Vincent Povirk : winex11.drv: ReadSelectionData should fail if the import function fails.
Alexandre Julliard
julliard at winehq.org
Thu Mar 18 11:19:26 CDT 2010
Module: wine
Branch: master
Commit: 1eff311e8da7d2ca202427933b1e31302dddaef3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eff311e8da7d2ca202427933b1e31302dddaef3
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Mar 17 11:39:35 2010 -0500
winex11.drv: ReadSelectionData should fail if the import function fails.
---
dlls/winex11.drv/clipboard.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index f4e49e2..4d4306e 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -2199,7 +2199,10 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA
HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, xe.xselection.requestor,
xe.xselection.property);
- bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE);
+ if (hData)
+ bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, 0, lpData->lpFormat, TRUE);
+ else
+ TRACE("Import function failed\n");
}
else
{
More information about the wine-cvs
mailing list