December 2021 - Wine-devel - list.winehq.org

[PATCH v3 2/4] winevulkan: Pass Unix call arguments as a struct.
by Jacek Caban 10 Dec '21

10 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 31 +++- dlls/winevulkan/make_vulkan | 100 +++++++++---- dlls/winevulkan/vulkan.c | 285 +++++++++++++++++++++++++++--------- 3 files changed, 306 insertions(+), 110 deletions(-)

1 0

[PATCH v3 1/4] winevulkan: Support prefixing function parameters.
by Jacek Caban 10 Dec '21

10 Dec '21

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Don't use syscalls for functions sensitive for performance. Also share even more between direct call code paths and syscalls. dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)

1 0

[PATCH v2 01/11] ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error.
by Zebediah Figura 10 Dec '21

10 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- dlls/ws2_32/tests/afd.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e459087af76..51c92df57e3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5735,7 +5735,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_PENDING) io->u.Status = status; + if (status != STATUS_PENDING && !NT_ERROR(status)) io->u.Status = status; return status; } diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9e888f1fcb9..55029bfd30d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -688,7 +688,7 @@ static void test_poll(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); - todo_wine ok(!io.Status, "got %#x\n", io.Status); + ok(!io.Status, "got %#x\n", io.Status); ok(!io.Information, "got %#Ix\n", io.Information); /* Test passing the same handle twice. */ @@ -1201,7 +1201,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); todo_wine ok(ret == STATUS_INVALID_CONNECTION, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1213,7 +1213,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); wsabufs[0].len = sizeof(buffer); @@ -1301,7 +1301,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_DEVICE_NOT_READY, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); @@ -1368,7 +1368,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB | AFD_MSG_NOT_OOB; @@ -1376,7 +1376,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB; -- 2.34.1

1 10

[PATCH] ntdll: Properly test for LLVM libunwind error codes.
by Jinoh Kang 10 Dec '21

10 Dec '21

Commit f37b953e07f (ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes., 2021-12-10) made an unsuccessful attempt to fix UNW_ENOINFO detection on LLVM libunwind. It turns out that UNW_ENOINFO is actually negative in LLVM, so there's no need to flip the sign. Fix this by flipping the return value sign only when UNW_ENOINFO < 0 (LLVM libunwind), and then comparing it against the negated error code. Overall, all flavours of libunwind return a negative value on error. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: It turns out my last-minute patch change was based on a faulty assumption. I sincerely apologise for the extra hassle. I'll make sure to test this more extensively next time. dlls/ntdll/unix/signal_arm.c | 6 +++--- dlls/ntdll/unix/signal_arm64.c | 6 +++--- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index b65d6f2ddeb..eaa41d9e139 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,13 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1a01bb13c85..26910173b81 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,13 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index fa73ebb5a10..90fa04f0309 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,13 +1415,13 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) return STATUS_UNSUCCESSFUL; TRACE( "ip %#lx function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n", -- 2.31.1

1 0

[PATCH] advapi32/tests: Well known group names are not translated in Wine.
by Francois Gouget 10 Dec '21

10 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52175 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> -- Alternatively we could consider that translating the group names is not important since Windows itself does not always translate them ('Everyone' is translated in French and German but not in Japanese). So this could be a skip instead. --- dlls/advapi32/tests/lsa.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f8c822a7de2..8e1edd2326b 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -323,16 +323,17 @@ static void test_LsaLookupNames2(void) ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } -static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect) +static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect, BOOL todo) { ok_(__FILE__, line)(string->Length == wcslen(string->Buffer) * sizeof(WCHAR), "expected %u, got %u\n", wcslen(string->Buffer) * sizeof(WCHAR), string->Length); ok_(__FILE__, line)(string->MaximumLength == string->Length + sizeof(WCHAR), "expected %u, got %u\n", string->Length + sizeof(WCHAR), string->MaximumLength); - ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), "expected %s, got %s\n", + todo_if(todo) ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), + "expected %s, got %s\n", debugstr_w(expect), debugstr_w(string->Buffer)); } -#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +#define check_unicode_string(a, b, c) check_unicode_string_(__LINE__, a, b, c) static void test_LsaLookupSids(void) { @@ -371,11 +372,11 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(list->Entries == 1, "got %d\n", list->Entries); - check_unicode_string(&list->Domains[0].Name, computer_name); + check_unicode_string(&list->Domains[0].Name, computer_name, FALSE); ok(names[0].Use == SidTypeUser, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, user_name); + check_unicode_string(&names[0].Name, user_name, FALSE); LsaFreeMemory(names); LsaFreeMemory(list); @@ -388,7 +389,7 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(list->Entries == 1, "got %d\n", list->Entries); - check_unicode_string(&list->Domains[0].Name, L""); + check_unicode_string(&list->Domains[0].Name, L"", FALSE); ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); @@ -400,11 +401,11 @@ static void test_LsaLookupSids(void) langW[0] = 0; if (wcscmp(langW, L"0409") == 0 || wcscmp(langW, L"0411") == 0) /* English and Japanese */ - check_unicode_string(&names[0].Name, L"Everyone"); + check_unicode_string(&names[0].Name, L"Everyone", FALSE); else if (wcscmp(langW, L"0407") == 0) /* German */ - check_unicode_string(&names[0].Name, L"Jeder"); + check_unicode_string(&names[0].Name, L"Jeder", TRUE); else if (wcscmp(langW, L"040C") == 0) /* French */ - check_unicode_string(&names[0].Name, L"Tout le monde"); + check_unicode_string(&names[0].Name, L"Tout le monde", TRUE); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); @@ -422,7 +423,7 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678"); + check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678", FALSE); LsaFreeMemory(names); LsaFreeMemory(list); @@ -495,14 +496,14 @@ static void test_LsaGetUserName(void) status = pLsaGetUserName(&lsa_user, NULL); ok(!status, "got %#x\n", status); - check_unicode_string(lsa_user, user); + check_unicode_string(lsa_user, user, FALSE); LsaFreeMemory(lsa_user); status = pLsaGetUserName(&lsa_user, &lsa_domain); ok(!status, "got %#x\n", status); ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); - check_unicode_string(lsa_user, user); - check_unicode_string(lsa_domain, computer); + check_unicode_string(lsa_user, user, FALSE); + check_unicode_string(lsa_domain, computer, FALSE); LsaFreeMemory(lsa_user); LsaFreeMemory(lsa_domain); } -- 2.30.2

1 0

[PATCH] ntdll/tests: Fix the spelling of a comment.
by Francois Gouget 10 Dec '21

10 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 09b9bcc8497..9ef3da6dd14 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -99,7 +99,7 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); - /* NtCreateUserProcess() may return STATUS_INVALID_PARAMATER with some unitialized data in create_info. */ + /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some unitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); create_info.Size = sizeof(create_info); -- 2.30.2

1 0

[PATCH] server: Fix the spelling of a comment.
by Francois Gouget 10 Dec '21

10 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 296f7a5d265..467ccd1f0db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,7 +33,7 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H -/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +/* FreeBSD needs this for cpu_set_t instead of its cpuset_t */ #define _WITH_CPU_SET_T #include <sched.h> #endif -- 2.30.2

1 0

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 10 Dec '21

10 Dec '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 60 +++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 104cd493c8e..d095bd0a92e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.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-11-23 14:40+0800\n" +"PO-Revision-Date: 2021-11-28 00:32+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1155,8 +1155,8 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。請安裝" -"印表機後再試一次。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。請在安" +"裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." @@ -1224,7 +1224,7 @@ msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動; " +msgstr "I/O 活動中; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " @@ -1268,7 +1268,7 @@ msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支; " +msgstr "紙張有問題; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " @@ -2510,15 +2510,15 @@ msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-encoded X.509 (*.cer)" +msgstr "DER-encoded X.509 (*.cer)(&D)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer):" +msgstr "Base64-encoded X.509 (*.cer)(&S):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "密碼訊息語法標準/PK&CS #7 訊息 (*.p7b)" +msgstr "密碼訊息語法標準/PK&CS #7 訊息 (*.p7b)(&C)" #: dlls/cryptui/cryptui.rc:419 msgid "&Include all certificates in the certification path if possible" @@ -2526,7 +2526,7 @@ msgstr "儘量在憑證路徑中包含所有憑證(&I)" #: dlls/cryptui/cryptui.rc:421 msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "個人資訊交換/&PKCS #12 (*.pfx)" +msgstr "個人資訊交換/&PKCS #12 (*.pfx)(&P)" #: dlls/cryptui/cryptui.rc:423 msgid "Incl&ude all certificates in the certification path if possible" @@ -2588,7 +2588,7 @@ msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." -msgstr "這個憑證的所有預定目的都無法被驗證。" +msgstr "無法驗證這個憑證的所有預定目的。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" @@ -2855,7 +2855,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2864,7 +2864,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2873,7 +2873,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2882,7 +2882,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2891,7 +2891,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "由這個憑證授權單位所發的憑證將不再被信任。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2900,7 +2900,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "由這些憑證授權單位所發的憑證將不再被信任。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2909,7 +2909,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" -"確定要移除這個信任的根憑證?" +"您確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2918,7 +2918,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" -"確定要移除這些信任的根憑證?" +"您確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2926,7 +2926,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "由這個發行者簽署的軟體將將不再被信任。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2934,7 +2934,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "由這些發行者簽署的軟體將不再被信任。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" @@ -13076,13 +13076,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "使用中的字碼頁: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "無效的訊息。\n" +msgstr "無效的字碼頁\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13095,6 +13093,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [數字]\n" +"\n" +" 設定或顯示主控臺正在使用的字碼頁。\n" +"\n" +" 數字要在主控臺使用的字碼頁。\n" +"\n" +" 輸入 CHCP 而不輸入數字則顯示主控臺正在使用的字碼頁。\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -18901,7 +18907,7 @@ msgstr "RichEdit 庫載入失敗。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。您確定要這麼做嗎?" +msgstr "您已經選擇儲存為純文字格式。這可能導致格式遺失。您確定要這麼做嗎?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -19037,10 +19043,10 @@ msgstr "" "XCOPY 來源 [目的地] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"位置:\n" +"其中:\n" "\n" "[/I] 如果目的不存在且複製兩個或更多檔案時，\n" -"\t將目的假設為目錄。\n" +"\t將假設目的地為目錄。\n" "[/S] 複製目錄和子目錄。\n" "[/E] 複製目錄和子目錄，包括任何空目錄。\n" "[/Q] 安靜模式，在複製期間不列出名稱。\n" -- 2.33.0.windows.2

1 0

[PATCH] msi: GetBinaryType() doesn't accept DLLs.
by Hans Leidekker 10 Dec '21

10 Dec '21

With help from Dmitry Timoshkov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51790 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fb03958eb11..19ad3917265 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -697,6 +700,51 @@ static DWORD WINAPI custom_client_thread(void *arg) return rc; } +/* based on kernel32.GetBinaryTypeW() */ +static BOOL get_binary_type( const WCHAR *name, DWORD *type ) +{ + HANDLE hfile, mapping; + NTSTATUS status; + + hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, NULL, NULL, PAGE_READONLY, + SEC_IMAGE, hfile ); + CloseHandle( hfile ); + + switch (status) + { + case STATUS_SUCCESS: + { + SECTION_IMAGE_INFORMATION info; + + status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); + CloseHandle( mapping ); + if (status) return FALSE; + switch (info.Machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: + *type = SCS_32BIT_BINARY; + return TRUE; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } + } + case STATUS_INVALID_IMAGE_WIN_64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } +} + static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -744,7 +792,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->package->rpc_server_started = 1; } - ret = GetBinaryTypeW(source, &info->arch); + ret = get_binary_type(source, &info->arch); if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); -- 2.30.2

1 0

[PATCH] maintainers: Add the nsi include file.
by Huw Davies 10 Dec '21

10 Dec '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ea27dc41af3..d1f92c3a50b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,6 +221,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/iphlpapi/ F: dlls/nsi/ F: dlls/nsiproxy.sys/ +F: include/wine/nsi.h OLE Embedding M: Huw Davies <huw(a)codeweavers.com> -- 2.23.0

1 0