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

[PATCH] crypt32/tests: Make pfxdata static
by Alex Henrie 23 Dec '21

23 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 46c9102686d..852cedaa1fe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3038,7 +3038,7 @@ static void test_I_UpdateStore(void) CertCloseStore(store2, 0); } -const BYTE pfxdata[] = +static const BYTE pfxdata[] = { 0x30, 0x82, 0x0b, 0x1d, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0a, 0xe3, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, -- 2.34.1

1 0

[PATCH] taskmgr: Select process on switch from application to process
by David Kahurani 23 Dec '21

23 Dec '21

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- programs/taskmgr/applpage.c | 22 ++++++++++++++-------- programs/taskmgr/perfdata.c | 21 +++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b35881c2..0cf9f48d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -28,6 +28,7 @@ #include <commctrl.h> #include "taskmgr.h" +#include "perfdata.h" typedef struct { @@ -790,15 +791,20 @@ void ApplicationPage_OnGotoProcess(void) } if (pAPLI) { DWORD dwProcessId; + int index; + memset(&item, 0, sizeof(LV_ITEMW)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); - /* - * Switch to the process tab - */ - SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); - /* - * FIXME: Select the process item in the list - */ + GetWindowThreadProcessId(pAPLI->hWnd, &dwProcessId); + /* + * Switch to the process tab + */ + SendMessageW(hTabWnd, TCM_SETCURFOCUS, 1, 0); + + index = PerfDataGetProcessIndex(dwProcessId); + + SendMessageW(hProcessPageListCtrl, LVM_SETITEMSTATE, index, (LPARAM) &item); } } diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 4498a2fe..e8dc8900 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -356,6 +356,27 @@ ULONG PerfDataGetProcessId(ULONG Index) return ProcessId; } +ULONG PerfDataGetProcessIndex(ULONG ProcessId) +{ + ULONG index; + + EnterCriticalSection(&PerfDataCriticalSection); + + for(index=0; index<ProcessCount; index++) + { + if(pPerfData[index].ProcessId == ProcessId) + break; + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + if (index == ProcessCount) + return 0; + else + return index; +} + + BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2..ffc1d2d6 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -75,6 +75,7 @@ ULONG PerfDataGetProcessorSystemUsage(void); BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); +ULONG PerfDataGetProcessIndex(ULONG ProcessId); BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -- 2.25.1

1 0

[PATCH] api-ms-win-core-windowserrorreporting-l1-1-1: Add DLL
by Alex Henrie 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51923 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-windowserrorreporting-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 4 files changed, 13 insertions(+) create mode 100644 dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..9b2c111119f 100644 --- a/configure.ac +++ b/configure.ac @@ -2470,6 +2470,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-errorprivate-l1-1-1) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in new file mode 100644 index 00000000000..dc0b525273e --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-windowserrorreporting-l1-1-1.dll diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec new file mode 100644 index 00000000000..8201b14cfb8 --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-1/api-ms-win-core-windowserrorreporting-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stub GetApplicationRecoveryCallback +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings +@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile +@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule +@ stdcall WerUnregisterFile(wstr) kernel32.WerUnregisterFile +@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..b5e6443dd3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -300,6 +300,7 @@ my @dll_groups = "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", + "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0", -- 2.34.1

1 0

[PATCH] nsiproxy: Allow the name length to be IFNAMSIZ - 1.
by Huw Davies 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52214 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ndis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 86c4248c9ec..036e8f1eb0c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -259,7 +259,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) struct if_entry *entry; int name_len = strlen( name ); - if (name_len >= IFNAMSIZ - 1) return NULL; + if (name_len >= sizeof(entry->if_unix_name)) return NULL; entry = malloc( sizeof(*entry) ); if (!entry) return NULL; -- 2.23.0

1 0

[PATCH 1/6] winegstreamer: Allow specifying flipped video via negative height.
by Zebediah Figura 23 Dec '21

23 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50668 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/unixlib.h | 2 +- dlls/winegstreamer/wg_parser.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 90101893541..82bb534b938 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -63,7 +63,7 @@ struct wg_format WG_VIDEO_FORMAT_CINEPAK, } format; - uint32_t width, height; + int32_t width, height; uint32_t fps_n, fps_d; } video; struct diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index c3c9051a174..0178538fa81 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -450,7 +450,7 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) if ((video_format = wg_video_format_to_gst(format->u.video.format)) == GST_VIDEO_FORMAT_UNKNOWN) return NULL; - gst_video_info_set_format(&info, video_format, format->u.video.width, format->u.video.height); + gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height)); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */ @@ -497,7 +497,7 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format /* Do not compare FPS. */ return a->u.video.format == b->u.video.format && a->u.video.width == b->u.video.width - && a->u.video.height == b->u.video.height; + && abs(a->u.video.height) == abs(b->u.video.height); } assert(0); @@ -611,6 +611,8 @@ static NTSTATUS wg_parser_stream_enable(void *args) if (format->major_type == WG_MAJOR_TYPE_VIDEO) { + bool flip = (format->u.video.height < 0); + switch (format->u.video.format) { case WG_VIDEO_FORMAT_BGRA: @@ -618,7 +620,7 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_BGR: case WG_VIDEO_FORMAT_RGB15: case WG_VIDEO_FORMAT_RGB16: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "vertical-flip"); + flip = !flip; break; case WG_VIDEO_FORMAT_AYUV: @@ -630,9 +632,10 @@ static NTSTATUS wg_parser_stream_enable(void *args) case WG_VIDEO_FORMAT_YVYU: case WG_VIDEO_FORMAT_UNKNOWN: case WG_VIDEO_FORMAT_CINEPAK: - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "none"); break; } + + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", flip ? "vertical-flip" : "none"); } gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); -- 2.34.1

1 5

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

23 Dec '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 94 +++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 50 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index d4d05db3298..16c22e456a4 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-12-13 13:32+0800\n" +"PO-Revision-Date: 2021-12-23 14:09+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -257,7 +257,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式 '%s'。您想將這個移除程式從註冊表中移除嗎?" +msgstr "無法執行移除程式 '%s'。您想將這個移除程式從登錄中移除嗎?" #: dlls/appwiz.cpl/appwiz.rc:36 msgid "Not specified" @@ -4774,7 +4774,7 @@ msgstr "不存在的權杖。\n" #: dlls/kernel32/winerror.mc:1063 msgid "Registry corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" @@ -4782,47 +4782,47 @@ msgstr "無效的索引鍵。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "無法開啟註冊表索引鍵。\n" +msgstr "無法開啟登錄機碼。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "無法讀取註冊表索引鍵。\n" +msgstr "無法讀取登錄機碼。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "無法寫入註冊表索引鍵。\n" +msgstr "無法寫入登錄機碼。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" -msgstr "註冊表已復原。\n" +msgstr "登錄已復原。\n" #: dlls/kernel32/winerror.mc:1093 msgid "Registry is corrupt.\n" -msgstr "註冊表損毀。\n" +msgstr "登錄損毀。\n" #: dlls/kernel32/winerror.mc:1098 msgid "I/O to registry failed.\n" -msgstr "註冊表 I/O 時失敗。\n" +msgstr "I/O 至登錄時失敗。\n" #: dlls/kernel32/winerror.mc:1103 msgid "Not registry file.\n" -msgstr "非註冊表檔案。\n" +msgstr "非登錄檔案。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "索引鍵已刪除。\n" +msgstr "已刪除機碼。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" -msgstr "沒有註冊表記錄檔空間。\n" +msgstr "沒有登錄記錄檔空間。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "註冊表索引鍵有子項。\n" +msgstr "登錄機碼有子項。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子項必須是可變的。\n" +msgstr "子機碼必須是可變的。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -8020,7 +8020,7 @@ msgstr "新資料夾" #: dlls/msi/msi.rc:91 msgid "Allocating registry space" -msgstr "正在分配註冊表空間" +msgstr "正在分配登錄空間" #: dlls/msi/msi.rc:92 msgid "Searching for installed applications" @@ -10464,22 +10464,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "蘇丹標準時間" +msgstr "南蘇丹標準時間" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "蘇丹夏令時間" +msgstr "南蘇丹夏令時間" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 耶路撒冷" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13355,7 +13349,7 @@ msgid "" msgstr "" "PATH 顯示或變更 cmd 的搜尋路徑。\n" "\n" -"輸入 PATH 將會顯示目前的路徑設定 (根據註冊表\n" +"輸入 PATH 將會顯示目前的路徑設定 (根據登錄\n" "進行初始化)。要變更設定就在\n" "PATH 命令之後緊接新的值。\n" "\n" @@ -14765,7 +14759,7 @@ msgstr "系統設定(&S)" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "執行註冊表編輯器(&R)" +msgstr "執行登錄檔編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14877,7 +14871,7 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"這些設定只改變註冊表內的值。\n" +"這些設定只改變登錄內的值。\n" "它對 Wine 的性能沒有影響。" #: programs/oleview/oleview.rc:180 @@ -14942,7 +14936,7 @@ msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "執行 Wine 註冊表編輯器" +msgstr "執行 Wine 登錄檔編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -15047,7 +15041,7 @@ msgstr "介面" #: programs/oleview/oleview.rc:140 msgid "Registry" -msgstr "註冊表" +msgstr "登錄" #: programs/oleview/oleview.rc:141 msgid "Implementation" @@ -15313,7 +15307,7 @@ msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: 無法存取或建立指定的註冊表鍵\n" +msgstr "reg: 無法存取或建立指定的登錄機碼\n" #: programs/reg/reg.rc:116 msgid "reg: The operation completed successfully\n" @@ -15321,7 +15315,7 @@ msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" -msgstr "reg: 註冊表操作已經取消\n" +msgstr "reg: 登錄操作已經取消\n" #: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" @@ -15412,7 +15406,7 @@ msgid "" msgstr "" "REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" "\n" -" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +" 新增一個機碼到登錄，或新增值到給定的登錄機碼。\n" "\n" " <機碼>\n" " 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" @@ -15438,7 +15432,7 @@ msgstr "" " 登錄值。\n" "\n" " /t <類型>\n" -" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" 要新增到登錄的資料類型。如果指定了 [/t]，\n" " <類型> 必須是下列的其中一個:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" @@ -15665,7 +15659,7 @@ msgid "" msgstr "" "REG IMPORT <檔案>\n" "\n" -" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +" 從給定的檔案匯入機碼、值和資料到登錄。\n" "\n" " <檔案>\n" " 要匯入的登錄檔案的名稱和路徑。\n" @@ -15849,7 +15843,7 @@ msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -msgstr "註冊表(&R)" +msgstr "登錄檔(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." @@ -15921,7 +15915,7 @@ msgstr "移除我的最愛(&R)..." #: programs/regedit/regedit.rc:80 msgid "&About Registry Editor" -msgstr "關於註冊表編輯器(&A)" +msgstr "關於登錄檔編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 @@ -15934,7 +15928,7 @@ msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" -msgstr "匯出註冊表" +msgstr "要匯出的登錄" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" @@ -16016,28 +16010,28 @@ msgstr "編輯多字串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "含有與註冊表有關的全部指令" +msgstr "包含登錄工作相關的全部命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "含有與編輯數值有關的全部指令" +msgstr "包含編輯機碼或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "含有與自訂註冊表視窗有關的全部指令" +msgstr "包含自訂登錄視窗的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "含有與使用常用索引鍵有關的全部指令" +msgstr "包含使用常用的機碼的命令" #: programs/regedit/regedit.rc:163 msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有顯示登錄編輯程式說明及資訊的命令" +msgstr "包含顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "含有與建立新值有關的全部指令" +msgstr "包含建立新機碼或值的指令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16045,7 +16039,7 @@ msgstr "資料" #: programs/regedit/regedit.rc:154 msgid "Registry Editor" -msgstr "註冊表編輯器" +msgstr "登錄檔編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" @@ -16114,7 +16108,7 @@ msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的機碼和值已成功新增至註冊表。" +msgstr "%1 所包含的機碼和值已成功新增至登錄。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16270,7 +16264,7 @@ msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 msgid "Quits the Registry Editor" -msgstr "結束註冊表編輯器" +msgstr "結束登錄檔編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -16334,19 +16328,19 @@ msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" -msgstr "將純文字檔案匯入註冊表" +msgstr "將純文字檔案匯入登錄" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表匯出到純文字檔案" +msgstr "將登錄匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" -msgstr "列印註冊表的全部或部分" +msgstr "列印登錄的全部或部分" #: programs/regedit/regedit.rc:181 msgid "Opens Registry Editor Help" -msgstr "開啟註冊表編輯器的說明" +msgstr "開啟登錄檔編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -- 2.33.0.windows.2

1 0

[PATCH 1/2] ws2_32: Don't read more than necessary from the inputs in select().
by Torge Matthies 23 Dec '21

23 Dec '21

.NET Framework / old .NET Core seems to allocate not more space than necessary for the fd_set inputs, so if the allocation fell on the edge of the end of the heap, Wine tried to read past it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52259 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..446cbd0b469 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2395,9 +2395,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); - if (read_ptr) read = *read_ptr; - if (write_ptr) write = *write_ptr; - if (except_ptr) except = *except_ptr; + if (read_ptr) read.fd_count = read_ptr->fd_count; + if (write_ptr) write.fd_count = write_ptr->fd_count; + if (except_ptr) except.fd_count = except_ptr->fd_count; if (!(sync_event = get_sync_event())) return -1; @@ -2408,26 +2408,29 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < read.fd_count; ++i) { - params->sockets[params->count].socket = read.fd_array[i]; + poll_socket = read_ptr->fd_array[i]; + read.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; ++params->count; - poll_socket = read.fd_array[i]; } for (i = 0; i < write.fd_count; ++i) { - params->sockets[params->count].socket = write.fd_array[i]; + poll_socket = write_ptr->fd_array[i]; + write.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_WRITE; ++params->count; - poll_socket = write.fd_array[i]; } for (i = 0; i < except.fd_count; ++i) { - params->sockets[params->count].socket = except.fd_array[i]; + poll_socket = except_ptr->fd_array[i]; + except.fd_array[i] = poll_socket; + params->sockets[params->count].socket = poll_socket; params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; ++params->count; - poll_socket = except.fd_array[i]; } if (!params->count) @@ -2450,9 +2453,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!status) { /* pointers may alias, so clear them all first */ - if (read_ptr) FD_ZERO( read_ptr ); - if (write_ptr) FD_ZERO( write_ptr ); - if (except_ptr) FD_ZERO( except_ptr ); + if (read_ptr) read_ptr->fd_count = 0; + if (write_ptr) write_ptr->fd_count = 0; + if (except_ptr) except_ptr->fd_count = 0; for (i = 0; i < params->count; ++i) { -- 2.34.1

2 3

[PATCH 1/2] widl: Define _WIN64 for 64-bit targets.
by Bernhard Übelacker 23 Dec '21

23 Dec '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- tools/widl/widl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..d241e046846 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -849,6 +849,8 @@ int main(int argc,char *argv[]) add_widl_version_define(); wpp_add_cmdline_define("_WIN32=1"); + if (pointer_size == 8) + wpp_add_cmdline_define("_WIN64=1"); atexit(rm_tempfile); if (!no_preprocess) -- 2.34.1

1 2

[PATCH] msado15: Use a 64-bit type for DefinedSize on amd64.
by Bernhard Übelacker 22 Dec '21

22 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50842 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/msado15/recordset.c | 8 ++++---- dlls/msado15/tests/msado15.c | 9 +++++---- include/msado15_backcompat.idl | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 92a0deb6959..61b7ebb596a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -69,7 +69,7 @@ struct field LONG refs; WCHAR *name; DataTypeEnum type; - LONG defined_size; + LONG_PTR defined_size; LONG attrs; LONG index; struct recordset *recordset; @@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) return S_OK; } -static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG_PTR *size ) { struct field *field = impl_from_Field( iface ); @@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) return S_OK; } -static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG_PTR size ) { struct field *field = impl_from_Field( iface ); - TRACE( "%p, %d\n", field, size ); + TRACE( "%p, %ld\n", field, size ); field->defined_size = size; return S_OK; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 25c9c6f8356..cbe48764324 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -631,7 +631,7 @@ static void test_ADORecordsetConstruction(void) if (count > 0) { VARIANT index; - LONG size; + LONG_PTR size; DataTypeEnum type; V_VT( &index ) = VT_BSTR; @@ -646,7 +646,7 @@ static void test_ADORecordsetConstruction(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 5, "got %d\n", size ); + ok( size == 5, "got %ld\n", size ); VariantClear(&index); @@ -672,7 +672,8 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG count, size; + LONG count; + LONG_PTR size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -747,7 +748,7 @@ static void test_Fields(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 4, "got %d\n", size ); + ok( size == 4, "got %ld\n", size ); attrs = 0xdead; hr = Field_get_Attributes( field, &attrs ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index fedaf557066..08566a2eee0 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -634,7 +634,7 @@ interface Field20 : _ADO [id(0x0000044f), propget] HRESULT DefinedSize( - [out, retval] LONG *size); + [out, retval] LONG_PTR *size); [id(0x0000044c), propget] HRESULT Name( @@ -699,7 +699,7 @@ interface Field20 : _ADO [id(0x0000044f), propput] HRESULT DefinedSize( - [in] LONG size); + [in] LONG_PTR size); [id(0x0000040c), propput] HRESULT Attributes( -- 2.34.1

2 2

[PATCH] api-ms-win-core-versionansi-l1-1-1: Add dll.
by David Warner 22 Dec '21

22 Dec '21

Add the ANSI analogue to api-ms-win-core-version-l1-1-1 Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec diff --git a/configure b/configure index 69159422456..f38652cc263 100755 --- a/configure +++ b/configure @@ -21545,6 +21545,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_core_version_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-1 enable_api_ms_win_core_versionansi_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..57c4e01be61 100644 --- a/configure.ac +++ b/configure.ac @@ -2469,6 +2469,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in new file mode 100644 index 00000000000..054fa70c479 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-1.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec new file mode 100644 index 00000000000..a73d8924376 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall GetFileVersionInfoSizeA(str ptr) version.GetFileVersionInfoSizeA +@ stdcall GetFileVersionInfoA(str long long ptr) version.GetFileVersionInfoA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..3e5f54f4947 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -442,6 +442,7 @@ my @dll_groups = [ "version", "api-ms-win-core-versionansi-l1-1-0", + "api-ms-win-core-versionansi-l1-1-1", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", -- 2.33.1

1 0