Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

[reactos] 03/03: [TCPIP] When enumerating sockets, retrieve their state and return it

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91b013d3877d9f3a08c21… commit 91b013d3877d9f3a08c21ce3cdec1950a34220f9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 23 22:49:53 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 23 22:51:35 2018 +0100 [TCPIP] When enumerating sockets, retrieve their state and return it This fixes netstat not having any state when enumerating connections. Basically, now, our netstat produces stuff like: https://twitter.com/HeisSpiter/status/1065871999266955264 --- drivers/network/tcpip/include/tcp.h | 2 ++ drivers/network/tcpip/tcpip/ninfo.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/network/tcpip/include/tcp.h b/drivers/network/tcpip/include/tcp.h index 20147c77d7..6bb8280d5a 100644 --- a/drivers/network/tcpip/include/tcp.h +++ b/drivers/network/tcpip/include/tcp.h @@ -216,3 +216,5 @@ VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, const B void LibTCPDumpPcb(PVOID SocketContext); + +NTSTATUS TCPGetSocketStatus(PCONNECTION_ENDPOINT Connection, PULONG State); diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 42894767ea..d45b4bb1e5 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -188,7 +188,6 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TI_DbgPrint(DEBUG_INFO, ("Called.\n")); - TcpRow.State = 0; /* FIXME */ TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; TcpRow.dwLocalPort = AddrFile->Port; @@ -215,9 +214,13 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr; TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port); } + + Status = TCPGetSocketStatus(AddrFile->Connection, (PULONG)&TcpRow.State); + ASSERT(NT_SUCCESS(Status)); } else { + TcpRow.State = 0; TcpRow.dwRemoteAddr = 0; TcpRow.dwRemotePort = 0; }

5 years, 11 months

[reactos] 02/03: [IP] Add a TCPGetSocketStatus() wrapper around LibTCPGetSocketStatus()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=738f3276683a782eb74ca… commit 738f3276683a782eb74cabc0bac0f63dfc410613 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 23 22:48:34 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 23 22:51:35 2018 +0100 [IP] Add a TCPGetSocketStatus() wrapper around LibTCPGetSocketStatus() --- sdk/lib/drivers/ip/transport/tcp/tcp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/lib/drivers/ip/transport/tcp/tcp.c b/sdk/lib/drivers/ip/transport/tcp/tcp.c index 69a2f42366..675971bb2a 100644 --- a/sdk/lib/drivers/ip/transport/tcp/tcp.c +++ b/sdk/lib/drivers/ip/transport/tcp/tcp.c @@ -691,5 +691,19 @@ TCPSetNoDelay( return STATUS_SUCCESS; } +NTSTATUS +TCPGetSocketStatus( + PCONNECTION_ENDPOINT Connection, + PULONG State) +{ + if (!Connection) + return STATUS_UNSUCCESSFUL; + + if (Connection->SocketContext == NULL) + return STATUS_UNSUCCESSFUL; + + LibTCPGetSocketStatus(Connection->SocketContext, State); + return STATUS_SUCCESS; +} /* EOF */

5 years, 11 months

[reactos] 01/03: [LWIP] Implement a LibTCPGetSocketStatus() function in our LwIP glue

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29c15104230e95467229a… commit 29c15104230e95467229a3515e092c5e744bdeff Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 23 22:39:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 23 22:51:35 2018 +0100 [LWIP] Implement a LibTCPGetSocketStatus() function in our LwIP glue It is used to query a socket state (established, closed, and so on). --- sdk/lib/drivers/lwip/src/include/rosip.h | 1 + sdk/lib/drivers/lwip/src/rostcp.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/sdk/lib/drivers/lwip/src/include/rosip.h b/sdk/lib/drivers/lwip/src/include/rosip.h index 2838da8a9e..03aaf0c6a9 100644 --- a/sdk/lib/drivers/lwip/src/include/rosip.h +++ b/sdk/lib/drivers/lwip/src/include/rosip.h @@ -110,6 +110,7 @@ err_t LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t err_t LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); void LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg); void LibTCPSetNoDelay(PTCP_PCB pcb, BOOLEAN Set); +void LibTCPGetSocketStatus(PTCP_PCB pcb, PULONG State); /* IP functions */ void LibIPInsertPacket(void *ifarg, const void *const data, const u32_t size); diff --git a/sdk/lib/drivers/lwip/src/rostcp.c b/sdk/lib/drivers/lwip/src/rostcp.c index ea06d75a7f..8e22ccd5c2 100644 --- a/sdk/lib/drivers/lwip/src/rostcp.c +++ b/sdk/lib/drivers/lwip/src/rostcp.c @@ -840,3 +840,12 @@ LibTCPSetNoDelay( else pcb->flags &= ~TF_NODELAY; } + +void +LibTCPGetSocketStatus( + PTCP_PCB pcb, + PULONG State) +{ + /* Translate state from enum tcp_state -> MIB_TCP_STATE */ + *State = pcb->state + 1; +}

5 years, 11 months

[reactos] 01/01: [TRANSLATION] Update Simplified Chinese translation. (#1057)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2819679ec16f979acb66… commit a2819679ec16f979acb6615443087254a3ea1bba Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Fri Nov 23 23:24:47 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 23 16:24:47 2018 +0100 [TRANSLATION] Update Simplified Chinese translation. (#1057) --- boot/freeldr/fdebug/lang/zh-CN.rc | 7 ++- dll/shellext/devcpux/lang/zh-CN.rc | 23 ++++++++ dll/win32/shell32/lang/zh-CN.rc | 68 +++++++++++----------- media/inf/shortcuts.inf | 4 +- .../applications/sysutils/fontsub/lang/zh-CN.rc | 10 ++-- 5 files changed, 68 insertions(+), 44 deletions(-) diff --git a/boot/freeldr/fdebug/lang/zh-CN.rc b/boot/freeldr/fdebug/lang/zh-CN.rc index 9108065c3c..6351f6f095 100644 --- a/boot/freeldr/fdebug/lang/zh-CN.rc +++ b/boot/freeldr/fdebug/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -39,7 +40,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "关于 FreeLoader 调试器" FONT 9, "宋体" BEGIN - CONTROL "FreeLoader 调试器 v1.0\nCopyright (C) 2003\n由 Brian Palmer (brianp(a)reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 + CONTROL "FreeLoader 调试器 v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 DEFPUSHBUTTON "确定", IDOK, 183, 189, 44, 14, WS_GROUP ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20 EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -74,12 +75,12 @@ END STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader 调试器" IDS_HELLO "世界您好！" IDC_FDEBUG "FDEBUG" END STRINGTABLE BEGIN - IDS_LICENSE "此程序是免费软件; 你可以将它重新分发和/或修改根据 GNU 通用公共许可的条款，如由自由软件基金会出版; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, wr [...] + IDS_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证第 2 版或您选择的更高版本中的条款重新分发或修改它\r\n\r\n本程序之所以分发是希望其有用，但不提供任何担保。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该伴随此程序收到了 GPL 许可证的副本，如果没有，请写信给 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" END diff --git a/dll/shellext/devcpux/lang/zh-CN.rc b/dll/shellext/devcpux/lang/zh-CN.rc new file mode 100644 index 0000000000..193c014e47 --- /dev/null +++ b/dll/shellext/devcpux/lang/zh-CN.rc @@ -0,0 +1,23 @@ +/* Translated by Luo Yufan (njlyf2011(a)hotmail.oom) on 2018-11-23 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "处理器" +FONT 9, "宋体" +BEGIN + LTEXT "功能:", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "型号:", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "步进:", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "核心速度:", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7f42dfeaec..9d595ab573 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -157,7 +157,7 @@ BEGIN LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "已安装的物理内存：", IDC_STATIC, 35, 152, 130, 10 + LTEXT "已安装的物理内存:", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "确定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 @@ -167,7 +167,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "宋体" BEGIN - LTEXT "ReactOS 提供方：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "带给您 ReactOS 的是:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -685,18 +685,18 @@ BEGIN END IDD_ACTION DIALOG 0, 0, 225, 95 -CAPTION "New Action" +CAPTION "新操作" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "宋体" BEGIN - LTEXT "&Action:", -1, 5, 7, 150, 10 + LTEXT "操作(&A):", -1, 5, 7, 150, 10 EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL - LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + LTEXT "用于执行操作的应用程序(&L):", -1, 5, 42, 150, 10 EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 - AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 - DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 + PUSHBUTTON "浏览(&R)...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "使用 DDE(&U)", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "确定", IDOK, 160, 20, 60, 14 + PUSHBUTTON "取消", IDCANCEL, 160, 40, 60, 14 END IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 @@ -704,20 +704,20 @@ CAPTION "自定义" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "宋体" BEGIN - GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP - LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + GROUPBOX "您想要什么类型的文件夹?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "将此文件夹类型设置成模板(&F):", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP - LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 - LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + AUTOCHECKBOX "将此模板应用到所有子文件夹(&S)", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "文件夹图片", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "对于缩略图视图，您可以在此文件夹上放置图片以提醒您内容。", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "更改图片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "恢复默认(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "预览:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + GROUPBOX "文件夹图标", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "对于除缩略图以外的所有视图，您可以将标准""文件夹""图标更改为另一个图标。", IDC_STATIC, 15, 180, 210, 25 ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + PUSHBUTTON "更改图标(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 END STRINGTABLE @@ -801,9 +801,9 @@ BEGIN /* message box strings */ IDS_RESTART_TITLE "重新启动" - IDS_RESTART_PROMPT "是否重新启动系统?" + IDS_RESTART_PROMPT "请问需要重启系统吗?" IDS_SHUTDOWN_TITLE "关机" - IDS_SHUTDOWN_PROMPT "是否关闭系统?" + IDS_SHUTDOWN_PROMPT "请问需要关闭系统吗?" /* Run File dialog */ IDS_RUNDLG_ERROR "无法显示运行文件对话框 (内部错误)" @@ -889,9 +889,9 @@ BEGIN IDS_DRV_FILE "设备驱动程序" IDS_EFI_FILE "可扩展固件接口(EFI) 可执行文件" IDS_EXE_FILE "应用程序" - IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" - IDS_TLB_FILE "Type Library" + IDS_NLS_FILE "国家语言支持文件" + IDS_OCX_FILE "ActiveX 控件" + IDS_TLB_FILE "类型库" IDS_FON_FILE "字体文件" IDS_TTF_FILE "TrueType 字体文件" IDS_OTF_FILE "OpenType 字体文件" @@ -904,7 +904,7 @@ BEGIN IDS_SCR_FILE "屏幕保护程序" IDS_SYS_FILE "系统文件" IDS_VXD_FILE "虚拟设备驱动程序" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "%s-文件" IDS_OPEN_VERB "打开" IDS_EXPLORE_VERB "浏览" @@ -934,7 +934,7 @@ BEGIN IDS_BYTES_FORMAT "字节" IDS_UNKNOWN_APP "未知应用程序" - IDS_EXE_DESCRIPTION "描述：" + IDS_EXE_DESCRIPTION "描述:" IDS_MENU_EMPTY "(空)" IDS_OBJECTS "%d 个对象" @@ -962,18 +962,18 @@ BEGIN IDS_NEWEXT_ADVANCED_LEFT "<< 高级(&V)" IDS_NEWEXT_ADVANCED_RIGHT "高级(&V) >>" - IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_NEW "<新建>" IDS_NEWEXT_SPECIFY_EXT "您必须指定一个扩展名。" - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "扩展名 %s 已经与文件类型 %s 关联。是否要将 %s 与 %s 取消关联并为其创建新的文件类型？" IDS_NEWEXT_EXT_IN_USE "扩展名正在被使用" - IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_REMOVE_EXT "如果删除已注册的文件扩展名，则无法通过双击其图标来打开具有此扩展名的文件。\n\n您确定要删除此扩展名吗？" IDS_SPECIFY_ACTION "您必须指定一个操作。" IDS_INVALID_PROGRAM "找不到指定的程序。请确保文件名和路径正确无误。" IDS_REMOVE_ACTION "您确定要移除此操作吗？" - IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." - IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" - IDS_EDITING_ACTION "Editing action for type: " - IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_ACTION_EXISTS "已为此文件类型注册了操作 '%s' 。请输入其他名称，然后重试。" + IDS_EXE_FILTER "程序\0*.exe\0所有文件\0*.*\0" + IDS_EDITING_ACTION "编辑操作类型: " + IDS_NO_ICONS "文件 '%s' 不包含图标\n\n从列表中选择一个图标或指定其他文件。" IDS_FILE_NOT_FOUND "无法找到文件 '%s'。" END diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index d6b54c319d..fc4443c9d8 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1482,8 +1482,8 @@ RAPPS_TITLE_SHORT=应用程序管理器 RAPPS_DESC=下载并安装其他应用程序 SERVMAN_TITLE=服务 SERVMAN_DESC=服务 -DEVMGMT_TITLE=设备管理 -DEVMGMT_DESC=设备管理 +DEVMGMT_TITLE=设备管理器 +DEVMGMT_DESC=设备管理器 EVENTVWR_TITLE=事件查看器 EVENTVWR_DESC=启动事件查看器 MSCONFIG_TITLE=系统配置 diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc b/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc index b866d66106..51d801d4e3 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc @@ -19,8 +19,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED BEGIN 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 @@ -29,9 +29,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "退出(&X)\tAlt+F4", ID_EXIT END - POPUP "&Edit" + POPUP "编辑(&E)" BEGIN - MENUITEM "新项目(&N)\tCtrl+N", ID_NEW + MENUITEM "新建项目(&N)\tCtrl+N", ID_NEW MENUITEM SEPARATOR MENUITEM "编辑项目(&E)\tEnter", ID_EDIT MENUITEM SEPARATOR @@ -47,7 +47,7 @@ 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 SEPARATOR

5 years, 11 months

[reactos] 01/01: [SHELL32] Improve CORE-15295 IDD_FILE_PROPERTIES

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=432afb416127a1ffa064d… commit 432afb416127a1ffa064d87d1215d985ada1d91b Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Nov 23 02:25:28 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Nov 23 02:25:28 2018 +0100 [SHELL32] Improve CORE-15295 IDD_FILE_PROPERTIES addendum to 0.4.11-dev-673-g 04e1263921c0a4ee9b5ec10bb02884146fcca47a Actually this control must not statically consume width of 170. There are two different versions of that dialog. One has a "change"-button. In this case the edit must be only 100 wide. In case we have the version without the change button, we resize it to have 170 width (same as its neighbor). This commit is shared work of Stanislav Motylkov, Giannis Adamopoulos and Joachim Henze. Commit supersedes PR#1056. --- dll/win32/shell32/dialogs/filedefext.cpp | 10 ++++++++++ dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 33 files changed, 42 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index 2b650ecf91..d919753cdb 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -614,6 +614,16 @@ CFileDefExt::InitGeneralPage(HWND hwndDlg) LoadStringW(shell32_hInstance, IDS_EXE_DESCRIPTION, wszBuf, _countof(wszBuf)); SetDlgItemTextW(hwndDlg, 14006, wszBuf); ShowWindow(GetDlgItem(hwndDlg, 14024), SW_HIDE); + + /* hidden button 14024 allows to draw edit 14007 larger than defined in resources , we use edit 14009 as idol */ + RECT rectIdol, rectToAdjust; + GetClientRect(GetDlgItem(hwndDlg, 14009), &rectIdol); + GetClientRect(GetDlgItem(hwndDlg, 14007), &rectToAdjust); + SetWindowPos(GetDlgItem(hwndDlg, 14007), HWND_TOP, 0, 0, + rectIdol.right-rectIdol.left /* make it as wide as its idol */, + rectToAdjust.bottom-rectToAdjust.top /* but keep its current height */, + SWP_NOMOVE | SWP_NOZORDER ); + LPCWSTR pwszDescr = m_VerInfo.GetString(L"FileDescription"); if (pwszDescr) SetDlgItemTextW(hwndDlg, 14007, pwszDescr); diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index c51abaae11..d92e908455 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -260,7 +260,7 @@ BEGIN LTEXT "Отваряне с:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "C&hange...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Местоположение:", 14008, 8, 75, 61, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 3ea4937062..70c550ec67 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 64af9cb69d..9dd457b67b 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Otevírat v:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Změnit...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Umístění:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index ff7c561956..4aaf1f3997 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 384e0d54bc..c5051027dd 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Öffnen mit:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ändern...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Pfad:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 4ab460fcf4..9fad4f6752 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Ανοίγει με:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Θέση:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 3740ad025c..7580deaa7a 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 54d508cb35..0af93f1f2c 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -260,7 +260,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 7f0fbe07b5..a9af601531 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Se abre con:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Cambiar...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Ubicación:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index be81a68848..730dbfade4 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Ava programmiga:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Muuda...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Asukoht:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index e87eda964d..c26f324d1c 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 9dbfbb1b9f..d3de987465 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Changer...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localisation :", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index f99fb8203a..8904340619 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "נפתח באמצעות:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "שי&נוי...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "מיקום:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 4934e978b3..41f67c32a7 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index bbbf2c6ed4..a86e349621 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Apri con:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Modifica...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Posizione:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 6f0129b1c5..dd7b0a7e14 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "実行プログラム:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "変更(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "場所:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 67e88701b8..fa24d55a30 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 2947cfeb97..387541fa42 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 472e8cb53d..5f70d98772 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Åpne med:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Lokalisjon:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 32376d0aa5..08131b2619 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Otwierany za pomocą:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Zmień...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Lokalizacja:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index c350d0eef4..fd9d8bfa82 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Abre com:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Modificar...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Local:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 4af373ceeb..67787e74fa 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Abre com::", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localização:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 31971c0bff..e72c04b345 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -261,7 +261,7 @@ BEGIN LTEXT "Va fi deschis cu:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "Spe&cificare…", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Locație:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index aa5b2ff15c..b34cf139a3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -266,7 +266,7 @@ BEGIN LTEXT "Приложение:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Изменить...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Размещение:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 23c3e2ca30..345315be8f 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Otvoriť programom:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Umiestnenie:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 363635bb2b..0d9f4c8f43 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 593c10c701..0ff880ccb5 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -263,7 +263,7 @@ BEGIN LTEXT "Hap me:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ndrysho...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Vendndodhje:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 6e8b254961..7eff83fef4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Öppna med:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ändra...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Plats:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 5208a824c8..5c992270b9 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -261,7 +261,7 @@ BEGIN LTEXT "Birlikte Açılır:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Değiştir...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Konum:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 02e7dc25fc..96fd94e59c 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Додаток:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Розташування:", 14008, 8, 75, 50, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 4ac844e5fe..7f42dfeaec 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -269,7 +269,7 @@ BEGIN LTEXT "打开方式:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "更改...(&C)", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "地点:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 2b4800b8c8..bdb8fe1e20 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP

5 years, 11 months

[reactos] 01/01: [TCPIP] Fix returned IP address when querying TCP connections

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=500a5151ea1ef6d35ea4f… commit 500a5151ea1ef6d35ea4f77ecd16679ce7bdf852 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 22 21:50:21 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Nov 22 21:52:11 2018 +0100 [TCPIP] Fix returned IP address when querying TCP connections This gives something like that now: https://twitter.com/HeisSpiter/status/1065706156331606017 :-) CORE-15363 --- drivers/network/tcpip/tcpip/ninfo.c | 41 ++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 54e9be4955..42894767ea 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -177,43 +177,56 @@ TDI_STATUS InfoTdiQueryGetIPSnmpInfo( TDIEntityID ID, return Status; } +#define ntohs(n) ((((n) & 0xff) << 8) | (((n) & 0xff00) >> 8)) + TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, PUINT BufferSize) { MIB_TCPROW TcpRow; - PADDRESS_FILE EndPoint; - TDI_STATUS Status = TDI_INVALID_REQUEST; + TDI_STATUS Status = TDI_SUCCESS; TI_DbgPrint(DEBUG_INFO, ("Called.\n")); - EndPoint = NULL; TcpRow.State = 0; /* FIXME */ + TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; + TcpRow.dwLocalPort = AddrFile->Port; if (AddrFile->Listener != NULL) { - EndPoint = AddrFile->Listener->AddressFile; - TcpRow.State = MIB_TCP_STATE_LISTEN; - } - else if (AddrFile->Connection != NULL) - EndPoint = AddrFile->Connection->AddressFile; + PADDRESS_FILE EndPoint; - TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; - TcpRow.dwLocalPort = AddrFile->Port; + EndPoint = AddrFile->Listener->AddressFile; - if (EndPoint != NULL) - { + TcpRow.State = MIB_TCP_STATE_LISTEN; TcpRow.dwRemoteAddr = EndPoint->Address.Address.IPv4Address; TcpRow.dwRemotePort = EndPoint->Port; } + else if (AddrFile->Connection != NULL && + AddrFile->Connection->SocketContext != NULL) + { + TA_IP_ADDRESS EndPoint; + + Status = TCPGetSockAddress(AddrFile->Connection, (PTRANSPORT_ADDRESS)&EndPoint, TRUE); + if (NT_SUCCESS(Status)) + { + ASSERT(EndPoint.TAAddressCount >= 1); + ASSERT(EndPoint.Address[0].AddressLength == TDI_ADDRESS_LENGTH_IP); + TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr; + TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port); + } + } else { TcpRow.dwRemoteAddr = 0; TcpRow.dwRemotePort = 0; } - Status = InfoCopyOut( (PCHAR)&TcpRow, sizeof(TcpRow), - Buffer, BufferSize ); + if (NT_SUCCESS(Status)) + { + Status = InfoCopyOut( (PCHAR)&TcpRow, sizeof(TcpRow), + Buffer, BufferSize ); + } TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status));

5 years, 11 months

[reactos] 01/01: [README] Now that we got rid of ViewVC (see https://reactos.org/pipermail/ros-dev/2018-November/018970.html), update the SVN archive repo URL.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2403dea9b4faf13952161… commit 2403dea9b4faf13952161754d6b903bd6023438a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 22 01:00:07 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 22 01:00:07 2018 +0100 [README] Now that we got rid of ViewVC (see https://reactos.org/pipermail/ros-dev/2018-November/018970.html), update the SVN archive repo URL. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd21dfaddd..547610c847 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ See also the [CREDITS](CREDITS) file for others. The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/?p=reactos.git) in case GitHub is down. -There is also an obsolete [SVN archive repository](https://svn.reactos.org/svn/reactos?view=revision) that is kept for historical purposes. +There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes. [travis.badge]: https://travis-ci.org/reactos/reactos.svg?branch=master [appveyor.badge]: https://ci.appveyor.com/api/projects/status/github/reactos/reactos?branch=m…

5 years, 11 months

[reactos] 01/01: [SYSDM][DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1195f5300b3116594bb2… commit c1195f5300b3116594bb27b23fb16e321775f36b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Nov 22 00:07:54 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 21 22:07:54 2018 +0100 [SYSDM][DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054) Include only one user-mode DMI library. Addendum to baf2c0c. --- base/applications/dxdiag/CMakeLists.txt | 3 +-- base/applications/dxdiag/precomp.h | 1 - dll/cpl/sysdm/CMakeLists.txt | 3 +-- dll/cpl/sysdm/smbios.c | 1 - modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt | 3 +-- modules/rosapps/applications/sysutils/systeminfo/systeminfo.c | 1 - 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt index a299f85160..e8886abd66 100644 --- a/base/applications/dxdiag/CMakeLists.txt +++ b/base/applications/dxdiag/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp - ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp) list(APPEND SOURCE system.c diff --git a/base/applications/dxdiag/precomp.h b/base/applications/dxdiag/precomp.h index 4e16e04db4..5c9f003f37 100644 --- a/base/applications/dxdiag/precomp.h +++ b/base/applications/dxdiag/precomp.h @@ -23,7 +23,6 @@ #include <devguid.h> #include <strsafe.h> #include <udmihelp.h> -#include <dmilib.h> #include "resource.h" diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index f65d7352b5..865d5e7697 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -2,8 +2,7 @@ spec2def(sysdm.cpl sysdm.spec) include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp - ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp) list(APPEND SOURCE advanced.c diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c index 5aeb627edc..5c7e38e467 100644 --- a/dll/cpl/sysdm/smbios.c +++ b/dll/cpl/sysdm/smbios.c @@ -11,7 +11,6 @@ #include <strsafe.h> #include <udmihelp.h> -#include <dmilib.h> typedef struct GENERIC_NAME { diff --git a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt index 69f1690297..dac908585f 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp - ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp) add_executable(systeminfo systeminfo.c systeminfo.rc) set_module_type(systeminfo win32cui) diff --git a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c index 407553e887..de49912385 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c +++ b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c @@ -28,7 +28,6 @@ #include <iphlpapi.h> #include <winsock2.h> #include <udmihelp.h> -#include <dmilib.h> #include "resource.h"

5 years, 11 months

[reactos] 01/01: [DRWTSN32] Add SMBIOS data to the system information (#1017)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baf2c0cc2d849fffa68a1… commit baf2c0cc2d849fffa68a1634ed87e7da08805682 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Nov 21 23:49:15 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 21 21:49:15 2018 +0100 [DRWTSN32] Add SMBIOS data to the system information (#1017) [DMILIB][UDMIHELP] Allow functions to be linked with C++ code. --- base/applications/drwtsn32/CMakeLists.txt | 6 ++++-- base/applications/drwtsn32/sysinfo.cpp | 31 +++++++++++++++++++++++++++++++ sdk/lib/dmilib/dmilib.h | 5 ++++- sdk/lib/udmihelp/udmihelp.h | 15 ++++++++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/base/applications/drwtsn32/CMakeLists.txt b/base/applications/drwtsn32/CMakeLists.txt index 66dbdab1f7..e58b1c095f 100644 --- a/base/applications/drwtsn32/CMakeLists.txt +++ b/base/applications/drwtsn32/CMakeLists.txt @@ -2,7 +2,9 @@ PROJECT(drwtsn32) set_cpp(WITH_RUNTIME WITH_EXCEPTIONS WITH_STL) -include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp) list(APPEND CPP_SOURCE drwtsn32.cpp @@ -15,6 +17,6 @@ list(APPEND CPP_SOURCE add_executable(drwtsn32 ${CPP_SOURCE} drwtsn32.rc) add_pch(drwtsn32 precomp.h CPP_SOURCE) set_module_type(drwtsn32 win32gui UNICODE) -target_link_libraries(drwtsn32 atlnew) +target_link_libraries(drwtsn32 atlnew udmihelp) add_importlibs(drwtsn32 dbghelp psapi advapi32 shell32 shlwapi msvcrt user32 kernel32 ntdll) add_cd_file(TARGET drwtsn32 DESTINATION reactos/system32 FOR all) diff --git a/base/applications/drwtsn32/sysinfo.cpp b/base/applications/drwtsn32/sysinfo.cpp index 7148163b15..f52c58b2cb 100644 --- a/base/applications/drwtsn32/sysinfo.cpp +++ b/base/applications/drwtsn32/sysinfo.cpp @@ -6,6 +6,7 @@ */ #include "precomp.h" +#include <udmihelp.h> #include <winreg.h> #include <reactos/buildno.h> @@ -71,6 +72,36 @@ void PrintSystemInfo(FILE* output, DumpData& data) xfprintf(output, " User Name: %s" NEWLINE, Buffer); + PVOID SMBiosBuf; + PCHAR DmiStrings[ID_STRINGS_MAX] = { 0 }; + SMBiosBuf = LoadSMBiosData(DmiStrings); + if (SMBiosBuf) + { + if (DmiStrings[BIOS_VENDOR]) + xfprintf(output, " BIOS Vendor: %s" NEWLINE, DmiStrings[BIOS_VENDOR]); + if (DmiStrings[BIOS_VERSION]) + xfprintf(output, " BIOS Version: %s" NEWLINE, DmiStrings[BIOS_VERSION]); + if (DmiStrings[BIOS_DATE]) + xfprintf(output, " BIOS Date: %s" NEWLINE, DmiStrings[BIOS_DATE]); + if (DmiStrings[SYS_VENDOR]) + xfprintf(output, " System Manufacturer: %s" NEWLINE, DmiStrings[SYS_VENDOR]); + if (DmiStrings[SYS_FAMILY]) + xfprintf(output, " System Family: %s" NEWLINE, DmiStrings[SYS_FAMILY]); + if (DmiStrings[SYS_PRODUCT]) + xfprintf(output, " System Model: %s" NEWLINE, DmiStrings[SYS_PRODUCT]); + if (DmiStrings[SYS_VERSION]) + xfprintf(output, " System Version: %s" NEWLINE, DmiStrings[SYS_VERSION]); + if (DmiStrings[SYS_SKU]) + xfprintf(output, " System SKU: %s" NEWLINE, DmiStrings[SYS_SKU]); + if (DmiStrings[BOARD_VENDOR]) + xfprintf(output, " Baseboard Manufacturer: %s" NEWLINE, DmiStrings[BOARD_VENDOR]); + if (DmiStrings[BOARD_NAME]) + xfprintf(output, " Baseboard Model: %s" NEWLINE, DmiStrings[BOARD_NAME]); + if (DmiStrings[BOARD_VERSION]) + xfprintf(output, " Baseboard Version: %s" NEWLINE, DmiStrings[BOARD_VERSION]); + FreeSMBiosData(SMBiosBuf); + } + SYSTEM_INFO info; GetSystemInfo(&info); xfprintf(output, " Number of Processors: %d" NEWLINE, info.dwNumberOfProcessors); diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h index 9bfcf5f507..203352db57 100644 --- a/sdk/lib/dmilib/dmilib.h +++ b/sdk/lib/dmilib/dmilib.h @@ -6,7 +6,8 @@ * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#pragma once +#ifndef DMILIB_H +#define DMILIB_H enum _ID_STRINGS { @@ -34,3 +35,5 @@ ParseSMBiosTables( _In_reads_bytes_(TableSize) PVOID SMBiosTables, _In_ ULONG TableSize, _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); + +#endif /* DMILIB_H */ diff --git a/sdk/lib/udmihelp/udmihelp.h b/sdk/lib/udmihelp/udmihelp.h index 8ed59d9f3c..27652229d9 100644 --- a/sdk/lib/udmihelp/udmihelp.h +++ b/sdk/lib/udmihelp/udmihelp.h @@ -5,7 +5,14 @@ * COPYRIGHT: Copyright 2018 Stanislav Motylkov */ -#pragma once +#ifndef UDMIHELP_H +#define UDMIHELP_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <../dmilib/dmilib.h> PVOID LoadSMBiosData( @@ -25,3 +32,9 @@ GetSMBiosStringW( VOID FreeSMBiosData( _In_ PVOID Buffer); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* UDMIHELP_H */

5 years, 11 months

[reactos] 01/01: [KERNEL32] FlsAlloc - fiber local storage list was not initialized before using

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d897e271a2b09c14e3443… commit d897e271a2b09c14e3443daafcef87056d246b3f Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Tue Nov 13 22:52:18 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Nov 21 19:18:01 2018 +0100 [KERNEL32] FlsAlloc - fiber local storage list was not initialized before using --- dll/win32/kernel32/client/fiber.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index 1b1e1e37ac..a1a5ffe5d3 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -372,6 +372,7 @@ FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) if (!NtCurrentTeb()->FlsData) { NtCurrentTeb()->FlsData = pFlsData; + InitializeListHead(&Peb->FlsListHead); InsertTailList(&Peb->FlsListHead, &pFlsData->ListEntry); }

5 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018