Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

01/01: [TRANSLATION]Update Simplified Chinese translation. (#1032)
by Luo Yufan 14 Nov '18

14 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8a4e0a8e3e3540e8e467… commit d8a4e0a8e3e3540e8e4677e50ebbb5465720df50 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Nov 14 20:42:21 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 14 21:42:21 2018 +0900 [TRANSLATION]Update Simplified Chinese translation. (#1032) --- base/applications/msconfig_new/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 4 +- dll/win32/setupapi/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- media/inf/unknown.inf | 4 + .../applications/sysutils/fontsub/fontsub_res.rc | 3 + .../applications/sysutils/fontsub/lang/zh-CN.rc | 108 +++++++++++++++++++++ .../applications/sysutils/systeminfo/lang/zh-CN.rc | 70 +++++++++++++ .../applications/sysutils/systeminfo/rsrc.rc | 3 + 9 files changed, 193 insertions(+), 5 deletions(-) diff --git a/base/applications/msconfig_new/lang/zh-CN.rc b/base/applications/msconfig_new/lang/zh-CN.rc index 3fe40b6911..ba309047a7 100644 --- a/base/applications/msconfig_new/lang/zh-CN.rc +++ b/base/applications/msconfig_new/lang/zh-CN.rc @@ -15,7 +15,7 @@ BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 LTEXT "系统配置实用程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" - LTEXT "版权所有 (C) ReactOS 团队 2005-2015\n\ + LTEXT "版权所有 (C) ReactOS Team 2005-2015\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ Gregor Schneider (Gregor.Schneider(a)reactos.org)\n\ Hermès BÉLUSCA - MAÏTO (hermes.belusca(a)sfr.fr)", diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index a91d2dde30..8b6597de28 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -304,9 +304,9 @@ BEGIN IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 16 MB，并且不得超过所选磁盘上的可用空间。" IDS_WARNMAXIMUMRANGE "分页文件的最大大小不能小于其初始大小和不能超过所选磁盘上的可用空间。" IDS_PAGEFILE_NONE "无" - IDS_PAGEFILE_SYSTEM "系统已管理" + IDS_PAGEFILE_SYSTEM "系统已托管" IDS_INFOREBOOT "您必须重新启动计算机，才能应用更改。" - IDS_DEVS "\nReactOS 团队\n\n项目协调员\n\nAleksey Bragin\n\n开发团队\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKata [...] + IDS_DEVS "\nReactOS Team\n\n项目协调员\n\nAleksey Bragin\n\n开发组\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKat [...] IDS_HWPROFILE_CONFIRM_DELETE_TITLE "确认配置文件删除" IDS_HWPROFILE_CONFIRM_DELETE "你确定你想要删除的硬件配置文件？ ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "配置式名称已在使用。" diff --git a/dll/win32/setupapi/lang/zh-CN.rc b/dll/win32/setupapi/lang/zh-CN.rc index 86ce148b9e..352579156d 100644 --- a/dll/win32/setupapi/lang/zh-CN.rc +++ b/dll/win32/setupapi/lang/zh-CN.rc @@ -21,7 +21,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "所需文件" FONT 9, "宋体" BEGIN - LTEXT "插入厂商的安装盘，然后确定已在下面选定正确的驱动器。", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "请插入厂商的安装盘，然后确认已在下面选定正确的驱动器。", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "厂商文件复制来源:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index b2f3d7fcc5..4ac844e5fe 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -151,7 +151,7 @@ BEGIN LTEXT ")", IDC_STATIC, 153, 65, 5, 10 LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 - LTEXT " ReactOS 团队\0", IDC_STATIC, 105, 75, 53, 10 + LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "此 ReactOS 版本注册到:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 diff --git a/media/inf/unknown.inf b/media/inf/unknown.inf index 1372d73f14..3ae1e7a660 100644 --- a/media/inf/unknown.inf +++ b/media/inf/unknown.inf @@ -49,3 +49,7 @@ UnknownClassName = "Başka Aygıtlar" [Strings.0422] ReactOS = "Команда ReactOS" UnknownClassName = "Інші пристрої" + +[Strings.0804] +ReactOS = "ReactOS Team" +UnknownClassName = "其它设备" diff --git a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc index 741b180bbe..232b33cb4d 100644 --- a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc +++ b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc @@ -44,6 +44,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.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 new file mode 100644 index 0000000000..b866d66106 --- /dev/null +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc @@ -0,0 +1,108 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ + +/* UTF-8 */ +#pragma code_page(65001) + +/* Translated by Luo Yufan (njlyf2011(a)hotmail.com) on 2018-11-13 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +1 MENU +BEGIN + POPUP "文件(&F)" + BEGIN + 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 SEPARATOR + MENUITEM "在注册表中打开(&E)", ID_OPEN_REGKEY + MENUITEM SEPARATOR + MENUITEM "退出(&X)\tAlt+F4", ID_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "新项目(&N)\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "编辑项目(&E)\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "删除项目(&D)\tDel", ID_DELETE + END + POPUP "帮助(&H)" + BEGIN + MENUITEM "关于(&A)...", ID_ABOUT + END +END + +2 MENU +BEGIN + POPUP "Popup" + BEGIN + MENUITEM "新项目(&N)\tCtrl+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "编辑项目(&E)\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "删除项目(&D)\tDel", ID_DELETE + END +END + +STRINGTABLE +BEGIN + IDS_TITLE, "Font Substitutes Editor" + 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 许可证发布。" +END + +IDD_ADD DIALOGEX 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "添加替代项目" +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 + 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 "取消", 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, "宋体" +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 + 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 "取消", 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 +END diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc new file mode 100644 index 0000000000..14e27630ac --- /dev/null +++ b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc @@ -0,0 +1,70 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +/* Translated by Luo Yufan (njlyf2011(a)hotmail.com) on 2018-11-13 */ + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ +描述:\n\ + 本命令行工具允许管理员查询基本系统配置信息。\n\n\ +参数列表:\n\ + /S system 指定要连接的远程系统。\n\n\ + /U [domain\\]user 指定应该在哪个用户的上下文执行命令。\n\n\ + /P [password] 指定指定用户上下文的密码。如果省略则\n\ + 提示输入。\n\n\ + /FO format 指定显示结果的格式。\n\ + 有效值: ""TABLE"", ""LIST"", ""CSV""。\n\n\ + /NH 指定“列标题”不应该在输出中显示。\n\ + 只对 ""TABLE"" 和 ""CSV"" 格式有效。\n\n\ + /? 显示此帮助/用法。\n\n\ +示例:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S system\n\ + SYSTEMINFO /S system /U user\n\ + SYSTEMINFO /S system /U domain\\user /P password /FO TABLE\n\ + SYSTEMINFO /S system /FO LIST\n\ + SYSTEMINFO /S system /FO CSV /NH\n" + +IDS_HOST_NAME, "主机名" +IDS_OS_NAME, "OS 名称" +IDS_OS_VERSION, "OS 版本" +IDS_BUILD, "构建" +IDS_OS_BUILD_TYPE, "OS 构建类型" +IDS_REG_OWNER, "注册拥有者" +IDS_REG_ORG, "注册组织" +IDS_PRODUCT_ID, "产品 ID" +IDS_INST_DATE, "安装日期" +IDS_UP_TIME, "系统开机时间" +IDS_UP_TIME_FORMAT, "%u 日, %u 小时, %u 分钟, %u 秒" +IDS_SYS_MANUFACTURER, "系统制造商" +IDS_SYS_MODEL, "系统型号" +IDS_SYS_TYPE, "系统类型 +IDS_PROCESSORS, "处理器" +IDS_PROCESSORS_FORMAT, "已安装 %u 个处理器。" +IDS_BIOS_DATE, "BIOS 日期" +IDS_BIOS_VERSION, "BIOS 版本" +IDS_ROS_DIR, "ReactOS 目录" +IDS_SYS_DIR, "系统目录" +IDS_BOOT_DEV, "启动设备" +IDS_SYS_LOCALE, "系统区域位置" +IDS_INPUT_LOCALE, "输入区域位置" +IDS_TIME_ZONE, "时区" +IDS_TOTAL_PHYS_MEM, "物理内存总量" +IDS_AVAIL_PHISICAL_MEM, "物理内存可用量" +IDS_VIRT_MEM_MAX, "虚拟内存: 最大大小" +IDS_VIRT_MEM_AVAIL, "虚拟内存: 可用" +IDS_VIRT_MEM_INUSE, "虚拟内存: 已使用" +IDS_PAGEFILE_LOC, "页面文件位置" +IDS_DOMAIN, "域" +IDS_NETWORK_CARDS, "网卡" +IDS_NETWORK_CARDS_FORMAT, "已安装 %u 。" +IDS_CONNECTION_NAME, "连接名称" +IDS_STATUS, "状态" +IDS_MEDIA_DISCONNECTED, "媒体连接已中断" +IDS_DHCP_ENABLED, "DHCP 已启用" +IDS_NO, "否" +IDS_IP_ADDRESSES, "IP 地址" + +END diff --git a/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc b/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc index 5f9097a000..221bf35537 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc +++ b/modules/rosapps/applications/sysutils/systeminfo/rsrc.rc @@ -36,3 +36,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

01/01: [WINMM] Sync wine commit ebae298 as a fix for CORE-15336 (#1031)
by Baruch Rutman 14 Nov '18

14 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97150ce9dd96412036e64… commit 97150ce9dd96412036e64a1aa74ccfd2ca9c1805 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Wed Nov 14 13:32:55 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 14 12:32:55 2018 +0100 [WINMM] Sync wine commit ebae298 as a fix for CORE-15336 (#1031) Reduce CPU usage by only attempting once to load the default joystick driver. Fix for CORE-15336 Imported wine commit ebae298 https://github.com/wine-mirror/wine/commit/ebae298aa4d2711fef35d4ac60c60124… https://www.winehq.org/pipermail/wine-devel/2018-November/134767.html --- dll/win32/winmm/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dll/win32/winmm/joystick.c b/dll/win32/winmm/joystick.c index ed6054bfbf..92bd48d399 100644 --- a/dll/win32/winmm/joystick.c +++ b/dll/win32/winmm/joystick.c @@ -55,12 +55,21 @@ static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; */ static BOOL JOY_LoadDriver(DWORD dwJoyID) { - if (dwJoyID >= MAXJOYSTICK) + static BOOL winejoystick_missing = FALSE; + + if (dwJoyID >= MAXJOYSTICK || winejoystick_missing) return FALSE; if (JOY_Sticks[dwJoyID].hDriver) return TRUE; JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID); + + if (!JOY_Sticks[dwJoyID].hDriver) + { + /* The default driver is missing, don't attempt to load it again */ + winejoystick_missing = TRUE; + } + return (JOY_Sticks[dwJoyID].hDriver != 0); }

1 0

01/01: [TFTPD] Fix Coverity #1434273 "Out-of-Bounds access" (#1037)
by Pako Smith 14 Nov '18

14 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13e566444d5e0f20bd4a9… commit 13e566444d5e0f20bd4a92af9bce75408162f446 Author: Pako Smith <pakosmth(a)gmail.com> AuthorDate: Wed Nov 14 14:30:30 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 14 12:30:30 2018 +0100 [TFTPD] Fix Coverity #1434273 "Out-of-Bounds access" (#1037) 'extbuff' must be of size _MAX_PATH to comply with its usage in the GetModuleFileName() call made in the code. --- base/services/tftpd/tftpd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/tftpd/tftpd.cpp b/base/services/tftpd/tftpd.cpp index 7e0968a0a5..11e26fa2d3 100644 --- a/base/services/tftpd/tftpd.cpp +++ b/base/services/tftpd/tftpd.cpp @@ -38,7 +38,7 @@ char iniFile[_MAX_PATH]; char logFile[_MAX_PATH]; char lnkFile[_MAX_PATH]; char tempbuff[256]; -char extbuff[256]; +char extbuff[_MAX_PATH]; char logBuff[512]; char fileSep = '\\'; char notFileSep = '/';

1 0

01/01: [NTOSKRNL] Don't leak DACL
by Pierre Schweitzer 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95bc44e214cb03fb81845… commit 95bc44e214cb03fb8184519c8a7ad5a1880a35a2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 11 23:20:46 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Nov 11 23:21:36 2018 +0100 [NTOSKRNL] Don't leak DACL Spotted by Thomas :-) --- ntoskrnl/se/semgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/se/semgr.c b/ntoskrnl/se/semgr.c index 4bf89b6b94..389f6bf765 100644 --- a/ntoskrnl/se/semgr.c +++ b/ntoskrnl/se/semgr.c @@ -205,6 +205,9 @@ SepInitializationPhase1(VOID) &ObjectAttributes); ASSERT(NT_SUCCESS(Status)); + /* Free the DACL */ + ExFreePoolWithTag(Dacl, TAG_SE); + /* Create 'LSA_AUTHENTICATION_INITIALIZED' event */ RtlInitUnicodeString(&Name, L"LSA_AUTHENTICATION_INITIALIZED"); InitializeObjectAttributes(&ObjectAttributes,

1 0

02/02: [MC] Add messages 2500-2999. The NERR-range is complete.
by Eric Kohl 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c8356e752fdb1874c84e… commit 3c8356e752fdb1874c84e78876cceac49b04cf63 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 11 22:38:07 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 11 22:43:09 2018 +0100 [MC] Add messages 2500-2999. The NERR-range is complete. --- sdk/include/reactos/mc/netmsgmsg.mc | 1012 +++++++++++++++++++++++++++++++++++ 1 file changed, 1012 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 43959c72ba..07e86350f5 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -2426,6 +2426,1018 @@ Language=Russian The UPS service failed to perform a system shut down. . +MessageId=2500 +Severity=Success +Facility=System +SymbolicName=NERR_BadDosRetCode +Language=English +The program below returned a DOS error code: +. +Language=Russian +The program below returned a DOS error code: +. + +MessageId=2501 +Severity=Success +Facility=System +SymbolicName=NERR_ProgNeedsExtraMem +Language=English +The program below needs more memory: +. +Language=Russian +The program below needs more memory: +. + +MessageId=2502 +Severity=Success +Facility=System +SymbolicName=NERR_BadDosFunction +Language=English +The program below called an unsupported DOS function: +. +Language=Russian +The program below called an unsupported DOS function: +. + +MessageId=2503 +Severity=Success +Facility=System +SymbolicName=NERR_RemoteBootFailed +Language=English +The workstation failed to boot. +. +Language=Russian +The workstation failed to boot. +. + +MessageId=2504 +Severity=Success +Facility=System +SymbolicName=NERR_BadFileCheckSum +Language=English +The file below is corrupt. +. +Language=Russian +The file below is corrupt. +. + +MessageId=2505 +Severity=Success +Facility=System +SymbolicName=NERR_NoRplBootSystem +Language=English +No loader is specified in the boot-block definition file. +. +Language=Russian +No loader is specified in the boot-block definition file. +. + +MessageId=2506 +Severity=Success +Facility=System +SymbolicName=NERR_RplLoadrNetBiosErr +Language=English +NetBIOS returned an error: The NCB and SMB are dumped above. +. +Language=Russian +NetBIOS returned an error: The NCB and SMB are dumped above. +. + +MessageId=2507 +Severity=Success +Facility=System +SymbolicName=NERR_RplLoadrDiskErr +Language=English +A disk I/O error occurred. +. +Language=Russian +A disk I/O error occurred. +. + +MessageId=2508 +Severity=Success +Facility=System +SymbolicName=NERR_ImageParamErr +Language=English +Image parameter substitution failed. +. +Language=Russian +Image parameter substitution failed. +. + +MessageId=2509 +Severity=Success +Facility=System +SymbolicName=NERR_TooManyImageParams +Language=English +Too many image parameters cross disk sector boundaries. +. +Language=Russian +Too many image parameters cross disk sector boundaries. +. + +MessageId=2510 +Severity=Success +Facility=System +SymbolicName=NERR_NonDosFloppyUsed +Language=English +The image was not generated from a DOS diskette formatted with /S. +. +Language=Russian +The image was not generated from a DOS diskette formatted with /S. +. + +MessageId=2511 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootRestart +Language=English +Remote boot will be restarted later. +. +Language=Russian +Remote boot will be restarted later. +. + +MessageId=2512 +Severity=Success +Facility=System +SymbolicName=NERR_RplSrvrCallFailed +Language=English +The call to the Remoteboot server failed. +. +Language=Russian +The call to the Remoteboot server failed. +. + +MessageId=2513 +Severity=Success +Facility=System +SymbolicName=NERR_CantConnectRplSrvr +Language=English +Cannot connect to the Remoteboot server. +. +Language=Russian +Cannot connect to the Remoteboot server. +. + +MessageId=2514 +Severity=Success +Facility=System +SymbolicName=NERR_CantOpenImageFile +Language=English +Cannot open image file on the Remoteboot server. +. +Language=Russian +Cannot open image file on the Remoteboot server. +. + +MessageId=2515 +Severity=Success +Facility=System +SymbolicName=NERR_CallingRplSrvr +Language=English +Connecting to the Remoteboot server... +. +Language=Russian +Connecting to the Remoteboot server... +. + +MessageId=2516 +Severity=Success +Facility=System +SymbolicName=NERR_StartingRplBoot +Language=English +Connecting to the Remoteboot server... +. +Language=Russian +Connecting to the Remoteboot server... +. + +MessageId=2517 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootServiceTerm +Language=English +Remote boot service was stopped; check the error log for the cause of the problem. +. +Language=Russian +Remote boot service was stopped; check the error log for the cause of the problem. +. + +MessageId=2518 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootStartFailed +Language=English +Remote boot startup failed; check the error log for the cause of the problem. +. +Language=Russian +Remote boot startup failed; check the error log for the cause of the problem. +. + +MessageId=2519 +Severity=Success +Facility=System +SymbolicName=NERR_RPL_CONNECTED +Language=English +A second connection to a Remoteboot resource is not allowed. +. +Language=Russian +A second connection to a Remoteboot resource is not allowed. +. + +MessageId=2550 +Severity=Success +Facility=System +SymbolicName=NERR_BrowserConfiguredToNotRun +Language=English +The browser service was configured with MaintainServerList=No. +. +Language=Russian +The browser service was configured with MaintainServerList=No. +. + +MessageId=2610 +Severity=Success +Facility=System +SymbolicName=NERR_RplNoAdaptersStarted +Language=English +Service failed to start since none of the network adapters started with this service. +. +Language=Russian +Service failed to start since none of the network adapters started with this service. +. + +MessageId=2611 +Severity=Success +Facility=System +SymbolicName=NERR_RplBadRegistry +Language=English +Service failed to start due to bad startup information in the registry. +. +Language=Russian +Service failed to start due to bad startup information in the registry. +. + +MessageId=2612 +Severity=Success +Facility=System +SymbolicName=NERR_RplBadDatabase +Language=English +Service failed to start because its database is absent or corrupt. +. +Language=Russian +Service failed to start because its database is absent or corrupt. +. + +MessageId=2613 +Severity=Success +Facility=System +SymbolicName=NERR_RplRplfilesShare +Language=English +Service failed to start because RPLFILES share is absent. +. +Language=Russian +Service failed to start because RPLFILES share is absent. +. + +MessageId=2614 +Severity=Success +Facility=System +SymbolicName=NERR_RplNotRplServer +Language=English +Service failed to start because RPLUSER group is absent. +. +Language=Russian +Service failed to start because RPLUSER group is absent. +. + +MessageId=2615 +Severity=Success +Facility=System +SymbolicName=NERR_RplCannotEnum +Language=English +Cannot enumerate service records. +. +Language=Russian +Cannot enumerate service records. +. + +MessageId=2616 +Severity=Success +Facility=System +SymbolicName=NERR_RplWkstaInfoCorrupted +Language=English +Workstation record information has been corrupted. +. +Language=Russian +Workstation record information has been corrupted. +. + +MessageId=2617 +Severity=Success +Facility=System +SymbolicName=NERR_RplWkstaNotFound +Language=English +Workstation record was not found. +. +Language=Russian +Workstation record was not found. +. + +MessageId=2618 +Severity=Success +Facility=System +SymbolicName=NERR_RplWkstaNameUnavailable +Language=English +Workstation name is in use by some other workstation. +. +Language=Russian +Workstation name is in use by some other workstation. +. + +MessageId=2619 +Severity=Success +Facility=System +SymbolicName=NERR_RplProfileInfoCorrupted +Language=English +Profile record information has been corrupted. +. +Language=Russian +Profile record information has been corrupted. +. + +MessageId=2620 +Severity=Success +Facility=System +SymbolicName=NERR_RplProfileNotFound +Language=English +Profile record was not found. +. +Language=Russian +Profile record was not found. +. + +MessageId=2621 +Severity=Success +Facility=System +SymbolicName=NERR_RplProfileNameUnavailable +Language=English +Profile name is in use by some other profile. +. +Language=Russian +Profile name is in use by some other profile. +. + +MessageId=2622 +Severity=Success +Facility=System +SymbolicName=NERR_RplProfileNotEmpty +Language=English +There are workstations using this profile. +. +Language=Russian +There are workstations using this profile. +. + +MessageId=2623 +Severity=Success +Facility=System +SymbolicName=NERR_RplConfigInfoCorrupted +Language=English +Configuration record information has been corrupted. +. +Language=Russian +Configuration record information has been corrupted. +. + +MessageId=2624 +Severity=Success +Facility=System +SymbolicName=NERR_RplConfigNotFound +Language=English +Configuration record was not found. +. +Language=Russian +Configuration record was not found. +. + +MessageId=2625 +Severity=Success +Facility=System +SymbolicName=NERR_RplAdapterInfoCorrupted +Language=English +Adapter id record information has been corrupted. +. +Language=Russian +Adapter id record information has been corrupted. +. + +MessageId=2626 +Severity=Success +Facility=System +SymbolicName=NERR_RplInternal +Language=English +An internal service error has occurred. +. +Language=Russian +An internal service error has occurred. +. + +MessageId=2627 +Severity=Success +Facility=System +SymbolicName=NERR_RplVendorInfoCorrupted +Language=English +Vendor id record information has been corrupted. +. +Language=Russian +Vendor id record information has been corrupted. +. + +MessageId=2628 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootInfoCorrupted +Language=English +Boot block record information has been corrupted. +. +Language=Russian +Boot block record information has been corrupted. +. + +MessageId=2629 +Severity=Success +Facility=System +SymbolicName=NERR_RplWkstaNeedsUserAcct +Language=English +The user account for this workstation record is missing. +. +Language=Russian +The user account for this workstation record is missing. +. + +MessageId=2630 +Severity=Success +Facility=System +SymbolicName=NERR_RplNeedsRPLUSERAcct +Language=English +The RPLUSER local group could not be found. +. +Language=Russian +The RPLUSER local group could not be found. +. + +MessageId=2631 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootNotFound +Language=English +Boot block record was not found. +. +Language=Russian +Boot block record was not found. +. + +MessageId=2632 +Severity=Success +Facility=System +SymbolicName=NERR_RplIncompatibleProfile +Language=English +Chosen profile is incompatible with this workstation. +. +Language=Russian +Chosen profile is incompatible with this workstation. +. + +MessageId=2633 +Severity=Success +Facility=System +SymbolicName=NERR_RplAdapterNameUnavailable +Language=English +Chosen network adapter id is in use by some other workstation. +. +Language=Russian +Chosen network adapter id is in use by some other workstation. +. + +MessageId=2634 +Severity=Success +Facility=System +SymbolicName=NERR_RplConfigNotEmpty +Language=English +There are profiles using this configuration. +. +Language=Russian +There are profiles using this configuration. +. + +MessageId=2635 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootInUse +Language=English +There are workstations, profiles or configurations using this boot block. +. +Language=Russian +There are workstations, profiles or configurations using this boot block. +. + +MessageId=2636 +Severity=Success +Facility=System +SymbolicName=NERR_RplBackupDatabase +Language=English +Service failed to backup Remoteboot database. +. +Language=Russian +Service failed to backup Remoteboot database. +. + +MessageId=2637 +Severity=Success +Facility=System +SymbolicName=NERR_RplAdapterNotFound +Language=English +Adapter record was not found. +. +Language=Russian +Adapter record was not found. +. + +MessageId=2638 +Severity=Success +Facility=System +SymbolicName=NERR_RplVendorNotFound +Language=English +Vendor record was not found. +. +Language=Russian +Vendor record was not found. +. + +MessageId=2639 +Severity=Success +Facility=System +SymbolicName=NERR_RplVendorNameUnavailable +Language=English +Vendor name is in use by some other vendor record. +. +Language=Russian +Vendor name is in use by some other vendor record. +. + +MessageId=2640 +Severity=Success +Facility=System +SymbolicName=NERR_RplBootNameUnavailable +Language=English +(boot name, vendor id) is in use by some other boot block record. +. +Language=Russian +(boot name, vendor id) is in use by some other boot block record. +. + +MessageId=2641 +Severity=Success +Facility=System +SymbolicName=NERR_RplConfigNameUnavailable +Language=English +Configuration name is in use by some other configuration. +. +Language=Russian +Configuration name is in use by some other configuration. +. + +MessageId=2660 +Severity=Success +Facility=System +SymbolicName=NERR_DfsInternalCorruption +Language=English +The internal database maintained by the DFS service is corrupt +. +Language=Russian +The internal database maintained by the DFS service is corrupt +. + +MessageId=2661 +Severity=Success +Facility=System +SymbolicName=NERR_DfsVolumeDataCorrupt +Language=English +One of the records in the internal DFS database is corrupt +. +Language=Russian +One of the records in the internal DFS database is corrupt +. + +MessageId=2662 +Severity=Success +Facility=System +SymbolicName=NERR_DfsNoSuchVolume +Language=English +There is no DFS name whose entry path matches the input Entry Path +. +Language=Russian +There is no DFS name whose entry path matches the input Entry Path +. + +MessageId=2663 +Severity=Success +Facility=System +SymbolicName=NERR_DfsVolumeAlreadyExists +Language=English +A root or link with the given name already exists +. +Language=Russian +A root or link with the given name already exists +. + +MessageId=2664 +Severity=Success +Facility=System +SymbolicName=NERR_DfsAlreadyShared +Language=English +The server share specified is already shared in the DFS +. +Language=Russian +The server share specified is already shared in the DFS +. + +MessageId=2665 +Severity=Success +Facility=System +SymbolicName=NERR_DfsNoSuchShare +Language=English +The indicated server share does not support the indicated DFS namespace +. +Language=Russian +The indicated server share does not support the indicated DFS namespace +. + +MessageId=2666 +Severity=Success +Facility=System +SymbolicName=NERR_DfsNotALeafVolume +Language=English +The operation is not valid on this portion of the namespace +. +Language=Russian +The operation is not valid on this portion of the namespace +. + +MessageId=2667 +Severity=Success +Facility=System +SymbolicName=NERR_DfsLeafVolume +Language=English +The operation is not valid on this portion of the namespace +. +Language=Russian +The operation is not valid on this portion of the namespace +. + +MessageId=2668 +Severity=Success +Facility=System +SymbolicName=NERR_DfsVolumeHasMultipleServers +Language=English +The operation is ambiguous because the link has multiple servers +. +Language=Russian +The operation is ambiguous because the link has multiple servers +. + +MessageId=2669 +Severity=Success +Facility=System +SymbolicName=NERR_DfsCantCreateJunctionPoint +Language=English +Unable to create a link +. +Language=Russian +Unable to create a link +. + +MessageId=2670 +Severity=Success +Facility=System +SymbolicName=NERR_DfsServerNotDfsAware +Language=English +The server is not DFS Aware +. +Language=Russian +The server is not DFS Aware +. + +MessageId=2671 +Severity=Success +Facility=System +SymbolicName=NERR_DfsBadRenamePath +Language=English +The specified rename target path is invalid +. +Language=Russian +The specified rename target path is invalid +. + +MessageId=2672 +Severity=Success +Facility=System +SymbolicName=NERR_DfsVolumeIsOffline +Language=English +The specified DFS link is offline +. +Language=Russian +The specified DFS link is offline +. + +MessageId=2673 +Severity=Success +Facility=System +SymbolicName=NERR_DfsNoSuchServer +Language=English +The specified server is not a server for this link +. +Language=Russian +The specified server is not a server for this link +. + +MessageId=2674 +Severity=Success +Facility=System +SymbolicName=NERR_DfsCyclicalName +Language=English +A cycle in the DFS name was detected +. +Language=Russian +A cycle in the DFS name was detected +. + +MessageId=2675 +Severity=Success +Facility=System +SymbolicName=NERR_DfsNotSupportedInServerDfs +Language=English +The operation is not supported on a server-based DFS +. +Language=Russian +The operation is not supported on a server-based DFS +. + +MessageId=2676 +Severity=Success +Facility=System +SymbolicName=NERR_DfsDuplicateService +Language=English +This link is already supported by the specified server-share +. +Language=Russian +This link is already supported by the specified server-share +. + +MessageId=2677 +Severity=Success +Facility=System +SymbolicName=NERR_DfsCantRemoveLastServerShare +Language=English +Can't remove the last server-share supporting this root or link +. +Language=Russian +Can't remove the last server-share supporting this root or link +. + +MessageId=2678 +Severity=Success +Facility=System +SymbolicName=NERR_DfsVolumeIsInterDfs +Language=English +The operation is not supported for an Inter-DFS link +. +Language=Russian +The operation is not supported for an Inter-DFS link +. + +MessageId=2679 +Severity=Success +Facility=System +SymbolicName=NERR_DfsInconsistent +Language=English +The internal state of the DFS Service has become inconsistent +. +Language=Russian +The internal state of the DFS Service has become inconsistent +. + +MessageId=2680 +Severity=Success +Facility=System +SymbolicName=NERR_DfsServerUpgraded +Language=English +The DFS Service has been installed on the specified server +. +Language=Russian +The DFS Service has been installed on the specified server +. + +MessageId=2681 +Severity=Success +Facility=System +SymbolicName=NERR_DfsDataIsIdentical +Language=English +The DFS data being reconciled is identical +. +Language=Russian +The DFS data being reconciled is identical +. + +MessageId=2682 +Severity=Success +Facility=System +SymbolicName=NERR_DfsCantRemoveDfsRoot +Language=English +The DFS root cannot be deleted - Uninstall DFS if required +. +Language=Russian +The DFS root cannot be deleted - Uninstall DFS if required +. + +MessageId=2683 +Severity=Success +Facility=System +SymbolicName=NERR_DfsChildOrParentInDfs +Language=English +A child or parent directory of the share is already in a DFS +. +Language=Russian +A child or parent directory of the share is already in a DFS +. + +MessageId=2690 +Severity=Success +Facility=System +SymbolicName=NERR_DfsInternalError +Language=English +DFS internal error +. +Language=Russian +DFS internal error +. + +MessageId=2691 +Severity=Success +Facility=System +SymbolicName=NERR_SetupAlreadyJoined +Language=English +This machine is already joined to a domain. +. +Language=Russian +This machine is already joined to a domain. +. + +MessageId=2692 +Severity=Success +Facility=System +SymbolicName=NERR_SetupNotJoined +Language=English +This machine is not currently joined to a domain. +. +Language=Russian +This machine is not currently joined to a domain. +. + +MessageId=2693 +Severity=Success +Facility=System +SymbolicName=NERR_SetupDomainController +Language=English +This machine is a domain controller and cannot be unjoined from a domain. +. +Language=Russian +This machine is a domain controller and cannot be unjoined from a domain. +. + +MessageId=2694 +Severity=Success +Facility=System +SymbolicName=NERR_DefaultJoinRequired +Language=English +The destination domain controller does not support creating machine accounts in OUs. +. +Language=Russian +The destination domain controller does not support creating machine accounts in OUs. +. + +MessageId=2695 +Severity=Success +Facility=System +SymbolicName=NERR_InvalidWorkgroupName +Language=English +The specified workgroup name is invalid. +. +Language=Russian +The specified workgroup name is invalid. +. + +MessageId=2696 +Severity=Success +Facility=System +SymbolicName=NERR_NameUsesIncompatibleCodePage +Language=English +The specified computer name is incompatible with the default language used on the domain controller. +. +Language=Russian +The specified computer name is incompatible with the default language used on the domain controller. +. + +MessageId=2697 +Severity=Success +Facility=System +SymbolicName=NERR_ComputerAccountNotFound +Language=English +The specified computer account could not be found. +. +Language=Russian +The specified computer account could not be found. +. + +MessageId=2698 +Severity=Success +Facility=System +SymbolicName=NERR_PersonalSku +Language=English +This version of the operating system cannot be joined to a domain. +. +Language=Russian +This version of the operating system cannot be joined to a domain. +. + +MessageId=2701 +Severity=Success +Facility=System +SymbolicName=NERR_PasswordMustChange +Language=English +Password must change at next logon +. +Language=Russian +Password must change at next logon +. + +MessageId=2702 +Severity=Success +Facility=System +SymbolicName=NERR_AccountLockedOut +Language=English +Account is locked out +. +Language=Russian +Account is locked out +. + +MessageId=2703 +Severity=Success +Facility=System +SymbolicName=NERR_PasswordTooLong +Language=English +Password is too long +. +Language=Russian +Password is too long +. + +MessageId=2704 +Severity=Success +Facility=System +SymbolicName=NERR_PasswordNotComplexEnough +Language=English +Password doesn't meet the complexity policy +. +Language=Russian +Password doesn't meet the complexity policy +. + +MessageId=2705 +Severity=Success +Facility=System +SymbolicName=NERR_PasswordFilterError +Language=English +Password doesn't meet the requirements of the filter dll's +. +Language=Russian +Password doesn't meet the requirements of the filter dll's +. + +MessageId=2999 +Severity=Success +Facility=System +SymbolicName=MAX_NERR +Language=English +This is the last error in NERR range. +. +Language=Russian +This is the last error in NERR range. +. + ; ; other message definitions

1 0

01/02: [PSDK] Add missing NERR-codes to lmerr.h
by Eric Kohl 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f80b6648b29666d17cba… commit 1f80b6648b29666d17cba29d88f8b7c92642c0c7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 11 22:37:02 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 11 22:43:08 2018 +0100 [PSDK] Add missing NERR-codes to lmerr.h --- sdk/include/psdk/lmerr.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/lmerr.h b/sdk/include/psdk/lmerr.h index 66aab138d7..b8b01884d5 100644 --- a/sdk/include/psdk/lmerr.h +++ b/sdk/include/psdk/lmerr.h @@ -293,12 +293,25 @@ #define NERR_DfsNotSupportedInServerDfs (NERR_BASE+575) #define NERR_DfsDuplicateService (NERR_BASE+576) #define NERR_DfsCantRemoveLastServerShare (NERR_BASE+577) -#define NERR_DfsVolumeIsInterDfs (NERR_BASE+578) +#define NERR_DfsVolumeIsInterDfs (NERR_BASE+578) #define NERR_DfsInconsistent (NERR_BASE+579) #define NERR_DfsServerUpgraded (NERR_BASE+580) #define NERR_DfsDataIsIdentical (NERR_BASE+581) #define NERR_DfsCantRemoveDfsRoot (NERR_BASE+582) #define NERR_DfsChildOrParentInDfs (NERR_BASE+583) #define NERR_DfsInternalError (NERR_BASE+590) +#define NERR_SetupAlreadyJoined (NERR_BASE+591) +#define NERR_SetupNotJoined (NERR_BASE+592) +#define NERR_SetupDomainController (NERR_BASE+593) +#define NERR_DefaultJoinRequired (NERR_BASE+594) +#define NERR_InvalidWorkgroupName (NERR_BASE+595) +#define NERR_NameUsesIncompatibleCodePage (NERR_BASE+596) +#define NERR_ComputerAccountNotFound (NERR_BASE+597) +#define NERR_PersonalSku (NERR_BASE+598) +#define NERR_PasswordMustChange (NERR_BASE+601) +#define NERR_AccountLockedOut (NERR_BASE+602) +#define NERR_PasswordTooLong (NERR_BASE+603) +#define NERR_PasswordNotComplexEnough (NERR_BASE+604) +#define NERR_PasswordFilterError (NERR_BASE+605) #define MAX_NERR (NERR_BASE+899) #endif

1 0

05/05: [NTOS:IO] RAW-FS: Few improvements.
by Hermès Bélusca-Maïto 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbaa8e7dfb941f8038ff5… commit cbaa8e7dfb941f8038ff50eeca516696af8268bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 11 21:27:30 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 11 21:56:18 2018 +0100 [NTOS:IO] RAW-FS: Few improvements. - Simplify the volume-deletion code in RawCheckForDismount(). - Fixes the OpenCount check in RawClose(): the VCB mutex must be released when the volume has not been dismounted, either because OpenCount != 0 or because RawCheckForDismount() returned FALSE. - Explicitly use VCB_STATE_LOCKED instead of hardcoding its value. - In IRP_MN_VERIFY_VOLUME handling, lock the volume before playing with it, and again let the volume be dismounted only if OpenCount == 0 (and the IoDeleteDevice() call is done by RawCheckForDismount()). --- ntoskrnl/io/iomgr/rawfs.c | 57 ++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/io/iomgr/rawfs.c b/ntoskrnl/io/iomgr/rawfs.c index d08bb22f49..569be1a1bf 100644 --- a/ntoskrnl/io/iomgr/rawfs.c +++ b/ntoskrnl/io/iomgr/rawfs.c @@ -131,41 +131,27 @@ RawCheckForDismount(IN PVCB Vcb, /* If we were to delete, delete the volume */ if (Delete) { - PVPB DelVpb; - /* Release our Vcb lock to be able delete us */ - KeReleaseMutex(&Vcb->Mutex, 0); + KeReleaseMutex(&Vcb->Mutex, FALSE); /* If we have a local VPB, we'll have to delete it * but we won't dismount us - something went bad before */ if (Vcb->LocalVpb) { - DelVpb = Vcb->LocalVpb; + ExFreePool(Vcb->LocalVpb); } - /* Otherwise, dismount our device if possible */ - else + /* Otherwise, delete any of the available VPB if its reference count is zero */ + else if (Vcb->Vpb->ReferenceCount == 0) { - if (Vcb->Vpb->ReferenceCount) - { - ObfDereferenceObject(Vcb->TargetDeviceObject); - IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, - VOLUME_DEVICE_OBJECT, - Vcb)); - return Delete; - } - - DelVpb = Vcb->Vpb; + ExFreePool(Vcb->Vpb); } - /* Delete any of the available VPB and dismount */ - ExFreePool(DelVpb); + /* Dismount our device if possible */ ObfDereferenceObject(Vcb->TargetDeviceObject); IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, VOLUME_DEVICE_OBJECT, Vcb)); - - return Delete; } return Delete; @@ -227,7 +213,7 @@ RawClose(IN PVCB Vcb, /* Decrease the open count and check if this is a dismount */ Vcb->OpenCount--; - if (!Vcb->OpenCount || !RawCheckForDismount(Vcb, FALSE)) + if (Vcb->OpenCount != 0 || !RawCheckForDismount(Vcb, FALSE)) { KeReleaseMutex(&Vcb->Mutex, FALSE); } @@ -509,10 +495,10 @@ RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, case FSCTL_LOCK_VOLUME: /* Make sure we're not locked, and that we're alone */ - if (!(Vcb->VcbState & 1) && (Vcb->OpenCount == 1)) + if (!(Vcb->VcbState & VCB_STATE_LOCKED) && (Vcb->OpenCount == 1)) { /* Lock the VCB */ - Vcb->VcbState |= 1; + Vcb->VcbState |= VCB_STATE_LOCKED; Status = STATUS_SUCCESS; } else @@ -526,7 +512,7 @@ RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, case FSCTL_UNLOCK_VOLUME: /* Make sure we're locked */ - if (!(Vcb->VcbState & 1)) + if (!(Vcb->VcbState & VCB_STATE_LOCKED)) { /* Let caller know we're not */ Status = STATUS_NOT_LOCKED; @@ -534,7 +520,7 @@ RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, else { /* Unlock the VCB */ - Vcb->VcbState &= ~1; + Vcb->VcbState &= ~VCB_STATE_LOCKED; Status = STATUS_SUCCESS; } break; @@ -543,7 +529,7 @@ RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, case FSCTL_DISMOUNT_VOLUME: /* Make sure we're locked */ - if (Vcb->VcbState & 1) + if (Vcb->VcbState & VCB_STATE_LOCKED) { /* Do nothing, just return success */ Status = STATUS_SUCCESS; @@ -616,18 +602,23 @@ RawFileSystemControl(IN PVCB Vcb, case IRP_MN_VERIFY_VOLUME: + /* Lock the device */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + /* We don't do verifies */ Status = STATUS_WRONG_VOLUME; Vcb->Vpb->RealDevice->Flags &= ~DO_VERIFY_VOLUME; /* Check if we should delete the device */ - if (RawCheckForDismount(Vcb, FALSE)) + if (Vcb->OpenCount != 0 || !RawCheckForDismount(Vcb, FALSE)) { - /* Do it */ - IoDeleteDevice((PDEVICE_OBJECT) - CONTAINING_RECORD(Vcb, - VOLUME_DEVICE_OBJECT, - Vcb)); + /* In case of deletion, the mutex is already released */ + KeReleaseMutex(&Vcb->Mutex, FALSE); } /* We're done */ @@ -752,7 +743,7 @@ RawQueryFsVolumeInfo(IN PVCB Vcb, DPRINT("RawQueryFsVolumeInfo(%p, %p, %p)\n", Vcb, Buffer, Length); /* Clear the buffer and stub it out */ - RtlZeroMemory( Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); + RtlZeroMemory(Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); Buffer->VolumeSerialNumber = Vcb->Vpb->SerialNumber; Buffer->SupportsObjects = FALSE; Buffer->VolumeLabelLength = 0;

1 0

04/05: [NTOS:IO] RAW-FS: Minor code formatting only.
by Hermès Bélusca-Maïto 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5ead049d9fdfff914ead… commit a5ead049d9fdfff914ead19e91a5c5efa5408b55 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 11 21:23:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 11 21:56:17 2018 +0100 [NTOS:IO] RAW-FS: Minor code formatting only. --- ntoskrnl/io/iomgr/rawfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/io/iomgr/rawfs.c b/ntoskrnl/io/iomgr/rawfs.c index 062c1fb42e..d08bb22f49 100644 --- a/ntoskrnl/io/iomgr/rawfs.c +++ b/ntoskrnl/io/iomgr/rawfs.c @@ -108,6 +108,7 @@ RawCheckForDismount(IN PVCB Vcb, Vcb->LocalVpb = NULL; Vcb->Vpb->Flags |= VPB_PERSISTENT; } + /* Don't do anything */ Delete = FALSE; } @@ -124,10 +125,10 @@ RawCheckForDismount(IN PVCB Vcb, } } - /* Release lock and return status */ + /* Release the VPB lock */ IoReleaseVpbSpinLock(OldIrql); - /* If we were to delete, delete volume */ + /* If we were to delete, delete the volume */ if (Delete) { PVPB DelVpb; @@ -311,7 +312,7 @@ RawCreate(IN PVCB Vcb, } /* Increase the open count and set the VPB */ - Vcb->OpenCount += 1; + Vcb->OpenCount++; IoStackLocation->FileObject->Vpb = Vcb->Vpb; /* Set IRP status and disable intermediate buffering */ @@ -330,10 +331,10 @@ RawCreate(IN PVCB Vcb, } /* Check if the request failed */ - if (!(NT_SUCCESS(Status)) && !(Vcb->OpenCount)) + if (!NT_SUCCESS(Status) && !Vcb->OpenCount) { /* Check if we can dismount the device */ - Deleted = RawCheckForDismount(Vcb, TRUE); + Deleted = RawCheckForDismount(Vcb, TRUE); } /* In case of deletion, the mutex is already released */ @@ -464,11 +465,10 @@ RawMountVolume(IN PIO_STACK_LOCATION IoStackLocation) /* Increment OpenCount by two to avoid dismount when RawClose() will be called on ObDereferenceObject() */ Volume->Vcb.OpenCount += 2; - /* Notify for sucessful mount */ + /* Notify for successful mount */ FsRtlNotifyVolumeEvent(FileObject, FSRTL_VOLUME_MOUNT); - /* Decrease refcount to 0 to make FileObject being released */ + /* It's not opened anymore, decrease the reference count to 0 to make FileObject being released */ ObDereferenceObject(FileObject); - /* It's not open anymore, go back to 0 */ Volume->Vcb.OpenCount -= 2; return Status;

1 0

03/05: [SETUPLIB] Lock the BTRFS volume before installing the new bootsector code.
by Hermès Bélusca-Maïto 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f527e23aa75e8ae3fa87b… commit f527e23aa75e8ae3fa87b075f205513a35789403 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 11 20:31:35 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 11 21:55:48 2018 +0100 [SETUPLIB] Lock the BTRFS volume before installing the new bootsector code. CORE-15334 CORE-15339 The BTRFS driver requires the volume to be locked in order to modify the first sectors of the partition, even though they are outside the file-system space / in the reserved area (they are situated before the super-block at 0x1000) and is in principle allowed by the NT storage stack. So we lock here in order to write the bootsector at sector 0. If locking fails, we ignore and continue nonetheless. See also the following links for reference: https://stackoverflow.com/a/12928934 https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-wri… https://support.microsoft.com/en-us/help/942448/changes-to-the-file-system-… --- base/setup/lib/bootsup.c | 58 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 2459c731da..3d494c949a 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -1613,6 +1613,7 @@ InstallBtrfsBootCodeToDisk( IN PCWSTR RootPath) { NTSTATUS Status; + NTSTATUS LockStatus; UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; @@ -1754,6 +1755,30 @@ InstallBtrfsBootCodeToDisk( return Status; } + /* + * The BTRFS driver requires the volume to be locked in order to modify + * the first sectors of the partition, even though they are outside the + * file-system space / in the reserved area (they are situated before + * the super-block at 0x1000) and is in principle allowed by the NT + * storage stack. + * So we lock here in order to write the bootsector at sector 0. + * If locking fails, we ignore and continue nonetheless. + */ + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("WARNING: Failed to lock BTRFS volume for writing bootsector! Operations may fail! (Status 0x%lx)\n", LockStatus); + } + /* Obtaining partition info and writing it to bootsector */ Status = NtDeviceIoControlFile(FileHandle, NULL, @@ -1768,9 +1793,7 @@ InstallBtrfsBootCodeToDisk( if (!NT_SUCCESS(Status)) { DPRINT1("IOCTL_DISK_GET_PARTITION_INFO_EX failed (Status %lx)\n", Status); - NtClose(FileHandle); - RtlFreeHeap(ProcessHeap, 0, NewBootSector); - return Status; + goto Quit; } /* Write new bootsector to RootPath */ @@ -1788,15 +1811,13 @@ InstallBtrfsBootCodeToDisk( sizeof(BTRFS_BOOTSECTOR), &FileOffset, NULL); -#if 0 if (!NT_SUCCESS(Status)) { DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); - RtlFreeHeap(ProcessHeap, 0, NewBootSector); - return Status; + goto Quit; } +#if 0 /* Write backup boot sector */ if ((BackupBootSector != 0x0000) && (BackupBootSector != 0xFFFF)) { @@ -1813,9 +1834,7 @@ InstallBtrfsBootCodeToDisk( if (!NT_SUCCESS(Status)) { DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); - RtlFreeHeap(ProcessHeap, 0, NewBootSector); - return Status; + goto Quit; } } @@ -1835,6 +1854,25 @@ InstallBtrfsBootCodeToDisk( DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); } #endif + +Quit: + /* Unlock the volume */ + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("Failed to unlock BTRFS volume (Status 0x%lx)\n", LockStatus); + } + + /* Close the volume */ NtClose(FileHandle); /* Free the new boot sector */

1 0

02/05: [SETUPLIB] Use proper file share access when opening partitions for raw access.
by Hermès Bélusca-Maïto 11 Nov '18

11 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfb2b88f822733fe3c56c… commit bfb2b88f822733fe3c56cfd9f8edfad4a9742aa9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 11 17:14:13 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 11 21:47:37 2018 +0100 [SETUPLIB] Use proper file share access when opening partitions for raw access. --- base/setup/lib/bootsup.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 1caf02f951..2459c731da 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -576,7 +576,7 @@ IsThereAValidBootSector( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) goto Quit; @@ -644,7 +644,7 @@ SaveBootSector( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -747,7 +747,7 @@ InstallMbrBootCodeToDiskHelper( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -793,7 +793,7 @@ InstallMbrBootCodeToDiskHelper( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -845,7 +845,7 @@ InstallMbrBootCodeToDiskHelper( GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { @@ -956,7 +956,7 @@ InstallFat12BootCodeToFloppy( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1005,7 +1005,7 @@ InstallFat12BootCodeToFloppy( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1054,7 +1054,7 @@ InstallFat12BootCodeToFloppy( GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { @@ -1140,7 +1140,7 @@ InstallFat16BootCode( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1225,7 +1225,7 @@ InstallFat16BootCodeToFile( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT /* | FILE_SEQUENTIAL_ONLY */); if (!NT_SUCCESS(Status)) return Status; @@ -1296,7 +1296,7 @@ InstallFat16BootCodeToDisk( GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) return Status; @@ -1370,7 +1370,7 @@ InstallFat32BootCode( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1521,7 +1521,7 @@ InstallFat32BootCodeToFile( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT /* | FILE_SEQUENTIAL_ONLY */); if (!NT_SUCCESS(Status)) return Status; @@ -1592,7 +1592,7 @@ InstallFat32BootCodeToDisk( GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT /* | FILE_SEQUENTIAL_ONLY */); if (!NT_SUCCESS(Status)) return Status; @@ -1643,7 +1643,7 @@ InstallBtrfsBootCodeToDisk( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1691,7 +1691,7 @@ InstallBtrfsBootCodeToDisk( GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { @@ -1745,7 +1745,7 @@ InstallBtrfsBootCodeToDisk( GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018