[PATCH] mlang/tests: Return correct result in Rfc1766ToLcid on failure
Detlef Riekenberg
wine.dev at web.de
Tue May 26 16:17:46 CDT 2009
---
dlls/mlang/mlang.c | 3 +++
dlls/mlang/tests/mlang.c | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 5deb87b..bd6a7f5 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 04896f6..757545b 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);
+
}
--
1.5.4.3
--=-cNa3tw7qVMzMIELM/8+o--
More information about the wine-patches
mailing list