Attachment 5822 Details for Bug 7121 – Patch to fix the problem

[patch] Patch to fix the problem

winclipboardwndproc.c.patch (text/plain), 3.19 KB, created by Colin Harrison on 2006-06-05 07:07:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Harrison

Created: 2006-06-05 07:07:53 UTC

Size: 3.19 KB

patch

obsolete

>--- winclipboardwndproc.c.orig	2006-06-05 13:16:01.000000000 +0100
>+++ winclipboardwndproc.c	2006-06-05 13:16:41.000000000 +0100
>@@ -35,6 +35,8 @@
> #include <sys/time.h>
> #include "winclipboard.h"
> 
>+extern void		winFixClipboardChain();
>+
> 
> /*
>  * Constants
>@@ -181,28 +183,10 @@
> 
>     case WM_CHANGECBCHAIN:
>       {
>-	static Bool s_fProcessingChangeCBChain = FALSE;
> 	winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: wParam(%x) "
> 		  "lParam(%x) s_hwndNextViewer(%x)\n", 
> 		  wParam, lParam, s_hwndNextViewer);
> 
>-
>-	/*
>-	 * We've occasionally seen a loop in the clipboard chain.  Break
>-	 * it on the first hint of recursion.
>-	 */
>-	if (! s_fProcessingChangeCBChain) 
>-	  {
>-	    s_fProcessingChangeCBChain = TRUE;
>-	  }
>-	else
>-	  {
>-	    winErrorFVerb (1, "winClipboardWindowProc - WM_CHANGECBCHAIN - "
>-			   "Nested calls detected.  Bailing.\n");
>-	    winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");
>-	    return 0;
>-	  }
>-	
> 	if ((HWND) wParam == s_hwndNextViewer)
> 	  {
> 	    s_hwndNextViewer = (HWND) lParam;
>@@ -217,7 +201,6 @@
> 	  SendMessage (s_hwndNextViewer, message,
> 		       wParam, lParam);
> 
>-	s_fProcessingChangeCBChain = FALSE;
>       }
>       winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");
>       return 0;
>@@ -274,8 +257,8 @@
> 	winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Enter\n");
> 
> 	/*
>-	 * We've occasionally seen a loop in the clipboard chain.  Break
>-	 * it on the first hint of recursion.
>+	 * We've occasionally seen a loop in the clipboard chain.
>+	 * Try and fix it on the first hint of recursion.
> 	 */
> 	if (! s_fProcessingDrawClipboard) 
> 	  {
>@@ -283,16 +266,17 @@
> 	  }
> 	else
> 	  {
>+	    /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */
>+	    s_fCBCInitialized = FALSE;
>+	    ChangeClipboardChain (hwnd, s_hwndNextViewer);
>+	    winFixClipboardChain();
> 	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
>-			   "Nested calls detected.  Bailing.\n");
>+			   "Nested calls detected.  Re-initing.\n");
> 	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
>+	    s_fProcessingDrawClipboard = FALSE;
> 	    return 0;
> 	  }
> 
>-	/* Pass the message on the next window in the clipboard viewer chain */
>-	if (s_hwndNextViewer)
>-	  SendMessage (s_hwndNextViewer, message, 0, 0);
>-	
> 	/* Bail on first message */
> 	if (!s_fCBCInitialized)
> 	  {
>@@ -318,6 +302,8 @@
> 		    "We own the clipboard, returning.\n");
> 	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
> 	    s_fProcessingDrawClipboard = FALSE;
>+	    if (s_hwndNextViewer)
>+		SendMessage (s_hwndNextViewer, message, wParam, lParam);
> 	    return 0;
> 	  }
> 
>@@ -379,6 +365,8 @@
> 
> 	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
> 	    s_fProcessingDrawClipboard = FALSE;
>+	    if (s_hwndNextViewer)
>+		SendMessage (s_hwndNextViewer, message, wParam, lParam);
> 	    return 0;
> 	  }
> 
>@@ -422,6 +410,9 @@
> 	s_fProcessingDrawClipboard = FALSE;
>       }
>       winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
>+      /* Pass the message on the next window in the clipboard viewer chain */
>+      if (s_hwndNextViewer)
>+	SendMessage (s_hwndNextViewer, message, wParam, lParam);
>       return 0;
> 
>

Actions: View | Splinter Review

Attachments on bug 7121: 5822

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.