Jacek Caban : winex11: Remove unused cf_xdnd from XDNDDATA.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:30:33 CDT 2022
Module: wine
Branch: master
Commit: 306ad4786d980b44785c6f1cb9f9c65f7fba2c56
URL: https://source.winehq.org/git/wine.git/?a=commit;h=306ad4786d980b44785c6f1cb9f9c65f7fba2c56
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 25 16:59:25 2022 +0200
winex11: Remove unused cf_xdnd from XDNDDATA.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/clipboard.c | 4 ++--
dlls/winex11.drv/x11drv.h | 2 +-
dlls/winex11.drv/xdnd.c | 6 ++----
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 137bc04c659..8fdfb87a671 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -1051,7 +1051,7 @@ static HANDLE import_selection( Display *display, Window win, Atom selection,
*/
void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection,
Atom *targets, UINT count,
- void (*callback)( Atom, UINT, HANDLE ))
+ void (*callback)( UINT, HANDLE ))
{
UINT i;
HANDLE handle;
@@ -1064,7 +1064,7 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select
if (!(format = find_x11_format( targets[i] ))) continue;
if (!format->id) continue;
if (!(handle = import_selection( display, win, selection, format ))) continue;
- callback( targets[i], format->id, handle );
+ callback( format->id, handle );
}
}
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index da037297745..a8d2f78aa6b 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -299,7 +299,7 @@ extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLS
extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN;
extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection,
Atom *targets, UINT count,
- void (*callback)( Atom, UINT, HANDLE )) DECLSPEC_HIDDEN;
+ void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN;
/**************************************************************************
* X11 GDI driver
diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c
index eb685613b7b..b9bba1ff872 100644
--- a/dlls/winex11.drv/xdnd.c
+++ b/dlls/winex11.drv/xdnd.c
@@ -48,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd);
typedef struct tagXDNDDATA
{
int cf_win;
- Atom cf_xdnd;
HANDLE contents;
struct list entry;
} XDNDDATA, *LPXDNDDATA;
@@ -63,7 +62,7 @@ static HWND XDNDLastTargetWnd;
/* might be an ancestor of XDNDLastTargetWnd */
static HWND XDNDLastDropTargetWnd;
-static void X11DRV_XDND_InsertXDNDData( Atom property, UINT format, HANDLE contents );
+static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents );
static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm,
Atom *types, unsigned long count);
static BOOL X11DRV_XDND_HasHDROP(void);
@@ -565,14 +564,13 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm,
*
* Cache available XDND property
*/
-static void X11DRV_XDND_InsertXDNDData( Atom property, UINT format, HANDLE contents )
+static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents )
{
LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA));
if (current)
{
EnterCriticalSection(&xdnd_cs);
- current->cf_xdnd = property;
current->cf_win = format;
current->contents = contents;
list_add_tail(&xdndData, ¤t->entry);
More information about the wine-cvs
mailing list