Changeset 4461 in vbox for trunk/src/VBox

Timestamp:

Aug 31, 2007 8:41:54 AM (17 years ago)

Author:

vboxsync

Message:

Rewrote seamless notification handling.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• VBoxHook/VBoxHook.cpp (modified) (4 diffs)
• VBoxHook/testcase/tstHook.cpp (modified) (1 diff)
• VBoxService/VBoxSeamless.cpp (modified) (2 diffs)
• VBoxService/VBoxService.cpp (modified) (4 diffs)
• include/VBoxGuestInternal.h (modified) (1 diff)
• include/VBoxHook.h (modified) (1 diff)

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

@@ -19 +19 @@
 #pragma data_seg("SHARED") 
 static HWINEVENTHOOK    hEventHook[2]    = {0}; 
-static HWND             hwndNotification = 0;
 #pragma data_seg() 
 #pragma comment(linker, "/section:SHARED,RWS") 
+
+static HANDLE   hNotifyEvent = 0;
 
 #ifdef DEBUG
@@ -74 +75 @@
         }
 #endif
-        BOOL ret = PostMessage(hwndNotification, WM_VBOX_SEAMLESS_UPDATE, 0, 0);
-        dprintf(("PostMessage %x returned %d (last error %x)\n", hwndNotification, ret, GetLastError()));
+        if (!hNotifyEvent)
+        {
+            hNotifyEvent = OpenEvent(EVENT_ALL_ACCESS, FALSE, VBOXHOOK_GLOBAL_EVENT_NAME);
+            dprintf(("OpenEvent returned %x (last err=%x)\n", hNotifyEvent, GetLastError()));
+        }
+        BOOL ret = SetEvent(hNotifyEvent);
+        dprintf(("SetEvent %x returned %d (last error %x)\n", hNotifyEvent, ret, GetLastError()));
         break;
     }
@@ -82 +88 @@
 
 /* Install the global message hook */
-BOOL VBoxInstallHook(HMODULE hDll, HWND hwndPostWindow)
+BOOL VBoxInstallHook(HMODULE hDll)
 {
     if (hEventHook[0] || hEventHook[1])
         return TRUE;
 
-    hwndNotification = hwndPostWindow;
-
-    dprintf(("VBoxInstallHook hwnd=%x\n", hwndPostWindow));
     CoInitialize(NULL);
     hEventHook[0] = SetWinEventHook(EVENT_OBJECT_LOCATIONCHANGE, EVENT_OBJECT_LOCATIONCHANGE,
@@ -115 +118 @@
     }
     hEventHook[0]  = hEventHook[1] = 0;
-    hwndNotification = 0;
     return true;
 }

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

@@ -21 +21 @@
 {
     printf("Enabling global hook\n");
-    VBoxInstallHook(GetModuleHandle("VBoxHook.dll"), 0);
+
+    HANDLE hEvent = CreateEvent(NULL, FALSE, FALSE, VBOXHOOK_GLOBAL_EVENT_NAME);
+
+    VBoxInstallHook(GetModuleHandle("VBoxHook.dll"));
     getchar();
 

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxSeamless.cpp

@@ -32 +32 @@
     HMODULE    hModule;
 
-    BOOL    (* pfnVBoxInstallHook)(HMODULE hDll, HWND hwndPostWindow);
+    BOOL    (* pfnVBoxInstallHook)(HMODULE hDll);
     BOOL    (* pfnVBoxRemoveHook)();
 
@@ -120 +120 @@
         VBoxSeamlessCheckWindows();
 
-        gCtx.pfnVBoxInstallHook(gCtx.hModule, gToolWindow);
+        gCtx.pfnVBoxInstallHook(gCtx.hModule);
     }
 }

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

@@ -30 +30 @@
 HANDLE                gVBoxDriver;
 HANDLE                gStopSem;
+HANDLE                ghSeamlessNotifyEvent = 0;
 SERVICE_STATUS        gVBoxServiceStatus;
 SERVICE_STATUS_HANDLE gVBoxServiceStatusHandle;
@@ -291 +292 @@
             return;
         }
+        ghSeamlessNotifyEvent = CreateEvent(NULL, FALSE, FALSE, VBOXHOOK_GLOBAL_EVENT_NAME);
+        if (ghSeamlessNotifyEvent == NULL)
+        {
+            dprintf(("VBoxService: CreateEvent failed: rc = %d\n", GetLastError()));
+            return;
+        }
     }
 
@@ -335 +342 @@
      * Wait for the stop semaphore to be posted or a window event to arrive
      */
+    HANDLE hWaitEvent[2] = {gStopSem, ghSeamlessNotifyEvent};
     while(true)
     {
-        DWORD waitResult = MsgWaitForMultipleObjectsEx(1, &gStopSem, 250, QS_ALLINPUT, 0);
+        DWORD waitResult = MsgWaitForMultipleObjectsEx(2, hWaitEvent, 500, QS_ALLINPUT, 0);
         if (waitResult == WAIT_OBJECT_0)
         {
@@ -344 +352 @@
             break;
         }
-        /* timeout or a window message, handle it */
-        MSG msg;
-        while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-        {
-            dprintf(("VBoxService: msg %p\n", msg.message));
-            if (msg.message == WM_QUIT)
-            {
-                dprintf(("VBoxService: WM_QUIT!\n"));
-                SetEvent(gStopSem);
-                continue;
-            }
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-        /* we might have to repeat this operation because the shell might not be loaded yet */
-        if (!fTrayIconCreated)
-        {
-            fTrayIconCreated = Shell_NotifyIcon(NIM_ADD, &ndata);
-            dprintf(("VBoxService: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
+        else
+        if (waitResult == WAIT_OBJECT_0+1)
+        {
+            /* seamless window notification */
+            VBoxSeamlessCheckWindows();
+        }
+        else
+        {
+            /* timeout or a window message, handle it */
+            MSG msg;
+            while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+            {
+                dprintf(("VBoxService: msg %p\n", msg.message));
+                if (msg.message == WM_QUIT)
+                {
+                    dprintf(("VBoxService: WM_QUIT!\n"));
+                    SetEvent(gStopSem);
+                    continue;
+                }
+                TranslateMessage(&msg);
+                DispatchMessage(&msg);
+            }
+            /* we might have to repeat this operation because the shell might not be loaded yet */
+            if (!fTrayIconCreated)
+            {
+                fTrayIconCreated = Shell_NotifyIcon(NIM_ADD, &ndata);
+                dprintf(("VBoxService: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
+            }
         }
     }

trunk/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h

@@ -12 +12 @@
 
 /** Uncomment to enable VRDP status checks */
-//#define VBOX_WITH_VRDP_SESSION_HANDLING
+#define VBOX_WITH_VRDP_SESSION_HANDLING
 
 /** IOCTL for VBoxGuest to enable a VRDP session */

trunk/src/VBox/Additions/WINNT/include/VBoxHook.h

@@ -18 +18 @@
 
 #define VBOXHOOK_DLL_NAME           "VBoxHook.dll"
+#define VBOXHOOK_GLOBAL_EVENT_NAME  "Local\\VBoxHookNotifyEvent"
 
 /* Install the global message hook */
-BOOL VBoxInstallHook(HMODULE hDll, HWND hwndPostWindow);
+BOOL VBoxInstallHook(HMODULE hDll);
 
 /* Remove the global message hook */