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

Huw Davies : ole32/tests: Rename variable to avoid a conflict on some systems.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 083473659bf28ea5fde0e83b9a132ec41c5d290c URL: http://source.winehq.org/git/wine.git/?a=commit;h=083473659bf28ea5fde0e83b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 15:48:21 2009 +0100 ole32/tests: Rename variable to avoid a conflict on some systems. --- dlls/ole32/tests/clipboard.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1b406d9..a64fa23 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -387,7 +387,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) const char *cmpl_stm_data = "complex stream"; const char *cmpl_text_data = "complex text"; -const WCHAR devname[] = {'m','y','d','e','v',0}; +const WCHAR device_name[] = {'m','y','d','e','v',0}; static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) { @@ -418,15 +418,15 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); dm.dmDriverExtra = 0; - lstrcpyW(dm.dmDeviceName, devname); - obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra); - obj->fmtetc[3].ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra; + lstrcpyW(dm.dmDeviceName, device_name); + obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); + obj->fmtetc[3].ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; obj->fmtetc[3].ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); obj->fmtetc[3].ptd->tdDeviceNameOffset = 0; obj->fmtetc[3].ptd->tdPortNameOffset = 0; - obj->fmtetc[3].ptd->tdExtDevmodeOffset = obj->fmtetc[3].ptd->tdDriverNameOffset + sizeof(devname); - lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, devname); - memcpy(obj->fmtetc[3].ptd->tdData + sizeof(devname), &dm, dm.dmSize + dm.dmDriverExtra); + obj->fmtetc[3].ptd->tdExtDevmodeOffset = obj->fmtetc[3].ptd->tdDriverNameOffset + sizeof(device_name); + lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, device_name); + memcpy(obj->fmtetc[3].ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); InitFormatEtc(obj->fmtetc[4], cf_global, TYMED_HGLOBAL); InitFormatEtc(obj->fmtetc[5], cf_another, TYMED_HGLOBAL); @@ -1180,15 +1180,15 @@ static void test_flushed_getdata(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); dm.dmDriverExtra = 0; - lstrcpyW(dm.dmDeviceName, devname); - fmt.ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra); - fmt.ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra; + lstrcpyW(dm.dmDeviceName, device_name); + fmt.ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); + fmt.ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; fmt.ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); fmt.ptd->tdDeviceNameOffset = 0; fmt.ptd->tdPortNameOffset = 0; - fmt.ptd->tdExtDevmodeOffset = fmt.ptd->tdDriverNameOffset + sizeof(devname); - lstrcpyW((WCHAR*)fmt.ptd->tdData, devname); - memcpy(fmt.ptd->tdData + sizeof(devname), &dm, dm.dmSize + dm.dmDriverExtra); + fmt.ptd->tdExtDevmodeOffset = fmt.ptd->tdDriverNameOffset + sizeof(device_name); + lstrcpyW((WCHAR*)fmt.ptd->tdData, device_name); + memcpy(fmt.ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr);

1 0

Huw Davies : ole32: Improve the TRACEs by printing the fmtetc contents.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: aaed9de51ae84a4b24e908ad6ac558848842400e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaed9de51ae84a4b24e908ad6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 15:26:04 2009 +0100 ole32: Improve the TRACEs by printing the fmtetc contents. --- dlls/ole32/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 7255323..92795c6 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1138,7 +1138,7 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, ole_priv_data_entry *entry; DWORD mask; - TRACE("(%p,%p,%p)\n", iface, fmt, med); + TRACE("(%p, %p {%s}, %p)\n", iface, fmt, dump_fmtetc(fmt), med); if ( !fmt || !med ) return E_INVALIDARG; @@ -1203,7 +1203,7 @@ end: static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med) { - FIXME("(%p, %p, %p): stub\n", iface, fmt, med); + FIXME("(%p, %p {%s}, %p): stub\n", iface, fmt, dump_fmtetc(fmt), med); return E_NOTIMPL; } @@ -1217,7 +1217,7 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt, */ static HRESULT WINAPI snapshot_QueryGetData(IDataObject *iface, FORMATETC *fmt) { - FIXME("(%p, %p)\n", iface, fmt); + FIXME("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); if (!fmt) return E_INVALIDARG;

1 0

Mikołaj Zalewski : winedbg: Add a crash dialog for --auto mode.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 1e256e426df84b6ba00a4c360f355b3809a72b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e256e426df84b6ba00a4c360… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Dec 21 22:28:32 2008 +0100 winedbg: Add a crash dialog for --auto mode. --- dlls/kernel32/tests/debugger.c | 97 ++++++++++++++--------- programs/winedbg/Makefile.in | 5 +- programs/winedbg/crashdlg.c | 173 ++++++++++++++++++++++++++++++++++++++++ programs/winedbg/debugger.h | 6 ++ programs/winedbg/intvar.h | 3 + programs/winedbg/resource.h | 34 ++++++++ programs/winedbg/rsrc.rc | 26 ++++++ programs/winedbg/rsrc_En.rc | 53 ++++++++++++ programs/winedbg/tgt_active.c | 16 +++- programs/winedbg/winedbg.c | 36 +++++--- 10 files changed, 394 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e256e426df84b6ba00a4…

1 0

Giuseppe Bilotta : comctl32/toolbar: Fix trace info for TOOLBAR_InternalInsertButtonsT.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 6a01f71949bea02507bca4012d56a2a637dfc2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a01f71949bea02507bca4012… Author: Giuseppe Bilotta <giuseppe.bilotta(a)gmail.com> Date: Wed Apr 22 13:31:09 2009 +0200 comctl32/toolbar: Fix trace info for TOOLBAR_InternalInsertButtonsT. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1ba284c..c3add77 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1832,7 +1832,7 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto for (iButton = 0; iButton < nAddButtons; iButton++) { TBUTTON_INFO *btnPtr = &infoPtr->buttons[iIndex + iButton]; - TOOLBAR_DumpTBButton(lpTbb, fUnicode); + TOOLBAR_DumpTBButton(lpTbb + iButton, fUnicode); ZeroMemory(btnPtr, sizeof(*btnPtr));

1 0

Jeff Latimer : include: Bring in6_addr into line with the MS definition.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: b485ed2346b07afe7d3212f065610d8f20beb678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b485ed2346b07afe7d3212f06… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Apr 22 23:09:14 2009 +1000 include: Bring in6_addr into line with the MS definition. --- include/Makefile.in | 1 + include/in6addr.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2ipdef.h | 29 +++++++++------------------ include/ws2tcpip.h | 3 -- 4 files changed, 63 insertions(+), 22 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 795e55c..5f7aacc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -244,6 +244,7 @@ SRCDIR_INCLUDES = \ idispids.h \ imagehlp.h \ imm.h \ + in6addr.h \ initguid.h \ intshcut.h \ ipexport.h \ diff --git a/include/in6addr.h b/include/in6addr.h new file mode 100644 index 0000000..042e8d2 --- /dev/null +++ b/include/in6addr.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2009 Jeff Latimer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __IN6ADDR__ +#define __IN6ADDR__ + +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + +typedef struct WS(in6_addr) { + union { + WS(u_char) Byte[16]; + WS(u_short) Word[8]; + } u; +} IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; + +#define in_addr6 WS(in6_addr) + +#ifdef USE_WS_PREFIX +#define WS__S6_un u +#define WS__S6_u8 Byte +#define WS_s6_addr WS__S6_un.WS__S6_u8 +#else +#define _S6_un u +#define _S6_u8 Byte +#define s6_addr _S6_un._S6_u8 +#endif + +#define s6_bytes u.Byte +#define s6_words u.Word + +#undef WS + +#endif /* __IN6ADDR__ */ diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index c9c0970..ff2b201 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -19,7 +19,7 @@ #ifndef __WS2IPDEF__ #define __WS2IPDEF__ -/* FIXME: #include <in6addr.h> */ +#include <in6addr.h> #ifdef USE_WS_PREFIX #define WS(x) WS_##x @@ -27,21 +27,12 @@ #define WS(x) x #endif -/* FIXME: This gets defined by some Unix (Linux) header and messes things */ -#undef s6_addr - -/* FIXME: should be in in6addr.h */ -typedef struct WS(in_addr6) -{ - WS(u_char) s6_addr[16]; /* IPv6 address */ -} IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; - typedef struct WS(sockaddr_in6_old) { - short sin6_family; /* AF_INET6 */ - WS(u_short) sin6_port; /* Transport level port number */ - WS(u_long) sin6_flowinfo; /* IPv6 flow information */ - struct WS(in_addr6) sin6_addr; /* IPv6 address */ + SHORT sin6_family; + USHORT sin6_port; + ULONG sin6_flowinfo; + IN6_ADDR sin6_addr; } SOCKADDR_IN6_OLD,*PSOCKADDR_IN6_OLD, *LPSOCKADDR_IN6_OLD; typedef union sockaddr_gen @@ -131,11 +122,11 @@ typedef struct _INTERFACE_INFO typedef struct WS(sockaddr_in6) { - short sin6_family; /* AF_INET6 */ - WS(u_short) sin6_port; /* Transport level port number */ - WS(u_long) sin6_flowinfo; /* IPv6 flow information */ - struct WS(in_addr6) sin6_addr; /* IPv6 address */ - WS(u_long) sin6_scope_id; /* IPv6 scope id */ + SHORT sin6_family; + USHORT sin6_port; + ULONG sin6_flowinfo; + IN6_ADDR sin6_addr; + ULONG sin6_scope_id; } SOCKADDR_IN6,*PSOCKADDR_IN6, *LPSOCKADDR_IN6; /* diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index fc9f258..6f1293f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -29,9 +29,6 @@ #define WS(x) x #endif -/* FIXME: This gets defined by some Unix (Linux) header and messes things */ -#undef s6_addr - /* for addrinfo calls */ typedef struct WS(addrinfo) {

1 0

Alexandre Julliard : ws2_32/tests: Avoid sizeof in traces.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: d341cca616a47361f9bf78337b651a475aead929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341cca616a47361f9bf78337… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:25:50 2009 +0200 ws2_32/tests: Avoid sizeof in traces. --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cd88b8d..23aa59c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1296,7 +1296,7 @@ static void test_WSAAddressToStringA(void) ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address, expect1 ), "Expected: %s, got: %s\n", expect1, address ); - ok( len == sizeof( expect1 ), "Expected size to be %d, got %d\n", sizeof( expect1 ), len); + ok( len == sizeof( expect1 ), "Got size %d\n", len); len = sizeof(address); @@ -1330,7 +1330,7 @@ static void test_WSAAddressToStringA(void) ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address, expect4 ), "Expected: %s, got: %s\n", expect4, address ); - ok( len == sizeof( expect4 ), "Expected size to be %d, got %d\n", sizeof( expect4 ), len); + ok( len == sizeof( expect4 ), "Got size %d\n", len); } static void test_WSAAddressToStringW(void) @@ -1369,7 +1369,7 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect1 ), "Expected different address string\n" ); - ok( len == sizeof( expect1 )/sizeof( WCHAR ), "Expected size to be %d, got %d\n", sizeof( expect1 )/sizeof( WCHAR ), len); + ok( len == sizeof( expect1 )/sizeof( WCHAR ), "Got size %d\n", len); len = sizeof(address); @@ -1403,7 +1403,7 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" ); - ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Expected size to be %d, got %d\n", sizeof( expect4 )/sizeof( WCHAR ), len); + ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Got size %d\n", len); } static void test_WSAStringToAddressA(void)

1 0

Alexandre Julliard : kernel32: Make sure the string is properly terminated in QueryFullProcessImageNameW.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: c6083037a87f901239793b5fd359a0a98b0c50c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6083037a87f901239793b5fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 16:54:16 2009 +0200 kernel32: Make sure the string is properly terminated in QueryFullProcessImageNameW. --- dlls/kernel32/process.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 624d4de..b10d08a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3158,10 +3158,11 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp RtlInitUnicodeStringEx(&nt_path, NULL); /* FIXME: On Windows, ProcessImageFileName return an NT path. We rely that it being a DOS path, * as this is on Wine. */ - status = NtQueryInformationProcess(hProcess, ProcessImageFileName, buffer, sizeof(buffer), &needed); + status = NtQueryInformationProcess(hProcess, ProcessImageFileName, buffer, + sizeof(buffer) - sizeof(WCHAR), &needed); if (status == STATUS_INFO_LENGTH_MISMATCH) { - dynamic_buffer = HeapAlloc(GetProcessHeap(), 0, needed); + dynamic_buffer = HeapAlloc(GetProcessHeap(), 0, needed + sizeof(WCHAR)); status = NtQueryInformationProcess(hProcess, ProcessImageFileName, (LPBYTE)dynamic_buffer, needed, &needed); result = dynamic_buffer; } @@ -3172,6 +3173,7 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp if (dwFlags & PROCESS_NAME_NATIVE) { + result->Buffer[result->Length / sizeof(WCHAR)] = 0; if (!RtlDosPathNameToNtPathName_U(result->Buffer, &nt_path, NULL, NULL)) { status = STATUS_OBJECT_PATH_NOT_FOUND; @@ -3186,8 +3188,9 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp goto cleanup; } - lstrcpynW(lpExeName, result->Buffer, result->Length/sizeof(WCHAR) + 1); *pdwSize = result->Length/sizeof(WCHAR); + memcpy( lpExeName, result->Buffer, result->Length ); + lpExeName[*pdwSize] = 0; cleanup: HeapFree(GetProcessHeap(), 0, dynamic_buffer);

1 0

Alexandre Julliard : jscript: Avoid size_t in printf width specifier.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: eae1898aae96dc646cf8895411769b0d2f48af18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae1898aae96dc646cf889541… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:25:35 2009 +0200 jscript: Avoid size_t in printf width specifier. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 8ae2152..e79fee4 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -2386,7 +2386,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, const char *opname = reop_names[op]; TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, - gData->stateStackTop * 2, "", opname); + (int)gData->stateStackTop * 2, "", opname); switch (op) { case REOP_EMPTY: @@ -2625,7 +2625,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) for (;;) { const char *opname = reop_names[op]; TRACE("\n%06d: %*s%s\n", pc - gData->regexp->program, - gData->stateStackTop * 2, "", opname); + (int)gData->stateStackTop * 2, "", opname); if (REOP_IS_SIMPLE(op)) { result = SimpleMatch(gData, x, op, &pc, TRUE);

1 0

Huw Davies : ole32/tests: win9x and winme don' t enumerate duplicated cfFormats.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 1556d831c8e0f3cd42ddb7f89965912296f6e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1556d831c8e0f3cd42ddb7f89… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 10:47:28 2009 +0100 ole32/tests: win9x and winme don't enumerate duplicated cfFormats. --- dlls/ole32/tests/clipboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 207411a..4cbd88b 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -584,7 +584,9 @@ static void test_enum_fmtetc(IDataObject *src) if(src) { hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); - ok(hr == S_FALSE, "%d: got %08x\n", count, hr); + ok(hr == S_FALSE || + broken(hr == S_OK && count == 5), /* win9x and winme don't enumerate duplicated cf's */ + "%d: got %08x\n", count, hr); IEnumFORMATETC_Release(src_enum); }

1 0

Huw Davies : ole32/tests: win9x and winme don't have CF_UNICODETEXT.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: f9d48e7ba0442c53e48ce49977859ce3c4501fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d48e7ba0442c53e48ce4997… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 22 10:25:59 2009 +0100 ole32/tests: win9x and winme don't have CF_UNICODETEXT. --- dlls/ole32/tests/clipboard.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 65af5bd..fd4a4e0 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1285,14 +1285,19 @@ static void test_nonole_clipboard(void) hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(fmt.cfFormat == CF_UNICODETEXT, "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); + ok(fmt.cfFormat == CF_UNICODETEXT || + broken(fmt.cfFormat == CF_METAFILEPICT), /* win9x and winme don't have CF_UNICODETEXT */ + "cf %04x\n", fmt.cfFormat); + if(fmt.cfFormat == CF_UNICODETEXT) + { + 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); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + } ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);

1 0