April 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tests: Tests for LVM_GETCOLUMNORDERARRAY: it actually uses HDM_GETORDERARRAY.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 3845ed795f65a4fdaf179c7a93bcd09f9fcb741d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3845ed795f65a4fdaf179c7a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 24 14:51:43 2009 +0400 comctl32/tests: Tests for LVM_GETCOLUMNORDERARRAY: it actually uses HDM_GETORDERARRAY. --- dlls/comctl32/tests/listview.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8fcf0f4..1612171 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -152,6 +152,12 @@ static const struct message listview_ownerdata_switchto_seq[] = { { 0 } }; +static const struct message listview_getorderarray_seq[] = { + { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, + { HDM_GETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -800,9 +806,10 @@ static void test_items(void) static void test_columns(void) { - HWND hwnd; + HWND hwnd, hwndheader; LVCOLUMN column; DWORD rc; + INT order[2]; hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -821,6 +828,31 @@ static void test_columns(void) "Inserting column with no mask failed to set width to 10 with %d\n", rc); DestroyWindow(hwnd); + + /* LVM_GETCOLUMNORDERARRAY */ + hwnd = create_listview_control(0); + hwndheader = subclass_header(hwnd); + + memset(&column, 0, sizeof(column)); + column.mask = LVCF_WIDTH; + column.cx = 100; + rc = ListView_InsertColumn(hwnd, 0, &column); + ok(rc == 0, "Inserting column failed with %d\n", rc); + + column.cx = 200; + rc = ListView_InsertColumn(hwnd, 1, &column); + ok(rc == 1, "Inserting column failed with %d\n", rc); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + rc = SendMessage(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc != 0, "Expected LVM_GETCOLUMNORDERARRAY to succeed\n"); + ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); + ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", TRUE); + + DestroyWindow(hwnd); } /* test setting imagelist between WM_NCCREATE and WM_CREATE */ static WNDPROC listviewWndProc;

1 0

Konstantin Kondratyuk : fonts: Add Kazakhstan's symbols into tahoma.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 3ae2e3a76281622f1562de70b8144b603aad1ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae2e3a76281622f1562de70b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Apr 24 15:10:32 2009 +0400 fonts: Add Kazakhstan's symbols into tahoma. --- fonts/tahoma.sfd | 643 +++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahoma.ttf | Bin 85796 -> 89124 bytes 2 files changed, 637 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ae2e3a76281622f1562d…

1 0

Paul Vriens : setupapi/tests: Fix a test failure on Win98.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 97505798ec1c9154835f529c47a3e66ef2f96525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97505798ec1c9154835f529c4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 11:56:10 2009 +0200 setupapi/tests: Fix a test failure on Win98. --- dlls/setupapi/tests/misc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 726d1eb..e110e22 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -144,7 +144,7 @@ static void test_SetupCopyOEMInf(void) CHAR toolong[MAX_PATH * 2]; CHAR path[MAX_PATH], dest[MAX_PATH]; CHAR tmpfile[MAX_PATH], dest_save[MAX_PATH]; - LPSTR inf; + LPSTR inf = NULL; DWORD size; BOOL res; @@ -293,6 +293,9 @@ static void test_SetupCopyOEMInf(void) ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); + ok((inf && inf[0] != 0) || + broken(!inf), /* Win98 */ + "Expected inf to point to the filename\n"); ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n");

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win98.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 6d1d5b653f33b9e99a36341de3f0802ecb82f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1d5b653f33b9e99a36341de… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 24 09:29:12 2009 +0200 shell32/tests: Fix a test failure on Win98. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3720340..0536d2e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -147,8 +147,10 @@ static void test_ParseDisplayName(void) ok(SUCCEEDED(hr), "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (FAILED(hr)) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31, "Last pidl should be of type " - "PT_FOLDER, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || + pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ + "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", + pILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); finished:

1 0

Huw Davies : winex11.drv: Print clipboard formats in hex.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 3f7b2b99329b180026f81b45012f56b221590148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7b2b99329b180026f81b450… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 24 12:24:52 2009 +0100 winex11.drv: Print clipboard formats in hex. --- dlls/winex11.drv/clipboard.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e7f4667..bb29b82 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -537,7 +537,7 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(LPCWSTR FormatNam lpFormat->NextFormat = lpNewFormat; lpNewFormat->PrevFormat = lpFormat; - TRACE("Registering format(%d): %s drvData %d\n", + TRACE("Registering format(%04x): %s drvData %d\n", lpNewFormat->wFormatID, debugstr_w(FormatName), lpNewFormat->drvData); return lpNewFormat; @@ -615,7 +615,7 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE16 hData1 { LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormatID); - TRACE("format=%d lpData=%p hData16=%08x hData32=%p flags=0x%08x lpFormat=%p override=%d\n", + TRACE("format=%04x lpData=%p hData16=%08x hData32=%p flags=0x%08x lpFormat=%p override=%d\n", wFormatID, lpData, hData16, hData32, flags, lpFormat, override); if (lpData && !override) @@ -671,7 +671,7 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE16 hData1 */ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) { - TRACE("%d\n", lpData->wFormatID); + TRACE("%04x\n", lpData->wFormatID); if ((lpData->wFormatID >= CF_GDIOBJFIRST && lpData->wFormatID <= CF_GDIOBJLAST) || @@ -794,7 +794,7 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa { if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData)) { - ERR("Failed to cache clipboard data owned by another process. Format=%d\n", + ERR("Failed to cache clipboard data owned by another process. Format=%04x\n", lpData->wFormatID); bret = FALSE; } @@ -937,7 +937,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma INT src_chars, dst_chars, alloc_size; LPWINE_CLIPDATA lpSource = NULL; - TRACE(" %d\n", wFormatID); + TRACE("%04x\n", wFormatID); if ((lpSource = X11DRV_CLIPBOARD_LookupData(wFormatID)) && lpSource->hData32) @@ -947,17 +947,17 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_UNICODETEXT)) && (!(lpSource->wFlags & CF_FLAG_SYNTHESIZED) || lpSource->hData32)) { - TRACE("UNICODETEXT -> %d\n", wFormatID); + TRACE("UNICODETEXT -> %04x\n", wFormatID); } else if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_TEXT)) && (!(lpSource->wFlags & CF_FLAG_SYNTHESIZED) || lpSource->hData32)) { - TRACE("TEXT -> %d\n", wFormatID); + TRACE("TEXT -> %04x\n", wFormatID); } else if ((lpSource = X11DRV_CLIPBOARD_LookupData(CF_OEMTEXT)) && (!(lpSource->wFlags & CF_FLAG_SYNTHESIZED) || lpSource->hData32)) { - TRACE("OEMTEXT -> %d\n", wFormatID); + TRACE("OEMTEXT -> %04x\n", wFormatID); } if (!lpSource || (lpSource->wFlags & CF_FLAG_SYNTHESIZED && @@ -993,7 +993,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma if (!dst_chars) return FALSE; - TRACE("Converting from '%d' to '%d', %i chars\n", + TRACE("Converting from '%04x' to '%04x', %i chars\n", lpSource->wFormatID, wFormatID, src_chars); /* Convert characters to bytes */ @@ -1421,7 +1421,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requ *lpBytes = 0; /* Assume failure */ if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) - ERR("Failed to export %d format\n", lpData->wFormatID); + ERR("Failed to export %04x format\n", lpData->wFormatID); else { datasize = GlobalSize(lpData->hData32); @@ -1613,7 +1613,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, } } else - ERR("Failed to render %d format\n", lpData->wFormatID); + ERR("Failed to render %04x format\n", lpData->wFormatID); return 0; } @@ -1633,7 +1633,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) { - ERR("Failed to export %d format\n", lpdata->wFormatID); + ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } @@ -1667,7 +1667,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window reque { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) { - ERR("Failed to export %d format\n", lpdata->wFormatID); + ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } @@ -1685,7 +1685,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window reques { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) { - ERR("Failed to export %d format\n", lpdata->wFormatID); + ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } @@ -1762,7 +1762,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ while (lpFormat) { - TRACE("Atom#%d Property(%d): --> FormatID(%d) %s\n", + TRACE("Atom#%d Property(%d): --> FormatID(%04x) %s\n", i, lpFormat->drvData, lpFormat->wFormatID, debugstr_w(lpFormat->Name)); X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, 0, 0, lpFormat, FALSE); lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); @@ -1805,7 +1805,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p ERR("Failed to register %s property. Type will not be cached.\n", names[i]); continue; } - TRACE("Atom#%d Property(%d): --> FormatID(%d) %s\n", + TRACE("Atom#%d Property(%d): --> FormatID(%04x) %s\n", i, lpFormat->drvData, lpFormat->wFormatID, debugstr_w(lpFormat->Name)); X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, 0, 0, lpFormat, FALSE); } @@ -1952,11 +1952,11 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA XEvent xe; BOOL bRet = FALSE; - TRACE("%d\n", lpData->wFormatID); + TRACE("%04x\n", lpData->wFormatID); if (!lpData->lpFormat) { - ERR("Requesting format %d but no source format linked to data.\n", + ERR("Requesting format %04x but no source format linked to data.\n", lpData->wFormatID); return FALSE; } @@ -2666,7 +2666,7 @@ BOOL CDECL X11DRV_GetClipboardData(UINT wFormat, HANDLE16* phData16, HANDLE* phD if (phData32) *phData32 = lpRender->hData32; - TRACE(" returning hData16(%04x) hData32(%p) (type %d)\n", + TRACE(" returning hData16(%04x) hData32(%p) (type %04x)\n", lpRender->hData16, lpRender->hData32, lpRender->wFormatID); return lpRender->hData16 || lpRender->hData32; @@ -2724,7 +2724,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID) BOOL bsyn = TRUE; LPWINE_CLIPDATA lpSource = NULL; - TRACE(" %d\n", wFormatID); + TRACE(" %04x\n", wFormatID); /* Don't need to synthesize if it already exists */ if (X11DRV_CLIPBOARD_LookupData(wFormatID))

1 0

Alexandre Julliard : include: Fix the SYSTEM_CACHE_INFORMATION structure for Win64.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 1f8876b1decd892f7456828b8325ceb307326350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8876b1decd892f7456828b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 12:31:03 2009 +0200 include: Fix the SYSTEM_CACHE_INFORMATION structure for Win64. --- include/winternl.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 48fa8d0..5ebbca5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1302,9 +1302,11 @@ typedef struct _SYSTEM_CACHE_INFORMATION { ULONG CurrentSize; ULONG PeakSize; ULONG PageFaultCount; +#ifndef _WIN64 ULONG MinimumWorkingSet; ULONG MaximumWorkingSet; ULONG unused[4]; +#endif } SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; /* System Information Class 0x17 */

1 0

Alexandre Julliard : user32: Fix the DDE service formatting for 64-bit.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: b5346a8ce3c43a3cd5f570e3676b24a2fd717f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5346a8ce3c43a3cd5f570e36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 12:48:44 2009 +0200 user32: Fix the DDE service formatting for 64-bit. --- dlls/user32/dde_misc.c | 4 ++-- dlls/user32/tests/dde.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d0243c7..fda8255 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1647,7 +1647,7 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, */ WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) { - static const WCHAR fmtW[] = {'%','s','(','0','x','%','0','8','l','x',')',0}; + static const WCHAR fmtW[] = {'%','s','(','0','x','%','*','x',')',0}; WDML_SERVER* pServer; WCHAR buf1[256]; WCHAR buf2[256]; @@ -1659,7 +1659,7 @@ WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTop WDML_IncHSZ(pInstance, hszService); DdeQueryStringW(pInstance->instanceID, hszService, buf1, 256, CP_WINUNICODE); - snprintfW(buf2, 256, fmtW, buf1, GetCurrentProcessId()); + snprintfW(buf2, 256, fmtW, buf1, 2*sizeof(ULONG_PTR), GetCurrentProcessId()); pServer->hszServiceSpec = DdeCreateStringHandleW(pInstance->instanceID, buf2, CP_WINUNICODE); pServer->atomService = WDML_MakeAtomFromHsz(pServer->hszService); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e7f09f1..3fa9a4f 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -585,7 +585,7 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); ok(!strncmp(str, "TestDDEServer(", 14), "Expected TestDDEServer(, got %s\n", str); ok(str[size - 1] == ')', "Expected ')', got %c\n", str[size - 1]); - ok(size == 25, "Expected 25, got %d\n", size); + ok(size == 17 + 2*sizeof(ULONG_PTR), "Got size %d for %s\n", size, str); return (HDDEDATA)TRUE; }

1 0

Huw Davies : ole32: Fix a couple of comments.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 739ca6deae8c80d47d9f857477f03d4f938e1eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739ca6deae8c80d47d9f85747… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 24 12:15:47 2009 +0100 ole32: Fix a couple of comments. --- dlls/ole32/moniker.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 1cd18aa..f65fe8f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -340,7 +340,7 @@ RunningObjectTableImpl_AddRef(IRunningObjectTable* iface) } /*********************************************************************** - * RunningObjectTable_Initialize + * RunningObjectTable_Destroy */ static HRESULT RunningObjectTableImpl_Destroy(void) @@ -414,7 +414,7 @@ RunningObjectTableImpl_Release(IRunningObjectTable* iface) * grfFlags [in] Registration options * punkObject [in] the object being registered * pmkObjectName [in] the moniker of the object being registered - * pdwRegister [in] the value identifying the registration + * pdwRegister [out] the value identifying the registration */ static HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags,

1 0

Huw Davies : ole32: Expose the marshalled data on the clipboard rather than as a window prop so that other processes can actually read it .
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 12edc21a3a8ab38768859f758f452651adcf8eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12edc21a3a8ab38768859f758… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 24 12:02:48 2009 +0100 ole32: Expose the marshalled data on the clipboard rather than as a window prop so that other processes can actually read it. --- dlls/ole32/clipboard.c | 49 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index ec11411..4d7a7db 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -208,6 +208,8 @@ UINT object_descriptor_clipboard_format = 0; UINT link_source_descriptor_clipboard_format = 0; UINT ole_private_data_clipboard_format = 0; +static UINT wine_marshal_clipboard_format; + static inline char *dump_fmtetc(FORMATETC *fmt) { static char buf[100]; @@ -905,8 +907,9 @@ static HRESULT get_current_dataobject(IDataObject **data) *data = NULL; if(!wnd) return S_FALSE; - h = GetPropW(wnd, wine_marshal_dataobject); + h = GetClipboardData(wine_marshal_clipboard_format); if(!h) return S_FALSE; + if(GlobalSize(h) == 0) return S_FALSE; ptr = GlobalLock(h); if(!ptr) return S_FALSE; @@ -1379,6 +1382,9 @@ static void register_clipboard_formats(void) 'D','e','s','c','r','i','p','t','o','r',0}; static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; + static const WCHAR WineMarshalledDataObject[] = {'W','i','n','e',' ','M','a','r','s','h','a','l','l','e','d',' ', + 'D','a','t','a','O','b','j','e','c','t',0}; + ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); filename_clipboard_format = RegisterClipboardFormatW(FileName); filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); @@ -1390,6 +1396,8 @@ static void register_clipboard_formats(void) object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); + + wine_marshal_clipboard_format = RegisterClipboardFormatW(WineMarshalledDataObject); } /*********************************************************************** @@ -1584,13 +1592,38 @@ static inline void release_marshal_data(IStream *stm) } /*********************************************************************** + * expose_marshalled_dataobject + * + * Sets the marshalled dataobject to the clipboard. In the flushed case + * we set a zero sized HGLOBAL to clear the old marshalled data. + */ +static HRESULT expose_marshalled_dataobject(ole_clipbrd *clipbrd, IDataObject *data) +{ + HGLOBAL h; + + if(data) + { + HGLOBAL h_stm; + GetHGlobalFromStream(clipbrd->marshal_data, &h_stm); + dup_global_mem(h_stm, GMEM_DDESHARE|GMEM_MOVEABLE, &h); + } + else /* flushed */ + h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 0); + + if(!h) return E_OUTOFMEMORY; + + SetClipboardData(wine_marshal_clipboard_format, h); + return S_OK; +} + +/*********************************************************************** * set_src_dataobject * * Clears and sets the clipboard's src IDataObject. * * To marshal the source dataobject we do something rather different from Windows. - * We set a window prop which contains the marshalled data. - * Windows set two props one of which is an IID, the other is an endpoint number. + * We set a clipboard format which contains the marshalled data. + * Windows sets two window props one of which is an IID, the other is an endpoint number. */ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) { @@ -1601,7 +1634,6 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) if(clipbrd->src_data) { - RemovePropW(wnd, wine_marshal_dataobject); release_marshal_data(clipbrd->marshal_data); IDataObject_Release(clipbrd->src_data); @@ -1612,7 +1644,6 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) if(data) { - HGLOBAL h; IUnknown *unk; IDataObject_AddRef(data); @@ -1623,8 +1654,6 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); IUnknown_Release(unk); /* Don't hold a ref on IUnknown, we have one on IDataObject. */ if(FAILED(hr)) return hr; - GetHGlobalFromStream(clipbrd->marshal_data, &h); - SetPropW(wnd, wine_marshal_dataobject, h); hr = set_clipboard_formats(clipbrd, data); } return hr; @@ -1784,7 +1813,11 @@ HRESULT WINAPI OleSetClipboard(IDataObject* data) if(FAILED(hr)) goto end; if(data) + { + hr = expose_marshalled_dataobject(clipbrd, data); + if(FAILED(hr)) goto end; hr = set_dataobject_format(wnd); + } end: @@ -1792,6 +1825,7 @@ end: if ( FAILED(hr) ) { + expose_marshalled_dataobject(clipbrd, NULL); set_src_dataobject(clipbrd, NULL); } @@ -1865,6 +1899,7 @@ HRESULT WINAPI OleFlushClipboard(void) hr = set_dataobject_format(NULL); + expose_marshalled_dataobject(clipbrd, NULL); set_src_dataobject(clipbrd, NULL); if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE;

1 0

Alexandre Julliard : user32/tests: Don' t try to unpack or free invalid handles.
by Alexandre Julliard April 24, 2009

April 24, 2009

Module: wine Branch: master Commit: 5515b022ba59a25bac9b68ecd98daf303d1333e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5515b022ba59a25bac9b68ecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 13:38:58 2009 +0200 user32/tests: Don't try to unpack or free invalid handles. --- dlls/user32/tests/dde.c | 103 +---------------------------------------------- 1 files changed, 1 insertions(+), 102 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3fa9a4f..840406e 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1188,7 +1188,7 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP ok(!IsWindowUnicode((HWND)wparam), "client should be an ANSI window\n"); old_dde_client_wndproc = (WNDPROC)SetWindowLongPtrA((HWND)wparam, GWLP_WNDPROC, (ULONG_PTR)hook_dde_client_wndproc); trace("server: sending WM_DDE_ACK to %p\n", (HWND)wparam); - SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, MAKELPARAM(aService, 0)); + SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, PackDDElParam(WM_DDE_ACK, aService, 0)); } else GlobalDeleteAtom(aService); @@ -1802,10 +1802,6 @@ static void test_FreeDDElParam(void) hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_ADVISE, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - val = GlobalFree(hglobal); - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_UNADVISE, (LPARAM)hglobal); @@ -1816,18 +1812,10 @@ static void test_FreeDDElParam(void) hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_ACK, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - val = GlobalFree(hglobal); - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_DATA, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - val = GlobalFree(hglobal); - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_REQUEST, (LPARAM)hglobal); @@ -1838,10 +1826,6 @@ static void test_FreeDDElParam(void) hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_POKE, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - val = GlobalFree(hglobal); - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_EXECUTE, (LPARAM)hglobal); @@ -1853,17 +1837,12 @@ static void test_FreeDDElParam(void) static void test_PackDDElParam(void) { UINT_PTR lo, hi, *ptr; - HGLOBAL hglobal; LPARAM lparam; BOOL ret; lparam = PackDDElParam(WM_DDE_INITIATE, 0xcafe, 0xbeef); /* value gets sign-extended despite being an LPARAM */ ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); - ok(GlobalLock((HGLOBAL)lparam) == NULL, - "Expected NULL, got %p\n", GlobalLock((HGLOBAL)lparam)); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_INITIATE, lparam, &lo, &hi); @@ -1876,10 +1855,6 @@ static void test_PackDDElParam(void) lparam = PackDDElParam(WM_DDE_TERMINATE, 0xcafe, 0xbeef); ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); - ok(GlobalLock((HGLOBAL)lparam) == NULL, - "Expected NULL, got %p\n", GlobalLock((HGLOBAL)lparam)); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_TERMINATE, lparam, &lo, &hi); @@ -1913,17 +1888,8 @@ static void test_PackDDElParam(void) ret = FreeDDElParam(WM_DDE_ADVISE, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - hglobal = GlobalFree((HGLOBAL)lparam); - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - lparam = PackDDElParam(WM_DDE_UNADVISE, 0xcafe, 0xbeef); ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); - ok(GlobalLock((HGLOBAL)lparam) == NULL, - "Expected NULL, got %p\n", GlobalLock((HGLOBAL)lparam)); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_UNADVISE, lparam, &lo, &hi); @@ -1953,11 +1919,6 @@ static void test_PackDDElParam(void) ret = FreeDDElParam(WM_DDE_ACK, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - - hglobal = GlobalFree((HGLOBAL)lparam); - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); } else win_skip("got lparam 0x%lx for WM_DDE_ACK\n", lparam); @@ -1985,17 +1946,8 @@ static void test_PackDDElParam(void) ret = FreeDDElParam(WM_DDE_DATA, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - hglobal = GlobalFree((HGLOBAL)lparam); - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - lparam = PackDDElParam(WM_DDE_REQUEST, 0xcafe, 0xbeef); ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); - ok(GlobalLock((HGLOBAL)lparam) == NULL, - "Expected NULL, got %p\n", GlobalLock((HGLOBAL)lparam)); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_REQUEST, lparam, &lo, &hi); @@ -2029,17 +1981,8 @@ static void test_PackDDElParam(void) ret = FreeDDElParam(WM_DDE_POKE, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - hglobal = GlobalFree((HGLOBAL)lparam); - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - lparam = PackDDElParam(WM_DDE_EXECUTE, 0xcafe, 0xbeef); ok(lparam == 0xbeef, "Expected 0xbeef, got %08lx\n", lparam); - ok(GlobalLock((HGLOBAL)lparam) == NULL, - "Expected NULL, got %p\n", GlobalLock((HGLOBAL)lparam)); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi); @@ -2106,17 +2049,6 @@ static void test_UnpackDDElParam(void) broken(hi == 0xbeef), /* win2k */ "Expected 0, got %08lx\n", hi); - lo = 0xdead; - hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_ADVISE, 0xcafebabe, &lo, &hi); - ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0 || - broken(lo == 0xdead), /* win2k */ - "Expected 0, got %08lx\n", lo); - ok(hi == 0 || - broken(hi == 0xbeef), /* win2k */ - "Expected 0, got %08lx\n", hi); - hglobal = GlobalAlloc(GMEM_DDESHARE, 2); ptr = GlobalLock(hglobal); ptr[0] = 0xcafebabe; @@ -2139,17 +2071,6 @@ static void test_UnpackDDElParam(void) lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_ACK, 0xcafebabe, &lo, &hi); - ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0 || - broken(lo == 0xdead), /* win2k */ - "Expected 0, got %08lx\n", lo); - ok(hi == 0 || - broken(hi == 0xbeef), /* win2k */ - "Expected 0, got %08lx\n", hi); - - lo = 0xdead; - hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ACK, (LPARAM)hglobal, &lo, &hi); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", lo); @@ -2157,17 +2078,6 @@ static void test_UnpackDDElParam(void) lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_DATA, 0xcafebabe, &lo, &hi); - ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0 || - broken(lo == 0xdead), /* win2k */ - "Expected 0, got %08lx\n", lo); - ok(hi == 0 || - broken(hi == 0xbeef), /* win2k */ - "Expected 0, got %08lx\n", hi); - - lo = 0xdead; - hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_DATA, (LPARAM)hglobal, &lo, &hi); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", lo); @@ -2182,17 +2092,6 @@ static void test_UnpackDDElParam(void) lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_POKE, 0xcafebabe, &lo, &hi); - ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(lo == 0 || - broken(lo == 0xdead), /* win2k */ - "Expected 0, got %08lx\n", lo); - ok(hi == 0 || - broken(hi == 0xbeef), /* win2k */ - "Expected 0, got %08lx\n", hi); - - lo = 0xdead; - hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_POKE, (LPARAM)hglobal, &lo, &hi); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", lo);

1 0