Changeset 95871 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 27, 2022 2:38:21 AM (3 years ago)

Author:

vboxsync

Message:

Add/Nt/VBoxHook: Made it build in VBOX_WITH_NOCRT_STATIC mode. bugref:10261

Location:

trunk/src/VBox/Additions/WINNT/VBoxHook

Files:

• VBoxHook.cpp (modified) (4 diffs)
• testcase/tstHook.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
+
 #include <VBoxHook.h>
 #include <VBox/VBoxGuestLib.h>
 #ifdef DEBUG
-# include <stdio.h>
+# include <VBox/VBoxGuest.h>
+# include <VBox/VMMDev.h>
+# include <iprt/string.h>
 #endif
 
@@ -184 +187 @@
 
 #ifdef DEBUG
-# include <VBox/VBoxGuest.h>
-# include <VBox/VMMDev.h>
-
 /**
  * dprintf worker using VBoxGuest.sys and VMMDevReq_LogString.
@@ -225 +225 @@
     va_list va;
     va_start(va, pszFormat);
-    size_t cch = vsprintf(s_uBuf.Req.szString, pszFormat, va);
+    size_t cch = RTStrPrintf(s_uBuf.Req.szString, sizeof(s_uBuf.Req.szString), pszFormat, va);
     va_end(va);
 
@@ -238 +238 @@
                     &cbReturned, NULL);
 }
-
 #endif /* DEBUG */
 

trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/tstHook.cpp

@@ -22 +22 @@
 #include <iprt/win/windows.h>
 #include <VBoxHook.h>
-#include <stdio.h>
 
 
 int main()
 {
-    printf("Enabling global hook\n");
+    DWORD cbIgnores;
+    WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), RT_STR_TUPLE("Enabling global hook\r\n"), &cbIgnores, NULL);
 
     HANDLE hEvent = CreateEvent(NULL, FALSE, FALSE, VBOXHOOK_GLOBAL_WT_EVENT_NAME);
 
     VBoxHookInstallWindowTracker(GetModuleHandle("VBoxHook.dll"));
-    getchar();
 
-    printf("Disabling global hook\n");
+    /* wait for input. */
+    uint8_t ch;
+    ReadFile(GetStdHandle(STD_INPUT_HANDLE), &ch, sizeof(ch), &cbIgnores, NULL);
+
+    /* disable hook. */
+    WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), RT_STR_TUPLE("Disabling global hook\r\n"), &cbIgnores, NULL);
     VBoxHookRemoveWindowTracker();
     CloseHandle(hEvent);