Changeset 51094 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 17, 2014 7:29:14 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL/CrCmd: unload fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_main.c (modified) (3 diffs)
• server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -158 +158 @@
     tearingdown = 1;
 
-    if (cr_server.DisableData.hNotifyTerm)
+    if (cr_server.fCrCmdEnabled)
     {
         VBOXCRCMDCTL_HGCMENABLE_DATA EnableData;
-        int rc = cr_server.DisableData.pfnNotifyTerm(cr_server.DisableData.hNotifyTerm, &EnableData);
+        /* crVBoxServerHgcmEnable will erase the DisableData, preserve it here */
+        VBOXCRCMDCTL_HGCMDISABLE_DATA DisableData = cr_server.DisableData;
+        int rc;
+
+        CRASSERT(DisableData.pfnNotifyTerm);
+        rc = DisableData.pfnNotifyTerm(DisableData.hNotifyTerm, &EnableData);
         if (!RT_SUCCESS(rc))
         {
@@ -175 +180 @@
         }
 
-        cr_server.DisableData.pfnNotifyTermDone(cr_server.DisableData.hNotifyTerm);
+        CRASSERT(DisableData.pfnNotifyTermDone);
+        DisableData.pfnNotifyTermDone(DisableData.hNotifyTerm);
+
+        Assert(!cr_server.fCrCmdEnabled);
     }
 
@@ -4230 +4238 @@
     crVBoxServerDefaultContextSet();
 
+    memset(&cr_server.DisableData, 0, sizeof (cr_server.DisableData));
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4898 +4898 @@
     if (!hFb)
     {
-        WARN(("request to present on disabled framebuffer, ignore"));
+        LOG(("request to present on disabled framebuffer, ignore"));
         return 0;
     }