Dmitry Timoshkov : kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 081737379a827bfac31efcc684591ef1f4860392
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=081737379a827bfac31efcc68...

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;