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

Timestamp:

May 21, 2011 8:45:49 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: fixed a couple of problems in the un-STL-ified code

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (1 diff)
• testcase/tstSeamlessX11-auto.cpp (modified) (18 diffs)

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

@@ -418 +418 @@
 {
     LogRelFlowFunc(("\n"));
-    VBoxGuestWinFree(mGuestWindows.removeWindow(hWin), NULL);
-    mChanged = true;
+    VBoxGuestWinInfo *pInfo = mGuestWindows.removeWindow(hWin);
+    if (pInfo)
+    {
+        VBoxGuestWinFree(pInfo, mDisplay);
+        mChanged = true;
+    }
     LogRelFlowFunc(("returning\n"));
 }

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -1 +1 @@
 /** @file
  * Automated test of the X11 seamless Additions code.
+ * @todo Better separate test data from implementation details!
  */
 
@@ -67 +68 @@
 Atom XInternAtom(Display *display, const char *atom_name, Bool only_if_exists)
 {
+    Assert(display == TEST_DISPLAY);
     if (!RTStrCmp(atom_name, WM_TYPE_PROP))
         return (Atom) ATOM_PROP;
@@ -95 +97 @@
                        unsigned char **prop_return)
 {
-    Atom atomType = XInternAtom (NULL, WM_TYPE_PROP, true);
-    Atom atomTypeDesktop = XInternAtom (NULL, WM_TYPE_DESKTOP_PROP, true);
+    Assert(display == TEST_DISPLAY);
+    Atom atomType = XInternAtom (display, WM_TYPE_PROP, true);
+    Atom atomTypeDesktop = XInternAtom (display, WM_TYPE_DESKTOP_PROP, true);
     /* We only handle things we expect. */
     AssertReturn((req_type == XA_ATOM) || (req_type == AnyPropertyType),
@@ -130 +133 @@
 Bool XShapeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
+    Assert(dpy == TEST_DISPLAY);
     return true;
 }
@@ -137 +141 @@
 int XSelectInput(Display *display, Window w, long event_mask)
 {
+    Assert(display == TEST_DISPLAY);
     return 0;
 }
@@ -144 +149 @@
                                   unsigned long event_mask);
 void XShapeSelectInput(Display *display, Window w, unsigned long event_mask)
-{}
+{
+    Assert(display == TEST_DISPLAY);
+}
 
 extern "C" Window XDefaultRootWindow(Display *display);
 Window XDefaultRootWindow(Display *display)
 {
+    Assert(display == TEST_DISPLAY);
     return TEST_ROOT;
 }
@@ -164 +172 @@
                   unsigned int *nchildren_return)
 {
+    Assert(display == TEST_DISPLAY);
     AssertReturn(w == TEST_ROOT, False);  /* We support nothing else */
     AssertPtrReturn(children_return, False);
@@ -181 +190 @@
 Window XmuClientWindow(Display *dpy, Window win)
 {
+    Assert(dpy == TEST_DISPLAY);
     return win;
 }
@@ -189 +199 @@
                             XWindowAttributes *window_attributes_return)
 {
+    Assert(display == TEST_DISPLAY);
     AssertPtrReturn(window_attributes_return, 1);
     for (unsigned i = 0; i < g_cSmlsWindows; ++i)
@@ -206 +217 @@
                          XSizeHints *hints_return, long *supplied_return)
 {
+    Assert(display == TEST_DISPLAY);
     return 1;
 }
@@ -229 +241 @@
                                  int *count, int *ordering)
 {
+    Assert(dpy == TEST_DISPLAY);
     if ((window != g_SmlsShapedWindow) || (window == 0))
         return NULL;  /* Probably not correct, but works for us. */
@@ -253 +266 @@
 int XNextEvent(Display *display, XEvent *event_return)
 {
+    Assert(display == TEST_DISPLAY);
     event_return->xany.type = g_SmlsEventType;
     event_return->xany.window = g_SmlsEventWindow;
@@ -271 +285 @@
                   long event_mask, XEvent *event_send)
 {
+    Assert(display == TEST_DISPLAY);
     AssertFailedReturn(0);
 }
@@ -278 +293 @@
 int XFlush(Display *display)
 {
+    Assert(display == TEST_DISPLAY);
     AssertFailedReturn(0);
 }
@@ -349 +365 @@
     /** The event to delivered */
     int x11EventType;
-    /** The windows for which the event in @enmEvent is delivered */
+    /** The window for which the event in @enmEvent is delivered */
     Window hEventWindow;
     /** The number of windows expected to be reported at the end of the
@@ -471 +487 @@
 };
 
-/*** Test fixture to test the code against X11 unmap events ***/
+/*** Test fixtures to test the code against X11 unmap events ***/
 
 static XWindowAttributes g_aAttrib4After[] =
@@ -499 +515 @@
     0,
     NULL
+};
+
+/*** A window we are not monitoring has been unmapped.  Nothing should
+ *** happen, especially nothing bad. ***/
+
+static RTRECT g_aRects2[] =
+{
+    { 100, 200, 150, 250 },
+    { 150, 250, 300, 500 }
+};
+
+static SMLSFIXTURE g_testUnmapOther =
+{
+    RT_ELEMENTS(g_ahWin1),
+    g_ahWin1,
+    g_aAttrib1Before,
+    g_apszNames1,
+    20,
+    RT_ELEMENTS(g_aRectangle1),
+    g_aRectangle1,
+    RT_ELEMENTS(g_ahWin1),
+    g_ahWin1,
+    g_aAttrib1Before,
+    g_apszNames1,
+    20,
+    RT_ELEMENTS(g_aRectangle1),
+    g_aRectangle1,
+    UnmapNotify,
+    21,
+    RT_ELEMENTS(g_aRects2),
+    g_aRects2
 };
 
@@ -650 +697 @@
     cErrs += smlsDoFixture(&g_testMap, "MapNotify event");
     cErrs += smlsDoFixture(&g_testUnmap, "UnmapNotify event");
+    cErrs += smlsDoFixture(&g_testUnmapOther,
+                           "UnmapNotify event for unmonitored window");
     cErrs += smlsDoFixture(&g_testShape, "ShapeNotify event");
     if (cErrs > 0)