[PATCH v18 0/1] MR6919: bcp47langs: Add tests for GetUserLanguages.

[Vijay Kiran Kamuju (＠infyquest)]

This is for testing the implementation for Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56915

--
  v18: bcp47langs: Add stub for GetUserLanguages.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6919

[PATCH v18 1/1] bcp47langs: Add stub for GetUserLanguages.

[Vijay Kiran Kamuju]

From: Vijay Kiran Kamuju <infyquest(a)gmail.com>

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
 dlls/bcp47langs/bcp47langs.spec    |  2 +-
 dlls/bcp47langs/main.c             | 15 ++++++++++++---
 dlls/bcp47langs/tests/Makefile.in  |  2 +-
 dlls/bcp47langs/tests/bcp47langs.c | 22 ++++++++++++++++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/dlls/bcp47langs/bcp47langs.spec b/dlls/bcp47langs/bcp47langs.spec
index c90a2b59d49..1904021219f 100644
--- a/dlls/bcp47langs/bcp47langs.spec
+++ b/dlls/bcp47langs/bcp47langs.spec
@@ -48,7 +48,7 @@
 @ stub GetUserDisplayLanguageOverride
 @ stub GetUserLanguageInputMethods
 @ stub GetUserLanguageInputMethodsForUser
-@ stub GetUserLanguages
+@ stdcall GetUserLanguages(long ptr)
 @ stub GetUserLanguagesForAllUsers
 @ stub GetUserLanguagesForUser
 @ stub GetUserLocaleFromLanguageProfileOptOut
diff --git a/dlls/bcp47langs/main.c b/dlls/bcp47langs/main.c
index 7ec9ebef697..2ac3e4a8ab9 100644
--- a/dlls/bcp47langs/main.c
+++ b/dlls/bcp47langs/main.c
@@ -17,9 +17,12 @@
  */
 
 #include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winstring.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bcp47langs);
@@ -53,3 +56,9 @@ HRESULT WINAPI GetFontFallbackLanguageList(const WCHAR *lang, size_t buffer_leng
     memcpy(buffer, lang, lang_length * sizeof(WCHAR));
     return S_OK;
 }
+
+DWORD WINAPI GetUserLanguages(WCHAR delim, HSTRING *langs)
+{
+    FIXME("%lc, %p\n", delim, langs);
+    return 0;
+}
diff --git a/dlls/bcp47langs/tests/Makefile.in b/dlls/bcp47langs/tests/Makefile.in
index 3c2cee465cf..43db21a1c47 100644
--- a/dlls/bcp47langs/tests/Makefile.in
+++ b/dlls/bcp47langs/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL = bcp47langs.dll
-IMPORTS = bcp47langs
+IMPORTS = combase bcp47langs
 
 SOURCES = \
 	bcp47langs.c
diff --git a/dlls/bcp47langs/tests/bcp47langs.c b/dlls/bcp47langs/tests/bcp47langs.c
index 7cdf3ed8ef4..c76896422d4 100644
--- a/dlls/bcp47langs/tests/bcp47langs.c
+++ b/dlls/bcp47langs/tests/bcp47langs.c
@@ -18,9 +18,13 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+#include "winstring.h"
+
 #include "wine/test.h"
 
 HRESULT WINAPI GetFontFallbackLanguageList(const WCHAR *, size_t, WCHAR *, size_t *);
+DWORD WINAPI GetUserLanguages(WCHAR, HSTRING *);
 
 static void test_GetFontFallbackLanguageList(void)
 {
@@ -63,7 +67,25 @@ static void test_GetFontFallbackLanguageList(void)
     ok(required_size >= (wcslen(L"en-US") + 1), "Got unexpected size %Iu.\n", required_size);
 }
 
+static void test_GetUserLanguages(void)
+{
+    DWORD hr;
+    HSTRING usrlangs;
+
+    hr = GetUserLanguages('|', NULL);
+    todo_wine ok(hr == 0, "got %ld.\n", hr);
+
+    hr = GetUserLanguages('|', &usrlangs);
+    todo_wine ok(hr == 0, "got %ld.\n", hr);
+    WindowsDeleteString(usrlangs);
+
+    hr = GetUserLanguages(',', &usrlangs);
+    todo_wine ok(hr == 0, "got %ld.\n", hr);
+    WindowsDeleteString(usrlangs);
+}
+
 START_TEST(bcp47langs)
 {
     test_GetFontFallbackLanguageList();
+    test_GetUserLanguages();
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6919

[Zhiyi Zhang (＠zhiyi)]

There is a slightly better MR at https://gitlab.winehq.org/wine/wine/-/merge_requests/6131. But the author didn't address the latest comments.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6919#note_117599

[Vijay Kiran Kamuju (＠infyquest)]

I checked the MR, I will try to incorporate some of the comments and changes.
But in the testbot for Windows 10 VMs, it generally outputs more than 1 language.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6919#note_117656