Changeset 63094 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2016 3:19:54 PM (8 years ago)

Author:

vboxsync

Message:

VBoxHook: coding standards.

Location:

trunk/src/VBox/Additions/WINNT/VBoxHook

Files:

• VBoxHook.cpp (modified) (7 diffs)
• dllmain.cpp (modified) (1 diff)
• testcase/tstHook.cpp (modified) (3 diffs)

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

@@ -16 +16 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/win/windows.h>
 #include <VBoxHook.h>
@@ -21 +25 @@
 #include <stdio.h>
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 #pragma data_seg("SHARED")
-static HWINEVENTHOOK    hWinEventHook[2]    = {0};
-static HWINEVENTHOOK    hDesktopEventHook   = NULL;
+static HWINEVENTHOOK    g_ahWinEventHook[2]   = { NULL, NULL };
+static HWINEVENTHOOK    g_hDesktopEventHook   = NULL;
 #pragma data_seg()
 #pragma comment(linker, "/section:SHARED,RWS")
 
-static HANDLE   hWinNotifyEvent = 0;
-static HANDLE   hDesktopNotifyEvent = 0;
-
+static HANDLE   g_hWinNotifyEvent     = NULL;
+static HANDLE   g_hDesktopNotifyEvent = NULL;
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
 #ifdef DEBUG
 static void WriteLog(const char *pszFormat, ...);
@@ -81 +93 @@
         }
 #endif
-        if (!hWinNotifyEvent)
+        if (!g_hWinNotifyEvent)
         {
-            hWinNotifyEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, VBOXHOOK_GLOBAL_WT_EVENT_NAME);
-            dprintf(("OpenEvent returned %x (last err=%x)\n", hWinNotifyEvent, GetLastError()));
+            g_hWinNotifyEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, VBOXHOOK_GLOBAL_WT_EVENT_NAME);
+            dprintf(("OpenEvent returned %x (last err=%x)\n", g_hWinNotifyEvent, GetLastError()));
         }
-        BOOL ret = SetEvent(hWinNotifyEvent);
-        dprintf(("SetEvent %x returned %d (last error %x)\n", hWinNotifyEvent, ret, GetLastError()));
+        BOOL ret = SetEvent(g_hWinNotifyEvent);
+        dprintf(("SetEvent %x returned %d (last error %x)\n", g_hWinNotifyEvent, ret, GetLastError()));
         break;
     }
@@ -96 +108 @@
                                             DWORD dwEventThread, DWORD dwmsEventTime)
 {
-    if (!hDesktopNotifyEvent)
-    {
-        hDesktopNotifyEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, VBOXHOOK_GLOBAL_DT_EVENT_NAME);
-        dprintf(("OpenEvent returned %x (last err=%x)\n", hDesktopNotifyEvent, GetLastError()));
-    }
-    BOOL ret = SetEvent(hDesktopNotifyEvent);
-    dprintf(("SetEvent %x returned %d (last error %x)\n", hDesktopNotifyEvent, ret, GetLastError()));
+    if (!g_hDesktopNotifyEvent)
+    {
+        g_hDesktopNotifyEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, VBOXHOOK_GLOBAL_DT_EVENT_NAME);
+        dprintf(("OpenEvent returned %x (last err=%x)\n", g_hDesktopNotifyEvent, GetLastError()));
+    }
+    BOOL ret = SetEvent(g_hDesktopNotifyEvent);
+    dprintf(("SetEvent %x returned %d (last error %x)\n", g_hDesktopNotifyEvent, ret, GetLastError()));
 }
 
 BOOL VBoxHookInstallActiveDesktopTracker(HMODULE hDll)
 {
-    if (hDesktopEventHook)
+    if (g_hDesktopEventHook)
         return TRUE;
 
     CoInitialize(NULL);
-    hDesktopEventHook = SetWinEventHook(EVENT_SYSTEM_DESKTOPSWITCH, EVENT_SYSTEM_DESKTOPSWITCH,
-                                        hDll,
-                                        VBoxHandleDesktopEvent,
-                                        0, 0,
-                                        0);
-
-    return !!hDesktopEventHook;
+    g_hDesktopEventHook = SetWinEventHook(EVENT_SYSTEM_DESKTOPSWITCH, EVENT_SYSTEM_DESKTOPSWITCH,
+                                          hDll,
+                                          VBoxHandleDesktopEvent,
+                                          0, 0,
+                                          0);
+
+    return !!g_hDesktopEventHook;
 
 }
@@ -123 +135 @@
 BOOL VBoxHookRemoveActiveDesktopTracker()
 {
-    if (hDesktopEventHook)
-    {
-        UnhookWinEvent(hDesktopEventHook);
+    if (g_hDesktopEventHook)
+    {
+        UnhookWinEvent(g_hDesktopEventHook);
         CoUninitialize();
     }
-    hDesktopEventHook = 0;
+    g_hDesktopEventHook = 0;
     return TRUE;
 }
@@ -135 +147 @@
 BOOL VBoxHookInstallWindowTracker(HMODULE hDll)
 {
-    if (hWinEventHook[0] || hWinEventHook[1])
+    if (g_ahWinEventHook[0] || g_ahWinEventHook[1])
         return TRUE;
 
     CoInitialize(NULL);
-    hWinEventHook[0] = SetWinEventHook(EVENT_OBJECT_LOCATIONCHANGE, EVENT_OBJECT_LOCATIONCHANGE,
-                                       hDll,
-                                       VBoxHandleWinEvent,
-                                       0, 0,
-                                       WINEVENT_INCONTEXT | WINEVENT_SKIPOWNPROCESS);
-
-    hWinEventHook[1] = SetWinEventHook(EVENT_OBJECT_CREATE, EVENT_OBJECT_HIDE,
-                                       hDll,
-                                       VBoxHandleWinEvent,
-                                       0, 0,
-                                       WINEVENT_INCONTEXT | WINEVENT_SKIPOWNPROCESS);
-    return !!hWinEventHook[0];
+    g_ahWinEventHook[0] = SetWinEventHook(EVENT_OBJECT_LOCATIONCHANGE, EVENT_OBJECT_LOCATIONCHANGE,
+                                          hDll,
+                                          VBoxHandleWinEvent,
+                                          0, 0,
+                                          WINEVENT_INCONTEXT | WINEVENT_SKIPOWNPROCESS);
+
+    g_ahWinEventHook[1] = SetWinEventHook(EVENT_OBJECT_CREATE, EVENT_OBJECT_HIDE,
+                                          hDll,
+                                          VBoxHandleWinEvent,
+                                          0, 0,
+                                          WINEVENT_INCONTEXT | WINEVENT_SKIPOWNPROCESS);
+    return !!g_ahWinEventHook[0];
 }
 
@@ -156 +168 @@
 BOOL VBoxHookRemoveWindowTracker()
 {
-    if (hWinEventHook[0] && hWinEventHook[1])
-    {
-        UnhookWinEvent(hWinEventHook[0]);
-        UnhookWinEvent(hWinEventHook[1]);
+    if (g_ahWinEventHook[0] && g_ahWinEventHook[1])
+    {
+        UnhookWinEvent(g_ahWinEventHook[0]);
+        UnhookWinEvent(g_ahWinEventHook[1]);
         CoUninitialize();
     }
-    hWinEventHook[0]  = hWinEventHook[1] = 0;
+    g_ahWinEventHook[0] = g_ahWinEventHook[1] = 0;
     return TRUE;
 }

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

@@ -26 +26 @@
  * @param   hDLLInst        Dll instance handle
  * @param   fdwReason       Callback reason
- * @param   lpvReserved     Reserved
+ * @param   pvReserved      Reserved
  */
-BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID pvReserved)
 {
+    RT_NOREF(hDLLInst, pvReserved)
     switch (fdwReason)
     {

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

@@ +1 @@
+/* $Id$ */
+/** @file
+ * VBoxHook testcase.
+ */
+
 /*
  * Copyright (C) 2006-2016 Oracle Corporation
@@ -19 +24 @@
 #include <stdio.h>
 
-int main(int argc, char **argv)
+
+int main()
 {
     printf("Enabling global hook\n");
@@ -34 +40 @@
     return 0;
 }
+