October 2017 - Wine-Commits

Zebediah Figura : winemp3.acm: Rename to l3codeca.acm.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: bcc8791bc18f6c430cc2e29a2fd1641da77f7c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc8791bc18f6c430cc2e29a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 12 09:19:12 2017 -0500 winemp3.acm: Rename to l3codeca.acm. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 +++--- configure.ac | 4 ++-- dlls/{winemp3.acm => l3codeca.acm}/Makefile.in | 2 +- .../winemp3.acm.spec => l3codeca.acm/l3codeca.acm.spec} | 0 dlls/{winemp3.acm => l3codeca.acm}/mpegl3.c | 0 loader/wine.inf.in | 2 +- programs/winecfg/libraries.c | 2 +- tools/winapi/win32.api | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 095aa39..98bc0266 100755 --- a/configure +++ b/configure @@ -1277,6 +1277,7 @@ enable_kernel32 enable_kernelbase enable_ksuser enable_ktmw32 +enable_l3codeca_acm enable_loadperf enable_localspl enable_localui @@ -1508,7 +1509,6 @@ enable_winehid_sys enable_winejoystick_drv enable_winemac_drv enable_winemapi -enable_winemp3_acm enable_wineoss_drv enable_wineps_drv enable_winepulse_drv @@ -14128,7 +14128,7 @@ if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_Co *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; esac -enable_winemp3_acm=${enable_winemp3_acm:-no} +enable_l3codeca_acm=${enable_l3codeca_acm:-no} fi if test "$ac_cv_header_AL_al_h" = "yes" @@ -18456,6 +18456,7 @@ wine_fn_config_dll keyboard.drv16 enable_win16 wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel wine_fn_config_dll ksuser enable_ksuser wine_fn_config_dll ktmw32 enable_ktmw32 +wine_fn_config_dll l3codeca.acm enable_l3codeca_acm wine_fn_config_dll loadperf enable_loadperf implib wine_fn_config_dll localspl enable_localspl clean wine_fn_config_test dlls/localspl/tests localspl_test @@ -18826,7 +18827,6 @@ wine_fn_config_dll winehid.sys enable_winehid_sys wine_fn_config_dll winejoystick.drv enable_winejoystick_drv wine_fn_config_dll winemac.drv enable_winemac_drv clean wine_fn_config_dll winemapi enable_winemapi -wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv clean wine_fn_config_dll wineps16.drv16 enable_win16 diff --git a/configure.ac b/configure.ac index 44c7eed..76c7af5 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,7 +1684,7 @@ then fi WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], - [enable_winemp3_acm]) + [enable_l3codeca_acm]) dnl **** Check for OpenAL 1.1 **** if test "$ac_cv_header_AL_al_h" = "yes" @@ -3220,6 +3220,7 @@ WINE_CONFIG_DLL(keyboard.drv16,enable_win16) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) WINE_CONFIG_DLL(ksuser) WINE_CONFIG_DLL(ktmw32) +WINE_CONFIG_DLL(l3codeca.acm) WINE_CONFIG_DLL(loadperf,,[implib]) WINE_CONFIG_DLL(localspl,,[clean]) WINE_CONFIG_TEST(dlls/localspl/tests) @@ -3590,7 +3591,6 @@ WINE_CONFIG_DLL(winehid.sys) WINE_CONFIG_DLL(winejoystick.drv) WINE_CONFIG_DLL(winemac.drv,,[clean]) WINE_CONFIG_DLL(winemapi) -WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[clean]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in similarity index 82% rename from dlls/winemp3.acm/Makefile.in rename to dlls/l3codeca.acm/Makefile.in index 6e24c45..4f946ed 100644 --- a/dlls/winemp3.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,4 +1,4 @@ -MODULE = winemp3.acm +MODULE = l3codeca.acm IMPORTS = winmm user32 EXTRAINCL = $(MPG123_CFLAGS) EXTRALIBS = $(MPG123_LIBS) $(COREAUDIO_LIBS) diff --git a/dlls/winemp3.acm/winemp3.acm.spec b/dlls/l3codeca.acm/l3codeca.acm.spec similarity index 100% rename from dlls/winemp3.acm/winemp3.acm.spec rename to dlls/l3codeca.acm/l3codeca.acm.spec diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c similarity index 100% rename from dlls/winemp3.acm/mpegl3.c rename to dlls/l3codeca.acm/mpegl3.c diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 322d2cd..660e87d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2635,7 +2635,7 @@ system.ini, mci,,"waveaudio=mciwave.dll" system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" system.ini, drivers32,,"msacm.msg711=msg711.acm" -system.ini, drivers32,,"msacm.winemp3=winemp3.acm" +system.ini, drivers32,,"msacm.l3acm=l3codeca.acm" system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" system.ini, drivers32,,"vidc.mrle=msrle32.dll" system.ini, drivers32,,"vidc.msvc=msvidc32.dll" diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index ff3f67a..d414c75 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -57,6 +57,7 @@ static const char * const builtin_only[] = "icmp", "iphlpapi", "kernel32", + "l3codeca.acm", "mountmgr.sys", "mswsock", "ntdll", @@ -70,7 +71,6 @@ static const char * const builtin_only[] = "w32skrnl", "wined3d", "winedos", - "winemp3.acm", "wineps", "winmm", "wintab32", diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 172bb17..3a4557a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5760,7 +5760,7 @@ UINT DWORD_PTR -%%winemp3.acm +%%l3codeca.acm %long

1 0

Alexandre Julliard : Release 2.19.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5616ffbb39df7ad3ac0a41e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 01:40:20 2017 +0200 Release 2.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 593 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 279 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5616ffbb39df7ad3ac0…

1 0

Vadim Druzhin : comctl32/tests: Add tests for LVM_APPROXIMATEVIEWRECT in LVS_REPORT mode.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 2fb1002f323cb6129f41ac4131980eaf75ed6158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb1002f323cb6129f41ac413… Author: Vadim Druzhin <cdslow(a)mail.ru> Date: Fri Oct 13 17:45:09 2017 +0300 comctl32/tests: Add tests for LVM_APPROXIMATEVIEWRECT in LVS_REPORT mode. Signed-off-by: Vadim Druzhin <cdslow(a)mail.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 136 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dce253c..0e12362 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4962,13 +4962,18 @@ static void test_LVS_EX_TRANSPARENTBKGND(void) static void test_approximate_viewrect(void) { - HWND hwnd; - DWORD ret; + static CHAR test[] = "abracadabra, a very long item label"; + DWORD item_width, item_height, header_height; + static CHAR column_header[] = "Header"; + unsigned const column_width = 100; + DWORD ret, item_count; HIMAGELIST himl; - HBITMAP hbmp; LVITEMA itema; - static CHAR test[] = "abracadabra, a very long item label"; + LVCOLUMNA col; + HBITMAP hbmp; + HWND hwnd; + /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); himl = ImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -5025,6 +5030,129 @@ static void test_approximate_viewrect(void) expect(MAKELONG(152,152), ret); DestroyWindow(hwnd); + + /* LVS_REPORT */ + hwnd = create_listview_control(LVS_REPORT); + + /* Empty control without columns */ + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, MAKELPARAM(100, 100)); +todo_wine + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + header_height = HIWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret)); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == (header_height - 2 * item_height), "Unexpected height %d.\n", HIWORD(ret)) ; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height, "Unexpected height.\n"); + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + /* Insert column */ + col.mask = LVCF_TEXT | LVCF_WIDTH; + col.pszText = column_header; + col.cx = column_width; + ret = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + /* Empty control with column */ + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); +todo_wine { + ok(LOWORD(ret) >= column_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); +} + header_height = HIWORD(ret); + item_width = LOWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret)); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + for (item_count = 1; item_count <= 2; ++item_count) + { + itema.mask = LVIF_TEXT; + itema.iItem = 0; + itema.iSubItem = 0; + itema.pszText = test; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); + ok(LOWORD(ret) >= column_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + header_height = HIWORD(ret); + item_width = LOWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d, item %d\n", LOWORD(ret), item_count - 1); + ok(HIWORD(ret) > header_height, "Unexpected height %d. item %d.\n", HIWORD(ret), item_count - 1); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + item_count * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, MAKELONG(item_width * 2, header_height + 3 * item_height)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(item_width * 2, 0)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(-1, -1)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + } + + DestroyWindow(hwnd); + } static void test_finditem(void)

1 0

Hugh McMaster : regedit/tests: Add REG_NONE to the empty hex data import tests.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 8ecc0d41ca00e762ad22e9abddbce35caacfea19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecc0d41ca00e762ad22e9abd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:08 2017 +0000 regedit/tests: Add REG_NONE to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 64793b7..babea53 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -659,7 +659,8 @@ static void test_basic_import(void) "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" "\"Wine22g\"=hex(abcd):\n" - "\"Wine22h\"=hex:\n\n"); + "\"Wine22h\"=hex:\n" + "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -668,6 +669,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); RegCloseKey(hkey); @@ -1072,7 +1074,8 @@ static void test_basic_import_unicode(void) "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" "\"Wine22g\"=hex(abcd):\n" - "\"Wine22h\"=hex:\n\n"); + "\"Wine22h\"=hex:\n" + "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -1081,6 +1084,7 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); RegCloseKey(hkey);

1 0

Hugh McMaster : regedit/tests: Delete the export file before returning from compare_export().
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: a5de10a207a6a510752b2d6b3b3fddf12e7c5ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5de10a207a6a510752b2d6b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:07 2017 +0000 regedit/tests: Delete the export file before returning from compare_export(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bf0232a..64793b7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3393,7 +3393,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = TRUE; + + ret = DeleteFileA(filename); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -3468,9 +3470,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a simple data structure */ dword = 0x100; add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); @@ -3479,9 +3478,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); @@ -3519,9 +3515,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - lr = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); @@ -3535,9 +3528,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -3552,9 +3542,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : regedit/tests: Print an error code when CreateFile fails.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: c751b69f889c2385684407494f6815824aa232b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751b69f889c2385684407494… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:05 2017 +0000 regedit/tests: Print an error code when CreateFile fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3e949a5..37181bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -56,7 +56,7 @@ static BOOL write_file(const void *str, DWORD size) file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if (file == INVALID_HANDLE_VALUE) return FALSE;

1 0

Hugh McMaster : reg/tests: Add REG_NONE to the empty hex data import tests.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 50619b6ed30afa39537c234954038cf678ab7865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50619b6ed30afa39537c23495… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:28 2017 +0000 reg/tests: Add REG_NONE to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 168a03d..48cf8f2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2356,7 +2356,8 @@ static void test_import(void) "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" "\"Wine68g\"=hex(abcd):\n" - "\"Wine68h\"=hex:\n\n", &r); + "\"Wine68h\"=hex:\n" + "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -2366,6 +2367,7 @@ static void test_import(void) verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3850,7 +3852,8 @@ static void test_unicode_import(void) "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" "\"Wine68g\"=hex(abcd):\n" - "\"Wine68h\"=hex:\n\n", &r); + "\"Wine68h\"=hex:\n" + "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -3860,6 +3863,7 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Delete the export file before returning from compare_export().
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: e426c353fa9a025b324a6a80231970198edf2f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e426c353fa9a025b324a6a802… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:27 2017 +0000 reg/tests: Delete the export file before returning from compare_export(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 12a1666..168a03d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4309,7 +4309,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = TRUE; + + ret = DeleteFileA(filename); + todo_wine lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -4437,9 +4439,6 @@ static void test_export(void) todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a simple data structure */ dword = 0x100; add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); @@ -4449,9 +4448,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); @@ -4490,9 +4486,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); @@ -4507,9 +4500,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4525,9 +4515,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Daniel Lehman : msvcp90: Add std::range_error table.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: f664a991fdf52dfd142439be7ec4c2c9aaa7f1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f664a991fdf52dfd142439be7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 12 15:52:45 2017 -0700 msvcp90: Add std::range_error table. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 22 ++++++++--------- dlls/msvcp90/cxx.h | 1 + dlls/msvcp90/exception.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index d9e42bd..f496430 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -907,10 +907,10 @@ @ stub -arch=win64 ??0overflow_error(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0overflow_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z @ stub -arch=win64 ??0overflow_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win32 ??0range_error(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z +@ thiscall -arch=win32 ??0range_error(a)std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor +@ cdecl -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor +@ thiscall -arch=win32 ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr +@ cdecl -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr @ thiscall -arch=win32 ??0runtime_error(a)std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor @ cdecl -arch=win64 ??0runtime_error(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor @ thiscall -arch=win32 ??0runtime_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_runtime_error_ctor_bstr @@ -1083,8 +1083,8 @@ @ cdecl -arch=win64 ??1out_of_range(a)std@@UEAA(a)XZ(ptr) MSVCP_logic_error_dtor @ stub -arch=win32 ??1overflow_error(a)std@@UAE(a)XZ @ stub -arch=win64 ??1overflow_error(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1range_error(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1range_error(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1range_error(a)std@@UAE(a)XZ(ptr) MSVCP_runtime_error_dtor +@ cdecl -arch=win64 ??1range_error(a)std@@UEAA(a)XZ(ptr) MSVCP_runtime_error_dtor @ thiscall -arch=win32 ??1runtime_error(a)std@@UAE(a)XZ(ptr) MSVCP_logic_error_dtor @ cdecl -arch=win64 ??1runtime_error(a)std@@UEAA(a)XZ(ptr) MSVCP_logic_error_dtor @ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor @@ -1257,8 +1257,8 @@ @ cdecl -arch=win64 ??4out_of_range(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_out_of_range_assign @ stub -arch=win32 ??4overflow_error(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4overflow_error(a)std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_range_error_assign +@ cdecl -arch=win64 ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_range_error_assign @ thiscall -arch=win32 ??4runtime_error(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_runtime_error_assign @ cdecl -arch=win64 ??4runtime_error(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_runtime_error_assign @ stub -arch=win32 ??4underflow_error(a)std@@QAEAAV01(a)ABV01@@Z @@ -1829,7 +1829,7 @@ # extern ??_7money_base(a)std@@6B@ @ extern ??_7out_of_range(a)std@@6B@ MSVCP_out_of_range_vtable # extern ??_7overflow_error(a)std@@6B@ -# extern ??_7range_error(a)std@@6B@ +@ extern ??_7range_error(a)std@@6B@ MSVCP_range_error_vtable @ extern ??_7runtime_error(a)std@@6B@ MSVCP_runtime_error_vtable # extern ??_7time_base(a)std@@6B@ # extern ??_7underflow_error(a)std@@6B@ @@ -2045,8 +2045,8 @@ @ cdecl -arch=win64 ?_Doraise(a)out_of_range@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)overflow_error@std@@MBEXXZ @ stub -arch=win64 ?_Doraise(a)overflow_error@std@@MEBAXXZ -@ stub -arch=win32 ?_Doraise(a)range_error@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise(a)range_error@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise(a)range_error@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise(a)range_error@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ thiscall -arch=win32 ?_Doraise(a)runtime_error@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise(a)runtime_error@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)underflow_error@std@@MBEXXZ diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 12a7f84..ddf9421 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -311,6 +311,7 @@ typedef enum __exception_type { EXCEPTION_INVALID_ARGUMENT, EXCEPTION_RUNTIME_ERROR, EXCEPTION_FAILURE, + EXCEPTION_RANGE_ERROR, } exception_type; void throw_exception(exception_type, const char *); diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index c96f7a1..e62dfae 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -59,6 +59,8 @@ extern const vtable_ptr MSVCP_runtime_error_vtable; extern const vtable_ptr MSVCP_failure_vtable; /* ??_7bad_cast(a)std@@6B@ */ extern const vtable_ptr MSVCP_bad_cast_vtable; +/* ??_7range_error(a)std@@6B@ */ +extern const vtable_ptr MSVCP_range_error_vtable; static void MSVCP_type_info_dtor(type_info * _this) { @@ -195,6 +197,8 @@ exception* __thiscall MSVCP_exception_assign(exception *this, const exception *a /* ?_Doraise(a)runtime_error@std@@MEBAXXZ */ /* ?_Doraise(a)bad_cast@std@@MBEXXZ */ /* ?_Doraise(a)bad_cast@std@@MEBAXXZ */ +/* ?_Doraise(a)range_error@std@@MBEXXZ */ +/* ?_Doraise(a)range_error@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { @@ -585,6 +589,8 @@ runtime_error* __thiscall MSVCP_runtime_error_ctor_bstr(runtime_error *this, con /* ??1runtime_error(a)std@@UAE(a)XZ */ /* ??1runtime_error(a)std@@UEAA(a)XZ */ +/* ??1range_error(a)std@@UAE(a)XZ */ +/* ??1range_error(a)std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_dtor, 4) void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) { @@ -766,6 +772,53 @@ bad_cast* __thiscall MSVCP_bad_cast_opequals(bad_cast *this, const bad_cast *rhs DEFINE_RTTI_DATA1(bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@") DEFINE_CXX_DATA1(bad_cast, &exception_cxx_type_info, MSVCP_bad_cast_dtor) +/* range_error class data */ +typedef runtime_error range_error; + +static range_error* MSVCP_range_error_ctor( range_error *this, exception_name name ) +{ + TRACE("%p %s\n", this, EXCEPTION_STR(name)); + MSVCP_runtime_error_ctor(this, name); + this->e.vtable = &MSVCP_range_error_vtable; + return this; +} + +/* ??0range_error(a)std@@QAE(a)ABV01@@Z */ +/* ??0range_error(a)std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_copy_ctor, 8) +range_error* __thiscall MSVCP_range_error_copy_ctor( + range_error *this, const range_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_runtime_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_range_error_vtable; + return this; +} + +/* ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +/* ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +#ifndef _MSVCIRT +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_ctor_bstr, 8) +range_error* __thiscall MSVCP_range_error_ctor_bstr(range_error *this, const basic_string_char *str) +{ + const char *name = MSVCP_basic_string_char_c_str(str); + TRACE("(%p %p %s)\n", this, str, name); + return MSVCP_range_error_ctor(this, EXCEPTION_NAME(name)); +} +#endif + +/* ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z */ +/* ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_assign, 8) +range_error* __thiscall MSVCP_range_error_assign(range_error *this, const range_error *assign) +{ + MSVCP_runtime_error_dtor(this); + return MSVCP_range_error_copy_ctor(this, assign); +} + +DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVrange_error(a)std@@") +DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) + /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void) { @@ -856,6 +909,9 @@ void __asm_dummy_vtables(void) { EXCEPTION_VTABLE(bad_cast, VTABLE_ADD_FUNC(MSVCP_bad_cast_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what)); + EXCEPTION_VTABLE(range_error, + VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_exception_what)); #ifndef __GNUC__ } #endif @@ -913,6 +969,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_failure_ctor(&e, name); _CxxThrowException((exception*)&e, &failure_cxx_type); } + case EXCEPTION_RANGE_ERROR: { + range_error e; + MSVCP_range_error_ctor(&e, name); + _CxxThrowException((exception*)&e, &range_error_cxx_type); + } } } @@ -929,6 +990,7 @@ void init_exception(void *base) init_runtime_error_rtti(base); init_failure_rtti(base); init_bad_cast_rtti(base); + init_range_error_rtti(base); init_exception_cxx(base); init_bad_alloc_cxx(base); @@ -939,5 +1001,6 @@ void init_exception(void *base) init_runtime_error_cxx(base); init_failure_cxx(base); init_bad_cast_cxx(base); + init_range_error_cxx(base); #endif }

1 0

Andrey Gusev : user32/tests: Remove redundant comparison.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 70b8a2f86b8e270841bea8390f2063445b5c8b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b8a2f86b8e270841bea8390… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 13 15:38:27 2017 +0300 user32/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 94e98af..8f2576d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -933,8 +933,7 @@ static void test_Input_blackbox(void) empty_message_queue(); prevWndProc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR) WndProc2); - ok(prevWndProc != 0 || (prevWndProc == 0 && GetLastError() == 0), - "error: %d\n", (int) GetLastError()); + ok(prevWndProc != 0 || GetLastError() == 0, "error: %d\n", (int) GetLastError()); i.type = INPUT_KEYBOARD; i.u.ki.time = 0;

1 0