commit 0c468c816ca352c76a3561d76567b587a1ee09e1
author Ulrich Czekalla <ulrich.czekalla@utoronto.ca> Mon Jun 05 11:55:14 2006 -0400
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 05 21:01:30 2006 +0200
tree 0254959c4fde2c49a014066c6a1079d68325991f
parent 00b2511bc84d8c3b5b926a0a4d552d83308fce1a

x11drv: Improve handling of the case where the clipboard is opened
with a window from another thread or process.

dlls/user/user_private.h

diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h
index a58ba5e..ffb2796 100644
--- a/dlls/user/user_private.h
+++ b/dlls/user/user_private.h
@@ -122,7 +122,7 @@
     BOOL   (*pGetScreenSaveActive)(void);
     void   (*pSetScreenSaveActive)(BOOL);
     /* clipboard functions */
-    void   (*pAcquireClipboard)(HWND);                     /* Acquire selection */
+    INT    (*pAcquireClipboard)(HWND);                     /* Acquire selection */
     BOOL   (*pCountClipboardFormats)(void);                /* Count available clipboard formats */
     void   (*pEmptyClipboard)(BOOL);                       /* Empty clipboard data */
     void   (*pEndClipboardUpdate)(void);                   /* End clipboard update */
@@ -131,7 +131,6 @@
     INT    (*pGetClipboardFormatName)(UINT, LPWSTR, UINT); /* Get a clipboard format name */
     BOOL   (*pIsClipboardFormatAvailable)(UINT);           /* Check if specified format is available */
     UINT   (*pRegisterClipboardFormat)(LPCWSTR);           /* Register a clipboard format */
-    void   (*pResetSelectionOwner)(HWND, BOOL);
     BOOL   (*pSetClipboardData)(UINT, HANDLE16, HANDLE, BOOL);   /* Set specified selection data */
     /* display modes */
     LONG   (*pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);