Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/01: [ADVAPI32] CreateProcessAsUserA/W: Partially revert an obvious case of over-engineering. Only share the common parts! Now it looks a lot better. No more stupid bUnicode!
by Eric Kohl 27 Dec '18

27 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b17e8a5e3ce9fdf855010… commit b17e8a5e3ce9fdf8550104421a8c3ef63c03cb0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Dec 27 19:27:43 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Dec 27 19:29:20 2018 +0100 [ADVAPI32] CreateProcessAsUserA/W: Partially revert an obvious case of over-engineering. Only share the common parts! Now it looks a lot better. No more stupid bUnicode! --- dll/win32/advapi32/misc/logon.c | 101 ++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 67 deletions(-) diff --git a/dll/win32/advapi32/misc/logon.c b/dll/win32/advapi32/misc/logon.c index 0b9d60320f..742c093178 100644 --- a/dll/win32/advapi32/misc/logon.c +++ b/dll/win32/advapi32/misc/logon.c @@ -89,60 +89,13 @@ CloseLogonLsaHandle(VOID) static BOOL CreateProcessAsUserCommon( - _In_ BOOL bUnicode, _In_opt_ HANDLE hToken, - _In_opt_ LPCVOID lpApplicationName, - _Inout_opt_ LPVOID lpCommandLine, - _In_opt_ LPSECURITY_ATTRIBUTES lpProcessAttributes, - _In_opt_ LPSECURITY_ATTRIBUTES lpThreadAttributes, - _In_ BOOL bInheritHandles, _In_ DWORD dwCreationFlags, - _In_opt_ LPVOID lpEnvironment, - _In_opt_ LPCVOID lpCurrentDirectory, - _In_ LPVOID lpStartupInfo, _Out_ LPPROCESS_INFORMATION lpProcessInformation) { NTSTATUS Status; PROCESS_ACCESS_TOKEN AccessToken; - /* Create the process with a suspended main thread */ - if (bUnicode) - { - /* Call the UNICODE version */ - if (!CreateProcessW((LPCWSTR)lpApplicationName, - (LPWSTR)lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, - dwCreationFlags | CREATE_SUSPENDED, - lpEnvironment, - (LPCWSTR)lpCurrentDirectory, - (LPSTARTUPINFOW)lpStartupInfo, - lpProcessInformation)) - { - ERR("CreateProcessW failed, last error: %d\n", GetLastError()); - return FALSE; - } - } - else - { - /* Call the ANSI version */ - if (!CreateProcessA((LPCSTR)lpApplicationName, - (LPSTR)lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, - dwCreationFlags | CREATE_SUSPENDED, - lpEnvironment, - (LPCSTR)lpCurrentDirectory, - (LPSTARTUPINFOA)lpStartupInfo, - lpProcessInformation)) - { - ERR("CreateProcessA failed, last error: %d\n", GetLastError()); - return FALSE; - } - } - if (hToken != NULL) { TOKEN_TYPE Type; @@ -293,18 +246,25 @@ CreateProcessAsUserA( debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + /* Create the process with a suspended main thread */ + if (!CreateProcessA(lpApplicationName, + lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags | CREATE_SUSPENDED, + lpEnvironment, + lpCurrentDirectory, + lpStartupInfo, + lpProcessInformation)) + { + ERR("CreateProcessA failed, last error: %d\n", GetLastError()); + return FALSE; + } + /* Call the helper function */ - return CreateProcessAsUserCommon(FALSE, - hToken, - lpApplicationName, - lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, + return CreateProcessAsUserCommon(hToken, dwCreationFlags, - lpEnvironment, - lpCurrentDirectory, - lpStartupInfo, lpProcessInformation); } @@ -332,18 +292,25 @@ CreateProcessAsUserW( debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + /* Create the process with a suspended main thread */ + if (!CreateProcessW(lpApplicationName, + lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags | CREATE_SUSPENDED, + lpEnvironment, + lpCurrentDirectory, + lpStartupInfo, + lpProcessInformation)) + { + ERR("CreateProcessW failed, last error: %d\n", GetLastError()); + return FALSE; + } + /* Call the helper function */ - return CreateProcessAsUserCommon(TRUE, - hToken, - lpApplicationName, - lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, + return CreateProcessAsUserCommon(hToken, dwCreationFlags, - lpEnvironment, - lpCurrentDirectory, - lpStartupInfo, lpProcessInformation); }

1 0

[reactos] 01/01: [TRANSLATION] Update Traditional Chinese translation. (#1193)
by Luo Yufan 27 Dec '18

27 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c34833390af71b7552b87… commit c34833390af71b7552b87d0fba5c6ef64acc7dc6 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Thu Dec 27 15:24:24 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 27 16:24:24 2018 +0900 [TRANSLATION] Update Traditional Chinese translation. (#1193) --- base/applications/cmdutils/find/lang/zh-TW.rc | 2 +- base/applications/cmdutils/help/lang/zh-TW.rc | 2 +- base/applications/cmdutils/taskkill/lang/zh-TW.rc | 10 ++-- base/applications/findstr/lang/zh-TW.rc | 2 +- base/applications/mplay32/lang/zh-TW.rc | 2 +- base/applications/msconfig/lang/zh-TW.rc | 2 +- base/applications/mscutils/servman/lang/zh-TW.rc | 2 +- base/applications/rapps/lang/zh-TW.rc | 6 +-- base/applications/taskmgr/lang/zh-TW.rc | 14 +++--- base/shell/explorer/lang/zh-TW.rc | 2 +- dll/cpl/access/lang/zh-TW.rc | 2 +- dll/cpl/desk/lang/zh-TW.rc | 2 +- dll/cpl/inetcpl/lang/zh-TW.rc | 2 +- dll/cpl/powercfg/lang/zh-TW.rc | 8 ++-- dll/cpl/sysdm/lang/zh-TW.rc | 10 ++-- dll/cpl/usrmgr/lang/zh-TW.rc | 4 +- dll/cpl/wined3dcfg/lang/zh-TW.rc | 2 +- dll/win32/devmgr/lang/zh-CN.rc | 20 ++++---- dll/win32/devmgr/lang/zh-TW.rc | 56 +++++++++++----------- dll/win32/netcfgx/lang/zh-TW.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- dll/win32/tapiui/lang/zh-TW.rc | 8 ++-- dll/win32/winmm/lang/winmm_Zh.rc | 6 +-- modules/rosapps/applications/winfile/lang/zh-CN.rc | 2 +- 25 files changed, 86 insertions(+), 86 deletions(-) diff --git a/base/applications/cmdutils/find/lang/zh-TW.rc b/base/applications/cmdutils/find/lang/zh-TW.rc index 9ff1b1278a..55d618bf5c 100644 --- a/base/applications/cmdutils/find/lang/zh-TW.rc +++ b/base/applications/cmdutils/find/lang/zh-TW.rc @@ -11,5 +11,5 @@ BEGIN /N 從 1 開始為顯示的行編號\n\ /V 輸出不包含該指定字串的行" IDS_NO_SUCH_FILE "FIND: %s: 沒有這個檔\n" - IDS_CANNOT_OPEN "FIND: %s: 無法打開檔\n" + IDS_CANNOT_OPEN "FIND: %s: 無法開啟檔\n" END diff --git a/base/applications/cmdutils/help/lang/zh-TW.rc b/base/applications/cmdutils/help/lang/zh-TW.rc index 20d1e74cec..6688b4e267 100644 --- a/base/applications/cmdutils/help/lang/zh-TW.rc +++ b/base/applications/cmdutils/help/lang/zh-TW.rc @@ -30,7 +30,7 @@ COPY 將一個或多個檔案複製到另一個位置。\n\ DATE 顯示或設置日期。\n\ DELETE 刪除一個或多個檔。\n\ DIR 顯示一個目錄中的檔案清單和子目錄。\n\ -ECHO 顯示消息，或打開/關閉命令回顯。\n\ +ECHO 顯示消息，或開啟/關閉命令回顯。\n\ ERASE 刪除一個或多個檔。\n\ EXIT 退出 CMD.EXE 程式 (命令直譯器)。\n\ FOR 為一組檔中的每一個檔執行指定命令。\n\ diff --git a/base/applications/cmdutils/taskkill/lang/zh-TW.rc b/base/applications/cmdutils/taskkill/lang/zh-TW.rc index b8cccace42..afc52383ba 100644 --- a/base/applications/cmdutils/taskkill/lang/zh-TW.rc +++ b/base/applications/cmdutils/taskkill/lang/zh-TW.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE { - STRING_USAGE, "用法: taskkill [/?] [/f] [/im 進程名稱 | /pid 進程 ID]\n" + STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理序名稱 | /pid 處理序 ID]\n" STRING_INVALID_OPTION, "錯誤: 未知或不正確命令列選項指定。\n" STRING_INVALID_PARAM, "錯誤: 不正確命令列參數指定。\n" STRING_MISSING_OPTION, "錯誤: 選項 /im 或 /pid 之一必須指定。\n" @@ -14,8 +14,8 @@ STRINGTABLE STRING_CLOSE_PROC_SRCH, "關閉消息發送到頂級視窗的過程 ""%1"" 與 PID %2!u!.\n" STRING_TERM_PID_SEARCH, "過程與 PID %1!u! 被強行終止。\n" STRING_TERM_PROC_SEARCH, " ""%1"" 過程與 PID %2!u! 被強行終止。\n" - STRING_SEARCH_FAILED, "錯誤: 找不到進程 ""%1""。\n" - STRING_ENUM_FAILED, "錯誤: 無法枚舉進程清單。\n" - STRING_TERMINATE_FAILED, "錯誤: 無法終止進程 ""%1""。\n" - STRING_SELF_TERMINATION, "錯誤: 不允許自我終止的進程。\n" + STRING_SEARCH_FAILED, "錯誤: 找不到處理序 ""%1""。\n" + STRING_ENUM_FAILED, "錯誤: 無法枚舉處理序清單。\n" + STRING_TERMINATE_FAILED, "錯誤: 無法終止處理序 ""%1""。\n" + STRING_SELF_TERMINATION, "錯誤: 不允許自我終止的處理序。\n" } diff --git a/base/applications/findstr/lang/zh-TW.rc b/base/applications/findstr/lang/zh-TW.rc index 7e3e76255d..da69db3565 100644 --- a/base/applications/findstr/lang/zh-TW.rc +++ b/base/applications/findstr/lang/zh-TW.rc @@ -17,5 +17,5 @@ BEGIN /N 顯示的行編號 (由 1 開始)\n\ /V 輸出不包含該指定字串的行" IDS_NO_SUCH_FILE "FINDSTR: %s: 沒有這個檔案\n" - IDS_CANNOT_OPEN "FINDSTR: %s: 無法打開檔案\n" + IDS_CANNOT_OPEN "FINDSTR: %s: 無法開啟檔案\n" END diff --git a/base/applications/mplay32/lang/zh-TW.rc b/base/applications/mplay32/lang/zh-TW.rc index afdf5fe571..41e60e6161 100644 --- a/base/applications/mplay32/lang/zh-TW.rc +++ b/base/applications/mplay32/lang/zh-TW.rc @@ -53,7 +53,7 @@ END STRINGTABLE BEGIN IDS_MODE_UNKNOWN "未知" - IDS_MODE_OPEN "已打開" + IDS_MODE_OPEN "已開啟" IDS_MODE_STOP "已停止" IDS_MODE_PLAY "播放中" IDS_MODE_PAUSE "已暫停" diff --git a/base/applications/msconfig/lang/zh-TW.rc b/base/applications/msconfig/lang/zh-TW.rc index 25f6f82ede..a64063c90b 100644 --- a/base/applications/msconfig/lang/zh-TW.rc +++ b/base/applications/msconfig/lang/zh-TW.rc @@ -153,7 +153,7 @@ BEGIN IDS_TOOLS_INFO_DESCR "顯示版本訊息。" IDS_TOOLS_INFO_CMD "winver.exe" IDS_TOOLS_REGEDIT_NAME "登錄表編輯器" - IDS_TOOLS_REGEDIT_DESCR "打開登錄表編輯器。" + IDS_TOOLS_REGEDIT_DESCR "開啟登錄表編輯器。" IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "系統內容" IDS_TOOLS_SYSDM_DESCR "顯示這台電腦的內容" diff --git a/base/applications/mscutils/servman/lang/zh-TW.rc b/base/applications/mscutils/servman/lang/zh-TW.rc index c1b782a6f3..47ad892016 100644 --- a/base/applications/mscutils/servman/lang/zh-TW.rc +++ b/base/applications/mscutils/servman/lang/zh-TW.rc @@ -314,7 +314,7 @@ BEGIN IDS_HINT_EDIT " 編輯選定服務的屬性。" IDS_HINT_CREATE " 創建一個新的服務。" IDS_HINT_DELETE " 刪除選定的服務。" - IDS_HINT_PROP " 為當前選擇專案打開屬性頁。" + IDS_HINT_PROP " 為當前選擇專案開啟屬性頁。" IDS_HINT_LARGE " 用大圖示顯示條目。" IDS_HINT_SMALL " 用小圖示顯示條目。" IDS_HINT_LIST " 用清單顯示條目。" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index fa7ef74026..9f086b0f37 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -108,7 +108,7 @@ CAPTION "關於" FONT 9, "新細明體" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "ReactOS 程式管理器版權所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + LTEXT "ReactOS 程式管理員版權所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 DEFPUSHBUTTON "關閉", IDOK, 133, 46, 50, 14 END @@ -184,13 +184,13 @@ END STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS 程式管理器" + IDS_APPTITLE "ReactOS 程式管理員" IDS_SEARCH_TEXT "搜索…" IDS_INSTALL "安裝" IDS_UNINSTALL "解除安裝" IDS_MODIFY "修改" IDS_APPS_COUNT "程式個數：%d; Selected: %d" - IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理器！\n\n" + IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站：" IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "已安裝" diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index e2fec31aa6..546008d1d1 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -332,7 +332,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "工作管理員" IDC_TASKMGR "工作管理員" - IDS_IDLE_PROCESS "系統空閒進程" + IDS_IDLE_PROCESS "系統空閒處理序" END STRINGTABLE @@ -363,7 +363,7 @@ BEGIN ID_HELP_ABOUT "顯示程式資訊、版本號和版權資訊" ID_FILE_EXIT "退出工作管理員應用程式" ID_OPTIONS_SHOW16BITTASKS "顯示關聯 ntvdm.exe 下的 16 位任務" - ID_VIEW_SELECTCOLUMNS "選擇哪一列將可見的進程頁" + ID_VIEW_SELECTCOLUMNS "選擇哪一列將可見的處理序頁" ID_VIEW_SHOWKERNELTIMES "在績效圖中顯示核心程式的時間" ID_VIEW_CPUHISTORY_ONEGRAPHALL "單一歷史記錄圖表顯示出總的 CPU 使用率" ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "每個 CPU 都有其自身的歷史圖" @@ -374,10 +374,10 @@ STRINGTABLE BEGIN ID_ENDTASK "告訴要關閉所選的任務" ID_GOTOPROCESS "將焦點切換到所選任務的過程" - ID_RESTORE "從其隱藏狀態恢復工作管理器" + ID_RESTORE "從其隱藏狀態恢復工作管理員" ID_PROCESS_PAGE_ENDPROCESS "從系統中刪除的過程" - ID_PROCESS_PAGE_ENDPROCESSTREE "從系統中刪除此進程及其所有子體" - ID_PROCESS_PAGE_DEBUG "將調試器附加到該進程" + ID_PROCESS_PAGE_ENDPROCESSTREE "從系統中刪除此處理序及其所有子體" + ID_PROCESS_PAGE_DEBUG "將調試器附加到該處理序" ID_PROCESS_PAGE_SETAFFINITY "控制程序允許在哪個處理器運行" ID_PROCESS_PAGE_SETPRIORITY_REALTIME "設定程序優先順序為即時" ID_PROCESS_PAGE_SETPRIORITY_HIGH "設定程序優先順序為高" @@ -431,7 +431,7 @@ BEGIN IDS_MENU_CPUHISTORY "CPU 使用記錄(&C)" IDS_MENU_SHOWKERNELTIMES "顯示核心時間(&S)" IDS_CREATENEWTASK "新工作" - IDS_CREATENEWTASK_DESC "工作管理員將根據您所輸入的名稱，為您打開相應的程式、資料夾、檔案或網路資源。" + IDS_CREATENEWTASK_DESC "工作管理員將根據您所輸入的名稱，為您開啟相應的程式、資料夾、檔案或網路資源。" IDS_MSG_ACCESSPROCESSAFF "無法存取或設定處理器親和性" IDS_MSG_PROCESSONEPRO "程序必須連繫至少一個處理器。" IDS_MSG_INVALIDOPTION "選項無效" @@ -440,7 +440,7 @@ BEGIN IDS_MSG_TASKMGRWARNING "工作管理員警告" IDS_MSG_WARNINGTERMINATING "警告: 結束程序可能導政資料遺失或系統不穩定。\n程序在結束時將不能儲存任何資料。\n你是否確定要繼續？" IDS_MSG_UNABLETERMINATEPRO "無法結束處理程序" - IDS_MSG_CLOSESYSTEMPROCESS "這是一個關鍵的系統過程。工作管理員不會結束這一進程。" + IDS_MSG_CLOSESYSTEMPROCESS "這是一個關鍵的系統過程。工作管理員不會結束這一處理序。" IDS_MSG_UNABLECHANGEPRIORITY "無法更改優先順序" IDS_MSG_WARNINGCHANGEPRIORITY "警告: 更改此程序的優先順序可能導致系統不穩定。\n你是否確定要更改優先順序？" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情況: %d%%" diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 563a0a34fc..74e1d4108b 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -173,7 +173,7 @@ END IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN GROUPBOX "選擇程式圖示大小 ", IDC_STATIC, 7, 7, 238, 37 diff --git a/dll/cpl/access/lang/zh-TW.rc b/dll/cpl/access/lang/zh-TW.rc index 89f9467b27..9df242da4b 100644 --- a/dll/cpl/access/lang/zh-TW.rc +++ b/dll/cpl/access/lang/zh-TW.rc @@ -84,7 +84,7 @@ END IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體", 0, 0, 0x0 BEGIN GROUPBOX "自動重置", -1, 6, 11, 234, 47 diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index eb120c18df..421c4fd8f4 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -141,7 +141,7 @@ END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN GROUPBOX "顯示", -1, 7, 6, 237, 56, WS_GROUP diff --git a/dll/cpl/inetcpl/lang/zh-TW.rc b/dll/cpl/inetcpl/lang/zh-TW.rc index c059b030fb..5776dc731c 100644 --- a/dll/cpl/inetcpl/lang/zh-TW.rc +++ b/dll/cpl/inetcpl/lang/zh-TW.rc @@ -40,7 +40,7 @@ END IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 9, "新細明體" -CAPTION "常規" +CAPTION "一般" BEGIN GROUPBOX "主頁", IDC_STATIC, 4, 4, 312, 56 diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index 475c559965..a8a6a3df4e 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -95,12 +95,12 @@ BEGIN LTEXT "在計算機休眠時，它將內存中所有信息保存到硬碟上，然後關閉計算機。在退出休眠狀態時，計算機會恢復到原來的狀態。", -1, 37, 6, 210, 35 GROUPBOX "休眠", -1, 6, 41, 240, 32 AUTOCHECKBOX "啓用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP - GROUPBOX "用於休眠的磁盤空間", -1, 6, 80, 240, 76 - LTEXT "空閒的磁盤空間:", -1, 15, 95, 140, 10 + GROUPBOX "用於休眠的磁碟空間", -1, 6, 80, 240, 76 + LTEXT "空閒的磁碟空間:", -1, 15, 95, 140, 10 LTEXT "未知", IDC_FREESPACE, 160, 95, 80, 10 - LTEXT "休眠所需的磁盤空間:", -1, 15, 115, 140, 10 + LTEXT "休眠所需的磁碟空間:", -1, 15, 115, 140, 10 LTEXT "未知", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 - LTEXT "在計算機進入休眠之前，您必須釋放一些磁盤空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 + LTEXT "在計算機進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END STRINGTABLE diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index f0e893d334..94995aaf58 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -52,7 +52,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "要進行大多數改動，您必須作爲管理員身分登錄。", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "性能", IDC_STATIC, 6, 18, 244, 50 - LTEXT "性能選項控制應用程序如何使用內存。這將會影響到電腦運行速度。", IDC_STATIC, 16, 29, 228, 17 + 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 @@ -105,7 +105,7 @@ END IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "常規" +CAPTION "一般" FONT 8, "新細明體" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON @@ -162,7 +162,7 @@ BEGIN PUSHBUTTON "更改類型", IDC_USERPROFILE_CHANGE, 90, 155, 50, 15 PUSHBUTTON "刪除", IDC_USERPROFILE_DELETE, 145, 155, 50, 15 PUSHBUTTON "複製到", IDC_USERPROFILE_COPY, 200, 155, 50, 15 - CONTROL "要創建一個新的使用者帳戶，在控制面板中打開<A>使用者帳戶</A> 。", + CONTROL "要創建一個新的使用者帳戶，在控制面板中開啟<A>使用者帳戶</A> 。", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 DEFPUSHBUTTON "確定", IDOK, 134, 198, 54, 15 PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 @@ -301,8 +301,8 @@ BEGIN IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。" - IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 16 MB，並且不得超過所選磁盤上的可用空間。" - IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁盤上的可用空間。" + IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 16 MB，並且不得超過所選磁碟上的可用空間。" + IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁碟上的可用空間。" IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理" IDS_INFOREBOOT "您必須重新啓動電腦，才能套用更改。" diff --git a/dll/cpl/usrmgr/lang/zh-TW.rc b/dll/cpl/usrmgr/lang/zh-TW.rc index 4b1cc59dda..85f4ae0334 100644 --- a/dll/cpl/usrmgr/lang/zh-TW.rc +++ b/dll/cpl/usrmgr/lang/zh-TW.rc @@ -40,7 +40,7 @@ END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 @@ -89,7 +89,7 @@ END IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 diff --git a/dll/cpl/wined3dcfg/lang/zh-TW.rc b/dll/cpl/wined3dcfg/lang/zh-TW.rc index 855e2d6c95..7ce5051036 100644 --- a/dll/cpl/wined3dcfg/lang/zh-TW.rc +++ b/dll/cpl/wined3dcfg/lang/zh-TW.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 3cd8c4701a..565ba63fe7 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -18,12 +18,12 @@ BEGIN IDS_UNKNOWNDEVICE "未知的设备" IDS_NODRIVERLOADED "为此设备不安装任何驱动程序。" IDS_DEVONPARENT "on %1" - IDS_TROUBLESHOOTDEV "排除故障......(&T)" + IDS_TROUBLESHOOTDEV "排除故障(&T)..." IDS_ENABLEDEV "启用设备(&N)" IDS_REINSTALLDRV "重新安装驱动程序(&I)" IDS_PROPERTIES "属性(&R)" - IDS_UPDATEDRV "更新驱动程序...(&P)" - IDS_REBOOT "重新启动计算机...(&C)" + IDS_UPDATEDRV "更新驱动程序(&P)..." + IDS_REBOOT "重新启动计算机(&C)..." IDS_NOTAVAILABLE "没有可供选择" IDS_NOTDIGITALLYSIGNED "不进行数字签名" IDS_NODRIVERS "没有驱动程序文件要求或都已加载此设备。" @@ -129,14 +129,14 @@ IDD_HARDWARE DIALOGEX 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 9, "宋体" BEGIN - LTEXT "设备:(&D)", IDC_DEVICES, 7, 6, 196, 10 + LTEXT "设备(&D):", IDC_DEVICES, 7, 6, 196, 10 CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50 GROUPBOX "设备属性", IDC_PROPERTIESGROUP, 7, 76, 196, 105 LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_STATUS, 14, 112, 183, 30 - PUSHBUTTON "排除故障......(&T)", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "排除故障(&T)...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP PUSHBUTTON "属性(&R)", IDC_PROPERTIES, 146, 140, 50, 14 END @@ -155,8 +155,8 @@ BEGIN EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY GROUPBOX "设备状态", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL - PUSHBUTTON "排除故障...(&T)", IDC_DEVPROBLEM, 148, 163, 90, 15 - LTEXT "设备使用情况:(&D)", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + PUSHBUTTON "排除故障(&T)...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "设备使用情况(&D):", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -175,9 +175,9 @@ BEGIN EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "数字签名:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "驱动程序详细信息...(&D)", IDC_DRIVERDETAILS, 7, 106, 75, 15 + PUSHBUTTON "驱动程序详细信息(&D)...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "要查看有关驱动程序文件的详细信息。", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "更新驱动程序...(&U)", IDC_UPDATEDRIVER, 7, 134, 75, 15 + PUSHBUTTON "更新驱动程序(&U)...", IDC_UPDATEDRIVER, 7, 134, 75, 15 LTEXT "更新设备驱动程序。", -1, 91, 138, 154, 17, SS_NOPREFIX PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX @@ -192,7 +192,7 @@ FONT 9, "宋体" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "驱动程序文件:(&D)", -1, 7, 36, 204, 8 + LTEXT "驱动程序文件(&D):", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index dab5ce5bd1..4f10efaa6f 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -18,12 +18,12 @@ BEGIN IDS_UNKNOWNDEVICE "未知的裝置" IDS_NODRIVERLOADED "為此裝置不安裝任何驅動程式。" IDS_DEVONPARENT "on %1" - IDS_TROUBLESHOOTDEV "排除故障......(&T)" + IDS_TROUBLESHOOTDEV "排除故障(&T)..." IDS_ENABLEDEV "啟用裝置(&N)" IDS_REINSTALLDRV "重新安裝驅動程式(&I)" IDS_PROPERTIES "屬性(&R)" - IDS_UPDATEDRV "更新驅動程式...(&P)" - IDS_REBOOT "重新啟動計算機...(&C)" + IDS_UPDATEDRV "更新驅動程式(&P)..." + IDS_REBOOT "重新啟動電腦(&C)..." IDS_NOTAVAILABLE "沒有可供選擇" IDS_NOTDIGITALLYSIGNED "不進行數字簽名" IDS_NODRIVERS "沒有驅動程式檔案要求或都已載入此裝置。" @@ -39,24 +39,24 @@ END STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "此裝置工作正常。" - IDS_DEV_NOT_CONFIGURED "此裝置的配置不正確。" - IDS_DEV_DEVLOADER_FAILED "ReactOS 無法載入這個裝置的驅動程式，因為計算機報告兩個 %1 匯流排類型。" + IDS_DEV_NOT_CONFIGURED "此裝置的設定不正確。" + IDS_DEV_DEVLOADER_FAILED "ReactOS 無法載入這個裝置的驅動程式，因為電腦報告兩個 %1 匯流排類型。" IDS_DEV_DEVLOADER_FAILED2 "此裝置 %1 裝置裝載無法載入裝置驅動程式。" IDS_DEV_OUT_OF_MEMORY "此裝置的驅動程式可能已損壞，或者您的系統的內存或其他資源不足。" - IDS_DEV_ENTRY_IS_WRONG_TYPE "此裝置工作不正常，因為其驅動程式之一可能已損壞，或您的註冊表可能已損壞。" + IDS_DEV_ENTRY_IS_WRONG_TYPE "此裝置工作不正常，因為其驅動程式之一可能已損壞，或您的登錄可能已損壞。" IDS_DEV_LACKED_ARBITRATOR "此裝置的驅動程式要求 ReactOS 不知道如何處理資源。" IDS_DEV_BOOT_CONFIG_CONFLICT "另一個裝置正在使用此裝置所需的資源。" IDS_DEV_FAILED_FILTER "此裝置的驅動程式需要重新安裝。" IDS_DEV_DEVLOADER_NOT_FOUND "此裝置工作不正常，因為 ReactOS 不能載入的檔案載入裝置的驅動程式 %1。" IDS_DEV_DEVLOADER_NOT_FOUND2 "此裝置工作不正常，因為檔案 %1 載入此裝置的驅動程式是壞了。" IDS_DEV_DEVLOADER_NOT_FOUND3 "裝置故障: 試著改變此裝置的驅動程式。如果無法正常工作，請參閱硬體檔案。" - IDS_DEV_INVALID_DATA "此裝置工作不正常，因為您的計算機中的 BIOS 錯誤地報告裝置的資源。" + IDS_DEV_INVALID_DATA "此裝置工作不正常，因為您的電腦中的 BIOS 錯誤地報告裝置的資源。" IDS_DEV_INVALID_DATA2 "此裝置工作不正常，因為裝置的 BIOS 錯誤地報告裝置的資源。" IDS_DEV_FAILED_START "此裝置是要麼不存在，工作不正常，或者沒有安裝所有的驅動程式。" IDS_DEV_LIAR "ReactOS 停止響應嘗試啟動這個裝置，因此永遠不會嘗試重新啟動此裝置時。" IDS_DEV_NORMAL_CONFLICT "此裝置不能找到任何免費 %1 的資源使用。" IDS_DEV_NOT_VERIFIED "此裝置是要麼不存在，工作不正常，或者沒有安裝所有的驅動程式。" - IDS_DEV_NEED_RESTART "此裝置不能正常工作，直到您重新啟動計算機。" + IDS_DEV_NEED_RESTART "此裝置不能正常工作，直到您重新啟動電腦。" IDS_DEV_REENUMERATION "此裝置造成資源衝突。" IDS_DEV_PARTIAL_LOG_CONF "ReactOS 無法識別此裝置使用的所有資源。" IDS_DEV_UNKNOWN_RESOURCE "驅動程式資訊檔案 %1 告訴子裝置使用一種資源，父裝置不有，也不承認。" @@ -78,22 +78,22 @@ BEGIN IDS_DEV_FAILED_ADD "此裝置工作不正常，因為 %1 工作不正常。" IDS_DEV_DISABLED_SERVICE "ReactOS 不能安裝此裝置的驅動程式，因為它不能訪問已安裝檔案的驅動器或網路上的位置。" IDS_DEV_TRANSLATION_FAILED "此裝置沒有響應對其驅動程式。" - IDS_DEV_NO_SOFTCONFIG "ReactOS 不能確定此裝置的設定。請參考此裝置附帶的檔案，使用資源選項卡來設定配置。" - IDS_DEV_BIOS_TABLE "您的計算機的系統固件不包括足夠的資訊來正確配置和使用此裝置。 \n若要使用此裝置，請聯繫計算機製造商以獲取固件或 BIOS 更新。" - IDS_DEV_IRQ_TRANSLATION_FAILED "該裝置正在請求 PCI 中斷但被配置為 ISA 中斷 (反之亦然)。 \n請使用計算機的系統設定程式重新配置此裝置的中斷。" + IDS_DEV_NO_SOFTCONFIG "ReactOS 不能確定此裝置的設定。請參考此裝置附帶的檔案，使用資源選項卡來設定設定。" + IDS_DEV_BIOS_TABLE "您的電腦的系統軔體不包括足夠的資訊來正確設定和使用此裝置。 \n若要使用此裝置，請聯繫電腦製造商以獲取軔體或 BIOS 更新。" + IDS_DEV_IRQ_TRANSLATION_FAILED "該裝置正在請求 PCI 中斷但被設定為 ISA 中斷 (反之亦然)。 \n請使用電腦的系統設定程式重新設定此裝置的中斷。" IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS 無法初始化這個硬體的裝置驅動程式。" IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "由於裝置驅動程式的前一個例項仍在內存中，ReactOS 無法載入這個硬體的裝置驅動程式。" IDS_DEV_DRIVER_FAILED_LOAD "ReactOS 無法載入這個硬體的裝置驅動程式。驅動程式可能已損壞或丟失。" - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS 無法訪問這個硬體，因為它在註冊表中的服務金鑰資訊已丟失或記錄不正確。" + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS 無法訪問這個硬體，因為它在登錄中的服務金鑰資訊已丟失或記錄不正確。" IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS 成功地載入了這個硬體的裝置驅動程式，但找不到硬體裝置。" IDS_DEV_DUPLICATE_DEVICE "ReactOS 無法載入這個硬體的裝置驅動程式，因為那裡是一個重複的裝置已經在系統上運行。" IDS_DEV_FAILED_POST_START "ReactOS 已停止此裝置，因為它已報告的問題。" IDS_DEV_HALTED "應用程式或服務已關閉這個硬體裝置。" - IDS_DEV_PHANTOM "目前，這個硬體裝置沒有連線到計算機。" + IDS_DEV_PHANTOM "目前，這個硬體裝置沒有連線到電腦。" IDS_DEV_SYSTEM_SHUTDOWN "因為作業系統正在關閉 ReactOS 無法訪問這個硬體裝置。" - IDS_DEV_HELD_FOR_EJECT "ReactOS 不能使用這個硬體裝置，因為它已為安全刪除，但它不從計算機刪除。" + IDS_DEV_HELD_FOR_EJECT "ReactOS 不能使用這個硬體裝置，因為它已為安全刪除，但它不從電腦刪除。" IDS_DEV_DRIVER_BLOCKED "此裝置的軟體已經被阻止開始因為它已知有 ReactOS 的問題。請與硬體供應商聯繫新的驅動程式。" - IDS_DEV_REGISTRY_TOO_LARGE "ReactOS 不能啟動新的硬體裝置，因為系統配置單元是太大 (超過了註冊表大小限制)。" + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS 不能啟動新的硬體裝置，因為系統設定單元是太大 (超過了登錄大小限制)。" IDS_DEV_SETPROPERTIES_FAILED "ReactOS 不能更改此裝置的設定。" END @@ -107,7 +107,7 @@ BEGIN IDS_PROP_ENUMERATOR "列舉數" IDS_PROP_CAPABILITIES "能力" IDS_PROP_DEVNODEFLAGS "Devnode 標誌" - IDS_PROP_CONFIGFLAGS "配置標誌" + IDS_PROP_CONFIGFLAGS "設定標誌" IDS_PROP_CSCONFIGFLAGS "CSConfig 標誌" IDS_PROP_EJECTIONRELATIONS "彈射關係" IDS_PROP_REMOVALRELATIONS "刪除關係" @@ -119,7 +119,7 @@ BEGIN IDS_PROP_CLASSINSTALLER "安裝程式類" IDS_PROP_CLASSCOINSTALLER "類別協同安裝程" IDS_PROP_DEVICECOINSTALLER "裝置協同安裝程式" - IDS_PROP_FIRMWAREREVISION "固件版本" + IDS_PROP_FIRMWAREREVISION "軔體版本" IDS_PROP_CURRENTPOWERSTATE "當前電源狀態" IDS_PROP_POWERCAPABILITIES "電源功能" IDS_PROP_POWERSTATEMAPPINGS "電源狀態對映" @@ -129,20 +129,20 @@ IDD_HARDWARE DIALOGEX 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 9, "新細明體" BEGIN - LTEXT "裝置:(&D)", IDC_DEVICES, 7, 6, 196, 10 + LTEXT "裝置(&D):", IDC_DEVICES, 7, 6, 196, 10 CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50 GROUPBOX "裝置屬性", IDC_PROPERTIESGROUP, 7, 76, 196, 105 LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_STATUS, 14, 112, 183, 30 - PUSHBUTTON "排除故障......(&T)", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "排除故障(&T)...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP PUSHBUTTON "屬性(&R)", IDC_PROPERTIES, 146, 140, 50, 14 END IDD_DEVICEGENERAL DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -155,8 +155,8 @@ BEGIN EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY GROUPBOX "裝置狀態", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL - PUSHBUTTON "排除故障...(&T)", IDC_DEVPROBLEM, 148, 163, 90, 15 - LTEXT "裝置使用情況:(&D)", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + PUSHBUTTON "排除故障(&T)...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "裝置使用情況(&D):", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -175,9 +175,9 @@ BEGIN EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "數字簽名:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "驅動程式詳細資訊...(&D)", IDC_DRIVERDETAILS, 7, 106, 75, 15 + PUSHBUTTON "驅動程式詳細資訊(&D)...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "要檢視有關驅動程式檔案的詳細資訊。", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "更新驅動程式...(&U)", IDC_UPDATEDRIVER, 7, 134, 75, 15 + PUSHBUTTON "更新驅動程式(&U)...", IDC_UPDATEDRIVER, 7, 134, 75, 15 LTEXT "更新裝置驅動程式。", -1, 91, 138, 154, 17, SS_NOPREFIX PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX @@ -192,7 +192,7 @@ FONT 9, "新細明體" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "驅動程式檔案:(&D)", -1, 7, 36, 204, 8 + LTEXT "驅動程式檔案(&D):", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 @@ -272,7 +272,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS 裝置管理器" + IDS_APPNAME "ReactOS 裝置管理員" IDS_CONFIRM_DISABLE "禁用此裝置會使其停止運行。\r\n你真的想要禁用它嗎?" IDS_CONFIRM_UNINSTALL "警告: 您將要從系統中解除安裝此裝置。\r\n你想要繼續嗎?" END @@ -307,8 +307,8 @@ BEGIN IDS_HINT_DISABLE " 禁用所選的裝置。" IDS_HINT_UPDATE " 啟動所選裝置的更新驅動程式軟體嚮導。" IDS_HINT_UNINSTALL " 解除安裝所選裝置的驅動程式。" - IDS_HINT_ADD " 將一箇舊的 (非即插) 裝置添加到計算機。" - IDS_HINT_ABOUT " 關於 ReactOS 裝置管理器。" + IDS_HINT_ADD " 將一箇舊的 (非即插) 裝置添加到電腦。" + IDS_HINT_ABOUT " 關於 ReactOS 裝置管理員。" IDS_HINT_EXIT " 退出程式。" IDS_HINT_DEV_BY_TYPE " 按硬體類型顯示裝置。" diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 498a613e14..14ca30aa27 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN LTEXT "你可以得到如果您的網路支援此功能自動分配的 IP 設定。否則，您需要詢問網路管理員以獲得合適的 IP 設定。", -1, 9, 9, 235, 27 diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 7378995135..f54c9f3250 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -96,7 +96,7 @@ END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装程序 " +CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index e590cadcaa..cae401bc62 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -81,7 +81,7 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "系統區域設置應與您要使用的應用程序的語言相匹配。使用者區域設置控制數字，貨幣和日期的顯示方式。", IDC_STATIC, 53, 7, 253, 20 + LTEXT "系統區域設置應與您要使用的應用程式的語言相匹配。使用者區域設置控制數字，貨幣和日期的顯示方式。", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "若要變更系統和使用者的地區設定, 點選自訂。", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "自訂(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 diff --git a/dll/win32/tapiui/lang/zh-TW.rc b/dll/win32/tapiui/lang/zh-TW.rc index 0b19bd8db3..ef64ee2bb6 100644 --- a/dll/win32/tapiui/lang/zh-TW.rc +++ b/dll/win32/tapiui/lang/zh-TW.rc @@ -20,7 +20,7 @@ END 102 DIALOGEX 0, 0, 252, 255 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN ICON 202, 2000, 7, 7, 20, 20 @@ -91,7 +91,7 @@ END 105 DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "常規" +CAPTION "一般" FONT 9, "新細明體" BEGIN ICON 203, 2000, 7, 7, 20, 20 @@ -408,7 +408,7 @@ BEGIN 80 "是否確實要刪除此區號規則?" 81 "您必須輸入要撥打的號碼。" 82 "您輸入的電話卡名稱已在使用。請輸入一個唯一的名稱。" - 83 "ReactOS 需要從中你將撥號的位置電話信息。如果您取消沒有提供此信息，此程序可能無法正常撥號時。此外，一些應用程序響應您取消此對話框由立即重新發佈它。\n確實要取消嗎?" + 83 "ReactOS 需要從中你將撥號的位置電話信息。如果您取消沒有提供此信息，此程序可能無法正常撥號時。此外，一些應用程式響應您取消此對話方塊由立即重新發佈它。\n確實要取消嗎?" 84 "確認取消" 85 "我的位置" 86 "< 沒有服務提供商可用於安裝 >" @@ -419,7 +419,7 @@ BEGIN 91 "此頁正在嘗試訪問您的網絡上的目錄信息。\n你想允許它繼續嗎?" 92 "此頁嘗試訪問或更改網絡會議信息。\n你想允許它繼續嗎?" 93 "此頁嘗試訪問或更改登錄資訊。\n你想允許它繼續嗎?" - 1064 "不能打開電話和調制解調器控制面板。你可能有問題啓動電話服務。" + 1064 "不能開啟電話和調制解調器控制面板。你可能有問題啓動電話服務。" 1065 "刪除提供商" 15800 "23" 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" diff --git a/dll/win32/winmm/lang/winmm_Zh.rc b/dll/win32/winmm/lang/winmm_Zh.rc index ad912768a5..95734805ca 100644 --- a/dll/win32/winmm/lang/winmm_Zh.rc +++ b/dll/win32/winmm/lang/winmm_Zh.rc @@ -150,7 +150,7 @@ MMSYSERR_INVALPARAM, "不正確參數被傳遞給系統函數。" WAVERR_BADFORMAT, "以指定的格式不受支援或無法進行轉換。使用能力功能來確定所支援的格式" WAVERR_STILLPLAYING, "還播放媒體資料時，無法執行此操作。重置該設備，或等到完成資料玩。" WAVERR_UNPREPARED, "沒有準備的波標題。使用準備功能來準備標題，然後再試。 " -WAVERR_SYNC, "無法打開設備沒有使用 WAVE_ALLOWSYNC 標誌。請使用該標誌，然後再試。" +WAVERR_SYNC, "無法開啟設備沒有使用 WAVE_ALLOWSYNC 標誌。請使用該標誌，然後再試。" /* MIDI errors */ MIDIERR_UNPREPARED, "MIDI 標題未準備。使用準備功能來準備標題，然後再試。" @@ -161,11 +161,11 @@ MIDIERR_NODEVICE, "當前的 MIDI 映射器安裝是指沒有安裝在系統 MIDIERR_INVALIDSETUP, "當前的 MIDI 設置已損壞。複製原始的 MIDIMAP. CFG 檔到電腦系統的目錄，然後再試。" /* MCI errors */ -MCIERR_INVALID_DEVICE_ID, "不正確 MCI 裝置識別碼。使用時打開 MCI 設備返回的 ID。" +MCIERR_INVALID_DEVICE_ID, "不正確 MCI 裝置識別碼。使用時開啟 MCI 設備返回的 ID。" MCIERR_UNRECOGNIZED_KEYWORD, "驅動程式無法識別指定的命令參數。 " MCIERR_UNRECOGNIZED_COMMAND, "驅動程式無法識別指定的命令。" MCIERR_HARDWARE, "還有一個問題與您的媒體設備。請確保它正常工作，或與設備製造商聯繫。" -MCIERR_INVALID_DEVICE_NAME, "指定的設備未打開，或不被 MCI 識別。" +MCIERR_INVALID_DEVICE_NAME, "指定的設備未開啟，或不被 MCI 識別。" MCIERR_OUT_OF_MEMORY, "沒有足夠的記憶體完成此任務。\n退出一個或多個應用程式以增加可用記憶體，然後再試一次。" MCIERR_DEVICE_OPEN, "設備名稱是已被該應用程式用作別名。使用唯一的別名。" MCIERR_CANNOT_LOAD_DRIVER, "在載入指定的裝置驅動程式是檢測不到的問題。" diff --git a/modules/rosapps/applications/winfile/lang/zh-CN.rc b/modules/rosapps/applications/winfile/lang/zh-CN.rc index 8ffb6344dc..2ebd6c8fff 100644 --- a/modules/rosapps/applications/winfile/lang/zh-CN.rc +++ b/modules/rosapps/applications/winfile/lang/zh-CN.rc @@ -182,7 +182,7 @@ IDM_WINEFILE MENU #endif } - POPUP "磁盤(&D)" { + POPUP "磁碟(&D)" { MENUITEM "複製(&C)...", 201 MENUITEM "命名(&L)...", 202 MENUITEM SEPARATOR

1 0

[reactos] 01/01: [FONT][WIN32SS] Optimize a bit
by Katayama Hirofumi MZ 27 Dec '18

27 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ee576f91deeb88cf2146… commit 6ee576f91deeb88cf21462e9a7f5b6bef5513c74 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 27 09:23:49 2018 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 27 09:23:49 2018 +0900 [FONT][WIN32SS] Optimize a bit --- win32ss/gdi/ntgdi/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 0bdc40719a..cd548a5bca 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5806,6 +5806,8 @@ GreExtTextOutW( DxShift = fuOptions & ETO_PDY ? 1 : 0; use_kerning = FT_HAS_KERNING(face); previous = 0; + if ((fuOptions & ETO_OPAQUE) || + (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT))) { TextLeft = RealXStart; TextTop = YStart;

1 0

[reactos] 01/01: [TRANSLATION] Update Traditional Chinese translation. (#1192)
by Luo Yufan 26 Dec '18

26 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1de19002a9d7cf848d8f… commit d1de19002a9d7cf848d8f4c59410755575dd8149 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Thu Dec 27 04:02:23 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 26 21:02:23 2018 +0100 [TRANSLATION] Update Traditional Chinese translation. (#1192) --- base/applications/cmdutils/help/lang/zh-TW.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/regedit/lang/zh-TW.rc | 2 +- base/applications/taskmgr/lang/zh-TW.rc | 2 +- dll/cpl/desk/lang/zh-TW.rc | 2 +- dll/cpl/main/lang/zh-TW.rc | 6 +++--- dll/cpl/powercfg/lang/zh-TW.rc | 4 ++-- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- dll/shellext/ntobjshex/lang/zh-TW.rc | 2 +- dll/win32/devmgr/lang/zh-TW.rc | 2 +- dll/win32/newdev/lang/zh-TW.rc | 2 +- dll/win32/tapiui/lang/zh-TW.rc | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/cmdutils/help/lang/zh-TW.rc b/base/applications/cmdutils/help/lang/zh-TW.rc index 9afe998ea6..20d1e74cec 100644 --- a/base/applications/cmdutils/help/lang/zh-TW.rc +++ b/base/applications/cmdutils/help/lang/zh-TW.rc @@ -47,7 +47,7 @@ MOVE 將一個或多個檔從一個資料夾移動到另一個資料夾。\n PATH 顯示或設置可執行檔的搜索路徑。\n\ PAUSE 掛起批次檔的執行並顯示一條消息。\n\ POPD 恢復由 PUSHD 存儲的前一個目前的目錄的值。\n\ -PROMPT 更改命令提示符。\n\ +PROMPT 更改命令提示字元。\n\ PUSHD 保存目前的目錄然後更改。\n\ RD 刪除一個目錄。\n\ REM 在批次檔中記錄注釋 (評論)。\n\ diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 74bf5e5062..c89314dde4 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -57,7 +57,7 @@ BEGIN MENUITEM SEPARATOR POPUP "縮放" BEGIN - POPUP "用戶自定義" + POPUP "使用者自訂" BEGIN MENUITEM "12.5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index 3979788c3c..2a8dc503fb 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -289,7 +289,7 @@ BEGIN ID_REGISTRY_IMPORTREGISTRYFILE "將檔案匯入到登錄中。" ID_REGISTRY_EXPORTREGISTRYFILE "將登錄全部或部分匯出到檔案中。" ID_REGISTRY_LOADHIVE "載入 Hive 控制檔到登錄中。" - ID_REGISTRY_UNLOADHIVE "從註冊表中解除載入 Hive 控制檔。" + ID_REGISTRY_UNLOADHIVE "從登錄中解除載入 Hive 控制檔。" ID_REGISTRY_CONNECTNETWORKREGISTRY "連線到遠端電腦的登錄。" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "斷開與遠端電腦登錄的連線。" ID_REGISTRY_PRINT "列印所有或部分登錄。" diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 2d91b2ade6..e2fec31aa6 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -431,7 +431,7 @@ BEGIN IDS_MENU_CPUHISTORY "CPU 使用記錄(&C)" IDS_MENU_SHOWKERNELTIMES "顯示核心時間(&S)" IDS_CREATENEWTASK "新工作" - IDS_CREATENEWTASK_DESC "工作管理員將根據您所輸入的名稱，為您打開相應的程式、文件夾、文件或網絡資源。" + IDS_CREATENEWTASK_DESC "工作管理員將根據您所輸入的名稱，為您打開相應的程式、資料夾、檔案或網路資源。" IDS_MSG_ACCESSPROCESSAFF "無法存取或設定處理器親和性" IDS_MSG_PROCESSONEPRO "程序必須連繫至少一個處理器。" IDS_MSG_INVALIDOPTION "選項無效" diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 1f35df64e9..eb120c18df 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -207,7 +207,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "顯示" - IDS_CPLDESCRIPTION "自定義桌面顯示和螢幕保護程式" + IDS_CPLDESCRIPTION "自訂桌面顯示和螢幕保護裝置" IDS_NONE "(無)" IDS_CENTER "居中" IDS_STRETCH "拉伸" diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc index 5ced394f53..c5a0abc0f7 100644 --- a/dll/cpl/main/lang/zh-TW.rc +++ b/dll/cpl/main/lang/zh-TW.rc @@ -83,7 +83,7 @@ BEGIN PUSHBUTTON "另存為(&V)...", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14 PUSHBUTTON "刪除(&D)", IDC_BUTTON_DELETE_SCHEME, 128, 31, 50, 14 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "自定義(&C):", -1, 5, 57, 60, 10 + LTEXT "自訂(&C):", -1, 5, 57, 60, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "啟用指針陰影(&E)", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 PUSHBUTTON "使用預設值(&F)", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 @@ -147,9 +147,9 @@ END STRINGTABLE BEGIN IDS_CPLNAME_1 "滑鼠" - IDS_CPLDESCRIPTION_1 "自定義滑鼠設定，例如按鈕設定，雙擊速度，滑鼠指針，和移動速度。" + IDS_CPLDESCRIPTION_1 "自訂滑鼠設定，例如按鈕設定，雙擊速度，滑鼠指針，和移動速度。" IDS_CPLNAME_2 "鍵盤" - IDS_CPLDESCRIPTION_2 "自定義鍵盤設定，例如指針閃爍速率和字元重複速率。" + IDS_CPLDESCRIPTION_2 "自訂鍵盤設定，例如指針閃爍速率和字元重複速率。" IDS_ARROW "正常選擇" IDS_HELP "幫助選擇" IDS_APPSTARTING "後臺運行" diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index 9fff9c10f6..475c559965 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -22,7 +22,7 @@ BEGIN LTEXT "關閉監視器(&M):", IDC_MONITOR, 13, 148, 84, 10 COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "關閉硬盤(&I):", IDC_DISK, 13, 171, 84, 10 + LTEXT "關閉硬碟(&I):", IDC_DISK, 13, 171, 84, 10 COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "系統待機(&T):", IDC_STANDBY, 13, 191, 84, 10 @@ -92,7 +92,7 @@ CAPTION "休眠" FONT 9, "新細明體" BEGIN ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 - LTEXT "在計算機休眠時，它將內存中所有信息保存到硬盤上，然後關閉計算機。在退出休眠狀態時，計算機會恢復到原來的狀態。", -1, 37, 6, 210, 35 + LTEXT "在計算機休眠時，它將內存中所有信息保存到硬碟上，然後關閉計算機。在退出休眠狀態時，計算機會恢復到原來的狀態。", -1, 37, 6, 210, 35 GROUPBOX "休眠", -1, 6, 41, 240, 32 AUTOCHECKBOX "啓用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP GROUPBOX "用於休眠的磁盤空間", -1, 6, 80, 240, 76 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 11cf4f0905..f0e893d334 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 LTEXT "初始大小(MB)(&I):", -1, 22, 118, 75, 9 LTEXT "最大值(MB)(&X):", -1, 22, 131, 75, 9 - AUTORADIOBUTTON "自定義大小(&C):", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "自訂大小(&C):", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP AUTORADIOBUTTON "系統管理的大小(&Y)", IDC_SYSMANSIZE, 20, 145, 88, 9 AUTORADIOBUTTON "無分頁文件(&N)", IDC_NOPAGEFILE, 20, 158, 78,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE diff --git a/dll/shellext/ntobjshex/lang/zh-TW.rc b/dll/shellext/ntobjshex/lang/zh-TW.rc index 2989e012a9..807de59209 100644 --- a/dll/shellext/ntobjshex/lang/zh-TW.rc +++ b/dll/shellext/ntobjshex/lang/zh-TW.rc @@ -5,5 +5,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT 物件名稱空間" - IDS_REGISTRY_NAME "系統註冊表" + IDS_REGISTRY_NAME "系統登錄" END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index add5f5f6da..dab5ce5bd1 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -61,7 +61,7 @@ BEGIN IDS_DEV_PARTIAL_LOG_CONF "ReactOS 無法識別此裝置使用的所有資源。" IDS_DEV_UNKNOWN_RESOURCE "驅動程式資訊檔案 %1 告訴子裝置使用一種資源，父裝置不有，也不承認。" IDS_DEV_REINSTALL "此裝置的驅動程式需要重新安裝。" - IDS_DEV_REGISTRY "您的註冊表可能已損壞。" + IDS_DEV_REGISTRY "您的登錄可能已損毀。" IDS_DEV_WILL_BE_REMOVED "ReactOS 刪除這個裝置。" IDS_DEV_DISABLED "此裝置未啟動。" IDS_DEV_DISABLED2 "此裝置已被禁用。" diff --git a/dll/win32/newdev/lang/zh-TW.rc b/dll/win32/newdev/lang/zh-TW.rc index 6e59b062a7..5fbc83371a 100644 --- a/dll/win32/newdev/lang/zh-TW.rc +++ b/dll/win32/newdev/lang/zh-TW.rc @@ -11,7 +11,7 @@ BEGIN LTEXT "此嚮導將安裝新的裝置驅動程式:", IDC_STATIC, 120, 21, 195, 16 LTEXT "單擊下一步繼續。", IDC_STATIC, 120, 169, 195, 16 LTEXT "未知的裝置", IDC_DEVICE, 148, 36, 147, 17 - LTEXT "警告! 安裝自定義的裝置可能會凍結您的計算機或使其無法啟動!", IDC_STATIC, 120, 59, 195, 16 + LTEXT "警告! 安裝自訂的裝置可能會凍結您的電腦或使其無法啟動!", IDC_STATIC, 120, 59, 195, 16 CONTROL "自動安裝驅動程式", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "從特定位置安裝驅動程式", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 END diff --git a/dll/win32/tapiui/lang/zh-TW.rc b/dll/win32/tapiui/lang/zh-TW.rc index 09f95e367b..0b19bd8db3 100644 --- a/dll/win32/tapiui/lang/zh-TW.rc +++ b/dll/win32/tapiui/lang/zh-TW.rc @@ -418,7 +418,7 @@ BEGIN 90 "此頁正在嘗試進行或監視電話呼叫或其他多媒體連接您的計算機上。\n您想允許它繼續嗎?" 91 "此頁正在嘗試訪問您的網絡上的目錄信息。\n你想允許它繼續嗎?" 92 "此頁嘗試訪問或更改網絡會議信息。\n你想允許它繼續嗎?" - 93 "此頁嘗試訪問或更改註冊表信息。\n你想允許它繼續嗎?" + 93 "此頁嘗試訪問或更改登錄資訊。\n你想允許它繼續嗎?" 1064 "不能打開電話和調制解調器控制面板。你可能有問題啓動電話服務。" 1065 "刪除提供商" 15800 "23"

1 0

[reactos] 01/01: [NTOS:IO] When a device has been started, create an Enum sub key to its service key and add the device instance name to the Enum sub key.
by Eric Kohl 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=079f7027f604f02875be5… commit 079f7027f604f02875be54e98b11cc7c62d6c651 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Dec 25 23:04:27 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Dec 25 23:04:27 2018 +0100 [NTOS:IO] When a device has been started, create an Enum sub key to its service key and add the device instance name to the Enum sub key. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 143 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index d6e181626b..3ea446977c 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -646,6 +646,147 @@ IopSendStopDevice(IN PDEVICE_OBJECT DeviceObject) IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +static +NTSTATUS +IopSetServiceEnumData(PDEVICE_NODE DeviceNode) +{ + UNICODE_STRING ServicesKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + UNICODE_STRING ServiceKeyName; + UNICODE_STRING EnumKeyName; + UNICODE_STRING ValueName; + PKEY_VALUE_FULL_INFORMATION KeyValueInformation; + HANDLE ServiceKey = NULL, ServiceEnumKey; + ULONG Disposition; + ULONG Count = 0, NextInstance = 0; + WCHAR ValueBuffer[6]; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("IopSetServiceEnumData(%p)\n", DeviceNode); + DPRINT("Instance: %wZ\n", &DeviceNode->InstancePath); + DPRINT("Service: %wZ\n", &DeviceNode->ServiceName); + + if (DeviceNode->ServiceName.Buffer == NULL) + { + DPRINT1("No service!\n"); + return STATUS_SUCCESS; + } + + ServiceKeyName.MaximumLength = ServicesKeyPath.Length + DeviceNode->ServiceName.Length + sizeof(UNICODE_NULL); + ServiceKeyName.Length = 0; + ServiceKeyName.Buffer = ExAllocatePool(PagedPool, ServiceKeyName.MaximumLength); + if (ServiceKeyName.Buffer == NULL) + { + DPRINT1("No ServiceKeyName.Buffer!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&ServiceKeyName, &ServicesKeyPath); + RtlAppendUnicodeStringToString(&ServiceKeyName, &DeviceNode->ServiceName); + + DPRINT("ServiceKeyName: %wZ\n", &ServiceKeyName); + + Status = IopOpenRegistryKeyEx(&ServiceKey, NULL, &ServiceKeyName, KEY_CREATE_SUB_KEY); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + RtlInitUnicodeString(&EnumKeyName, L"Enum"); + Status = IopCreateRegistryKeyEx(&ServiceEnumKey, + ServiceKey, + &EnumKeyName, + KEY_SET_VALUE, + REG_OPTION_VOLATILE, + &Disposition); + if (NT_SUCCESS(Status)) + { + if (Disposition == REG_OPENED_EXISTING_KEY) + { + /* Read the NextInstance value */ + Status = IopGetRegistryValue(ServiceEnumKey, + L"Count", + &KeyValueInformation); + if (!NT_SUCCESS(Status)) + goto done; + + if ((KeyValueInformation->Type == REG_DWORD) && + (KeyValueInformation->DataLength)) + { + /* Read it */ + Count = *(PULONG)((ULONG_PTR)KeyValueInformation + + KeyValueInformation->DataOffset); + } + + ExFreePool(KeyValueInformation); + KeyValueInformation = NULL; + + /* Read the NextInstance value */ + Status = IopGetRegistryValue(ServiceEnumKey, + L"NextInstance", + &KeyValueInformation); + if (!NT_SUCCESS(Status)) + goto done; + + if ((KeyValueInformation->Type == REG_DWORD) && + (KeyValueInformation->DataLength)) + { + NextInstance = *(PULONG)((ULONG_PTR)KeyValueInformation + + KeyValueInformation->DataOffset); + } + + ExFreePool(KeyValueInformation); + KeyValueInformation = NULL; + } + + /* Set the instance path */ + swprintf(ValueBuffer, L"%lu", NextInstance); + RtlInitUnicodeString(&ValueName, ValueBuffer); + Status = ZwSetValueKey(ServiceEnumKey, + &ValueName, + 0, + REG_SZ, + DeviceNode->InstancePath.Buffer, + DeviceNode->InstancePath.MaximumLength); + if (!NT_SUCCESS(Status)) + goto done; + + /* Increment Count and NextInstance */ + Count++; + NextInstance++; + + /* Set the new Count value */ + RtlInitUnicodeString(&ValueName, L"Count"); + Status = ZwSetValueKey(ServiceEnumKey, + &ValueName, + 0, + REG_DWORD, + &Count, + sizeof(Count)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the new NextInstance value */ + RtlInitUnicodeString(&ValueName, L"NextInstance"); + Status = ZwSetValueKey(ServiceEnumKey, + &ValueName, + 0, + REG_DWORD, + &NextInstance, + sizeof(NextInstance)); + } + +done: + if (ServiceEnumKey != NULL) + ZwClose(ServiceEnumKey); + + if (ServiceKey != NULL) + ZwClose(ServiceKey); + + ExFreePool(ServiceKeyName.Buffer); + + return Status; +} + VOID NTAPI IopStartDevice2(IN PDEVICE_OBJECT DeviceObject) @@ -739,6 +880,8 @@ IopStartAndEnumerateDevice(IN PDEVICE_NODE DeviceNode) } #endif + IopSetServiceEnumData(DeviceNode); + /* Make sure we're started, and check if we need enumeration */ if ((DeviceNode->Flags & DNF_STARTED) && (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY))

1 0

[reactos] 01/01: [FONT][WIN32SS] Follow-up of #1184
by Katayama Hirofumi MZ 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be8446588339ad3fb73dc… commit be8446588339ad3fb73dc4acc92766813abdfd41 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 25 21:51:58 2018 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 25 21:54:33 2018 +0900 [FONT][WIN32SS] Follow-up of #1184 --- win32ss/gdi/ntgdi/freetype.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 85ad7ceb46..0bdc40719a 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5813,10 +5813,13 @@ GreExtTextOutW( { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); + // FIXME: Use FT_LOAD_BITMAP_METRICS_ONLY or cache. error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); + DPRINT1("Failed to load glyph! [index: %d]\n", glyph_index); + IntUnLockFreeType(); + goto Cleanup; } glyph = face->glyph; @@ -5828,6 +5831,8 @@ GreExtTextOutW( if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); + IntUnLockFreeType(); + goto Cleanup; } /* retrieve kerning distance and move pen position */

1 0

[reactos] 03/03: [BTRFS] Reduce diff with upstream
by Pierre Schweitzer 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6cd48809abe178cc9b5c… commit e6cd48809abe178cc9b5c20670ce1a8770ae9d2d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 25 13:50:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 25 13:50:41 2018 +0100 [BTRFS] Reduce diff with upstream CORE-15452 --- drivers/filesystems/btrfs/btrfs_drv.h | 12 ++++++++++++ drivers/filesystems/btrfs/create.c | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index e6ea5891f3..3ccb10ac06 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -1856,6 +1856,11 @@ NTSTATUS NTAPI ZwQueryInformationProcess( #endif #endif +#if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_VISTA) +typedef struct _ECP_LIST ECP_LIST; +typedef struct _ECP_LIST *PECP_LIST; +#endif + #if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) NTSTATUS WINAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, ULONG *utf8_bytes_written, @@ -1870,6 +1875,13 @@ NTSTATUS NTAPI FsRtlRemoveDotsFromPath(PWSTR OriginalString, NTSTATUS NTAPI FsRtlValidateReparsePointBuffer(ULONG BufferLength, PREPARSE_DATA_BUFFER ReparseBuffer); ULONG NTAPI KeQueryActiveProcessorCount(PKAFFINITY ActiveProcessors); +NTSTATUS NTAPI FsRtlGetEcpListFromIrp(IN PIRP Irp, + OUT PECP_LIST *EcpList); +NTSTATUS NTAPI FsRtlGetNextExtraCreateParameter(IN PECP_LIST EcpList, + IN PVOID CurrentEcpContext, + OUT LPGUID NextEcpType OPTIONAL, + OUT PVOID *NextEcpContext, + OUT PULONG NextEcpContextSize OPTIONAL); #endif /* defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_VISTA) */ #endif diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index 1b4417e802..2cde2371e8 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -2510,10 +2510,8 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R UNICODE_STRING dsus, fpus, stream; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); POOL_TYPE pool_type = IrpSp->Flags & SL_OPEN_PAGING_FILE ? NonPagedPool : PagedPool; -#ifndef __REACTOS__ ECP_LIST* ecp_list; ATOMIC_CREATE_ECP_CONTEXT* acec = NULL; -#endif #ifdef DEBUG_FCB_REFCOUNTS LONG oc; #endif @@ -2526,7 +2524,6 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R if (options & FILE_DELETE_ON_CLOSE && IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) return STATUS_CANNOT_DELETE; -#ifndef __REACTOS__ if (NT_SUCCESS(FsRtlGetEcpListFromIrp(Irp, &ecp_list)) && ecp_list) { void* ctx = NULL; GUID type; @@ -2543,7 +2540,6 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R } } while (NT_SUCCESS(Status)); } -#endif dsus.Buffer = (WCHAR*)datasuf; dsus.Length = dsus.MaximumLength = sizeof(datasuf) - sizeof(WCHAR); @@ -2720,7 +2716,6 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R FileObject->SectionObjectPointer = &fileref->fcb->nonpaged->segment_object; -#ifndef __REACTOS__ // FIXME - ATOMIC_CREATE_ECP_IN_FLAG_BEST_EFFORT if (acec && acec->InFlags & ATOMIC_CREATE_ECP_IN_FLAG_REPARSE_POINT_SPECIFIED) { if (acec->ReparseBufferLength > sizeof(UINT32) && *(UINT32*)acec->ReparseBuffer == IO_REPARSE_TAG_SYMLINK) { @@ -2751,7 +2746,6 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R acec->OutFlags |= ATOMIC_CREATE_ECP_OUT_FLAG_REPARSE_POINT_SET; } -#endif fileref->dc->type = fileref->fcb->type;

1 0

[reactos] 02/03: [NTOSKRNL_VISTA] Implement FsRtlGetEcpListFromIrp and FsRtlGetNextExtraCreateParameter
by Pierre Schweitzer 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f75ea083e356c4c9eba0e… commit f75ea083e356c4c9eba0e59262f5fbeeca241136 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 25 13:45:41 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 25 13:50:41 2018 +0100 [NTOSKRNL_VISTA] Implement FsRtlGetEcpListFromIrp and FsRtlGetNextExtraCreateParameter CORE-15452 --- sdk/lib/drivers/ntoskrnl_vista/fsrtl.c | 119 +++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c index 4d7831aa4c..8b714af57a 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c +++ b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c @@ -9,6 +9,33 @@ #include <ntdef.h> #include <ntifs.h> +typedef struct _ECP_LIST +{ + ULONG Signature; + ULONG Flags; + LIST_ENTRY EcpList; +} ECP_LIST, *PECP_LIST; + +typedef ULONG ECP_HEADER_FLAGS; + +typedef struct _ECP_HEADER +{ + ULONG Signature; + ULONG Spare; + LIST_ENTRY ListEntry; + GUID EcpType; + PFSRTL_EXTRA_CREATE_PARAMETER_CLEANUP_CALLBACK CleanupCallback; + ECP_HEADER_FLAGS Flags; + ULONG Size; + PVOID ListAllocatedFrom; + PVOID Filter; +} ECP_HEADER, *PECP_HEADER; + +#define ECP_HEADER_SIZE (sizeof(ECP_HEADER)) + +#define ECP_HEADER_TO_CONTEXT(H) ((PVOID)((ULONG_PTR)H + ECP_HEADER_SIZE)) +#define ECP_CONTEXT_TO_HEADER(C) ((PECP_HEADER)((ULONG_PTR)C - ECP_HEADER_SIZE)) + NTKERNELAPI NTSTATUS NTAPI @@ -240,3 +267,95 @@ FsRtlValidateReparsePointBuffer(IN ULONG BufferLength, return STATUS_IO_REPARSE_TAG_INVALID; } +NTKERNELAPI +NTSTATUS +NTAPI +FsRtlGetEcpListFromIrp(IN PIRP Irp, + OUT PECP_LIST *EcpList) +{ + /* Call Io */ + return IoGetIrpExtraCreateParameter(Irp, EcpList); +} + +NTKERNELAPI +NTSTATUS +NTAPI +FsRtlGetNextExtraCreateParameter(IN PECP_LIST EcpList, + IN PVOID CurrentEcpContext, + OUT LPGUID NextEcpType OPTIONAL, + OUT PVOID *NextEcpContext, + OUT PULONG NextEcpContextSize OPTIONAL) +{ + PECP_HEADER CurrentEntry; + + /* If we have no context ... */ + if (CurrentEcpContext == NULL) + { + if (IsListEmpty(&EcpList->EcpList)) + { + goto FailEmpty; + } + + /* Simply consider first entry */ + CurrentEntry = CONTAINING_RECORD(EcpList->EcpList.Flink, ECP_HEADER, ListEntry); + } + else + { + /* Otherwise, consider the entry matching the given context */ + CurrentEntry = ECP_CONTEXT_TO_HEADER(CurrentEcpContext); + + /* Make sure we didn't reach the end */ + if (&CurrentEntry->ListEntry == &EcpList->EcpList) + { + goto FailEmpty; + } + } + + /* We must have an entry */ + if (CurrentEntry == NULL) + { + goto FailEmpty; + } + + /* If caller wants a context, give it */ + if (NextEcpContext != NULL) + { + *NextEcpContext = ECP_HEADER_TO_CONTEXT(CurrentEntry); + } + + /* Same for its size (which the size minus the header overhead) */ + if (NextEcpContextSize != NULL) + { + *NextEcpContextSize = CurrentEntry->Size - sizeof(ECP_HEADER); + } + + /* And copy the type if asked to */ + if (NextEcpType != NULL) + { + RtlCopyMemory(NextEcpType, &CurrentEntry->EcpType, sizeof(GUID)); + } + + /* Job done */ + return STATUS_SUCCESS; + + /* Failure case: just zero everything */ +FailEmpty: + if (NextEcpContext != NULL) + { + *NextEcpContext = NULL; + } + + if (NextEcpContextSize != NULL) + { + *NextEcpContextSize = 0; + } + + if (NextEcpType != NULL) + { + RtlZeroMemory(NextEcpType, sizeof(GUID)); + } + + /* And return failure */ + return STATUS_NOT_FOUND; +} +

1 0

[reactos] 01/03: [NTOSKRNL_VISTA] Implement IoGetIrpExtraCreateParameter
by Pierre Schweitzer 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a76b8843a88fedd4d1815… commit a76b8843a88fedd4d1815704412d110006b2000e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 25 13:44:44 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 25 13:50:40 2018 +0100 [NTOSKRNL_VISTA] Implement IoGetIrpExtraCreateParameter CORE-15452 --- sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 1 + sdk/lib/drivers/ntoskrnl_vista/io.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 0fdafabeb9..0fd8fd8c7e 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) list(APPEND SOURCE fsrtl.c + io.c ke.c rtl.c) diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c new file mode 100644 index 0000000000..1d88cbb68f --- /dev/null +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/drivers/ntoskrnl_vista/io.c + * PURPOSE: Io functions of Vista+ + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <ntdef.h> +#include <ntifs.h> + +NTKERNELAPI +NTSTATUS +NTAPI +IoGetIrpExtraCreateParameter(IN PIRP Irp, + OUT PECP_LIST *ExtraCreateParameter) +{ + /* Check we have a create operation */ + if (!BooleanFlagOn(Irp->Flags, IRP_CREATE_OPERATION)) + { + return STATUS_INVALID_PARAMETER; + } + + /* If so, return user buffer */ + *ExtraCreateParameter = Irp->UserBuffer; + return STATUS_SUCCESS; +}

1 0

[reactos] 01/01: [FONT][WIN32SS] Refactor rendering text background (#1184)
by Katayama Hirofumi MZ 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6cfeaef5105dc6db2f12… commit d6cfeaef5105dc6db2f12682bc48f17f9caacdcc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 25 20:41:25 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 25 20:41:25 2018 +0900 [FONT][WIN32SS] Refactor rendering text background (#1184) Simplify the background filling codes. CORE-14856 --- win32ss/gdi/ntgdi/freetype.c | 295 +++++++++++++------------------------------ 1 file changed, 89 insertions(+), 206 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 744db67cb1..85ad7ceb46 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5593,7 +5593,7 @@ GreExtTextOutW( FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; LONGLONG TextLeft, RealXStart; - ULONG TextTop, previous, BackgroundLeft; + ULONG TextTop, previous; FT_Bool use_kerning; RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; @@ -5617,6 +5617,7 @@ GreExtTextOutW( BOOL EmuBold, EmuItalic; int thickness; BOOL bResult; + ULONGLONG TextWidth; /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) @@ -5798,136 +5799,16 @@ GreExtTextOutW( yoff = fixAscender >> 6; #undef VALIGN_MASK - use_kerning = FT_HAS_KERNING(face); - previous = 0; - /* - * Process the horizontal alignment and modify XStart accordingly. + * Calculate width of the text. */ + TextWidth = 0; DxShift = fuOptions & ETO_PDY ? 1 : 0; - if (pdcattr->lTextAlign & (TA_RIGHT | TA_CENTER)) - { - ULONGLONG TextWidth = 0; - LPCWSTR TempText = String; - int iStart; - - /* - * Calculate width of the text. - */ - - if (NULL != Dx) - { - iStart = Count < 2 ? 0 : Count - 2; - TextWidth = Count < 2 ? 0 : (Dx[(Count-2)<<DxShift] << 6); - } - else - { - iStart = 0; - } - TempText = String + iStart; - - for (i = iStart; i < Count; i++) - { - glyph_index = get_glyph_index_flagged(face, *TempText, ETO_GLYPH_INDEX, fuOptions); - - if (EmuBold || EmuItalic) - realglyph = NULL; - else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - RenderMode, pmxWorldToDevice); - if (!realglyph) - { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); - } - - glyph = face->glyph; - if (EmuBold || EmuItalic) - { - if (EmuBold) - FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) - FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); - } - else - { - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - plf->lfHeight, - pmxWorldToDevice, - glyph, - RenderMode); - } - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - goto Cleanup; - } - - } - /* Retrieve kerning distance */ - if (use_kerning && previous && glyph_index) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextWidth += delta.x; - } - - TextWidth += realglyph->root.advance.x >> 10; - - if (EmuBold || EmuItalic) - { - FT_Done_Glyph((FT_Glyph)realglyph); - realglyph = NULL; - } - - previous = glyph_index; - TempText++; - } - - previous = 0; - - if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) - { - RealXStart -= TextWidth / 2; - } - else - { - RealXStart -= TextWidth; - } - } - - psurf = dc->dclevel.pSurface; - SurfObj = &psurf->SurfObj ; - - if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) - DC_vUpdateBackgroundBrush(dc) ; - - if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) - DC_vUpdateTextBrush(dc) ; - - if (!face->units_per_EM) - { - thickness = 1; - } - else - { - thickness = face->underline_thickness * - face->size->metrics.y_ppem / face->units_per_EM; - if (thickness <= 0) - thickness = 1; - } - - if ((fuOptions & ETO_OPAQUE) && plf->lfItalic) + use_kerning = FT_HAS_KERNING(face); + previous = 0; { - /* Draw background */ TextLeft = RealXStart; TextTop = YStart; - BackgroundLeft = (RealXStart + 32) >> 6; for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); @@ -5935,9 +5816,7 @@ GreExtTextOutW( error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { - DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - goto Cleanup; + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); } glyph = face->glyph; @@ -5949,59 +5828,19 @@ GreExtTextOutW( if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - goto Cleanup; } /* retrieve kerning distance and move pen position */ - if (use_kerning && previous && glyph_index && NULL == Dx) + if (use_kerning && previous && glyph_index && Dx == NULL) { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); TextLeft += delta.x; } - DPRINT("TextLeft: %I64d\n", TextLeft); - DPRINT("TextTop: %lu\n", TextTop); - DPRINT("Advance: %d\n", realglyph->root.advance.x); - - DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) - { - IntUpdateBoundsRect(dc, &DestRect); - } - IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - MouseSafetyOnDrawEnd(dc->ppdev); - BackgroundLeft = DestRect.right; - - DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; - DestRect.right = DestRect.left + realglyph->bitmap.width; - DestRect.top = TextTop + yoff - realglyph->top; - DestRect.bottom = DestRect.top + realglyph->bitmap.rows; - - bitSize.cx = realglyph->bitmap.width; - bitSize.cy = realglyph->bitmap.rows; - MaskRect.right = realglyph->bitmap.width; - MaskRect.bottom = realglyph->bitmap.rows; - if (NULL == Dx) + if (Dx == NULL) { TextLeft += realglyph->root.advance.x >> 10; - DPRINT("New TextLeft: %I64d\n", TextLeft); } else { @@ -6011,9 +5850,8 @@ GreExtTextOutW( FLOATOBJ_Set1(&Scale); /* do the shift before multiplying to preserve precision */ - FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); + FLOATOBJ_MulLong(&Scale, Dx[i << DxShift] << 6); TextLeft += FLOATOBJ_GetLong(&Scale); - DPRINT("New TextLeft2: %I64d\n", TextLeft); } if (DxShift) @@ -6029,6 +5867,84 @@ GreExtTextOutW( realglyph = NULL; } } + + TextWidth = TextLeft - RealXStart; + } + + /* + * Process the horizontal alignment and modify XStart accordingly. + */ + if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) + { + RealXStart -= TextWidth / 2; + } + else if ((pdcattr->lTextAlign & TA_RIGHT) == TA_RIGHT) + { + RealXStart -= TextWidth; + if (((RealXStart + TextWidth + 32) >> 6) <= Start.x + dc->ptlDCOrig.x) + RealXStart += 1 << 6; + } + + psurf = dc->dclevel.pSurface; + SurfObj = &psurf->SurfObj ; + + if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) + DC_vUpdateBackgroundBrush(dc) ; + + if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(dc) ; + + if (!face->units_per_EM) + { + thickness = 1; + } + else + { + thickness = face->underline_thickness * + face->size->metrics.y_ppem / face->units_per_EM; + if (thickness <= 0) + thickness = 1; + } + + if (fuOptions & ETO_OPAQUE) + { + /* Draw background */ + RECTL Rect; + + Rect.left = (RealXStart + 32) >> 6; + Rect.top = TextTop + yoff - ((fixAscender + 32) >> 6); + Rect.right = (RealXStart + TextWidth + 32) >> 6; + Rect.bottom = Rect.top + ((fixAscender + fixDescender) >> 6); + + if (dc->fs & (DC_ACCUM_APP | DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(dc, &Rect); + } + + if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) + DC_vUpdateBackgroundBrush(dc); + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, Rect.left, Rect.top, Rect.right, Rect.bottom); + + SourcePoint.x = SourcePoint.y = 0; + BrushOrigin.x = BrushOrigin.y = 0; + + psurf = dc->dclevel.pSurface; + IntEngBitBlt( + &psurf->SurfObj, + NULL, + NULL, + (CLIPOBJ *)&dc->co, + NULL, + &Rect, + &SourcePoint, + &SourcePoint, + &dc->eboBackground.BrushObject, + &BrushOrigin, + ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); + + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); } EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); @@ -6042,7 +5958,7 @@ GreExtTextOutW( */ TextLeft = RealXStart; TextTop = YStart; - BackgroundLeft = (RealXStart + 32) >> 6; + previous = 0; for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); @@ -6099,39 +6015,6 @@ GreExtTextOutW( DPRINT("TextTop: %lu\n", TextTop); DPRINT("Advance: %d\n", realglyph->root.advance.x); - if ((fuOptions & ETO_OPAQUE) && !plf->lfItalic) - { - DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); - - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - - if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) - { - IntUpdateBoundsRect(dc, &DestRect); - } - IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawEnd(dc->ppdev); - - BackgroundLeft = DestRect.right; - } - DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; DestRect.right = DestRect.left + realglyph->bitmap.width; DestRect.top = TextTop + yoff - realglyph->top;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
33
Older →

Jump to page:

2026

2025

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