mlang/tests: Return correct result in Rfc1766ToLcidA on failure.

f4def21f · Detlef Riekenberg · Alexandre Julliard · 7bc167ac · f4def21f · f4def21f
Commit f4def21f authored May 26, 2009 by Detlef Riekenberg Committed by Alexandre Julliard May 27, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

mlang.c dlls/mlang/mlang.c +3 -0

mlang.c dlls/mlang/tests/mlang.c +6 -0

No files found.
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1238,6 +1238,9 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A)
 {
    WCHAR rfc1766W[MAX_RFC1766_NAME + 1];

+    if (!rfc1766A)
+        return E_INVALIDARG;
+
    MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME);
    rfc1766W[MAX_RFC1766_NAME] = 0;


--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -935,6 +935,12 @@ static void test_Rfc1766ToLcid(void)

    }

+    ret = Rfc1766ToLcidA(&lcid, NULL);
+    ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret);
+
+    ret = Rfc1766ToLcidA(NULL, "en");
+    ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret);
+
 }