Changeset 96459 in vbox

Timestamp:

Aug 24, 2022 10:02:55 PM (2 years ago)

Author:

vboxsync

Message:

Add/VBoxGuest: Made VBoxGuestInst.cpp build in no-CRT mode. Cleaned up code. bugref:10261

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (1 diff)
• win/VBoxGuestInst.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -269 +269 @@
   VBoxGuestInstNT_LDFLAGS := -Include:_vcc100_kernel32_fakes_asm # Temporary kludge to deal with some link order issue.
  endif
+ VBoxGuestInstNT_INCS     = ../../WINNT/include
  VBoxGuestInstNT_SOURCES  = win/VBoxGuestInst.cpp
  VBoxGuestInstNT_USES     = vboximportchecker

trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Small tool to (un)install the VBoxGuest device driver.
+ * Small tool to (un)install the VBoxGuest device driver (for testing).
  */
 
@@ -41 +41 @@
 #include <iprt/win/windows.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <VBox/VBoxGuest.h> /* for VBOXGUEST_SERVICE_NAME */
 #include <iprt/err.h>
-
-
-//#define TESTMODE
-
-
-
-static int installDriver(bool fStartIt)
+#include <iprt/message.h>
+#include <iprt/stream.h>
+#include <iprt/utf16.h>
+
+
+
+
+static RTEXITCODE installDriver(bool fStartIt)
 {
     /*
      * Assume it didn't exist, so we'll create the service.
      */
-    SC_HANDLE   hSMgrCreate = OpenSCManager(NULL, NULL, SERVICE_CHANGE_CONFIG);
+    SC_HANDLE   hSMgrCreate = OpenSCManagerW(NULL, NULL, SERVICE_CHANGE_CONFIG);
     if (!hSMgrCreate)
-    {
-        printf("OpenSCManager(,,create) failed rc=%lu\n", GetLastError());
-        return -1;
-    }
-
-    const char    *pszSlashName = "\\VBoxGuest.sys";
-    char szDriver[MAX_PATH * 2];
-    GetCurrentDirectory(MAX_PATH, szDriver);
-    strcat(szDriver, pszSlashName);
-    if (GetFileAttributesA(szDriver) == INVALID_FILE_ATTRIBUTES)
-    {
-        GetSystemDirectory(szDriver, sizeof(szDriver));
-        strcat(strcat(szDriver, "\\drivers"), pszSlashName);
+        return RTMsgErrorExitFailure("OpenSCManager(,,create) failed: %u", GetLastError());
+
+    const wchar_t  *pwszSlashName = L"\\VBoxGuest.sys";
+    wchar_t         wszDriver[MAX_PATH * 2];
+    GetCurrentDirectoryW(MAX_PATH, wszDriver);
+    RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), pwszSlashName);
+    if (GetFileAttributesW(wszDriver) == INVALID_FILE_ATTRIBUTES)
+    {
+        GetSystemDirectoryW(wszDriver, MAX_PATH);
+        RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), L"\\drivers");
+        RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), pwszSlashName);
 
         /* Try FAT name abbreviation. */
-        if (GetFileAttributesA(szDriver) == INVALID_FILE_ATTRIBUTES)
-        {
-            pszSlashName = "\\VBoxGst.sys";
-            GetCurrentDirectory(MAX_PATH, szDriver);
-            strcat(szDriver, pszSlashName);
-            if (GetFileAttributesA(szDriver) == INVALID_FILE_ATTRIBUTES)
+        if (GetFileAttributesW(wszDriver) == INVALID_FILE_ATTRIBUTES)
+        {
+            pwszSlashName = L"\\VBoxGst.sys";
+            GetCurrentDirectoryW(MAX_PATH, wszDriver);
+            RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), pwszSlashName);
+            if (GetFileAttributesW(wszDriver) == INVALID_FILE_ATTRIBUTES)
             {
-                GetSystemDirectory(szDriver, sizeof(szDriver));
-                strcat(strcat(szDriver, "\\drivers"), pszSlashName);
-
+                GetSystemDirectoryW(wszDriver, MAX_PATH);
+                RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), L"\\drivers");
+                RTUtf16Cat(wszDriver, RT_ELEMENTS(wszDriver), pwszSlashName);
             }
         }
     }
 
-    SC_HANDLE hService = CreateService(hSMgrCreate,
-                                       VBOXGUEST_SERVICE_NAME,
-                                       "VBoxGuest Support Driver",
-                                       SERVICE_QUERY_STATUS | (fStartIt ? SERVICE_START : 0),
-                                       SERVICE_KERNEL_DRIVER,
-                                       SERVICE_BOOT_START,
-                                       SERVICE_ERROR_NORMAL,
-                                       szDriver,
-                                       "System",
-                                       NULL, NULL, NULL, NULL);
+    RTEXITCODE rcExit;
+    SC_HANDLE hService = CreateServiceW(hSMgrCreate,
+                                        RT_CONCAT(L,VBOXGUEST_SERVICE_NAME),
+                                        L"VBoxGuest Support Driver",
+                                        SERVICE_QUERY_STATUS | (fStartIt ? SERVICE_START : 0),
+                                        SERVICE_KERNEL_DRIVER,
+                                        SERVICE_BOOT_START,
+                                        SERVICE_ERROR_NORMAL,
+                                        wszDriver,
+                                        L"System",
+                                        NULL, NULL, NULL, NULL);
     if (hService)
     {
-        printf("Successfully created service '%s' for driver '%s'.\n", VBOXGUEST_SERVICE_NAME, szDriver);
+        RTMsgInfo("Successfully created service '%s' for driver '%ls'.\n", VBOXGUEST_SERVICE_NAME, wszDriver);
+        rcExit = RTEXITCODE_SUCCESS;
         if (fStartIt)
         {
             if (StartService(hService, 0, NULL))
-                printf("successfully started driver '%s'\n", szDriver);
+                RTMsgInfo("successfully started driver '%ls'\n", wszDriver);
             else
-                printf("StartService failed: %lu\n", GetLastError());
+                rcExit = RTMsgErrorExitFailure("StartService failed: %u", GetLastError());
         }
         CloseServiceHandle(hService);
     }
     else
-        printf("CreateService failed! lasterr=%lu (szDriver=%s)\n", GetLastError(), szDriver);
+        rcExit = RTMsgErrorExitFailure("CreateService failed! %u (wszDriver=%ls)\n", GetLastError(), wszDriver);
     CloseServiceHandle(hSMgrCreate);
-    return hService ? 0 : -1;
-}
-
-static int uninstallDriver(void)
-{
-    int rc = -1;
-    SC_HANDLE   hSMgr = OpenSCManager(NULL, NULL, SERVICE_CHANGE_CONFIG);
+    return rcExit;
+}
+
+
+static RTEXITCODE uninstallDriver(void)
+{
+    SC_HANDLE hSMgr = OpenSCManagerW(NULL, NULL, SERVICE_CHANGE_CONFIG);
     if (!hSMgr)
-    {
-        printf("OpenSCManager(,,delete) failed rc=%lu\n", GetLastError());
-        return -1;
-    }
-    SC_HANDLE hService = OpenService(hSMgr, VBOXGUEST_SERVICE_NAME, SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE);
+        return RTMsgErrorExitFailure("OpenSCManager(,,change_config) failed: %u", GetLastError());
+
+    RTEXITCODE rcExit;
+    SC_HANDLE hService = OpenServiceW(hSMgr, RT_CONCAT(L, VBOXGUEST_SERVICE_NAME), SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE);
     if (hService)
     {
@@ -135 +131 @@
         QueryServiceStatus(hService, &Status);
         if (Status.dwCurrentState == SERVICE_STOPPED)
-            rc = VINF_SUCCESS;
+            rcExit = RTEXITCODE_SUCCESS;
         else if (ControlService(hService, SERVICE_CONTROL_STOP, &Status))
         {
@@ -145 +141 @@
             }
             if (Status.dwCurrentState == SERVICE_STOPPED)
-                rc = VINF_SUCCESS;
+                rcExit = RTEXITCODE_SUCCESS;
             else
-            {
-                printf("Failed to stop service. status=%ld (%#lx)\n", Status.dwCurrentState, Status.dwCurrentState);
-                rc = VERR_GENERAL_FAILURE;
-            }
+                rcExit = RTMsgErrorExitFailure("Failed to stop service! Service status: %u (%#x)\n",
+                                                Status.dwCurrentState, Status.dwCurrentState);
         }
         else
-        {
-            DWORD dwErr = GetLastError();
-            if (   Status.dwCurrentState == SERVICE_STOP_PENDING
-                && dwErr == ERROR_SERVICE_CANNOT_ACCEPT_CTRL)
-                rc = VERR_RESOURCE_BUSY;    /* better than VERR_GENERAL_FAILURE */
-            else
-            {
-                printf("ControlService failed with dwErr=%ld. status=%lu (%#lx)\n",
-                       dwErr, Status.dwCurrentState, Status.dwCurrentState);
-                rc = -1;
-            }
-        }
+            rcExit = RTMsgErrorExitFailure("ControlService failed: %u, Service status: %u (%#x)",
+                                            GetLastError(), Status.dwCurrentState, Status.dwCurrentState);
 
         /*
          * Delete the service.
          */
-        if (RT_SUCCESS(rc))
+        if (rcExit == RTEXITCODE_SUCCESS)
         {
             if (DeleteService(hService))
-                rc = 0;
+                RTMsgInfo("Successfully deleted the %s service\n", VBOXGUEST_SERVICE_NAME);
             else
-            {
-                printf("DeleteService failed lasterr=%lu\n", GetLastError());
-                rc = -1;
-            }
-        }
+                rcExit = RTMsgErrorExitFailure("DeleteService failed: %u", GetLastError());
+        }
+
         CloseServiceHandle(hService);
     }
     else if (GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST)
-        rc = 0;
+    {
+        RTMsgInfo("Nothing to do, the service %s does not exist.\n", VBOXGUEST_SERVICE_NAME);
+        rcExit = RTEXITCODE_SUCCESS;
+    }
     else
-        printf("OpenService failed lasterr=%lu\n", GetLastError());
+        rcExit = RTMsgErrorExitFailure("OpenService failed: %u", GetLastError());
+
     CloseServiceHandle(hSMgr);
-    return rc;
-}
-
-#ifdef TESTMODE
-
-static HANDLE openDriver(void)
-{
-    HANDLE hDevice;
-
-    hDevice = CreateFile(VBOXGUEST_DEVICE_NAME, // Win2k+: VBOXGUEST_DEVICE_NAME_GLOBAL
-                         GENERIC_READ | GENERIC_WRITE,
-                         FILE_SHARE_READ | FILE_SHARE_WRITE,
-                         NULL,
-                         OPEN_EXISTING,
-                         FILE_ATTRIBUTE_NORMAL,
-                         NULL);
-    if (hDevice == INVALID_HANDLE_VALUE)
-    {
-        printf("CreateFile did not work. GetLastError() %lu\n", GetLastError());
-    }
-    return hDevice;
-}
-
-static int closeDriver(HANDLE hDevice)
-{
-    CloseHandle(hDevice);
-    return 0;
-}
-
-static int performTest(void)
-{
-    int rc = 0;
-
-    HANDLE hDevice = openDriver();
-
+    return rcExit;
+}
+
+
+static RTEXITCODE performTest(void)
+{
+    HANDLE hDevice = CreateFileW(RT_CONCAT(L,VBOXGUEST_DEVICE_NAME), // Win2k+: VBOXGUEST_DEVICE_NAME_GLOBAL
+                                 GENERIC_READ | GENERIC_WRITE,
+                                 FILE_SHARE_READ | FILE_SHARE_WRITE,
+                                 NULL,
+                                 OPEN_EXISTING,
+                                 FILE_ATTRIBUTE_NORMAL,
+                                 NULL);
     if (hDevice != INVALID_HANDLE_VALUE)
-        closeDriver(hDevice);
+    {
+        CloseHandle(hDevice);
+        RTMsgInfo("Test succeeded\n");
+        return RTEXITCODE_SUCCESS;
+    }
+    return RTMsgErrorExitFailure("Test failed! Unable to open driver (CreateFileW -> %u).", GetLastError());
+}
+
+
+static RTEXITCODE usage(const char *pszProgName)
+{
+    RTPrintf("\n"
+             "Usage: %s [install|uninstall|test]\n", pszProgName);
+    return RTEXITCODE_SYNTAX;
+}
+
+
+int main(int argc, char **argv)
+{
+    if (argc != 2)
+    {
+        RTMsgError(argc < 2 ? "Too few arguments! Expected one." : "Too many arguments! Expected only one.");
+        return usage(argv[0]);
+    }
+
+    RTEXITCODE rcExit;
+    if (strcmp(argv[1], "install") == 0)
+        rcExit = installDriver(true);
+    else if (strcmp(argv[1], "uninstall") == 0)
+        rcExit = uninstallDriver();
+    else if (strcmp(argv[1], "test") == 0)
+        rcExit = performTest();
     else
-        printf("openDriver failed!\n");
-
-    return rc;
-}
-
-#endif /* TESTMODE */
-
-static int usage(char *programName)
-{
-    printf("error, syntax: %s [install|uninstall]\n", programName);
-    return 1;
-}
-
-int main(int argc, char **argv)
-{
-    bool installMode;
-#ifdef TESTMODE
-    bool testMode = false;
-#endif
-
-    if (argc != 2)
-        return usage(argv[0]);
-
-    if (strcmp(argv[1], "install") == 0)
-        installMode = true;
-    else if (strcmp(argv[1], "uninstall") == 0)
-        installMode = false;
-#ifdef TESTMODE
-    else if (strcmp(argv[1], "test") == 0)
-        testMode = true;
-#endif
-    else
-        return usage(argv[0]);
-
-
-    int rc;
-#ifdef TESTMODE
-    if (testMode)
-        rc = performTest();
-    else
-#endif
-    if (installMode)
-        rc = installDriver(true);
-    else
-        rc = uninstallDriver();
-
-    if (rc == 0)
-        printf("operation completed successfully!\n");
-    else
-        printf("error: operation failed with status code %d\n", rc);
-
-    return rc;
-}
-
+    {
+        RTMsgError("Unknown argument: '%s'", argv[1]);
+        rcExit = usage(argv[0]);
+    }
+    return rcExit;
+}
+