Changeset 10777 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxRestore.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

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

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;
 }