Changeset 32249 in vbox for trunk

Timestamp:

Sep 6, 2010 12:57:48 PM (14 years ago)

Author:

vboxsync

Message:

VBoxTray: Corrected some logging prefixes.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxClipboard.cpp (modified) (29 diffs)
• VBoxDisplay.cpp (modified) (36 diffs)
• VBoxRestore.cpp (modified) (9 diffs)
• VBoxSeamless.cpp (modified) (23 diffs)
• VBoxTray.cpp (modified) (5 diffs)

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

@@ -67 +67 @@
         while ((format = EnumClipboardFormats (format)) != 0)
         {
-            Log(("vboxClipboardChanged: format = 0x%08X\n", format));
+            Log(("VBoxTray: vboxClipboardChanged: format = 0x%08X\n", format));
             switch (format)
             {
@@ -141 +141 @@
             HWND hwndNext    = (HWND)lParam;
 
-            Log(("vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
+            Log(("VBoxTray: vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
 
             if (hwndRemoved == pCtx->hwndNextInChain)
@@ -164 +164 @@
         case WM_DRAWCLIPBOARD:
         {
-            Log(("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
+            Log(("VBoxTray: vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
             if (GetClipboardOwner () != hwnd)
@@ -172 +172 @@
                 int vboxrc = vboxClipboardChanged(pCtx);
                 if (RT_FAILURE(vboxrc))
-                    Log(("vboxClipboardProcessMsg: vboxClipboardChanged failed, rc = %Rrc\n", vboxrc));
+                    Log(("VBoxTray: vboxClipboardProcessMsg: vboxClipboardChanged failed, rc = %Rrc\n", vboxrc));
             }
 
@@ -209 +209 @@
             UINT format = (UINT)wParam;
 
-            Log(("vboxClipboardProcessMsg: WM_RENDERFORMAT, format = %x\n", format));
+            Log(("VBoxTray: vboxClipboardProcessMsg: WM_RENDERFORMAT, format = %x\n", format));
             switch (format)
             {
@@ -240 +240 @@
             {
                 /* Unsupported clipboard format is requested. */
-                Log(("vboxClipboardProcessMsg: Unsupported clipboard format requested: %ld\n", u32Format));
+                Log(("VBoxTray: vboxClipboardProcessMsg: Unsupported clipboard format requested: %ld\n", u32Format));
                 EmptyClipboard();
             }
@@ -250 +250 @@
                 /* Preallocate a buffer, most of small text transfers will fit into it. */
                 HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, cbPrealloc);
-                Log(("vboxClipboardProcessMsg: Preallocated handle hMem = %p\n", hMem));
+                Log(("VBoxTray: vboxClipboardProcessMsg: Preallocated handle hMem = %p\n", hMem));
 
                 if (hMem)
                 {
                     void *pMem = GlobalLock(hMem);
-                    Log(("vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
+                    Log(("VBoxTray: vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
 
                     if (pMem)
@@ -261 +261 @@
                         /* Read the host data to the preallocated buffer. */
                         int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cbPrealloc, &cb);
-                        Log(("vboxClipboardProcessMsg: VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
+                        Log(("VBoxTray: vboxClipboardProcessMsg: VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
 
                         if (RT_SUCCESS(vboxrc))
@@ -280 +280 @@
                                 /* The preallocated buffer is too small, adjust the size. */
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                Log(("vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
+                                Log(("VBoxTray: vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
 
                                 if (hMem)
                                 {
                                     pMem = GlobalLock(hMem);
-                                    Log(("vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
+                                    Log(("VBoxTray: vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
 
                                     if (pMem)
@@ -292 +292 @@
                                         uint32_t cbNew = 0;
                                         vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cb, &cbNew);
-                                        Log(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
+                                        Log(("VBoxTray: VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
 
                                         if (RT_SUCCESS (vboxrc) && cbNew <= cb)
@@ -345 +345 @@
 
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                Log(("vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
+                                Log(("VBoxTray: vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
 
                                 if (hMem)
@@ -352 +352 @@
                                      * size is 'cb' and format is 'format'. */
                                     HANDLE hClip = SetClipboardData(format, hMem);
-                                    Log(("vboxClipboardProcessMsg: WM_RENDERFORMAT hClip = %p\n", hClip));
+                                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_RENDERFORMAT hClip = %p\n", hClip));
 
                                     if (hClip)
@@ -395 +395 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
+                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
             }
             else
@@ -405 +405 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                 {
-                    Log(("vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
+                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
                     hClip = SetClipboardData(CF_UNICODETEXT, NULL);
                 }
@@ -411 +411 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                 {
-                    Log(("vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
+                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
                     hClip = SetClipboardData(CF_DIB, NULL);
                 }
@@ -418 +418 @@
                 {
                     UINT format = RegisterClipboardFormat ("HTML Format");
-                    Log(("vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
+                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
                     if (format != 0)
                     {
@@ -426 +426 @@
 
                 CloseClipboard();
-                Log(("vboxClipboardProcessMsg: WM_USER: hClip = %p, err = %ld\n", hClip, GetLastError ()));
+                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: hClip = %p, err = %ld\n", hClip, GetLastError ()));
             }
         } break;
@@ -438 +438 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
+                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
             }
             else
@@ -452 +452 @@
                         if (lp != NULL)
                         {
-                            Log(("vboxClipboardProcessMsg: WM_USER + 1: CF_DIB\n"));
+                            Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_DIB\n"));
                             vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
                                                               lp, GlobalSize(hClip));
@@ -473 +473 @@
                         if (uniString != NULL)
                         {
-                            Log(("vboxClipboardProcessMsg: WM_USER + 1: CF_UNICODETEXT\n"));
+                            Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_UNICODETEXT\n"));
                             vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
                                                               uniString, (lstrlenW(uniString) + 1) * 2);
@@ -496 +496 @@
                             if (lp != NULL)
                             {
-                                Log(("vboxClipboardProcessMsg: WM_USER + 1: CF_HTML\n"));
+                                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_HTML\n"));
                                 vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
                                                                   lp, GlobalSize(hClip));
@@ -525 +525 @@
     }
 
-    Log(("vboxClipboardProcessMsg returned with rc = %ld\n", rc));
+    Log(("VBoxTray: vboxClipboardProcessMsg returned with rc = %ld\n", rc));
     return rc;
 }
@@ -576 +576 @@
     }
 
-    Log(("vboxClipboardInit returned with rc = %Rrc\n", rc));
+    Log(("VBoxTray: vboxClipboardInit returned with rc = %Rrc\n", rc));
     return rc;
 }
@@ -610 +610 @@
 int VBoxClipboardInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VboxClipboardInit\n"));
+    Log(("VBoxTray: VboxClipboardInit\n"));
     if (gCtx.pEnv)
     {
@@ -642 +642 @@
 unsigned __stdcall VBoxClipboardThread(void *pInstance)
 {
-    Log(("VBoxClipboardThread\n"));
+    Log(("VBoxTray: VBoxClipboardThread\n"));
 
     VBOXCLIPBOARDCONTEXT *pCtx = (VBOXCLIPBOARDCONTEXT *)pInstance;
@@ -655 +655 @@
         if (RT_FAILURE(rc))
         {
-            Log(("VBoxClipboardThread: Failed to call the driver for host message! rc = %Rrc\n", rc));
+            Log(("VBoxTray: VBoxClipboardThread: Failed to call the driver for host message! rc = %Rrc\n", rc));
             if (rc == VERR_INTERRUPTED)
             {
@@ -672 +672 @@
         else
         {
-            Log(("VBoxClipboardThread: VbglR3ClipboardGetHostMsg u32Msg = %ld, u32Formats = %ld\n", u32Msg, u32Formats));
+            Log(("VBoxTray: VBoxClipboardThread: VbglR3ClipboardGetHostMsg u32Msg = %ld, u32Formats = %ld\n", u32Msg, u32Formats));
             switch (u32Msg)
             {
@@ -697 +697 @@
                 default:
                 {
-                    Log(("VBoxClipboardThread: Unsupported message from host! Message = %ld\n", u32Msg));
+                    Log(("VBoxTray: VBoxClipboardThread: Unsupported message from host! Message = %ld\n", u32Msg));
                 }
             }
@@ -710 +710 @@
     if (pCtx != &gCtx)
     {
-        Log(("VBoxClipboardDestroy: invalid instance %p (our = %p)!\n", pCtx, &gCtx));
+        Log(("VBoxTray: VBoxClipboardDestroy: invalid instance %p (our = %p)!\n", pCtx, &gCtx));
         pCtx = &gCtx;
     }

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

@@ -146 +146 @@
         dispDevice.cb = sizeof(DISPLAY_DEVICE);
 
-        Log(("Checking for active VBox display driver (W2K+)...\n"));
+        Log(("VBoxTray: Checking for active VBox display driver (W2K+)...\n"));
 
         while (EnumDisplayDevices(NULL,
@@ -153 +153 @@
                                   0))
         {
-            Log(("DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+            Log(("VBoxTray: DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
                           devNum,
                           &dispDevice.DeviceName[0],
@@ -163 +163 @@
             if (dispDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
             {
-                Log(("Primary device.\n"));
+                Log(("VBoxTray: Primary device.\n"));
 
                 if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
@@ -185 +185 @@
     else    /* This must be NT 4 or something really old, so don't use EnumDisplayDevices() here  ... */
     {
-        Log(("Checking for active VBox display driver (NT or older)...\n"));
+        Log(("VBoxTray: Checking for active VBox display driver (NT or older)...\n"));
 
         DEVMODE tempDevMode;
@@ -225 +225 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     {
-        Log(("[%d] %s\n", i, DisplayDevice.DeviceName));
+        Log(("VBoxTray: [%d] %s\n", i, DisplayDevice.DeviceName));
 
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
+            Log(("VBoxTray: ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -235 +235 @@
         {
 
-            Log(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
+            Log(("VBoxTray: ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -244 +244 @@
     }
 
-    Log(("ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    Log(("VBoxTray: ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
 
     if (NumDevices == 0 || Id >= NumDevices)
     {
-        Log(("ResizeDisplayDevice: Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        Log(("VBoxTray: ResizeDisplayDevice: Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
         return FALSE;
     }
@@ -266 +266 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     {
-        Log(("ResizeDisplayDevice: [%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
+        Log(("VBoxTray: ResizeDisplayDevice: [%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
 
         BOOL bFetchDevice = FALSE;
@@ -272 +272 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
+            Log(("VBoxTray: ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             DevPrimaryNum = DevNum;
             bFetchDevice = TRUE;
@@ -279 +279 @@
         {
 
-            Log(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
+            Log(("VBoxTray: ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             bFetchDevice = TRUE;
         }
@@ -287 +287 @@
             if (DevNum >= NumDevices)
             {
-                Log(("ResizeDisplayDevice: %d >= %d\n", NumDevices, DevNum));
+                Log(("VBoxTray: ResizeDisplayDevice: %d >= %d\n", NumDevices, DevNum));
                 return FALSE;
             }
@@ -302 +302 @@
                  ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                Log(("ResizeDisplayDevice: EnumDisplaySettings err %d\n", GetLastError ()));
+                Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings err %d\n", GetLastError ()));
                 return FALSE;
             }
@@ -321 +321 @@
                      * Do not return here, ignore the error and set the display info to 0x0x0.
                      */
-                    Log(("EnumDisplaySettings(ENUM_CURRENT_SETTINGS) err %d\n", GetLastError ()));
+                    Log(("VBoxTray: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) err %d\n", GetLastError ()));
                     ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
                 }
             }
 
-            Log(("ResizeDisplayDevice: %dx%dx%d at %d,%d\n",
+            Log(("VBoxTray: ResizeDisplayDevice: %dx%dx%d at %d,%d\n",
                     paDeviceModes[DevNum].dmPelsWidth,
                     paDeviceModes[DevNum].dmPelsHeight,
@@ -366 +366 @@
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
-        Log(("ResizeDisplayDevice: Already at desired resolution.\n"));
+        Log(("VBoxTray: ResizeDisplayDevice: Already at desired resolution.\n"));
         return FALSE;
     }
@@ -374 +374 @@
     for (i = 0; i < NumDevices; i++)
     {
-        Log(("ResizeDisplayDevice: [%d]: %d,%d %dx%d\n",
+        Log(("VBoxTray: ResizeDisplayDevice: [%d]: %d,%d %dx%d\n",
                 i, paRects[i].left, paRects[i].top,
                 paRects[i].right - paRects[i].left,
@@ -390 +390 @@
         tempDevMode.dmSize = sizeof(DEVMODE);
         EnumDisplaySettings((LPSTR)paDisplayDevices[i].DeviceName, 0xffffff, &tempDevMode);
-        Log(("ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
+        Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
     }
 
@@ -413 +413 @@
         }
 
-        Log(("ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
+        Log(("VBoxTray: ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
               gCtx.pfnChangeDisplaySettingsEx,
               paDeviceModes[i].dmPelsWidth,
@@ -423 +423 @@
         LONG status = gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,
                                         &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
-        Log(("ResizeDisplayDevice: ChangeDisplaySettingsEx position status %d, err %d\n", status, GetLastError ()));
+        Log(("VBoxTray: ResizeDisplayDevice: ChangeDisplaySettingsEx position status %d, err %d\n", status, GetLastError ()));
     }
 
     /* A second call to ChangeDisplaySettings updates the monitor. */
     LONG status = gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL, 0, NULL);
-    Log(("ResizeDisplayDevice: ChangeDisplaySettings update status %d\n", status));
+    Log(("VBoxTray: ResizeDisplayDevice: ChangeDisplaySettings update status %d\n", status));
     if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
     {
@@ -455 +455 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxTray: VBoxDisplayThread : DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n"));
+        Log(("VBoxTray: VBoxDisplayThread : DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n"));
         return -1;
     }
@@ -471 +471 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            /*Log(("VBoxDisplayThread : DeviceIOControl succeded\n"));*/
+            /*Log(("VBoxTray: VBoxDisplayThread : DeviceIOControl succeded\n"));*/
 
             if (NULL == pCtx) {
-                Log(("VBoxDisplayThread : Invalid context detected!\n"));
+                Log(("VBoxTray: VBoxDisplayThread : Invalid context detected!\n"));
                 break;
             }
 
             if (NULL == pCtx->pEnv) {
-                Log(("VBoxDisplayThread : Invalid context environment detected!\n"));
+                Log(("VBoxTray: VBoxDisplayThread : Invalid context environment detected!\n"));
                 break;
             }
@@ -487 +487 @@
                 break;
 
-            /*Log(("VBoxDisplayThread : checking event\n"));*/
+            /*Log(("VBoxTray: VBoxDisplayThread : checking event\n"));*/
 
             /* did we get the right event? */
             if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
             {
-                Log(("VBoxDisplayThread : going to get display change information.\n"));
+                Log(("VBoxTray: VBoxDisplayThread : going to get display change information.\n"));
 
                 /* We got at least one event. Read the requested resolution
@@ -522 +522 @@
                     if (fDisplayChangeQueried)
                     {
-                        Log(("VBoxDisplayThread : VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
+                        Log(("VBoxTray: VBoxDisplayThread : VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
 
                         /* Horizontal resolution must be a multiple of 8, round down. */
@@ -534 +534 @@
 
                         if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
-                            Log(("VBoxDisplayThread : Detected WDDM Driver\n"));
+                            Log(("VBoxTray: VBoxDisplayThread : Detected WDDM Driver\n"));
 
                         if (enmDriverType != VBOXDISPLAY_DRIVER_TYPE_UNKNOWN)
@@ -541 +541 @@
 #endif
                         {
-                            Log(("VBoxDisplayThread : Display driver is active!\n"));
+                            Log(("VBoxTray: VBoxDisplayThread : Display driver is active!\n"));
 
                             if (pCtx->pfnChangeDisplaySettingsEx != 0)
                             {
-                                Log(("VBoxDisplayThread : Detected W2K or later.\n"));
+                                Log(("VBoxTray: VBoxDisplayThread : Detected W2K or later.\n"));
 
 #ifdef  VBOXWDDM
@@ -557 +557 @@
                                     if (err == NO_ERROR)
                                     {
-                                        Log(("VBoxDisplayThread : VBoxDispIfResize succeeded\n"));
+                                        Log(("VBoxTray: VBoxDisplayThread : VBoxDispIfResize succeeded\n"));
                                         break;
                                     }
-                                    Log(("VBoxDisplayThread : VBoxDispIfResize failed err(%d)\n", err));
+                                    Log(("VBoxTray: VBoxDisplayThread : VBoxDispIfResize failed err(%d)\n", err));
                                 }
 #endif
@@ -575 +575 @@
                             else
                             {
-                                Log(("VBoxDisplayThread : Detected NT.\n"));
+                                Log(("VBoxTray: VBoxDisplayThread : Detected NT.\n"));
 
                                 /* Single monitor NT. */
@@ -585 +585 @@
                                 if (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode))
                                 {
-                                    Log(("VBoxDisplayThread : Current mode: %dx%dx%d at %d,%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y));
+                                    Log(("VBoxTray: VBoxDisplayThread : Current mode: %dx%dx%d at %d,%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y));
 
                                     /* Check whether a mode reset or a change is requested. */
@@ -603 +603 @@
                                     {
                                         /* All zero values means a forced mode reset. Do nothing. */
-                                        Log(("VBoxDisplayThread : Forced mode reset.\n"));
+                                        Log(("VBoxTray: VBoxDisplayThread : Forced mode reset.\n"));
                                     }
 
@@ -611 +611 @@
                                         && devMode.dmBitsPerPel == displayChangeRequest.bpp)
                                     {
-                                        Log(("VBoxDisplayThread : already at desired resolution.\n"));
+                                        Log(("VBoxTray: VBoxDisplayThread : already at desired resolution.\n"));
                                         break;
                                     }
@@ -629 +629 @@
                                         devMode.dmBitsPerPel = displayChangeRequest.bpp;
 
-                                    Log(("VBoxDisplayThread : setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
+                                    Log(("VBoxTray: VBoxDisplayThread : setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
 
                                     /* set the new mode */
@@ -635 +635 @@
                                     if (status != DISP_CHANGE_SUCCESSFUL)
                                     {
-                                        Log(("VBoxDisplayThread : error from ChangeDisplaySettings: %d\n", status));
+                                        Log(("VBoxTray: VBoxDisplayThread : error from ChangeDisplaySettings: %d\n", status));
 
                                         if (status == DISP_CHANGE_BADMODE)
@@ -651 +651 @@
                                 else
                                 {
-                                    Log(("VBoxDisplayThread : error from EnumDisplaySettings: %d\n", GetLastError ()));
+                                    Log(("VBoxTray: VBoxDisplayThread : error from EnumDisplaySettings: %d\n", GetLastError ()));
                                     break;
                                 }
@@ -658 +658 @@
                         else
                         {
-                            Log(("VBoxDisplayThread : vboxDisplayDriver is not active.\n"));
+                            Log(("VBoxTray: VBoxDisplayThread : vboxDisplayDriver is not active.\n"));
                         }
 
@@ -671 +671 @@
                     else
                     {
-                        Log(("VBoxDisplayThread : error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                        Log(("VBoxTray: VBoxDisplayThread : error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                         /* sleep a bit to not eat too much CPU while retrying */
                         /* are we supposed to stop? */
@@ -686 +686 @@
         } else
         {
-            Log(("VBoxDisplayThread : error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxTray: VBoxDisplayThread : error 0 from DeviceIoControl VBOXGUEST_IOCTL_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)
@@ -700 +700 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxTray: VBoxDisplayThread : DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    Log(("VBoxDisplayThread : finished display change request thread\n"));
+        Log(("VBoxTray: VBoxDisplayThread : DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    Log(("VBoxTray: VBoxDisplayThread : finished display change request thread\n"));
     return 0;
 }

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

@@ -38 +38 @@
 int VBoxRestoreInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxRestoreInit\n"));
+    Log(("VBoxTray: VBoxRestoreInit\n"));
 
     gCtx.pEnv      = pEnv;
@@ -53 +53 @@
 void VBoxRestoreDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    Log(("VBoxRestoreDestroy\n"));
+    Log(("VBoxTray: VBoxRestoreDestroy\n"));
     return;
 }
@@ -71 +71 @@
     /* send to display driver */
     ret = VBoxDispIfEscape(&gCtx.pEnv->dispIf, &escape, 0);
-    Log(("VBoxRestoreSession -> VRDP activate state = %d\n", ret));
+    Log(("VBoxTray: VBoxRestoreSession -> VRDP activate state = %d\n", ret));
 
     if (ret != gCtx.fRDPState)
@@ -79 +79 @@
         if (!DeviceIoControl (gCtx.pEnv->hDriver, ret == NO_ERROR ? VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION : VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
         {
-            Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+            Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         }
         gCtx.fRDPState = ret;
@@ -101 +101 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+        Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         return 0;
     }
@@ -117 +117 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            Log(("VBoxRestoreThread: DeviceIOControl succeded\n"));
+            Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -123 +123 @@
                 break;
 
-            Log(("VBoxRestoreThread: checking event\n"));
+            Log(("VBoxTray: VBoxRestoreThread: checking event\n"));
 
             /* did we get the right event? */
@@ -134 +134 @@
         else
         {
-            Log(("VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxTray: VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -150 +150 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed\n"));
+        Log(("VBoxTray: VBoxRestoreThread: DeviceIOControl(CtlMask) failed\n"));
     }
 
-    Log(("VBoxRestoreThread: finished seamless change request thread\n"));
+    Log(("VBoxTray: VBoxRestoreThread: finished seamless change request thread\n"));
     return 0;
 }

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

@@ -52 +52 @@
 int VBoxSeamlessInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxSeamlessInit\n"));
+    Log(("VBoxTray: VBoxSeamlessInit\n"));
 
     *pfStartThread = false;
@@ -65 +65 @@
     if (OSinfo.dwMajorVersion <= 4)         /* Windows NT 4.0 or older */
     {
-        Log(("VBoxSeamlessInit: Windows NT 4.0 or older not supported!\n"));
+        Log(("VBoxTray: VBoxSeamlessInit: Windows NT 4.0 or older not supported!\n"));
         return VERR_NOT_SUPPORTED;
     }
@@ -85 +85 @@
                              &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
         {
-            Log(("VBoxSeamlessInit: VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
+            Log(("VBoxTray: VBoxSeamlessInit: VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
             return VERR_INVALID_PARAMETER;
         }
@@ -95 +95 @@
     else
     {
-        Log(("VBoxSeamlessInit: LoadLibrary failed with %d\n", GetLastError()));
+        Log(("VBoxTray: VBoxSeamlessInit: LoadLibrary failed with %d\n", GetLastError()));
         return VERR_INVALID_PARAMETER;
     }
@@ -105 +105 @@
 void VBoxSeamlessDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    Log(("VBoxSeamlessDestroy\n"));
+    Log(("VBoxTray: VBoxSeamlessDestroy\n"));
     /* inform the host that we no longer support the seamless window mode */
     VMMDevReqGuestCapabilities vmmreqGuestCaps = {0};
@@ -115 +115 @@
                          &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
     {
-        Log(("VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
+        Log(("VBoxTray: VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
     }
 
@@ -161 +161 @@
         return TRUE;
 
-    Log(("VBoxEnumFunc %x\n", hwnd));
+    Log(("VBoxTray: VBoxEnumFunc %x\n", hwnd));
     /* Only visible windows that are present on the desktop are interesting here */
 #ifndef MMSEAMLESS
@@ -182 +182 @@
             && dwExStyle == (WS_EX_LAYERED|WS_EX_TOOLWINDOW|WS_EX_TRANSPARENT|WS_EX_TOPMOST))
         {
-            Log(("Filter out shadow window style=%x exstyle=%x\n", dwStyle, dwExStyle));
+            Log(("VBoxTray: Filter out shadow window style=%x exstyle=%x\n", dwStyle, dwExStyle));
             return TRUE;
         }
@@ -189 +189 @@
         if (strcmp(szWindowText, "Program Manager"))
         {
-            Log(("Enum hwnd=%x rect (%d,%d) (%d,%d)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
-            Log(("title=%s style=%x exStyle=%x\n", szWindowText, dwStyle, dwExStyle));
+            Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+            Log(("VBoxTray: title=%s style=%x exStyle=%x\n", szWindowText, dwStyle, dwExStyle));
 
             HRGN hrgn = CreateRectRgn(0,0,0,0);
@@ -198 +198 @@
             if (ret == ERROR)
             {
-                Log(("GetWindowRgn failed with rc=%d\n", GetLastError()));
+                Log(("VBoxTray: GetWindowRgn failed with rc=%d\n", GetLastError()));
                 SetRectRgn(hrgn, rectVisible.left, rectVisible.top, rectVisible.right, rectVisible.bottom);
             }
@@ -217 +217 @@
         else
         {
-            Log(("Enum hwnd=%x rect (%d,%d) (%d,%d) (ignored)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
-            Log(("title=%s style=%x\n", szWindowText, dwStyle));
+            Log(("VBoxTray: Enum hwnd=%x rect (%d,%d) (%d,%d) (ignored)\n", hwnd, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+            Log(("VBoxTray: title=%s style=%x\n", szWindowText, dwStyle));
         }
     }
@@ -233 +233 @@
 #ifndef MMSEAMLESS
     GetWindowRect(GetDesktopWindow(), &param.rect);
-    Log(("VBoxRecheckVisibleWindows desktop=%x rect (%d,%d) (%d,%d)\n", GetDesktopWindow(), param.rect.left, param.rect.top, param.rect.right, param.rect.bottom));
+    Log(("VBoxTray: VBoxRecheckVisibleWindows desktop=%x rect (%d,%d) (%d,%d)\n", GetDesktopWindow(), param.rect.left, param.rect.top, param.rect.right, param.rect.bottom));
 #endif
     EnumWindows(VBoxEnumFunc, (LPARAM)&param);
@@ -255 +255 @@
 #ifdef DEBUG
                     RECT *lpRect = (RECT *)&lpRgnData->Buffer[0];
-                    Log(("New visible region: \n"));
+                    Log(("VBoxTray: New visible region: \n"));
 
                     for (DWORD i=0;i<lpRgnData->rdh.nCount;i++)
                     {
-                        Log(("visible rect (%d,%d)(%d,%d)\n", lpRect[i].left, lpRect[i].top, lpRect[i].right, lpRect[i].bottom));
+                        Log(("VBoxTray: visible rect (%d,%d)(%d,%d)\n", lpRect[i].left, lpRect[i].top, lpRect[i].right, lpRect[i].bottom));
                     }
 #endif
@@ -275 +275 @@
                     }
                     else
-                        Log(("Visible rectangles haven't changed; ignore\n"));
+                        Log(("VBoxTray: Visible rectangles haven't changed; ignore\n"));
                 }
                 if (lpEscapeData != gCtx.lpEscapeData)
@@ -305 +305 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxSeamlessThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxTray: VBoxSeamlessThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        Log(("VBoxSeamlessThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+        Log(("VBoxTray: VBoxSeamlessThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         return 0;
     }
@@ -321 +321 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            Log(("VBoxSeamlessThread: DeviceIOControl succeded\n"));
+            Log(("VBoxTray: VBoxSeamlessThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -327 +327 @@
                 break;
 
-            Log(("VBoxSeamlessThread: checking event\n"));
+            Log(("VBoxTray: VBoxSeamlessThread: checking event\n"));
 
             /* did we get the right event? */
             if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST)
             {
-                Log(("VBoxTray: going to get seamless change information.\n"));
+                Log(("VBoxTray: VBoxTray: going to get seamless change information.\n"));
 
                 /* We got at least one event. Read the requested resolution
@@ -349 +349 @@
                     if (fSeamlessChangeQueried)
                     {
-                        Log(("VBoxSeamlessThread: mode change to %d\n", seamlessChangeRequest.mode));
+                        Log(("VBoxTray: VBoxSeamlessThread: mode change to %d\n", seamlessChangeRequest.mode));
 
                         switch(seamlessChangeRequest.mode)
@@ -356 +356 @@
                             if (fWasScreenSaverActive)
                             {
-                                Log(("Re-enabling the screensaver\n"));
+                                Log(("VBoxTray: Re-enabling the screensaver\n"));
                                 ret = SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0);
                                 if (!ret)
-                                    Log(("SystemParametersInfo SPI_SETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
+                                    Log(("VBoxTray: SystemParametersInfo SPI_SETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
                             }
                             PostMessage(gToolWindow, WM_VBOX_REMOVE_SEAMLESS_HOOK, 0, 0);
@@ -367 +367 @@
                             ret = SystemParametersInfo(SPI_GETSCREENSAVEACTIVE, 0, &fWasScreenSaverActive, 0);
                             if (!ret)
-                                Log(("SystemParametersInfo SPI_GETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
+                                Log(("VBoxTray: SystemParametersInfo SPI_GETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
 
                             if (fWasScreenSaverActive)
-                                Log(("Disabling the screensaver\n"));
+                                Log(("VBoxTray: Disabling the screensaver\n"));
 
                             ret = SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0);
                             if (!ret)
-                                Log(("SystemParametersInfo SPI_SETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
+                                Log(("VBoxTray: SystemParametersInfo SPI_SETSCREENSAVEACTIVE failed with %d\n", GetLastError()));
                             PostMessage(gToolWindow, WM_VBOX_INSTALL_SEAMLESS_HOOK, 0, 0);
                             break;
@@ -389 +389 @@
                     else
                     {
-                        Log(("VBoxSeamlessThread: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                        Log(("VBoxTray: VBoxSeamlessThread: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                     }
                     /* sleep a bit to not eat too much CPU while retrying */
@@ -403 +403 @@
         else
         {
-            Log(("VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxTray: VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_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)
@@ -418 +418 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxSeamlessThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxTray: VBoxSeamlessThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        Log(("VBoxSeamlessThread: DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    Log(("VBoxSeamlessThread: finished seamless change request thread\n"));
+        Log(("VBoxTray: VBoxSeamlessThread: DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    Log(("VBoxTray: VBoxSeamlessThread: finished seamless change request thread\n"));
     return 0;
 }

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

@@ -93 +93 @@
     if (hIcon == NULL)
     {
-        Log(("Could not load tray icon, err %08X\n", GetLastError()));
+        Log(("VBoxTray: Could not load tray icon, err %08X\n", GetLastError()));
         return FALSE;
     }
@@ -112 +112 @@
     if (!fCreated)
     {
-        Log(("Could not create tray icon, err %08X\n", GetLastError()));
+        Log(("VBoxTray: Could not create tray icon, err %08X\n", GetLastError()));
         RT_ZERO(gNotifyIconData);
     }
@@ -152 +152 @@
     while (pTable->pszName)
     {
-        Log(("Starting %s...\n", pTable->pszName));
+        Log(("VBoxTray: Starting %s...\n", pTable->pszName));
 
         int rc = VINF_SUCCESS;
@@ -169 +169 @@
         if (RT_FAILURE (rc))
         {
-            Log(("Failed to initialize rc = %Rrc.\n", rc));
+            Log(("VBoxTray: Failed to initialize rc = %Rrc.\n", rc));
         }
         else
@@ -192 +192 @@
             if (RT_FAILURE (rc))
             {
-                Log(("Failed to start the thread.\n"));
+                Log(("VBoxTray: Failed to start the thread.\n"));
 
                 if (pTable->pfnDestroy)