reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-27 06:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11: Convert the clipboard data list to a standard Wine list.

Browse Source
This commit is contained in:
Alexandre Julliard 2011-03-03 20:25:01 +01:00
parent 4ec8e1a037
commit bfa753ba55
1 changed files with 24 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "x11drv.h" #include "x11drv.h"
#include "wine/list.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/server.h" #include "wine/server.h"
@ -121,13 +122,12 @@ typedef struct tagWINE_CLIPFORMAT {
} WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT;
typedef struct tagWINE_CLIPDATA { typedef struct tagWINE_CLIPDATA {
struct list entry;
UINT wFormatID; UINT wFormatID;
HANDLE hData; HANDLE hData;
UINT wFlags; UINT wFlags;
UINT drvData; UINT drvData;
LPWINE_CLIPFORMAT lpFormat; LPWINE_CLIPFORMAT lpFormat;
struct tagWINE_CLIPDATA *PrevData;
struct tagWINE_CLIPDATA *NextData;
} WINE_CLIPDATA, *LPWINE_CLIPDATA; } WINE_CLIPDATA, *LPWINE_CLIPDATA;
#define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ #define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */
@ -311,7 +311,7 @@ static const struct
/* /*
* Cached clipboard data. * Cached clipboard data.
*/ */
static LPWINE_CLIPDATA ClipData = NULL; static struct list data_list = LIST_INIT( data_list );
static UINT ClipDataCount = 0; static UINT ClipDataCount = 0;
/* /*
@ -487,24 +487,12 @@ static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT curre
*/ */
static LPWINE_CLIPDATA X11DRV_CLIPBOARD_LookupData(DWORD wID) static LPWINE_CLIPDATA X11DRV_CLIPBOARD_LookupData(DWORD wID)
{ {
LPWINE_CLIPDATA lpData = ClipData; WINE_CLIPDATA *data;
if (lpData) LIST_FOR_EACH_ENTRY( data, &data_list, WINE_CLIPDATA, entry )
{ if (data->wFormatID == wID) return data;
do
{
if (lpData->wFormatID == wID)
break;
lpData = lpData->NextData; return NULL;
}
while(lpData != ClipData);
if (lpData->wFormatID != wID)
lpData = NULL;
}
return lpData;
} }
@ -649,23 +637,7 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, D
lpData->lpFormat = lpFormat; lpData->lpFormat = lpFormat;
lpData->drvData = 0; lpData->drvData = 0;
if (ClipData) list_add_tail( &data_list, &lpData->entry );
{
LPWINE_CLIPDATA lpPrevData = ClipData->PrevData;
lpData->PrevData = lpPrevData;
lpData->NextData = ClipData;
lpPrevData->NextData = lpData;
ClipData->PrevData = lpData;
}
else
{
lpData->NextData = lpData;
lpData->PrevData = lpData;
ClipData = lpData;
}
ClipDataCount++; ClipDataCount++;
} }
@ -2734,33 +2706,15 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow)
*/ */
void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) void CDECL X11DRV_EmptyClipboard(BOOL keepunowned)
{ {
if (ClipData) WINE_CLIPDATA *data, *next;
LIST_FOR_EACH_ENTRY_SAFE( data, next, &data_list, WINE_CLIPDATA, entry )
{ {
LPWINE_CLIPDATA lpData, lpStart; if (keepunowned && (data->wFlags & CF_FLAG_UNOWNED)) continue;
LPWINE_CLIPDATA lpNext = ClipData; list_remove( &data->entry );
X11DRV_CLIPBOARD_FreeData( data );
TRACE(" called with %d entries in cache.\n", ClipDataCount); HeapFree( GetProcessHeap(), 0, data );
ClipDataCount--;
do
{
lpStart = ClipData;
lpData = lpNext;
lpNext = lpData->NextData;
if (!keepunowned || !(lpData->wFlags & CF_FLAG_UNOWNED))
{
lpData->PrevData->NextData = lpData->NextData;
lpData->NextData->PrevData = lpData->PrevData;
if (lpData == ClipData)
ClipData = lpNext != lpData ? lpNext : NULL;
X11DRV_CLIPBOARD_FreeData(lpData);
HeapFree(GetProcessHeap(), 0, lpData);
ClipDataCount--;
}
} while (lpNext != lpStart);
} }
TRACE(" %d entries remaining in cache.\n", ClipDataCount); TRACE(" %d entries remaining in cache.\n", ClipDataCount);
@ -2820,7 +2774,7 @@ INT CDECL X11DRV_CountClipboardFormats(void)
UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat)
{ {
CLIPBOARDINFO cbinfo; CLIPBOARDINFO cbinfo;
UINT wNextFormat = 0; struct list *ptr = NULL;
TRACE("(%04X)\n", wFormat); TRACE("(%04X)\n", wFormat);
@ -2828,18 +2782,16 @@ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat)
if (!wFormat) if (!wFormat)
{ {
if (ClipData) ptr = list_head( &data_list );
wNextFormat = ClipData->wFormatID;
} }
else else
{ {
LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormat); LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormat);
if (lpData) ptr = list_next( &data_list, &lpData->entry );
if (lpData && lpData->NextData != ClipData)
wNextFormat = lpData->NextData->wFormatID;
} }
return wNextFormat; if (!ptr) return 0;
return LIST_ENTRY( ptr, WINE_CLIPDATA, entry )->wFormatID;
} }
@ -3032,9 +2984,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
*/ */
cTargets = 1; /* Include TARGETS */ cTargets = 1; /* Include TARGETS */
if (!(lpData = ClipData)) return None; if (!list_head( &data_list )) return None;
do LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry )
{ {
lpFormats = ClipFormats; lpFormats = ClipFormats;
@ -3046,10 +2998,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
lpFormats = lpFormats->NextFormat; lpFormats = lpFormats->NextFormat;
} }
lpData = lpData->NextData;
} }
while (lpData != ClipData);
TRACE(" found %d formats\n", cTargets); TRACE(" found %d formats\n", cTargets);
@ -3059,10 +3008,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
return None; return None;
i = 0; i = 0;
lpData = ClipData;
targets[i++] = x11drv_atom(TARGETS); targets[i++] = x11drv_atom(TARGETS);
do LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry )
{ {
lpFormats = ClipFormats; lpFormats = ClipFormats;
@ -3074,10 +3022,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
lpFormats = lpFormats->NextFormat; lpFormats = lpFormats->NextFormat;
} }
lpData = lpData->NextData;
} }
while (lpData != ClipData);
wine_tsx11_lock(); wine_tsx11_lock();