Fixed handling of synthesized data.

Don't report errors when there is no selection owner. Reintegrate the COMPOUND_TEXT patch by Kusanagi Kouichi.

Fixed handling of synthesized data.
18873e77 · Ulrich Czekalla · Alexandre Julliard · d5ca917a · 18873e77 · 18873e77
Commit 18873e77 authored Jul 08, 2003 by Ulrich Czekalla Committed by Alexandre Julliard Jul 08, 2003
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

clipboard.c dlls/x11drv/clipboard.c +0 -0

event.c dlls/x11drv/event.c +2 -1

x11drv.h dlls/x11drv/x11drv.h +2 -1

No files found.
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
--- a/dlls/x11drv/event.c
+++ b/dlls/x11drv/event.c
@@ -829,7 +829,8 @@ static void EVENT_SelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BO
          {
              unsigned char* lpClipData;
              DWORD cBytes;
-              HANDLE hClipData = lpFormat->lpDrvExportFunc(lpData, &cBytes);
+              HANDLE hClipData = lpFormat->lpDrvExportFunc(request, event->target,
+                  rprop, lpData, &cBytes);

              if (hClipData && (lpClipData = GlobalLock(hClipData)))
              {

--- a/dlls/x11drv/x11drv.h
+++ b/dlls/x11drv/x11drv.h
@@ -396,7 +396,8 @@ typedef struct tagWINE_CLIPDATA {
    struct tagWINE_CLIPDATA *NextData;
 } WINE_CLIPDATA, *LPWINE_CLIPDATA;

-typedef HANDLE (*DRVEXPORTFUNC)(LPWINE_CLIPDATA lpData, LPDWORD lpBytes);
+typedef HANDLE (*DRVEXPORTFUNC)(Window requestor, Atom aTarget, Atom rprop,
+    LPWINE_CLIPDATA lpData, LPDWORD lpBytes);
 typedef HANDLE (*DRVIMPORTFUNC)(LPBYTE hData, UINT cBytes);

 typedef struct tagWINE_CLIPFORMAT {