February 2020 - Wine-commits

Michael Stefaniuc : bcrypt/tests: Get rid of strcmp_wa().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 7485362fa13354361fd185a115fa7b866398e70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7485362fa13354361fd185a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 4 21:44:10 2020 +0100 bcrypt/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d26150f469..0dc2085111 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -155,13 +155,6 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_object_length(a) _test_object_length(__LINE__,a) static void _test_object_length(unsigned line, void *handle) { @@ -211,7 +204,7 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) } #define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) -static void _test_alg_name(unsigned line, void *handle, const char *exname) +static void _test_alg_name(unsigned line, void *handle, const WCHAR *exname) { ULONG size = 0xdeadbeef; UCHAR buf[256]; @@ -220,13 +213,14 @@ static void _test_alg_name(unsigned line, void *handle, const char *exname) status = pBCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); - ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); + ok_(__FILE__,line)(size == (lstrlenW(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!lstrcmpW(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), + wine_dbgstr_w(exname)); } struct hash_test { - const char *alg; + const WCHAR *alg; unsigned hash_size; const char *hash; const char *hash2; @@ -239,15 +233,12 @@ static void test_hash(const struct hash_test *test) BCRYPT_ALG_HANDLE alg; BCRYPT_HASH_HANDLE hash; UCHAR buf[512], buf_hmac[1024], hash_buf[128], hmac_hash[128]; - WCHAR alg_name[64]; char str[512]; NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); - alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -312,7 +303,7 @@ static void test_hash(const struct hash_test *test) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -380,19 +371,19 @@ static void test_hashes(void) { static const struct hash_test tests[] = { - { "SHA1", 20, + { L"SHA1", 20, "961fa64958818f767707072755d7018dcd278e94", "9314f62ff64197143c91fc86de37e9ae776a3fb8", "2472cf65d0e090618d769d3e46f0d9446cf212da", "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { "SHA256", 32, + { L"SHA256", 32, "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { "SHA384", 48, + { L"SHA384", 48, "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" "63eed1e743a692d70e0504b0cfd12ef9", "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" @@ -402,7 +393,7 @@ static void test_hashes(void) "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" "e6e0be8b214d8508595b17a8c4b4e7db", }, - { "SHA512", 64, + { L"SHA512", 64, "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" @@ -412,19 +403,19 @@ static void test_hashes(void) "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { "MD2", 16, + { L"MD2", 16, "1bb33606ba908912a84221109d29cd7e", "b9a6ad9323b17e2d0cd389dddd6ef78a", "7f05b0638d77f4a27f3a9c4d353cd648", "05980873e6bfdd05dd7b30078de7e42a", }, - { "MD4", 16, + { L"MD4", 16, "74b5db93c0b41e36ca7074338fc0b637", "a14a9ff2059a8c28f47b01e6bc48a1bf", "bc2e8ac4d8248ed21b8d26227a30ea3a", "b609db0eb4b8669db74f2c20099701e4", }, - { "MD5", 16, + { L"MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", "bcdd7ca574342aa9db0e212348eacb16", "7bda029b93fa8d817fcc9e13d6bdf092", @@ -460,7 +451,7 @@ static void test_BcryptHash(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 16); - test_alg_name(alg, "MD5"); + test_alg_name(alg, L"MD5"); memset(md5, 0, sizeof(md5)); ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); @@ -541,7 +532,7 @@ static void test_BcryptDeriveKeyPBKDF2(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 20); - test_alg_name(alg, "SHA1"); + test_alg_name(alg, L"SHA1"); ret = pBCryptDeriveKeyPBKDF2(alg, rfc6070[0].pwd, rfc6070[0].pwd_len, rfc6070[0].salt, rfc6070[0].salt_len, 0, buf, rfc6070[0].dk_len, 0); @@ -581,7 +572,7 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); - test_alg_name(alg, "RNG"); + test_alg_name(alg, L"RNG"); memset(buf, 0, 16); ret = pBCryptGenRandom(alg, buf, 8, 0); @@ -654,7 +645,7 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); - test_alg_name(alg, "AES"); + test_alg_name(alg, L"AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Brendan Shanks : wbemuuid: Add library.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 829dff0ee770f720ee90976faac3cbd6bb2afc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=829dff0ee770f720ee90976f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 4 12:11:44 2020 -0800 wbemuuid: Add library. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wbemuuid/Makefile.in | 4 ++++ dlls/wbemuuid/wbemuuid.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index c7e8f5ef1f..80235dd995 100755 --- a/configure +++ b/configure @@ -1617,6 +1617,7 @@ enable_vssapi enable_vulkan_1 enable_wbemdisp enable_wbemprox +enable_wbemuuid enable_wdscore enable_webservices enable_wer @@ -20930,6 +20931,7 @@ wine_fn_config_makefile dlls/wbemdisp enable_wbemdisp wine_fn_config_makefile dlls/wbemdisp/tests enable_tests wine_fn_config_makefile dlls/wbemprox enable_wbemprox wine_fn_config_makefile dlls/wbemprox/tests enable_tests +wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests diff --git a/configure.ac b/configure.ac index f9ca95ce49..40374210bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3739,6 +3739,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) +WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in new file mode 100644 index 0000000000..449a0e68a8 --- /dev/null +++ b/dlls/wbemuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwbemuuid.a + +C_SRCS = \ + wbemuuid.c diff --git a/dlls/wbemuuid/wbemuuid.c b/dlls/wbemuuid/wbemuuid.c new file mode 100644 index 0000000000..8fc3314d8d --- /dev/null +++ b/dlls/wbemuuid/wbemuuid.c @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "dispex.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "initguid.h" + +#include "wbemcli.h" +#include "wbemprov.h" +#include "wbemdisp.h"

1 0

Jacek Caban : jscript: Add GetSourceLineText implementation.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 150b7391b878aed21e13116d7628adddabf13c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=150b7391b878aed21e13116d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 20:28:38 2020 +0100 jscript: Add GetSourceLineText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 3 ++- dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 15 ++++++++++++--- dlls/jscript/parser.y | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 9 +++++++-- 7 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2be5f24fae..61db10cd41 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2521,7 +2521,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte if(FAILED(hres)) { if(hres != DISP_E_EXCEPTION) throw_error(ctx, hres, NULL); - set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR); + set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR, NULL); release_bytecode(compiler.code); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 054b0c7602..f94cfd1e80 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2779,7 +2779,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) frame = ctx->call_ctx; if(exception_hres != DISP_E_EXCEPTION) throw_error(ctx, exception_hres, NULL); - set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR); + set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR, NULL); while(!frame->except_frame) { DWORD flags; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bb991c442e..cad46e12c5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -229,6 +229,7 @@ struct _jsexcept_t { jsstr_t *source; jsstr_t *message; + jsstr_t *line; bytecode_t *code; unsigned loc; @@ -240,7 +241,7 @@ struct _jsexcept_t { void enter_script(script_ctx_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT leave_script(script_ctx_t*,HRESULT) DECLSPEC_HIDDEN; void reset_ei(jsexcept_t*) DECLSPEC_HIDDEN; -void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned) DECLSPEC_HIDDEN; +void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned,jsstr_t*) DECLSPEC_HIDDEN; typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index eca6c90138..4d54d74f6c 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -420,7 +420,7 @@ HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) return DISP_E_EXCEPTION; } -void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned source_id) +void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned source_id, jsstr_t *line) { if(is_jscript_error(ei->error)) { if(!ei->source) { @@ -438,6 +438,8 @@ void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned ei->code = bytecode_addref(code); ei->loc = loc; + if(line) + ei->line = jsstr_addref(line); } jsdisp_t *create_builtin_error(script_ctx_t *ctx) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 860fb01cf5..8f97fa818d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -211,12 +211,17 @@ static HRESULT WINAPI JScriptError_GetSourceLineText(IActiveScriptError *iface, { JScriptError *This = impl_from_IActiveScriptError(iface); - FIXME("(%p)->(%p)\n", This, source); + TRACE("(%p)->(%p)\n", This, source); if(!source) return E_POINTER; - *source = NULL; - return E_FAIL; + + if(!This->ei.line) { + *source = NULL; + return E_FAIL; + } + + return jsstr_to_bstr(This->ei.line, source); } static const IActiveScriptErrorVtbl JScriptErrorVtbl = { @@ -248,6 +253,10 @@ void reset_ei(jsexcept_t *ei) jsstr_release(ei->message); ei->message = NULL; } + if(ei->line) { + jsstr_release(ei->line); + ei->line = NULL; + } } void enter_script(script_ctx_t *ctx, jsexcept_t *ei) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5a71a84ffa..507369ca20 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1598,12 +1598,24 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_clear(mark); hres = parser_ctx->hres; if(FAILED(hres)) { - WARN("parser failed around %s\n", - debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20)); + const WCHAR *line_start = code->source + parser_ctx->error_loc, *line_end = line_start; + jsstr_t *line_str; + + while(line_start > code->source && line_start[-1] != '\n') + line_start--; + while(*line_end && *line_end != '\n') + line_end++; + line_str = jsstr_alloc_len(line_start, line_end - line_start); + + WARN("parser failed around %s in line %s\n", + debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20), + debugstr_jsstr(line_str)); throw_error(ctx, hres, NULL); - set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR); + set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR, line_str); parser_release(parser_ctx); + if(line_str) + jsstr_release(line_str); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 6e2250882d..675bd819ee 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2232,6 +2232,13 @@ static void test_error_reports(void) NULL, ERROR_TODO_SCODE | ERROR_TODO_DESCRIPTION }, + { + L"f(1\n,\n2,\n ,,3\n);\n", + JS_E_SYNTAX, 3, 1, + L"Microsoft JScript compilation error", + L"Syntax error", + L" ,,3" + }, }; if (!is_lang_english()) @@ -2304,9 +2311,7 @@ static void test_error_reports(void) hres = IActiveScriptError_GetSourceLineText(script_error, &line_text); if (tests[i].line_text) { - todo_wine ok(hres == S_OK, "GetSourceLineText failed: %08x\n", hres); - todo_wine ok(line_text != NULL && !lstrcmpW(line_text, tests[i].line_text), "[%u] GetSourceLineText returned %s expected %s\n", i, wine_dbgstr_w(line_text), wine_dbgstr_w(tests[i].line_text)); }

1 0

Jacek Caban : mshtml/tests: Get rid of is_prefix_wa.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: a98179c0ab7cd7aced1a317177b87af761050842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a98179c0ab7cd7aced1a3171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 20:32:32 2020 +0100 mshtml/tests: Get rid of is_prefix_wa. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2b0a5cde95..c758fb2907 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -563,20 +563,6 @@ static const elem_type_info_t elem_type_infos[] = { {L"tspan", tspan_iids, NULL} }; -static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) -{ - int len, prefix_len; - CHAR buf[512]; - - len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, ARRAY_SIZE(buf), NULL, NULL)-1; - prefix_len = lstrlenA(prefix); - if(len < prefix_len) - return FALSE; - - buf[prefix_len] = 0; - return !lstrcmpA(buf, prefix); -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -8255,7 +8241,7 @@ static void test_iframe_elem(IHTMLElement *elem) } #define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) -static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *exstr, BOOL is_todo) +static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const WCHAR *exstr, BOOL is_todo) { BSTR str; HRESULT hres; @@ -8264,7 +8250,7 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); todo_wine_if(is_todo) { if(exstr) - ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + ok_(__FILE__,line)(str && !wcsncmp(str, exstr, lstrlenW(exstr)), "cssText = %s\n", wine_dbgstr_w(str)); else ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); } @@ -8310,13 +8296,13 @@ static void test_stylesheet(IDispatch *disp) ok(href == NULL, "got href != NULL\n"); SysFreeString(href); - test_stylesheet_csstext(stylesheet, ".body {", FALSE); + test_stylesheet_csstext(stylesheet, L".body {", FALSE); set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); - test_stylesheet_csstext(stylesheet, ".div {", TRUE); + test_stylesheet_csstext(stylesheet, L".div {", TRUE); set_stylesheet_csstext(stylesheet, "", FALSE); test_stylesheet_csstext(stylesheet, NULL, FALSE); set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); - test_stylesheet_csstext(stylesheet, ".div {", FALSE); + test_stylesheet_csstext(stylesheet, L".div {", FALSE); hres = IHTMLStyleSheet_get_rules(stylesheet, &col); ok(hres == S_OK, "get_rules failed: %08x\n", hres);

1 0

Alexandre Julliard : wrc: Directly implement UTF-8 conversions.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 88abd7cb984f80b4f8788582361236ce331346f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88abd7cb984f80b4f8788582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:39:42 2020 +0100 wrc: Directly implement UTF-8 conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 156 insertions(+), 27 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index a1e07b85b2..15bbde9d74 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -296,12 +296,12 @@ int is_valid_codepage(int id) return IsValidCodePage( id ); } -int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); } -int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +static int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { return WideCharToMultiByte( codepage, flags, src, srclen, dst, dstlen, NULL, NULL ); } @@ -315,25 +315,145 @@ int is_valid_codepage(int cp) return cp == CP_UTF8 || wine_cp_get_table(cp); } -int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { - if (codepage == CP_UTF8) return wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); } -int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +static int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { - if (codepage == CP_UTF8) return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); return wine_cp_wcstombs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen, NULL, NULL ); } #endif /* _WIN32 */ +static WCHAR *utf8_to_unicode( const char *src, int srclen, int *dstlen ) +{ + static const char utf8_length[128] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80-0x8f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90-0x9f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xa0-0xaf */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xb0-0xbf */ + 0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xc0-0xcf */ + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xd0-0xdf */ + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xe0-0xef */ + 3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0 /* 0xf0-0xff */ + }; + static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; + + const char *srcend = src + srclen; + int len, res; + WCHAR *ret, *dst; + + dst = ret = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + while (src < srcend) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + len = utf8_length[ch - 0x80]; + if (len && src + len <= srcend) + { + res = ch & utf8_mask[len]; + switch (len) + { + case 3: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + src++; + if (res < 0x10) break; + case 2: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + if (res >= 0x110000 >> 6) break; + src++; + if (res < 0x20) break; + if (res >= 0xd800 >> 6 && res <= 0xdfff >> 6) break; + case 1: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + src++; + if (res < 0x80) break; + if (res <= 0xffff) *dst++ = res; + else + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + *dst++ = 0xdc00 | (res & 0x3ff); + } + continue; + } + } + *dst++ = 0xfffd; + } + *dst = 0; + *dstlen = dst - ret; + return ret; +} + +static char *unicode_to_utf8( const WCHAR *src, int srclen, int *dstlen ) +{ + char *ret, *dst; + + dst = ret = xmalloc( srclen * 3 + 1 ); + for ( ; srclen; srclen--, src++) + { + unsigned int ch = *src; + + if (ch < 0x80) /* 0x00-0x7f: 1 byte */ + { + *dst++ = ch; + continue; + } + if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xc0 | ch; + dst += 2; + continue; + } + if (ch >= 0xd800 && ch <= 0xdbff && srclen > 1 && src[1] >= 0xdc00 && src[1] <= 0xdfff) + { + /* 0x10000-0x10ffff: 4 bytes */ + ch = 0x10000 + ((ch & 0x3ff) << 10) + (src[1] & 0x3ff); + dst[3] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[2] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xf0 | ch; + dst += 4; + src++; + srclen--; + continue; + } + if (ch >= 0xd800 && ch <= 0xdfff) ch = 0xfffd; /* invalid surrogate pair */ + + /* 0x800-0xffff: 3 bytes */ + dst[2] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xe0 | ch; + dst += 3; + } + *dst = 0; + *dstlen = dst - ret; + return ret; +} + string_t *convert_string(const string_t *str, enum str_e type, int codepage) { string_t *ret = xmalloc(sizeof(*ret)); int res; + ret->type = type; ret->loc = str->loc; if (!codepage && str->type != type) @@ -341,27 +461,33 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) if((str->type == str_char) && (type == str_unicode)) { - ret->type = str_unicode; - ret->size = wrc_mbstowcs( codepage, 0, str->str.cstr, str->size, NULL, 0 ); - ret->str.wstr = xmalloc( (ret->size+1) * sizeof(WCHAR) ); - res = wrc_mbstowcs( codepage, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, - ret->str.wstr, ret->size ); - if (res == -2) - parser_error( "Invalid character in string '%.*s' for codepage %u", - str->size, str->str.cstr, codepage ); - ret->str.wstr[ret->size] = 0; + if (codepage == CP_UTF8) + ret->str.wstr = utf8_to_unicode( str->str.cstr, str->size, &ret->size ); + else + { + ret->str.wstr = xmalloc( (str->size + 1) * sizeof(WCHAR) ); + res = wrc_mbstowcs( codepage, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, str->size ); + if (res == -2) + parser_error( "Invalid character in string '%.*s' for codepage %u", + str->size, str->str.cstr, codepage ); + ret->size = res; + ret->str.wstr[ret->size] = 0; + } } else if((str->type == str_unicode) && (type == str_char)) { - ret->type = str_char; - ret->size = wrc_wcstombs( codepage, 0, str->str.wstr, str->size, NULL, 0 ); - ret->str.cstr = xmalloc( ret->size + 1 ); - wrc_wcstombs( codepage, 0, str->str.wstr, str->size, ret->str.cstr, ret->size ); - ret->str.cstr[ret->size] = 0; + if (codepage == CP_UTF8) + ret->str.cstr = unicode_to_utf8( str->str.wstr, str->size, &ret->size ); + else + { + ret->str.cstr = xmalloc( str->size * 2 + 1 ); + ret->size = wrc_wcstombs( codepage, 0, str->str.wstr, str->size, ret->str.cstr, str->size * 2 ); + ret->str.cstr[ret->size] = 0; + } } else if(str->type == str_unicode) { - ret->type = str_unicode; ret->size = str->size; ret->str.wstr = xmalloc(sizeof(WCHAR)*(ret->size+1)); memcpy( ret->str.wstr, str->str.wstr, ret->size * sizeof(WCHAR) ); @@ -369,7 +495,6 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) } else /* str->type == str_char */ { - ret->type = str_char; ret->size = str->size; ret->str.cstr = xmalloc( ret->size + 1 ); memcpy( ret->str.cstr, str->str.cstr, ret->size ); @@ -389,22 +514,26 @@ void free_string(string_t *str) /* check if the string is valid utf8 despite a different codepage being in use */ int check_valid_utf8( const string_t *str, int codepage ) { - unsigned int i; + int i, count; + WCHAR *wstr; if (!check_utf8) return 0; if (!codepage) return 0; if (codepage == CP_UTF8) return 0; if (!is_valid_codepage( codepage )) return 0; - for (i = 0; i < str->size; i++) + for (i = count = 0; i < str->size; i++) { if ((unsigned char)str->str.cstr[i] >= 0xf5) goto done; - if ((unsigned char)str->str.cstr[i] >= 0xc2) break; + if ((unsigned char)str->str.cstr[i] >= 0xc2) { count++; continue; } if ((unsigned char)str->str.cstr[i] >= 0x80) goto done; } - if (i == str->size) return 0; /* no 8-bit chars at all */ + if (!count) return 0; /* no 8-bit chars at all */ - if (wrc_mbstowcs( CP_UTF8, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0) return 1; + wstr = utf8_to_unicode( str->str.cstr, str->size, &count ); + for (i = 0; i < count; i++) if (wstr[i] == 0xfffd) break; + free( wstr ); + return (i == count); done: check_utf8 = 0; /* at least one 8-bit non-utf8 string found, stop checking */

1 0

Alexandre Julliard : wmc: Directly implement UTF-8 conversions.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: c2f6714970728914ec0dfc7892f200394b8fa25b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f6714970728914ec0dfc78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:39:48 2020 +0100 wmc: Directly implement UTF-8 conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 2 - tools/wmc/mcl.c | 15 +++++-- tools/wmc/po.c | 18 ++------ tools/wmc/utils.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 2 + tools/wmc/write.c | 36 ++++++++-------- 6 files changed, 155 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2f6714970728914ec0d…

1 0

Alexandre Julliard : unicode: Avoid copying the decomposition data when not necessary.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: cd8eaef47e00aacecbf8c6d3a61c971724cbebf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8eaef47e00aacecbf8c6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:52:04 2020 +0100 unicode: Avoid copying the decomposition data when not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 16 +---------- dlls/kernelbase/locale.c | 67 +++++++++++++++++++++++++++++---------------- dlls/ntdll/locale.c | 40 +++++++++++++++++++-------- include/wine/unicode.h | 3 -- libs/port/decompose.c | 21 ++------------ libs/port/mbtowc.c | 53 +++++++++++++++++++++++------------ libs/port/sortkey.c | 30 ++++++++++++-------- tools/make_unicode | 51 ++++------------------------------ 8 files changed, 135 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8eaef47e00aacecbf8…

1 0

Alexandre Julliard : unicode: Expand surrogates in decomposition tables.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 0576fa43c414f866e1e91dae89bd2b096d7bf2a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0576fa43c414f866e1e91dae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 14:36:21 2020 +0100 unicode: Expand surrogates in decomposition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 96 ++--- libs/port/decompose.c | 914 ++++++++++++++++++++++---------------------- tools/make_unicode | 15 +- 3 files changed, 518 insertions(+), 507 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0576fa43c414f866e1e9…

1 0

Alexandre Julliard : unicode: Move the combining class table to ntdll.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 6346809302e5b8bd990d4b09d74c90e7d18741fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6346809302e5b8bd990d4b09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 16:29:34 2020 +0100 unicode: Move the combining class table to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + {libs/port => dlls/ntdll}/combclass.c | 0 libs/port/Makefile.in | 1 - tools/make_unicode | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 491cf5a707..94348d56a6 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ actctx.c \ atom.c \ cdrom.c \ + combclass.c \ critsection.c \ crypt.c \ debugbuffer.c \ diff --git a/libs/port/combclass.c b/dlls/ntdll/combclass.c similarity index 100% rename from libs/port/combclass.c rename to dlls/ntdll/combclass.c diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f9e45035bd..3b70f82d6f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -76,7 +76,6 @@ C_SRCS = \ c_950.c \ casemap.c \ collation.c \ - combclass.c \ compose.c \ cpsymbol.c \ cptable.c \ diff --git a/tools/make_unicode b/tools/make_unicode index c500e68ee9..3f1d3e55a9 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2757,7 +2757,7 @@ dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c", 1 ); dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 ); -dump_combining_class( "libs/port/combclass.c" ); +dump_combining_class( "dlls/ntdll/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); dump_bracket( "dlls/usp10/bracket.c" );

1 0

Alexandre Julliard : kernel32/tests: Optionally test the entire NormalizationTest.txt file.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 269c372c098020b7b97fd38c82a406025a6fe1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=269c372c098020b7b97fd38c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 14:31:45 2020 +0100 kernel32/tests: Optionally test the entire NormalizationTest.txt file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 115 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 76a993e6c3..36822d5acc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5862,6 +5862,36 @@ static void test_SetThreadUILanguage(void) "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); } +static int put_utf16( WCHAR *str, unsigned int c ) +{ + if (c < 0x10000) + { + *str = c; + return 1; + } + c -= 0x10000; + str[0] = 0xd800 | (c >> 10); + str[1] = 0xdc00 | (c & 0x3ff); + return 2; +} + +/* read a Unicode string from NormalizationTest.txt format; helper for test_NormalizeString */ +static int read_str( char *str, WCHAR res[32] ) +{ + int pos = 0; + char *end; + + while (*str && pos < 31) + { + unsigned int c = strtoul( str, &end, 16 ); + pos += put_utf16( res + pos, c ); + while (*end == ' ') end++; + str = end; + } + res[pos] = 0; + return pos; +} + static void test_NormalizeString(void) { /* part 0: specific cases */ @@ -6010,8 +6040,10 @@ static void test_NormalizeString(void) const struct test_data_normal *ptest = test_arr; const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD }; WCHAR dst[256]; + BOOLEAN ret; NTSTATUS status; int dstlen, str_cmp, i, j; + FILE *f; if (!pNormalizeString) { @@ -6057,8 +6089,6 @@ static void test_NormalizeString(void) if (pRtlNormalizeString) { - BOOLEAN ret = FALSE; - dstlen = 0; status = pRtlNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, &dstlen ); ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); @@ -6072,6 +6102,7 @@ static void test_NormalizeString(void) str_cmp = wcsncmp( ptest->expected[i], dst, dstlen ); ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); + ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); @@ -6258,6 +6289,86 @@ static void test_NormalizeString(void) todo_wine ok( dstlen == 3, "%d: wrong len %d\n", i, dstlen ); } } + + /* optionally run the full test file from Unicode.org + * available at http://www.unicode.org/Public/UCD/latest/ucd/NormalizationTest.txt + */ + if ((f = fopen( "NormalizationTest.txt", "r" ))) + { + char *p, buffer[1024]; + WCHAR str[3], srcW[32], dstW[32], resW[4][32]; + int i, line = 0, part = 0, ch; + char tested[0x110000 / 8]; + + while (fgets( buffer, sizeof(buffer), f )) + { + line++; + if ((p = strchr( buffer, '#' ))) *p = 0; + if (!strncmp( buffer, "@Part", 5 )) + { + part = atoi( buffer + 5 ); + continue; + } + if (!(p = strtok( buffer, ";" ))) continue; + read_str( p, srcW ); + for (i = 0; i < 4; i++) + { + p = strtok( NULL, ";" ); + read_str( p, &resW[i][0] ); + } + if (part == 1) + { + ch = srcW[0]; + if (ch >= 0xd800 && ch <= 0xdbff) + ch = 0x10000 + ((srcW[0] & 0x3ff) << 10) + (srcW[1] & 0x3ff); + tested[ch / 8] |= 1 << (ch % 8); + } + for (i = 0; i < 4; i++) + { + memset( dstW, 0xcc, sizeof(dstW) ); + dstlen = pNormalizeString( norm_forms[i], srcW, -1, dstW, ARRAY_SIZE(dstW) ); + ok( !wcscmp( dstW, resW[i] ), + "line %u form %u: wrong result %s for %s expected %s\n", line, i, + wine_dbgstr_w( dstW ), wine_dbgstr_w( srcW ), wine_dbgstr_w( resW[i] )); + } + } + fclose( f ); + + /* test chars that are not in the @Part1 list */ + for (ch = 0; ch < 0x110000; ch++) + { + if (tested[ch / 8] & (1 << (ch % 8))) continue; + str[put_utf16( str, ch )] = 0; + for (i = 0; i < 4; i++) + { + memset( dstW, 0xcc, sizeof(dstW) ); + SetLastError( 0xdeadbeef ); + dstlen = pNormalizeString( norm_forms[i], str, -1, dstW, ARRAY_SIZE(dstW) ); + if ((ch >= 0xd800 && ch <= 0xdfff) || + (ch >= 0xfdd0 && ch <= 0xfdef) || + ((ch & 0xffff) >= 0xfffe)) + { + ok( dstlen <= 0, "char %04x form %u: wrong result %d %s expected error\n", + ch, i, dstlen, wine_dbgstr_w( dstW )); + ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, + "char %04x form %u: error %u\n", str[0], i, GetLastError() ); + status = pRtlIsNormalizedString( norm_forms[i], str, -1, &ret ); + ok( status == STATUS_NO_UNICODE_TRANSLATION, + "char %04x form %u: failed %x\n", ch, i, status ); + } + else + { + ok( !wcscmp( dstW, str ), + "char %04x form %u: wrong result %s expected unchanged\n", + ch, i, wine_dbgstr_w( dstW )); + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], str, -1, &ret ); + ok( !status, "char %04x form %u: failed %x\n", ch, i, status ); + ok( ret, "char %04x form %u: not normalized\n", ch, i ); + } + } + } + } } static void test_SpecialCasing(void)

1 0