February 2016 - Wine-commits

Sebastian Lackner : kernel32/tests: Simplify activation context tests by using todo_wine_if.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: fd0780cb35243b0c4bf480c044e768066fe2c7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0780cb35243b0c4bf480c04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:06:17 2016 +0100 kernel32/tests: Simplify activation context 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/kernel32/tests/actctx.c | 47 ++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 64176cb..af3dadf 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -776,12 +776,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest); handle = pCreateActCtxW(&actctx); - if (todo) todo_wine - { - ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); - ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); - } - else + todo_wine_if(todo) { ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); @@ -2089,13 +2084,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); - if (todo) - todo_wine - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringA: unexpected error %u\n", err); - else - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringA: unexpected error %u\n", err); + todo_wine_if(todo) + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringA: unexpected error %u\n", err); memset(&data, 0xfe, sizeof(data)); data.cbSize = sizeof(data); @@ -2105,13 +2096,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should err = GetLastError(); ok_(__FILE__, line)(ret == should_find, "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); - if (todo) - todo_wine - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringW: unexpected error %u\n", err); - else - ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), - "FindActCtxSectionStringW: unexpected error %u\n", err); + todo_wine_if(todo) + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringW: unexpected error %u\n", err); SetLastError(0); ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); @@ -2144,22 +2131,14 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi data.cbSize = sizeof(data); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data); - if (todo) - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); - else - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + todo_wine_if(todo) + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); - if (todo) - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); - else - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + todo_wine_if(todo) + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); pRtlFreeUnicodeString(&string_to_findW); }

1 0

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

10 Feb '16

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 : kernel32/tests: Move logic of okChildInt macro into a function.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 5bb169ad7b5ecd7a87ba55ebc284c938efdea9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb169ad7b5ecd7a87ba55ebc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:57:57 2016 +0100 kernel32/tests: Move logic of okChildInt macro into a function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4ef6431..0beb9bf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -582,18 +582,16 @@ static void ok_child_stringWA( int line, const char *sect, const char *key, HeapFree(GetProcessHeap(),0,resultA); } +static void ok_child_int( int line, const char *sect, const char *key, UINT expect ) +{ + UINT result = GetPrivateProfileIntA( sect, key, !expect, resfile ); + ok_(__FILE__, line)( result == expect, "%s:%s expected %u, but got %u\n", sect, key, expect, result ); +} + #define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) #define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) #define okChildStringWA(sect, key, expect) ok_child_stringWA(__LINE__, (sect), (key), (expect), 1 ) - -/* using !expect ensures that the test will fail if the sect/key isn't present - * in result file - */ -#define okChildInt(sect, key, expect) \ - do { \ - UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \ - ok(result == expect, "%s:%s expected %u, but got %u\n", (sect), (key), (UINT)(expect), result); \ - } while (0) +#define okChildInt(sect, key, expect) ok_child_int(__LINE__, (sect), (key), (expect)) static void test_Startup(void) {

1 0

Sebastian Lackner : kernel32/tests: Disable Windows version dependent test for pcPriClassBase.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 748103663c6ec160c302f220c16fd53532689020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748103663c6ec160c302f220c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:58:28 2016 +0100 kernel32/tests: Disable Windows version dependent test for pcPriClassBase. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0beb9bf..2708072 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1129,7 +1129,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory(); @@ -1200,7 +1200,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory();

1 0

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

10 Feb '16

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

Nikolay Sivov : dwrite: Add a helper to test for isolate class instead of relying on enum layout.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 3d34f29b5c120d36da934b781f97b01e0e33e6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d34f29b5c120d36da934b781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:10:47 2016 +0300 dwrite: Add a helper to test for isolate class instead of relying on enum layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 273d100..abf3604 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -543,6 +543,11 @@ static inline void iso_dump_types(const char* header, IsolatedRun *run) Note: On input only these directional classes are expected AL, HL, R, L, ON, BN, NSM, AN, EN, ES, ET, CS, ------------------------------------------------------------------------*/ +static BOOL bidi_is_isolate(UINT8 class) +{ + return class == LRI || class == RLI || class == FSI || class == PDI; +} + static void bidi_resolve_weak(IsolatedRun *iso_run) { int i; @@ -553,7 +558,7 @@ static void bidi_resolve_weak(IsolatedRun *iso_run) int j = get_prev_valid_char_from_run(iso_run, i); if (j == -1) *iso_run->item[i].class = iso_run->sos; - else if (*iso_run->item[j].class >= LRI) + else if (bidi_is_isolate(*iso_run->item[j].class)) *iso_run->item[i].class = ON; else *iso_run->item[i].class = *iso_run->item[j].class; @@ -754,7 +759,7 @@ static void bidi_resolve_neutrals(IsolatedRun *run) /* Translate isolates into NI */ for (i = 0; i < run->length; i++) { - if (*run->item[i].class >= LRI) + if (bidi_is_isolate(*run->item[i].class)) *run->item[i].class = NI; switch (*run->item[i].class) {

1 0

Nikolay Sivov : dwrite: Use enum members for class testing, simplify reseting to NI before applying Nx rules.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: e17e6e42d1b2e162892cd9e8966dfdd67d7e7163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17e6e42d1b2e162892cd9e89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:10:48 2016 +0300 dwrite: Use enum members for class testing, simplify reseting to NI before applying Nx rules. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index abf3604..16ca25f 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -759,16 +759,18 @@ static void bidi_resolve_neutrals(IsolatedRun *run) /* Translate isolates into NI */ for (i = 0; i < run->length; i++) { - if (bidi_is_isolate(*run->item[i].class)) - *run->item[i].class = NI; - switch (*run->item[i].class) { case B: case S: - case WS: *run->item[i].class = NI; + case WS: + case FSI: + case LRI: + case RLI: + case PDI: *run->item[i].class = NI; } - ASSERT(*run->item[i].class < 5 || *run->item[i].class == BN); /* "Only NI, L, R, AN, EN and BN are allowed" */ + /* "Only NI, L, R, AN, EN and BN are allowed" */ + ASSERT(*run->item[i].class <= EN || *run->item[i].class == BN); } /* N0: Skipping bracketed pairs for now */ @@ -900,8 +902,8 @@ static void bidi_resolve_implicit(const UINT8 *classes, UINT8 *levels, int sos, if (classes[i] == BN) continue; - ASSERT(classes[i] > 0); /* "No Neutrals allowed to survive here." */ - ASSERT(classes[i] < 5); /* "Out of range." */ + ASSERT(classes[i] != ON); /* "No Neutrals allowed to survive here." */ + ASSERT(classes[i] <= EN); /* "Out of range." */ if (odd(levels[i]) && (classes[i] == L || classes[i] == EN || classes[i] == AN)) levels[i]++;

1 0

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

10 Feb '16

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

Nikolay Sivov : msxml3/tests: Simplify a couple of tests using todo_wine_if().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: cdda92fc4ef7e674f2167d581dec3f7ed0a2918c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdda92fc4ef7e674f2167d581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:41:47 2016 +0300 msxml3/tests: Simplify a couple of tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 4 +--- dlls/msxml3/tests/schema.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 88b2404..9c8d103 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2867,9 +2867,7 @@ static void test_saxreader_encoding(void) CloseHandle(file); hr = ISAXXMLReader_parseURL(reader, testXmlW); - if (entry->todo) - todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); - else + todo_wine_if(entry->todo) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); DeleteFileA(testXmlA); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index bfedb8b..43ddc3c 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1322,10 +1322,7 @@ static void test_XDR_datatypes(void) hr = IXMLDOMNode_get_nodeTypedValue(node, &v); EXPECT_HR(hr, S_OK); - if (ptr->todo) - todo_wine - ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); - else + todo_wine_if(ptr->todo) ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); switch (ptr->type_schema)

1 0

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

10 Feb '16

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