- Removed waiting until clipboard was started after being launched in

  function winProcSetSelectionOwner. (This was causing a dead lock)
- Changed welcome message
- Synchronised winclipboardxevents with the version on the release branch
  (Removed calls to XLockDisplay and XUnlockDisplay)
- Call to XInitThreads has been moved to the beginning of dix\main. This
  function should be called before any call to a Xlib function.

1 files changed, 1 insertions, 9 deletions

diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 25ce15f07..615a2cb65 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -188,7 +188,6 @@ winClipboardFlushXEvents (HWND hwnd,
 	    }

 

 	  /* Check that clipboard format is available */

-	  XLockDisplay (pDisplay);

 	  if (fUseUnicode

 	      && !IsClipboardFormatAvailable (CF_UNICODETEXT))

 	    {

@@ -201,7 +200,6 @@ winClipboardFlushXEvents (HWND hwnd,
 	      lasthwnd = hwnd;

 

 	      /* Abort */

-	      XUnlockDisplay (pDisplay);

 	      fAbort = TRUE;

 	      goto winClipboardFlushXEvents_SelectionRequest_Done;

 	    }

@@ -212,7 +210,6 @@ winClipboardFlushXEvents (HWND hwnd,
 		      "available from Win32 clipboard.  Aborting.\n");

 

 	      /* Abort */

-	      XUnlockDisplay (pDisplay);

 	      fAbort = TRUE;

 	      goto winClipboardFlushXEvents_SelectionRequest_Done;

 	    }

@@ -231,7 +228,6 @@ winClipboardFlushXEvents (HWND hwnd,
 		      GetLastError ());

 

 	      /* Abort */

-	      XUnlockDisplay (pDisplay);

 	      fAbort = TRUE;

 	      goto winClipboardFlushXEvents_SelectionRequest_Done;

 	    }

@@ -269,11 +265,10 @@ winClipboardFlushXEvents (HWND hwnd,
 	  if (!hGlobal)

 	    {

 	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

-		      "GetClipboardData () failed: 0x%08x\n",

+		      "GetClipboardData () failed: %08x\n",

 		      GetLastError ());

 

 	      /* Abort */

-	      XUnlockDisplay (pDisplay);

 	      fAbort = TRUE;

 	      goto winClipboardFlushXEvents_SelectionRequest_Done;

 	    }

@@ -309,7 +304,6 @@ winClipboardFlushXEvents (HWND hwnd,
 

 	  /* Convert DOS string to UNIX string */

 	  winClipboardDOStoUNIX (pszConvertData, strlen (pszConvertData));

-	  XUnlockDisplay (pDisplay);

 

 	  /* Setup our text list */

 	  pszTextList[0] = pszConvertData;

@@ -694,7 +688,6 @@ winClipboardFlushXEvents (HWND hwnd,
 	  xtpText.nitems = 0;

 

 	  /* Convert the X clipboard string to DOS format */

-	  XLockDisplay (pDisplay);

 	  winClipboardUNIXtoDOS ((unsigned char **)&pszReturnData, strlen (pszReturnData));

 

 	  if (fUseUnicode)

@@ -802,7 +795,6 @@ winClipboardFlushXEvents (HWND hwnd,
 	   */

 

 	winClipboardFlushXEvents_SelectionNotify_Done:

-	  XUnlockDisplay (pDisplay);

 	  /* Free allocated resources */

 	  if (ppszTextList)

 	    XFreeStringList (ppszTextList);