Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/03: [NTOS] Fixes for NtDisplayString().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03873aeef396eca773283… commit 03873aeef396eca773283a71257967b8c0ec7b4b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 20 03:32:08 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 20 03:47:36 2018 +0100 [NTOS] Fixes for NtDisplayString(). - Require the user to have TCB privilege for using this function. - Probe and capture the user-provided string (and avoid usermode-triggered BSODS ;-) - Allocate the OEM-converted string in *NonPagedPool* because we are going to transmit the buffer to BOOTVID. --- ntoskrnl/inbv/inbv.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index cb6af3e4bf..75825d0aa2 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -5,6 +5,10 @@ #include <debug.h> #include "bootvid/bootvid.h" +#ifndef TAG_OSTR +#define TAG_OSTR 'RTSO' +#endif + /* GLOBALS *******************************************************************/ /* @@ -771,15 +775,62 @@ NTSTATUS NTAPI NtDisplayString(IN PUNICODE_STRING DisplayString) { + NTSTATUS Status; + UNICODE_STRING CapturedString; OEM_STRING OemString; + KPROCESSOR_MODE PreviousMode; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + /* We require the TCB privilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + return STATUS_PRIVILEGE_NOT_HELD; + + /* Capture the string */ + Status = ProbeAndCaptureUnicodeString(&CapturedString, PreviousMode, DisplayString); + if (!NT_SUCCESS(Status)) + return Status; + + /* Do not display the string if it is empty */ + if (CapturedString.Length == 0 || CapturedString.Buffer == NULL) + { + Status = STATUS_SUCCESS; + goto Quit; + } - /* Convert the string to OEM and display it */ - RtlUnicodeStringToOemString(&OemString, DisplayString, TRUE); + /* + * Convert the string since INBV understands only ANSI/OEM. Allocate the + * string buffer in non-paged pool because INBV passes it down to BOOTVID. + * We cannot perform the allocation using RtlUnicodeStringToOemString() + * since its allocator uses PagedPool. + */ + RtlInitEmptyAnsiString((PANSI_STRING)&OemString, NULL, + RtlUnicodeStringToOemSize(&CapturedString)); + OemString.Buffer = ExAllocatePoolWithTag(NonPagedPool, + OemString.MaximumLength, + TAG_OSTR); + if (OemString.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Quit; + } + RtlUnicodeStringToOemString(&OemString, &CapturedString, FALSE); + + /* Display the string */ InbvDisplayString(OemString.Buffer); - RtlFreeOemString(&OemString); - /* Return success */ - return STATUS_SUCCESS; + /* Free the string buffer */ + ExFreePoolWithTag(OemString.Buffer, TAG_OSTR); + + Status = STATUS_SUCCESS; + +Quit: + /* Free the captured string */ + ReleaseCapturedUnicodeString(&CapturedString, PreviousMode); + + return Status; } #ifdef INBV_ROTBAR_IMPLEMENTED

5 years, 9 months

[reactos] 01/01: [TRANSLATION] Update Traditional Chinese translation. (#1166)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25d076789a21a7937b408… commit 25d076789a21a7937b408c4ef6632fed4d2a9526 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Thu Dec 20 10:25:12 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 20 03:25:12 2018 +0100 [TRANSLATION] Update Traditional Chinese translation. (#1166) Translations for DESK, HDWWIZ, SYSDM, TIMEDATE and BROWSEUI. If any Taiwanese contributors are present, please help improving the translations! --- dll/cpl/desk/lang/zh-TW.rc | 33 ++++++++------- dll/cpl/hdwwiz/lang/zh-TW.rc | 91 ++++++++++++++++++++-------------------- dll/cpl/sysdm/lang/zh-TW.rc | 20 ++++----- dll/cpl/timedate/lang/zh-TW.rc | 30 ++++++------- dll/win32/browseui/lang/zh-TW.rc | 52 +++++++++++------------ 5 files changed, 114 insertions(+), 112 deletions(-) diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 3254325b61..1f35df64e9 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -1,4 +1,5 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -19,11 +20,11 @@ END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "螢幕保護程式" +CAPTION "螢幕保護裝置" FONT 9, "新細明體", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "螢幕保護程式(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "螢幕保護裝置(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "設定(&T)...", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "預覽(&V)", IDC_SCREENS_TESTSC, 175, 102, 50, 15 @@ -35,7 +36,7 @@ BEGIN CONTROL "密碼保護(&P)", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "監視器的節能特徵(&E)", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 - LTEXT "要修改監視器的電源設定，請單擊“電源”。", IDC_STATIC, 16, 161, 146, 27 + LTEXT "要修改監視器的電源設定，請按 [電源]。", IDC_STATIC, 16, 161, 146, 27 PUSHBUTTON "電源(&O)...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 END @@ -55,13 +56,13 @@ BEGIN COMBOBOX IDC_APPEARANCE_SIZE, 7, 194, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "效果(&E)...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "高階(&D)", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "進階(&D)", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "高階外觀" +CAPTION "進階外觀" FONT 9, "新細明體" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -135,7 +136,7 @@ BEGIN GROUPBOX "顏色(&C)", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 - PUSHBUTTON "高階(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 + PUSHBUTTON "進階(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -148,21 +149,21 @@ BEGIN COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "相容性", -1, 7, 67, 237, 97 - LTEXT "如果在更改顏色設定後不立即重新啟動計算機，某些程式可能無法正常工作。\r\n\n更改顯示設定後:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "在應用新的顯示設定之前重新啟動計算機(&R)", IDC_RESTART_RB, 14, 116, 228, 10 - AUTORADIOBUTTON "應用新的顯示設定而不重新啟動計算機(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + LTEXT "如果在更改顏色設定後不立即重新啟動電腦，某些程式可能無法正常工作。\r\n\n更改顯示設定後:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "在應用新的顯示設定之前重新啟動電腦(&R)", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "應用新的顯示設定而不重新啟動電腦(&P)", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "在應用新的顯示設定之前詢問(&K)", IDC_ASKME_RB, 14, 146, 228, 10 END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" +CAPTION "顯示設定" FONT 8, "新細明體" BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "您是否想要保留顯示設定?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "是(&Y)", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "否(&N)", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -193,7 +194,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "標準" - IDS_CLEARTYPEEFFECT "FreeType Antialiased" + IDS_CLEARTYPEEFFECT "FreeType 消除鋸齒" END STRINGTABLE @@ -210,7 +211,7 @@ BEGIN IDS_NONE "(無)" IDS_CENTER "居中" IDS_STRETCH "拉伸" - IDS_TILE "平鋪" + IDS_TILE "並排" IDS_FIT "Fit" IDS_FILL "Fill" END @@ -269,5 +270,5 @@ BEGIN IDS_DISPLAY_SETTINGS "顯示設定" IDS_APPLY_FAILED "應用新設定失敗..." IDS_APPLY_NEEDS_RESTART "需要重新啟動計算機使更改生效。" - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." + IDS_TIMEOUTTEXT "在 %d 內還原設定。" END diff --git a/dll/cpl/hdwwiz/lang/zh-TW.rc b/dll/cpl/hdwwiz/lang/zh-TW.rc index 1113391879..49fadd63e5 100644 --- a/dll/cpl/hdwwiz/lang/zh-TW.rc +++ b/dll/cpl/hdwwiz/lang/zh-TW.rc @@ -1,28 +1,29 @@ /* * (Traditional Chinese resources) - * (繁体中文资源) + * (繁體中文資源) * by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) + * Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "歡迎使用添加硬體嚮導", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "這個嚮導幫助您:", -1, 114, 40, 182, 8 - LTEXT "1) 安裝軟體來支援添加到計算機的硬體。", -1, 121, 56, 184, 16 + LTEXT "歡迎使用新增硬體精靈", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "這個精靈幫助您:", -1, 114, 40, 182, 8 + LTEXT "1) 安裝軟體來支援添加到電腦的硬體。", -1, 121, 56, 184, 16 LTEXT "2) 解決您的硬體問題。", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "如果硬體帶安裝 CD，建議您單擊“取消”，關閉這個嚮導，用製造商的 CD 來安裝這個硬體。", 503, 150, 106, 155, 50 - LTEXT "要繼續，請單擊“下一步”。", -1, 114, 166, 193, 8 + LTEXT "如果硬體帶安裝 CD，建議您按 [取消]，關閉這個精靈，用製造商的 CD 來安裝這個硬體。", 503, 150, 106, 155, 50 + LTEXT "要繼續，請按 [下一步]。", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -31,52 +32,52 @@ END IDD_ISCONNECTEDPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "您是否已將這個硬體跟計算機連線?", -1, 20, 11, 275, 8 + LTEXT "您是否已將這個硬體跟電腦連線?", -1, 20, 11, 275, 8 AUTORADIOBUTTON "是，硬體已連線好(&Y)", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP AUTORADIOBUTTON "否，尚未添加硬體(&N)", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "從以下列表，選擇一個已安裝的硬體裝置，然後單擊“下一步”，檢查屬性或解決您遇到的問題。", -1, 21, 8, 275, 22 - LTEXT "要添加列表中沒有顯示的硬體，請單擊“添加新的硬體裝置”。", -1, 21, 32, 275, 24 + LTEXT "從以下清單中選擇一個已安裝的硬體裝置，然後單擊 [下一步]，檢查內容或解決您遇到的問題。", -1, 21, 8, 275, 22 + LTEXT "要添加列表中沒有顯示的硬體，請單擊 [添加新的硬體裝置]。", -1, 21, 32, 275, 24 LTEXT "已安裝的硬體(&N):", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "這個嚮導可以搜索其他硬體併為您自動安裝。或者，如果您知道要安裝哪個型號的硬體，您可以從列表選擇。", -1, 21, 8, 280, 24 - LTEXT "您期望嚮導做什麼?", -1, 23, 40, 275, 8 + LTEXT "這個嚮導可以搜索其他硬體併為您自動安裝。或者，如果您知道要安裝哪個型號的硬體，您可以從清單選擇。", -1, 21, 8, 280, 24 + LTEXT "您期望精靈做什麼?", -1, 23, 40, 275, 8 AUTORADIOBUTTON "搜索並自動安裝硬體(推薦)(&S)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "安裝我手動從列表選擇的硬體(高階)(&M)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + AUTORADIOBUTTON "安裝我手動從清單選擇的硬體(進階)(&M)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "檢測到的硬體:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "偵測到的硬體:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "如果看不到想要的硬體類別，請單擊“顯示所有裝置”。", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "如果看不到想要的硬體類別，請按 [顯示所有裝置]。", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "常見硬體類型(&H):", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END @@ -86,7 +87,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "添加硬體嚮導" FONT 9, "新細明體" BEGIN - LTEXT "可能需要幾分鐘的時間來查找硬體。", -1, 21, 8, 275, 15 + LTEXT "可能需要幾分鐘的時間來搜尋硬體。", -1, 21, 8, 275, 15 LTEXT "整個進度:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX @@ -95,59 +96,59 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "正在完成添加硬體嚮導", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "您已成功完成添加硬體嚮導。", -1, 114, 32, 193, 19 + LTEXT "正在完成新增硬體精靈", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "您已成功完成新增硬體精靈。", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "要關閉這個嚮導，請單擊“完成”。", -1, 114, 166, 132, 8 + LTEXT "要關閉這個精靈，請按 [完成]。", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN LTEXT "正在完成添加硬體嚮導", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "安裝了下列硬體:", -1, 114, 32, 193, 19 - LTEXT "要關閉這個嚮導，請單擊“完成”。", -1, 114, 166, 132, 8 + LTEXT "要關閉這個嚮導，請按 [完成]。", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN - LTEXT "正在完成添加硬體嚮導", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "正在完成新增硬體精靈", IDC_FINISHTITLE, 114, 8, 195, 28 LTEXT "這裡是您所選硬體的當前狀態:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "要啟用可以幫助您解決問題的疑難解答，請單擊“完成”。", -1, 114, 136, 193, 16 - LTEXT "要退出這個嚮導，請單擊“取消”。", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "要啟用可以幫助您解決問題的疑難解答，請按 [完成]。", -1, 114, 136, 193, 16 + LTEXT "要退出這個嚮導，請按 [取消]。", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "添加硬體嚮導" +CAPTION "新增硬體精靈" FONT 9, "新細明體" BEGIN LTEXT "無法繼續添加硬體嚮導", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "要繼續，請將這個硬體跟計算機連線。", -1, 114, 40, 193, 16 - AUTOCHECKBOX "單擊“完成”時關閉計算機；這樣，我可以開啟計算機並連線硬體(&T)。", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "在大多數情況下，ReactOS 在硬體跟計算機連線後自動將其安裝。如果 ReactOS 找不到這個硬體，您可以重新開啟這個嚮導，安裝支援軟體。", -1, 114, 98, 193, 32 - LTEXT "要關閉這個嚮導，請單擊“完成”。", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "要繼續，請將這個硬體跟電腦連線。", -1, 114, 40, 193, 16 + AUTOCHECKBOX "點選 [完成] 時關閉電腦；這樣，我可以開啟電腦並連線硬體(&T)。", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "在大多數情況下，ReactOS 在硬體和電腦連線後自動將其安裝。如果 ReactOS 找不到這個硬體，您可以重新開啟這個嚮導，安裝支援軟體。", -1, 114, 98, 193, 32 + LTEXT "要關閉這個嚮導，請按 [完成]。", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN - IDS_CPLNAME "添加硬體" - IDS_CPLDESCRIPTION "為計算機添加新硬體" - IDS_SEARCHTITLE "嚮導正在搜索，請稍候..." - IDS_SEARCHTEXT "嚮導正在搜索最近連線到計算機但尚未安裝的硬體。" - IDS_ISCONNECTED "硬體已經與計算機連線了嗎?" - IDS_PROBELISTTITLE "以下硬體已安裝在您的計算機上" + IDS_CPLNAME "新增硬體" + IDS_CPLDESCRIPTION "為電腦添加新硬體" + IDS_SEARCHTITLE "正在搜尋，請稍候..." + IDS_SEARCHTEXT "精靈正在搜索最近連線到電腦但尚未安裝的硬體。" + IDS_ISCONNECTED "硬體已經與電腦連線了嗎?" + IDS_PROBELISTTITLE "以下硬體已安裝在您的電腦上" IDS_ADDNEWDEVICE "添加一個新硬體裝置" - IDS_SELECTWAYTITLE "此嚮導可以幫助您安裝其它硬體" - IDS_HDTYPESTITLE "從以下列表，選擇要安裝的硬體類型" + IDS_SELECTWAYTITLE "此精靈可以幫助您安裝其它硬體" + IDS_HDTYPESTITLE "從以下清單中選擇要安裝的硬體類型" END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 8311ba0f66..11cf4f0905 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -22,7 +22,7 @@ BEGIN LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 - CONTROL "請訪問<A HREF=""http://www.reactos.org/"">ReactOS 主頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 + CONTROL "請訪問<A HREF=""http://www.reactos.org/"">ReactOS 首頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "查看著作權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15 END @@ -55,7 +55,7 @@ BEGIN LTEXT "性能選項控制應用程序如何使用內存。這將會影響到電腦運行速度。", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "設定", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "使用者設定檔", IDC_STATIC, 6, 75, 244, 48 - LTEXT "與您登陸相關的桌面設定", IDC_STATIC, 16, 88, 228, 20 + LTEXT "與您登入時相關的桌面設定", IDC_STATIC, 16, 88, 228, 20 PUSHBUTTON "設定", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "啓動和故障恢復", IDC_STATIC, 6, 131, 244, 52 LTEXT "啓動和故障恢複選項指定電腦如何啓動並設定系統失敗時所需要採取的動作。", IDC_STATIC, 16, 144, 228, 19 @@ -70,8 +70,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "系統設定" FONT 9, "新細明體", 0, 0, 0x1 BEGIN - GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 - LTEXT "ReactOS 建作伺服器作業系統並這樣被報告。選中此框可變更(僅對應用程式有效)。", IDC_STATIC, 15, 15, 183, 41 + GROUPBOX "版本資訊", IDC_STATIC, 6, 3, 210, 73 + LTEXT "ReactOS 作為伺服器作業系統建立並這樣被報告。選中此框可變更(僅對應用程式有效)。", IDC_STATIC, 15, 15, 183, 41 CONTROL "作爲工作站報告", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "確定", IDOK, 166, 83, 50, 14 END @@ -115,7 +115,7 @@ BEGIN LTEXT "序列號：", IDC_STATIC, 10, 55, 52, 8 LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 - AUTOCHECKBOX "這是一臺便攜式電腦(&P)", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP + AUTOCHECKBOX "這是一台便攜式電腦(&P)", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "插接狀態未知(&S)", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "電腦被插接(&D)", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 AUTORADIOBUTTON "電腦未插接(&U)", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 @@ -155,7 +155,7 @@ CAPTION "使用者設定" FONT 9, "新細明體" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "用戶設定檔保存桌面設定和其他與您的用戶帳戶有關的信息。可在您使用的每臺電腦上創建不同的設定檔，或選定一個漫遊設定檔用在您使用的每臺電腦上。", IDC_STATIC, 40, 11, 211, 35 + LTEXT "使用者設定檔保存桌面設定和其他與您的使用者帳戶有關的信息。可在您使用的每臺電腦上創建不同的設定檔，或選定一個漫遊設定檔用在您使用的每臺電腦上。", IDC_STATIC, 40, 11, 211, 35 LTEXT "儲存在本機上的設定檔:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE @@ -176,7 +176,7 @@ BEGIN GROUPBOX "系統啓動", IDC_STATIC, 7, 12, 238, 95 LTEXT "默認操作系統(&S):", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "顯示操作系統列表的時間(&T):", IDC_STRECLIST, 14, 56, 160, 8 + AUTOCHECKBOX "顯示作業系統清單的時間(&T):", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 @@ -186,7 +186,7 @@ BEGIN CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "秒", IDC_STATIC, 223, 70, 18, 8 - LTEXT "要手動編輯啓動選項，請單擊“編輯”。", IDC_STATIC, 14, 89, 187, 8 + LTEXT "要手動編輯啓動選項，請選擇 [編輯]。", IDC_STATIC, 14, 89, 187, 8 PUSHBUTTON "秒", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "系統失敗", IDC_STATIC, 7, 111, 238, 140 AUTOCHECKBOX "將事件寫入系統日誌(&W)", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 @@ -196,7 +196,7 @@ BEGIN COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST LTEXT "轉儲文件(&F):", IDC_STATIC, 17, 202, 150, 8 EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12, ES_AUTOHSCROLL - AUTOCHECKBOX "覆蓋任何現有文件(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + AUTOCHECKBOX "覆寫任何現有文件(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 DEFPUSHBUTTON "確定", IDOK, 141, 258, 50, 15 PUSHBUTTON "取消", IDCANCEL, 195, 258, 50, 15 END @@ -305,7 +305,7 @@ BEGIN IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁盤上的可用空間。" IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理" - IDS_INFOREBOOT "您必須重新啓動電腦，才能應用更改。" + IDS_INFOREBOOT "您必須重新啓動電腦，才能套用更改。" IDS_DEVS "\nReactOS 團隊\n\n項目協調員\n\nAleksey Bragin\n\n開發團隊\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKata [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "確認設定檔刪除" IDS_HWPROFILE_CONFIRM_DELETE "你確定你想要刪除的硬件設定檔？ ""%s""?" diff --git a/dll/cpl/timedate/lang/zh-TW.rc b/dll/cpl/timedate/lang/zh-TW.rc index 5784606426..125212cfe0 100644 --- a/dll/cpl/timedate/lang/zh-TW.rc +++ b/dll/cpl/timedate/lang/zh-TW.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "时间和日期" +CAPTION "時間和日期" FONT 9, "新細明體", 0, 0, 0x0 BEGIN GROUPBOX "日期(&D)", -1, 4, 2, 122, 125 @@ -13,7 +13,7 @@ BEGIN CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 11, 37, 108, 80, WS_EX_CLIENTEDGE - GROUPBOX "时间(&T)", -1, 132, 2, 113, 125 + GROUPBOX "時間(&T)", -1, 132, 2, 113, 125 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 CONTROL "", IDC_CLOCKWND, "ClockWndClass", WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 @@ -21,39 +21,39 @@ END IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "时区" +CAPTION "時區" FONT 9, "新細明體", 0, 0, 0x0 BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "根据夏时制自动调节时钟(&U)", + AUTOCHECKBOX "根據夏時制自動調節時鐘(&U)", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "互联网时间" +CAPTION "網際網路時間" FONT 9, "新細明體", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "自动与互联网时间服务器同步(&S)", + AUTOCHECKBOX "自動與網際網路時間伺服器同步(&S)", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - LTEXT "服务器:", IDC_SERVERTEXT, 34, 22, 28, 13 + LTEXT "伺服器:", IDC_SERVERTEXT, 34, 22, 28, 13 PUSHBUTTON "立即更新(&U)", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "同步只有在您的计算机与互联网连接时才能进行。", -1, 12, 114, 225, 25 + LTEXT "同步只有在您的電腦與網際網路連接時才能進行。", -1, 12, 114, 225, 25 END STRINGTABLE BEGIN - IDS_CPLNAME "日期和时间" - IDS_CPLDESCRIPTION "请为您的计算机设置日期、时间和时区信息" - IDS_TIMEZONETEXT "当前时区: %s" - IDS_TIMEZONEINVALID "无效的" + IDS_CPLNAME "日期和時間" + IDS_CPLDESCRIPTION "請為您的計算機設置日期、時間和時區信息" + IDS_TIMEZONETEXT "當前時區: %s" + IDS_TIMEZONEINVALID "無效的" IDS_TIMEZONEUNKNOWN "未知" - IDS_INETTIMESUCSYNC "时间已成功同步，在 %s 在 %s 在 %s" + IDS_INETTIMESUCSYNC "時間已成功同步，在 %s 在 %s 在 %s" IDS_INETTIMENEXTSYNC "下次同步:%s 在 %s" - IDS_INETTIMESYNCING "请等待，ReactOS 正在同步 %s" - IDS_INETTIMEERROR "在 ReactOS 同步时发生了一个错误。%s" + IDS_INETTIMESYNCING "請等待，ReactOS 正在同步 %s" + IDS_INETTIMEERROR "在 ReactOS 同步時發生了一個錯誤。%s" END diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 199879edba..a96a59b7e4 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -30,8 +30,8 @@ BEGIN MENUITEM "位址列(&A)", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED MENUITEM "連結(&L)", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "鎖定工具欄(&B)", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED - MENUITEM "自定義...(&C)", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "鎖定工具列(&B)", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED + MENUITEM "自訂...(&C)", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED MENUITEM "文字標籤(&T)", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED MENUITEM "轉到按鈕(&G)", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED END @@ -98,32 +98,32 @@ END IDM_TASKBAR_TOOLBARS MENUEX BEGIN - POPUP "工具欄(&T)", -1, MFT_STRING, MFS_ENABLED, 0 + POPUP "工具列(&T)", -1, MFT_STRING, MFS_ENABLED, 0 BEGIN MENUITEM "桌面(&D)", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING MENUITEM "快速啟動(&Q)", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED - MENUITEM "新的工具欄...(&N)", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING + MENUITEM "新的工具列...(&N)", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING END END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w Title", IDM_BAND_TITLE - MENUITEM "&Close Toolbar", IDM_BAND_CLOSE + MENUITEM "顯示標題(&W)", IDM_BAND_TITLE + MENUITEM "選擇工具列(&C)", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "檢視(&V)", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "大圖示(&L)", IDM_LARGE_ICONS + MENUITEM "小圖示(&S)", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT + MENUITEM "開啟資料夾(&O)", IDM_OPEN_FOLDER + MENUITEM "顯示文字(&S)", IDM_SHOW_TEXT END END @@ -219,7 +219,7 @@ END STRINGTABLE BEGIN - 9250 "顯示程式資訊、版本號和版權資訊。" + 9250 "顯示程式資訊、版本號和版權資訊。" 9252 "顯示偵錯資訊。" END @@ -239,26 +239,26 @@ END STRINGTABLE BEGIN - 9505 "顯示或隱藏工具欄。" + 9505 "顯示或隱藏工具列。" 9506 "顯示或隱藏狀態列。" - 9508 "顯示標準按鈕工具欄。" + 9508 "顯示標準按鈕工具列。" 9509 "顯示位址列。" - 9510 "顯示快速連結欄。" - 9516 "鎖定的大小和位置的工具欄。" + 9510 "顯示快速連結列。" + 9516 "鎖定的大小和位置的工具列。" END STRINGTABLE BEGIN - 9533 "自定義工具欄。" + 9533 "自訂工具列。" END STRINGTABLE BEGIN - 9552 "顯示或隱藏一個瀏覽器欄。" + 9552 "顯示或隱藏一個瀏覽器列。" 9553 "顯示搜索欄。" - 9554 "顯示收藏夾欄。" - 9555 "顯示歷史記錄欄。" - 9557 "顯示資料夾欄。" + 9554 "顯示收藏夾列。" + 9555 "顯示歷史記錄列。" + 9557 "顯示資料夾列。" 9559 "顯示媒體欄。" END @@ -277,7 +277,7 @@ END STRINGTABLE BEGIN - IDS_GOBUTTONLABEL "|去||" + IDS_GOBUTTONLABEL "|移至||" IDS_GOBUTTONTIPTEMPLATE "轉到 ""%s""" END @@ -306,7 +306,7 @@ STRINGTABLE BEGIN IDS_BACK "返回到 %s" IDS_FORWARD "前進到 %s" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "資料夾選項" END STRINGTABLE @@ -316,7 +316,7 @@ END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "選擇一個資料夾" + IDS_TOOLBAR_ERR_TITLE "工具列" + IDS_TOOLBAR_ERR_TEXT "無法建立工具列" END

5 years, 9 months

[reactos] 01/01: [NETSHELL] Use distinct icon for connection status window (#1167)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1f0e89e213c0ee55fd09… commit c1f0e89e213c0ee55fd0973360d1265ed881ebd4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Dec 20 02:35:22 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 20 00:35:22 2018 +0100 [NETSHELL] Use distinct icon for connection status window (#1167) CORE-15445 --- dll/shellext/netshell/lanstatusui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 3d985e7db0..08ade893e5 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -685,7 +685,7 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { case PSCB_INITIALIZED: { - hIcon = LoadIconW(netshell_hInstance, MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER)); + hIcon = LoadIconW(netshell_hInstance, MAKEINTRESOURCEW(IDI_NET_IDLE)); SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); break; } @@ -710,7 +710,7 @@ ShowStatusPropertyDialog( pinfo.phpage = hppages; pinfo.hwndParent = hwndDlg; pinfo.hInstance = netshell_hInstance; - pinfo.pszIcon = MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER); + pinfo.pszIcon = MAKEINTRESOURCEW(IDI_NET_IDLE); pinfo.pfnCallback = PropSheetProc; if (pContext->pNet->GetProperties(&pProperties) == S_OK)

5 years, 9 months

[reactos] 01/01: [NTOSKRNL] Drop the ViewLock mutex in favour of the master spin lock

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f8b041bf06245b3278d7… commit 4f8b041bf06245b3278d7bb6723f60fe0aaec5c7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Dec 19 22:49:48 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Dec 19 22:51:45 2018 +0100 [NTOSKRNL] Drop the ViewLock mutex in favour of the master spin lock This will allow Cc calls during DPC, which is required by MS FastFAT CORE-11819 --- ntoskrnl/cc/fs.c | 15 +++-- ntoskrnl/cc/view.c | 180 ++++++++++++++++++++++++++++------------------------- 2 files changed, 101 insertions(+), 94 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index cb98eed153..e31a17b87b 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -15,8 +15,6 @@ /* GLOBALS *****************************************************************/ -extern KGUARDED_MUTEX ViewLock; - NTSTATUS CcRosInternalFreeVacb(PROS_VACB Vacb); /* FUNCTIONS *****************************************************************/ @@ -115,12 +113,13 @@ CcIsThereDirtyData ( { PROS_VACB Vacb; PLIST_ENTRY Entry; + KIRQL oldIrql; /* Assume no dirty data */ BOOLEAN Dirty = FALSE; CCTRACE(CC_API_DEBUG, "Vpb=%p\n", Vpb); - KeAcquireGuardedMutex(&ViewLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); /* Browse dirty VACBs */ for (Entry = DirtyVacbListHead.Flink; Entry != &DirtyVacbListHead; Entry = Entry->Flink) @@ -148,7 +147,7 @@ CcIsThereDirtyData ( } } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); return Dirty; } @@ -202,8 +201,8 @@ CcPurgeCacheSection ( /* Assume success */ Success = TRUE; - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); ListEntry = SharedCacheMap->CacheMapVacbListHead.Flink; while (ListEntry != &SharedCacheMap->CacheMapVacbListHead) { @@ -246,8 +245,8 @@ CcPurgeCacheSection ( RemoveEntryList(&Vacb->CacheMapVacbListEntry); InsertHeadList(&FreeList, &Vacb->CacheMapVacbListEntry); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); while (!IsListEmpty(&FreeList)) { diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d7dcfe1ff7..81a1dac801 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -45,8 +45,6 @@ LIST_ENTRY DirtyVacbListHead; static LIST_ENTRY VacbLruListHead; -KGUARDED_MUTEX ViewLock; - NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST SharedCacheMapLookasideList; static NPAGED_LOOKASIDE_LIST VacbLookasideList; @@ -135,8 +133,8 @@ CcRosTraceCacheMap ( { DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", SharedCacheMap); - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); + oldirql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; while (current_entry != &SharedCacheMap->CacheMapVacbListHead) @@ -147,8 +145,9 @@ CcRosTraceCacheMap ( DPRINT1(" VACB 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n", current, current->ReferenceCount, current->Dirty, current->PageOut ); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql); - KeReleaseGuardedMutex(&ViewLock); + + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldirql); } else { @@ -191,13 +190,14 @@ CcRosFlushDirtyPages ( PROS_VACB current; BOOLEAN Locked; NTSTATUS Status; + KIRQL OldIrql; DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target); (*Count) = 0; KeEnterCriticalRegion(); - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); current_entry = DirtyVacbListHead.Flink; if (current_entry == &DirtyVacbListHead) @@ -232,14 +232,14 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); Status = CcRosFlushVacb(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); CcRosVacbDecRefCount(current); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE) && @@ -270,7 +270,7 @@ CcRosFlushDirtyPages ( current_entry = DirtyVacbListHead.Flink; } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); KeLeaveCriticalRegion(); DPRINT("CcRosFlushDirtyPages() finished\n"); @@ -307,7 +307,7 @@ CcRosTrimCache ( *NrFreed = 0; retry: - KeAcquireGuardedMutex(&ViewLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); current_entry = VacbLruListHead.Flink; while (current_entry != &VacbLruListHead) @@ -319,7 +319,7 @@ retry: VacbLruListEntry); current_entry = current_entry->Flink; - KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&current->SharedCacheMap->CacheMapLock); /* Reference the VACB */ CcRosVacbIncRefCount(current); @@ -328,8 +328,8 @@ retry: if (InterlockedCompareExchange((PLONG)&current->MappedCount, 0, 0) > 0 && !current->Dirty) { /* We have to break these locks because Cc sucks */ - KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&current->SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); /* Page out the VACB */ for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++) @@ -340,8 +340,8 @@ retry: } /* Reacquire the locks */ - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&current->SharedCacheMap->CacheMapLock); } /* Dereference the VACB */ @@ -365,10 +365,10 @@ retry: (*NrFreed) += PagesFreed; } - KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&current->SharedCacheMap->CacheMapLock); } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); /* Try flushing pages if we haven't met our target */ if ((Target > 0) && !FlushedPages) @@ -459,8 +459,8 @@ CcRosLookupVacb ( DPRINT("CcRosLookupVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n", SharedCacheMap, FileOffset); - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; while (current_entry != &SharedCacheMap->CacheMapVacbListHead) @@ -473,8 +473,8 @@ CcRosLookupVacb ( FileOffset)) { CcRosVacbIncRefCount(current); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); return current; } if (current->FileOffset.QuadPart > FileOffset) @@ -482,8 +482,8 @@ CcRosLookupVacb ( current_entry = current_entry->Flink; } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); return NULL; } @@ -498,8 +498,8 @@ CcRosMarkDirtyVacb ( SharedCacheMap = Vacb->SharedCacheMap; - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); ASSERT(!Vacb->Dirty); @@ -514,11 +514,9 @@ CcRosMarkDirtyVacb ( Vacb->Dirty = TRUE; - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); /* Schedule a lazy writer run to now that we have dirty VACB */ - oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (!LazyWriter.ScanActive) { CcScheduleLazyWriteScan(FALSE); @@ -539,8 +537,8 @@ CcRosUnmarkDirtyVacb ( if (LockViews) { - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); } ASSERT(Vacb->Dirty); @@ -555,8 +553,8 @@ CcRosUnmarkDirtyVacb ( if (LockViews) { - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); } } @@ -702,7 +700,7 @@ CcRosFreeUnusedVacb ( Freed = FALSE; InitializeListHead(&FreeList); - KeAcquireGuardedMutex(&ViewLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); /* Browse all the available VACB */ current_entry = VacbLruListHead.Flink; @@ -715,7 +713,7 @@ CcRosFreeUnusedVacb ( VacbLruListEntry); current_entry = current_entry->Flink; - KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&current->SharedCacheMap->CacheMapLock); /* Only deal with unused VACB, we will free them */ Refs = CcRosVacbGetRefCount(current); @@ -732,11 +730,11 @@ CcRosFreeUnusedVacb ( InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); } - KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&current->SharedCacheMap->CacheMapLock); } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); /* And now, free any of the found VACB, that'll free memory! */ while (!IsListEmpty(&FreeList)) @@ -837,7 +835,7 @@ Retry: return Status; } - KeAcquireGuardedMutex(&ViewLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); *Vacb = current; /* There is window between the call to CcRosLookupVacb @@ -845,7 +843,7 @@ Retry: * file offset exist. If there is a VACB, we release * our newly created VACB and return the existing one. */ - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); current_entry = SharedCacheMap->CacheMapVacbListHead.Flink; previous = NULL; while (current_entry != &SharedCacheMap->CacheMapVacbListHead) @@ -858,7 +856,7 @@ Retry: FileOffset)) { CcRosVacbIncRefCount(current); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); #if DBG if (SharedCacheMap->Trace) { @@ -868,7 +866,7 @@ Retry: current); } #endif - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); Refs = CcRosVacbDecRefCount(*Vacb); ASSERT(Refs == 0); @@ -896,9 +894,9 @@ Retry: { InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); MI_SET_USAGE(MI_USAGE_CACHE); #if MI_TRACE_PFNS @@ -938,6 +936,7 @@ CcRosGetVacb ( PROS_VACB current; NTSTATUS Status; ULONG Refs; + KIRQL OldIrql; ASSERT(SharedCacheMap); @@ -961,13 +960,13 @@ CcRosGetVacb ( Refs = CcRosVacbGetRefCount(current); - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); /* Move to the tail of the LRU list */ RemoveEntryList(&current->VacbLruListEntry); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); /* * Return information about the VACB to the caller. @@ -1150,7 +1149,8 @@ NTSTATUS NTAPI CcRosDeleteFileCache ( PFILE_OBJECT FileObject, - PROS_SHARED_CACHE_MAP SharedCacheMap) + PROS_SHARED_CACHE_MAP SharedCacheMap, + PKIRQL OldIrql) /* * FUNCTION: Releases the shared cache map associated with a file object */ @@ -1158,41 +1158,38 @@ CcRosDeleteFileCache ( PLIST_ENTRY current_entry; PROS_VACB current; LIST_ENTRY FreeList; - KIRQL oldIrql; ASSERT(SharedCacheMap); SharedCacheMap->OpenCount++; - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, *OldIrql); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - KeAcquireGuardedMutex(&ViewLock); + *OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); SharedCacheMap->OpenCount--; if (SharedCacheMap->OpenCount == 0) { - KIRQL OldIrql; - FileObject->SectionObjectPointer->SharedCacheMap = NULL; /* * Release all VACBs */ InitializeListHead(&FreeList); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead)) { current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); RemoveEntryList(&current->VacbLruListEntry); InitializeListHead(&current->VacbLruListEntry); if (current->Dirty) { - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); CcRosUnmarkDirtyVacb(current, FALSE); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); DPRINT1("Freeing dirty VACB\n"); } if (current->MappedCount != 0) @@ -1203,14 +1200,14 @@ CcRosDeleteFileCache ( } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); } #if DBG SharedCacheMap->Trace = FALSE; #endif - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, *OldIrql); ObDereferenceObject(SharedCacheMap->FileObject); while (!IsListEmpty(&FreeList)) @@ -1249,12 +1246,12 @@ CcRosDeleteFileCache ( #endif } - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + *OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); RemoveEntryList(&SharedCacheMap->SharedCacheMapLinks); - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + KeReleaseQueuedSpinLock(LockQueueMasterLock, *OldIrql); ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); - KeAcquireGuardedMutex(&ViewLock); + *OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); } return STATUS_SUCCESS; } @@ -1265,12 +1262,14 @@ CcRosReferenceCache ( PFILE_OBJECT FileObject) { PROS_SHARED_CACHE_MAP SharedCacheMap; - KeAcquireGuardedMutex(&ViewLock); + KIRQL OldIrql; + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); ASSERT(SharedCacheMap->OpenCount != 0); SharedCacheMap->OpenCount++; - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } VOID @@ -1279,14 +1278,16 @@ CcRosRemoveIfClosed ( PSECTION_OBJECT_POINTERS SectionObjectPointer) { PROS_SHARED_CACHE_MAP SharedCacheMap; + KIRQL OldIrql; + DPRINT("CcRosRemoveIfClosed()\n"); - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); SharedCacheMap = SectionObjectPointer->SharedCacheMap; if (SharedCacheMap && SharedCacheMap->OpenCount == 0) { - CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap); + CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap, &OldIrql); } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } @@ -1296,7 +1297,9 @@ CcRosDereferenceCache ( PFILE_OBJECT FileObject) { PROS_SHARED_CACHE_MAP SharedCacheMap; - KeAcquireGuardedMutex(&ViewLock); + KIRQL OldIrql; + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); if (SharedCacheMap->OpenCount > 0) @@ -1304,11 +1307,17 @@ CcRosDereferenceCache ( SharedCacheMap->OpenCount--; if (SharedCacheMap->OpenCount == 0) { + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); MmFreeSectionSegments(SharedCacheMap->FileObject); - CcRosDeleteFileCache(FileObject, SharedCacheMap); + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + CcRosDeleteFileCache(FileObject, SharedCacheMap, &OldIrql); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + + return; } } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } NTSTATUS @@ -1324,7 +1333,7 @@ CcRosReleaseFileCache ( PPRIVATE_CACHE_MAP PrivateMap; PROS_SHARED_CACHE_MAP SharedCacheMap; - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) { @@ -1335,17 +1344,15 @@ CcRosReleaseFileCache ( * lock the master lock, to be sure not to race * with a potential read ahead ongoing! */ - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); PrivateMap = FileObject->PrivateCacheMap; FileObject->PrivateCacheMap = NULL; - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); if (PrivateMap != NULL) { /* Remove it from the file */ - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); RemoveEntryList(&PrivateMap->PrivateLinks); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); /* And free it. */ if (PrivateMap != &SharedCacheMap->PrivateCacheMap) @@ -1362,13 +1369,19 @@ CcRosReleaseFileCache ( SharedCacheMap->OpenCount--; if (SharedCacheMap->OpenCount == 0) { + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); MmFreeSectionSegments(SharedCacheMap->FileObject); - CcRosDeleteFileCache(FileObject, SharedCacheMap); + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + CcRosDeleteFileCache(FileObject, SharedCacheMap, &OldIrql); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + + return STATUS_SUCCESS; } } } } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); return STATUS_SUCCESS; } @@ -1417,7 +1430,7 @@ CcRosInitializeFileCache ( InitializeListHead(&SharedCacheMap->BcbList); } - KeAcquireGuardedMutex(&ViewLock); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (Allocated) { if (FileObject->SectionObjectPointer->SharedCacheMap == NULL) @@ -1428,9 +1441,7 @@ CcRosInitializeFileCache ( KernelMode); FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); InsertTailList(&CcCleanSharedCacheMapList, &SharedCacheMap->SharedCacheMapLinks); - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } else { @@ -1457,16 +1468,14 @@ CcRosInitializeFileCache ( /* If we also allocated the shared cache map for this file, kill it */ if (Allocated) { - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); RemoveEntryList(&SharedCacheMap->SharedCacheMapLinks); - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); FileObject->SectionObjectPointer->SharedCacheMap = NULL; ObDereferenceObject(FileObject); ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1478,14 +1487,14 @@ CcRosInitializeFileCache ( KeInitializeSpinLock(&PrivateMap->ReadAheadSpinLock); /* Link it to the file */ - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&SharedCacheMap->CacheMapLock); InsertTailList(&SharedCacheMap->PrivateList, &PrivateMap->PrivateLinks); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); FileObject->PrivateCacheMap = PrivateMap; SharedCacheMap->OpenCount++; } - KeReleaseGuardedMutex(&ViewLock); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); return STATUS_SUCCESS; } @@ -1524,7 +1533,6 @@ CcInitView ( InitializeListHead(&CcDeferredWrites); InitializeListHead(&CcCleanSharedCacheMapList); KeInitializeSpinLock(&CcDeferredWriteSpinLock); - KeInitializeGuardedMutex(&ViewLock); ExInitializeNPagedLookasideList(&iBcbLookasideList, NULL, NULL,

5 years, 9 months

[reactos] 02/02: [NTOSKRNL] Fix indentation. No code changes.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b67dbdbea5f0543c221d8… commit b67dbdbea5f0543c221d813d8eca58d4d0533380 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Dec 18 21:35:12 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 19 19:18:21 2018 +0100 [NTOSKRNL] Fix indentation. No code changes. --- ntoskrnl/io/iomgr/irp.c | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/ntoskrnl/io/iomgr/irp.c b/ntoskrnl/io/iomgr/irp.c index b1de62da03..1b19d49e9a 100644 --- a/ntoskrnl/io/iomgr/irp.c +++ b/ntoskrnl/io/iomgr/irp.c @@ -817,25 +817,25 @@ IoBuildAsynchronousFsdRequest(IN ULONG MajorFunction, return NULL; } - /* Probe and Lock */ - _SEH2_TRY - { - /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, - KernelMode, - MajorFunction == IRP_MJ_READ ? - IoWriteAccess : IoReadAccess); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Free the IRP and its MDL */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); + /* Probe and Lock */ + _SEH2_TRY + { + /* Do the probe */ + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + MajorFunction == IRP_MJ_READ ? + IoWriteAccess : IoReadAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Free the IRP and its MDL */ + IoFreeMdl(Irp->MdlAddress); + IoFreeIrp(Irp); /* Fail */ - _SEH2_YIELD(return NULL); - } - _SEH2_END; + _SEH2_YIELD(return NULL); + } + _SEH2_END; } else { @@ -1931,19 +1931,19 @@ IoMakeAssociatedIrp(IN PIRP Irp, __FUNCTION__, Irp); - /* Allocate the IRP */ - AssocIrp = IoAllocateIrp(StackSize, FALSE); - if (!AssocIrp) return NULL; + /* Allocate the IRP */ + AssocIrp = IoAllocateIrp(StackSize, FALSE); + if (!AssocIrp) return NULL; - /* Set the Flags */ - AssocIrp->Flags |= IRP_ASSOCIATED_IRP; + /* Set the Flags */ + AssocIrp->Flags |= IRP_ASSOCIATED_IRP; - /* Set the Thread */ - AssocIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread; + /* Set the Thread */ + AssocIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread; - /* Associate them */ - AssocIrp->AssociatedIrp.MasterIrp = Irp; - return AssocIrp; + /* Associate them */ + AssocIrp->AssociatedIrp.MasterIrp = Irp; + return AssocIrp; } /*

5 years, 9 months

[reactos] 01/02: [NTOSKRNL] Fix indentation. No code changes.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e56b21ad68a30fd17755… commit 7e56b21ad68a30fd17755216cd433f887b204941 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 17 21:23:10 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 19 19:18:20 2018 +0100 [NTOSKRNL] Fix indentation. No code changes. --- ntoskrnl/io/iomgr/iomdl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/io/iomgr/iomdl.c b/ntoskrnl/io/iomgr/iomdl.c index af108c40d4..8b758d4cdf 100644 --- a/ntoskrnl/io/iomgr/iomdl.c +++ b/ntoskrnl/io/iomgr/iomdl.c @@ -76,13 +76,13 @@ IoAllocateMdl(IN PVOID VirtualAddress, p = Irp->MdlAddress; while (p->Next) p = p->Next; p->Next = Mdl; - } - else - { + } + else + { /* Otherwise, insert it directly */ Irp->MdlAddress = Mdl; - } - } + } + } /* Return the allocated mdl */ return Mdl;

5 years, 9 months

[reactos] 06/06: [NTUSER] Implement creating the system threads - Add UserCreateSystemThread function that will signal csrss to create a new system thread. - NtUserCreateWindowStation: Create the raw input thread and the desktop thread when the IO window station gets created. - IntMakeHungWindowGhosted: Create the ghost system thread that will own all ghost windows. - Let the raw input thread manage the window station of csrss.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a8d9f12d63d9135eeb8a… commit 1a8d9f12d63d9135eeb8af65e1093413cadcc9bb Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 16 13:16:29 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [NTUSER] Implement creating the system threads - Add UserCreateSystemThread function that will signal csrss to create a new system thread. - NtUserCreateWindowStation: Create the raw input thread and the desktop thread when the IO window station gets created. - IntMakeHungWindowGhosted: Create the ghost system thread that will own all ghost windows. - Let the raw input thread manage the window station of csrss. [USERSRV] Remove system threads creating hack - Implement SrvCreateSystemThreads - Don't create the system threads in UserServerDllInitialization. --- win32ss/user/ntuser/csr.c | 80 ++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/csr.h | 7 ++++ win32ss/user/ntuser/desktop.c | 19 +++++++++ win32ss/user/ntuser/desktop.h | 1 + win32ss/user/ntuser/ghost.c | 43 +++++++++++++------- win32ss/user/ntuser/ghost.h | 2 + win32ss/user/ntuser/input.c | 41 +++++++++---------- win32ss/user/ntuser/input.h | 2 +- win32ss/user/ntuser/simplecall.c | 2 +- win32ss/user/ntuser/winsta.c | 17 ++++++++ win32ss/user/winsrv/usersrv/init.c | 41 ++++--------------- 11 files changed, 183 insertions(+), 72 deletions(-) diff --git a/win32ss/user/ntuser/csr.c b/win32ss/user/ntuser/csr.c index 7893cb53c0..93fffc0e7e 100644 --- a/win32ss/user/ntuser/csr.c +++ b/win32ss/user/ntuser/csr.c @@ -14,6 +14,7 @@ DBG_DEFAULT_CHANNEL(UserCsr); PEPROCESS gpepCSRSS = NULL; PVOID CsrApiPort = NULL; +DWORD gdwPendingSystemThreads = 0; VOID InitCsrProcess(VOID /*IN PEPROCESS CsrProcess*/) @@ -197,4 +198,83 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, return ApiMessage->Status; } +/* + * UserSystemThreadProc + * + * Called form dedicated thread in CSRSS. RIT is started in context of this + * thread because it needs valid Win32 process with TEB initialized. + */ +DWORD UserSystemThreadProc(BOOL bRemoteProcess) +{ + DWORD Type; + + if (!gdwPendingSystemThreads) + { + ERR("gdwPendingSystemThreads is 0!\n"); + return 0; + } + + /* Decide which thread this will be */ + if (gdwPendingSystemThreads & ST_RIT) + Type = ST_RIT; + else if (gdwPendingSystemThreads & ST_DESKTOP_THREAD) + Type = ST_DESKTOP_THREAD; + else + Type = ST_GHOST_THREAD; + + ASSERT(Type); + + /* We will handle one of these threads right here so unmark it as pending */ + gdwPendingSystemThreads &= ~Type; + + UserLeave(); + + TRACE("UserSystemThreadProc: %d\n", Type); + + switch (Type) + { + case ST_RIT: RawInputThreadMain(); break; + case ST_DESKTOP_THREAD: DesktopThreadMain(); break; + case ST_GHOST_THREAD: UserGhostThreadEntry(); break; + default: ERR("Wrong type: %x\n", Type); + } + + UserEnterShared(); + + return 0; +} + +BOOL UserCreateSystemThread(DWORD Type) +{ + USER_API_MESSAGE ApiMessage; + PUSER_CREATE_SYSTEM_THREAD pCreateThreadRequest = &ApiMessage.Data.CreateSystemThreadRequest; + + TRACE("UserCreateSystemThread: %d\n", Type); + + ASSERT(UserIsEnteredExclusive()); + + if (gdwPendingSystemThreads & Type) + { + ERR("System thread 0x%x already pending for creation\n", Type); + return TRUE; + } + + /* We can't pass a parameter to the new thread so mark what the new thread needs to do */ + gdwPendingSystemThreads |= Type; + + /* Ask winsrv to create a new system thread. This new thread will enter win32k again calling UserSystemThreadProc */ + pCreateThreadRequest->bRemote = FALSE; + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpCreateSystemThreads), + sizeof(USER_CREATE_SYSTEM_THREAD)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + ERR("Csr call failed!\n"); + return FALSE; + } + + return TRUE; +} + /* EOF */ diff --git a/win32ss/user/ntuser/csr.h b/win32ss/user/ntuser/csr.h index 8359e733a2..ac1ef10bc9 100644 --- a/win32ss/user/ntuser/csr.h +++ b/win32ss/user/ntuser/csr.h @@ -32,4 +32,11 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, IN CSR_API_NUMBER ApiNumber, IN ULONG DataLength); +#define ST_RIT (1<<0) +#define ST_DESKTOP_THREAD (1<<1) +#define ST_GHOST_THREAD (1<<2) + +DWORD UserSystemThreadProc(BOOL bRemoteProcess); +BOOL UserCreateSystemThread(DWORD Type); + /* EOF */ diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 4cfdde9af7..e066198226 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -36,6 +36,7 @@ PDESKTOP gpdeskInputDesktop = NULL; HDC ScreenDeviceContext = NULL; PTHREADINFO gptiDesktopThread = NULL; HCURSOR gDesktopCursor = NULL; +PKEVENT gpDesktopThreadStartedEvent = NULL; /* OBJECT CALLBACKS **********************************************************/ @@ -243,6 +244,22 @@ InitDesktopImpl(VOID) ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP); ExDesktopObjectType->TypeInfo.GenericMapping = IntDesktopMapping; ExDesktopObjectType->TypeInfo.ValidAccessMask = DESKTOP_ALL_ACCESS; + + /* Allocate memory for the event structure */ + gpDesktopThreadStartedEvent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KEVENT), + USERTAG_EVENT); + if (!gpDesktopThreadStartedEvent) + { + ERR("Failed to allocate event!\n"); + return STATUS_NO_MEMORY; + } + + /* Initialize the kernel event */ + KeInitializeEvent(gpDesktopThreadStartedEvent, + SynchronizationEvent, + FALSE); + return STATUS_SUCCESS; } @@ -1501,6 +1518,8 @@ VOID NTAPI DesktopThreadMain(VOID) classes will be allocated from the shared heap */ UserRegisterSystemClasses(); + KeSetEvent(gpDesktopThreadStartedEvent, IO_NO_INCREMENT, FALSE); + while (TRUE) { Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE); diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index 0e1950ff64..6f15bb12a3 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -86,6 +86,7 @@ extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; extern PTHREADINFO gptiForeground; extern PTHREADINFO gptiDesktopThread; +extern PKEVENT gpDesktopThreadStartedEvent; typedef struct _SHELL_HOOK_WINDOW { diff --git a/win32ss/user/ntuser/ghost.c b/win32ss/user/ntuser/ghost.c index 3342fea155..fcb70a4c77 100644 --- a/win32ss/user/ntuser/ghost.c +++ b/win32ss/user/ntuser/ghost.c @@ -11,9 +11,34 @@ #define NDEBUG #include <debug.h> +DBG_DEFAULT_CHANNEL(UserInput); + static UNICODE_STRING GhostClass = RTL_CONSTANT_STRING(GHOSTCLASSNAME); static UNICODE_STRING GhostProp = RTL_CONSTANT_STRING(GHOST_PROP); +PTHREADINFO gptiGhostThread = NULL; + +/* + * GhostThreadMain + * + * Creates ghost windows and exits when no non-responsive window remains. + */ +VOID NTAPI +UserGhostThreadEntry(VOID) +{ + TRACE("Ghost thread started\n"); + + UserEnterExclusive(); + + gptiGhostThread = PsGetCurrentThreadWin32Thread(); + + //TODO: Implement. This thread should handle all ghost windows and exit when no ghost window is needed. + + gptiGhostThread = NULL; + + UserLeave(); +} + BOOL FASTCALL IntIsGhostWindow(PWND Window) { BOOLEAN Ret = FALSE; @@ -161,18 +186,10 @@ BOOL FASTCALL IntMakeHungWindowGhosted(HWND hwndHung) return FALSE; // already ghosting } - // TODO: - // 1. Create a thread. - // 2. Create a ghost window in the thread. - // 3. Do message loop in the thread - { - static int bWarnedOnce = 0; - if (!bWarnedOnce) - { - bWarnedOnce++; - STUB; - } - } + // TODO: Find a way to pass the hwnd of pHungWnd to the ghost thread as we can't pass parameters directly + + if (!gptiGhostThread) + UserCreateSystemThread(ST_GHOST_THREAD); - return FALSE; + return TRUE; } diff --git a/win32ss/user/ntuser/ghost.h b/win32ss/user/ntuser/ghost.h index cd7b45ce5c..9746658335 100644 --- a/win32ss/user/ntuser/ghost.h +++ b/win32ss/user/ntuser/ghost.h @@ -1 +1,3 @@ BOOL FASTCALL IntMakeHungWindowGhosted(HWND hwndHung); +VOID NTAPI UserGhostThreadEntry(VOID); + diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index 509fcda6e9..e4dbbabba0 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -138,6 +138,7 @@ RawInputThreadMain(VOID) MOUSE_INPUT_DATA MouseInput; KEYBOARD_INPUT_DATA KeyInput; PVOID ShutdownEvent; + HWINSTA hWinSta; ByteOffset.QuadPart = (LONGLONG)0; //WaitTimeout.QuadPart = (LONGLONG)(-10000000); @@ -151,6 +152,23 @@ RawInputThreadMain(VOID) KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); + Status = ObOpenObjectByPointer(InputWindowStation, + 0, + NULL, + MAXIMUM_ALLOWED, + ExWindowStationObjectType, + UserMode, + (PHANDLE)&hWinSta); + if (NT_SUCCESS(Status)) + { + UserSetProcessWindowStation(hWinSta); + } + else + { + ASSERT(FALSE); + /* Failed to open the interactive winsta! What now? */ + } + UserEnterExclusive(); StartTheTimers(); UserLeave(); @@ -330,29 +348,6 @@ RawInputThreadMain(VOID) ERR("Raw Input Thread Exit!\n"); } -/* - * CreateSystemThreads - * - * Called form dedicated thread in CSRSS. RIT is started in context of this - * thread because it needs valid Win32 process with TEB initialized. - */ -DWORD NTAPI -CreateSystemThreads(UINT Type) -{ - UserLeave(); - - switch (Type) - { - case 0: RawInputThreadMain(); break; - case 1: DesktopThreadMain(); break; - default: ERR("Wrong type: %x\n", Type); - } - - UserEnterShared(); - - return 0; -} - /* * InitInputImpl * diff --git a/win32ss/user/ntuser/input.h b/win32ss/user/ntuser/input.h index 715a0b95ee..2c2e50c4ef 100644 --- a/win32ss/user/ntuser/input.h +++ b/win32ss/user/ntuser/input.h @@ -60,8 +60,8 @@ extern PATTACHINFO gpai; /* General */ INIT_FUNCTION NTSTATUS NTAPI InitInputImpl(VOID); +VOID NTAPI RawInputThreadMain(VOID); BOOL FASTCALL IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt); -DWORD NTAPI CreateSystemThreads(UINT Type); NTSTATUS FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); BOOL FASTCALL IsRemoveAttachThread(PTHREADINFO); VOID FASTCALL DoTheScreenSaver(VOID); diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 9356415c46..179d58bcde 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -392,7 +392,7 @@ NtUserCallOneParam( break; case ONEPARAM_ROUTINE_CREATESYSTEMTHREADS: - Result = CreateSystemThreads(Param); + Result = UserSystemThreadProc(Param); break; case ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW: diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 12a1b90d3a..63325fe800 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -497,7 +497,20 @@ IntCreateWindowStation( InputWindowStation = WindowStation; WindowStation->Flags &= ~WSS_NOIO; + InitCursorImpl(); + + UserCreateSystemThread(ST_DESKTOP_THREAD); + UserCreateSystemThread(ST_RIT); + + /* Desktop functions require the desktop thread running so wait for it to initialize */ + UserLeaveCo(); + KeWaitForSingleObject(gpDesktopThreadStartedEvent, + UserRequest, + UserMode, + FALSE, + NULL); + UserEnterCo(); } else { @@ -742,6 +755,8 @@ NtUserCreateWindowStation( return NULL; } + UserEnterExclusive(); + /* Create the window station */ Status = IntCreateWindowStation(&hWinSta, ObjectAttributes, @@ -753,6 +768,8 @@ NtUserCreateWindowStation( Unknown4, Unknown5, Unknown6); + UserLeave(); + if (NT_SUCCESS(Status)) { TRACE("NtUserCreateWindowStation created window station '%wZ' with handle 0x%p\n", diff --git a/win32ss/user/winsrv/usersrv/init.c b/win32ss/user/winsrv/usersrv/init.c index d70209e688..2c38825bbe 100644 --- a/win32ss/user/winsrv/usersrv/init.c +++ b/win32ss/user/winsrv/usersrv/init.c @@ -121,8 +121,13 @@ CreateSystemThreads(PVOID pParam) CSR_API(SrvCreateSystemThreads) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = CsrExecServerThread(CreateSystemThreads, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot start system thread!\n"); + } + + return Status; } CSR_API(SrvActivateDebugger) @@ -282,38 +287,6 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization) return Status; } -/*** From win32csr... See r54125 ***/ - { - HANDLE ServerThread; - CLIENT_ID ClientId; - UINT i; - - /* Start the Raw Input Thread and the Desktop Thread */ - for (i = 0; i < 2; ++i) - { - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - TRUE, - 0, - 0, - 0, - CreateSystemThreads, - UlongToPtr(i), - &ServerThread, - &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - { - DPRINT1("Cannot start Raw Input Thread!\n"); - } - } - } -/*** END - From win32csr... ***/ - /* All done */ return STATUS_SUCCESS; }

5 years, 9 months

[reactos] 05/06: [USERSRV] Add definition for the USER_CREATE_SYSTEM_THREAD api message

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9924da34ccda309d85829… commit 9924da34ccda309d85829d984251e9d61906f2cf Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Dec 13 11:21:00 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [USERSRV] Add definition for the USER_CREATE_SYSTEM_THREAD api message --- sdk/include/reactos/subsys/win/winmsg.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/reactos/subsys/win/winmsg.h b/sdk/include/reactos/subsys/win/winmsg.h index a42d6152db..6134538cad 100644 --- a/sdk/include/reactos/subsys/win/winmsg.h +++ b/sdk/include/reactos/subsys/win/winmsg.h @@ -82,6 +82,10 @@ typedef struct _USER_REGISTER_LOGON_PROCESS BOOL Register; } USER_REGISTER_LOGON_PROCESS, *PUSER_REGISTER_LOGON_PROCESS; +typedef struct _USER_CREATE_SYSTEM_THREAD +{ + BOOL bRemote; +} USER_CREATE_SYSTEM_THREAD, *PUSER_CREATE_SYSTEM_THREAD; typedef struct _USER_API_MESSAGE { @@ -99,6 +103,7 @@ typedef struct _USER_API_MESSAGE USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest; USER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; USER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; + USER_CREATE_SYSTEM_THREAD CreateSystemThreadRequest; } Data; } USER_API_MESSAGE, *PUSER_API_MESSAGE;

5 years, 9 months

[reactos] 04/06: [WINSRV] Add a hack to fix giving the api port to win32k - Register our api port with win32k in SrvRegisterLogonProcess because UserClientConnect is never really called.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ec7b163c9bdf6dbe4379… commit 3ec7b163c9bdf6dbe4379273135f0261e6b88638 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 16 13:14:56 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [WINSRV] Add a hack to fix giving the api port to win32k - Register our api port with win32k in SrvRegisterLogonProcess because UserClientConnect is never really called. [NTUSER] Silence a noisy trace --- win32ss/user/ntuser/ntstubs.c | 2 +- win32ss/user/winsrv/usersrv/register.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index fdb9a7b558..44cbb5af3b 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -797,8 +797,8 @@ NtUserSetInformationThread(IN HANDLE ThreadHandle, { HANDLE CsrPortHandle; - ERR("Set CSR API Port for Win32k\n"); + TRACE("Set CSR API Port for Win32k\n"); if (ThreadInformationLength != sizeof(CsrPortHandle)) { Status = STATUS_INFO_LENGTH_MISMATCH; diff --git a/win32ss/user/winsrv/usersrv/register.c b/win32ss/user/winsrv/usersrv/register.c index 0070a3407d..0a521bcdd4 100644 --- a/win32ss/user/winsrv/usersrv/register.c +++ b/win32ss/user/winsrv/usersrv/register.c @@ -20,6 +20,10 @@ static BOOLEAN ServicesProcessIdValid = FALSE; ULONG_PTR ServicesProcessId = 0; ULONG_PTR LogonProcessId = 0; +#if 1 //HACK! See use below +extern HANDLE CsrApiPort; +#endif + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvRegisterLogonProcess) @@ -45,6 +49,30 @@ CSR_API(SrvRegisterLogonProcess) LogonProcessId = 0; } +#if 1 //HAAAACK. This should be done in UserClientConnect which is never called! + + /* Check if we don't have an API port yet */ + if (CsrApiPort == NULL) + { + NTSTATUS Status; + + /* Query the API port and save it globally */ + CsrApiPort = CsrQueryApiPort(); + + DPRINT("Giving win32k our api port\n"); + + /* Inform win32k about the API port */ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, + sizeof(CsrApiPort)); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } +#endif + return STATUS_SUCCESS; }

5 years, 9 months

[reactos] 03/06: [NTUSER] Fix desktop and window station assignment for csrss - NtUserSetInformationThread: Stub UserThreadUseActiveDesktop and UserThreadRestoreDesktop - Properly mark the first thread that enters win32k belonging to csrss. At this point we assume that since gpepCSRSS isn't initialized yet, it probably is the first thread.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dad76af8a44c6ccec94de… commit dad76af8a44c6ccec94de564b5db6755f0422500 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 16 13:19:54 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [NTUSER] Fix desktop and window station assignment for csrss - NtUserSetInformationThread: Stub UserThreadUseActiveDesktop and UserThreadRestoreDesktop - Properly mark the first thread that enters win32k belonging to csrss. At this point we assume that since gpepCSRSS isn't initialized yet, it probably is the first thread. [WINSRV] Use NtUserSetInformationThread to set the current desktop when needed -When csrss needs to use user32 or enter win32k, it first needs to assign the current thread to a desktop. --- win32ss/user/ntuser/main.c | 14 +++--------- win32ss/user/ntuser/ntstubs.c | 29 +++++++++++++++++++++++++ win32ss/user/winsrv/usersrv/harderror.c | 31 +++++++++++---------------- win32ss/user/winsrv/usersrv/shutdown.c | 38 +++++++++++++++++++++++++++++++-- 4 files changed, 81 insertions(+), 31 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 73d39d3bd5..b97a1f3d37 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -535,7 +535,7 @@ InitThreadCallback(PETHREAD Thread) // FIXME: Flag SYSTEM threads with... TIF_SYSTEMTHREAD !! /* CSRSS threads have some special features */ - if (Process == gpepCSRSS) + if (Process == gpepCSRSS || !gpepCSRSS) ptiCurrent->TIF_flags = TIF_CSRSSTHREAD | TIF_DONTATTACHQUEUE; ptiCurrent->pcti = &ptiCurrent->cti; @@ -575,11 +575,8 @@ InitThreadCallback(PETHREAD Thread) * Do not try to open a desktop or window station before the very first * (interactive) window station has been created by Winlogon. */ - // if (ptiCurrent->ppi->hdeskStartup == NULL && InputWindowStation != NULL) - /* Last things to do only if we are not a SYSTEM or CSRSS thread */ - // HACK Part #1: Temporarily disabled to have our current USERSRV running, but normally this is its duty to connect itself to the required desktop! - if (// !(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && - /**/ptiCurrent->ppi->hdeskStartup == NULL &&/**/ + if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && + ptiCurrent->ppi->hdeskStartup == NULL && InputWindowStation != NULL) { HWINSTA hWinSta = NULL; @@ -587,15 +584,10 @@ InitThreadCallback(PETHREAD Thread) UNICODE_STRING DesktopPath; PDESKTOP pdesk; - // HACK Part #2: We force USERSRV to connect to WinSta0 by setting the STARTF_INHERITDESKTOP flag. - if (ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) - ProcessParams->WindowFlags |= STARTF_INHERITDESKTOP; - /* * Inherit the thread desktop and process window station (if not yet inherited) * from the process startup info structure. See documentation of CreateProcess(). */ - Status = STATUS_UNSUCCESSFUL; if (ProcessParams && ProcessParams->DesktopInfo.Length > 0) { diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index a4c7f21404..fdb9a7b558 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -691,6 +691,9 @@ NtUserSetInformationProcess( return 0; } +HDESK FASTCALL +IntGetDesktopObjectHandle(PDESKTOP DesktopObject); + NTSTATUS APIENTRY NtUserSetInformationThread(IN HANDLE ThreadHandle, @@ -820,6 +823,32 @@ NtUserSetInformationThread(IN HANDLE ThreadHandle, break; } + case UserThreadUseActiveDesktop: + { + HDESK hdesk; + + if (Thread != PsGetCurrentThread()) + { + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + hdesk = IntGetDesktopObjectHandle(gpdeskInputDesktop); + IntSetThreadDesktop(hdesk, FALSE); + + break; + } + case UserThreadRestoreDesktop: + { + if (Thread != PsGetCurrentThread()) + { + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + IntSetThreadDesktop(NULL, FALSE); + break; + } default: { STUB; diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 6ff336aff5..e835ed8135 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -1012,34 +1012,16 @@ UserpMessageBox( IN ULONG Timeout) { ULONG MessageBoxResponse; - HDESK hDesk, hOldDesk; DPRINT("Text = '%S', Caption = '%S', Type = 0x%lx\n", TextStringU->Buffer, CaptionStringU->Buffer, Type); - // TEMPORARY HACK to fix desktop assignment for harderror message boxes. - hDesk = OpenInputDesktop(0, FALSE, GENERIC_WRITE); - if (!hDesk) - return ResponseNotHandled; - - /* Assign the desktop to this thread */ - hOldDesk = GetThreadDesktop(GetCurrentThreadId()); - if (!SetThreadDesktop(hDesk)) - { - CloseDesktop(hDesk); - return ResponseNotHandled; - } - /* Display a message box */ MessageBoxResponse = MessageBoxTimeoutW(NULL, TextStringU->Buffer, CaptionStringU->Buffer, Type, 0, Timeout); - /* Restore the original desktop */ - SetThreadDesktop(hOldDesk); - CloseDesktop(hDesk); - /* Return response value */ switch (MessageBoxResponse) { @@ -1107,6 +1089,7 @@ UserServerHardError( UNICODE_STRING TextU, CaptionU; WCHAR LocalTextBuffer[256]; WCHAR LocalCaptionBuffer[256]; + NTSTATUS Status; ASSERT(ThreadData->Process != NULL); @@ -1136,6 +1119,16 @@ UserServerHardError( // (Message->UnicodeStringParameterMask & 0x3) } + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadUseActiveDesktop, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set thread desktop!\n"); + return; + } + /* Re-initialize the hard errors cache */ UserInitHardErrorsCache(); @@ -1187,6 +1180,8 @@ Quit: if (CaptionU.Buffer != LocalCaptionBuffer) RtlFreeUnicodeString(&CaptionU); + NtUserSetInformationThread(NtCurrentThread(), UserThreadRestoreDesktop, NULL, 0); + return; } diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index 7238b21ab8..c73a535ffb 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -191,8 +191,17 @@ EndNowThreadProc(LPVOID Parameter) PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT)Parameter; MSG Msg; - // SetThreadDesktop(NotifyContext->Desktop); - // SwitchDesktop(NotifyContext->Desktop); +#if 0 + SetThreadDesktop(NotifyContext->Desktop); + SwitchDesktop(NotifyContext->Desktop); +#else + /* For now show the end task dialog in the active desktop */ + NtUserSetInformationThread(NtCurrentThread(), + UserThreadUseActiveDesktop, + NULL, + 0); +#endif + CallInitCommonControls(); NotifyContext->Dlg = CreateDialogParam(UserServerDllInstance, MAKEINTRESOURCE(IDD_END_NOW), NULL, @@ -811,20 +820,43 @@ CSR_API(SrvExitWindowsEx) NTSTATUS Status; PUSER_EXIT_REACTOS ExitReactOSRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactOSRequest; + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadUseActiveDesktop, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set thread desktop!\n"); + return Status; + } + Status = UserExitReactOS(CsrGetClientThread(), ExitReactOSRequest->Flags); ExitReactOSRequest->Success = NT_SUCCESS(Status); ExitReactOSRequest->LastError = GetLastError(); + NtUserSetInformationThread(NtCurrentThread(), UserThreadRestoreDesktop, NULL, 0); + return Status; } CSR_API(SrvEndTask) { PUSER_END_TASK EndTaskRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.EndTaskRequest; + NTSTATUS Status; // FIXME: This is HACK-plemented!! DPRINT1("SrvEndTask is HACKPLEMENTED!!\n"); + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadUseActiveDesktop, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set thread desktop!\n"); + return Status; + } + SendMessageW(EndTaskRequest->WndHandle, WM_CLOSE, 0, 0); // PostMessageW(EndTaskRequest->WndHandle, WM_CLOSE, 0, 0); @@ -846,6 +878,8 @@ CSR_API(SrvEndTask) EndTaskRequest->LastError = ERROR_SUCCESS; } + NtUserSetInformationThread(NtCurrentThread(), UserThreadRestoreDesktop, NULL, 0); + return STATUS_SUCCESS; }

5 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018