Changeset 10374 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Jul 8, 2008 2:57:59 PM (16 years ago)

Author:

vboxsync

Message:

Corrected log messages.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDisplay.cpp (modified) (3 diffs)
• VBoxRestore.cpp (modified) (1 diff)
• VBoxSeamless.cpp (modified) (2 diffs)
• VBoxTray.cpp (modified) (16 diffs)
• VBoxVRDP.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -57 +57 @@
     if (NULL == hUser)
     {
-        dprintf(("VBoxService: Could not get module handle of USER32.DLL!\n"));
+        dprintf(("VBoxTray: Could not get module handle of USER32.DLL!\n"));
         return VERR_NOT_IMPLEMENTED; 
     }
@@ -63 +63 @@
     {
         *(uintptr_t *)&gCtx.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA"); 
-        dprintf(("VBoxService: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
+        dprintf(("VBoxTray: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
 
         *(uintptr_t *)&gCtx.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA"); 
-        dprintf(("VBoxService: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
+        dprintf(("VBoxTray: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
     }
     else if (OSinfo.dwMajorVersion <= 4)            /* Windows NT 4.0 */
@@ -74 +74 @@
     else                                /* Unsupported platform */
     {
-        dprintf(("VBoxService: Warning, display for platform not handled yet!\n"));
+        dprintf(("VBoxTray: Warning, display for platform not handled yet!\n"));
         return VERR_NOT_IMPLEMENTED; 
     }
 
-    dprintf(("VBoxService: Display init successful.\n"));
+    dprintf(("VBoxTray: Display init successful.\n"));
 
     *pfStartThread = true;

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxRestore.cpp

@@ -141 +141 @@
         else
         {
-            dprintf(("VBoxService: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */

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

@@ -324 +324 @@
             if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST)
             {
-                dprintf(("VBoxService: going to get seamless change information.\n"));
+                dprintf(("VBoxTray: going to get seamless change information.\n"));
 
                 /* We got at least one event. Read the requested resolution
@@ -395 +395 @@
         else
         {
-            dprintf(("VBoxService: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)

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

@@ -150 +150 @@
 static int vboxStartServices (VBOXSERVICEENV *pEnv, VBOXSERVICEINFO *pTable)
 {
-    dprintf(("VBoxService: Starting services...\n"));
+    dprintf(("VBoxTray: Starting services...\n"));
 
     pEnv->hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -263 +263 @@
 void WINAPI VBoxServiceStart(void)
 {
-    dprintf(("VBoxService: Start\n"));
+    dprintf(("VBoxTray: Start\n"));
 
     VBOXSERVICEENV svcEnv;
@@ -279 +279 @@
     if (gVBoxDriver == INVALID_HANDLE_VALUE)
     {
-        dprintf(("VBoxService: could not open VBox Guest Additions driver! Please install / start it first! rc = %d\n", GetLastError()));
+        dprintf(("VBoxTray: could not open VBox Guest Additions driver! Please install / start it first! rc = %d\n", GetLastError()));
         status = ERROR_GEN_FAILURE;
     }
 
-    dprintf(("VBoxService: Driver h %p, st %p\n", gVBoxDriver, status));
+    dprintf(("VBoxTray: Driver h %p, st %p\n", gVBoxDriver, status));
 
     if (status == NO_ERROR)
@@ -298 +298 @@
     }
 
-    dprintf(("VBoxService: Class st %p\n", status));
+    dprintf(("VBoxTray: Class st %p\n", status));
 
     if (status == NO_ERROR)
@@ -325 +325 @@
     }
 
-    dprintf(("VBoxService: Window h %p, st %p\n", gToolWindow, status));
+    dprintf(("VBoxTray: Window h %p, st %p\n", gToolWindow, status));
 
     if (status == NO_ERROR)
@@ -332 +332 @@
         if (gStopSem == NULL)
         {
-            dprintf(("VBoxService: CreateEvent for Stopping failed: rc = %d\n", GetLastError()));
+            dprintf(("VBoxTray: CreateEvent for Stopping failed: rc = %d\n", GetLastError()));
             return;
         }
@@ -354 +354 @@
         if (GetVersionEx(&info))
         {
-            dprintf(("VBoxService: Windows version major %d minor %d\n", info.dwMajorVersion, info.dwMinorVersion));
+            dprintf(("VBoxTray: Windows version major %d minor %d\n", info.dwMajorVersion, info.dwMinorVersion));
             dwMajorVersion = info.dwMajorVersion;
         }
@@ -399 +399 @@
             if (ghSeamlessNotifyEvent == NULL)
             {
-                dprintf(("VBoxService: CreateEvent for Seamless failed: rc = %d\n", GetLastError()));
+                dprintf(("VBoxTray: CreateEvent for Seamless failed: rc = %d\n", GetLastError()));
                 return;
             }
@@ -441 +441 @@
     sprintf(ndata.szTip, "Sun xVM VirtualBox Guest Additions %d.%d.%dr%d", VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD, VBOX_SVN_REV);
 
-    dprintf(("VBoxService: ndata.hWnd %08X, ndata.hIcon = %p\n", ndata.hWnd, ndata.hIcon));
+    dprintf(("VBoxTray: ndata.hWnd %08X, ndata.hIcon = %p\n", ndata.hWnd, ndata.hIcon));
 
     /* Boost thread priority to make sure we wake up early for seamless window notifications (not sure if it actually makes any difference though) */
@@ -457 +457 @@
         dwEventCount = 1;                       
 
-    dprintf(("VBoxService: Number of events to wait in main loop: %ld\n", dwEventCount));
+    dprintf(("VBoxTray: Number of events to wait in main loop: %ld\n", dwEventCount));
 
     while(true)
@@ -464 +464 @@
         waitResult = waitResult - WAIT_OBJECT_0;
 
-        dprintf(("VBoxService: Wait result  = %ld.\n", waitResult));
+        dprintf(("VBoxTray: Wait result  = %ld.\n", waitResult));
 
         if (waitResult == 0)
         {
-            dprintf(("VBoxService: Event 'Exit' triggered.\n"));
+            dprintf(("VBoxTray: Event 'Exit' triggered.\n"));
             /* exit */
             break;
@@ -474 +474 @@
         else if ((waitResult == 1) && (ghSeamlessNotifyEvent!=0))       /* Only jump in, if seamless is active! */
         {
-            dprintf(("VBoxService: Event 'Seamless' triggered.\n"));
+            dprintf(("VBoxTray: Event 'Seamless' triggered.\n"));
 
             /* seamless window notification */
@@ -485 +485 @@
             while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
             {
-                dprintf(("VBoxService: msg %p\n", msg.message));
+                dprintf(("VBoxTray: msg %p\n", msg.message));
                 if (msg.message == WM_QUIT)
                 {
-                    dprintf(("VBoxService: WM_QUIT!\n"));
+                    dprintf(("VBoxTray: WM_QUIT!\n"));
                     SetEvent(gStopSem);
                     continue;
@@ -499 +499 @@
             {
                 fTrayIconCreated = Shell_NotifyIcon(NIM_ADD, &ndata);
-                dprintf(("VBoxService: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
-            }
-        }
-    }
-
-    dprintf(("VBoxService: returned from main loop, exiting...\n"));
+                dprintf(("VBoxTray: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
+            }
+        }
+    }
+
+    dprintf(("VBoxTray: returned from main loop, exiting...\n"));
 
     /* remove the system tray icon */
     Shell_NotifyIcon(NIM_DELETE, &ndata);
 
-    dprintf(("VBoxService: waiting for display change thread...\n"));
+    dprintf(("VBoxTray: waiting for display change thread...\n"));
 
     vboxStopServices (&svcEnv, vboxServiceTable);
 
-    dprintf(("VBoxService: destroying tool window...\n"));
+    dprintf(("VBoxTray: destroying tool window...\n"));
 
     /* destroy the tool window */
@@ -524 +524 @@
     CloseHandle(ghSeamlessNotifyEvent);
 
-    dprintf(("VBoxService: leaving service main function\n"));
+    dprintf(("VBoxTray: leaving service main function\n"));
 
     return;
@@ -546 +546 @@
    }
 
-    dprintf(("VBoxService: Started.\n"));
+    dprintf(("VBoxTray: Started.\n"));
 
     gInstance = hInstance;
     VBoxServiceStart();
 
-    dprintf(("VBoxService: Ended.\n"));
+    dprintf(("VBoxTray: Ended.\n"));
 
     /* Release instance mutex. */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp

@@ -410 +410 @@
                 else
                 {
-                    dprintf(("VBoxService: error from DeviceIoControl IOCTL_VBOXGUEST_VMMREQUEST\n"));
+                    dprintf(("VBoxTray: error from DeviceIoControl IOCTL_VBOXGUEST_VMMREQUEST\n"));
 
                     /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -423 +423 @@
         else
         {
-            dprintf(("VBoxService: error from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */