Changeset 29936 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 1, 2010 8:30:15 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

62205

Message:

Block first for a minute as using DONT_RESOLVE_DLL_REFERENCES is kind of risky.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -397 +397 @@
     RTThreadUserSignal(RTThreadSelf());
 
+        /*
+         * Block here first for a minute as using DONT_RESOLVE_DLL_REFERENCES is kind of risky; other code that uses LoadLibrary on a dll loaded like this
+         * before will end up crashing the process as the dll's init routine was never called.
+         *
+         * We have to use this feature as we can't simply execute all init code in our service process.
+         *
+         */
+    int rc = RTSemEventMultiWait(g_PageSharingEvent, 60000);
+    if (*pfShutdown)
+        goto end;
+
+    if (rc != VERR_TIMEOUT && RT_FAILURE(rc))
+    {
+        VBoxServiceError("RTSemEventMultiWait failed; rc=%Rrc\n", rc);
+        goto end;
+    }
+
     /*
      * Now enter the loop retrieving runtime data continuously.
@@ -415 +432 @@
         if (*pfShutdown)
             break;
-        int rc = RTSemEventMultiWait(g_PageSharingEvent, 60000);
+        rc = RTSemEventMultiWait(g_PageSharingEvent, 60000);
         if (*pfShutdown)
             break;
@@ -425 +442 @@
     }
 
+end:
     RTSemEventMultiDestroy(g_PageSharingEvent);
     g_PageSharingEvent = NIL_RTSEMEVENTMULTI;