Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 02/02: [NETMSG] Fix message table include statement and build netmsg.dll.
by Eric Kohl 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5efe6f00a91cffeb918fc… commit 5efe6f00a91cffeb918fc7dcd77318b2a2abf392 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 22 17:52:03 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 22 19:04:55 2018 +0100 [NETMSG] Fix message table include statement and build netmsg.dll. --- dll/win32/CMakeLists.txt | 1 + dll/win32/netmsg/CMakeLists.txt | 2 +- dll/win32/netmsg/netmsg.rc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 8f426f9532..a725979443 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -135,6 +135,7 @@ add_subdirectory(netapi32) add_subdirectory(netcfgx) add_subdirectory(netevent) add_subdirectory(netid) +add_subdirectory(netmsg) add_subdirectory(newdev) add_subdirectory(npptools) add_subdirectory(ntdll_vista) diff --git a/dll/win32/netmsg/CMakeLists.txt b/dll/win32/netmsg/CMakeLists.txt index 3957ebeaf7..7115171eba 100644 --- a/dll/win32/netmsg/CMakeLists.txt +++ b/dll/win32/netmsg/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(netmsg SHARED netmsg.rc) -set_module_type(netmsg module UNICODE) +set_module_type(netmsg module UNICODE ENTRYPOINT 0) add_dependencies(netmsg netmsgmsg) add_cd_file(TARGET netmsg DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/netmsg/netmsg.rc b/dll/win32/netmsg/netmsg.rc index df8f4ea2fd..c8b637efa1 100644 --- a/dll/win32/netmsg/netmsg.rc +++ b/dll/win32/netmsg/netmsg.rc @@ -4,4 +4,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netmsg.dll" #include <reactos/version.rc> -#include <netmsg_msg.rc> +#include <netmsgmsg.rc>

1 0

[reactos] 01/02: [MC] Remove some useless quotation marks from message strings.
by Eric Kohl 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c6eeb501811a94d85c8d… commit 5c6eeb501811a94d85c8d4e370a9cb6d41ebbd47 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 22 17:47:39 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 22 19:04:54 2018 +0100 [MC] Remove some useless quotation marks from message strings. --- sdk/include/reactos/mc/netmsgmsg.mc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 865ab8987a..0a5c933e8b 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -3677,13 +3677,13 @@ Language=English The user accounts database (NET.ACC) is corrupted. The local security\n system is replacing the corrupted NET.ACC with the backup\n made on %1 at %2.\n -Any updates made to the database after this time are lost.\n" +Any updates made to the database after this time are lost.\n . Language=Russian The user accounts database (NET.ACC) is corrupted. The local security\n system is replacing the corrupted NET.ACC with the backup\n made on %1 at %2.\n -Any updates made to the database after this time are lost.\n" +Any updates made to the database after this time are lost.\n . MessageId=3028 @@ -3694,13 +3694,13 @@ Language=English The user accounts database (NET.ACC) is missing. The local\n security system is restoring the backup database\n made on %1 at %2.\n -Any updates made to the database after this time are lost.\n" +Any updates made to the database after this time are lost.\n . Language=Russian The user accounts database (NET.ACC) is missing. The local\n security system is restoring the backup database\n made on %1 at %2.\n -Any updates made to the database after this time are lost.\n" +Any updates made to the database after this time are lost.\n . MessageId=3029 @@ -3726,11 +3726,11 @@ Facility=System SymbolicName=ALERT_3030 Language=English The server cannot export directory %1, to client %2.\n -It is exported from another server." +It is exported from another server. . Language=Russian The server cannot export directory %1, to client %2.\n -It is exported from another server." +It is exported from another server. . MessageId=3031 @@ -5907,13 +5907,13 @@ Language=English WARNING: You have until %1 to logoff. If you\n have not logged off at this time, your session will be\n disconnected, and any open files or devices you\n -have open may lose data." +have open may lose data. . Language=Russian WARNING: You have until %1 to logoff. If you\n have not logged off at this time, your session will be\n disconnected, and any open files or devices you\n -have open may lose data." +have open may lose data. . MessageId=3418 @@ -9658,10 +9658,10 @@ Severity=Success Facility=System SymbolicName=APPERR2_4486 Language=English -ReactOS%0" +ReactOS%0 . Language=Russian -ReactOS%0" +ReactOS%0 . MessageId=4487 @@ -12951,12 +12951,12 @@ SymbolicName=APPERR2_5034 Language=English Printing Failed\n\n \"%1\" failed to print on %2 on %3. The Printer is %4.\n\n -For more help use the print troubleshooter." +For more help use the print troubleshooter. . Language=Russian Printing Failed\n\n \"%1\" failed to print on %2 on %3. The Printer is %4.\n\n -For more help use the print troubleshooter." +For more help use the print troubleshooter. . MessageId=5035 @@ -14214,11 +14214,11 @@ Facility=System SymbolicName=NRCERR_5326 Language=English An unexpected protocol packet was received. There may be an\n -incompatible remote device. The network control block (NCB) is the data." +incompatible remote device. The network control block (NCB) is the data. . Language=Russian An unexpected protocol packet was received. There may be an\n -incompatible remote device. The network control block (NCB) is the data." +incompatible remote device. The network control block (NCB) is the data. . MessageId=5333 @@ -15923,14 +15923,14 @@ The subnet object '%1' appears in the Configuration\\Sites\\Subnets\n container in the DS. The name is not syntactically valid. The valid\n syntax is xx.xx.xx.xx/yy where xx.xx.xx.xx is a valid IP subnet number\n and yy is the number of bits in the subnet mask.\n\n -Correct the name of the subnet object." +Correct the name of the subnet object. . Language=Russian The subnet object '%1' appears in the Configuration\\Sites\\Subnets\n container in the DS. The name is not syntactically valid. The valid\n syntax is xx.xx.xx.xx/yy where xx.xx.xx.xx is a valid IP subnet number\n and yy is the number of bits in the subnet mask.\n\n -Correct the name of the subnet object." +Correct the name of the subnet object. . MessageId=5781

1 0

[reactos] 01/01: [FONTSUB] Fix build²
by Pierre Schweitzer 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cbd1cad0e9b282b89511… commit 9cbd1cad0e9b282b8951146c9a3a210deeff8e1e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 22 15:02:16 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 22 15:02:16 2018 +0100 [FONTSUB] Fix build² --- modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc index d521a85c20..9a45c8af65 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc @@ -25,7 +25,7 @@ BEGIN MENUITEM "重新加載登錄(&L)\tCtrl+L", ID_RELOAD MENUITEM "更新登錄(&R)\tCtrl+U", ID_UPDATE_REGISTRY MENUITEM SEPARATOR - MENUITEM "在登錄中開啟(&E)”, ID_OPEN_REGKEY + MENUITEM "在登錄中開啟(&E)", ID_OPEN_REGKEY MENUITEM SEPARATOR MENUITEM "退出(&X)\tAlt+F4", ID_EXIT END

1 0

[reactos] 01/01: [FONTSUB] Fix build
by Pierre Schweitzer 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b4d6d40d6d34dad305a2… commit 6b4d6d40d6d34dad305a24720c3c80f5f341daa5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 22 14:52:02 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 22 14:52:02 2018 +0100 [FONTSUB] Fix build --- modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc index 1de9687c47..d521a85c20 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc @@ -17,7 +17,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL 1 MENU BEGIN - POPUP “檔案(&F)” + POPUP "檔案(&F)" BEGIN MENUITEM "匯入(&I)...\tCtrl+O", ID_IMPORT MENUITEM "匯出(&E)...\tCtrl+S", ID_EXPORT @@ -37,7 +37,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "刪除項目(&D)\tDel", ID_DELETE END - POPUP “說明(&H)” + POPUP "說明(&H)" BEGIN MENUITEM "關於(&A)...", ID_ABOUT END @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN - IDS_TITLE, “字型名稱替代” + IDS_TITLE, "字型名稱替代" IDS_FONTNAME, "字型名稱" IDS_SUBSTITUTE, "替代" IDS_ENTERNAME, "(請輸入字型名稱...)" @@ -79,7 +79,7 @@ END IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "添加替代項目" -FONT 10, “新細明體” +FONT 10, "新細明體" BEGIN CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 @@ -94,7 +94,7 @@ END IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "編輯替代項目" -FONT 10, “新細明體” +FONT 10, "新細明體" BEGIN CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14

1 0

[reactos] 01/01: [KMTESTS:CC] Add a trace to identify failing tests
by Pierre Schweitzer 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b5c1503c45aced0db201… commit 0b5c1503c45aced0db201d8a6327054a93cb6c1e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 22 14:36:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 22 14:36:45 2018 +0100 [KMTESTS:CC] Add a trace to identify failing tests --- modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c index 3934b9d6a8..7895786dd5 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -182,6 +182,8 @@ PerformTest( if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) { + trace("Starting test: %d\n", TestId); + if (TestId == 0 || TestId == 2) { Offset.QuadPart = 0;

1 0

[reactos] 01/01: [TRANSLATION] Update Chinese shortcut translation (#1179)
by Luo Yufan 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eca1aa87a427bfad3ba39… commit eca1aa87a427bfad3ba3995e1c0160442b88978f Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Sat Dec 22 21:35:33 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 22 22:35:33 2018 +0900 [TRANSLATION] Update Chinese shortcut translation (#1179) * [INF] Update Traditional Chinese translation. * [ROSAPPS] Update Chinese translation. * [FONTSUB] Add Traditional Chinese translation. * [FONTSUB] Add Traditional Chinese translation. * [FONTSUB] Update Simplified Chinese translation. * [ROSAPPS] Update Chinese translation. * [FONTSUB] Update Simplified Chinese translation. --- media/inf/shortcuts.inf | 66 ++++++++++++++++- .../applications/sysutils/fontsub/fontsub_res.rc | 3 + .../applications/sysutils/fontsub/lang/zh-CN.rc | 4 +- .../sysutils/fontsub/lang/{zh-CN.rc => zh-TW.rc} | 85 +++++++++++----------- modules/rosapps/rosapps_shortcuts.inf | 26 +++++-- 5 files changed, 134 insertions(+), 50 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 3f416df53c..a03f026391 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1461,7 +1461,7 @@ WINMINE_DESC=Сапер SPIDER_TITLE=Пас'янс Павук SPIDER_DESC=Пас'янс Павук -; Chinese +; Simplified Chinese [Strings.0804] ACCESSORIES=附件 SYSTOOLS=系统工具 @@ -1524,3 +1524,67 @@ WINMINE_TITLE=扫雷 WINMINE_DESC=扫雷 SPIDER_TITLE=蜘蛛纸牌 SPIDER_DESC=蜘蛛纸牌 + +; Traditional Chinese +[Strings.0404] +ACCESSORIES=附屬應用程式 +SYSTOOLS=系統管理工具 +ACCESSIBILITY=協助工具 +ENTERTAINMENT=娛樂 +COMMUNICATIONS=通訊 +GAMES=遊樂場 + +README_TITLE=說明 +README_DESC=ReactOS 說明文件 + +CMD_TITLE=命令提示字元 +CMD_DESC=命令提示字元 +EXPLORER_TITLE=ReactOS 檔案總管 +EXPLORER_DESC=ReactOS 檔案總管 +RAPPS_TITLE=ReactOS 應用程式管理員 +RAPPS_TITLE_SHORT=應用程式管理員 +RAPPS_DESC=下載並安裝其它應用程式 +SERVMAN_TITLE=服務 +SERVMAN_DESC=服務 +DEVMGMT_TITLE=裝置管理員 +DEVMGMT_DESC=裝置管理員 +EVENTVWR_TITLE=事件檢視器 +EVENTVWR_DESC=啓動事件檢視器 +MSCONFIG_TITLE=系統設定 +MSCONFIG_DESC=啓動系統設定 +CALC_TITLE=小算盤 +CALC_DESC=小算盤 +NOTEPAD_TITLE=記事本 +NOTEPAD_DESC=記事本 +MSTSC_TITLE=遠端桌面連線 +MSTSC_DESC=啓動遠端桌面連線 +WORDPAD_TITLE=WordPad +WORDPAD_DESC=WordPad +MSPAINT_TITLE=小畫家 +MSPAINT_DESC=小畫家 +CHARMAP_TITLE=字元對應表 +CHARMAP_DESC=字元對應表 +CLIPBRD_TITLE=剪貼本檢視器 +CLIPBRD_DESC=剪貼本檢視器 +KBSWITCH_TITLE=鍵盤配置切換器 +KBSWITCH_DESC=啓動鍵盤配置切換器 +REGEDIT_TITLE=登錄編輯程式 +REGEDIT_DESC=啓動登錄編輯程式 +DXDIAG_TITLE=ReactX 診斷工具 +DXDIAG_DESC=啓動 ReactX 診斷工具 +MAGNIFY_TITLE=放大鏡 +MAGNIFY_DESC=放大鏡 +OSK_TITLE=螢幕小鍵盤 +OSK_DESC=啓動螢幕小鍵盤 +MPLAY_TITLE=媒體播放器 +MPLAY_DESC=啓動媒體播放器 +SNDVOL_TITLE=音量控制 +SNDVOL_DESC=啓動音量控制 +SNDREC32_TITLE=錄音機 +SNDREC32_DESC=啓動錄音機 +SOL_TITLE=接龍 +SOL_DESC=接龍 +WINMINE_TITLE=踩地雷 +WINMINE_DESC=踩地雷 +SPIDER_TITLE=連環新接龍 +SPIDER_DESC=連環新接龍 diff --git a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc index 232b33cb4d..2d1a5abff2 100644 --- a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc +++ b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc @@ -47,6 +47,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif 1 ACCELERATORS BEGIN diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc index 51d801d4e3..d22fd26de2 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN - IDS_TITLE, "Font Substitutes Editor" + IDS_TITLE, "字体名称替代" IDS_FONTNAME, "字体名称" IDS_SUBSTITUTE, "替代" IDS_ENTERNAME, "(请输入字体名称...)" @@ -73,7 +73,7 @@ BEGIN IDS_QUERYDELETE, "您确定要删除此项目吗？" IDS_CANTOPENKEY, "无法打开注册表键值。" IDS_REBOOTNOW, "注册表已经更新。现在需要重启系统吗？" - IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\n本软件基于 CC0 1.0 许可证发布。" + IDS_ABOUT, "FontSub (字体名称替代) 版本 0.5\r\nby 片山博文MZ 和 The ReactOS Team\r\n\r\n本软件基于 CC0 1.0 许可证发布。" END IDD_ADD DIALOGEX 0, 0, 315, 65 diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc similarity index 55% copy from modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc copy to modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc index 51d801d4e3..1de9687c47 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc @@ -11,35 +11,35 @@ /* UTF-8 */ #pragma code_page(65001) -/* Translated by Luo Yufan (njlyf2011(a)hotmail.com) on 2018-11-13 */ +/* Translated by Luo Yufan (njlyf2011(a)hotmail.com) on 2018-12-22 */ -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL 1 MENU BEGIN - POPUP "文件(&F)" + POPUP “檔案(&F)” BEGIN - MENUITEM "导入(&I)...\tCtrl+O", ID_IMPORT - MENUITEM "导出(&E)...\tCtrl+S", ID_EXPORT + MENUITEM "匯入(&I)...\tCtrl+O", ID_IMPORT + MENUITEM "匯出(&E)...\tCtrl+S", ID_EXPORT MENUITEM SEPARATOR - MENUITEM "重新加载注册表(&L)\tCtrl+L", ID_RELOAD - MENUITEM "更新注册表(&R)\tCtrl+U", ID_UPDATE_REGISTRY + MENUITEM "重新加載登錄(&L)\tCtrl+L", ID_RELOAD + MENUITEM "更新登錄(&R)\tCtrl+U", ID_UPDATE_REGISTRY MENUITEM SEPARATOR - MENUITEM "在注册表中打开(&E)", ID_OPEN_REGKEY + MENUITEM "在登錄中開啟(&E)”, ID_OPEN_REGKEY MENUITEM SEPARATOR MENUITEM "退出(&X)\tAlt+F4", ID_EXIT END - POPUP "编辑(&E)" + POPUP "編輯(&E)" BEGIN - MENUITEM "新建项目(&N)\tCtrl+N", ID_NEW + MENUITEM "新增項目(&N)\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "编辑项目(&E)\tEnter", ID_EDIT + MENUITEM "編輯項目(&E)\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "删除项目(&D)\tDel", ID_DELETE + MENUITEM "刪除項目(&D)\tDel", ID_DELETE END - POPUP "帮助(&H)" + POPUP “說明(&H)” BEGIN - MENUITEM "关于(&A)...", ID_ABOUT + MENUITEM "關於(&A)...", ID_ABOUT END END @@ -47,62 +47,63 @@ END BEGIN POPUP "Popup" BEGIN - MENUITEM "新建项目(&N)\tCtrl+N", ID_NEW + MENUITEM "新建項目(&N)\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "编辑项目(&E)\tEnter", ID_EDIT + MENUITEM "編輯項目(&E)\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "删除项目(&D)\tDel", ID_DELETE + MENUITEM "刪除項目(&D)\tDel", ID_DELETE END END STRINGTABLE BEGIN - IDS_TITLE, "Font Substitutes Editor" - IDS_FONTNAME, "字体名称" + IDS_TITLE, “字型名稱替代” + IDS_FONTNAME, "字型名稱" IDS_SUBSTITUTE, "替代" - IDS_ENTERNAME, "(请输入字体名称...)" - IDS_IMPORT, "导入" - IDS_EXPORT, "导出" - IDS_CANTIMPORT, "无法导入。" - IDS_CANTEXPORT, "无法导出。" - IDS_INPFILTER, "注册表文件 (*.reg)|*.reg|所有文件 (*.*)|*.*|" - IDS_OUTFILTER, "注册表文件 (*.reg)|*.reg|" - IDS_QUERYUPDATE, "替代信息已经修改。请问现在需要更新注册表吗？" - IDS_ALREADYEXISTS, "同样的名称已存在。" - IDS_ENTERNAME2, "请输入字体名称。" - IDS_QUERYDELETE, "您确定要删除此项目吗？" - IDS_CANTOPENKEY, "无法打开注册表键值。" - IDS_REBOOTNOW, "注册表已经更新。现在需要重启系统吗？" - IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\n本软件基于 CC0 1.0 许可证发布。" + IDS_ENTERNAME, "(請輸入字型名稱...)" + IDS_IMPORT, "匯入" + IDS_EXPORT, "匯出" + IDS_CANTIMPORT, "無法匯入。" + IDS_CANTEXPORT, "無法匯出。" + IDS_INPFILTER, "登錄檔 (*.reg)|*.reg|所有檔案 (*.*)|*.*|" + IDS_OUTFILTER, "登錄檔 (*.reg)|*.reg|" + IDS_QUERYUPDATE, "替代信息已經修改。請問現在需要更新登錄嗎？" + IDS_ALREADYEXISTS, "同樣的名稱已存在。" + IDS_ENTERNAME2, "請輸入字型名稱。" + IDS_QUERYDELETE, "您確定要刪除此項目嗎？" + IDS_CANTOPENKEY, "無法開啟登錄鍵值。" + IDS_REBOOTNOW, "登錄已經更新。現在需要重啓系統嗎？" + IDS_ABOUT, "FontSub (字型名稱替代) 版本 0.5\r\nby 片山博文MZ 和 The ReactOS Team\r\n\r\n本軟體基於 CC0 1.0 授權發佈。" END IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "添加替代项目" -FONT 10, "宋体" +CAPTION "添加替代項目" +FONT 10, “新細明體” BEGIN - CONTROL "字体名称(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "替代(&S):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "确定", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "確定", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 CONTROL "取消", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 END IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "编辑替代项目" -FONT 10, "宋体" +CAPTION "編輯替代項目" +FONT 10, “新細明體” BEGIN - CONTROL "字体名称(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "字型名稱(&N):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "替代(&S):", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "确定", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "確定", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 CONTROL "取消", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 - CONTROL "删除(&D)", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 + CONTROL "刪除(&D)", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 END + diff --git a/modules/rosapps/rosapps_shortcuts.inf b/modules/rosapps/rosapps_shortcuts.inf index 7a681cc1fb..704332180a 100644 --- a/modules/rosapps/rosapps_shortcuts.inf +++ b/modules/rosapps/rosapps_shortcuts.inf @@ -372,7 +372,7 @@ SCREENSHOT_DESC=Зробити знімок екрана VCD_TITLE=Virtual CDRom Control Panel VCD_DESC=Manage virtual CDRom drives -; Chinese +; Simplified Chinese [Strings.0804] ACCESSORIES=附件 SYSTOOLS=系统工具 @@ -381,9 +381,25 @@ ENTERTAINMENT=娱乐 COMMUNICATIONS=通讯 GAMES=游戏 -FONTSUB_TITLE=FontSub -FONTSUB_DESC=Font Substitutes Editor +FONTSUB_TITLE=字体名称替代 +FONTSUB_DESC=字体名称替代 SCREENSHOT_TITLE=屏幕截图 SCREENSHOT_DESC=屏幕截图 -VCD_TITLE=Virtual CDRom Control Panel -VCD_DESC=Manage virtual CDRom drives +VCD_TITLE=虚拟光驱控制面板 +VCD_DESC=管理虚拟光盘驱动器 + +; Traditional Chinese +[Strings.0404] +ACCESSORIES=附屬應用程式 +SYSTOOLS=系統管理工具 +ACCESSIBILITY=協助工具 +ENTERTAINMENT=娛樂 +COMMUNICATIONS=通訊 +GAMES=遊樂場 + +FONTSUB_TITLE=字型名稱替代 +FONTSUB_DESC=字型名稱替代 +SCREENSHOT_TITLE=螢幕擷取 +SCREENSHOT_DESC=螢幕擷取 +VCD_TITLE=虛擬光碟機控制台 +VCD_DESC=管理虛擬光碟機

1 0

[reactos] 02/02: [KMTESTS:CC] Add more tests for SetFileSizes
by Pierre Schweitzer 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7c0236fc10e833b62e4f… commit f7c0236fc10e833b62e4f67c29c9093718f2facc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 22 12:42:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 22 12:42:05 2018 +0100 [KMTESTS:CC] Add more tests for SetFileSizes These are covered by Thomas' patch. CORE-11819 --- modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 11 +++++++++-- modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c | 8 +++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c index cc8840dc85..3934b9d6a8 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -171,13 +171,18 @@ PerformTest( Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; Fcb->Header.ValidDataLength.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; + if (TestId > 1 && TestId < 4) + { + Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; + } + KmtStartSeh(); CcInitializeCacheMap(TestFileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, TRUE, &Callbacks, NULL); KmtEndSeh(STATUS_SUCCESS); if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) { - if (TestId == 0) + if (TestId == 0 || TestId == 2) { Offset.QuadPart = 0; KmtStartSeh(); @@ -194,6 +199,7 @@ PerformTest( CcSetFileSizes(TestFileObject, &NewFileSizes); KmtEndSeh(STATUS_SUCCESS); + Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY; Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY; Offset.QuadPart = 0; @@ -208,7 +214,7 @@ PerformTest( CcUnpinData(Bcb); } } - else if (TestId == 1) + else if (TestId == 1 || TestId == 3) { Buffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); if (!skip(Buffer != NULL, "ExAllocatePool failed\n")) @@ -226,6 +232,7 @@ PerformTest( CcSetFileSizes(TestFileObject, &NewFileSizes); KmtEndSeh(STATUS_SUCCESS); + Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY; Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY; RtlZeroMemory(Buffer, PAGE_SIZE); diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c index 6e8a11dfff..121598444c 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c @@ -18,10 +18,12 @@ START_TEST(CcSetFileSizes) KmtLoadDriver(L"CcSetFileSizes", FALSE); KmtOpenDriver(); - /* 0: mapped data - * 1: copy read + /* 0: mapped data - only FS + * 1: copy read - only FS + * 2: mapped data - FS & AS + * 3: copy read - FS & AS */ - for (TestId = 0; TestId < 2; ++TestId) + for (TestId = 0; TestId < 4; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

[reactos] 01/02: [KMTESTS:CC] Add tests for CcSetFileSizes
by Pierre Schweitzer 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba5d6e977bf36a6248e51… commit ba5d6e977bf36a6248e51bf5ed1588a530cb9baa Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 22 12:29:18 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 22 12:32:02 2018 +0100 [KMTESTS:CC] Add tests for CcSetFileSizes These are passing in W2K3 but failing in ReactOS. CORE-11819 --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest/testlist.c | 2 + modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 15 + .../rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 408 +++++++++++++++++++++ .../rostests/kmtests/ntos_cc/CcSetFileSizes_user.c | 34 ++ 5 files changed, 460 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 623188e913..feb522be36 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -139,6 +139,7 @@ list(APPEND KMTEST_SOURCE ntos_cc/CcMapData_user.c ntos_cc/CcPinMappedData_user.c ntos_cc/CcPinRead_user.c + ntos_cc/CcSetFileSizes_user.c ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 5b5b65364b..0c5e2010d6 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -10,6 +10,7 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_CcMapData; KMT_TESTFUNC Test_CcPinMappedData; KMT_TESTFUNC Test_CcPinRead; +KMT_TESTFUNC Test_CcSetFileSizes; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; @@ -41,6 +42,7 @@ const KMT_TEST TestList[] = { "CcMapData", Test_CcMapData }, { "CcPinMappedData", Test_CcPinMappedData }, { "CcPinRead", Test_CcPinRead }, + { "CcSetFileSizes", Test_CcSetFileSizes }, { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index 3357f19e68..8815f5c897 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -60,3 +60,18 @@ add_importlibs(ccpinread_drv ntoskrnl hal) add_target_compile_definitions(ccpinread_drv KMT_STANDALONE_DRIVER) #add_pch(ccmapdata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccpinread_drv) + +# +# CcSetFileSizes +# +list(APPEND CCSETFILESIZES_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcSetFileSizes_drv.c) + +add_library(ccsetfilesizes_drv SHARED ${CCSETFILESIZES_DRV_SOURCE}) +set_module_type(ccsetfilesizes_drv kernelmodedriver) +target_link_libraries(ccsetfilesizes_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ccsetfilesizes_drv ntoskrnl hal) +add_target_compile_definitions(ccsetfilesizes_drv KMT_STANDALONE_DRIVER) +#add_pch(ccsetfilesizes_drv ../include/kmt_test.h) +add_rostests_file(TARGET ccsetfilesizes_drv) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c new file mode 100644 index 0000000000..cc8840dc85 --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -0,0 +1,408 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for CcSetFileSizes function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +static ULONG TestTestId = -1; +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; +static KMT_IRP_HANDLER TestIrpHandler; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"CcSetFileSizes"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +BOOLEAN +NTAPI +AcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromLazyWrite( + _In_ PVOID Context) +{ + return; +} + +BOOLEAN +NTAPI +AcquireForReadAhead( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromReadAhead( + _In_ PVOID Context) +{ + return; +} + +static CACHE_MANAGER_CALLBACKS Callbacks = { + AcquireForLazyWrite, + ReleaseFromLazyWrite, + AcquireForReadAhead, + ReleaseFromReadAhead, +}; + +static CC_FILE_SIZES NewFileSizes = { + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)VACB_MAPPING_GRANULARITY), // .AllocationSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)VACB_MAPPING_GRANULARITY), // .FileSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)VACB_MAPPING_GRANULARITY) // .ValidDataLength +}; + +static +PVOID +MapAndLockUserBuffer( + _In_ _Out_ PIRP Irp, + _In_ ULONG BufferLength) +{ + PMDL Mdl; + + if (Irp->MdlAddress == NULL) + { + Mdl = IoAllocateMdl(Irp->UserBuffer, BufferLength, FALSE, FALSE, Irp); + if (Mdl == NULL) + { + return NULL; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoFreeMdl(Mdl); + Irp->MdlAddress = NULL; + _SEH2_YIELD(return NULL); + } + _SEH2_END; + } + + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); +} + +static +VOID +PerformTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + PVOID Bcb; + BOOLEAN Ret; + PULONG Buffer; + PTEST_FCB Fcb; + LARGE_INTEGER Offset; + IO_STATUS_BLOCK IoStatus; + + ok_eq_pointer(TestFileObject, NULL); + ok_eq_pointer(TestDeviceObject, NULL); + ok_eq_ulong(TestTestId, -1); + + TestDeviceObject = DeviceObject; + TestTestId = TestId; + TestFileObject = IoCreateStreamFileObject(NULL, DeviceObject); + if (!skip(TestFileObject != NULL, "Failed to allocate FO\n")) + { + Fcb = ExAllocatePool(NonPagedPool, sizeof(TEST_FCB)); + if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + { + RtlZeroMemory(Fcb, sizeof(TEST_FCB)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + + TestFileObject->FsContext = Fcb; + TestFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY; + Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; + Fcb->Header.ValidDataLength.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; + + KmtStartSeh(); + CcInitializeCacheMap(TestFileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, TRUE, &Callbacks, NULL); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) + { + if (TestId == 0) + { + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, VACB_MAPPING_GRANULARITY - PAGE_SIZE, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + CcUnpinData(Bcb); + } + + KmtStartSeh(); + CcSetFileSizes(TestFileObject, &NewFileSizes); + KmtEndSeh(STATUS_SUCCESS); + + Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY; + + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, VACB_MAPPING_GRANULARITY, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + + CcUnpinData(Bcb); + } + } + else if (TestId == 1) + { + Buffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); + if (!skip(Buffer != NULL, "ExAllocatePool failed\n")) + { + Ret = FALSE; + Offset.QuadPart = VACB_MAPPING_GRANULARITY - 2 * PAGE_SIZE; + + KmtStartSeh(); + Ret = CcCopyRead(TestFileObject, &Offset, PAGE_SIZE, TRUE, Buffer, &IoStatus); + KmtEndSeh(STATUS_SUCCESS); + + ok_eq_ulong(Buffer[(PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + + KmtStartSeh(); + CcSetFileSizes(TestFileObject, &NewFileSizes); + KmtEndSeh(STATUS_SUCCESS); + + Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY; + RtlZeroMemory(Buffer, PAGE_SIZE); + + Offset.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; + + KmtStartSeh(); + Ret = CcCopyRead(TestFileObject, &Offset, PAGE_SIZE, TRUE, Buffer, &IoStatus); + KmtEndSeh(STATUS_SUCCESS); + + ok_eq_ulong(Buffer[(PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + + ExFreePool(Buffer); + } + } + } + } + } +} + + +static +VOID +CleanupTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + LARGE_INTEGER Zero = RTL_CONSTANT_LARGE_INTEGER(0LL); + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + ok_eq_pointer(TestDeviceObject, DeviceObject); + ok_eq_ulong(TestTestId, TestId); + + if (!skip(TestFileObject != NULL, "No test FO\n")) + { + if (CcIsFileCached(TestFileObject)) + { + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(TestFileObject, &Zero, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + } + + if (TestFileObject->FsContext != NULL) + { + ExFreePool(TestFileObject->FsContext); + TestFileObject->FsContext = NULL; + TestFileObject->SectionObjectPointer = NULL; + } + + ObDereferenceObject(TestFileObject); + } + + TestFileObject = NULL; + TestDeviceObject = NULL; + TestTestId = -1; +} + + +static +NTSTATUS +TestMessageHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + FsRtlEnterFileSystem(); + + switch (ControlCode) + { + case IOCTL_START_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + PerformTest(*(PULONG)Buffer, DeviceObject); + break; + + case IOCTL_FINISH_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + CleanupTest(*(PULONG)Buffer, DeviceObject); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + FsRtlExitFileSystem(); + + return Status; +} + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + + FsRtlEnterFileSystem(); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_READ) + { + PMDL Mdl; + ULONG Length; + PVOID Buffer; + PTEST_FCB Fcb; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Read.ByteOffset; + Length = IoStack->Parameters.Read.Length; + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + ok(Fcb != NULL, "Null FCB\n"); + + ok(FlagOn(Irp->Flags, IRP_NOCACHE), "Not coming from Cc\n"); + + ok_irql(APC_LEVEL); + ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + + if (Offset.QuadPart < Fcb->Header.FileSize.QuadPart) + { + RtlFillMemory(Buffer, min(Length, Fcb->Header.FileSize.QuadPart - Offset.QuadPart), 0xBA); + Buffer = (PVOID)((ULONG_PTR)Buffer + (ULONG_PTR)min(Length, Fcb->Header.FileSize.QuadPart - Offset.QuadPart)); + + if (Length > (Fcb->Header.FileSize.QuadPart - Offset.QuadPart)) + { + RtlFillMemory(Buffer, Length - Fcb->Header.FileSize.QuadPart, 0xBD); + } + } + else + { + RtlFillMemory(Buffer, Length, 0xBD); + } + + Status = STATUS_SUCCESS; + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Mdl->MdlFlags & MDL_IO_PAGE_READ) != 0, "Non paging IO\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + + Irp->IoStatus.Information = Length; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + FsRtlExitFileSystem(); + + return Status; +} diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c new file mode 100644 index 0000000000..6e8a11dfff --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite CcSetFileSizes test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +START_TEST(CcSetFileSizes) +{ + DWORD Ret; + ULONG TestId; + + KmtLoadDriver(L"CcSetFileSizes", FALSE); + KmtOpenDriver(); + + /* 0: mapped data + * 1: copy read + */ + for (TestId = 0; TestId < 2; ++TestId) + { + Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + Ret = KmtSendUlongToDriver(IOCTL_FINISH_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + } + + KmtCloseDriver(); + KmtUnloadDriver(); +}

1 0

[reactos] 01/01: [USP10] Don't mix character and glyph index caches. CORE-14226
by Thomas Faber 22 Dec '18

22 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c086edf36678e072afc58… commit c086edf36678e072afc58efcde12608c2c3c55eb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Dec 22 11:29:24 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Dec 22 11:29:24 2018 +0100 [USP10] Don't mix character and glyph index caches. CORE-14226 Import Wine commits by Nikolay Sivov: * d1e618d31da usp10: Use glyph index consistently in ScriptGetGlyphABCWidth(). * 8d018d8d1da usp10: Make sure metrics cache is used with glyph indices only. * eda3a3e37da usp10: Remove extra parentheses. Fixes font display in UltraISO and GOG installers. See also https://bugs.winehq.org/show_bug.cgi?id=44410 --- dll/win32/usp10/usp10.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dll/win32/usp10/usp10.c b/dll/win32/usp10/usp10.c index ab3af43ba8..a18c049b08 100644 --- a/dll/win32/usp10/usp10.c +++ b/dll/win32/usp10/usp10.c @@ -3416,35 +3416,41 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) { + WORD glyph; ABC abc; + + /* FIXME: set to more reasonable values */ + pGoffset[i].du = pGoffset[i].dv = 0; + if (pGlyphProps[i].sva.fZeroWidth) { abc.abcA = abc.abcB = abc.abcC = 0; + if (piAdvance) piAdvance[i] = 0; + continue; + } + + if (psa->fNoGlyphIndex) + { + if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr; } - else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) + else + glyph = pwGlyphs[i]; + + if (!get_cache_glyph_widths(psc, glyph, &abc)) { - BOOL ret; if (!hdc) return E_PENDING; if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { - if (psa->fNoGlyphIndex) - ret = GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc); - else - ret = GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc); - if (!ret) return S_FALSE; + if (!GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc)) return S_FALSE; } else { INT width; - if (psa->fNoGlyphIndex) - ret = GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width); - else - ret = GetCharWidthI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &width); - if (!ret) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc.abcB = width; abc.abcA = abc.abcC = 0; } - set_cache_glyph_widths(psc, pwGlyphs[i], &abc); + set_cache_glyph_widths(psc, glyph, &abc); } if (pABC) { @@ -3452,8 +3458,6 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS pABC->abcB += abc.abcB; pABC->abcC += abc.abcC; } - /* FIXME: set to more reasonable values */ - pGoffset[i].du = pGoffset[i].dv = 0; if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; } @@ -3708,14 +3712,14 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB if (!get_cache_glyph_widths(psc, glyph, abc)) { if (!hdc) return E_PENDING; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE; } else { INT width; - if (!GetCharWidth32W(hdc, glyph, glyph, &width)) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc->abcB = width; abc->abcA = abc->abcC = 0; }

1 0

[reactos] 01/01: [NTOS:CC] CcCanIWrite(): Use BYTES_TO_PAGES(Length)
by Serge Gautherie 21 Dec '18

21 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d1f13cf77f5a734def5c… commit 4d1f13cf77f5a734def5c798cbaf95818a43f9e6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Dec 21 19:20:59 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Dec 21 19:20:59 2018 +0100 [NTOS:CC] CcCanIWrite(): Use BYTES_TO_PAGES(Length) --- ntoskrnl/cc/copy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 4509e2e43b..41980b87d4 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -685,8 +685,7 @@ CcCanIWrite ( Length = BytesToWrite; } - /* Convert it to pages count */ - Pages = (Length + PAGE_SIZE - 1) >> PAGE_SHIFT; + Pages = BYTES_TO_PAGES(Length); /* By default, assume limits per file won't be hit */ PerFileDefer = FALSE;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
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