wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Hugh McMaster : reg: Fail if the separator for REG_MULTI_SZ is not one character in length.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 8a902f37618e42ff6e1e6ec82173b10fd3fcfac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a902f37618e42ff6e1e6ec82… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:07 2016 +1100 reg: Fail if the separator for REG_MULTI_SZ is not one character in length. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bcd812a..7dc624a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -579,7 +579,7 @@ int wmain(int argc, WCHAR *argvW[]) { WCHAR *ptr = argvW[++i]; - if (!ptr) + if (!ptr || strlenW(ptr) != 1) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Hugh McMaster : reg/tests: Add a test for /s with no separator character.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5a2ddc8d25c5560f7bfc7fd0575a74033de784bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2ddc8d25c5560f7bfc7fd05… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:06 2016 +1100 reg/tests: Add a test for /s with no separator character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1958be0..a813de1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -355,6 +355,9 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Fail if /s is used without an accompanying argument.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 46bdc153f129a32bd88eefc484d27db3e89ac881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bdc153f129a32bd88eefc48… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:05 2016 +1100 reg: Fail if /s is used without an accompanying argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ef25fe5..bcd812a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -576,7 +576,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + WCHAR *ptr = argvW[++i]; + + if (!ptr) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) { if (!(data = argvW[++i]))

1 0

Frédéric Delanoy : mscms/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 6ef5ae801d6e1f8f1a6492952d1fc82b9d1604ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef5ae801d6e1f8f1a6492952… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 15:18:25 2016 +0100 mscms/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index f3ebe03..c4ea7f2 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -675,10 +675,8 @@ static void test_EnumColorProfilesA( char *standardprofile ) ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); size = 0; @@ -689,10 +687,8 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -729,10 +725,8 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -742,10 +736,8 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); }

1 0

Frédéric Delanoy : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5da69565b53e6897d58d86e8da69e2d62902d3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da69565b53e6897d58d86e8d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 12:04:20 2016 +0100 kernel32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 38c0675..a3ae5e6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3172,11 +3172,8 @@ static void test_CreateFileMapping_protection(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); /* FIXME: remove once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - else - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); @@ -3267,9 +3264,7 @@ todo_wine ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); - else + todo_wine_if (td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); @@ -3284,9 +3279,7 @@ todo_wine ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(info.Protect == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_after_write); - else + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(info.Protect == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_after_write); } } @@ -3302,9 +3295,7 @@ todo_wine ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); - else + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); } @@ -3675,11 +3666,8 @@ static void test_mapping(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); /* FIXME: remove once Wine is fixed */ - if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - else - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); } UnmapViewOfFile(base);

1 0

Frédéric Delanoy : imagehlp/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 70e2aa7fdb97a48ec6ac87defde462294bdb7050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e2aa7fdb97a48ec6ac87def… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 10:55:20 2016 +0100 imagehlp/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/image.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 48443f5..3416c10 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -186,10 +186,7 @@ static void check_updates(LPCSTR header, const struct expected_update_accum *exp { DWORD i; - if (expected->todo) - todo_wine ok(expected->cUpdates == got->cUpdates, "%s: expected %d updates, got %d\n", - header, expected->cUpdates, got->cUpdates); - else + todo_wine_if (expected->todo) ok(expected->cUpdates == got->cUpdates, "%s: expected %d updates, got %d\n", header, expected->cUpdates, got->cUpdates); for (i = 0; i < min(expected->cUpdates, got->cUpdates); i++)

1 0

Charles Davis : dinput: Don't define a debug channel when it isn't used.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 4dba8a4e27db04c4edec973115bc1288a039156b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dba8a4e27db04c4edec97311… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 13:51:19 2016 -0700 dinput: Don't define a debug channel when it isn't used. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9921a28..261cee1 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -65,10 +65,10 @@ #include "device_private.h" #include "joystick_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAVE_LINUX_22_JOYSTICK_API +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define JOYDEV_NEW "/dev/input/js" #define JOYDEV_OLD "/dev/js" #define JOYDEVDRIVER " (js)" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4b4d69c..86f12d0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -63,10 +63,10 @@ #include "device_private.h" #include "joystick_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAS_PROPER_HEADER +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define EVDEVPREFIX "/dev/input/event" #define EVDEVDRIVER " (event)"

1 0

Nikolay Sivov : usp10/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: e6e0bc4a06102a09ed48c6a6ab40ff7f84c6f9e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0bc4a06102a09ed48c6a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:22:21 2016 +0300 usp10/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(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 | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6fab064..7881667 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -85,38 +85,28 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, winetest_win_skip("This test broken on this platform\n"); return; } - if (nItemsToDo) - todo_wine winetest_ok(outnItems == nItems, "Wrong number of items\n"); - else + todo_wine_if (nItemsToDo) winetest_ok(outnItems == nItems, "Wrong number of items\n"); for (x = 0; x <= outnItems; x++) { if (items[x].isBroken && broken(outpItems[x].iCharPos == items[x].broken_value[0])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[0]) - todo_wine winetest_ok(outpItems[x].iCharPos == items[x].iCharPos, "%i:Wrong CharPos\n",x); - else + else todo_wine_if (items[x].todo_flag[0]) winetest_ok(outpItems[x].iCharPos == items[x].iCharPos, "%i:Wrong CharPos (%i)\n",x,outpItems[x].iCharPos); if (items[x].isBroken && broken(outpItems[x].a.fRTL== items[x].broken_value[1])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[1]) - todo_wine winetest_ok(outpItems[x].a.fRTL == items[x].fRTL, "%i:Wrong fRTL\n",x); - else + else todo_wine_if (items[x].todo_flag[1]) winetest_ok(outpItems[x].a.fRTL == items[x].fRTL, "%i:Wrong fRTL(%i)\n",x,outpItems[x].a.fRTL); if (items[x].isBroken && broken(outpItems[x].a.fLayoutRTL == items[x].broken_value[2])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[2]) - todo_wine winetest_ok(outpItems[x].a.fLayoutRTL == items[x].fLayoutRTL, "%i:Wrong fLayoutRTL\n",x); - else + else todo_wine_if (items[x].todo_flag[2]) winetest_ok(outpItems[x].a.fLayoutRTL == items[x].fLayoutRTL, "%i:Wrong fLayoutRTL(%i)\n",x,outpItems[x].a.fLayoutRTL); if (items[x].isBroken && broken(outpItems[x].a.s.uBidiLevel == items[x].broken_value[3])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[3]) - todo_wine winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel\n",x); - else + else todo_wine_if (items[x].todo_flag[3]) winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel(%i)\n",x,outpItems[x].a.s.uBidiLevel); if (x != outnItems) winetest_ok(outpItems[x].a.eScript != SCRIPT_UNDEFINED, "%i: Undefined script\n",x); @@ -124,17 +114,13 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, { if (items[x].isBroken && broken(tags[x] == items[x].broken_value[4])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[4]) - todo_wine winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); - else + else todo_wine_if (items[x].todo_flag[4]) winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); } if (items[x].isBroken && broken(outpItems[x].a.s.fOverrideDirection == items[x].broken_value[5])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[5]) - todo_wine winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection\n",x); - else + else todo_wine_if (items[x].todo_flag[5]) winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection(%i)\n",x,outpItems[x].a.s.fOverrideDirection); } }

1 0

Nikolay Sivov : wininet/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 1b06662f0b67c47b6aecdace36843e21df13b704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b06662f0b67c47b6aecdace3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:17:30 2016 +0300 wininet/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5636d4b..45907e4 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1503,16 +1503,12 @@ static void test_InternetErrorDlg(void) default: break; } - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, flags, NULL); - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1521,9 +1517,7 @@ static void test_InternetErrorDlg(void) expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); - if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

1 0

Nikolay Sivov : wmiutils/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: fd00c9db5ab7ee56ae817bb75e02d40d6bd0488a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd00c9db5ab7ee56ae817bb75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:12:44 2016 +0300 wmiutils/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 56bebb3..99907a3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -140,8 +140,8 @@ static void test_IWbemPath_SetText(void) for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); - if (test[i].todo) todo_wine ok( hr == test[i].ret, "%u got %08x\n", i, hr ); - else ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + todo_wine_if (test[i].todo) + ok( hr == test[i].ret, "%u got %08x\n", i, hr ); if (test[i].ret == S_OK) {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016