wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Matteo Bruni : ddraw: Fix typo in a comment.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 1e992a430beaa73a85313a81fd0cd1df61d91c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e992a430beaa73a85313a81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:42 2021 +0100 ddraw: Fix typo in a comment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 09f52b85aed..65e24b0bbcf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -97,7 +97,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, * while in exclusive mode, since it would get obscured by the popup * window. On the other hand, if the current frontbuffer *is* the GDI * frontbuffer, that's what's supposed to happen; the popup should obscure - * (oart of) the ddraw swapchain window. + * (part of) the ddraw swapchain window. * * This affects the "Deer Hunter" demo, which uses a popup window and GDI * draws to draw part of the user interface. See also the "fswindow"

1 0

Matteo Bruni : ddraw: Add a trace to ddraw_surface_update_frontbuffer().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 029297fabd1231427398ed33bbbd5f3fd91f708e URL: https://source.winehq.org/git/wine.git/?a=commit;h=029297fabd1231427398ed33… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:41 2021 +0100 ddraw: Add a trace to ddraw_surface_update_frontbuffer(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d4fddcc8d06..09f52b85aed 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -64,6 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; + TRACE("surface %p, rect %s, read %#x, swap_interval %u.\n", + surface, wine_dbgstr_rect(rect), read, swap_interval); + if (ddraw->flags & DDRAW_SWAPPED && !read) { ddraw->flags &= ~DDRAW_SWAPPED;

1 0

Matteo Bruni : ddraw: Pass the sub resource count to ddraw_surface_reserve_memory().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 91916619922c96bbeedbd4b9fb233b467b62b3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91916619922c96bbeedbd4b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:39 2021 +0100 ddraw: Pass the sub resource count to ddraw_surface_reserve_memory(). Mostly to avoid triggering the WARN() from wined3d_texture_get_sub_resource_desc() every time this function is called. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 25aa2be41bb..d4fddcc8d06 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5923,7 +5923,8 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource return DD_OK; } -static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_texture) +static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_count) { static const unsigned int extra_size = 0x10000; @@ -5931,9 +5932,8 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text struct wined3d_resource_desc resource_desc; struct wined3d_sub_resource_desc desc; unsigned int pitch, slice_pitch; - unsigned int sub_resource_idx; HRESULT hr = WINED3D_OK; - unsigned int offset; + unsigned int offset, i; wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &resource_desc); if (!(texture->texture_memory = heap_alloc_zero(resource_desc.size + extra_size))) @@ -5944,13 +5944,18 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text TRACE("texture->texture_memory %p.\n", texture->texture_memory); offset = 0; - sub_resource_idx = 0; - while (wined3d_texture_get_sub_resource_desc(wined3d_texture, sub_resource_idx, &desc) - == WINED3D_OK) + for (i = 0; i < sub_resource_count; ++i) { - wined3d_texture_get_pitch(wined3d_texture, sub_resource_idx, &pitch, &slice_pitch); + if (FAILED(hr = wined3d_texture_get_sub_resource_desc(wined3d_texture, i, &desc))) + { + ERR("Subresource %u not found.\n", i); + heap_free(texture->texture_memory); + texture->texture_memory = NULL; + return hr; + } + wined3d_texture_get_pitch(wined3d_texture, i, &pitch, &slice_pitch); - if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, sub_resource_idx, + if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, i, desc.width, desc.height, resource_desc.format, desc.multisample_type, desc.multisample_quality, (BYTE *)texture->texture_memory + offset, pitch))) @@ -5959,7 +5964,6 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text texture->texture_memory = NULL; break; } - ++sub_resource_idx; offset += desc.size; } return hr; @@ -6641,7 +6645,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ && desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY && wined3d_display_mode_format.u1.dwRGBBitCount <= 16; - if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture))) + if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, layers * levels))) { ERR("Failed to reserve surface memory, hr %#x.\n", hr); goto fail; @@ -6700,7 +6704,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCBLT, (struct wined3d_color_key *)&desc->ddckCKSrcBlt); - if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture))) + if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, 1))) { hr = hr_ddraw_from_wined3d(hr); goto fail;

1 0

Hugh McMaster : conhost: Process Ctrl-M key input.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 12cf3459b5ae561f012b4c47dd4775c428d026e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cf3459b5ae561f012b4c47… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 14 22:43:15 2021 +1100 conhost: Process Ctrl-M key input. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50526 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05447d52dd5..94dd050fd2f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1129,6 +1129,7 @@ static const struct edit_line_key_entry win32_key_map_ctrl[] = { VK_RIGHT, edit_line_move_right_word }, { VK_END, edit_line_kill_suffix }, { VK_HOME, edit_line_kill_prefix }, + { 'M', edit_line_done }, { 0 } };

1 0

Chilung Chan : xcopy: Add /k in Syntax message of STRING_HELP string.
by Alexandre Julliard 14 Dec '21

14 Dec '21

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 3a7d9445e554858af510a0f66404b2ef4cf08b4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7d9445e554858af510a0f6… Author: Chilung Chan <eason066(a)gmail.com> Date: Mon Dec 13 14:05:24 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 96 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 104cd493c8e..33e01c8f1c1 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-12-13 13: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?" @@ -4334,11 +4334,11 @@ msgstr "找不到程序。\n" #: dlls/kernel32/winerror.mc:508 msgid "No children to wait for.\n" -msgstr "沒有要等待的子行程。\n" +msgstr "沒有要等待的子處理程序。\n" #: dlls/kernel32/winerror.mc:513 msgid "Child process has not completed.\n" -msgstr "子行程還未完成。\n" +msgstr "子處理程序還未完成。\n" #: dlls/kernel32/winerror.mc:518 msgid "Invalid use of direct access handle.\n" @@ -4686,7 +4686,7 @@ msgstr "旗號太多貼文。\n" #: dlls/kernel32/winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" -msgstr "讀取/寫入行程記憶體已部分完成。\n" +msgstr "Read/WriteProcessMemory 已部分完成。\n" #: dlls/kernel32/winerror.mc:958 msgid "The oplock wasn't granted.\n" @@ -4894,7 +4894,7 @@ msgstr "服務限定的錯誤。\n" #: dlls/kernel32/winerror.mc:1213 msgid "Process aborted.\n" -msgstr "行程已取消。\n" +msgstr "處理程序已取消。\n" #: dlls/kernel32/winerror.mc:1218 msgid "Service dependency failed.\n" @@ -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" @@ -16557,60 +16563,60 @@ msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "用法：taskkill [/?] [/f] [/im 行程名稱 | /pid 行程識別號]\n" +msgstr "用法: taskkill [/?] [/f] [/im 處理程序名稱 | /pid 處理程序 ID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "錯誤：指定了不明或無效的命令列選項。\n" +msgstr "錯誤: 指定了不明或無效的命令列選項。\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "錯誤：指定了無效的命令列參數。\n" +msgstr "錯誤: 指定了無效的命令列參數。\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "錯誤：選項 /im 或 /pid 之一必須被指定。\n" +msgstr "錯誤: 必須指定選項 /im 或 /pid 的其中之一。\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "錯誤：選項 %1 預期有一個命令列參數。\n" +msgstr "錯誤: 選項 %1 需要一個命令列參數。\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "錯誤：選項 /im 和 /pid 彼此互斥。\n" +msgstr "錯誤: 選項 /im 和 /pid 彼此互斥。\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" -msgstr "已發送關閉訊息給具有 PID %1!u! 的行程的最上層視窗。\n" +msgstr "已將關閉訊息發送到處理程序 PID %1!u! 的最上層視窗。\n" #: programs/taskkill/taskkill.rc:37 msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" -msgstr "已發送關閉訊息給具有 PID %2!u! 的行程 %1 的最上層視窗。\n" +msgstr "已將關閉訊息發送到處理程序 '%1' (PID %2!u!) 的最上層視窗。\n" #: programs/taskkill/taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "具有 PID %1!u! 的行程已被強制終止。\n" +msgstr "處理程序 PID %1!u! 已被強制終止。\n" #: programs/taskkill/taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "具有 PID %2!u! 的行程 %1 已被強制終止。\n" +msgstr "處理程序 '%1' (PID: %2!u!) 已被強制終止。\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 找不到處理程序 %1。\n" #: programs/taskkill/taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "錯誤：無法列舉行程清單。\n" +msgstr "錯誤: 無法列舉處理程序清單。\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "錯誤：無法終止行程 %1。\n" +msgstr "錯誤: 無法終止處理程序 %1。\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "錯誤：不允許行程自我終止。\n" +msgstr "錯誤: 處理程序不允許自我終止。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -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"

1 0

Paul Gofman : ntdll: Add stub for NtSetDebugFilterState().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: e36c6f04ce3d25ef6cfd4203aadaf3cee044e642 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36c6f04ce3d25ef6cfd4203… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 14 00:30:25 2021 +0300 ntdll: Add stub for NtSetDebugFilterState(). Eternal Return benefited from this function present as .spec file stub which was removed by 52202224d9ab8316896370db2af6399a5fb7b916. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f6ed7683bd..bd8e1f5efe6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long long long) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 26e7decc059..0024d494c43 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -343,3 +343,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8f20da7eece..10884a7a673 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..42e852f4d28 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + return NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID);

1 0

Andrey Gusev : wmc: Fix a typo in a comment.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 6f1b78b537bbd6f897f30fdf1b5a66e42c5b819f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1b78b537bbd6f897f30fdf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 14 12:49:00 2021 +0200 wmc: Fix a typo in a comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/write.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wmc/write.h b/tools/wmc/write.h index 8451e0b7950..964059a1c04 100644 --- a/tools/wmc/write.h +++ b/tools/wmc/write.h @@ -1,5 +1,5 @@ /* - * Wine Message Compiler outpur generation + * Wine Message Compiler output generation * * Copyright 2000 Bertho A. Stultiens (BS) *

1 0

Andrey Gusev : hlink/tests: Fix a typo in a comment.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 58980a4e20572d4a5c497be86f203db12673e303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58980a4e20572d4a5c497be8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 14 12:48:23 2021 +0200 hlink/tests: Fix a typo in a comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index ccbbd889d5c..c905093bd86 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -183,7 +183,7 @@ static void test_reference(void) ok(r == S_OK, "failed\n"); ok(str == NULL, "string should be null\n"); - /* Unimplented functions checks */ + /* Unimplemented functions checks */ r = IHlink_GetAdditionalParams(lnk, NULL); ok(r == E_NOTIMPL, "failed\n");

1 0

Zebediah Figura : winegstreamer: Acquire all of the flushing locks in GST_Seeking_SetPositions().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: fa3fa0e3d5ee2d7e3a6afc67997a38c2fae6e8dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa3fa0e3d5ee2d7e3a6afc67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 13 18:06:04 2021 -0600 winegstreamer: Acquire all of the flushing locks in GST_Seeking_SetPositions(). The current code unintentionally repeatedly acquires the lock for the stream currently being seeked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50906 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index cf284cda668..8532fc1af8b 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1327,8 +1327,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, * ensures the seek is serialized between flushes. */ for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - EnterCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + EnterCriticalSection(&flush_pin->flushing_cs); } SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); @@ -1342,8 +1344,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - IPin_EndFlush(filter->sources[i]->pin.pin.peer); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + IPin_EndFlush(flush_pin->pin.pin.peer); } if (filter->reader) @@ -1353,8 +1357,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, /* Release the flushing locks. */ for (i = filter->source_count - 1; i >= 0; --i) { - if (filter->sources[i]->pin.pin.peer) - LeaveCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + LeaveCriticalSection(&flush_pin->flushing_cs); } return S_OK;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021