ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x11drv: Fix two clipboard bugs. 

Fix two clipboard problems that caused BadAtom crashes and caused some
clipboard formats to not be exported properly.
This commit is contained in:
Dan Kegel 2006-04-09 14:47:21 -07:00 committed by Alexandre Julliard
parent 12be14b6cc
commit d5292cb3f4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/x11drv/clipboard.c
View File

@ -1784,6 +1784,10 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p
if (names) if (names)
{ {
wine_tsx11_lock(); wine_tsx11_lock();
/* FIXME: we're at the mercy of the app sending the event here.
* Currently if they send a bogus atom, we will crash.
* We should handle BadAtom errors gracefully in this call.
*/
XGetAtomNames( display, atoms, nb_atoms, names ); XGetAtomNames( display, atoms, nb_atoms, names );
wine_tsx11_unlock(); wine_tsx11_unlock();
for (i = 0; i < nb_atoms; i++) for (i = 0; i < nb_atoms; i++)
@ -2790,6 +2794,13 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
LPWINE_CLIPFORMAT lpFormats; LPWINE_CLIPFORMAT lpFormats;
LPWINE_CLIPDATA lpData; LPWINE_CLIPDATA lpData;
/* Create X atoms for any clipboard types which don't have atoms yet.
* This avoids sending bogus zero atoms.
* Without this, copying might not have access to all clipboard types.
* FIXME: is it safe to call this here?
*/
intern_atoms();
/* /*
* Count the number of items we wish to expose as selection targets. * Count the number of items we wish to expose as selection targets.
*/ */
@ -2804,7 +2815,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
while (lpFormats) while (lpFormats)
{ {
if ((lpFormats->wFormatID == lpData->wFormatID) && if ((lpFormats->wFormatID == lpData->wFormatID) &&
lpFormats->lpDrvExportFunc) lpFormats->lpDrvExportFunc && lpFormats->drvData)
cTargets++; cTargets++;
lpFormats = lpFormats->NextFormat; lpFormats = lpFormats->NextFormat;
@ -2832,7 +2843,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
while (lpFormats) while (lpFormats)
{ {
if ((lpFormats->wFormatID == lpData->wFormatID) && if ((lpFormats->wFormatID == lpData->wFormatID) &&
lpFormats->lpDrvExportFunc) lpFormats->lpDrvExportFunc && lpFormats->drvData)
targets[i++] = lpFormats->drvData; targets[i++] = lpFormats->drvData;
lpFormats = lpFormats->NextFormat; lpFormats = lpFormats->NextFormat;
@ -2849,12 +2860,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
unsigned int i; unsigned int i;
for ( i = 0; i < cTargets; i++) for ( i = 0; i < cTargets; i++)
{ {
if (targets[i]) char *itemFmtName = XGetAtomName(display, targets[i]);
{ TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName);
char *itemFmtName = XGetAtomName(display, targets[i]); XFree(itemFmtName);
TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName);
XFree(itemFmtName);
}
} }
} }