Changeset 38315 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 4, 2011 2:07:14 PM (14 years ago)

Author:

vboxsync

Message:

crogl: send WM_SETTINGCHANGE outside the hashtable lock to avoid redraw deadlocking

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -770 +770 @@
 }
 
+typedef struct VBOXCR_UPDATEWNDCB
+{
+    VBOXDISPMP_REGIONS Regions;
+    bool fSendUpdateMsg;
+} VBOXCR_UPDATEWNDCB, *PVBOXCR_UPDATEWNDCB;
+
 static void stubSyncTrUpdateWindowCB(unsigned long key, void *data1, void *data2)
 {
     WindowInfo *pWindow = (WindowInfo *) data1;
-    VBOXDISPMP_REGIONS *pRegions = (VBOXDISPMP_REGIONS*) data2;
+    PVBOXCR_UPDATEWNDCB pCbData = (PVBOXCR_UPDATEWNDCB) data2;
+    VBOXDISPMP_REGIONS *pRegions = &pCbData->Regions;
     bool bChanged = false;
     HRGN hNewRgn = INVALID_HANDLE_VALUE;
@@ -866 +873 @@
                 if (pWindow->hVisibleRegion==INVALID_HANDLE_VALUE || EqualRgn(pWindow->hVisibleRegion, hEmptyRgn))
                 {
-                    SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0, SMTO_NORMAL, 1000, NULL);
+                    pCbData->fSendUpdateMsg = true;
                 }
 
@@ -951 +958 @@
     static VBOXDISPMP_CALLBACKS VBoxDispMpTstCallbacks = {NULL, NULL, NULL};
     HMODULE hVBoxD3D = NULL;
-    VBOXDISPMP_REGIONS Regions;
+    VBOXCR_UPDATEWNDCB RegionsData;
     HRESULT hr;
 # endif
@@ -1016 +1023 @@
             if (VBoxDispMpTstCallbacks.pfnGetRegions)
             {
-                hr = VBoxDispMpTstCallbacks.pfnGetRegions(&Regions, 50);
+                hr = VBoxDispMpTstCallbacks.pfnGetRegions(&RegionsData.Regions, 50);
                 if (S_OK==hr)
                 {
+                    RegionsData.fSendUpdateMsg = false;
 #  if 0
                     uint32_t i;
-                    crDebug(">>>Regions for HWND(0x%x)>>>", Regions.hWnd);
-                    crDebug("Flags(0x%x)", Regions.pRegions->fFlags.Value);
-                    for (i = 0; i < Regions.pRegions->RectsInfo.cRects; ++i)
+                    crDebug(">>>Regions for HWND(0x%x)>>>", RegionsData.Regions.hWnd);
+                    crDebug("Flags(0x%x)", RegionsData.Regions.pRegions->fFlags.Value);
+                    for (i = 0; i < RegionsData.Regions.pRegions->RectsInfo.cRects; ++i)
                     {
-                        RECT *pRect = &Regions.pRegions->RectsInfo.aRects[i];
+                        RECT *pRect = &RegionsData.Regions.pRegions->RectsInfo.aRects[i];
                         crDebug("Rect(%d): left(%d), top(%d), right(%d), bottom(%d)", i, pRect->left, pRect->top, pRect->right, pRect->bottom);
                     }
@@ -1031 +1039 @@
 #  endif
                     /*hacky way to make sure window wouldn't be deleted in another thread as we hold hashtable lock here*/
-                    crHashtableWalk(stub.windowTable, stubSyncTrUpdateWindowCB, &Regions);
+                    crHashtableWalk(stub.windowTable, stubSyncTrUpdateWindowCB, &RegionsData);
+                    if (RegionsData.fSendUpdateMsg)
+                    {
+                        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0, SMTO_NORMAL, 1000, NULL);
+                    }
                 }
                 else