April 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : jscript: Handle PROP_IDX in jsdisp_get_own_property.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 67fef476c7551514891ca799821eac235e637891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67fef476c7551514891ca799… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 11 18:58:50 2022 +0300 jscript: Handle PROP_IDX in jsdisp_get_own_property. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ef13e295f0b..32265d34b9d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2546,6 +2546,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl switch(prop->type) { case PROP_BUILTIN: case PROP_JSVAL: + case PROP_IDX: desc->mask |= PROPF_WRITABLE; desc->explicit_value = TRUE; if(!flags_only) {

1 0

Gabriel Ivăncescu : jscript: Make idx props enumerable.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 45d8af4cf35388f290df3f11c7e11bf3b30450c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d8af4cf35388f290df3f11… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 11 18:58:51 2022 +0300 jscript: Make idx props enumerable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 17 ++++++++++++++++- dlls/mshtml/tests/es5.js | 28 +++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 32265d34b9d..6ee02a0d0f5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -285,7 +285,10 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, for(ptr = name; is_digit(*ptr) && idx < 0x10000; ptr++) idx = idx*10 + (*ptr-'0'); if(!*ptr && idx < This->builtin_info->idx_length(This)) { - prop = alloc_prop(This, name, PROP_IDX, This->builtin_info->idx_put ? PROPF_WRITABLE : 0); + unsigned flags = PROPF_ENUMERABLE; + if(This->builtin_info->idx_put) + flags |= PROPF_WRITABLE; + prop = alloc_prop(This, name, PROP_IDX, flags); if(!prop) return E_OUTOFMEMORY; @@ -2444,6 +2447,18 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty HRESULT hres; if(id == DISPID_STARTENUM) { + if(obj->builtin_info->idx_length) { + unsigned i = 0, len = obj->builtin_info->idx_length(obj); + WCHAR name[12]; + + for(i = 0; i < len; i++) { + swprintf(name, ARRAY_SIZE(name), L"%d", i); + hres = find_prop_name(obj, string_hash(name), name, &iter); + if(FAILED(hres)) + return hres; + } + } + if (enum_type == JSDISP_ENUM_ALL) { hres = fill_protrefs(obj); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 0339d9b08fa..6baebbd372c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -654,12 +654,38 @@ sync_test("property_definitions", function() { }); sync_test("string_idx", function() { - var s = "foobar"; + var i, s = "foobar"; ok(s[0] === "f", "s[0] = " + s[0]); ok(s[5] === "r", "s[5] = " + s[5]); ok(s[6] === undefined, "s[6] = " + s[6]); ok((delete s[0]) === false, "delete s[0] returned true"); ok((delete s[6]) === true, "delete s[6] returned false"); + s[6] = "X"; + ok(s[6] === undefined, "s[6] = " + s[6]); + + s = new String(s); + test_own_data_prop_desc(s, "0", false, true, false); + test_own_data_prop_desc(s, "1", false, true, false); + ok(!s.hasOwnProperty("6"), "'6' is a property"); + + s[7] = "X"; + ok(s[7] === "X", "s[7] = " + s[7]); + // s.hasOwnProperty("7") returns false on Win8 likely due to a bug in its js engine + + Object.defineProperty(s, "8", {writable: false, enumerable: true, configurable: true, value: "Y"}); + ok(s[8] === "Y", "s[8] = " + s[8]); + ok(s.hasOwnProperty("8"), "'8' not a property"); + + String.prototype[9] = "Z"; + ok(s[9] === "Z", "s[9] = " + s[9]); + delete String.prototype[9]; + + i = 0; + for(var idx in s) { + ok(s[idx] === "foobar XY"[idx], "enum s[" + idx + "] = " + s[idx]); + i++; + } + ok(i === 8, "enum did " + i + " iterations"); }); sync_test("string_trim", function() {

1 0

Gabriel Ivăncescu : jscript: Throw proper error when invoking non-method builtin.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: fa09e3f36cb84e67cbd38f86398c7ff72732727c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa09e3f36cb84e67cbd38f86… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 11 18:58:52 2022 +0300 jscript: Throw proper error when invoking non-method builtin. Instead of crashing. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 +++ dlls/jscript/tests/api.js | 2 ++ dlls/mshtml/tests/documentmode.js | 13 +++++++++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6ee02a0d0f5..319617b7a52 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -560,6 +560,9 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t case PROP_BUILTIN: { jsval_t vthis; + if(!prop->u.p->invoke) + return JS_E_FUNCTION_EXPECTED; + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9eaeddd5c73..fe336d46ba9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2611,6 +2611,8 @@ testException(function() {delete false;}, "E_INVALID_DELETE"); testException(function() {undefined.toString();}, "E_OBJECT_EXPECTED"); testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED"); +testException(function() {/a/.lastIndex();}, "E_NOT_FUNC"); +testException(function() {"a".length();}, "E_NOT_FUNC"); testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 3f772cf092f..55de9b7158f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1307,6 +1307,19 @@ sync_test("builtins_diffs", function() { }catch(e) { ok(e.number === 0xa1398 - 0x80000000, "RegExp.toString with non-regexp: exception = " + e.number); } + + try { + /a/.lastIndex(); + ok(false, "/a/.lastIndex(): expected exception"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "/a/.lastIndex(): exception = " + e.number); + } + try { + "a".length(); + ok(false, "\"a\".length(): expected exception"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "\"a\".length(): exception = " + e.number); + } }); sync_test("__proto__", function() {

1 0

Paul Gofman : msvcp140: Implement _Copy_file().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: d72d596070eb28fd5f747fb6120d36f66ff93bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72d596070eb28fd5f747fb6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 21:44:35 2022 +0300 msvcp140: Implement _Copy_file(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 62 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 11 ++++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3de0318a4d5..e7bdcd0378e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) @ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) @ stub _Cosh @ cdecl _Current_get(ptr) @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 14ba4a767d0..423c4c652b9 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -227,6 +227,7 @@ static int (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static void (__cdecl *p_Close_dir)(void*); +static DWORD (__cdecl *p_Copy_file)(WCHAR const *, WCHAR const *); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); @@ -338,6 +339,7 @@ static BOOL init(void) SET(p_xtime_get, "xtime_get"); SET(p_Close_dir, "_Close_dir"); + SET(p_Copy_file, "_Copy_file"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_Equivalent, "_Equivalent"); @@ -1575,6 +1577,65 @@ static void test_cnd(void) CloseHandle(cm.initialized); } +static void test_Copy_file(void) +{ + WCHAR origin_path[MAX_PATH], temp_path[MAX_PATH]; + HANDLE file; + DWORD ret; + + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(L"wine_test_dir", NULL); + + file = CreateFileW(L"wine_test_dir/f1", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + + file = CreateFileW(L"wine_test_dir/f2", 0, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(CloseHandle(file), "CloseHandle\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_READONLY); + + ok(CreateDirectoryW(L"wine_test_dir/d1", NULL) || GetLastError() == ERROR_ALREADY_EXISTS, + "CreateDirectoryW failed.\n"); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/d1"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f2"); + ok(ret == ERROR_ACCESS_DENIED, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); + todo_wine ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); + ok(ret == ERROR_FILE_NOT_FOUND, "Got unexpected ret %lu.\n", ret); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + + ok(RemoveDirectoryW(L"wine_test_dir/d1"), "expect wine_test_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_NORMAL); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f3"), "expect wine_test_dir/f3 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1601,5 +1662,6 @@ START_TEST(msvcp140) test__Syserror_map(); test_Equivalent(); test_cnd(); + test_Copy_file(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 61308f49203..ef2c122f17f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15776,6 +15776,17 @@ enum file_type __cdecl _Stat(WCHAR const* path, int* permissions) return (attr & FILE_ATTRIBUTE_DIRECTORY) ? directory_file : regular_file; } +/* _Copy_file, msvcp140 version */ +DWORD __cdecl _Copy_file(WCHAR const* src, WCHAR const* dst) +{ + TRACE("src %s, dst %s.\n", debugstr_w(src), debugstr_w(dst)); + + if (CopyFileW(src, dst, FALSE)) + return ERROR_SUCCESS; + + return GetLastError(); +} + /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z */ /* ?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z */ enum file_type __cdecl tr2_sys__Lstat_wchar(WCHAR const* path, int* err_code) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index a15fb5c7ee3..3ba0ce1dfba 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -3632,7 +3632,7 @@ @ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp140._Cnd_timedwait @ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp140._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp140._Cnd_wait -@ stub _Copy_file +@ cdecl _Copy_file(wstr wstr) msvcp140._Copy_file @ stub _Cosh @ cdecl _Current_get(ptr) msvcp140._Current_get @ cdecl _Current_set(wstr) msvcp140._Current_set

1 0

Paul Gofman : kernelbase: Reset last error on success in CopyFileExW().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 02faaea93b78d5d53976b2955bef7beffa780d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02faaea93b78d5d53976b295… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 21:44:36 2022 +0300 kernelbase: Reset last error on success in CopyFileExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 7 +++++++ dlls/kernelbase/file.c | 1 + dlls/msvcp140/tests/msvcp140.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4cdfea1b4..1fb9e98cf41 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -899,8 +899,15 @@ static void test_CopyFileW(void) ok(!ret && GetLastError() == ERROR_FILE_EXISTS, "CopyFileW: unexpected error %ld\n", GetLastError()); + SetLastError(0xdeadbeef); ret = CopyFileW(source, dest, FALSE); ok(ret, "CopyFileW: error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CopyFileExW(source, dest, NULL, NULL, NULL, 0 ); + ok(ret, "CopyFileExW: error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError()); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 569d92345b7..8ae982294f6 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -588,6 +588,7 @@ done: HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 ); + if (ret) SetLastError( 0 ); return ret; } diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 423c4c652b9..1df2f058424 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1619,7 +1619,7 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - todo_wine ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3");

1 0

Alexandre Julliard : ntdll: Use the standard CPTABLEINFO structure for the Unix codepage.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: deab47be6eabc93b89b76e332db8dab1502daebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=deab47be6eabc93b89b76e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 11:15:03 2022 +0200 ntdll: Use the standard CPTABLEINFO structure for the Unix codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 163 ++++++++++---------------------------------------- 1 file changed, 30 insertions(+), 133 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 9b499239803..47bc0118802 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -83,13 +83,7 @@ static char user_locale[LOCALE_NAME_MAX_LENGTH]; const WCHAR system_dir[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\',0}; -static struct -{ - USHORT *data; - USHORT *dbcs; - USHORT *mbtable; - void *wctable; -} unix_cp; +static CPTABLEINFO unix_cp = { CP_UTF8, 4, '?', 0xfffd, '?', '?' }; static char *get_nls_file_path( ULONG type, ULONG id ) { @@ -276,17 +270,6 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "UTF8", CP_UTF8 } }; -static void init_unix_cptable( USHORT *ptr ) -{ - unix_cp.data = ptr; - ptr += ptr[0]; - unix_cp.wctable = ptr + ptr[0] + 1; - unix_cp.mbtable = ++ptr; - ptr += 256; - if (*ptr++) ptr += 256; /* glyph table */ - if (*ptr) unix_cp.dbcs = ptr + 1; /* dbcs ranges */ -} - static void init_unix_codepage(void) { char charset_name[16]; @@ -315,7 +298,7 @@ static void init_unix_codepage(void) if (charset_names[pos].cp != CP_UTF8) { void *data = read_nls_file( NLS_SECTION_CODEPAGE, charset_names[pos].cp ); - if (data) init_unix_cptable( data ); + if (data) init_codepage_table( data, &unix_cp ); } return; } @@ -378,42 +361,14 @@ static BOOL is_dynamic_env_var( const char *var ) */ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) { - DWORD reslen; + unsigned int reslen; - if (unix_cp.data) - { - DWORD i; + if (unix_cp.CodePage != CP_UTF8) return cp_mbstowcs( &unix_cp, dst, dstlen, src, srclen ); - if (unix_cp.dbcs) - { - for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) - { - USHORT off = unix_cp.dbcs[(unsigned char)*src]; - if (off && srclen > 1) - { - src++; - srclen--; - *dst = unix_cp.dbcs[off + (unsigned char)*src]; - } - else *dst = unix_cp.mbtable[(unsigned char)*src]; - } - reslen = dstlen - i; - } - else - { - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) dst[i] = unix_cp.mbtable[(unsigned char)src[i]]; - } - } - else /* utf-8 */ - { - reslen = 0; - RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - reslen /= sizeof(WCHAR); + utf8_mbstowcs( dst, dstlen, &reslen, src, srclen ); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); #endif - } return reslen; } @@ -423,98 +378,40 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) { - DWORD i, reslen; + unsigned int i, reslen; - if (unix_cp.data) + if (unix_cp.CodePage != CP_UTF8) { - if (unix_cp.dbcs) + if (strict) { - const unsigned short *uni2cp = unix_cp.wctable; - for (i = dstlen; srclen && i; i--, srclen--, src++) + if (unix_cp.DBCSCodePage) { - unsigned short ch = uni2cp[*src]; - if (ch >> 8) - { - if (strict && unix_cp.dbcs[unix_cp.dbcs[ch >> 8] + (ch & 0xff)] != *src) return -1; - if (i == 1) break; /* do not output a partial char */ - i--; - *dst++ = ch >> 8; - } - else + const WCHAR *uni2cp = unix_cp.WideCharTable; + for (i = 0; i < srclen; i++) { - if (unix_cp.mbtable[ch] != *src) return -1; - *dst++ = (char)ch; + WCHAR ch = uni2cp[src[i]]; + if (ch >> 8) + { + if (unix_cp.DBCSOffsets[unix_cp.DBCSOffsets[ch >> 8] + (ch & 0xff)] != src[i]) + return -1; + } + else if (unix_cp.MultiByteTable[(unsigned char)ch] != src[i]) return -1; } } - reslen = dstlen - i; - } - else - { - const unsigned char *uni2cp = unix_cp.wctable; - reslen = min( srclen, dstlen ); - for (i = 0; i < reslen; i++) + else { - unsigned char ch = uni2cp[src[i]]; - if (strict && unix_cp.mbtable[ch] != src[i]) return -1; - dst[i] = ch; + const char *uni2cp = unix_cp.WideCharTable; + for (i = 0; i < srclen; i++) + if (unix_cp.MultiByteTable[(unsigned char)uni2cp[src[i]]] != src[i]) + return -1; } } + reslen = cp_wcstombs( &unix_cp, dst, dstlen, src, srclen ); } - else /* utf-8 */ + else { - char *end; - unsigned int val; - - for (end = dst + dstlen; srclen; srclen--, src++) - { - WCHAR ch = *src; - - if (ch < 0x80) /* 0x00-0x7f: 1 byte */ - { - if (dst > end - 1) break; - *dst++ = ch; - continue; - } - if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ - { - if (dst > end - 2) break; - dst[1] = 0x80 | (ch & 0x3f); - ch >>= 6; - dst[0] = 0xc0 | ch; - dst += 2; - continue; - } - if (!get_utf16( src, srclen, &val )) - { - if (strict) return -1; - val = 0xfffd; - } - if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ - { - if (dst > end - 3) break; - dst[2] = 0x80 | (val & 0x3f); - val >>= 6; - dst[1] = 0x80 | (val & 0x3f); - val >>= 6; - dst[0] = 0xe0 | val; - dst += 3; - } - else /* 0x10000-0x10ffff: 4 bytes */ - { - if (dst > end - 4) break; - dst[3] = 0x80 | (val & 0x3f); - val >>= 6; - dst[2] = 0x80 | (val & 0x3f); - val >>= 6; - dst[1] = 0x80 | (val & 0x3f); - val >>= 6; - dst[0] = 0xf0 | val; - dst += 4; - src++; - srclen--; - } - } - reslen = dstlen - (end - dst); + NTSTATUS status = utf8_wcstombs( dst, dstlen, &reslen, src, srclen ); + if (strict && status == STATUS_SOME_NOT_MAPPED) return -1; } return reslen; } @@ -1140,9 +1037,9 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_system_dll_path_var( env, pos, size ); append_envA( env, pos, size, "WINEUSERNAME", user_name ); append_envA( env, pos, size, "WINEDLLOVERRIDES", overrides ); - if (unix_cp.data) + if (unix_cp.CodePage != CP_UTF8) { - sprintf( str, "%u", unix_cp.data[1] ); + sprintf( str, "%u", unix_cp.CodePage ); append_envA( env, pos, size, "WINEUNIXCP", str ); } else append_envW( env, pos, size, "WINEUNIXCP", NULL );

1 0

Alexandre Julliard : ntdll: Support UTF-8 codepage in string conversion functions.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 2aa4673f32d08238b61e5b445d8bf873dccf2556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa4673f32d08238b61e5b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 11:36:24 2022 +0200 ntdll: Support UTF-8 codepage in string conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 189 ++++++++++++++++++++++++++++++++++++++++------------ dlls/ntdll/string.c | 8 +-- 2 files changed, 148 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2aa4673f32d08238b61e…

1 0

Alexandre Julliard : kernelbase: Use RtlMultiByteToUnicodeN in IsChar* functions.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 23834ee3b8d0a3d73eed593404748abd7d29d0d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23834ee3b8d0a3d73eed5934… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:01:36 2022 +0200 kernelbase: Use RtlMultiByteToUnicodeN in IsChar* functions. In case the Ansi codepage was set to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 54d4a838731..1e477a449e1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5580,8 +5580,10 @@ INT WINAPI DECLSPEC_HOTPATCH IdnToUnicode( DWORD flags, const WCHAR *src, INT sr */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_ALPHA); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_ALPHA); } @@ -5599,8 +5601,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & (C1_ALPHA | C1_DIGIT)); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & (C1_ALPHA | C1_DIGIT)); } @@ -5645,8 +5649,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharDigitW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_LOWER); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_LOWER); } @@ -5673,8 +5679,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharPunctW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_SPACE); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_SPACE); } @@ -5692,8 +5700,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_UPPER); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_UPPER); }

1 0

Alexandre Julliard : kernelbase: Avoid redundant locale lookups in GetLocaleInfoA().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: fd2ecee06fe9ab3af09854bb72fe9be3ec40a673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd2ecee06fe9ab3af09854bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:19:52 2022 +0200 kernelbase: Avoid redundant locale lookups in GetLocaleInfoA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 1e477a449e1..67052af7e4f 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5098,6 +5098,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetGeoInfoW( GEOID id, GEOTYPE type, WCHAR *data, i */ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buffer, INT len ) { + const NLS_LOCALE_DATA *locale; WCHAR *bufferW; INT lenW, ret; @@ -5113,19 +5114,26 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buf SetLastError( ERROR_INVALID_FLAGS ); return 0; } - + if (!(locale = NlsValidateLocale( &lcid, 0 ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (LOWORD(lctype) == LOCALE_FONTSIGNATURE || (lctype & LOCALE_RETURN_NUMBER)) - return GetLocaleInfoW( lcid, lctype, (WCHAR *)buffer, len / sizeof(WCHAR) ) * sizeof(WCHAR); + { + ret = get_locale_info( locale, lcid, lctype, (WCHAR *)buffer, len / sizeof(WCHAR) ); + return ret * sizeof(WCHAR); + } - if (!(lenW = GetLocaleInfoW( lcid, lctype, NULL, 0 ))) return 0; + if (!(lenW = get_locale_info( locale, lcid, lctype, NULL, 0 ))) return 0; if (!(bufferW = RtlAllocateHeap( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; } - ret = GetLocaleInfoW( lcid, lctype, bufferW, lenW ); - if (ret) ret = WideCharToMultiByte( get_lcid_codepage( lcid, lctype ), 0, + ret = get_locale_info( locale, lcid, lctype, bufferW, lenW ); + if (ret) ret = WideCharToMultiByte( get_locale_codepage( locale, lctype ), 0, bufferW, ret, buffer, len, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, bufferW ); return ret;

1 0

Alexandre Julliard : kernelbase: Support UTF-7/8 codepages in get_codepage_table().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 8993e15cfa5b77ac2487239354ffe63bbc5e562d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8993e15cfa5b77ac24872393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:21:47 2022 +0200 kernelbase: Support UTF-7/8 codepages in get_codepage_table(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 34 ++++++++++++++++-- dlls/kernelbase/locale.c | 86 +++++++++++++------------------------------- 2 files changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9b95fcae640..8dc5814162a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4251,6 +4251,7 @@ static void test_GetCPInfo(void) { BOOL ret; CPINFO cpinfo; + CPINFOEXW cpiw; SetLastError(0xdeadbeef); ret = GetCPInfo(CP_SYMBOL, &cpinfo); @@ -4275,6 +4276,18 @@ static void test_GetCPInfo(void) for (i = 0; i < sizeof(cpinfo.LeadByte); i++) ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + + memset( &cpiw, 0xcc, sizeof(cpiw) ); + ret = GetCPInfoExW( CP_UTF7, 0, &cpiw ); + ok( ret, "GetCPInfoExW failed err %lu\n", GetLastError() ); + ok( cpiw.DefaultChar[0] == 0x3f, "wrong DefaultChar[0] %02x\n", cpiw.DefaultChar[0] ); + ok( cpiw.DefaultChar[1] == 0, "wrong DefaultChar[1] %02x\n", cpiw.DefaultChar[1] ); + for (i = 0; i < 12; i++) ok( cpiw.LeadByte[i] == 0, "wrong LeadByte[%u] %02x\n", i, cpiw.LeadByte[i] ); + ok( cpiw.MaxCharSize == 5, "wrong MaxCharSize %02x\n", cpiw.MaxCharSize ); + ok( cpiw.CodePage == CP_UTF7, "wrong CodePage %02x\n", cpiw.CodePage ); + ok( cpiw.UnicodeDefaultChar == 0xfffd, "wrong UnicodeDefaultChar %02x\n", cpiw.UnicodeDefaultChar ); + ok( !wcscmp( cpiw.CodePageName, L"65000 (UTF-7)" ), + "wrong CodePageName %s\n", debugstr_w(cpiw.CodePageName) ); } memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); @@ -4293,10 +4306,27 @@ static void test_GetCPInfo(void) ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); for (i = 0; i < sizeof(cpinfo.LeadByte); i++) ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); - ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, - "expected 4, got %u\n", cpinfo.MaxCharSize); + ok(cpinfo.MaxCharSize == 4, "expected 4, got %u\n", cpinfo.MaxCharSize); + + memset( &cpiw, 0xcc, sizeof(cpiw) ); + ret = GetCPInfoExW( CP_UTF8, 0, &cpiw ); + ok( ret, "GetCPInfoExW failed err %lu\n", GetLastError() ); + ok( cpiw.DefaultChar[0] == 0x3f, "wrong DefaultChar[0] %02x\n", cpiw.DefaultChar[0] ); + ok( cpiw.DefaultChar[1] == 0, "wrong DefaultChar[1] %02x\n", cpiw.DefaultChar[1] ); + for (i = 0; i < 12; i++) ok( cpiw.LeadByte[i] == 0, "wrong LeadByte[%u] %02x\n", i, cpiw.LeadByte[i] ); + ok( cpiw.MaxCharSize == 4, "wrong MaxCharSize %02x\n", cpiw.MaxCharSize ); + ok( cpiw.CodePage == CP_UTF8, "wrong CodePage %02x\n", cpiw.CodePage ); + ok( cpiw.UnicodeDefaultChar == 0xfffd, "wrong UnicodeDefaultChar %02x\n", cpiw.UnicodeDefaultChar ); + ok( !wcscmp( cpiw.CodePageName, L"65001 (UTF-8)" ), + "wrong CodePageName %s\n", debugstr_w(cpiw.CodePageName) ); } + + SetLastError( 0xdeadbeef ); + ret = GetCPInfoExW( 0xbeef, 0, &cpiw ); + ok( !ret, "GetCPInfoExW succeeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); + if (pNtGetNlsSectionPtr) { CPTABLEINFO table; diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 67052af7e4f..c0cd0307447 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -164,8 +164,8 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 28604, L"ISO 8859-14 Latin 8 (Celtic)" }, { 28605, L"ISO 8859-15 Latin 9 (Euro)" }, { 28606, L"ISO 8859-16 Latin 10 (Balkan)" }, - { 65000, L"Unicode (UTF-7)" }, - { 65001, L"Unicode (UTF-8)" } + { 65000, L"65000 (UTF-7)" }, + { 65001, L"65001 (UTF-8)" } }; /* Unicode expanded ligatures */ @@ -1964,24 +1964,28 @@ static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) static UINT get_locale_codepage( const NLS_LOCALE_DATA *locale, ULONG flags ) { UINT ret = locale->idefaultansicodepage; - if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = system_locale->idefaultansicodepage; + if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = nls_info.AnsiTableInfo.CodePage; return ret; } static UINT get_lcid_codepage( LCID lcid, ULONG flags ) { - UINT ret = GetACP(); + UINT ret = nls_info.AnsiTableInfo.CodePage; - if (!(flags & LOCALE_USE_CP_ACP) && lcid != GetSystemDefaultLCID()) - GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&ret, sizeof(ret)/sizeof(WCHAR) ); + if (!(flags & LOCALE_USE_CP_ACP) && lcid != system_lcid) + { + const NLS_LOCALE_DATA *locale = NlsValidateLocale( &lcid, 0 ); + if (locale) ret = locale->idefaultansicodepage; + } return ret; } static const CPTABLEINFO *get_codepage_table( UINT codepage ) { + static const CPTABLEINFO utf7_cpinfo = { CP_UTF7, 5, '?', 0xfffd, '?', '?' }; + static const CPTABLEINFO utf8_cpinfo = { CP_UTF8, 4, '?', 0xfffd, '?', '?' }; unsigned int i; USHORT *ptr; SIZE_T size; @@ -1996,15 +2000,13 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) codepage = mac_cp; break; case CP_THREAD_ACP: - if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return &nls_info.AnsiTableInfo; codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale, 0 ); - if (!codepage) return &nls_info.AnsiTableInfo; - break; - default: - if (codepage == nls_info.AnsiTableInfo.CodePage) return &nls_info.AnsiTableInfo; - if (codepage == nls_info.OemTableInfo.CodePage) return &nls_info.OemTableInfo; break; } + if (codepage == nls_info.AnsiTableInfo.CodePage) return &nls_info.AnsiTableInfo; + if (codepage == nls_info.OemTableInfo.CodePage) return &nls_info.OemTableInfo; + if (codepage == CP_UTF8) return &utf8_cpinfo; + if (codepage == CP_UTF7) return &utf7_cpinfo; RtlEnterCriticalSection( &locale_section ); @@ -4838,27 +4840,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCPInfo( UINT codepage, CPINFO *cpinfo ) { const CPTABLEINFO *table; - if (!cpinfo) + if (!cpinfo || !(table = get_codepage_table( codepage ))) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - switch (codepage) - { - case CP_UTF7: - case CP_UTF8: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - memset( cpinfo->LeadByte, 0, sizeof(cpinfo->LeadByte) ); - cpinfo->MaxCharSize = (codepage == CP_UTF7) ? 5 : 4; - break; - default: - if (!(table = get_codepage_table( codepage ))) return FALSE; - cpinfo->MaxCharSize = table->MaximumCharacterSize; - memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); - memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); - break; - } + cpinfo->MaxCharSize = table->MaximumCharacterSize; + memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); + memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); return TRUE; } @@ -4871,38 +4860,16 @@ BOOL WINAPI GetCPInfoExW( UINT codepage, DWORD flags, CPINFOEXW *cpinfo ) const CPTABLEINFO *table; int min, max, pos; - if (!cpinfo) + if (!cpinfo || !(table = get_codepage_table( codepage ))) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - switch (codepage) - { - case CP_UTF7: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - cpinfo->LeadByte[0] = cpinfo->LeadByte[1] = 0; - cpinfo->MaxCharSize = 5; - cpinfo->CodePage = CP_UTF7; - cpinfo->UnicodeDefaultChar = 0x3f; - break; - case CP_UTF8: - cpinfo->DefaultChar[0] = 0x3f; - cpinfo->DefaultChar[1] = 0; - cpinfo->LeadByte[0] = cpinfo->LeadByte[1] = 0; - cpinfo->MaxCharSize = 4; - cpinfo->CodePage = CP_UTF8; - cpinfo->UnicodeDefaultChar = 0x3f; - break; - default: - if (!(table = get_codepage_table( codepage ))) return FALSE; - cpinfo->MaxCharSize = table->MaximumCharacterSize; - memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); - memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); - cpinfo->CodePage = table->CodePage; - cpinfo->UnicodeDefaultChar = table->UniDefaultChar; - break; - } + cpinfo->MaxCharSize = table->MaximumCharacterSize; + memcpy( cpinfo->DefaultChar, &table->DefaultChar, sizeof(cpinfo->DefaultChar) ); + memcpy( cpinfo->LeadByte, table->LeadByte, sizeof(cpinfo->LeadByte) ); + cpinfo->CodePage = table->CodePage; + cpinfo->UnicodeDefaultChar = table->UniDefaultChar; min = 0; max = ARRAY_SIZE(codepage_names) - 1; @@ -5775,9 +5742,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidCodePage( UINT codepage ) case CP_MACCP: case CP_THREAD_ACP: return FALSE; - case CP_UTF7: - case CP_UTF8: - return TRUE; default: return get_codepage_table( codepage ) != NULL; }

1 0