Changeset 21940 in vbox

Timestamp:

Aug 3, 2009 12:38:04 PM (16 years ago)

Author:

vboxsync

Message:

Additions/X11/VBoxClient: attempt to fix seamless Additions crashes

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• main.cpp (modified) (1 diff)
• seamless-x11.cpp (modified) (3 diffs)

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

@@ -88 +88 @@
     char errorText[1024];
 
-    if (pError->error_code == BadAtom)
-    {
-        /* This can be triggered in debug builds if a guest application passes a bad atom
-           in its list of supported clipboard formats.  As such it is harmless. */
-        Log(("VBoxClient: ignoring BadAtom error and returning\n"));
-        return 0;
-    }
-    if (pError->error_code == BadWindow)
-    {
-        /* This can be triggered if a guest application destroys a window before we notice. */
-        Log(("VBoxClient: ignoring BadWindow error and returning\n"));
-        return 0;
-    }
     XGetErrorText(pDisplay, pError->error_code, errorText, sizeof(errorText));
-    LogRel(("VBoxClient: an X Window protocol error occurred: %s (error code %d).  Request code: %d, minor code: %d, serial number: %d\n", errorText, pError->error_code, pError->request_code, pError->minor_code, pError->serial));
-    VBoxClient::CleanUp();
+    LogRelFlow(("VBoxClient: an X Window protocol error occurred: %s (error code %d).  Request code: %d, minor code: %d, serial number: %d\n", errorText, pError->error_code, pError->request_code, pError->minor_code, pError->serial));
     return 0;  /* We should never reach this. */
 }

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -332 +332 @@
         XWindowAttributes winAttrib;
 
-        if (XGetWindowAttributes(mDisplay, hWin, &winAttrib))
-        {
-            iter->second->mX = winAttrib.x;
-            iter->second->mY = winAttrib.y;
-            iter->second->mWidth = winAttrib.width;
-            iter->second->mHeight = winAttrib.height;
-        }
+        if (!XGetWindowAttributes(mDisplay, hWin, &winAttrib))
+            return;
+        iter->second->mX = winAttrib.x;
+        iter->second->mY = winAttrib.y;
+        iter->second->mWidth = winAttrib.width;
+        iter->second->mHeight = winAttrib.height;
         if (iter->second->mhasShape)
         {
@@ -346 +345 @@
             rects = XShapeGetRectangles(mDisplay, hWin, ShapeBounding,
                                         &cRects, &iOrdering);
+            if (rects.get() == NULL)
+                cRects = 0;
             iter->second->mcRects = cRects;
             iter->second->mapRects = rects;
@@ -392 +393 @@
         rects = XShapeGetRectangles(mDisplay, hWin, ShapeBounding, &cRects,
                                     &iOrdering);
+        if (rects.get() == NULL)
+            cRects = 0;
         iter->second->mhasShape = true;
         iter->second->mcRects = cRects;