Changeset 4302 in vbox

Timestamp:

Aug 23, 2007 8:10:09 AM (17 years ago)

Author:

vboxsync

Message:

Disabled code for VRDP status checks

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• VBoxRestore.cpp (modified) (3 diffs)
• VBoxRestore.h (modified) (1 diff)
• VBoxService.cpp (modified) (4 diffs)
• VBoxService.h (modified) (1 diff)

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

@@ -33 +33 @@
 static VBOXRESTORECONTEXT gCtx = {0};
 
-static void VBoxRestoreCheckVRDP();
-
 
 int VBoxRestoreInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
@@ -61 +59 @@
 }
 
-static void VBoxRestoreCheckVRDP()
+void VBoxRestoreCheckVRDP()
 {
     HDC  hdc;
     BOOL ret;
     
-
     /* Check VRDP activity */
     hdc = GetDC(HWND_DESKTOP);
@@ -125 +122 @@
         {
             dprintf(("VBoxService: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+
+            /** @todo Don't poll, but wait for connect/disconnect events */
+            PostMessage(gToolWindow, WM_VBOX_CHECK_VRDP, 0, 0);
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxRestore.h

@@ -23 +23 @@
 void               VBoxRestoreDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
 
-void               VBoxRestoreSession ();
+void VBoxRestoreSession();
+void VBoxRestoreCheckVRDP();
 
 #endif /* __VBOXSERVICERESTORE__H */

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

@@ -23 +23 @@
 #include "resource.h"
 #include <malloc.h>
+#include <VBoxGuestInternal.h>
 
 #include "helpers.h"
@@ -92 +93 @@
         VBoxSeamlessDestroy
     },
+#ifdef VBOX_WITH_VRDP_SESSION_HANDLING
     {
         "Restore",
@@ -98 +100 @@
         VBoxRestoreDestroy,
     },
+#endif
     {
         NULL
@@ -437 +440 @@
             break;
 
+        case WM_VBOX_CHECK_VRDP:
+            VBoxRestoreCheckVRDP();
+            break;
+
         default:
             return DefWindowProc(hwnd, msg, wParam, lParam);

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

@@ -31 +31 @@
 
 #define WM_VBOX_RESTORED                     0x2005
+#define WM_VBOX_CHECK_VRDP                   0x2006