reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Get rid of the unused parameter in the EmptyClipboard driver entry point.

Browse Source
This commit is contained in:
Alexandre Julliard 2015-06-03 16:38:44 +09:00
parent f5066488e9
commit b7c340de73
7 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user32/clipboard.c
View File

@ -299,8 +299,7 @@ BOOL WINAPI EmptyClipboard(void)
* to clear its cache. */
USER_Driver->pAcquireClipboard(cbinfo.hWndOpen);
/* Empty the local cache */
USER_Driver->pEmptyClipboard(FALSE);
USER_Driver->pEmptyClipboard();
bCBHasChanged = TRUE;

6
dlls/user32/driver.c
View File

@ -344,7 +344,7 @@ static BOOL CDECL nulldrv_CountClipboardFormats(void)
return 0;
}
static void CDECL nulldrv_EmptyClipboard( BOOL keepunowned )
static void CDECL nulldrv_EmptyClipboard(void)
{
}
@ -684,9 +684,9 @@ static BOOL CDECL loaderdrv_CountClipboardFormats(void)
return load_driver()->pCountClipboardFormats();
}
static void CDECL loaderdrv_EmptyClipboard( BOOL keepunowned )
static void CDECL loaderdrv_EmptyClipboard(void)
{
load_driver()->pEmptyClipboard( keepunowned );
load_driver()->pEmptyClipboard();
}
static void CDECL loaderdrv_EndClipboardUpdate(void)

2
dlls/user32/user_private.h
View File

@ -82,7 +82,7 @@ typedef struct tagUSER_DRIVER {
/* clipboard functions */
INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */
BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */
void (CDECL *pEmptyClipboard)(BOOL); /* Empty clipboard data */
void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */
void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */
UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */
HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */

4
dlls/winemac.drv/clipboard.c
View File

@ -1952,9 +1952,9 @@ INT CDECL macdrv_CountClipboardFormats(void)
*
* Empty cached clipboard data.
*/
void CDECL macdrv_EmptyClipboard(BOOL keepunowned)
void CDECL macdrv_EmptyClipboard(void)
{
TRACE("keepunowned %d\n", keepunowned);
TRACE("()\n");
macdrv_clear_pasteboard();
}

2
dlls/winemac.drv/winemac.drv.spec
View File

@ -14,7 +14,7 @@
@ cdecl CreateWindow(long) macdrv_CreateWindow
@ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon
@ cdecl DestroyWindow(long) macdrv_DestroyWindow
@ cdecl EmptyClipboard(long) macdrv_EmptyClipboard
@ cdecl EmptyClipboard() macdrv_EmptyClipboard
@ cdecl EndClipboardUpdate() macdrv_EndClipboardUpdate
@ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats
@ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors

25
dlls/winex11.drv/clipboard.c
View File

@ -129,7 +129,6 @@ static int selectionAcquired = 0; /* Contains the current selection
static Window selectionWindow = None; /* The top level X window which owns the selection */
static Atom selectionCacheSrc = XA_PRIMARY; /* The selection source from which the clipboard cache was filled */
void CDECL X11DRV_EmptyClipboard(BOOL keepunowned);
void CDECL X11DRV_EndClipboardUpdate(void);
static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom prop);
static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop);
@ -171,6 +170,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display);
static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display);
static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display);
static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple );
static void empty_clipboard( BOOL keepunowned );
/* Clipboard formats */
@ -621,7 +621,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(void)
}
else if (wSeqNo < seqno)
{
X11DRV_EmptyClipboard(TRUE);
empty_clipboard( TRUE );
if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0)
{
@ -2862,7 +2862,7 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi
selectionWindow = None;
X11DRV_EmptyClipboard(FALSE);
empty_clipboard( FALSE );
/* Reset the selection flags now that we are done */
selectionAcquired = S_NOSELECTION;
@ -2982,12 +2982,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow)
}
/**************************************************************************
* X11DRV_EmptyClipboard
*
* Empty cached clipboard data.
*/
void CDECL X11DRV_EmptyClipboard(BOOL keepunowned)
static void empty_clipboard(BOOL keepunowned)
{
WINE_CLIPDATA *data, *next;
@ -3003,7 +2998,15 @@ void CDECL X11DRV_EmptyClipboard(BOOL keepunowned)
TRACE(" %d entries remaining in cache.\n", ClipDataCount);
}
/**************************************************************************
* X11DRV_EmptyClipboard
*
* Empty cached clipboard data.
*/
void CDECL X11DRV_EmptyClipboard(void)
{
empty_clipboard( FALSE );
}
/**************************************************************************
* X11DRV_SetClipboardData
@ -3154,7 +3157,7 @@ void X11DRV_ResetSelectionOwner(void)
WARN("Failed to find another thread to take selection ownership. Clipboard data will be lost.\n");
X11DRV_CLIPBOARD_ReleaseOwnership();
X11DRV_EmptyClipboard(FALSE);
empty_clipboard( FALSE );
}

2
dlls/winex11.drv/winex11.drv.spec
View File

@ -28,7 +28,7 @@
@ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow
@ cdecl CreateWindow(long) X11DRV_CreateWindow
@ cdecl DestroyWindow(long) X11DRV_DestroyWindow
@ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard
@ cdecl EmptyClipboard() X11DRV_EmptyClipboard
@ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate
@ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats
@ cdecl GetClipboardData(long) X11DRV_GetClipboardData