December 2021 - Wine-Commits

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 30, 2021

Dec. 30, 2021

Module: wine Branch: master Commit: ba47d8a2b4e47aed1f788d7c4240d76014b67fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba47d8a2b4e47aed1f788d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 30 18:29:27 2021 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 704 ++++++++++++++++++++++----------------------------------------- 1 file changed, 248 insertions(+), 456 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba47d8a2b4e47aed1f78…

1 0

Zebediah Figura : server: Reselect the socket returned from accept_socket().
by Alexandre Julliard Dec. 30, 2021

Dec. 30, 2021

Module: wine Branch: master Commit: b1a2238a10413af1437982dd80f0c61d216ec12e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a2238a10413af1437982dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:15:33 2021 -0600 server: Reselect the socket returned from accept_socket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52024 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6bbd1c24666..9ff4a5d844d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5166,8 +5166,8 @@ static void test_accept_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); ctx->socket = server; - check_events_todo(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); closesocket(server); closesocket(client); diff --git a/server/sock.c b/server/sock.c index 2df4f3d3056..736f34feac5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -722,6 +722,7 @@ static void complete_async_accept( struct sock *sock, struct accept_req *req ) handle = alloc_handle_no_access_check( async_get_thread( async )->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); if (!handle) { @@ -2174,6 +2175,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) handle = alloc_handle( current->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); set_reply_data( &handle, sizeof(handle) ); return;

1 0

Zebediah Figura : winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.
by Alexandre Julliard Dec. 30, 2021

Dec. 30, 2021

Module: wine Branch: master Commit: 03d92af78a5000097b26560bba97320eb013441a URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d92af78a5000097b26560b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 22:04:35 2021 -0600 winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); }

1 0

Zebediah Figura : ws2_32/tests: Increase tolerance in a timing test.
by Alexandre Julliard Dec. 30, 2021

Dec. 30, 2021

Module: wine Branch: master Commit: 9d7f41e702e9f2cacc3b16e8b88a73d81e44860f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f41e702e9f2cacc3b16e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:20:59 2021 -0600 ws2_32/tests: Increase tolerance in a timing test. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9ff4a5d844d..5e16343a577 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3182,7 +3182,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n");

1 0

Zhiyi Zhang : comctl32/listview: Do not paint over header when handling WM_NCPAINT.
by Alexandre Julliard Dec. 30, 2021

Dec. 30, 2021

Module: wine Branch: master Commit: 5f0dcf79185941c4faff35d1cc9c758160f3a27d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0dcf79185941c4faff35d1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 30 16:10:35 2021 +0800 comctl32/listview: Do not paint over header when handling WM_NCPAINT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52285 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 41e3db5f9be..9e35f7879b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10537,8 +10537,8 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) { LONG exstyle = GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE); HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + RECT r, window_rect; HDC dc; - RECT r; HRGN cliprgn; int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); @@ -10552,7 +10552,13 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1) CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + if (infoPtr->hwndHeader && LISTVIEW_IsHeaderEnabled(infoPtr)) + { + GetWindowRect(infoPtr->hwndHeader, &window_rect); + r.top = min(r.bottom, r.top + window_rect.bottom - window_rect.top); + } dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN);

1 0

Zebediah Figura : ws2_32: Correctly null-terminate the addrinfo chain.
by Alexandre Julliard Dec. 29, 2021

Dec. 29, 2021

Module: wine Branch: master Commit: 9947a8d0de8dfa6bd3ca860940e94aa3dc91019b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9947a8d0de8dfa6bd3ca8609… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 12:38:53 2021 -0600 ws2_32: Correctly null-terminate the addrinfo chain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + dst->ai_next = NULL; next = (char *)dst->ai_addr + dst->ai_addrlen; if (dst == params->info || !addrinfo_in_list( params->info, dst )) @@ -763,8 +764,6 @@ static NTSTATUS unix_getaddrinfo( void *args ) } } - dst->ai_next = NULL; - freeaddrinfo( unix_info ); return 0; #else

1 0

Esme Povirk : maintainers: Updating my email address.
by Alexandre Julliard Dec. 29, 2021

Dec. 29, 2021

Module: wine Branch: master Commit: 58b1dc9f47310ba868cbcb3083de1b423247e7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b1dc9f47310ba868cbcb30… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Dec 29 13:39:23 2021 -0600 maintainers: Updating my email address. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -118,7 +118,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -146,7 +146,7 @@ F: dlls/win32u/printdrv.c F: dlls/win32u/region.c GDIPlus -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -240,7 +240,7 @@ F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -280,7 +280,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 TWAIN -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -314,9 +314,10 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl Windows Imaging Component -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +F: dlls/wmphoto/ Windows Management Instrumentation M: Hans Leidekker <hans(a)codeweavers.com> @@ -376,7 +377,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

André Zwing : kernelbase/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Dec. 29, 2021

Dec. 29, 2021

Module: wine Branch: master Commit: 25e1fcc56302d9c6ae364ec943c87cf78da9ba6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e1fcc56302d9c6ae364ec9… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Dec 28 20:09:49 2021 +0100 kernelbase/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/process.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index a28411f4e5b..1a008be9a7b 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -35,6 +35,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static void test_CompareObjectHandles(void) { HANDLE h1, h2; + BOOL ret; if (!pCompareObjectHandles) { @@ -42,24 +43,24 @@ static void test_CompareObjectHandles(void) return; } - ok( pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ), - "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() ); + ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ); + ok( ret, "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() ); - ok( pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ), - "comparing GetCurrentThread() to self failed with %u\n", GetLastError() ); + ret = pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ); + ok( ret, "comparing GetCurrentThread() to self failed with %u\n", GetLastError() ); SetLastError(0); - ok( !pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ) && - GetLastError() == ERROR_NOT_SAME_OBJECT, + ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ); + ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() ); h1 = NULL; - ok( DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), - &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ), - "failed to duplicate current process handle: %u\n", GetLastError() ); + ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "failed to duplicate current process handle: %u\n", GetLastError() ); - ok( pCompareObjectHandles( GetCurrentProcess(), h1 ), - "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() ); + ret = pCompareObjectHandles( GetCurrentProcess(), h1 ); + ok( ret, "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() ); CloseHandle( h1 ); @@ -67,12 +68,12 @@ static void test_CompareObjectHandles(void) ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); h2 = NULL; - ok( DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(), - &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ), - "failed to duplicate handle %p: %u\n", h1, GetLastError() ); + ret = DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "failed to duplicate handle %p: %u\n", h1, GetLastError() ); - ok( pCompareObjectHandles( h1, h2 ), - "comparing %p with %p failed with %u\n", h1, h2, GetLastError() ); + ret = pCompareObjectHandles( h1, h2 ); + ok( ret, "comparing %p with %p failed with %u\n", h1, h2, GetLastError() ); CloseHandle( h2 ); @@ -80,7 +81,8 @@ static void test_CompareObjectHandles(void) ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); SetLastError(0); - ok( !pCompareObjectHandles( h1, h2 ) && GetLastError() == ERROR_NOT_SAME_OBJECT, + ret = pCompareObjectHandles( h1, h2 ); + ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT, "comparing %p with %p returned %u\n", h1, h2, GetLastError() ); CloseHandle( h2 );

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 29, 2021

Dec. 29, 2021

Module: wine Branch: master Commit: a225ca161be6cf862af6a1fc154a623378ea10de URL: https://source.winehq.org/git/wine.git/?a=commit;h=a225ca161be6cf862af6a1fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 23:24:00 2021 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 1258 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 594 insertions(+), 664 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a225ca161be6cf862af6…

1 0

André Zwing : kernel32/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Dec. 29, 2021

Dec. 29, 2021

Module: wine Branch: master Commit: a6bf1a5ffb112db7d165508226fb9f029fa94d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf1a5ffb112db7d1655082… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Dec 28 20:09:48 2021 +0100 kernel32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d64a08666f8..2d327b7130c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7048,22 +7048,19 @@ static BOOL CALLBACK calinfo_procA(LPSTR calinfo) static void test_EnumCalendarInfoA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoA( calinfo_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoA( calinfo_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoA( calinfo_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7076,22 +7073,19 @@ static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) static void test_EnumCalendarInfoW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoW( calinfo_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoW( calinfo_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoW( calinfo_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7105,22 +7099,19 @@ static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) static void test_EnumCalendarInfoExA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExA( calinfoex_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExA( calinfoex_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExA( calinfoex_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7134,22 +7125,19 @@ static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) static void test_EnumCalendarInfoExW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExW( calinfoex_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExW( calinfoex_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExW( calinfoex_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } }

1 0