Changeset 96572 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

Timestamp:

Sep 1, 2022 8:36:22 PM (2 years ago)

Author:

vboxsync

Message:

HostDrives,Installer/win: Reworked the windows installer related code for no-CRT mode, where applicable, and changed the XxxxInstall.exe/XxxxUninstall.exe utilities to link against VBoxRT.dll instead of being statically linked. Lot's of cleanup. The change is uncomfortably large, but difficult to detangle these things. bugref:10261

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp (modified) (13 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

@@ -42 +42 @@
 #include <iprt/win/setupapi.h>
 #include <newdev.h>
+
 #include <iprt/assert.h>
-#include <iprt/err.h>
+#include <VBox/err.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/stream.h>
 #include <iprt/string.h>
-#include <VBox/err.h>
-#include <stdio.h>
 #include <VBox/usblib.h>
 #include <VBox/VBoxDrvCfg-win.h>
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** Handle to the open device. */
 static HANDLE   g_hUSBMonitor = INVALID_HANDLE_VALUE;
@@ -57 +61 @@
 static bool     g_fStartedService = false;
 
+
 /**
  * Attempts to start the service, creating it if necessary.
@@ -83 +88 @@
 int usbMonStopService(void)
 {
-    printf("usbMonStopService\n");
+    RTPrintf("usbMonStopService\n");
+
     /*
      * Assume it didn't exist, so we'll create the service.
@@ -141 +147 @@
     DWORD          cbReturned = 0;
 
-    printf("usbLibReleaseDevice %x %x %x\n", usVendorId, usProductId, usRevision);
+    RTPrintf("usbLibReleaseDevice %x %x %x\n", usVendorId, usProductId, usRevision);
 
     release.usVendorId  = usVendorId;
@@ -174 +180 @@
     Assert(g_hUSBMonitor);
 
-    printf("usblibInsertFilter %04X %04X %04X\n", usVendorId, usProductId, usRevision);
+    RTPrintf("usblibInsertFilter %04X %04X %04X\n", usVendorId, usProductId, usRevision);
 
     USBFilterInit(&filter, USBFILTERTYPE_CAPTURE);
@@ -222 +228 @@
     Assert(g_hUSBMonitor);
 
-    printf("usblibRemoveFilter %p\n", aID);
+    RTPrintf("usblibRemoveFilter %p\n", aID);
 
     uId = (uintptr_t)aID;
@@ -244 +250 @@
     DWORD          cbReturned;
 
-    printf("usbproxy: usbLibInit\n");
+    RTPrintf("usbproxy: usbLibInit\n");
 
     g_hUSBMonitor = CreateFile (USBMON_DEVICE_NAME,
@@ -269 +275 @@
         {
             /* AssertFailed(); */
-            printf("usbproxy: Unable to open filter driver!! (rc=%lu)\n", GetLastError());
+            RTPrintf("usbproxy: Unable to open filter driver!! (rc=%lu)\n", GetLastError());
             rc = VERR_FILE_NOT_FOUND;
             goto failure;
@@ -281 +287 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
     {
-        printf("usbproxy: Unable to query filter version!! (rc=%lu)\n", GetLastError());
+        RTPrintf("usbproxy: Unable to query filter version!! (rc=%lu)\n", GetLastError());
         rc = VERR_VERSION_MISMATCH;
         goto failure;
@@ -292 +298 @@
         )
     {
-        printf("usbproxy: Filter driver version mismatch!!\n");
+        RTPrintf("usbproxy: Filter driver version mismatch!!\n");
         rc = VERR_VERSION_MISMATCH;
         goto failure;
@@ -344 +350 @@
     RT_NOREF2(argc, argv);
 
-    printf("USB test\n");
+    RTPrintf("USB test\n");
 
     rc = usbMonitorInit();
@@ -355 +361 @@
     usbMonInsertFilter(0x80EE, 0x0030, 0x0110, &pId3);
 
-    printf("Waiting to capture devices... enter 'r' to run filters\n");
-    c = getchar();
+    RTPrintf("Waiting to capture devices... enter 'r' to run filters\n");
+    c = RTStrmGetCh(g_pStdIn);
     if (c == 'r')
     {
         usbMonRunFilters();
-        printf("Waiting to capture devices...\n");
-        getchar();  /* eat the '\n' */
-        getchar();  /* wait for more input */
-    }
-
-    printf("Releasing device\n");
+        RTPrintf("Waiting to capture devices...\n");
+        RTStrmGetCh(g_pStdIn);  /* eat the '\n' */
+        RTStrmGetCh(g_pStdIn);  /* wait for more input */
+    }
+
+    RTPrintf("Releasing device\n");
     usbMonReleaseDevice(0xA16, 0x2499, 0x100);
 
@@ -376 +382 @@
     return 0;
 }
+