March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : ntdll/tests: Enable compilation with long types in rtlstr.c.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: baf08a0d04bcffedf553d302eba17dada01b2026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf08a0d04bcffedf553d302… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 23 08:13:40 2022 +0100 ntdll/tests: Enable compilation with long types in rtlstr.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlstr.c | 265 +++++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=baf08a0d04bcffedf553…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in string.c.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 4eded62d2a26a99ded2514666f685d3bea7c4dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eded62d2a26a99ded251466… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 23 08:13:44 2022 +0100 ntdll/tests: Enable compilation with long types in string.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 6939dd3c15e..eabbe86792b 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdlib.h> #include <limits.h> @@ -308,10 +309,10 @@ static void one_ltoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ltoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ltoa(%d, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltoa(%ld, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ltoa(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltoa(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -327,10 +328,10 @@ static void one_ultoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ultoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ultoa(%u, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultoa(%lu, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ultoa(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultoa(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -415,10 +416,10 @@ static void one_ltow_test(int test_num, const ulong2str_t *ulong2str) result = p_ltow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ltow(%d, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltow(%ld, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ltow(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltow(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); } @@ -451,10 +452,10 @@ static void one_ultow_test(int test_num, const ulong2str_t *ulong2str) result = p_ultow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ultow(%u, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultow(%lu, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ultow(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultow(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); } @@ -481,7 +482,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_itow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test a): _itow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test a): _itow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } @@ -489,7 +490,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_ltow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test b): _ltow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test b): _ltow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } @@ -497,7 +498,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_ultow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test c): _ultow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test c): _ultow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } } @@ -959,7 +960,7 @@ static void test_wtoi(void) pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtoi(uni.Buffer); ok(result == str2long[test_num].value, - "(test %d): call failed: _wtoi(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _wtoi(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); pRtlFreeUnicodeString(&uni); } /* for */ @@ -973,7 +974,7 @@ static void test_atoi(void) for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patoi(str2long[test_num].str); ok(result == str2long[test_num].value, - "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); } } @@ -986,7 +987,7 @@ static void test_atol(void) for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patol(str2long[test_num].str); ok(result == str2long[test_num].value, - "(test %d): call failed: _atol(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _atol(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); } } @@ -1001,14 +1002,14 @@ static void test_wtol(void) pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtol(uni.Buffer); ok(result == str2long[test_num].value, - "(test %d): call failed: _wtol(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _wtol(\"%s\") has result %ld, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); pRtlFreeUnicodeString(&uni); } result = p_wtol( L"\t\xa0\n 12" ); - ok( result == 12, "got %d\n", result ); + ok( result == 12, "got %ld\n", result ); result = p_wtol( L"\x3000 12" ); - ok( result == 0, "got %d\n", result ); + ok( result == 0, "got %ld\n", result ); } @@ -1231,10 +1232,10 @@ static void test_wcstol(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { res = pwcstol( tests[i].str, &endpos, tests[i].base ); - ok( res == tests[i].res, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), res ); + ok( res == tests[i].res, "%u: %s res %08lx\n", i, wine_dbgstr_w(tests[i].str), res ); if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); ures = pwcstoul( tests[i].str, &endpos, tests[i].base ); - ok( ures == tests[i].ures, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), ures ); + ok( ures == tests[i].ures, "%u: %s res %08lx\n", i, wine_dbgstr_w(tests[i].str), ures ); } /* Test various unicode digits */ @@ -1242,14 +1243,14 @@ static void test_wcstol(void) { WCHAR tmp[] = { zeros[i] + 4, zeros[i], zeros[i] + 5, 0 }; res = pwcstol(tmp, NULL, 0); - ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], res); + ok(res == 405, "with zero = U+%04X: got %ld, expected 405\n", zeros[i], res); ures = pwcstoul(tmp, NULL, 0); - ok(ures == 405, "with zero = U+%04X: got %u, expected 405\n", zeros[i], ures); + ok(ures == 405, "with zero = U+%04X: got %lu, expected 405\n", zeros[i], ures); tmp[1] = zeros[i] + 10; res = pwcstol(tmp, NULL, 16); - ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], res); + ok(res == 4, "with zero = U+%04X: got %ld, expected 4\n", zeros[i], res); ures = pwcstoul(tmp, NULL, 16); - ok(ures == 4, "with zero = U+%04X: got %u, expected 4\n", zeros[i], ures); + ok(ures == 4, "with zero = U+%04X: got %lu, expected 4\n", zeros[i], ures); } }

1 0

Zebediah Figura : kernelbase: Do not parse the hostname of internet URLs if they are missing a double slash.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 26a3690796f8d9d17aa57b8bb2ebd4e4f3f6a623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a3690796f8d9d17aa57b8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:03 2022 -0500 kernelbase: Do not parse the hostname of internet URLs if they are missing a double slash. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++++ dlls/shlwapi/tests/url.c | 59 ++++++++++++------------------------------------ 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index fbe4728efda..7eda9bd483c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4204,7 +4204,11 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work++; pl->scheme_number = get_scheme_code(pl->scheme, pl->scheme_len); if (!is_slash( work[0] ) || !is_slash( work[1] )) + { + if (pl->scheme_number != URL_SCHEME_FILE) + pl->scheme_number = URL_SCHEME_UNKNOWN; return; + } work += 2; if (pl->scheme_number != URL_SCHEME_FILE) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 7cf7097a9ba..6957e244213 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -596,7 +596,6 @@ static void test_UrlGetPart(void) DWORD flags; HRESULT hr; const char *expect; - BOOL todo_hr; } tests[] = { @@ -657,8 +656,8 @@ static void test_UrlGetPart(void) {"http://user(a)host@q", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user(a)host@q", URL_PART_HOSTNAME, 0, S_OK, "host(a)q"}, - {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, + {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL}, + {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, @@ -780,13 +779,10 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - { - if (tests[i].hr == S_OK) - ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - else - ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); - } + if (tests[i].hr == S_OK) + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + else + ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); if (hr == S_FALSE) { @@ -796,33 +792,20 @@ static void test_UrlGetPart(void) else { if (hr == E_POINTER) - { - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(size == strlen(expect) + 1, "Got size %lu.\n", size); - } - } + ok(size == strlen(expect) + 1, "Got size %lu.\n", size); else - { ok(size == 1, "Got size %lu.\n", size); - } ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer); strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); + ok(hr == tests[i].hr, "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ok(size == strlen(buffer), "Got size %lu.\n", size); - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); - } + ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); } else { @@ -835,13 +818,10 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - { - if (tests[i].hr == S_OK) - ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - else - ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); - } + if (tests[i].hr == S_OK) + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + else + ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -851,25 +831,16 @@ static void test_UrlGetPart(void) else { if (hr == E_POINTER) - { - if (expect) - { - todo_wine_if (tests[i].todo_hr) - ok(size == strlen(expect) + 1, "Got size %lu.\n", size); - } - } + ok(size == strlen(expect) + 1, "Got size %lu.\n", size); else - { ok(size == 1, "Got size %lu.\n", size); - } ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); } size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr) - ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); + ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ok(size == wcslen(bufferW), "Got size %lu.\n", size);

1 0

Zebediah Figura : kernelbase: Do not allow schemes to be less than two characters in UrlGetPart().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: c2daf4f01e510d81d3627a91138de5f883db6d51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2daf4f01e510d81d3627a91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:01 2022 -0500 kernelbase: Do not allow schemes to be less than two characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index be7754dade2..917fd644770 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4198,7 +4198,7 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) memset(pl, 0, sizeof(*pl)); pl->scheme = url; work = parse_scheme( pl->scheme ); - if (*work != ':') return; + if (work < url + 2 || *work != ':') return; pl->scheme_len = work - pl->scheme; work++; if (!is_slash( work[0] ) || !is_slash( work[1] )) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 31581f82847..fb3df96e13d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -714,8 +714,8 @@ static void test_UrlGetPart(void) {"scheme :", URL_PART_SCHEME, 0, S_FALSE, ""}, {"sch eme:", URL_PART_SCHEME, 0, S_FALSE, ""}, {":", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"a:", URL_PART_SCHEME, 0, S_FALSE, "", .todo_hr = TRUE}, - {"0:", URL_PART_SCHEME, 0, S_FALSE, "", .todo_hr = TRUE}, + {"a:", URL_PART_SCHEME, 0, S_FALSE, ""}, + {"0:", URL_PART_SCHEME, 0, S_FALSE, ""}, {"ab:", URL_PART_SCHEME, 0, S_OK, "ab"}, {"about://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, @@ -868,7 +868,7 @@ static void test_UrlGetPart(void) size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr && strcmp(url, "a:") && strcmp(url, "0:")) + todo_wine_if (tests[i].todo_hr) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) {

1 0

Zebediah Figura : kernelbase: Do not parse username, password, and port separately for file URLs in UrlGetPart().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: a110b2e68e635cabfb3c9d714f27cd9483f21d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a110b2e68e635cabfb3c9d71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:02 2022 -0500 kernelbase: Do not parse username, password, and port separately for file URLs in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 109 ++++++++++++++++++++++++++--------------------- dlls/shlwapi/tests/url.c | 16 +++---- 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 917fd644770..fbe4728efda 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -72,6 +72,7 @@ struct parsed_url DWORD port_len; /* [out] size of Port (until "/" or eos) */ const WCHAR *query; /* [out] start of Query */ DWORD query_len; /* [out] size of Query (until eos) */ + DWORD scheme_number; }; static WCHAR *heap_strdupAtoW(const char *str) @@ -4201,49 +4202,69 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) if (work < url + 2 || *work != ':') return; pl->scheme_len = work - pl->scheme; work++; + pl->scheme_number = get_scheme_code(pl->scheme, pl->scheme_len); if (!is_slash( work[0] ) || !is_slash( work[1] )) return; + work += 2; - pl->username = work + 2; - work = parse_url_element( pl->username, L":@/\\?#" ); - pl->username_len = work - pl->username; - if (*work == ':') + if (pl->scheme_number != URL_SCHEME_FILE) { - pl->password = work + 1; - work = parse_url_element( pl->password, L"@/\\?#" ); - pl->password_len = work - pl->password; - if (*work != '@') + pl->username = work; + work = parse_url_element( pl->username, L":@/\\?#" ); + pl->username_len = work - pl->username; + if (*work == ':') { - /* what we just parsed must be the hostname and port - * so reset pointers and clear then let it parse */ + pl->password = work + 1; + work = parse_url_element( pl->password, L"@/\\?#" ); + pl->password_len = work - pl->password; + if (*work == '@') + { + work++; + } + else + { + /* what we just parsed must be the hostname and port + * so reset pointers and clear then let it parse */ + pl->username_len = pl->password_len = 0; + work = pl->username; + pl->username = pl->password = 0; + } + } + else if (*work == '@') + { + /* no password */ + pl->password_len = 0; + pl->password = 0; + work++; + } + else + { + /* what was parsed was hostname, so reset pointers and let it parse */ pl->username_len = pl->password_len = 0; - work = pl->username - 1; + work = pl->username; pl->username = pl->password = 0; } } - else if (*work == '@') + + pl->hostname = work; + if (pl->scheme_number == URL_SCHEME_FILE) { - /* no password */ - pl->password_len = 0; - pl->password = 0; + work = parse_url_element( pl->hostname, L"/\\?#" ); + pl->hostname_len = work - pl->hostname; + if (pl->hostname_len >= 2 && pl->hostname[1] == ':') + pl->hostname_len = 0; } else { - /* what was parsed was hostname, so reset pointers and let it parse */ - pl->username_len = pl->password_len = 0; - work = pl->username - 1; - pl->username = pl->password = 0; - } - - pl->hostname = work + 1; - work = parse_url_element( pl->hostname, L":/\\?#" ); - pl->hostname_len = work - pl->hostname; + work = parse_url_element( pl->hostname, L":/\\?#" ); + pl->hostname_len = work - pl->hostname; - if (*work == ':') - { - pl->port = work + 1; - work = parse_url_element( pl->port, L"/\\?#" ); - pl->port_len = work - pl->port; + if (*work == ':') + { + pl->port = work + 1; + work = parse_url_element( pl->port, L"/\\?#" ); + pl->port_len = work - pl->port; + } } if ((pl->query = wcschr( work, '?' ))) @@ -4255,26 +4276,19 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD part, DWORD flags) { - DWORD scheme, size, schsize; LPCWSTR addr, schaddr; struct parsed_url pl; + DWORD size, schsize; TRACE("%s, %p, %p(%ld), %#lx, %#lx\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags); if (!url || !out || !out_len || !*out_len) return E_INVALIDARG; - addr = wcschr(url, ':'); - if (!addr) - scheme = URL_SCHEME_UNKNOWN; - else - scheme = get_scheme_code(url, addr - url); - parse_url(url, &pl); - switch (scheme) + switch (pl.scheme_number) { - case URL_SCHEME_FILE: case URL_SCHEME_FTP: case URL_SCHEME_GOPHER: case URL_SCHEME_HTTP: @@ -4285,6 +4299,11 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_SCHEME_SNEWS: break; + case URL_SCHEME_FILE: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY && part != URL_PART_HOSTNAME) + return E_FAIL; + break; + default: if (part != URL_PART_SCHEME && part != URL_PART_QUERY) return E_FAIL; @@ -4299,16 +4318,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) - { - addr = NULL; - size = 0; - } - else - { - addr = pl.hostname; - size = pl.hostname_len; - } + addr = pl.hostname; + size = pl.hostname_len; break; case URL_PART_USERNAME: @@ -4342,7 +4353,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p return E_INVALIDARG; } - if (flags == URL_PARTFLAG_KEEPSCHEME && scheme != URL_SCHEME_FILE) + if (flags == URL_PARTFLAG_KEEPSCHEME && pl.scheme_number != URL_SCHEME_FILE) { if (!pl.scheme || !pl.scheme_len) return E_FAIL; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index fb3df96e13d..7cf7097a9ba 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -596,7 +596,7 @@ static void test_UrlGetPart(void) DWORD flags; HRESULT hr; const char *expect; - BOOL todo_hr, todo_result; + BOOL todo_hr; } tests[] = { @@ -684,10 +684,10 @@ static void test_UrlGetPart(void) {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21", .todo_result = TRUE}, - {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21"}, + {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PORT, 0, E_FAIL}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_QUERY, 0, S_OK, "query=x"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_HOSTNAME, 0, S_OK, "www.wine hq.org"}, {"http://user:pass 123(a)www.wine hq.org", URL_PART_PASSWORD, 0, S_OK, "pass 123"}, @@ -799,7 +799,7 @@ static void test_UrlGetPart(void) { if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(size == strlen(expect) + 1, "Got size %lu.\n", size); } } @@ -820,7 +820,7 @@ static void test_UrlGetPart(void) ok(size == strlen(buffer), "Got size %lu.\n", size); if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(!strcmp(buffer, expect), "Got result %s.\n", debugstr_a(buffer)); } } @@ -854,7 +854,7 @@ static void test_UrlGetPart(void) { if (expect) { - todo_wine_if (tests[i].todo_hr || tests[i].todo_result) + todo_wine_if (tests[i].todo_hr) ok(size == strlen(expect) + 1, "Got size %lu.\n", size); } }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 34ac3308d994a83173ab57f0bd107111f0e1c811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ac3308d994a83173ab57f0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 23 08:26:38 2022 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 72bf87a8177..5cd36211cc2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-08 09:46+0200\n" +"PO-Revision-Date: 2022-03-23 08:26+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3976,13 +3976,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Ciklinė __proto__ reikšmė" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Negalima apibrėžti savybės „|“: objektas nėra išplečiamas" +msgstr "Negalima sukurti savybės neišplečiamam objektui" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Tim Clem : winemac.drv: Move synthetic display modes after the real ones.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: c2936f70e3333a5a0cad06b38fbd19a5ef313faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2936f70e3333a5a0cad06b3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:06:01 2022 -0700 winemac.drv: Move synthetic display modes after the real ones. Also return higher synthesized bitdepths first. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 50 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index dfc238ed629..d43baf6bd68 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1049,7 +1049,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, display_mode = NULL; if (modes) { - int default_bpp = get_default_bpp(); + int default_bpp; DWORD seen_modes = 0; count = CFArrayGetCount(modes); @@ -1064,33 +1064,41 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, display_mode_bpp = display_mode_bits_per_pixel(display_mode); break; } + } - /* We only synthesize modes from those having the default bpp. */ - if (display_mode_bits_per_pixel(candidate) != default_bpp) - continue; + default_bpp = get_default_bpp(); - if (!modes_has_8bpp) + /* If all the real modes are exhausted, synthesize lower bpp modes. */ + if (!display_mode && (!modes_has_16bpp || !modes_has_8bpp)) + { + /* We want to synthesize higher depths first. */ + int synth_bpps[] = { modes_has_16bpp ? 0 : 16, modes_has_8bpp ? 0 : 8 }; + size_t synth_bpp_idx; + for (synth_bpp_idx = 0; synth_bpp_idx < 2; synth_bpp_idx++) { - seen_modes++; - if (seen_modes > mode) + int synth_bpp = synth_bpps[synth_bpp_idx]; + if (synth_bpp == 0) + continue; + + for (i = 0; i < count; i++) { - display_mode = (CGDisplayModeRef)CFRetain(candidate); - display_mode_bpp = 8; - synthesized = TRUE; - break; + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + /* We only synthesize modes from those having the default bpp. */ + if (display_mode_bits_per_pixel(candidate) != default_bpp) + continue; + + seen_modes++; + if (seen_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = synth_bpp; + synthesized = TRUE; + break; + } } - } - if (!modes_has_16bpp) - { - seen_modes++; - if (seen_modes > mode) - { - display_mode = (CGDisplayModeRef)CFRetain(candidate); - display_mode_bpp = 16; - synthesized = TRUE; + if (display_mode) break; - } } } }

1 0

Paul Gofman : iphlpapi: Don't request redundant static data in get_extended_tcp_table().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 3c19c54aa0016e2bfcc17a3f2f2b460e2f2d063b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c19c54aa0016e2bfcc17a3f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 09:07:25 2022 +0000 iphlpapi: Don't request redundant static data in get_extended_tcp_table(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 041e712f44f..afc400d26c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3082,6 +3082,19 @@ static int tcp6_row_owner_cmp( const void *a, const void *b ) return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } +static BOOL tcp_table_needs_pids( ULONG table_class ) +{ + switch (table_class) + { + case TCP_TABLE_BASIC_LISTENER: + case TCP_TABLE_BASIC_CONNECTIONS: + case TCP_TABLE_BASIC_ALL: + return FALSE; + + } + return TRUE; +} + /************************************************************************************* * get_extended_tcp_table * @@ -3093,13 +3106,19 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG DWORD err, count, needed, i, num = 0, row_size = 0; struct nsi_tcp_conn_key *key; struct nsi_tcp_conn_dynamic *dyn; - struct nsi_tcp_conn_static *stat; + struct nsi_tcp_conn_static *stat = NULL; if (!size) return ERROR_INVALID_PARAMETER; - err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), - NULL, 0, (void **)&dyn, sizeof(*dyn), - (void **)&stat, sizeof(*stat), &count, 0 ); + if (tcp_table_needs_pids( table_class )) + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + else /* Don't retrieve the static data if not required as this is expensive to compute */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + NULL, 0, &count, 0 ); + if (err) return err; for (i = 0; i < count; i++)

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in rtlbitmap.c.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: b4b75634d60704faf183c097c7dbf2a3c689c4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b75634d60704faf183c097… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 23 08:13:37 2022 +0100 ntdll/tests: Enable compilation with long types in rtlbitmap.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlbitmap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 3c3992e8fc9..7cb046a105a 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -20,6 +20,7 @@ * We use function pointers here as some of the bitmap functions exist only * in later versions of ntdll. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" @@ -501,7 +502,7 @@ static void test_RtlFindSetRuns(void) /* Get first 2 */ ulCount = pRtlFindSetRuns(&bm, runs, 2, FALSE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -511,7 +512,7 @@ static void test_RtlFindSetRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 2, TRUE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -521,7 +522,7 @@ static void test_RtlFindSetRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 3, TRUE); - ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); + ok(ulCount == 3, "RtlFindClearRuns returned %ld, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -539,7 +540,7 @@ static void test_RtlFindSetRuns(void) ULONG ulStart = 0; ulCount = pRtlFindLongestRunSet(&bm, &ulStart); - ok(ulCount == 33 && ulStart == 1877,"didn't find longest %d %d\n",ulCount,ulStart); + ok(ulCount == 33 && ulStart == 1877,"didn't find longest %ld %ld\n",ulCount,ulStart); memset(buff, 0, sizeof(buff)); ulCount = pRtlFindLongestRunSet(&bm, &ulStart); @@ -578,7 +579,7 @@ static void test_RtlFindClearRuns(void) /* Get first 2 */ ulCount = pRtlFindClearRuns(&bm, runs, 2, FALSE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -588,7 +589,7 @@ static void test_RtlFindClearRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 2, TRUE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -598,7 +599,7 @@ static void test_RtlFindClearRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 3, TRUE); - ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); + ok(ulCount == 3, "RtlFindClearRuns returned %ld, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -635,8 +636,8 @@ static void test_RtlFindNextForwardRunSet(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); - ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); - ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); + ok(ulCount == 6, "Invalid length of found set run: %ld, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found set run: %ld, expected 56\n", lpPos); } static void test_RtlFindNextForwardRunClear(void) @@ -649,8 +650,8 @@ static void test_RtlFindNextForwardRunClear(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); - ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); - ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); + ok(ulCount == 6, "Invalid length of found clear run: %ld, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found clear run: %ld, expected 56\n", lpPos); } #endif

1 0

Alexandre Julliard : ntdll: Support UTF-8 codepage in RtlInitCodePageTable().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: b5561c8bba9a613c53ae4669c4adb7450e5f458d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5561c8bba9a613c53ae4669… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 11:02:57 2022 +0100 ntdll: Support UTF-8 codepage in RtlInitCodePageTable(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 25 +++++++++++++++++++++++++ dlls/ntdll/locale.c | 7 +++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c910c348d45..2bc368c8bc1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4212,6 +4212,31 @@ static void test_GetCPInfo(void) ret = UnmapViewOfFile( ptr ); ok( ret, "UnmapViewOfFile failed err %lu\n", GetLastError() ); + status = pNtGetNlsSectionPtr( 11, 65001, NULL, &ptr, &size ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "failed %lx\n", status ); + if (pRtlInitCodePageTable) + { + static USHORT utf8[20] = { 0, CP_UTF8 }; + + memset( &table, 0xcc, sizeof(table) ); + pRtlInitCodePageTable( utf8, &table ); + ok( table.CodePage == CP_UTF8, "wrong codepage %u\n", table.CodePage ); + if (table.MaximumCharacterSize) + { + ok( table.MaximumCharacterSize == 4, "wrong char size %u\n", table.MaximumCharacterSize ); + ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); + ok( table.UniDefaultChar == 0xfffd, "wrong default char %x\n", table.UniDefaultChar ); + ok( table.TransDefaultChar == '?', "wrong default char %x\n", table.TransDefaultChar ); + ok( table.TransUniDefaultChar == '?', "wrong default char %x\n", table.TransUniDefaultChar ); + ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); + ok( !table.MultiByteTable, "wrong mbtable %p\n", table.MultiByteTable ); + ok( !table.WideCharTable, "wrong wctable %p\n", table.WideCharTable ); + ok( !table.DBCSRanges, "wrong ranges %p\n", table.DBCSRanges ); + ok( !table.DBCSOffsets, "wrong offsets %p\n", table.DBCSOffsets ); + } + else win_skip( "utf-8 codepage not supported\n" ); + } + /* normalization tables */ for (i = 0; i < 100; i++) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b4a14c0d68f..74c395cbd85 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -745,6 +745,13 @@ void WINAPI RtlInitCodePageTable( USHORT *ptr, CPTABLEINFO *info ) { USHORT hdr_size = ptr[0]; + if (ptr[1] == CP_UTF8) + { + static const CPTABLEINFO utf8_cpinfo = { CP_UTF8, 4, '?', 0xfffd, '?', '?' }; + *info = utf8_cpinfo; + return; + } + info->CodePage = ptr[1]; info->MaximumCharacterSize = ptr[2]; info->DefaultChar = ptr[3];

1 0