February 2016 - Wine-Commits

Hans Leidekker : webservices: Implement WsFindAttribute.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 46393a3f86ef7420df3356edacc94574901bd2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46393a3f86ef7420df3356eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:01:59 2016 +0100 webservices: Implement WsFindAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 65 +++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 89 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9391cf8..9164b4f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1068,12 +1068,12 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } -static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) { ULONG i; - if (len1 != len2) return FALSE; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return FALSE; } - return TRUE; + if (len1 != len2) return 1; + for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } + return 0; } struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, @@ -1088,10 +1088,10 @@ struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix if (!localname) return parent; str = parent->hdr.prefix; - if (!cmp_localname( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; str = parent->hdr.localName; - if (!cmp_localname( str->bytes, str->length, localname->bytes, localname->length )) continue; + if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; return parent; } @@ -1579,6 +1579,59 @@ static HRESULT read_get_attribute_text( struct reader *reader, WS_XML_UTF8_TEXT return S_OK; } +static BOOL find_attribute( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns, ULONG *index ) +{ + ULONG i; + WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; + + if (!localname) + { + *index = reader->current_attr; + return TRUE; + } + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_STRING *localname2 = elem->attributes[i]->localName; + const WS_XML_STRING *ns2 = elem->attributes[i]->ns; + + if (!cmp_name( localname->bytes, localname->length, localname2->bytes, localname2->length ) && + !cmp_name( ns->bytes, ns->length, ns2->bytes, ns2->length )) + { + *index = i; + return TRUE; + } + } + return FALSE; +} + +/************************************************************************** + * WsFindAttribute [webservices.@] + */ +HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *localname, + const WS_XML_STRING *ns, BOOL required, ULONG *index, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %s %s %d %p %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), + required, index, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !localname || !ns || !index) return E_INVALIDARG; + + if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + return WS_E_INVALID_OPERATION; + + if (!find_attribute( reader, localname, ns, index )) + { + if (required) return WS_E_INVALID_FORMAT; + *index = ~0u; + return S_FALSE; + } + return S_OK; +} + static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_BOOL_DESCRIPTION *desc, BOOL *ret ) { diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f9b2ea9..555226d 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1871,6 +1871,94 @@ static void test_cdata(void) WsFreeReader( reader ); } +static void test_WsFindAttribute(void) +{ + static const char test[] = "<t attr='value' attr2='value2'></t>"; + WS_XML_STRING ns = {0, NULL}, localname = {4, (BYTE *)"attr"}; + WS_XML_STRING localname2 = {5, (BYTE *)"attr2"}, localname3 = {5, (BYTE *)"attr3"}; + WS_XML_READER *reader; + ULONG index; + HRESULT hr; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname, &ns, TRUE, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname, NULL, TRUE, &index, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, NULL, &ns, TRUE, &index, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !index, "got %u\n", index ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname2, &ns, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( index == 1, "got %u\n", index ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( index == 0xdeadbeef, "got %u\n", index ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname3, &ns, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( index == 0xdeadbeef, "got %u\n", index ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname3, &ns, FALSE, &index, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( index == ~0u, "got %u\n", index ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1890,4 +1978,5 @@ START_TEST(reader) test_WsMoveReader(); test_simple_struct_type(); test_cdata(); + test_WsFindAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index ffe8bca..5500424 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -45,7 +45,7 @@ @ stub WsFileTimeToDateTime @ stub WsFillBody @ stdcall WsFillReader(ptr long ptr ptr) -@ stub WsFindAttribute +@ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody @ stub WsFlushWriter @ stub WsFreeChannel

1 0

Hugh McMaster : reg: Ask the user if they want to delete the subkey, value , default value or all values.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

1 0

Hugh McMaster : reg: Add support for the default registry value in ask_confirm().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

1 0

Hans Leidekker : webservices: Reset the attribute index in read_element.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 6449cb3b67b11a0032deb8a01ca3282f035ccb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6449cb3b67b11a0032deb8a01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:00 2016 +0100 webservices: Reset the attribute index in read_element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9164b4f..1b3dd2f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -962,6 +962,7 @@ static HRESULT read_element( struct reader *reader ) hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; + reader->current_attr = 0; for (;;) { read_skip_whitespace( reader ); @@ -972,6 +973,7 @@ static HRESULT read_element( struct reader *reader ) free_attribute( attr ); goto error; } + reader->current_attr++; } read_skip_whitespace( reader );

1 0

Sebastian Lackner : mmsystem.dll16: Fix argument order in GlobalAlloc16 call.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 7260223ce56e96d1bde34610156f6e7833a98214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260223ce56e96d1bde346101… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:14:55 2016 +0100 mmsystem.dll16: Fix argument order in GlobalAlloc16 call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/mmsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index fdf1318..d90240d 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -1943,7 +1943,7 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD TRACE("(%p, %p, %08x, %08x)!\n", fpThreadAddr, lpHndl, dwPmt, dwFlags); - hndl = GlobalAlloc16(sizeof(WINE_MMTHREAD), GMEM_SHARE|GMEM_ZEROINIT); + hndl = GlobalAlloc16(GMEM_SHARE|GMEM_ZEROINIT, sizeof(WINE_MMTHREAD)); if (hndl == 0) { ret = 2;

1 0

Sebastian Lackner : ntdll/tests: Simplify exception tests by using todo_wine_if.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 5b478f7c7e9043576d7e5d5d7328bdff6bb8722f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b478f7c7e9043576d7e5d5d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:05:54 2016 +0100 ntdll/tests: Simplify exception tests by using todo_wine_if. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index bd2fa40..d6a610e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1800,13 +1800,10 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - if (todo) - todo_wine - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); - else - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); + + todo_wine_if(todo) + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); }

1 0

Sebastian Lackner : vcomp/tests: Reenable architecture dependent tests.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: a77e14714e495ecc63654374d53585a227b4c67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77e14714e495ecc63654374d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:46:45 2016 +0100 vcomp/tests: Reenable architecture dependent tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4f030d3..914b55f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, +#endif }; struct { @@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, +#endif }; int i;

1 0

Huw Davies : usp10: ScriptPlace should honour the fZeroWidth attribute.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: fc028e99c1c22a7680607101c4a77e34fdb0581e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc028e99c1c22a7680607101c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 10 10:59:39 2016 +0000 usp10: ScriptPlace should honour the fZeroWidth attribute. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 13 +++++++++++++ dlls/usp10/usp10.c | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 408dd29..6fab064 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1747,6 +1747,19 @@ static void test_ScriptPlace(HDC hdc) ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + if (widths[0] != 0) + { + int old_width = widths[0]; + attrs[0].fZeroWidth = 1; + + hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); + ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); + ok(widths[0] == 0, "got width %d\n", widths[0]); + widths[0] = old_width; + } + else + skip("Glyph already has zero-width - skipping fZeroWidth test\n"); + ret = ExtTextOutW(hdc, 1, 1, 0, NULL, glyphs, 4, widths); ok(ret, "ExtTextOutW should return TRUE\n"); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1cb77eb..253177a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3316,7 +3316,11 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS for (i = 0; i < cGlyphs; i++) { ABC abc; - if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) + if (pGlyphProps[i].sva.fZeroWidth) + { + abc.abcA = abc.abcB = abc.abcC = 0; + } + else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) { if (!hdc) return E_PENDING; if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex)

1 0

Nikolay Sivov : comctl32/tests: Simplify tests using todo_wine_if().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 780ebcc7d92e67393d7975ffa6d32f3fa296f656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=780ebcc7d92e67393d7975ffa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:37:01 2016 +0300 comctl32/tests: Simplify tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 6 +----- dlls/comctl32/tests/listview.c | 35 ++++------------------------------- dlls/comctl32/tests/monthcal.c | 7 +------ 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 2c1320b..f37b72b 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1721,11 +1721,7 @@ static void check_orderarray(HWND hwnd, DWORD start, DWORD set, DWORD expected, for(i = 1; i<=count; i++) array |= order[i-1]<<(4*(count-i)); - if (todo) { - todo_wine - ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array); - } - else + todo_wine_if(todo) ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a6910d2..400c51a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -790,16 +790,7 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN ret = SendMessageA(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); - if (todo_item) - { - todo_wine - { - ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); - ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); - ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); - } - } - else + todo_wine_if(todo_item) { ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); @@ -832,34 +823,16 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi ret = SendMessageA(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); - if (todo_item) - { - todo_wine - { - ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); - ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); - } - } - else + todo_wine_if(todo_item) { ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); } - if (todo_subitem) - { - todo_wine - ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); - } - else + todo_wine_if(todo_subitem) ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); - if (todo_flags) - { - todo_wine - ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags); - } - else + todo_wine_if(todo_flags) ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags); } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index b22db1c..c0d296a 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1182,14 +1182,9 @@ if (0) if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) break; - if (title_hits[title_index].todo) { - todo_wine + todo_wine_if(title_hits[title_index].todo) ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", title_hits[title_index].ht, res, x); - } else { - ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); - } } old_res = res; }

1 0

Michael Müller : msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 410d7995faea981341f1a0ffef9e03989f90009f URL: http://source.winehq.org/git/wine.git/?a=commit;h=410d7995faea981341f1a0ffe… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 09:29:23 2016 +0100 msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 1b715e4..8f02cc1 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -988,6 +988,7 @@ static LRESULT WINAPI MCIWndProc16(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp switch (msg) { case MCIWNDM_SENDSTRINGA: + case MCIWNDM_SETTIMEFORMATA: lparam = (ULONG_PTR)MapSL(lparam); break;

1 0