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

Eric Pouech : ntdll/tests: Enable compilation with long types in string.c.
by Alexandre Julliard 23 Mar '22

23 Mar '22

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

Eric Pouech : ntdll/tests: Enable compilation with long types in rtlbitmap.c.
by Alexandre Julliard 23 Mar '22

23 Mar '22

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

Eric Pouech : ntdll/tests: Enable compilation with long types in sync.c.
by Alexandre Julliard 23 Mar '22

23 Mar '22

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

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in rtlstr.c.
by Alexandre Julliard 23 Mar '22

23 Mar '22

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 rtl.c.
by Alexandre Julliard 23 Mar '22

23 Mar '22

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

1 0

Alexandre Julliard : ntdll: Move user/system locale initialization to ntdll.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 8ccb24b15162e15ad3bad993c8800365d02714fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ccb24b15162e15ad3bad993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 11:02:19 2022 +0100 ntdll: Move user/system locale initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 34 ++-------------------------------- dlls/ntdll/locale.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2f2154a0e7c..9ef8fbe8f44 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -699,27 +699,6 @@ done: } -static LCID locale_to_lcid( WCHAR *win_name ) -{ - WCHAR *p; - LCID lcid; - - if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; - - /* try neutral name */ - if ((p = wcsrchr( win_name, '-' ))) - { - *p = 0; - if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) - { - if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) - lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); - return lcid; - } - } - return 0; -} - /*********************************************************************** * init_locale */ @@ -728,7 +707,7 @@ void init_locale(void) UINT ansi_cp = 0, oem_cp = 0; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; - LCID user_lcid = 0, system_lcid = 0; + LCID user_lcid; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; GEOID geoid = GEOID_NOT_AVAILABLE; @@ -738,16 +717,6 @@ void init_locale(void) if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); - if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) - system_lcid = locale_to_lcid( bufferW ); - if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) - user_lcid = locale_to_lcid( bufferW ); - if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); - if (!user_lcid) user_lcid = system_lcid; - - NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); - NtSetDefaultLocale( TRUE, user_lcid ); - NtSetDefaultLocale( FALSE, system_lcid ); kernel32_handle = GetModuleHandleW( L"kernel32.dll" ); @@ -806,6 +775,7 @@ void init_locale(void) /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ + user_lcid = GetUserDefaultLCID(); count = sizeof(bufferW); if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) { diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 158f068b03d..b4a14c0d68f 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -273,8 +273,10 @@ static const NLS_LOCALE_DATA *get_locale_data( UINT idx ) void locale_init(void) { + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + UNICODE_STRING name, value; LARGE_INTEGER unused; - LCID system_lcid; + LCID system_lcid, user_lcid = 0; NTSTATUS status; struct { @@ -298,6 +300,26 @@ void locale_init(void) lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset); lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); + + value.Buffer = locale; + value.MaximumLength = sizeof(locale); + RtlInitUnicodeString( &name, L"WINELOCALE" ); + if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) + { + const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); + if (entry) system_lcid = get_locale_data( entry->idx )->idefaultlanguage; + } + RtlInitUnicodeString( &name, L"WINEUSERLOCALE" ); + if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) + { + const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); + if (entry) user_lcid = get_locale_data( entry->idx )->idefaultlanguage; + } + if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + NtSetDefaultUILanguage( user_lcid ); + NtSetDefaultLocale( TRUE, user_lcid ); + NtSetDefaultLocale( FALSE, system_lcid ); }

1 0

Alexandre Julliard : ntdll: Support UTF-8 codepage in RtlInitCodePageTable().
by Alexandre Julliard 23 Mar '22

23 Mar '22

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

Alexandre Julliard : ntdll/tests: Fix string test for UTF-8 default codepage.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 63d7591b3cf510f32353ea7aa9bed07afcb57fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d7591b3cf510f32353ea7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 18:31:31 2022 +0100 ntdll/tests: Fix string test for UTF-8 default codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index eabbe86792b..3d9ae94c79a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1837,7 +1837,7 @@ static void test_toupper(void) { int i, ret, exp_ret; - char str[2], *p; + char str[3], *p; WCHAR wc; ok(ptoupper != NULL, "toupper is not available\n"); @@ -1846,17 +1846,20 @@ static void test_toupper(void) { str[0] = i; str[1] = i >> 8; + str[2] = 0; p = str; wc = RtlAnsiCharToUnicodeChar( &p ); wc = RtlUpcaseUnicodeChar( wc ); ret = WideCharToMultiByte( CP_ACP, 0, &wc, 1, str, 2, NULL, NULL ); - ok(ret == 1 || ret == 2, "WideCharToMultiByte returned %d\n", ret); + ok(!ret || ret == 1 || ret == 2, "WideCharToMultiByte returned %d\n", ret); if (ret == 2) exp_ret = (unsigned char)str[1] + ((unsigned char)str[0] << 8); - else + else if (ret == 1) exp_ret = (unsigned char)str[0]; + else + exp_ret = (WCHAR)i; - ret = ptoupper(i); + ret = (WCHAR)ptoupper(i); ok(ret == exp_ret, "toupper(%x) = %x, expected %x\n", i, ret, exp_ret); } }

1 0

Zebediah Figura : d3dcompiler: Implement D3DCompile2() using vkd3d_shader_compile().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 6a062afb75c1e026614403312f2e13207e359634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a062afb75c1e02661440331… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 20:25:26 2022 -0600 d3dcompiler: Implement D3DCompile2() using vkd3d_shader_compile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51713 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 3 +- dlls/d3dcompiler_34/Makefile.in | 3 +- dlls/d3dcompiler_35/Makefile.in | 3 +- dlls/d3dcompiler_36/Makefile.in | 3 +- dlls/d3dcompiler_37/Makefile.in | 3 +- dlls/d3dcompiler_38/Makefile.in | 3 +- dlls/d3dcompiler_39/Makefile.in | 3 +- dlls/d3dcompiler_40/Makefile.in | 3 +- dlls/d3dcompiler_41/Makefile.in | 3 +- dlls/d3dcompiler_42/Makefile.in | 3 +- dlls/d3dcompiler_43/Makefile.in | 2 + dlls/d3dcompiler_43/compiler.c | 210 +++++++++++++++++++++++++++++---- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 94 +++++++-------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 210 +++++++++++++++------------------ dlls/d3dcompiler_46/Makefile.in | 3 +- dlls/d3dcompiler_47/Makefile.in | 3 +- 16 files changed, 350 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a062afb75c1e0266144…

1 0

Tim Clem : winemac.drv: Simplify control flow in copy_display_modes.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 5c09278ab6eb7d2611b57bfb2111d043d5d30b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c09278ab6eb7d2611b57bfb… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:05:59 2022 -0700 winemac.drv: Simplify control flow in copy_display_modes. Introduce a helper function to determine if a mode is preferred over another. 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 | 123 ++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2ac8f32fa18..cc3bbc6cffc 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -576,6 +576,65 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o return ret; } + + +static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mode, + struct display_mode_descriptor *original_mode_desc) +{ + CFStringRef pixel_encoding; + size_t width_points, height_points; + size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; + BOOL old_size_same, new_size_same; + + /* If a given mode is the user's default, then always list it in preference to any similar + modes that may exist. */ + if (display_mode_matches_descriptor(new_mode, original_mode_desc)) + return TRUE; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + if (pixel_encoding) + { + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) + { + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + return FALSE; + } + } + + if (!old_mode) + return TRUE; + + /* Prefer the original mode over any similar mode. */ + if (display_mode_matches_descriptor(old_mode, original_mode_desc)) + return FALSE; + + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + width_points = CGDisplayModeGetWidth(new_mode); + height_points = CGDisplayModeGetHeight(new_mode); + new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + return TRUE; + + if (!new_size_same && old_size_same) + return FALSE; + + /* Otherwise, prefer the mode with the smaller pixel size. */ + return new_width_pixels < old_width_pixels && new_height_pixels < old_height_pixels; +} #endif @@ -620,72 +679,12 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) count = CFArrayGetCount(modes); for (i = 0; i < count; i++) { - BOOL better = TRUE; CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); + CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - /* If a given mode is the user's default, then always list it in preference to any similar - modes that may exist. */ - if (new_is_original) - better = TRUE; - else - { - CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); - CGDisplayModeRef old_mode; - - if (pixel_encoding) - { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) - { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - CFRelease(key); - continue; - } - } - - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - BOOL old_is_original = display_mode_matches_descriptor(old_mode, desc); - - if (old_is_original) - better = FALSE; - else - { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t width_points = CGDisplayModeGetWidth(new_mode); - size_t height_points = CGDisplayModeGetHeight(new_mode); - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) - better = FALSE; - else - { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) - better = FALSE; - } - } - } - } - - if (better) + if (mode_is_preferred(new_mode, old_mode, desc)) CFDictionarySetValue(modes_by_size, key, new_mode); CFRelease(key);

1 0