[v2 PATCH] usp10: Handle invalid arguments in ScriptIsComplex()
Nikolay Sivov
nsivov at codeweavers.com
Sat Apr 1 10:16:10 CDT 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
v2: fixed test failures
dlls/usp10/tests/usp10.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
dlls/usp10/usp10.c | 3 +++
2 files changed, 67 insertions(+)
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 1b2ba6fae3..d3027147ae 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -3911,6 +3911,68 @@ static void test_ScriptGetLogicalWidths(void)
}
}
+static void test_ScriptIsComplex(void)
+{
+ static const WCHAR testW[] = {0x202a,'1',0x202c,0};
+ static const WCHAR test2W[] = {'1',0};
+ static const struct complex_test
+ {
+ const WCHAR *text;
+ DWORD flags;
+ HRESULT hr;
+ BOOL todo;
+ } complex_tests[] =
+ {
+ { test2W, SIC_ASCIIDIGIT, S_OK },
+ { test2W, SIC_COMPLEX, S_FALSE },
+ { test2W, SIC_COMPLEX | SIC_ASCIIDIGIT, S_OK },
+ { testW, SIC_NEUTRAL | SIC_COMPLEX, S_OK },
+ { testW, SIC_NEUTRAL, S_FALSE, TRUE },
+ { testW, SIC_COMPLEX, S_OK },
+ { testW, 0, S_FALSE },
+ };
+ unsigned int i;
+ HRESULT hr;
+
+ hr = ScriptIsComplex(NULL, 0, 0);
+ ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr);
+
+ if (hr == E_INVALIDARG)
+ {
+ hr = ScriptIsComplex(NULL, 1, 0);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ }
+
+ hr = ScriptIsComplex(test2W, -1, SIC_ASCIIDIGIT);
+ ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr);
+
+ hr = ScriptIsComplex(test2W, 0, SIC_ASCIIDIGIT);
+ ok(hr == S_FALSE, "got 0x%08x\n", hr);
+
+ for (i = 0; i < sizeof(complex_tests)/sizeof(complex_tests[0]); i++)
+ {
+ hr = ScriptIsComplex(complex_tests[i].text, lstrlenW(complex_tests[i].text), complex_tests[i].flags);
+ todo_wine_if(complex_tests[i].todo)
+ ok(hr == complex_tests[i].hr, "%u: got %#x, expected %#x, flags %#x\n", i, hr, complex_tests[i].hr,
+ complex_tests[i].flags);
+ }
+
+ hr = ScriptIsComplex(test2W, 1, ~0u);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = ScriptIsComplex(testW, 3, 0);
+ ok(hr == S_FALSE, "got 0x%08x\n", hr);
+
+ hr = ScriptIsComplex(testW, 3, SIC_NEUTRAL | SIC_COMPLEX);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = ScriptIsComplex(testW, 3, SIC_COMPLEX);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ hr = ScriptIsComplex(test2W, 1, SIC_COMPLEX);
+ ok(hr == S_FALSE, "got 0x%08x\n", hr);
+}
+
START_TEST(usp10)
{
HWND hwnd;
@@ -3966,6 +4028,8 @@ START_TEST(usp10)
test_ScriptGetFontFunctions(hdc);
test_ScriptGetLogicalWidths();
+ test_ScriptIsComplex();
+
ReleaseDC(hwnd, hdc);
DestroyWindow(hwnd);
}
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 2df27beb79..c1d9c1c43e 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3019,6 +3019,9 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag)
TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag);
+ if (!chars || len < 0)
+ return E_INVALIDARG;
+
for (i = 0; i < len; i+=consumed)
{
if (i >= len)
--
2.11.0
More information about the wine-patches
mailing list