From 57dd848fb6dd7cf15820172e2abc9fb9de2b4268 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 3 Apr 2015 18:02:11 +0200
Subject: Solved hang-up problem during closing

---
 libX11/src/GetProp.c                       |  2 +-
 xorg-server/hw/xwin/winclipboard/thread.c  | 23 -----------------------
 xorg-server/hw/xwin/winclipboard/wndproc.c |  1 +
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/libX11/src/GetProp.c b/libX11/src/GetProp.c
index 9eb422ee3..88ec282ca 100644
--- a/libX11/src/GetProp.c
+++ b/libX11/src/GetProp.c
@@ -64,7 +64,7 @@ XGetWindowProperty(
     req->delete = delete;
     req->longOffset = offset;
     req->longLength = length;
-    error.sequenceNumber = dpy->request;
+    error.sequenceNumber = (CARD16)(dpy->request&0xffff);
 
     if (!_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
 	UnlockDisplay(dpy);
diff --git a/xorg-server/hw/xwin/winclipboard/thread.c b/xorg-server/hw/xwin/winclipboard/thread.c
index 20c473dd8..bb7418992 100755
--- a/xorg-server/hw/xwin/winclipboard/thread.c
+++ b/xorg-server/hw/xwin/winclipboard/thread.c
@@ -359,29 +359,6 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
                    "Bailing.\n", iReturn);
             break;
         }
-
-        if (FD_ISSET(iConnectionNumber, &fdsRead)) {
-            winDebug
-                ("winClipboardProc - X connection ready, pumping X event queue\n");
-        }
-
-#ifdef HAS_DEVWINDOWS
-        /* Check for Windows event ready */
-        if (FD_ISSET(fdMessageQueue, &fdsRead))
-#else
-        if (1)
-#endif
-        {
-            winDebug
-                ("winClipboardProc - /dev/windows ready, pumping Windows message queue\n");
-        }
-
-#ifdef HAS_DEVWINDOWS
-        if (!(FD_ISSET(iConnectionNumber, &fdsRead)) &&
-            !(FD_ISSET(fdMessageQueue, &fdsRead))) {
-            winDebug("winClipboardProc - Spurious wake, select() returned %d\n", iReturn);
-        }
-#endif
     }
 
     /* Close our X window */
diff --git a/xorg-server/hw/xwin/winclipboard/wndproc.c b/xorg-server/hw/xwin/winclipboard/wndproc.c
index c99975193..219085682 100755
--- a/xorg-server/hw/xwin/winclipboard/wndproc.c
+++ b/xorg-server/hw/xwin/winclipboard/wndproc.c
@@ -170,6 +170,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         s_hwndNextViewer = NULL;
         g_hwndClipboard = NULL;
+        PostMessage(hwnd, WM_WM_QUIT, 0L, 0L);
     }
         return 0;
 
-- 
cgit v1.2.3