Changeset 96387 in vbox

Timestamp:

Aug 20, 2022 11:06:28 PM (2 years ago)

Author:

vboxsync

Message:

Add/NT/Inst: More RegCleanup cleanups, changing makefile to always build the x86 version. bugref:10261

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (2 diffs)
• RegCleanup.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -54 +54 @@
 
 PROGRAMS += RegCleanup
-RegCleanup_TEMPLATE = VBoxGuestR3Exe
-RegCleanup_DEFS     = _WIN32_WINNT=0x0400 UNICODE
-RegCleanup_SOURCES  = \
+RegCleanup_TEMPLATE     := VBoxGuestR3Exe
+RegCleanup_BLD_TRG_ARCH := x86
+RegCleanup_DEFS         := _WIN32_WINNT=0x0400
+RegCleanup_SOURCES      := \
         RegCleanup.cpp \
         RegCleanup.rc
@@ -377 +378 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
+

trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.cpp

@@ -33 +33 @@
 
 
-static BOOL isNT4(void)
+static bool IsNt4(void)
 {
-    OSVERSIONINFO OSversion;
-
-    OSversion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    ::GetVersionEx(&OSversion);
-
-    switch (OSversion.dwPlatformId)
-    {
-        case VER_PLATFORM_WIN32s:
-        case VER_PLATFORM_WIN32_WINDOWS:
-            return FALSE;
-        case VER_PLATFORM_WIN32_NT:
-            if (OSversion.dwMajorVersion == 4)
-                return TRUE;
-            return FALSE;
-        default:
-            break;
-    }
-    return FALSE;
+    OSVERSIONINFOW VerInfo = { sizeof(VerInfo), 0 };
+    GetVersionExW(&VerInfo);
+    return VerInfo.dwPlatformId  == VER_PLATFORM_WIN32_NT
+        && VerInfo.dwMajorVersion == 4;
 }
 
@@ -58 +44 @@
 int main()
 {
-    /* This program is only for installing drivers on NT4 */
-    if (!isNT4())
+    if (!IsNt4())
     {
         DWORD cbIgn;
         WriteFile(GetStdHandle(STD_ERROR_HANDLE), RT_STR_TUPLE("This program only runs on NT4\r\n"), &cbIgn, NULL);
-        return 1;
+        return RTEXITCODE_FAILURE;
     }
 
@@ -72 +57 @@
     RegDeleteKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers\\InvalidDisplay");
     RegDeleteKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers\\NewDisplay");
-
-    return 0;
+    return RTEXITCODE_SUCCESS;
 }