From f4def21f57df4c3d33ff975e82f3020d01000714 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev@web.de>
Date: Tue, 26 May 2009 23:17:46 +0200
Subject: [PATCH] mlang/tests: Return correct result in Rfc1766ToLcidA on
 failure.

---
 dlls/mlang/mlang.c       | 3 +++
 dlls/mlang/tests/mlang.c | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 5deb87b3881..bd6a7f57f67 100644
--- 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;
 
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index df2ecb72efb..d39e0e3e954 100644
--- 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);
+
 }
 
 
-- 
2.11.4.GIT