Changeset 10777 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 21, 2008 2:17:40 PM (17 years ago)

Author:

vboxsync

Message:

Windows VBoxService: Getting rid of custom logging routines; now using the R3 guest lib.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxClipboard.cpp (modified) (27 diffs)
• VBoxDisplay.cpp (modified) (33 diffs)
• VBoxMemBalloon.cpp (modified) (8 diffs)
• VBoxRestore.cpp (modified) (9 diffs)
• VBoxSeamless.cpp (modified) (23 diffs)
• VBoxStatistics.cpp (modified) (13 diffs)
• VBoxTray.cpp (modified) (24 diffs)
• VBoxTray.h (modified) (1 diff)
• VBoxVRDP.cpp (modified) (15 diffs)
• helpers.h (modified) (1 diff)

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

@@ -214 +214 @@
             rc = VBoxHGCMParmUInt32Get (&parms.size, &u32Size);
 
-            dprintf (("vboxClipboardReadData: actual size = %d, rc = %d\n", u32Size, rc));
+            Log (("vboxClipboardReadData: actual size = %d, rc = %d\n", u32Size, rc));
 
             if (VBOX_SUCCESS (rc))
@@ -234 +234 @@
 //    if (vboxClipboardIsSameAsLastSent (pCtx, u32Format, pv, cb))
 //    {
-//        dprintf (("vboxClipboardWriteData: The data to be sent are the same as the last sent.\n"));
+//        Log (("vboxClipboardWriteData: The data to be sent are the same as the last sent.\n"));
 //        return VINF_SUCCESS;
 //    }
@@ -266 +266 @@
         while ((format = EnumClipboardFormats (format)) != 0)
         {
-            dprintf (("vboxClipboardChanged: format 0x%08X\n", format));
+            Log (("vboxClipboardChanged: format 0x%08X\n", format));
             switch (format)
             {
@@ -315 +315 @@
             HWND hwndNext    = (HWND)lParam;
 
-            dprintf (("vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
+            Log (("vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
 
             if (hwndRemoved == pCtx->hwndNextInChain)
@@ -336 +336 @@
         case WM_DRAWCLIPBOARD:
         {
-            dprintf (("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
+            Log (("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
             if (GetClipboardOwner () != hwnd)
@@ -360 +360 @@
             UINT format = (UINT)wParam;
 
-            dprintf (("vboxClipboardProcessMsg: WM_RENDERFORMAT, format %x\n", format));
+            Log (("vboxClipboardProcessMsg: WM_RENDERFORMAT, format %x\n", format));
             
             switch (format)
@@ -402 +402 @@
                 /* Preallocate a buffer, most of small text transfers will fit into it. */
                 HANDLE hMem = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, cbPrealloc);
-                dprintf(("hMem %p\n", hMem));
+                Log(("hMem %p\n", hMem));
 
                 if (hMem)
                 {
                     void *pMem = GlobalLock (hMem);
-                    dprintf(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
+                    Log(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
 
                     if (pMem)
@@ -413 +413 @@
                         /* Read the host data to the preallocated buffer. */
                         int vboxrc = vboxClipboardReadData (pCtx, u32Format, pMem, cbPrealloc, &cb);
-                        dprintf(("vboxClipboardReadData vboxrc %d\n",  vboxrc));
+                        Log(("vboxClipboardReadData vboxrc %d\n",  vboxrc));
 
                         if (VBOX_SUCCESS (rc))
@@ -423 +423 @@
                                 /* The preallocated buffer is too small, adjust the size. */
                                 hMem = GlobalReAlloc (hMem, cb, 0);
-                                dprintf(("hMem %p\n", hMem));
+                                Log(("hMem %p\n", hMem));
                                 
                                 if (hMem)
                                 {
                                     pMem = GlobalLock (hMem);
-                                    dprintf(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
+                                    Log(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
 
                                     if (pMem)
@@ -435 +435 @@
                                         uint32_t cbNew = 0;
                                         vboxrc = vboxClipboardReadData (pCtx, u32Format, pMem, cb, &cbNew);
-                                        dprintf(("vboxClipboardReadData vboxrc %d, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
+                                        Log(("vboxClipboardReadData vboxrc %d, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
 
                                         if (VBOX_SUCCESS (vboxrc) && cbNew <= cb)
@@ -468 +468 @@
                                 
                                 hMem = GlobalReAlloc (hMem, cb, 0);
-                                dprintf(("hMem %p\n", hMem));
+                                Log(("hMem %p\n", hMem));
                                 
                                 if (hMem)
@@ -476 +476 @@
                                      */
                                     HANDLE hClip = SetClipboardData (format, hMem);
-                                    dprintf(("WM_RENDERFORMAT hClip %p\n", hClip));
+                                    Log(("WM_RENDERFORMAT hClip %p\n", hClip));
 
                                     if (hClip)
@@ -532 +532 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                 {
-                    dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
+                    Log(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
                     
                     hClip = SetClipboardData (CF_UNICODETEXT, NULL);
@@ -539 +539 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                 {
-                    dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
+                    Log(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
                     
                     hClip = SetClipboardData (CF_DIB, NULL);
@@ -547 +547 @@
                 {
                     UINT format = RegisterClipboardFormat ("HTML Format");
-                    dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
+                    Log(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
                     if (format != 0)
                     {
@@ -556 +556 @@
                 CloseClipboard();
 
-                dprintf(("window proc WM_USER: hClip %p, err %d\n", hClip, GetLastError ()));
+                Log(("window proc WM_USER: hClip %p, err %d\n", hClip, GetLastError ()));
             }
             else
             {
-                dprintf(("window proc WM_USER: failed to open clipboard\n"));
+                Log(("window proc WM_USER: failed to open clipboard\n"));
             }
         } break;
@@ -583 +583 @@
                         if (lp != NULL)
                         {
-                            dprintf(("CF_DIB\n"));
+                            Log(("CF_DIB\n"));
 
                             vboxClipboardWriteData (pCtx, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
@@ -606 +606 @@
                         if (uniString != NULL)
                         {
-                            dprintf(("CF_UNICODETEXT\n"));
+                            Log(("CF_UNICODETEXT\n"));
 
                             vboxClipboardWriteData (pCtx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
@@ -633 +633 @@
                             if (lp != NULL)
                             {
-                                dprintf(("CF_HTML\n"));
+                                Log(("CF_HTML\n"));
 
                                 vboxClipboardWriteData (pCtx, VBOX_SHARED_CLIPBOARD_FMT_HTML,
@@ -748 +748 @@
     int rc = VINF_SUCCESS;
 
-    dprintf (("VboxClipboardInit\n"));
+    Log (("VboxClipboardInit\n"));
 
     if (gCtx.pEnv)
@@ -766 +766 @@
         rc = vboxClipboardInit (&gCtx);
 
-        dprintf (("vboxClipboardInit: rc = %d\n", rc));
+        Log (("vboxClipboardInit: rc = %d\n", rc));
 
         if (VBOX_SUCCESS (rc))
@@ -791 +791 @@
     VBOXCLIPBOARDCONTEXT *pCtx = (VBOXCLIPBOARDCONTEXT *)pInstance;
 
-    dprintf(("VBoxClipboardThread\n"));
+    Log(("VBoxClipboardThread\n"));
     
     /* Open the new driver instance to not interfere with other callers. */
@@ -821 +821 @@
                               NULL))
         {
-            dprintf(("Failed to call the driver for host message.\n"));
+            Log(("Failed to call the driver for host message.\n"));
 
             /* Wait a bit before retrying. */
@@ -847 +847 @@
                 if (VBOX_SUCCESS (rc))
                 {
-                    dprintf(("vboxClipboardHostEvent u32Msg %d, u32Formats %d\n", u32Msg, u32Formats));
+                    Log(("vboxClipboardHostEvent u32Msg %d, u32Formats %d\n", u32Msg, u32Formats));
     
                     switch (u32Msg)
@@ -873 +873 @@
                         default:
                         {
-                            dprintf(("Unsupported message from host!!!"));
+                            Log(("Unsupported message from host!!!"));
                         }
                     }
@@ -898 +898 @@
         }
 
-        dprintf(("processed host event rc = %d\n", rc));
+        Log(("processed host event rc = %d\n", rc));
     }
     
@@ -912 +912 @@
     if (pCtx != &gCtx)
     {
-        dprintf(("VBoxClipboardDestroy: invalid instance %p (our %p)!!!\n", pCtx, &gCtx));
+        Log(("VBoxClipboardDestroy: invalid instance %p (our %p)!!!\n", pCtx, &gCtx));
 
         pCtx = &gCtx;

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

@@ -57 +57 @@
     if (NULL == hUser)
     {
-        dprintf(("VBoxTray: Could not get module handle of USER32.DLL!\n"));
+        Log(("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(("VBoxTray: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
+        Log(("VBoxTray: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
 
         *(uintptr_t *)&gCtx.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA"); 
-        dprintf(("VBoxTray: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
+        Log(("VBoxTray: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
     }
     else if (OSinfo.dwMajorVersion <= 4)            /* Windows NT 4.0 */
@@ -74 +74 @@
     else                                /* Unsupported platform */
     {
-        dprintf(("VBoxTray: Warning, display for platform not handled yet!\n"));
+        Log(("VBoxTray: Warning, display for platform not handled yet!\n"));
         return VERR_NOT_IMPLEMENTED; 
     }
 
-    dprintf(("VBoxTray: Display init successful.\n"));
+    Log(("VBoxTray: Display init successful.\n"));
 
     *pfStartThread = true;
@@ -101 +101 @@
         dispDevice.cb = sizeof(DISPLAY_DEVICE);
 
-        dprintf(("Checking for active VBox display driver (W2K+)...\n"));
+        Log(("Checking for active VBox display driver (W2K+)...\n"));
 
         while (EnumDisplayDevices(NULL,
@@ -108 +108 @@
                                   0))
         {
-            dprintf(("DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+            Log(("DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
                           devNum,
                           &dispDevice.DeviceName[0],
@@ -118 +118 @@
             if (dispDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
             {
-                dprintf(("Primary device.\n"));
+                Log(("Primary device.\n"));
     
                 if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
@@ -135 +135 @@
     else    /* This must be NT 4 or something really old, so don't use EnumDisplayDevices() here  ... */
     {       
-        dprintf(("Checking for active VBox display driver (NT or older)...\n"));
+        Log(("Checking for active VBox display driver (NT or older)...\n"));
 
         DEVMODE tempDevMode;
@@ -165 +165 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     { 
-        dprintf(("[%d] %s\n", i, DisplayDevice.DeviceName));
+        Log(("[%d] %s\n", i, DisplayDevice.DeviceName));
 
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            dprintf(("Found primary device. err %d\n", GetLastError ()));
+            Log(("Found primary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -175 +175 @@
         {
             
-            dprintf(("Found secondary device. err %d\n", GetLastError ()));
+            Log(("Found secondary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -184 +184 @@
     }
     
-    dprintf(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    Log(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
     
     if (NumDevices == 0 || Id >= NumDevices)
     {
-        dprintf(("Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        Log(("Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
         return FALSE;
     }
@@ -206 +206 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     { 
-        dprintf(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
+        Log(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
         
         BOOL bFetchDevice = FALSE;
@@ -212 +212 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            dprintf(("Found primary device. err %d\n", GetLastError ()));
+            Log(("Found primary device. err %d\n", GetLastError ()));
             DevPrimaryNum = DevNum;
             bFetchDevice = TRUE;
@@ -219 +219 @@
         {
             
-            dprintf(("Found secondary device. err %d\n", GetLastError ()));
+            Log(("Found secondary device. err %d\n", GetLastError ()));
             bFetchDevice = TRUE;
         }
@@ -227 +227 @@
             if (DevNum >= NumDevices)
             {
-                dprintf(("%d >= %d\n", NumDevices, DevNum));
+                Log(("%d >= %d\n", NumDevices, DevNum));
                 return FALSE;
             }
@@ -238 +238 @@
                  ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                dprintf(("EnumDisplaySettings err %d\n", GetLastError ()));
+                Log(("EnumDisplaySettings err %d\n", GetLastError ()));
                 return FALSE;
             }
             
-            dprintf(("%dx%d at %d,%d\n",
+            Log(("%dx%d at %d,%d\n",
                     paDeviceModes[DevNum].dmPelsWidth,
                     paDeviceModes[DevNum].dmPelsHeight,
@@ -281 +281 @@
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
-        dprintf(("VBoxDisplayThread : already at desired resolution.\n"));
+        Log(("VBoxDisplayThread : already at desired resolution.\n"));
         return FALSE;
     }
 
     resizeRect(paRects, NumDevices, DevPrimaryNum, Id, Width, Height);
-#ifdef dprintf
+#ifdef Log
     for (i = 0; i < NumDevices; i++)
     {
-        dprintf(("[%d]: %d,%d %dx%d\n",
+        Log(("[%d]: %d,%d %dx%d\n",
                 i, paRects[i].left, paRects[i].top,
                 paRects[i].right - paRects[i].left,
                 paRects[i].bottom - paRects[i].top));
     }
-#endif /* dprintf */
+#endif /* Log */
     
     /* Without this, Windows will not ask the miniport for its
@@ -321 +321 @@
         }
 
-        dprintf(("calling pfnChangeDisplaySettingsEx %x\n", gCtx.pfnChangeDisplaySettingsEx));     
+        Log(("calling pfnChangeDisplaySettingsEx %x\n", gCtx.pfnChangeDisplaySettingsEx));     
 
         gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
                                         &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL); 
 
-        dprintf(("ChangeDisplaySettings position err %d\n", GetLastError ()));
+        Log(("ChangeDisplaySettings position err %d\n", GetLastError ()));
     }
     
     /* A second call to ChangeDisplaySettings updates the monitor. */
     LONG status = ChangeDisplaySettings(NULL, 0); 
-    dprintf(("ChangeDisplaySettings update status %d\n", status));
+    Log(("ChangeDisplaySettings update status %d\n", status));
     if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
     {
@@ -358 +358 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n"));
+        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n"));
         return -1;
     }
@@ -374 +374 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            dprintf(("VBoxDisplayThread : DeviceIOControl succeded\n"));
+            Log(("VBoxDisplayThread : DeviceIOControl succeded\n"));
 
             if (NULL == pCtx) {
-                dprintf(("VBoxDisplayThread : Invalid context detected!\n"));
+                Log(("VBoxDisplayThread : Invalid context detected!\n"));
                 break;
             }
 
             if (NULL == pCtx->pEnv) {
-                dprintf(("VBoxDisplayThread : Invalid context environment detected!\n"));
+                Log(("VBoxDisplayThread : Invalid context environment detected!\n"));
                 break;
             }
@@ -390 +390 @@
                 break;
 
-            dprintf(("VBoxDisplayThread : checking event\n"));
+            Log(("VBoxDisplayThread : checking event\n"));
 
             /* did we get the right event? */
             if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
             {
-                dprintf(("VBoxDisplayThread : going to get display change information.\n"));
+                Log(("VBoxDisplayThread : going to get display change information.\n"));
 
                 /* We got at least one event. Read the requested resolution
@@ -425 +425 @@
                     if (fDisplayChangeQueried)
                     {
-                        dprintf(("VBoxDisplayThread : VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
+                        Log(("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. */
@@ -435 +435 @@
                         if (isVBoxDisplayDriverActive (pCtx))
                         {
-                            dprintf(("VBoxDisplayThread : Display driver is active!\n"));
+                            Log(("VBoxDisplayThread : Display driver is active!\n"));
 
                             if (pCtx->pfnChangeDisplaySettingsEx != 0)
                             {
-                                dprintf(("VBoxDisplayThread : Detected W2K or later."));
+                                Log(("VBoxDisplayThread : Detected W2K or later."));
 
                                 /* W2K or later. */
@@ -452 +452 @@
                             else
                             {
-                                dprintf(("VBoxDisplayThread : Detected NT.\n"));
+                                Log(("VBoxDisplayThread : Detected NT.\n"));
 
                                 /* Single monitor NT. */
@@ -462 +462 @@
                                 if (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode))
                                 {
-                                    dprintf(("VBoxDisplayThread : Current mode: %dx%dx%d at %d,%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y));
+                                    Log(("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. */
@@ -480 +480 @@
                                     {
                                         /* All zero values means a forced mode reset. Do nothing. */
-                                        dprintf(("VBoxDisplayThread : Forced mode reset.\n"));
+                                        Log(("VBoxDisplayThread : Forced mode reset.\n"));
                                     }
 
@@ -488 +488 @@
                                         && devMode.dmBitsPerPel == displayChangeRequest.bpp)
                                     {
-                                        dprintf(("VBoxDisplayThread : already at desired resolution.\n"));
+                                        Log(("VBoxDisplayThread : already at desired resolution.\n"));
                                         break;
                                     }
@@ -506 +506 @@
                                         devMode.dmBitsPerPel = displayChangeRequest.bpp;
 
-                                    dprintf(("VBoxDisplayThread : setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
+                                    Log(("VBoxDisplayThread : setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
 
                                     /* set the new mode */
@@ -512 +512 @@
                                     if (status != DISP_CHANGE_SUCCESSFUL)
                                     {
-                                        dprintf(("VBoxDisplayThread : error from ChangeDisplaySettings: %d\n", status));
+                                        Log(("VBoxDisplayThread : error from ChangeDisplaySettings: %d\n", status));
 
                                         if (status == DISP_CHANGE_BADMODE)
@@ -528 +528 @@
                                 else
                                 {
-                                    dprintf(("VBoxDisplayThread : error from EnumDisplaySettings: %d\n", GetLastError ()));
+                                    Log(("VBoxDisplayThread : error from EnumDisplaySettings: %d\n", GetLastError ()));
                                     break;
                                 }
@@ -535 +535 @@
                         else
                         {
-                            dprintf(("VBoxDisplayThread : vboxDisplayDriver is not active.\n"));
+                            Log(("VBoxDisplayThread : vboxDisplayDriver is not active.\n"));
                         }
 
@@ -548 +548 @@
                     else
                     {
-                        dprintf(("VBoxDisplayThread : error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                        Log(("VBoxDisplayThread : error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                         /* sleep a bit to not eat too much CPU while retrying */
                         /* are we supposed to stop? */
@@ -561 +561 @@
         } else
         {
-            dprintf(("VBoxDisplayThread : error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("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)
@@ -575 +575 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    dprintf(("VBoxDisplayThread : finished display change request thread\n"));
+        Log(("VBoxDisplayThread : DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    Log(("VBoxDisplayThread : finished display change request thread\n"));
     return 0;
 }

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

@@ -47 +47 @@
     DWORD  cbReturned;
 
-    dprintf(("VBoxMemBalloonInit\n"));
+    Log(("VBoxMemBalloonInit: Init\n"));
 
     gCtx.pEnv                   = pEnv;
@@ -56 +56 @@
     if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
     {
-        dprintf(("VBoxMemBalloonInit: new balloon size %d MB\n", dwMemBalloonSize));
+        Log(("VBoxMemBalloonInit: new balloon size %d MB\n", dwMemBalloonSize));
         gCtx.uMemBalloonSize = dwMemBalloonSize;
     }
     else
-        dprintf(("VBoxMemBalloonInit: DeviceIoControl (balloon) failed with %d\n", GetLastError()));
+        Log(("VBoxMemBalloonInit: DeviceIoControl (balloon) failed with %d\n", GetLastError()));
 
     *pfStartThread = true;
@@ -70 +70 @@
 void VBoxMemBalloonDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    dprintf(("VBoxMemBalloonDestroy\n"));
+    Log(("VBoxMemBalloonDestroy\n"));
     return;
 }
@@ -95 +95 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+        Log(("VBoxMemBalloonThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         return 0;
     }
@@ -111 +111 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            dprintf(("VBoxMemBalloonThread: DeviceIOControl succeded\n"));
+            Log(("VBoxMemBalloonThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -117 +117 @@
                 break;
 
-            dprintf(("VBoxMemBalloonThread: checking event\n"));
+            Log(("VBoxMemBalloonThread: checking event\n"));
 
             /* did we get the right event? */
@@ -125 +125 @@
                 if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
                 {
-                    dprintf(("VBoxMemBalloonThread: new balloon size % MB\n", dwMemBalloonSize));
+                    Log(("VBoxMemBalloonThread: new balloon size % MB\n", dwMemBalloonSize));
                     pCtx->uMemBalloonSize = dwMemBalloonSize;
                 }
                 else
-                    dprintf(("VBoxMemBalloonThread: DeviceIoControl (balloon) failed with %d\n", GetLastError()));
+                    Log(("VBoxMemBalloonThread: DeviceIoControl (balloon) failed with %d\n", GetLastError()));
             }
         } 
         else
         {
-            dprintf(("VBoxMemBalloonThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxMemBalloonThread: 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))
     {
-        dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask) failed\n"));
+        Log(("VBoxMemBalloonThread: DeviceIOControl(CtlMask) failed\n"));
     }
 
-    dprintf(("VBoxMemBalloonThread: finished mem balloon change request thread\n"));
+    Log(("VBoxMemBalloonThread: finished mem balloon change request thread\n"));
     return 0;
 }

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

@@ -43 +43 @@
 int VBoxRestoreInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    dprintf(("VBoxRestoreInit\n"));
+    Log(("VBoxRestoreInit\n"));
 
     gCtx.pEnv      = pEnv;
@@ -58 +58 @@
 void VBoxRestoreDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    dprintf(("VBoxRestoreDestroy\n"));
+    Log(("VBoxRestoreDestroy\n"));
     return;
 }
@@ -77 +77 @@
     /* send to display driver */
     ret = ExtEscape(hdc, VBOXESC_ISVRDPACTIVE, 0, NULL, 0, NULL);
-    dprintf(("VBoxRestoreSession -> VRDP activate state = %d\n", ret));
+    Log(("VBoxRestoreSession -> VRDP activate state = %d\n", ret));
     ReleaseDC(HWND_DESKTOP, hdc);
 
@@ -86 +86 @@
         if (!DeviceIoControl (gCtx.pEnv->hDriver, (ret) ? VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION : VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
         {
-            dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+            Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         }
         gCtx.fRDPState = ret;
@@ -108 +108 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         return 0;
     }
@@ -124 +124 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            dprintf(("VBoxRestoreThread: DeviceIOControl succeded\n"));
+            Log(("VBoxRestoreThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -130 +130 @@
                 break;
 
-            dprintf(("VBoxRestoreThread: checking event\n"));
+            Log(("VBoxRestoreThread: checking event\n"));
 
             /* did we get the right event? */
@@ -141 +141 @@
         else
         {
-            dprintf(("VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("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 */
@@ -157 +157 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed\n"));
+        Log(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed\n"));
     }
 
-    dprintf(("VBoxRestoreThread: finished seamless change request thread\n"));
+    Log(("VBoxRestoreThread: finished seamless change request thread\n"));
     return 0;
 }

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

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

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

@@ -57 +57 @@
     DWORD  cbReturned;
 
-    dprintf(("VBoxStatsInit\n"));
+    Log(("VBoxStatsInit\n"));
 
     gCtx.pEnv                   = pEnv;
@@ -71 +71 @@
     if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST(req.header.size), &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
     {
-        dprintf(("VBoxStatsInit: new statistics interval %d seconds\n", req.u32StatInterval));
+        Log(("VBoxStatsInit: new statistics interval %d seconds\n", req.u32StatInterval));
         gCtx.uStatInterval = req.u32StatInterval * 1000;
     }
     else
-        dprintf(("VBoxStatsInit: DeviceIoControl failed with %d\n", GetLastError()));
+        Log(("VBoxStatsInit: DeviceIoControl failed with %d\n", GetLastError()));
 
     /* NtQuerySystemInformation might be dropped in future releases, so load it dynamically as per Microsoft's recommendation */
@@ -83 +83 @@
         *(uintptr_t *)&gCtx.pfnNtQuerySystemInformation = (uintptr_t)GetProcAddress(hMod, "NtQuerySystemInformation");
         if (gCtx.pfnNtQuerySystemInformation)
-            dprintf(("gCtx.pfnNtQuerySystemInformation = %x\n", gCtx.pfnNtQuerySystemInformation));
-        else
-        {
-            dprintf(("NTDLL.NtQuerySystemInformation not found!!\n"));
+            Log(("gCtx.pfnNtQuerySystemInformation = %x\n", gCtx.pfnNtQuerySystemInformation));
+        else
+        {
+            Log(("NTDLL.NtQuerySystemInformation not found!!\n"));
             return VERR_NOT_IMPLEMENTED;
         }
@@ -97 +97 @@
         *(uintptr_t *)&gCtx.pfnGlobalMemoryStatusEx = (uintptr_t)GetProcAddress(hMod, "GlobalMemoryStatusEx");
         if (gCtx.pfnGlobalMemoryStatusEx)
-            dprintf(("gCtx.GlobalMemoryStatusEx = %x\n", gCtx.pfnGlobalMemoryStatusEx));
+            Log(("gCtx.GlobalMemoryStatusEx = %x\n", gCtx.pfnGlobalMemoryStatusEx));
         else
         {
             /** @todo now fails in NT4; do we care? */
-            dprintf(("KERNEL32.GlobalMemoryStatusEx not found!!\n"));
+            Log(("KERNEL32.GlobalMemoryStatusEx not found!!\n"));
             return VERR_NOT_IMPLEMENTED;
         }
@@ -111 +111 @@
         *(uintptr_t *)&gCtx.pfnGetPerformanceInfo = (uintptr_t)GetProcAddress(hMod, "GetPerformanceInfo");
         if (gCtx.pfnGetPerformanceInfo)
-            dprintf(("gCtx.pfnGetPerformanceInfo= %x\n", gCtx.pfnGetPerformanceInfo));
+            Log(("gCtx.pfnGetPerformanceInfo= %x\n", gCtx.pfnGetPerformanceInfo));
         /* failure is not fatal */
     }
@@ -123 +123 @@
 void VBoxStatsDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    dprintf(("VBoxStatsDestroy\n"));
+    Log(("VBoxStatsDestroy\n"));
     return;
 }
@@ -176 +176 @@
         }
         else
-            dprintf(("GetPerformanceInfo failed with %d\n", GetLastError()));
+            Log(("GetPerformanceInfo failed with %d\n", GetLastError()));
     }
 
@@ -227 +227 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST(req.header.size), &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
         {
-            dprintf(("VBoxStatsReportStatistics: new statistics reported successfully!\n"));
-        }
-        else
-            dprintf(("VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError()));
+            Log(("VBoxStatsReportStatistics: new statistics reported successfully!\n"));
+        }
+        else
+            Log(("VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError()));
     }
 
@@ -252 +252 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxStatsThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+        Log(("VBoxStatsThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
         return 0;
     }
@@ -268 +268 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            dprintf(("VBoxStatsThread: DeviceIOControl succeded\n"));
+            Log(("VBoxStatsThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -274 +274 @@
                 break;
 
-            dprintf(("VBoxStatsThread: checking event\n"));
+            Log(("VBoxStatsThread: checking event\n"));
 
             /* did we get the right event? */
@@ -285 +285 @@
                 if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST(req.header.size), &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
                 {
-                    dprintf(("VBoxStatsThread: new statistics interval %d seconds\n", req.u32StatInterval));
+                    Log(("VBoxStatsThread: new statistics interval %d seconds\n", req.u32StatInterval));
                     pCtx->uStatInterval = req.u32StatInterval * 1000;
                 }
                 else
-                    dprintf(("VBoxStatsThread: DeviceIoControl (stat) failed with %d\n", GetLastError()));
+                    Log(("VBoxStatsThread: DeviceIoControl (stat) failed with %d\n", GetLastError()));
             }
         } 
         else
         {
-            dprintf(("VBoxStatsThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxStatsThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -316 +316 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxStatsThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    dprintf(("VBoxStatsThread: finished statistics change request thread\n"));
+        Log(("VBoxStatsThread: DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    Log(("VBoxStatsThread: finished statistics change request thread\n"));
     return 0;
 }

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

@@ -31 +31 @@
 #include <malloc.h>
 #include <VBoxGuestInternal.h>
-#include <iprt/string.h>
 
 #include "helpers.h"
@@ -45 +44 @@
 HWND                  gToolWindow;
 
-
-/* prototypes */
+/* Prototypes */
 VOID DisplayChangeThread(void *dummy);
 LRESULT CALLBACK VBoxToolWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
-
-#ifdef DEBUG
-/**
- * Helper function to send a message to WinDbg
- *
- * @param String message string
- */
-void WriteLog(char *String, ...)
-{
-    DWORD cbReturned;
-    CHAR Buffer[1024];
-    VMMDevReqLogString *pReq = (VMMDevReqLogString *)Buffer;
-
-    va_list va;
-
-    va_start(va, String);
-
-    vmmdevInitRequest(&pReq->header, VMMDevReq_LogString);
-    RTStrPrintfV(pReq->szString, sizeof(Buffer)-sizeof(*pReq), String, va);
-    OutputDebugStringA(pReq->szString);
-    pReq->header.size += strlen(pReq->szString);
-
-    printf("%s\n", pReq->szString);
-
-    FILE* pFh = fopen("c:\\VBoxTrayDebug.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, VBOXGUEST_IOCTL_VMMREQUEST(pReq->header.size), pReq, pReq->header.size,
-                    pReq, pReq->header.size, &cbReturned, NULL);
-
-    va_end (va);
-    return;
-}
-#endif
-
-
 
 /* The service table. */
@@ -150 +104 @@
 static int vboxStartServices (VBOXSERVICEENV *pEnv, VBOXSERVICEINFO *pTable)
 {
-    dprintf(("VBoxTray: Starting services...\n"));
+    Log(("VBoxTray: Starting services...\n"));
 
     pEnv->hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -162 +116 @@
     while (pTable->pszName)
     {
-        dprintf(("Starting %s...\n", pTable->pszName));
+        Log(("Starting %s...\n", pTable->pszName));
 
         int rc = VINF_SUCCESS;
@@ -179 +133 @@
         if (VBOX_FAILURE (rc))
         {
-            dprintf(("Failed to initialize rc = %Vrc.\n", rc));
+            Log(("Failed to initialize rc = %Vrc.\n", rc));
         }
         else
@@ -202 +156 @@
             if (VBOX_FAILURE (rc))
             {
-                dprintf(("Failed to start the thread.\n"));
+                Log(("Failed to start the thread.\n"));
 
                 if (pTable->pfnDestroy)
@@ -263 +217 @@
 void WINAPI VBoxServiceStart(void)
 {
-    dprintf(("VBoxTray: Start\n"));
+    Log(("VBoxTray: Leaving service main function"));
 
     VBOXSERVICEENV svcEnv;
@@ -279 +233 @@
     if (gVBoxDriver == INVALID_HANDLE_VALUE)
     {
-        dprintf(("VBoxTray: could not open VBox Guest Additions driver! Please install / start it first! rc = %d\n", GetLastError()));
+        Log(("VBoxTray: Could not open VBox Guest Additions driver! Please install / start it first! rc = %d\n", GetLastError()));
         status = ERROR_GEN_FAILURE;
     }
 
-    dprintf(("VBoxTray: Driver h %p, st %p\n", gVBoxDriver, status));
+    Log(("VBoxTray: Driver Handle = %p, Status = %p\n", gVBoxDriver, status));
 
     if (status == NO_ERROR)
@@ -298 +252 @@
     }
 
-    dprintf(("VBoxTray: Class st %p\n", status));
+    Log(("VBoxTray: Class st %p\n", status));
 
     if (status == NO_ERROR)
@@ -325 +279 @@
     }
 
-    dprintf(("VBoxTray: Window h %p, st %p\n", gToolWindow, status));
+    Log(("VBoxTray: Window Handle = %p, Status = %p\n", gToolWindow, status));
 
     if (status == NO_ERROR)
@@ -332 +286 @@
         if (gStopSem == NULL)
         {
-            dprintf(("VBoxTray: CreateEvent for Stopping failed: rc = %d\n", GetLastError()));
+            Log(("VBoxTray: CreateEvent for Stopping failed: rc = %d\n", GetLastError()));
             return;
         }
@@ -349 +303 @@
         ret = SetSecurityDescriptorDacl(SecAttr.lpSecurityDescriptor, TRUE, 0, FALSE);
         if (!ret)
-            dprintf(("SetSecurityDescriptorDacl failed with %d\n", GetLastError()));
+            Log(("VBoxTray: SetSecurityDescriptorDacl failed with %d\n", GetLastError()));
 
         info.dwOSVersionInfoSize = sizeof(info);
         if (GetVersionEx(&info))
         {
-            dprintf(("VBoxTray: Windows version major %d minor %d\n", info.dwMajorVersion, info.dwMinorVersion));
+            Log(("VBoxTray: Windows version major %d minor %d\n", info.dwMajorVersion, info.dwMinorVersion));
             dwMajorVersion = info.dwMajorVersion;
         }
@@ -375 +329 @@
                 *(uintptr_t *)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA = (uintptr_t)GetProcAddress(hModule, "ConvertStringSecurityDescriptorToSecurityDescriptorA");
 
-                dprintf(("pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
+                Log(("VBoxTray: pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
                 if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA)
                 {
@@ -381 +335 @@
                                                                                   SDDL_REVISION_1, &pSD, NULL);
                     if (!ret)
-                        dprintf(("ConvertStringSecurityDescriptorToSecurityDescriptorA failed with %d\n", GetLastError()));
+                        Log(("VBoxTray: ConvertStringSecurityDescriptorToSecurityDescriptorA failed with %d\n", GetLastError()));
 
                     ret = GetSecurityDescriptorSacl(pSD, &fSaclPresent, &pSacl, &fSaclDefaulted);
                     if (!ret)
-                        dprintf(("GetSecurityDescriptorSacl failed with %d\n", GetLastError()));
+                        Log(("VBoxTray: GetSecurityDescriptorSacl failed with %d\n", GetLastError()));
 
                     ret = SetSecurityDescriptorSacl(SecAttr.lpSecurityDescriptor, TRUE, pSacl, FALSE);
                     if (!ret)
-                        dprintf(("SetSecurityDescriptorSacl failed with %d\n", GetLastError()));
+                        Log(("VBoxTray: SetSecurityDescriptorSacl failed with %d\n", GetLastError()));
                 }
             }
@@ -399 +353 @@
             if (ghSeamlessNotifyEvent == NULL)
             {
-                dprintf(("VBoxTray: CreateEvent for Seamless failed: rc = %d\n", GetLastError()));
+                Log(("VBoxTray: CreateEvent for Seamless failed: rc = %d\n", GetLastError()));
                 return;
             }
@@ -441 +395 @@
     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(("VBoxTray: ndata.hWnd %08X, ndata.hIcon = %p\n", ndata.hWnd, ndata.hIcon));
+    Log(("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 +411 @@
         dwEventCount = 1;                       
 
-    dprintf(("VBoxTray: Number of events to wait in main loop: %ld\n", dwEventCount));
+    Log(("VBoxTray: Number of events to wait in main loop: %ld\n", dwEventCount));
 
     while(true)
@@ -464 +418 @@
         waitResult = waitResult - WAIT_OBJECT_0;
 
-        dprintf(("VBoxTray: Wait result  = %ld.\n", waitResult));
+        Log(("VBoxTray: Wait result  = %ld.\n", waitResult));
 
         if (waitResult == 0)
         {
-            dprintf(("VBoxTray: Event 'Exit' triggered.\n"));
+            Log(("VBoxTray: Event 'Exit' triggered.\n"));
             /* exit */
             break;
@@ -474 +428 @@
         else if ((waitResult == 1) && (ghSeamlessNotifyEvent!=0))       /* Only jump in, if seamless is active! */
         {
-            dprintf(("VBoxTray: Event 'Seamless' triggered.\n"));
+            Log(("VBoxTray: Event 'Seamless' triggered.\n"));
 
             /* seamless window notification */
@@ -485 +439 @@
             while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
             {
-                dprintf(("VBoxTray: msg %p\n", msg.message));
+                Log(("VBoxTray: msg %p\n", msg.message));
                 if (msg.message == WM_QUIT)
                 {
-                    dprintf(("VBoxTray: WM_QUIT!\n"));
+                    Log(("VBoxTray: WM_QUIT!\n"));
                     SetEvent(gStopSem);
                     continue;
@@ -499 +453 @@
             {
                 fTrayIconCreated = Shell_NotifyIcon(NIM_ADD, &ndata);
-                dprintf(("VBoxTray: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
-            }
-        }
-    }
-
-    dprintf(("VBoxTray: returned from main loop, exiting...\n"));
+                Log(("VBoxTray: fTrayIconCreated = %d, err %08X\n", fTrayIconCreated, GetLastError ()));
+            }
+        }
+    }
+
+    Log(("VBoxTray: Returned from main loop, exiting ...\n"));
 
     /* remove the system tray icon */
     Shell_NotifyIcon(NIM_DELETE, &ndata);
 
-    dprintf(("VBoxTray: waiting for display change thread...\n"));
+    Log(("VBoxTray: waiting for display change thread ...\n"));
 
     vboxStopServices (&svcEnv, vboxServiceTable);
 
-    dprintf(("VBoxTray: destroying tool window...\n"));
+    Log(("VBoxTray: Destroying tool window ...\n"));
 
     /* destroy the tool window */
@@ -524 +478 @@
     CloseHandle(ghSeamlessNotifyEvent);
 
-    dprintf(("VBoxTray: leaving service main function\n"));
+    Log(("VBoxTray: Leaving service main function\n"));
 
     return;
@@ -539 +493 @@
     if (   (hMutexAppRunning != NULL) 
         && (GetLastError() == ERROR_ALREADY_EXISTS))
-   {
+    {
       /* Close the mutex for this application instance. */
       CloseHandle (hMutexAppRunning);
       hMutexAppRunning = NULL;
       return 0;
-   }
-
-    dprintf(("VBoxTray: Started.\n"));
+    }
+
+    int rc = RTR3Init(false);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = VbglR3Init();
+    if (RT_FAILURE(rc))
+        return rc;
+
+    Log(("VBoxTray: Started.\n"));
 
     gInstance = hInstance;
     VBoxServiceStart();
 
-    dprintf(("VBoxTray: Ended.\n"));
+    Log(("VBoxTray: Ended.\n"));
 
     /* Release instance mutex. */
@@ -559 +521 @@
     }
 
+    VbglR3Term();
     return 0;
 }

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

@@ -30 +30 @@
 #include <process.h>
 
+#include <iprt/initterm.h>
+#include <iprt/string.h>
+
+#include <VBox/version.h>
 #include <VBox/VBoxGuest.h>
-#include <VBox/version.h>
-
+#include <VBox/Log.h>
 
 #define WM_VBOX_RESTORED                     0x2005

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

@@ -98 +98 @@
              * The parameter has to be disabled.
              */
-            dprintf(("Saving %s\n", parameters[i].name));
+            Log(("VBoxTray: vboxExperienceSet: Saving %s\n", parameters[i].name));
             
             /* Save the current value. */
@@ -132 +132 @@
                     if (parameters[i].cbSavedValue > sizeof (parameters[i].achSavedValue))
                     {
-                        dprintf(("not enough space %d > %d\n", parameters[i].cbSavedValue, sizeof (parameters[i].achSavedValue)));
+                        Log(("VBoxTray: vboxExperienceSet: Not enough space %d > %d\n", parameters[i].cbSavedValue, sizeof (parameters[i].achSavedValue)));
                         break;
                     }
@@ -148 +148 @@
             }
             
-            dprintf(("Disabling %s\n", parameters[i].name));
+            Log(("VBoxTray: vboxExperienceSet: Disabling %s\n", parameters[i].name));
             
             /* Disable the feature. */
@@ -203 +203 @@
         if (parameters[i].level > level)
         {
-            dprintf(("Restoring %s\n", parameters[i].name));
+            Log(("VBoxTray: vboxExperienceRestore: Restoring %s\n", parameters[i].name));
             
             /* Restore the feature. */
@@ -273 +273 @@
 int VBoxVRDPInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    dprintf(("VBoxVRDPInit\n"));
+    Log(("VBoxTray: VBoxVRDPInit\n"));
 
     gCtx.pEnv      = pEnv;
@@ -299 +299 @@
 void VBoxVRDPDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    dprintf(("VBoxVRDPDestroy\n"));
+    Log(("VBoxTray: VBoxVRDPDestroy\n"));
     VBOXVRDPCONTEXT *pCtx = (VBOXVRDPCONTEXT *)pInstance;
     vboxExperienceRestore (pCtx->level);
@@ -323 +323 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
+        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
         return 0;
     }
@@ -339 +339 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            dprintf(("VBoxVRDPThread: DeviceIOControl succeded\n"));
+            Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl succeded\n"));
 
             /* are we supposed to stop? */
@@ -345 +345 @@
                 break;
 
-            dprintf(("VBoxVRDPThread: checking event\n"));
+            Log(("VBoxTray: VBoxVRDPThread: checking event\n"));
 
             /* did we get the right event? */
@@ -367 +367 @@
                                      &cbReturned, NULL))
                 {
-                    dprintf(("VBoxVRDPThread: u8VRDPActive = %d, level %d\n", vrdpChangeRequest.u8VRDPActive, vrdpChangeRequest.u32VRDPExperienceLevel));
+                    Log(("VBoxTray: VBoxVRDPThread: u8VRDPActive = %d, level %d\n", vrdpChangeRequest.u8VRDPActive, vrdpChangeRequest.u32VRDPExperienceLevel));
                     
                     if (vrdpChangeRequest.u8VRDPActive)
@@ -380 +380 @@
                             pCtx->fSavedThemeEnabled = pCtx->pfnIsThemeActive ();
                             
-                            dprintf(("VBoxVRDPThread: pCtx->fSavedThemeEnabled = %d\n", pCtx->fSavedThemeEnabled));
+                            Log(("VBoxTray: VBoxVRDPThread: pCtx->fSavedThemeEnabled = %d\n", pCtx->fSavedThemeEnabled));
                             
                             if (pCtx->fSavedThemeEnabled)
@@ -398 +398 @@
                                 /* @todo the call returns S_OK but theming remains disabled. */
                                 HRESULT hrc = pCtx->pfnEnableTheming (TRUE);
-                                dprintf(("VBoxVRDPThread: enabling theme rc = 0x%08X\n", hrc));
+                                Log(("VBoxTray: VBoxVRDPThread: enabling theme rc = 0x%08X\n", hrc));
                                 pCtx->fSavedThemeEnabled = FALSE;
                             }
@@ -410 +410 @@
                 else
                 {
-                    dprintf(("VBoxTray: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                    Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
 
                     /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -423 +423 @@
         else
         {
-            dprintf(("VBoxTray: error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -438 +438 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    dprintf(("VBoxVRDPThread: finished VRDP change request thread\n"));
+        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    Log(("VBoxTray: VBoxVRDPThread: Finished VRDP change request thread\n"));
     return 0;
 }

trunk/src/VBox/Additions/WINNT/VBoxTray/helpers.h

@@ -24 +24 @@
 // #define DEBUG_DISPLAY_CHANGE
 
-#ifndef DDCLOG
-void SvcDebugOut2(char *String, ...);
-# ifdef DEBUG_DISPLAY_CHANGE
-#  define DDCLOG(a) dprintf(a)
-# else
-#  define DDCLOG(a) do {} while (0)
-# endif /* DEBUG_DISPLAY_CHANGE */
-#endif /* DDCLOG */
-
-#ifdef DEBUG
-void WriteLog(char *String, ...);
-#define dprintf(a) do { WriteLog a; } while (0)
+#ifdef DEBUG_DISPLAY_CHANGE
+    #define DDCLOG(a) Log(a)
 #else
-#define dprintf(a) do {} while (0)
-#endif /* DEBUG */
+    #define DDCLOG(a) do {} while (0)
+#endif /* DEBUG_DISPLAY_CHANGE */
 
 void resizeRect(RECTL *paRects, unsigned nRects, unsigned iPrimary, unsigned iResized, int NewWidth, int NewHeight);