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

Alexandre Julliard : ntdll/tests: Fix string test for UTF-8 default codepage.
by Alexandre Julliard March 23, 2022

March 23, 2022

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

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

March 23, 2022

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

Paul Gofman : nsiproxy: Avoid redundant pid mapping in tcp_conns_enumerate_all().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 6ba4c31e9d9033a1477df94149b31d531cff7327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba4c31e9d9033a1477df941… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 09:07:24 2022 +0000 nsiproxy: Avoid redundant pid mapping in tcp_conns_enumerate_all(). 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/nsiproxy.sys/tcp.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0cd81ae86e5..491ac797100 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -540,7 +540,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * memset( &key, 0, sizeof(key) ); memset( &dyn, 0, sizeof(dyn) ); memset( &stat, 0, sizeof(stat) ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -558,15 +558,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -601,16 +603,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); key.remote.Ipv6.sin6_scope_id = find_ipv6_addr_scope( &key.remote.Ipv6.sin6_addr, addr_scopes, addr_scopes_size ); - - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -649,7 +652,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (len <= sizeof(struct xinpgen)) goto err; addr_scopes = get_ipv6_addr_scope_table( &addr_scopes_size ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); orig_xig = (struct xinpgen *)buf; xig = orig_xig; @@ -708,15 +711,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); } - stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; }

1 0

Zebediah Figura : kernelbase: Do not return S_FALSE from UrlGetPartW().
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: a521bfd3f41ccfa30dc84043d5ac612f216198ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a521bfd3f41ccfa30dc84043… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 23:28:00 2022 -0500 kernelbase: Do not return S_FALSE from UrlGetPartW(). Only return it from UrlGetPartA(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 3 ++- dlls/shlwapi/tests/url.c | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 410d87ce620..be7754dade2 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4166,6 +4166,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, out, *out_len, NULL, NULL); *out_len = len2 - 1; heap_free(inW); + if (hr == S_OK && !*out_len) hr = S_FALSE; return hr; } @@ -4382,7 +4383,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return *out_len ? S_OK : S_FALSE; + return S_OK; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 476358c6d45..31581f82847 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -748,8 +748,6 @@ static void test_UrlGetPart(void) {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"}, }; - winetest_mute_threshold = 5; - hr = UrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); @@ -837,7 +835,7 @@ 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 || tests[i].hr == S_FALSE) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#lx.\n", hr); @@ -870,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].hr == S_FALSE || tests[i].todo_hr) && strcmp(url, "a:") && strcmp(url, "0:")) + todo_wine_if (tests[i].todo_hr && strcmp(url, "a:") && strcmp(url, "0:")) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -886,8 +884,6 @@ static void test_UrlGetPart(void) winetest_pop_context(); } - - winetest_mute_threshold = 42; } /* ########################### */

1 0

Floris Renaud : po: Update Dutch Translation.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 17a8fd84547b335b5b0e27a370efd597cf73bee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a8fd84547b335b5b0e27a3… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Mar 23 16:55:47 2022 +0100 po: Update Dutch Translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40692ed0bb3..21e4f45a65a 100644 --- a/po/nl.po +++ b/po/nl.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 13:40+0100\n" +"PO-Revision-Date: 2022-03-23 17:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3987,13 +3987,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Cyclische __proto__ waarde" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" +msgstr "Kan geen eigenschap maken voor een niet-uitbreidbaar object" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Tim Clem : winemac.drv: Sort display modes.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: e66c9cadbb2f97d79a523927516d0649c4ae09e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66c9cadbb2f97d79a523927… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:06:02 2022 -0700 winemac.drv: Sort display modes. Mac driver version of a8b4cf7f2d3d1fbd79308a106a84e753cdac69e8. Combined with the previous patch that reordered synthesized modes, the Mac driver implementation of EnumDisplayModesEx now returns modes in the same order as the X11 driver. 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 | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d43baf6bd68..023f7b80ed8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -656,6 +656,48 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo #endif +static CFComparisonResult mode_compare(const void *p1, const void *p2, void *context) +{ + CGDisplayModeRef a = (CGDisplayModeRef)p1, b = (CGDisplayModeRef)p2; + size_t a_val, b_val; + double a_refresh_rate, b_refresh_rate; + + /* Sort by bpp descending, */ + a_val = display_mode_bits_per_pixel(a); + b_val = display_mode_bits_per_pixel(b); + if (a_val < b_val) + return kCFCompareGreaterThan; + else if (a_val > b_val) + return kCFCompareLessThan; + + /* then width ascending, */ + a_val = CGDisplayModeGetWidth(a); + b_val = CGDisplayModeGetWidth(b); + if (a_val < b_val) + return kCFCompareLessThan; + else if (a_val > b_val) + return kCFCompareGreaterThan; + + /* then height ascending, */ + a_val = CGDisplayModeGetHeight(a); + b_val = CGDisplayModeGetHeight(b); + if (a_val < b_val) + return kCFCompareLessThan; + else if (a_val > b_val) + return kCFCompareGreaterThan; + + /* then refresh rate descending. */ + a_refresh_rate = CGDisplayModeGetRefreshRate(a); + b_refresh_rate = CGDisplayModeGetRefreshRate(b); + if (a_refresh_rate < b_refresh_rate) + return kCFCompareGreaterThan; + else if (a_refresh_rate > b_refresh_rate) + return kCFCompareLessThan; + + return kCFCompareEqualTo; +} + + /*********************************************************************** * copy_display_modes * @@ -725,7 +767,16 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display, BOOL include_uns #endif modes = CGDisplayCopyAllDisplayModes(display, NULL); - return modes; + if (modes) + { + CFIndex count = CFArrayGetCount(modes); + CFMutableArrayRef sorted_modes = CFArrayCreateMutableCopy(NULL, count, modes); + CFRelease(modes); + CFArraySortValues(sorted_modes, CFRangeMake(0, count), mode_compare, NULL); + return sorted_modes; + } + + return NULL; }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 5dddacbe7d2e47ef2f13c8a3c55b77cfe499e6c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dddacbe7d2e47ef2f13c8a3… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Mar 23 11:30:05 2022 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 117 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 66 deletions(-) diff --git a/po/ko.po b/po/ko.po index 34823747a8d..209366150ea 100644 --- a/po/ko.po +++ b/po/ko.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: 2021-12-30 11:19+0900\n" +"PO-Revision-Date: 2022-03-23 11:25+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -240,8 +240,8 @@ msgstr "" "다.\n" "\n" "참고: 배포판이 제공하는 wine-mono 패키지 사용을 추천합니다. 자세한 내용은 <a " -"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십" -"시오." +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 참고" +"하세요." #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -3954,13 +3954,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "순환하는 __proto__ 값" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "확장 가능하지 않은 속성 '|'을(를) 정의할 수 없습니다" +msgstr "확장 가능하지 않은 개체에 대한 속성을 만들 수 없습니다" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -6948,54 +6946,40 @@ msgid "This network connection does not exist.\n" msgstr "네트워크 연결이 없습니다.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "잘못된 인터럽트 시간.\n" +msgstr "호출이 중단되었습니다.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "잘못된 핸들입니다.\n" +msgstr "파일 핸들이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "잘못된 네트워크 주소.\n" +msgstr "주소가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "잘못된 이름.\n" +msgstr "인수가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" -msgstr "피어가 연결을 초기화 했습니다.\n" +msgstr "피어가 연결을 다시 설정했습니다.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "포인트를 찾을 수 없습니다.\n" +msgstr "호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "특성을 찾을 수 없습니다.\n" +msgstr "일시적으로 호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "복구할 수 없는 오류가 발생했습니다.\n" +msgstr "복구할 수 없는 오류입니다.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "유효한 이름입니다만, 요청한 데이터 레코드가 없습니다.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -7011,7 +6995,7 @@ msgstr "파일에서 서명을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3824 msgid "Invalid call.\n" -msgstr "잘못된 호출.\n" +msgstr "잘못된 호출입니다.\n" #: dlls/kernel32/winerror.mc:3831 msgid "Resource is not currently available.\n" @@ -9135,8 +9119,8 @@ msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" -"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하십" -"시오." +"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하세" +"요." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -9427,7 +9411,7 @@ msgid "" "make sure the correct drive is selected below" msgstr "" "제조업체 설치 디스크를 삽입하고,\n" -"아래의 선택된 드라이브가 올바른지 확인하시오" +"아래의 선택된 드라이브가 올바른지 확인하세요" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -10193,7 +10177,8 @@ msgstr "'%1' 항목을 휴지통으로 보내시겠습니까?" #: dlls/shell32/shell32.rc:177 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" +msgstr "" +"항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신 완전히 지우시겠습니까?" #: dlls/shell32/shell32.rc:184 msgid "" @@ -15141,7 +15126,7 @@ msgid "" msgstr "" "파일 '%s'이(가) 변경되었습니다.\n" "\n" -"변결 내용을 저장하시겠습니까?" +"변경 내용을 저장하시겠습니까?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." @@ -15781,7 +15766,7 @@ msgstr "" "지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" -"특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" +"특정 작업에 대한 도움말을 보려면 다음처럼 입력하세요.\n" " REG [작업] /?\n" "\n" @@ -16013,7 +15998,7 @@ msgstr "" " 레지스트리 값 이름의 데이터를 삭제합니다.\n" "\n" " /va\n" -" 레지스트리 키 아래의 모든 값을 삭제하니다.\n" +" 레지스트리 키 아래의 모든 값을 삭제합니다.\n" "\n" " /f\n" " 확인 절차 없이 (모든 하위키 및 값과 함께) 레지스트리 키를\n" @@ -17442,7 +17427,7 @@ msgstr "열 선택" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하십시오." +msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하세요." #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" @@ -18426,7 +18411,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" msgid "Letter" -msgstr "문자" +msgstr "드라이브" #: programs/winecfg/winecfg.rc:77 msgid "Target folder" @@ -18831,19 +18816,19 @@ msgstr "새 게임(&N)\tF2" #: programs/winemine/winemine.rc:42 msgid "Question &Marks" -msgstr "물음표(&M)" +msgstr "물음표 표시(&M)" #: programs/winemine/winemine.rc:44 msgid "&Beginner" -msgstr "초보자(&B)" +msgstr "초급(&B)" #: programs/winemine/winemine.rc:45 msgid "&Intermediate" -msgstr "중급자(&I)" +msgstr "중급(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "전문가(&E)" +msgstr "고급(&E)" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -18851,15 +18836,15 @@ msgstr "사용자 정의(&C)..." #: programs/winemine/winemine.rc:49 msgid "&Fastest Times" -msgstr "가장 빠른 시간(&F)" +msgstr "기록 보기(&F)" #: programs/winemine/winemine.rc:54 msgid "&About WineMine" -msgstr "지뢰찾기 정보(&A)" +msgstr "지뢰 찾기 정보(&A)" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" -msgstr "최단 시간" +msgstr "최단 시간 기록" #: programs/winemine/winemine.rc:63 msgid "Fastest times" @@ -18867,19 +18852,19 @@ msgstr "최단 시간" #: programs/winemine/winemine.rc:64 msgid "Beginner" -msgstr "초보자" +msgstr "초급" #: programs/winemine/winemine.rc:65 msgid "Intermediate" -msgstr "중급자" +msgstr "중급" #: programs/winemine/winemine.rc:66 msgid "Expert" -msgstr "전문가" +msgstr "고급" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 msgid "Reset Results" -msgstr "초기화 결과" +msgstr "초기화" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -18891,31 +18876,31 @@ msgstr "이름을 입력해 주세요" #: programs/winemine/winemine.rc:90 msgid "Custom Game" -msgstr "사용자 지정 게임" +msgstr "사용자 정의" #: programs/winemine/winemine.rc:92 msgid "Rows" -msgstr "가로줄" +msgstr "높이" #: programs/winemine/winemine.rc:93 msgid "Columns" -msgstr "세로줄" +msgstr "너비" #: programs/winemine/winemine.rc:94 msgid "Mines" -msgstr "지뢰" +msgstr "지뢰 수" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "모든 결과를 잃습니다. 계속 진행하시겠습니까?" +msgstr "모든 기록이 초기화됩니다. 계속 진행하시겠습니까?" #: programs/winemine/winemine.rc:30 msgid "WineMine" -msgstr "지뢰찾기" +msgstr "지뢰 찾기" #: programs/winemine/winemine.rc:31 msgid "Nobody" -msgstr "아무개" +msgstr "익명" #: programs/winemine/winemine.rc:32 msgid "Copyright 2000 Joshua Thielen" @@ -18983,7 +18968,7 @@ msgstr "Wine 도움말" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "도움말 파일 `%s'를 읽는 도중 오류 발생" +msgstr "도움말 파일 '%s'을(를) 읽는 동안 오류 발생" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18999,31 +18984,31 @@ msgstr "도움말 파일 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾으시겠습니까?" +msgstr "'%s'을(를) 찾을 수 없습니다. 파일을 직접 찾으시겠습니까?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Richedit 구현을 찾을 수 없습니다... 취소중" +msgstr "Richedit 구현을 찾을 수 없습니다... 취소 중" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "도움말 목차: " +msgstr "도움말 항목: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "오류: 명령 라인은 지원되지 않음\n" +msgstr "오류: 명령 줄은 지원하지 않습니다\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "오류: Alias를 찾을 수 없음\n" +msgstr "오류: 별칭을 찾을 수 없습니다\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "오류: 잘못된 질의\n" +msgstr "오류: 잘못된 질의입니다\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "오류: 잘못된 키 이름\n" +msgstr "오류: 잘못된 구문입니다\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Alexandre Julliard : ntdll: Move user/system locale initialization to ntdll.
by Alexandre Julliard March 23, 2022

March 23, 2022

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

Tim Clem : winemac.drv: Add a flag to filter unsupported modes in copy_display_modes.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 8a8808e98b1f902ba8cca7559814a25fbfd0d8b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8808e98b1f902ba8cca755… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Mar 22 11:06:00 2022 -0700 winemac.drv: Add a flag to filter unsupported modes in copy_display_modes. Prefer supported display modes over similar unsupported ones. Centralizes the logic from the ChangeDisplaySettingsEx and EnumDisplaySettingsEx implementations. 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 | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cc3bbc6cffc..dfc238ed629 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -524,6 +524,13 @@ static int get_default_bpp(void) } +static BOOL display_mode_is_supported(CGDisplayModeRef display_mode) +{ + uint32_t io_flags = CGDisplayModeGetIOFlags(display_mode); + return (io_flags & kDisplayModeValidFlag) && (io_flags & kDisplayModeSafeFlag); +} + + #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_original) { @@ -579,8 +586,10 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mode, - struct display_mode_descriptor *original_mode_desc) + struct display_mode_descriptor *original_mode_desc, + BOOL include_unsupported) { + BOOL new_is_supported; CFStringRef pixel_encoding; size_t width_points, height_points; size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; @@ -591,6 +600,11 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo if (display_mode_matches_descriptor(new_mode, original_mode_desc)) return TRUE; + /* Skip unsupported modes unless told to do otherwise. */ + new_is_supported = display_mode_is_supported(new_mode); + if (!new_is_supported && !include_unsupported) + return FALSE; + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); if (pixel_encoding) { @@ -615,6 +629,10 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo if (display_mode_matches_descriptor(old_mode, original_mode_desc)) return FALSE; + /* Prefer supported modes over similar unsupported ones. */ + if (!new_is_supported && display_mode_is_supported(old_mode)) + return FALSE; + /* Otherwise, prefer a mode whose pixel size equals its point size over one which is scaled. */ width_points = CGDisplayModeGetWidth(new_mode); @@ -649,8 +667,11 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo * returned from CGDisplayCopyAllDisplayModes() without special options. * This is especially bad if that's the user's default mode, since then * no "available" mode matches the initial settings. + * + * If include_unsupported is FALSE, display modes with IO flags that + * indicate that they are invalid or unsafe are filtered. */ -static CFArrayRef copy_display_modes(CGDirectDisplayID display) +static CFArrayRef copy_display_modes(CGDirectDisplayID display, BOOL include_unsupported) { CFArrayRef modes = NULL; @@ -684,7 +705,7 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (mode_is_preferred(new_mode, old_mode, desc)) + if (mode_is_preferred(new_mode, old_mode, desc, include_unsupported)) CFDictionarySetValue(modes_by_size, key, new_mode); CFRelease(key); @@ -766,7 +787,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, int num_displays; CFArrayRef display_modes; struct display_mode_descriptor* desc; - CFIndex count, i, safe, best; + CFIndex count, i, best; CGDisplayModeRef best_display_mode; uint32_t best_io_flags; BOOL best_is_original; @@ -801,7 +822,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; - display_modes = copy_display_modes(displays[0].displayID); + display_modes = copy_display_modes(displays[0].displayID, FALSE); if (!display_modes) { macdrv_free_displays(displays); @@ -825,7 +846,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, desc = create_original_display_mode_descriptor(displays[0].displayID); - safe = -1; best_display_mode = NULL; count = CFArrayGetCount(display_modes); for (i = 0; i < count; i++) @@ -843,11 +863,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, height *= 2; } - if (!(io_flags & kDisplayModeValidFlag) || !(io_flags & kDisplayModeSafeFlag)) - continue; - - safe++; - if (bpp != mode_bpp) continue; @@ -901,7 +916,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, better: best_display_mode = display_mode; - best = safe; + best = i; best_io_flags = io_flags; best_is_original = is_original; } @@ -1013,7 +1028,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == 0 || !modes) { if (modes) CFRelease(modes); - modes = copy_display_modes(displays[0].displayID); + modes = copy_display_modes(displays[0].displayID, (flags & EDS_RAWMODE) != 0); modes_has_8bpp = modes_has_16bpp = FALSE; if (modes) @@ -1042,11 +1057,6 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, { CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - io_flags = CGDisplayModeGetIOFlags(candidate); - if (!(flags & EDS_RAWMODE) && - (!(io_flags & kDisplayModeValidFlag) || !(io_flags & kDisplayModeSafeFlag))) - continue; - seen_modes++; if (seen_modes > mode) {

1 0

Zebediah Figura : d3dcompiler: Implement D3DCompile2() using vkd3d_shader_compile().
by Alexandre Julliard March 23, 2022

March 23, 2022

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