Detlef Riekenberg : mlang/tests: Return correct result in Rfc1766ToLcidA on failure.
Alexandre Julliard
julliard at winehq.org
Wed May 27 09:26:55 CDT 2009
Module: wine
Branch: master
Commit: f4def21f57df4c3d33ff975e82f3020d01000714
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4def21f57df4c3d33ff975e82f3020d01000714
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Tue May 26 23:17:46 2009 +0200
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(+), 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 df2ecb7..d39e0e3 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);
+
}
More information about the wine-cvs
mailing list