Changeset 42319 in vbox for trunk/src

Timestamp:

Jul 23, 2012 11:39:42 AM (13 years ago)

Author:

vboxsync

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

79389

Message:

VBoxClient: don't crash if we can't connect to HGCM

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -595 +595 @@
         XChangeProperty(m_pDisplay, m_proxyWin, xAtom(XA_XdndAware), XA_ATOM, 32, PropModeReplace,
                         reinterpret_cast<unsigned char*>(&ver), 1);
-    }while(0);
+    } while(0);
 
     m_state = Initialized;
@@ -1137 +1137 @@
             }
         }
-    }while(tries--);
+    } while(tries--);
     if (clme)
     {
@@ -1665 +1665 @@
                 }
             }
-        }while(!ASMAtomicReadBool(&m_fSrvStopping));
-    }while(0);
+        } while(!ASMAtomicReadBool(&m_fSrvStopping));
+    } while(0);
 
     LogRelFlowFunc(("returning %Rrc\n", rc));
@@ -1699 +1699 @@
                             0, RTTHREADTYPE_MSG_PUMP, RTTHREADFLAGS_WAITABLE,
                             "X11-NOTIFY");
-    }while(0);
+    } while(0);
 
     /* Cleanup on failure */
@@ -1713 +1713 @@
     ASMAtomicWriteBool(&m_fSrvStopping, true);
 
-    /* Send a x11 client messages to the x11 event loop. */
-    XClientMessageEvent m;
-    RT_ZERO(m);
-    m.type         = ClientMessage;
-    m.display      = m_pDisplay;
-    m.window       = None;
-    m.message_type = xAtom(XA_dndstop);
-    m.format       = 32;
-    int xrc = XSendEvent(m_pDisplay, None, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
-    if (RT_UNLIKELY(xrc == 0))
-        DO(("DnD_TERM: error sending xevent\n"));
+    asm volatile ("int3");
+    if (m_pDisplay)
+    {
+        /* Send a x11 client messages to the x11 event loop. */
+        XClientMessageEvent m;
+        RT_ZERO(m);
+        m.type         = ClientMessage;
+        m.display      = m_pDisplay;
+        m.window       = None;
+        m.message_type = xAtom(XA_dndstop);
+        m.format       = 32;
+        int xrc = XSendEvent(m_pDisplay, None, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
+        if (RT_UNLIKELY(xrc == 0))
+                DO(("DnD_TERM: error sending xevent\n"));
+    }
     /* Wait for our event threads to stop. */
 //    if (m_hX11Thread)
@@ -1761 +1765 @@
                 return rc;
         }
-    }while(!ASMAtomicReadBool(&pSrv->m_fSrvStopping));
+    } while(!ASMAtomicReadBool(&pSrv->m_fSrvStopping));
 
     return VINF_SUCCESS;