Rename os plugin to osinfo

12 files changed, 11 insertions, 11 deletions

diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh
index 2bfa3bae2d..be064b2032 100644
--- a/dist-assets/windows/installer.nsh
+++ b/dist-assets/windows/installer.nsh
@@ -94,7 +94,7 @@
 
 	log::Log "InstallWin7Hotfix()"
 
-	os::CheckWindows7Patch
+	osinfo::CheckWindows7Patch
 	Pop $0
 	Pop $1
 
diff --git a/windows/nsis-plugins/nsis-plugins.sln b/windows/nsis-plugins/nsis-plugins.sln
index c8ea42119f..102a73eb08 100644
--- a/windows/nsis-plugins/nsis-plugins.sln
+++ b/windows/nsis-plugins/nsis-plugins.sln
@@ -43,7 +43,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msiutil", "src\msiutil\msiu
 		{1344152F-2BAD-4198-8E51-31AAC32BFBB2} = {1344152F-2BAD-4198-8E51-31AAC32BFBB2}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os", "src\os\os.vcxproj", "{5ECCC4BC-599B-4F49-8D8F-63A2CF64764F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osinfo", "src\osinfo\osinfo.vcxproj", "{5ECCC4BC-599B-4F49-8D8F-63A2CF64764F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF}
 	EndProjectSection
diff --git a/windows/nsis-plugins/src/os/dllmain.cpp b/windows/nsis-plugins/src/osinfo/dllmain.cpp
index f11c65c519..f11c65c519 100644
--- a/windows/nsis-plugins/src/os/dllmain.cpp
+++ b/windows/nsis-plugins/src/osinfo/dllmain.cpp
diff --git a/windows/nsis-plugins/src/os/os.cpp b/windows/nsis-plugins/src/osinfo/osinfo.cpp
index b5b1e54250..b5b1e54250 100644
--- a/windows/nsis-plugins/src/os/os.cpp
+++ b/windows/nsis-plugins/src/osinfo/osinfo.cpp
diff --git a/windows/nsis-plugins/src/os/os.def b/windows/nsis-plugins/src/osinfo/osinfo.def
index 47808ce48f..e82f6366ba 100644
--- a/windows/nsis-plugins/src/os/os.def
+++ b/windows/nsis-plugins/src/osinfo/osinfo.def
@@ -1,4 +1,4 @@
-LIBRARY os
+LIBRARY osinfo
 
 EXPORTS
 
diff --git a/windows/nsis-plugins/src/os/os.vcxproj b/windows/nsis-plugins/src/osinfo/osinfo.vcxproj
index daa51758a4..6935bdb2a7 100644
--- a/windows/nsis-plugins/src/os/os.vcxproj
+++ b/windows/nsis-plugins/src/osinfo/osinfo.vcxproj
@@ -14,7 +14,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{5ECCC4BC-599B-4F49-8D8F-63A2CF64764F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>os</RootNamespace>
+    <RootNamespace>osinfo</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -59,7 +59,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;os_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -72,7 +72,7 @@
       <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories>
       <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>os.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>osinfo.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,7 +83,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;os_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -98,7 +98,7 @@
       <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories>
       <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>os.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>osinfo.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -109,14 +109,14 @@
   <ItemGroup>
     <ClCompile Include="update.cpp" />
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="os.cpp" />
+    <ClCompile Include="osinfo.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="os.def" />
+    <None Include="osinfo.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/nsis-plugins/src/os/os.vcxproj.filters b/windows/nsis-plugins/src/osinfo/osinfo.vcxproj.filters
index 6b31d70d05..6b31d70d05 100644
--- a/windows/nsis-plugins/src/os/os.vcxproj.filters
+++ b/windows/nsis-plugins/src/osinfo/osinfo.vcxproj.filters
diff --git a/windows/nsis-plugins/src/os/stdafx.cpp b/windows/nsis-plugins/src/osinfo/stdafx.cpp
index 3b6341d106..3b6341d106 100644
--- a/windows/nsis-plugins/src/os/stdafx.cpp
+++ b/windows/nsis-plugins/src/osinfo/stdafx.cpp
diff --git a/windows/nsis-plugins/src/os/stdafx.h b/windows/nsis-plugins/src/osinfo/stdafx.h
index f3a07375c7..f3a07375c7 100644
--- a/windows/nsis-plugins/src/os/stdafx.h
+++ b/windows/nsis-plugins/src/osinfo/stdafx.h
diff --git a/windows/nsis-plugins/src/os/targetver.h b/windows/nsis-plugins/src/osinfo/targetver.h
index ae4a5c032c..ae4a5c032c 100644
--- a/windows/nsis-plugins/src/os/targetver.h
+++ b/windows/nsis-plugins/src/osinfo/targetver.h
diff --git a/windows/nsis-plugins/src/os/update.cpp b/windows/nsis-plugins/src/osinfo/update.cpp
index a300882407..4f33310236 100644
--- a/windows/nsis-plugins/src/os/update.cpp
+++ b/windows/nsis-plugins/src/osinfo/update.cpp
@@ -73,7 +73,7 @@ bool HasSetupApiSha2Fix()
 
 	if (0 == VirtualQuery(bytes, &meminfo, sizeof(meminfo)))
 	{
-		THROW_WINDOWS_ERROR(GetLastError(), "CreateFileW");
+		THROW_WINDOWS_ERROR(GetLastError(), "VirtualQuery");
 	}
 
 	constexpr auto PATCH_MARKER_SIZE = sizeof(PATCH_MARKER) - 1;
diff --git a/windows/nsis-plugins/src/os/update.h b/windows/nsis-plugins/src/osinfo/update.h
index ae33258b56..ae33258b56 100644
--- a/windows/nsis-plugins/src/os/update.h
+++ b/windows/nsis-plugins/src/osinfo/update.h