Skip to content

W
wine-winehq
Commit c7d2a4dd authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Remove the unused clipboard format flags.

parent b1af55d5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
dlls/winex11.drv/clipboard.c
View file @ c7d2a4dd
...@@ -114,7 +114,6 @@ typedef struct tagWINE_CLIPFORMAT { ...@@ -114,7 +114,6 @@ typedef struct tagWINE_CLIPFORMAT {
struct list entry; struct list entry;
UINT wFormatID; UINT wFormatID;
UINT drvData; UINT drvData;
UINT wFlags;
DRVIMPORTFUNC lpDrvImportFunc; DRVIMPORTFUNC lpDrvImportFunc;
DRVEXPORTFUNC lpDrvExportFunc; DRVEXPORTFUNC lpDrvExportFunc;
} WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT;
...@@ -128,10 +127,8 @@ typedef struct tagWINE_CLIPDATA { ...@@ -128,10 +127,8 @@ typedef struct tagWINE_CLIPDATA {
LPWINE_CLIPFORMAT lpFormat; LPWINE_CLIPFORMAT lpFormat;
} WINE_CLIPDATA, *LPWINE_CLIPDATA; } WINE_CLIPDATA, *LPWINE_CLIPDATA;
#define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ #define CF_FLAG_UNOWNED 0x0001 /* cached data is not owned */
#define CF_FLAG_UNOWNED 0x0002 /* cached data is not owned */ #define CF_FLAG_SYNTHESIZED 0x0002 /* Implicitly converted data */
#define CF_FLAG_SYNTHESIZED 0x0004 /* Implicitly converted data */
#define CF_FLAG_UNICODE 0x0008 /* Data is in unicode */
static int selectionAcquired = 0; /* Contains the current selection masks */ static int selectionAcquired = 0; /* Contains the current selection masks */
static Window selectionWindow = None; /* The top level X window which owns the selection */ static Window selectionWindow = None; /* The top level X window which owns the selection */
...@@ -332,7 +329,6 @@ void X11DRV_InitClipboard(void) ...@@ -332,7 +329,6 @@ void X11DRV_InitClipboard(void)
if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format )))) break; if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format )))) break;
format->wFormatID = builtin_formats[i].id; format->wFormatID = builtin_formats[i].id;
format->drvData = GET_ATOM(builtin_formats[i].data); format->drvData = GET_ATOM(builtin_formats[i].data);
format->wFlags = CF_FLAG_BUILTINFMT;
format->lpDrvImportFunc = builtin_formats[i].import; format->lpDrvImportFunc = builtin_formats[i].import;
format->lpDrvExportFunc = builtin_formats[i].export; format->lpDrvExportFunc = builtin_formats[i].export;
list_add_tail( &format_list, &format->entry ); list_add_tail( &format_list, &format->entry );
...@@ -410,8 +406,7 @@ static WINE_CLIPFORMAT *register_format( UINT id, Atom prop ) ...@@ -410,8 +406,7 @@ static WINE_CLIPFORMAT *register_format( UINT id, Atom prop )
/* walk format chain to see if it's already registered */ /* walk format chain to see if it's already registered */
LIST_FOR_EACH_ENTRY( lpFormat, &format_list, WINE_CLIPFORMAT, entry ) LIST_FOR_EACH_ENTRY( lpFormat, &format_list, WINE_CLIPFORMAT, entry )
if ((lpFormat->wFormatID == id) && (lpFormat->wFlags & CF_FLAG_BUILTINFMT) == 0) if (lpFormat->wFormatID == id) return lpFormat;
return lpFormat;
return X11DRV_CLIPBOARD_InsertClipboardFormat(id, prop); return X11DRV_CLIPBOARD_InsertClipboardFormat(id, prop);
} }
...@@ -469,7 +464,6 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr ...@@ -469,7 +464,6 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr
WARN("No more memory for a new format!\n"); WARN("No more memory for a new format!\n");
return NULL; return NULL;
} }
lpNewFormat->wFlags = 0;
lpNewFormat->wFormatID = id; lpNewFormat->wFormatID = id;
lpNewFormat->drvData = prop; lpNewFormat->drvData = prop;
lpNewFormat->lpDrvImportFunc = X11DRV_CLIPBOARD_ImportClipboardData; lpNewFormat->lpDrvImportFunc = X11DRV_CLIPBOARD_ImportClipboardData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment