June 2016 - Wine-commits - list.winehq.org

André Hentschel : advapi32/tests: Allow Win8+ flags for Admins ACE.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 4464793e601c541587c199d45ccaee721e4f02cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4464793e601c541587c199d45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:36:27 2016 +0200 advapi32/tests: Allow Win8+ flags for Admins ACE. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eebd163..cf104ab 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4023,7 +4023,8 @@ static void test_GetNamedSecurityInfoA(void) flags = ((ACE_HEADER *)ace)->AceFlags; ok(flags == 0x0 || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ - || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)), /* win7 */ + || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) /* win7 */ + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)), /* win8+ */ "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS);

1 0

Alexandre Julliard : gdi32/tests: Get rid of the todo mechanism in the path tests.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: b2702b2d6f68fc28dd821d0d982157bf45901d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2702b2d6f68fc28dd821d0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 12:26:04 2016 +0900 gdi32/tests: Get rid of the todo mechanism in the path tests. All the tests succeed now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 242 ++++++++++++++++++++++-------------------------- 1 file changed, 112 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2702b2d6f68fc28dd821…

1 0

Alexandre Julliard : gdi32: Validate the point count in Polyline and Polygon.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 117f862ce52aab6f166e918b391fac20e682befc URL: http://source.winehq.org/git/wine.git/?a=commit;h=117f862ce52aab6f166e918b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 12:36:23 2016 +0900 gdi32: Validate the point count in Polyline and Polygon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0d4ad59..9666ea3 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1253,13 +1253,14 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, /************************************************************* * pathdrv_Polyline */ -static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); + BYTE *type; - if (!type) return FALSE; - if (cbPoints) type[0] = PT_MOVETO; + if (count < 2) return FALSE; + if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + type[0] = PT_MOVETO; return TRUE; } @@ -1267,25 +1268,27 @@ static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) /************************************************************* * pathdrv_PolylineTo */ -static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - return add_log_points_new_stroke( physdev, pts, cbPoints, PT_LINETO ); + if (count < 1) return FALSE; + return add_log_points_new_stroke( physdev, pts, count, PT_LINETO ); } /************************************************************* * pathdrv_Polygon */ -static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); + BYTE *type; - if (!type) return FALSE; - if (cbPoints) type[0] = PT_MOVETO; - if (cbPoints > 1) type[cbPoints - 1] = PT_LINETO | PT_CLOSEFIGURE; + if (count < 2) return FALSE; + if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + type[0] = PT_MOVETO; + type[count - 1] = PT_LINETO | PT_CLOSEFIGURE; return TRUE; }

1 0

Andrey Gusev : winhttp/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: a66f08db46ab7c6fb15b51473b15019d1d1fe154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66f08db46ab7c6fb15b51473… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:30:07 2016 +0300 winhttp/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f81c07c..6be7598 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -617,7 +617,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, go %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n");

1 0

Andrey Gusev : msvcp120/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 362297c31958ef11e39e3f0e84dc396af48f3bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362297c31958ef11e39e3f0e8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:26:35 2016 +0300 msvcp120/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7c94906..354b2d3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -592,7 +592,7 @@ static void test_xtime_get(void) diff = p__Xtime_diff_to_millis2(&after, &before); ok(diff >= tests[i], - "xtime_get() not functioning correctly, test: %d, expect: ge %d, got: %d\n", + "xtime_get() not functioning correctly, test: %d, expect: %d, got: %d\n", i, tests[i], diff); }

1 0

Andrey Gusev : riched20/tests: Fix a typo in ok() messages.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 355a2162469e5efd6c622a4ebb7a73ab2f063c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a2162469e5efd6c622a4eb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:28:57 2016 +0300 riched20/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 92af700..200ce53 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8123,7 +8123,7 @@ static void test_reset_default_para_fmt( void ) SendMessageA( richedit, WM_CUT, 0, 0 ); SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); - ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); + ok( fmt.wAlignment == def_align, "got %d expect %d\n", fmt.wAlignment, def_align ); DestroyWindow( richedit ); } @@ -8290,7 +8290,7 @@ static void test_alignment_style(void) SendMessageW(richedit, WM_CUT, 0, 0); SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - ok(pf.wAlignment == align_mask[i], "got %d exppect %d\n", pf.wAlignment, align_mask[i]); + ok(pf.wAlignment == align_mask[i], "got %d expect %d\n", pf.wAlignment, align_mask[i]); DestroyWindow(richedit); }

1 0

Piotr Caban : msvcirt/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 5c1b944a1c1c873c2090cbd7765a0a1ec3924f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1b944a1c1c873c2090cbd77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:06 2016 +0200 msvcirt/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 184 +++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c1b944a1c1c873c2090c…

1 0

Piotr Caban : msvcp60/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 2d4aac74089789107abe56c2685c54ee17d0e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4aac74089789107abe56c26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:13 2016 +0200 msvcp60/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 8 ++++---- dlls/msvcp60/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index f121604..a79d51b 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1435,7 +1435,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1460,7 +1460,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 2cbf025..f61ad4a 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -377,9 +377,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -388,11 +388,11 @@ static void test_basic_string_char_swap(void) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func3(p_basic_string_char_ctor_cstr_alloc, &str2, atmp2, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -580,8 +580,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -667,9 +667,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -678,11 +678,11 @@ static void test_basic_string_wchar_swap(void) { call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str2, wtmp2, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

Piotr Caban : msvcp90/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: c6530fee82352573e12f3dc1e3bf5edbef10807f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6530fee82352573e12f3dc1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:20 2016 +0200 msvcp90/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 8 ++++---- dlls/msvcp90/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0c57ca1..91c546e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1833,7 +1833,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1860,7 +1860,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1890,7 +1890,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1913,7 +1913,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 8aea30a..9d46df0 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -409,9 +409,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -420,11 +420,11 @@ static void test_basic_string_char_swap(void) { call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_ctor_cstr, &str2, atmp2); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -607,8 +607,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -694,9 +694,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -705,11 +705,11 @@ static void test_basic_string_wchar_swap(void) { call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_ctor_cstr, &str2, wtmp2); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

André Hentschel : mshtml/tests: Allow ParseUrl to clear buffer on Win10.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 56e06d3f2e511c8eee677341489089612768d127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e06d3f2e511c8eee6773414… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:50:21 2016 +0200 mshtml/tests: Allow ParseUrl to clear buffer on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index f9803df..6376f3f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -720,7 +720,9 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); - ok(buf[0] == '?', "buf changed\n"); + ok(buf[0] == '?' || buf[0] == '\0' /* Win10 */, + "Expected buf to be unchanged or empty, got %s\n", + wine_dbgstr_w(buf)); ok(size == sizeof(about_blank_url)/sizeof(WCHAR) || size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ "size=%d\n", size);

1 0