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

ole32: Handle CF_HDROP format. 

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jactry Zeng 2021-03-10 10:41:30 +00:00 committed by Alexandre Julliard
parent 6cc5f9a6ff
commit 1a82fbf433
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ole32/clipboard.c
View File

@ -1138,6 +1138,7 @@ static DWORD get_tymed_from_nonole_cf(UINT cf)
case CF_TEXT:
case CF_OEMTEXT:
case CF_UNICODETEXT:
case CF_HDROP:
return TYMED_ISTREAM | TYMED_HGLOBAL;
case CF_ENHMETAFILE:
return TYMED_ENHMF;

32
dlls/ole32/tests/clipboard.c
View File

@ -28,6 +28,8 @@
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "shellapi.h"
#include "shlobj.h"
#include "wine/test.h"
@ -1513,6 +1515,24 @@ static HENHMETAFILE create_emf(void)
return CloseEnhMetaFile(hdc);
}
static HDROP create_dropped_file(void)
{
WCHAR path[] = L"C:\\testfile1\0";
DROPFILES *dropfiles;
DWORD offset;
HDROP hdrop;
offset = sizeof(DROPFILES);
hdrop = GlobalAlloc(GHND, offset + sizeof(path));
dropfiles = GlobalLock(hdrop);
dropfiles->pFiles = offset;
dropfiles->fWide = TRUE;
memcpy((char *)dropfiles + offset, path, sizeof(path));
GlobalUnlock(hdrop);
return hdrop;
}
static void test_nonole_clipboard(void)
{
HRESULT hr;
@ -1524,6 +1544,7 @@ static void test_nonole_clipboard(void)
HENHMETAFILE emf;
STGMEDIUM med;
DWORD obj_type;
HDROP hdrop;
r = OpenClipboard(NULL);
ok(r, "gle %d\n", GetLastError());
@ -1552,6 +1573,7 @@ static void test_nonole_clipboard(void)
hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10);
emf = create_emf();
hstorage = create_storage();
hdrop = create_dropped_file();
r = OpenClipboard(NULL);
ok(r, "gle %d\n", GetLastError());
@ -1563,6 +1585,8 @@ static void test_nonole_clipboard(void)
ok(h == emf, "got %p\n", h);
h = SetClipboardData(cf_storage, hstorage);
ok(h == hstorage, "got %p\n", h);
h = SetClipboardData(CF_HDROP, hdrop);
ok(h == hdrop, "got %p\n", h);
r = CloseClipboard();
ok(r, "gle %d\n", GetLastError());
@ -1608,6 +1632,14 @@ static void test_nonole_clipboard(void)
ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex);
ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed);
hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
ok(hr == S_OK, "got %08x\n", hr);
ok(fmt.cfFormat == CF_HDROP, "cf %04x\n", fmt.cfFormat);
ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd);
ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);
ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex);
ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed);
hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */