Huw Davies : winex11.drv: Fix typo so that emf -> mfpict synthesis works.
Alexandre Julliard
julliard at winehq.org
Mon Apr 20 11:33:07 CDT 2009
Module: wine
Branch: master
Commit: 0b6d74c4282eeef61ae4b4e1be8db2cd919be5c7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6d74c4282eeef61ae4b4e1be8db2cd919be5c7
Author: Huw Davies <huw at codeweavers.com>
Date: Fri Apr 17 14:49:29 2009 +0100
winex11.drv: Fix typo so that emf -> mfpict synthesis works.
---
dlls/user32/tests/clipboard.c | 5 ++---
dlls/winex11.drv/clipboard.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c
index 41561a4..51aa852 100644
--- a/dlls/user32/tests/clipboard.c
+++ b/dlls/user32/tests/clipboard.c
@@ -247,10 +247,9 @@ static void test_synthesized(void)
ok(cf == CF_UNICODETEXT, "cf %08x\n", cf);
cf = EnumClipboardFormats(cf);
- todo_wine ok(cf == CF_METAFILEPICT, "cf %08x\n", cf);
- if(cf == CF_METAFILEPICT)
- cf = EnumClipboardFormats(cf);
+ ok(cf == CF_METAFILEPICT, "cf %08x\n", cf);
+ cf = EnumClipboardFormats(cf);
ok(cf == 0, "cf %08x\n", cf);
r = EmptyClipboard();
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 07d58a5..e7f4667 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -2746,7 +2746,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID)
}
else if (wFormatID == CF_METAFILEPICT)
{
- bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_METAFILEPICT)) &&
+ bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_ENHMETAFILE)) &&
~lpSource->wFlags & CF_FLAG_SYNTHESIZED;
}
else if (wFormatID == CF_DIB)
More information about the wine-cvs
mailing list