March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : http.sys: Cancel outstanding requests when a handle is closed.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: d942f12871c22d0a11840c2ba7af3a67cf1f1317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d942f12871c22d0a11840c2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:59 2020 -0600 http.sys: Cancel outstanding requests when a handle is closed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 9587eaa9a8..5fbae66b75 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1396,8 +1396,20 @@ static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct request_queue *queue = stack->FileObject->FsContext; + LIST_ENTRY *entry; TRACE("Closing queue %p.\n", queue); + + EnterCriticalSection(&http_cs); + + while ((entry = queue->irp_queue.Flink) != &queue->irp_queue) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + IoCancelIrp(queued_irp); + } + + LeaveCriticalSection(&http_cs); + close_queue(queue); irp->IoStatus.Status = STATUS_SUCCESS;

1 0

Zebediah Figura : server: Hold a reference to the device on behalf of the device manager.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 0bd7da4290ea32da0dba92c0190e2fb839580c3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bd7da4290ea32da0dba92c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 14 12:10:20 2020 -0600 server: Hold a reference to the device on behalf of the device manager. Otherwise, the only thing holding a reference to a device may be a device_file. If this is released in delete_device(), the subsequent call to unlink_named_object() will crash. This can occur if a device driver crashes with pending IRPs outstanding. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/device.c b/server/device.c index d3e2a84c1e..b02d965e33 100644 --- a/server/device.c +++ b/server/device.c @@ -700,6 +700,7 @@ static struct device *create_device( struct object *root, const struct unicode_s { device->unix_path = NULL; device->manager = manager; + grab_object( device ); list_add_tail( &manager->devices, &device->entry ); list_init( &device->kernel_object ); list_init( &device->files ); @@ -748,6 +749,7 @@ static void delete_device( struct device *device ) unlink_named_object( &device->obj ); list_remove( &device->entry ); device->manager = NULL; + release_object( device ); }

1 0

Alexandre Julliard : ntdll: Reimplement IdnToAscii() using the normalization table and the ntdll helpers.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 01237d089641789cb3cc9c6436435cf410af2da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01237d089641789cb3cc9c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:28:41 2020 +0100 ntdll: Reimplement IdnToAscii() using the normalization table and the ntdll helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 137 ++------------------------------------- dlls/kernel32/tests/locale.c | 10 ++- dlls/ntdll/locale.c | 148 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 5 files changed, 161 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01237d089641789cb3cc…

1 0

Dmitry Timoshkov : kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: cac04651637f339720cfde3c0c58672477c777c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac04651637f339720cfde3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:40 2020 +0800 kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 63 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8ff630a1eb..eff6c88b9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5461,12 +5461,24 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); +todo_wine + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); +todo_wine + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5475,6 +5487,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5483,6 +5497,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); } @@ -5490,7 +5506,7 @@ static void test_GetSystemPreferredUILanguages(void) static void test_GetThreadPreferredUILanguages(void) { BOOL ret; - ULONG count, size; + ULONG count, size, size_id; WCHAR *buf; if (!pGetThreadPreferredUILanguages) @@ -5510,6 +5526,51 @@ static void test_GetThreadPreferredUILanguages(void) ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); ok(ret, "got %u\n", GetLastError()); ok(count, "expected count > 0\n"); + + size_id = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size_id, "expected size > 0\n"); + ok(size_id <= size, "expected size > 0\n"); + + size = 0; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); +todo_wine + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); +todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 2; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(0, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); + HeapFree(GetProcessHeap(), 0, buf); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: 9870f9325af50bf4fc762266a97c663f587e8a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9870f9325af50bf4fc762266… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:37 2020 +0800 kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9870f9325af50bf4fc76…

1 0

Jacek Caban : makedep: Build builtin programs with ucrt.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: 0959d189c86eb4b218a8f4a49a6d6d897c09255b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0959d189c86eb4b218a8f4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:40:02 2020 +0100 makedep: Build builtin programs with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6dec1b3900..c324802916 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4260,11 +4260,6 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = 1; } - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); - LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - - make->is_cross = crosstarget && make->use_msvcrt; - if (make->use_msvcrt) { for (i = 0; i < make->imports.count; i++) @@ -4273,10 +4268,23 @@ static void load_sources( struct makefile *make ) if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; } - if (!crt_dll) crt_dll = "msvcrt"; + if (!crt_dll) + { + if (make->use_msvcrt && make->is_exe) + { + strarray_add( &make->imports, "ucrtbase" ); + crt_dll = "ucrtbase"; + } + else crt_dll = "msvcrt"; + } if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); + + make->is_cross = crosstarget && make->use_msvcrt; + if (make->is_cross) { for (i = 0; i < make->imports.count; i++)

1 0

Jacek Caban : ucrtbase: Add exe entry points implementation.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: 78eca968878cfac7f5b75ca9ccb3f2ad5100309d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78eca968878cfac7f5b75ca9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 15:25:23 2020 +0100 ucrtbase: Add exe entry points implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index 81ec188058..fa325d64b3 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl mainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; char **argv, **env; +#ifdef _UCRT + _configure_narrow_argv(_crt_argv_unexpanded_arguments); + _initialize_narrow_environment(); + argc = *__p___argc(); + argv = *__p___argv(); + env = _get_initial_narrow_environment(); +#else + int new_mode = 0; __getmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = main(argc, argv, env); diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 77eb4dbfa7..6bc20e2e0f 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl wmainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; WCHAR **argv, **env; +#ifdef _UCRT + _configure_wide_argv(_crt_argv_unexpanded_arguments); + _initialize_wide_environment(); + argc = *__p___argc(); + argv = *__p___wargv(); + env = _get_initial_wide_environment(); +#else + int new_mode = 0; __wgetmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = wmain(argc, argv, env); diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 2caef7c8c7..6711b4e66c 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -7,6 +7,11 @@ PARENTSRC = ../msvcrt C_SRCS = \ console.c \ cpp.c \ + crt_gccmain.c \ + crt_main.c \ + crt_winmain.c \ + crt_wmain.c \ + crt_wwinmain.c \ ctype.c \ data.c \ dir.c \

1 0

Serge Gautherie : shell32: Fix SHCNE_UPDATEITEM number of items.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: 83acbb79c1a059cbfec58fbb05619e7a6f703f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=83acbb79c1a059cbfec58fbb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Feb 27 14:32:26 2020 +0100 shell32: Fix SHCNE_UPDATEITEM number of items. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/changenotify.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2efb297ad5..a87913c1f0 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -64,10 +64,11 @@ static LONG next_id; SHCNE_DRIVEADDGUI | SHCNE_DRIVEREMOVED | SHCNE_FREESPACE | \ SHCNE_MEDIAINSERTED | SHCNE_MEDIAREMOVED | SHCNE_MKDIR | \ SHCNE_NETSHARE | SHCNE_NETUNSHARE | SHCNE_RMDIR | \ - SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE ) + SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE | \ + SHCNE_UPDATEITEM ) #define SHCNE_TWOITEMEVENTS ( \ - SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEITEM ) + SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM ) /* for dumping events */ static const char * DumpEvent( LONG event )

1 0

Nikolay Sivov : mf: Fix GetClock() for shutdown state.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: de95a030292324ac199ae014d40fd85a9c6dbed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de95a030292324ac199ae014… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:31:07 2020 +0300 mf: Fix GetClock() for shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 12 +++++++++--- dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0c7e1fbf01..a2a2ba6fe5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1364,13 +1364,19 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) { struct media_session *session = impl_from_IMFMediaSession(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, clock); - *clock = (IMFClock *)session->clock; - IMFClock_AddRef(*clock); + EnterCriticalSection(&session->cs); + if (SUCCEEDED(hr = session_is_shut_down(session))) + { + *clock = (IMFClock *)session->clock; + IMFClock_AddRef(*clock); + } + LeaveCriticalSection(&session->cs); - return S_OK; + return hr; } static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8f3a80360f..5f3114da32 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1100,6 +1100,7 @@ todo_wine hr = IMFClock_GetProperties(clock, &clock_props); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + IMFClock_Release(clock); IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); @@ -1117,6 +1118,9 @@ todo_wine hr = IMFMediaSession_Close(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */

1 0

Dmitry Timoshkov : kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard March 2, 2020

March 2, 2020

Module: wine Branch: master Commit: 081737379a827bfac31efcc684591ef1f4860392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081737379a827bfac31efcc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:42 2020 +0800 kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 98f9efa1b6..63b27f9453 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -112,6 +112,7 @@ static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *b if (lsize > *size) { + *size = lsize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index eff6c88b9e..fa067b7301 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5477,7 +5477,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; @@ -5487,7 +5486,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; @@ -5497,7 +5495,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); @@ -5550,7 +5547,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 1; @@ -5559,7 +5555,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 2;

1 0