January 2017 - Wine-Commits

André Hentschel : iphlpapi/tests: Add test for AllocateAndGetTcpExTableFromStack.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: c77b11eba0751abd8323ea2278f11b8e375112a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77b11eba0751abd8323ea227… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 17:55:39 2017 +0100 iphlpapi/tests: Add test for AllocateAndGetTcpExTableFromStack. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 9f59910..893e7cd 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -50,6 +50,7 @@ static HMODULE hLibrary = NULL; +static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWORD,DWORD); static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); static DWORD (WINAPI *pGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); @@ -97,6 +98,7 @@ static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); if (hLibrary) { + pAllocateAndGetTcpExTableFromStack = (void *)GetProcAddress(hLibrary, "AllocateAndGetTcpExTableFromStack"); pGetNumberOfInterfaces = (void *)GetProcAddress(hLibrary, "GetNumberOfInterfaces"); pGetIpAddrTable = (void *)GetProcAddress(hLibrary, "GetIpAddrTable"); pGetIfEntry = (void *)GetProcAddress(hLibrary, "GetIfEntry"); @@ -1562,6 +1564,52 @@ static void test_GetExtendedTcpTable(void) HeapFree( GetProcessHeap(), 0, table_module ); } +static void test_AllocateAndGetTcpExTableFromStack(void) +{ + DWORD ret; + MIB_TCPTABLE_OWNER_PID *table_ex = NULL; + + if (!pAllocateAndGetTcpExTableFromStack) + { + skip("AllocateAndGetTcpExTableFromStack not available\n"); + return; + } + + if (0) + { + /* crashes on native */ + ret = pAllocateAndGetTcpExTableFromStack( NULL, FALSE, INVALID_HANDLE_VALUE, 0, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, INVALID_HANDLE_VALUE, 0, AF_INET ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = pAllocateAndGetTcpExTableFromStack( (void **)NULL, FALSE, GetProcessHeap(), 0, AF_INET ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + } + + ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, GetProcessHeap(), 0, 0 ); + ok( ret == ERROR_INVALID_PARAMETER || broken(ERROR_NOT_SUPPORTED) /* win2k */, "got %u\n", ret ); + + ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, GetProcessHeap(), 0, AF_INET ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + + if (ret == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "AllocateAndGetTcpExTableFromStack table: %u entries\n", table_ex->dwNumEntries ); + for (i = 0; i < table_ex->dwNumEntries; i++) + { + trace( "%u: local %s:%u remote %s:%u state %u pid %u\n", i, + ntoa(table_ex->table[i].dwLocalAddr), ntohs(table_ex->table[i].dwLocalPort), + ntoa( table_ex->table[i].dwRemoteAddr ), ntohs(table_ex->table[i].dwRemotePort), + U(table_ex->table[i]).dwState, table_ex->table[i].dwOwningPid ); + } + } + HeapFree(GetProcessHeap(), 0, table_ex); + + ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, GetProcessHeap(), 0, AF_INET6 ); + ok( ret == ERROR_NOT_SUPPORTED, "got %u\n", ret ); +} + static void test_GetExtendedUdpTable(void) { DWORD ret, size; @@ -1923,6 +1971,7 @@ START_TEST(iphlpapi) test_GetAdaptersAddresses(); test_GetExtendedTcpTable(); test_GetExtendedUdpTable(); + test_AllocateAndGetTcpExTableFromStack(); test_CreateSortedAddressPairs(); test_interface_identifier_conversion(); test_GetIfEntry2();

1 0

Sebastian Lackner : comctl32/tests: Add tests for PROPSHEET_InsertPage.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 87a3ce056ea0d1183826d6130f5b5884b3df2ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a3ce056ea0d1183826d6130… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 17 07:58:38 2017 +0300 comctl32/tests: Add tests for PROPSHEET_InsertPage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 97 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 592ad15..1c284ff 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -821,7 +821,7 @@ static void test_PSM_ADDPAGE(void) psp.pfnDlgProc = page_dlg_proc_messages; psp.lParam = 0; - /* two page with the same data */ + /* multiple pages with the same data */ hpsp[0] = CreatePropertySheetPageA(&psp); hpsp[1] = CreatePropertySheetPageA(&psp); hpsp[2] = CreatePropertySheetPageA(&psp); @@ -893,6 +893,100 @@ if (0) DestroyWindow(hdlg); } +static void test_PSM_INSERTPAGE(void) +{ + HPROPSHEETPAGE hpsp[5]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg, tab; + BOOL ret; + DWORD r; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_MESSAGE_TEST); + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc_messages; + psp.lParam = 0; + + /* multiple pages with the same data */ + hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[1] = CreatePropertySheetPageA(&psp); + hpsp[2] = CreatePropertySheetPageA(&psp); + + U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); + hpsp[3] = CreatePropertySheetPageA(&psp); + + psp.dwFlags = PSP_PREMATURE; + hpsp[4] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.dwFlags = PSH_MODELESS; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + + hdlg = (HWND)PropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); + + /* add pages one by one */ + ret = SendMessageA(hdlg, PSM_INSERTPAGE, 5, (LPARAM)hpsp[1]); + todo_wine ok(ret == TRUE, "got %d\n", ret); + + /* try with invalid values */ + ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, 0); + ok(ret == FALSE, "got %d\n", ret); + +if (0) +{ + /* crashes on native */ + ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)INVALID_HANDLE_VALUE); +} + + ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)INVALID_HANDLE_VALUE, (LPARAM)hpsp[2]); + ok(ret == FALSE, "got %d\n", ret); + + /* check item count */ + tab = (HWND)SendMessageA(hdlg, PSM_GETTABCONTROL, 0, 0); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + todo_wine ok(r == 2, "got %d\n", r); + + ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)hpsp[1], (LPARAM)hpsp[2]); + todo_wine ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + todo_wine ok(r == 3, "got %d\n", r); + + /* add property sheet page that can't be created */ + ret = SendMessageA(hdlg, PSM_INSERTPAGE, 1, (LPARAM)hpsp[3]); + todo_wine ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + todo_wine ok(r == 4, "got %d\n", r); + + /* select page that can't be created */ + ret = SendMessageA(hdlg, PSM_SETCURSEL, 1, 0); + todo_wine ok(ret == TRUE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + todo_wine ok(r == 3, "got %d\n", r); + + /* test PSP_PREMATURE flag with incorrect property sheet page */ + ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)hpsp[4]); + ok(ret == FALSE, "got %d\n", ret); + + r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); + todo_wine ok(r == 3, "got %d\n", r); + + DestroyPropertySheetPage(hpsp[4]); + DestroyWindow(hdlg); +} + START_TEST(propsheet) { test_title(); @@ -903,4 +997,5 @@ START_TEST(propsheet) test_custom_default_button(); test_messages(); test_PSM_ADDPAGE(); + test_PSM_INSERTPAGE(); }

1 0

Hans Leidekker : advapi32/tests: Skip StartTrace tests if the user doesn' t have admin rights.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 57c4d280f8f63af52097667513d4840e2f32079f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c4d280f8f63af5209766751… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 17 10:49:26 2017 +0100 advapi32/tests: Skip StartTrace tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d86a924..838454e 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1218,6 +1218,11 @@ static void test_start_trace(void) properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); ret = StartTraceA(&handle, sessionname, properties); + if (ret == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + goto done; + } ok(ret == ERROR_SUCCESS, "Expected success, got %d\n", ret); ret = StartTraceA(&handle, sessionname, properties); @@ -1228,6 +1233,7 @@ static void test_start_trace(void) /* clean up */ ControlTraceA(handle, sessionname, properties, EVENT_TRACE_CONTROL_STOP); +done: HeapFree(GetProcessHeap(), 0, properties); DeleteFileA(filepath); }

1 0

Hans Leidekker : msvcp120/tests: Fix test failures on Windows XP.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 9e32160a77f2391c53f48d4797753b070ca1d421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e32160a77f2391c53f48d479… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 17 10:49:28 2017 +0100 msvcp120/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5df5440..d70c0df 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1625,7 +1625,7 @@ static void test_tr2_sys__Symlink(void) errno = 0xdeadbeef; SetLastError(0xdeadbeef); ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); - if(!i && (ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION)) { + if(!i && (ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION || ret==ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); ok(DeleteFileA("f1"), "expect f1 to exist\n"); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); @@ -1684,7 +1684,7 @@ static void test_tr2_sys__Unlink(void) CloseHandle(file); ret = p_tr2_sys__Symlink("tr2_test_dir/f1", "tr2_test_dir/f1_symlink"); - if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION || ret==ERROR_CALL_NOT_IMPLEMENTED) { tests[0].last_error = ERROR_FILE_NOT_FOUND; win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); }else {

1 0

Michael Stefaniuc : wrc: Remove a wrong comment.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: e697a639e0dce4652d2d7013bb393bd85dee0ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e697a639e0dce4652d2d7013b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 10:14:45 2017 +0100 wrc: Remove a wrong comment. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 5b7e24c..8c2f280 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -876,7 +876,7 @@ static void menuexitem2res(res_t *res, menu_item_t *menitem, const language_t *l { put_dword(res, itm->gottype ? itm->type : 0); put_dword(res, itm->gotstate ? itm->state : 0); - put_dword(res, itm->gotid ? itm->id : 0); /* FIXME: Docu. says word */ + put_dword(res, itm->gotid ? itm->id : 0); put_word(res, (itm->popup ? 0x01 : 0) | (!itm->next ? MF_END : 0)); if(itm->name) put_string(res, itm->name, str_unicode, TRUE, lang);

1 0

Hans Leidekker : bcrypt/tests: Relax the AES object length test.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 1ee781266d674e64bbe572dfe8d29f6e49bf4c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee781266d674e64bbe572dfe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 17 10:49:27 2017 +0100 bcrypt/tests: Relax the AES object length test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3e41335..422f2cf 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -789,22 +789,8 @@ todo_wine { len = size = 0; ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - if (sizeof(void *) == 4) - { - ok(len == 618 /* >= Win 8 */ - || broken(len == 610) /* Win 7 */ - || broken(len == 582) /* < Win 7 */, - "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); - } - else - { - ok(len == 654 /* >= Win 8 */ - || broken(len == 622) /* Win 7 */ - || broken(len == 598) /* < Win 7 */, - "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); - } + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %u\n", size); len = size = 0; ret = pBCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);

1 0

Huw Davies : kernel32/tests: Fix the invariant locale' s country abbreviation on Windows 10.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 17431e2330e96eb054e0905edf311021eb6a25a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17431e2330e96eb054e0905ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 10:51:45 2017 +0000 kernel32/tests: Fix the invariant locale's country abbreviation on Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2300956..c5b65f7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4726,7 +4726,7 @@ static void test_EnumSystemGeoID(void) struct invariant_entry { const char *name; int id; - const char *expect; + const char *expect, *expect2; }; #define X(x) #x, x @@ -4737,7 +4737,7 @@ static const struct invariant_entry invariant_list[] = { { X(LOCALE_SNATIVELANGNAME), "Invariant Language" }, { X(LOCALE_ICOUNTRY), "1" }, { X(LOCALE_SENGCOUNTRY), "Invariant Country" }, - { X(LOCALE_SABBREVCTRYNAME), "IVC" }, + { X(LOCALE_SABBREVCTRYNAME), "IVC", "" }, { X(LOCALE_SNATIVECTRYNAME), "Invariant Country" }, { X(LOCALE_IDEFAULTLANGUAGE), "0409" }, { X(LOCALE_IDEFAULTCOUNTRY), "1" }, @@ -4864,9 +4864,11 @@ static void test_invariant(void) else { len = strlen(ptr->expect)+1; /* include \0 */ - ok(ret == len, "For id %d, expected ret == %d, got %d, error %d\n", + ok(ret == len || (ptr->expect2 && ret == strlen(ptr->expect2)+1), + "For id %d, expected ret == %d, got %d, error %d\n", ptr->id, len, ret, GetLastError()); - ok(!strcmp(buffer, ptr->expect), "For id %d, Expected %s, got '%s'\n", + ok(!strcmp(buffer, ptr->expect) || (ptr->expect2 && !strcmp(buffer, ptr->expect2)), + "For id %d, Expected %s, got '%s'\n", ptr->id, ptr->expect, buffer); }

1 0

Huw Davies : kernel32/tests: Skip testing the translated invariant names on non US-English locales.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: fdf80ad7d9b096bcc5936b901d2c9b03609f36dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf80ad7d9b096bcc5936b901… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 10:51:46 2017 +0000 kernel32/tests: Skip testing the translated invariant names on non US-English locales. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c5b65f7..4224c0a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4875,10 +4875,10 @@ static void test_invariant(void) ptr++; } - if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || - (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + if ((LANGIDFROMLCID(GetSystemDefaultLCID()) != MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)) || + (LANGIDFROMLCID(GetThreadLocale()) != MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US))) { - skip("Non-English locale\n"); + skip("Non US-English locale\n"); } else {

1 0

Huw Davies : kernel32/tests: Windows 10 accepts locale names like "zz-ZZ" and "foo".
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: wine Branch: master Commit: 8948174aebafa5005a8ea6319bcb82e5d23e353a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8948174aebafa5005a8ea6319… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 10:51:44 2017 +0000 kernel32/tests: Windows 10 accepts locale names like "zz-ZZ" and "foo". Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 07d6f8c..2300956 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -43,6 +43,7 @@ static const WCHAR symbols_stripped[] = {'j','u','s','t','a','t','e','s','t','s' static const WCHAR localeW[] = {'e','n','-','U','S',0}; static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR emptyW[] = {0}; +static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; static inline unsigned int strlenW( const WCHAR *str ) { @@ -2644,7 +2645,7 @@ static void test_LCMapStringEx(void) trace("testing LCMapStringEx\n"); SetLastError(0xdeadbeef); - ret = pLCMapStringEx(fooW, LCMAP_LOWERCASE, + ret = pLCMapStringEx(invalidW, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 0); todo_wine { ok(!ret, "LCMapStringEx should fail with bad locale name\n"); @@ -2738,7 +2739,7 @@ static void test_LocaleNameToLCID(void) /* bad name */ SetLastError(0xdeadbeef); - lcid = pLocaleNameToLCID(fooW, 0); + lcid = pLocaleNameToLCID(invalidW, 0); ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, "Expected lcid == 0, got %08x, error %d\n", lcid, GetLastError()); @@ -4463,7 +4464,8 @@ static void test_IsValidLocaleName(void) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; static const WCHAR zzW[] = {'z','z',0}; - static const WCHAR zzzzW[] = {'z','z','-','Z','Z',0}; + static const WCHAR zz_zzW[] = {'z','z','-','Z','Z',0}; + static const WCHAR zzzzW[] = {'z','z','z','z',0}; BOOL ret; if (!pIsValidLocaleName) @@ -4475,7 +4477,9 @@ static void test_IsValidLocaleName(void) ret = pIsValidLocaleName(enusW); ok(ret, "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(zzW); - ok(!ret, "IsValidLocaleName should have failed\n"); + ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(zz_zzW); + ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zzzzW); ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT);

1 0

Francois Gouget : testbot/web: Fix the sort order of a job's tasks.
by Alexandre Julliard Jan. 17, 2017

Jan. 17, 2017

Module: tools Branch: master Commit: b339f509deb5fe6c859da9b27b310a2f202333b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b339f509deb5fe6c859da9b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 17 16:04:24 2017 +0100 testbot/web: Fix the sort order of a job's tasks. Each entry's id is a numeric value that's equal to step.no*100+task.no. But by default sort performs a string comparison resulting in task (10,1), aka "1001", coming before (1,1), aka "101", which comes before (11,1), aka "1101", etc. Also note that sorting is normally the job of the CollectionBlock but the JobDetails page is bypassing it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b43d375..cf3b4a8 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -213,7 +213,7 @@ sub SortKeys($$$) { my ($self, $CollectionBlock, $Keys) = @_; - my @SortedKeys = sort @$Keys; + my @SortedKeys = sort { $a <=> $b } @$Keys; return \@SortedKeys; }

1 0