Changeset 46097 in vbox for trunk

Timestamp:

May 15, 2013 1:11:39 PM (12 years ago)

Author:

vboxsync

Message:

ConsoleVRDPServer: do not stop VRDP server if a resize is in process

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleVRDPServer.h (modified) (2 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -126 +126 @@
      */
     void SendUpdate (unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate) const;
-    void SendResize (void) const;
+    void SendResize (void);
     void SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const;
 
@@ -164 +164 @@
     HVRDESERVER mhServer;
     int mServerInterfaceVersion;
+
+    int32_t volatile mcInResize; /* Do not Stop the server if this is not 0. */
 
     static int loadVRDPLibrary (const char *pszLibraryName);

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -1333 +1333 @@
     mhServer = 0;
     mServerInterfaceVersion = 0;
+
+    mcInResize = 0;
 
     m_fGuestWantsAbsolute = false;
@@ -2819 +2821 @@
         mhServer = 0;
 
+        /* Workaround for VM process hangs on termination.
+         *
+         * Make sure that the server is not currently processing a resize.
+         * mhServer 0 will not allow to enter the server again.
+         * Wait until any current resize returns from the server.
+         */
+        if (mcInResize)
+        {
+            LogRel(("VRDP: waiting for resize %d\n", mcInResize));
+
+            int i = 0;
+            while (mcInResize && ++i < 100)
+            {
+                RTThreadSleep(10);
+            }
+        }
+
         if (mpEntryPoints && hServer)
         {
@@ -3635 +3654 @@
 }
 
-void ConsoleVRDPServer::SendResize(void) const
+void ConsoleVRDPServer::SendResize(void)
 {
     if (mpEntryPoints && mhServer)
     {
+        ++mcInResize;
         mpEntryPoints->VRDEResize(mhServer);
+        --mcInResize;
     }
 }