Changeset 6360 in vbox for trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp

Timestamp:

Jan 15, 2008 5:37:15 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27282

Message:

Guest Additions NT4: Dynamic display resizing works now.

Guest Additions NT4: Bugfix: VBoxService was eating up 99% of CPU time.

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp (modified) (9 diffs)

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

@@ -30 +30 @@
 
 #include "helpers.h"
-
 #include <sddl.h>
 
@@ -69 +68 @@
     pReq->header.size += strlen(pReq->szString);
 
+    printf("%s\n", pReq->szString);
+
+    FILE* pFh = fopen("c:\\VBoxServiceDebug.txt", "at");
+
+    /* Does maybe not work on Vista (write protection when starting without admin rights), 
+       so do this check! */
+    if (NULL != pFh)        
+    {
+        fprintf(pFh, "%s", pReq->szString);
+        fclose(pFh);
+    }
+
     DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, pReq, pReq->header.size,
                     pReq, pReq->header.size, &cbReturned, NULL);
@@ -135 +146 @@
 static int vboxStartServices (VBOXSERVICEENV *pEnv, VBOXSERVICEINFO *pTable)
 {
+    dprintf(("VBoxService: Starting services...\n"));
+
     pEnv->hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 
@@ -262 +275 @@
     if (gVBoxDriver == INVALID_HANDLE_VALUE)
     {
-        dprintf(("VBoxService: could not open VBox Guest Additions driver! rc = %d\n", GetLastError()));
+        dprintf(("VBoxService: could not open VBox Guest Additions driver! Please install / start it first! rc = %d\n", GetLastError()));
         status = ERROR_GEN_FAILURE;
     }
@@ -315 +328 @@
         if (gStopSem == NULL)
         {
-            dprintf(("VBoxService: CreateEvent failed: rc = %d\n", GetLastError()));
+            dprintf(("VBoxService: CreateEvent for Stopping failed: rc = %d\n", GetLastError()));
             return;
         }
@@ -377 +390 @@
         }
 
-        ghSeamlessNotifyEvent = CreateEvent(&SecAttr, FALSE, FALSE, VBOXHOOK_GLOBAL_EVENT_NAME);
-        if (ghSeamlessNotifyEvent == NULL)
-        {
-            dprintf(("VBoxService: CreateEvent failed: rc = %d\n", GetLastError()));
-            return;
+        if (dwMajorVersion >= 5)        /* Only for W2K and up ... */
+        {
+            ghSeamlessNotifyEvent = CreateEvent(&SecAttr, FALSE, FALSE, VBOXHOOK_GLOBAL_EVENT_NAME);
+            if (ghSeamlessNotifyEvent == NULL)
+            {
+                dprintf(("VBoxService: CreateEvent for Seamless failed: rc = %d\n", GetLastError()));
+                return;
+            }
         }
     }
@@ -430 +446 @@
      * Wait for the stop semaphore to be posted or a window event to arrive
      */
+
+    DWORD dwEventCount = 2;
     HANDLE hWaitEvent[2] = {gStopSem, ghSeamlessNotifyEvent};
+
+    if (0 == ghSeamlessNotifyEvent)         /* If seamless mode is not active / supported, reduce event array count */
+        dwEventCount = 1;                       
+
+    dprintf(("VBoxService: Number of events to wait in main loop: %ld\n", dwEventCount));
+
     while(true)
     {
-        DWORD waitResult = MsgWaitForMultipleObjectsEx(2, hWaitEvent, 500, QS_ALLINPUT, 0);
-        if (waitResult == WAIT_OBJECT_0)
-        {
-            dprintf(("VBoxService: exit\n"));
+        DWORD waitResult = MsgWaitForMultipleObjectsEx(dwEventCount, hWaitEvent, 500, QS_ALLINPUT, 0);
+        waitResult = waitResult - WAIT_OBJECT_0;
+
+        dprintf(("VBoxService: Wait result  = %ld.\n", waitResult));
+
+        if (waitResult == 0)
+        {
+            dprintf(("VBoxService: Event 'Exit' triggered.\n"));
             /* exit */
             break;
         }
-        else
-        if (waitResult == WAIT_OBJECT_0+1)
-        {
+        else if ((waitResult == 1) && (ghSeamlessNotifyEvent!=0))       /* Only jump in, if seamless is active! */
+        {
+            dprintf(("VBoxService: Event 'Seamless' triggered.\n"));
+
             /* seamless window notification */
             VBoxSeamlessCheckWindows();
@@ -504 +533 @@
     dprintf(("VBoxService: WinMain\n"));
     gInstance = hInstance;
-    VBoxServiceStart ();
+    VBoxServiceStart();
+    
     return 0;
 }
@@ -546 +576 @@
     return 0;
 }
-