[Xorg-commit] xc/programs/Xserver/hw/xwin winclipboardxevents.c,1.1.4.1.2.6,1.1.4.1.2.7

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv31219

Modified Files:
      Tag: CYGWIN
	winclipboardxevents.c 
Log Message:
Sync with XWin Xserver 4.3.0-36 release.  Fix bug where we called OpenClipboard but never called CloseClipboard.

Index: winclipboardxevents.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v
retrieving revision 1.1.4.1.2.6
retrieving revision 1.1.4.1.2.7
diff -u -d -r1.1.4.1.2.6 -r1.1.4.1.2.7
--- winclipboardxevents.c	11 Jan 2004 02:49:14 -0000	1.1.4.1.2.6
+++ winclipboardxevents.c	11 Jan 2004 03:49:45 -0000	1.1.4.1.2.7
@@ -189,6 +189,22 @@
 	      break;
 	    }
 
+	  /* Check that clipboard format is available */
+	  if (fUnicodeSupport
+	      && !IsClipboardFormatAvailable (CF_UNICODETEXT))
+	    {
+	      ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "
+		      "available from Win32 clipboard.  Aborting.\n");
+	      break;
+	    }
+	  else if (!fUnicodeSupport
+		   && !IsClipboardFormatAvailable (CF_TEXT))
+	    {
+	      ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "
+		      "available from Win32 clipboard.  Aborting.\n");
+	      break;
+	    }
+
 	  /* Access the clipboard */
 	  if (!OpenClipboard (hwnd))
 	    {
@@ -215,27 +231,11 @@
 	  /* Get a pointer to the clipboard text, in desired format */
 	  if (fUnicodeSupport)
 	    {
-	      /* Check that clipboard format is available */
-	      if (!IsClipboardFormatAvailable (CF_UNICODETEXT))
-		{
-		  ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "
-			  "available from Win32 clipboard.  Aborting.\n");
-		  break;
-		}
-
 	      /* Retrieve clipboard data */
 	      hGlobal = GetClipboardData (CF_UNICODETEXT);
 	    }
 	  else
 	    {
-	      /* Check that clipboard format is available */
-	      if (!IsClipboardFormatAvailable (CF_TEXT))
-		{
-		  ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "
-			  "available from Win32 clipboard.  Aborting.\n");
-		  break;
-		}
-
 	      /* Retrieve clipboard data */
 	      hGlobal = GetClipboardData (CF_TEXT);
 	    }