Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [DEVCPUX] Add russian translation
by Stanislav Motylkov 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fa744241fd9600c97095… commit 0fa744241fd9600c970955bb29494fb9f05ee5e2 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Sep 26 16:15:07 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 27 12:10:06 2018 +0200 [DEVCPUX] Add russian translation Also make MHz string translatable. Addendum to 793e2a3. --- dll/shellext/devcpux/lang/en-US.rc | 5 +++++ dll/shellext/devcpux/lang/ru-RU.rc | 21 +++++++++++++++++++++ dll/shellext/devcpux/processor.c | 8 +++++++- dll/shellext/devcpux/processor.rc | 5 ++++- dll/shellext/devcpux/resource.h | 2 ++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dll/shellext/devcpux/lang/en-US.rc b/dll/shellext/devcpux/lang/en-US.rc index 4ea9377e0a..428531e5a8 100644 --- a/dll/shellext/devcpux/lang/en-US.rc +++ b/dll/shellext/devcpux/lang/en-US.rc @@ -15,6 +15,11 @@ BEGIN LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 END +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME diff --git a/dll/shellext/devcpux/lang/ru-RU.rc b/dll/shellext/devcpux/lang/ru-RU.rc new file mode 100644 index 0000000000..6e5217b28f --- /dev/null +++ b/dll/shellext/devcpux/lang/ru-RU.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Процессор" +FONT 8, "MS Shell Dlg" +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 МГц" +END diff --git a/dll/shellext/devcpux/processor.c b/dll/shellext/devcpux/processor.c index 8544af1c35..06c2667af2 100644 --- a/dll/shellext/devcpux/processor.c +++ b/dll/shellext/devcpux/processor.c @@ -92,11 +92,17 @@ ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) WCHAR szFeatures[MAX_PATH] = L""; WCHAR szModel[3]; WCHAR szStepping[3]; + WCHAR szMhz[16]; WCHAR szCurrentMhz[10]; BOOL bFirst = TRUE; SYSTEM_INFO SystemInfo; PROCESSOR_POWER_INFORMATION PowerInfo; + if (!LoadStringW(g_hInstance, IDS_MEGAHERTZ, szMhz, ARRAYSIZE(szMhz))) + { + StringCbCopyW(szMhz, sizeof(szMhz), L"%ld MHz"); + } + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) AddFeature(szFeatures, sizeof(szFeatures), L"MMX", &bFirst); if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) @@ -119,7 +125,7 @@ ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); - StringCbPrintfW(szCurrentMhz, sizeof(szCurrentMhz), L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + StringCbPrintfW(szCurrentMhz, sizeof(szCurrentMhz), szMhz, PowerInfo.CurrentMhz); SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); return TRUE; diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index e98f907589..0771485902 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -14,4 +14,7 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" -#endif \ No newline at end of file +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif diff --git a/dll/shellext/devcpux/resource.h b/dll/shellext/devcpux/resource.h index e3543d061e..2eee3a93e9 100644 --- a/dll/shellext/devcpux/resource.h +++ b/dll/shellext/devcpux/resource.h @@ -6,3 +6,5 @@ #define IDC_MODEL 302 #define IDC_STEPPING 303 #define IDC_CORESPEED 304 + +#define IDS_MEGAHERTZ 400

1 0

02/02: [NETCFGX] Add the most simple property sheet provider for network adapters
by Eric Kohl 26 Sep '18

26 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c1e5f7cb9896e36acc43… commit 3c1e5f7cb9896e36acc43493878c345ee206ed1e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 26 23:48:01 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 26 23:49:02 2018 +0200 [NETCFGX] Add the most simple property sheet provider for network adapters - Switch to WINE debug code. - Build the UNICODE version of the DLL by default. - Add the most simple property sheet provider. --- dll/win32/netcfgx/CMakeLists.txt | 3 +- dll/win32/netcfgx/lang/bg-BG.rc | 7 +++ dll/win32/netcfgx/lang/cs-CZ.rc | 7 +++ dll/win32/netcfgx/lang/da-DK.rc | 7 +++ dll/win32/netcfgx/lang/de-DE.rc | 7 +++ dll/win32/netcfgx/lang/el-GR.rc | 7 +++ dll/win32/netcfgx/lang/en-US.rc | 7 +++ dll/win32/netcfgx/lang/es-ES.rc | 7 +++ dll/win32/netcfgx/lang/fr-FR.rc | 7 +++ dll/win32/netcfgx/lang/he-IL.rc | 7 +++ dll/win32/netcfgx/lang/hu-HU.rc | 7 +++ dll/win32/netcfgx/lang/id-ID.rc | 7 +++ dll/win32/netcfgx/lang/it-IT.rc | 7 +++ dll/win32/netcfgx/lang/ja-JP.rc | 7 +++ dll/win32/netcfgx/lang/nl-NL.rc | 7 +++ dll/win32/netcfgx/lang/no-NO.rc | 7 +++ dll/win32/netcfgx/lang/pl-PL.rc | 7 +++ dll/win32/netcfgx/lang/ro-RO.rc | 7 +++ dll/win32/netcfgx/lang/ru-RU.rc | 7 +++ dll/win32/netcfgx/lang/sk-SK.rc | 7 +++ dll/win32/netcfgx/lang/sq-AL.rc | 7 +++ dll/win32/netcfgx/lang/sv-SE.rc | 7 +++ dll/win32/netcfgx/lang/tr-TR.rc | 7 +++ dll/win32/netcfgx/lang/uk-UA.rc | 7 +++ dll/win32/netcfgx/lang/zh-CN.rc | 7 +++ dll/win32/netcfgx/lang/zh-TW.rc | 7 +++ dll/win32/netcfgx/netcfgx.c | 98 ++++++++++++++++++++-------------------- dll/win32/netcfgx/netcfgx.spec | 4 +- dll/win32/netcfgx/precomp.h | 4 ++ dll/win32/netcfgx/propertypage.c | 83 ++++++++++++++++++++++++++++++++++ dll/win32/netcfgx/resource.h | 1 + 31 files changed, 315 insertions(+), 53 deletions(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index a2816b2181..f192cc8d18 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE netcfg_iface.c inetcfgcomp_iface.c tcpipconf_notify.c + propertypage.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c) @@ -18,7 +19,7 @@ add_library(netcfgx SHARED netcfgx.rc ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) -set_module_type(netcfgx win32dll) +set_module_type(netcfgx win32dll UNICODE) target_link_libraries(netcfgx uuid wine) add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_pch(netcfgx precomp.h SOURCE) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 222032267a..03b8e8a043 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Мрежoвo свързване" diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index 3dee4adc4b..007a4e1dee 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -201,6 +201,13 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Síťové připojení" diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index 702a991572..5c0d0a5ac7 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index 98246876c9..19479ceac5 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "LAN-Verbindung" diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index dc577ad09c..3bb1fc04e7 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 1ae3d47847..feea1713ac 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 924a0b0de9..6ea5be2a73 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -197,6 +197,13 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Conexión de red" diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 946d51f400..b696364a18 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Connexion réseau" diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 97ebe3da4f..34716189bd 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "חיבור רשת" diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index d3d1d50c71..d89e15db9a 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index dbe7daeed4..5bf8d0ba8b 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index c5a3e952b4..1be24d196f 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Connessioni di rete" diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index 7a0f935b41..f546e31715 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 5d50ce161c..299c0fe5bb 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 6a6d1957b9..4b6b0d54ed 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Nettverk tilkobling" diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index df75350fa1..8ea8cf18d8 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -202,6 +202,13 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Połączenie sieciowe" diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index e9e0ce82df..299eaec46e 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -201,6 +201,13 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Conexiune de rețea" diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 590ad886b7..cfecc1b962 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Сетевое подключение" diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index a43de3133a..7ea1f8eb4f 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index 21138cf1f3..261a22a088 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -200,6 +200,13 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Lidhje rrjeti" diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index f7cf0fe263..dd2c3502d1 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 8e5edda248..3dcaa7a889 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -197,6 +197,13 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Ağ Bağlantısı" diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index 2cbd712d75..c4a0d1d37c 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Мережне підключення" diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index aa7c70fc29..755762a2f1 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -203,6 +203,13 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "网络连接" diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index ec52ad4966..82f1cc5238 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -203,6 +203,13 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "網路連線" diff --git a/dll/win32/netcfgx/netcfgx.c b/dll/win32/netcfgx/netcfgx.c index 13ae0946a5..7438632ad2 100644 --- a/dll/win32/netcfgx/netcfgx.c +++ b/dll/win32/netcfgx/netcfgx.c @@ -15,8 +15,6 @@ #include <ndk/iofuncs.h> #include <ndk/rtlfuncs.h> -#define NDEBUG -#include <debug.h> HINSTANCE netcfgx_hInstance; const GUID CLSID_TcpipConfigNotifyObject = {0xA907657F, 0x6FDF, 0x11D0, {0x8E, 0xFB, 0x00, 0xC0, 0x4F, 0xD9, 0x12, 0xB2}}; @@ -244,7 +242,7 @@ InstallNetDevice( /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) { - DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); + ERR("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -252,7 +250,7 @@ InstallNetDevice( InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!InstanceId) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -260,7 +258,7 @@ InstallNetDevice( if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) { rc = GetLastError(); - DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -268,7 +266,7 @@ InstallNetDevice( DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!DeviceName) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -279,7 +277,7 @@ InstallNetDevice( ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!ExportName) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -290,14 +288,14 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -306,7 +304,7 @@ InstallNetDevice( rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hNetworkKey); @@ -315,21 +313,21 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -337,7 +335,7 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(DWORD)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -355,21 +353,21 @@ InstallNetDevice( { hKey = NULL; rc = GetLastError(); - DPRINT1("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); + ERR("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -378,7 +376,7 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } } @@ -386,28 +384,28 @@ InstallNetDevice( rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -417,14 +415,14 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -433,7 +431,7 @@ InstallNetDevice( hKey = NULL; if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -445,14 +443,14 @@ InstallNetDevice( rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -460,7 +458,7 @@ InstallNetDevice( rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -468,25 +466,25 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } @@ -511,7 +509,7 @@ static DWORD InstallNetClient(VOID) { - DPRINT1("Installation of network clients is not yet supported\n"); + FIXME("Installation of network clients is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -519,7 +517,7 @@ static DWORD InstallNetService(VOID) { - DPRINT1("Installation of network services is not yet supported\n"); + FIXME("Installation of network services is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -527,7 +525,7 @@ static DWORD InstallNetTransport(VOID) { - DPRINT1("Installation of network protocols is not yet supported\n"); + FIXME("Installation of network protocols is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -557,14 +555,14 @@ NetClassInstaller( if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; - DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + TRACE("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); /* Get driver info details */ DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData)) { rc = GetLastError(); - DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -573,7 +571,7 @@ NetClassInstaller( && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { rc = GetLastError(); - DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -581,14 +579,14 @@ NetClassInstaller( if (hInf == INVALID_HANDLE_VALUE) { rc = GetLastError(); - DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc); + ERR("SetupOpenInfFileW() failed with error 0x%lx\n", rc); goto cleanup; } if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName, LINE_LEN, NULL, NULL)) { rc = GetLastError(); - DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -596,7 +594,7 @@ NetClassInstaller( if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) { rc = GetLastError(); - DPRINT("Unable to find key %S in section %S of file %S (error 0x%lx)\n", + ERR("Unable to find key %S in section %S of file %S (error 0x%lx)\n", L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc); goto cleanup; } @@ -604,7 +602,7 @@ NetClassInstaller( if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt)) { rc = GetLastError(); - DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc); + ERR("SetupGetIntField() failed with error 0x%lx\n", rc); goto cleanup; } @@ -616,14 +614,14 @@ NetClassInstaller( if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) { rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); goto cleanup; } BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!BusType) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -631,7 +629,7 @@ NetClassInstaller( if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) { rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); goto cleanup; } } @@ -641,7 +639,7 @@ NetClassInstaller( RpcStatus = UuidCreate(&Uuid); if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) { - DPRINT("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); + ERR("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -649,7 +647,7 @@ NetClassInstaller( RpcStatus = UuidToStringW(&Uuid, &UuidRpcString); if (RpcStatus != RPC_S_OK) { - DPRINT("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); + ERR("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -658,7 +656,7 @@ NetClassInstaller( UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!UuidString) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -677,7 +675,7 @@ NetClassInstaller( rc = InstallNetTransport(); else { - DPRINT("Invalid class guid\n"); + ERR("Invalid class guid\n"); rc = ERROR_GEN_FAILURE; } @@ -691,6 +689,6 @@ cleanup: if (rc == ERROR_SUCCESS) rc = ERROR_DI_DO_DEFAULT; - DPRINT("Returning 0x%lx\n", rc); + TRACE("Returning 0x%lx\n", rc); return rc; } diff --git a/dll/win32/netcfgx/netcfgx.spec b/dll/win32/netcfgx/netcfgx.spec index 6a09c9d419..73261e4f0b 100644 --- a/dll/win32/netcfgx/netcfgx.spec +++ b/dll/win32/netcfgx/netcfgx.spec @@ -7,8 +7,8 @@ 8 stub ModemClassCoInstaller 9 stub NetCfgDiagFromCommandArgs 10 stub NetCfgDiagRepairRegistryBindings -11 stdcall NetClassInstaller (long ptr ptr) -12 stub NetPropPageProvider +11 stdcall NetClassInstaller(long ptr ptr) +12 stdcall NetPropPageProvider(ptr ptr long) 13 stub RasAddBindings 14 stub RasCountBindings 15 stub RasRemoveBindings diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index cda83aa9b0..b8c69a583e 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -21,8 +21,12 @@ #include <devguid.h> #include <commctrl.h> +#include <wine/debug.h> + #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); + typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { REFIID riid; diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c new file mode 100644 index 0000000000..65f667835b --- /dev/null +++ b/dll/win32/netcfgx/propertypage.c @@ -0,0 +1,83 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Network property page provider + * COPYRIGHT: Copyright 2018 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#include "precomp.h" + +static +INT_PTR +CALLBACK +NetPropertyPageDlgProc( + HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + ERR("NetPropertyPageDlgProc: WM_INITDIALOG\n"); + return TRUE; +// return OnInitDialog(hwnd, wParam, lParam); + +// case WM_DESTROY: +// OnDestroy(hwnd); +// break; + + default: + break; + } + + return FALSE; +} + + +BOOL +WINAPI +NetPropPageProvider( + PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + LPARAM lParam) +{ + PROPSHEETPAGEW PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + ERR("NetPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + { + ERR("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); + PropSheetPage.dwFlags = 0; + PropSheetPage.hInstance = netcfgx_hInstance; + PropSheetPage.u.pszTemplate = MAKEINTRESOURCE(IDD_NET_PROPERTY_DLG); + PropSheetPage.pfnDlgProc = NetPropertyPageDlgProc; + PropSheetPage.lParam = 0; + PropSheetPage.pfnCallback = NULL; + + hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); + if (hPropSheetPage == NULL) + { + ERR("CreatePropertySheetPageW() failed!\n"); + return FALSE; + } + + if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) + { + ERR("lpfnAddPropSheetPageProc() failed!\n"); + DestroyPropertySheetPage(hPropSheetPage); + return FALSE; + } + } + + ERR("Done!\n"); + + return TRUE; +} + +/* EOF */ diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h index f8795d394d..cb32ceb787 100644 --- a/dll/win32/netcfgx/resource.h +++ b/dll/win32/netcfgx/resource.h @@ -12,6 +12,7 @@ #define IDD_TCPIPDNS_DLG 108 #define IDD_TCPIPSUFFIX_DLG 109 #define IDD_TCPIP_PORT_DLG 110 +#define IDD_NET_PROPERTY_DLG 111 /* controls */

1 0

01/02: [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Support class property sheet providers.
by Eric Kohl 26 Sep '18

26 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=986ce63c4c17e354c56aa… commit 986ce63c4c17e354c56aab068be87d32bbadb653 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 26 23:42:00 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 26 23:49:01 2018 +0200 [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Support class property sheet providers. --- dll/win32/setupapi/devclass.c | 157 ++++++++++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 60 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 5f88f40ab8..cc7446fdfd 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1228,6 +1228,42 @@ SETUP_GetClassDevPropertySheetsCallback( return PropPageData->DontCancel; } +static DWORD +SETUP_GetValueString( + IN HKEY hKey, + IN LPWSTR lpValueName, + OUT LPWSTR *lpString) +{ + LPWSTR lpBuffer; + DWORD dwLength = 0; + DWORD dwRegType; + DWORD rc; + + *lpString = NULL; + + RegQueryValueExW(hKey, lpValueName, NULL, &dwRegType, NULL, &dwLength); + + if (dwLength == 0 || dwRegType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); + if (lpBuffer == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + rc = RegQueryValueExW(hKey, lpValueName, NULL, NULL, (LPBYTE)lpBuffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpBuffer); + return rc; + } + + lpBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + + *lpString = lpBuffer; + + return ERROR_SUCCESS; +} + /*********************************************************************** * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) */ @@ -1240,7 +1276,8 @@ SetupDiGetClassDevPropertySheetsW( OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) { - struct DeviceInfoSet *list; + struct DeviceInfoSet *devInfoSet = NULL; + struct DeviceInfo *devInfo = NULL; BOOL ret = FALSE; TRACE("%p %p %p 0%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, @@ -1251,7 +1288,7 @@ SetupDiGetClassDevPropertySheetsW( SetLastError(ERROR_INVALID_HANDLE); else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) + else if ((devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!PropertySheetHeader) SetLastError(ERROR_INVALID_PARAMETER); @@ -1259,7 +1296,7 @@ SetupDiGetClassDevPropertySheetsW( SetLastError(ERROR_INVALID_FLAGS); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL)) + else if (!DeviceInfoData && IsEqualIID(&devInfoSet->ClassGuid, &GUID_NULL)) SetLastError(ERROR_INVALID_PARAMETER); else if (PropertySheetType != DIGCDP_FLAG_ADVANCED && PropertySheetType != DIGCDP_FLAG_BASIC @@ -1274,74 +1311,66 @@ SetupDiGetClassDevPropertySheetsW( HMODULE hModule = NULL; PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; struct ClassDevPropertySheetsData PropPageData; - DWORD dwLength, dwRegType; DWORD InitialNumberOfPages; DWORD rc; if (DeviceInfoData) - hKey = SETUPDI_OpenDrvKey(list->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); - else - { - hKey = SetupDiOpenClassRegKeyExW(&list->ClassGuid, KEY_QUERY_VALUE, - DIOCR_INSTALLER, list->MachineName + 2, NULL); - } - if (hKey == INVALID_HANDLE_VALUE) - goto cleanup; + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength); - if (rc == ERROR_FILE_NOT_FOUND) - { - /* No registry key. As it is optional, don't say it's a bad error */ - if (RequiredSize) - *RequiredSize = 0; - ret = TRUE; - goto cleanup; - } - else if (rc != ERROR_SUCCESS && dwRegType != REG_SZ) - { - SetLastError(rc); - goto cleanup; - } - - PropPageProvider = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); - if (!PropPageProvider) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)PropPageProvider, &dwLength); - if (rc != ERROR_SUCCESS) + /* Get the class property page provider */ + if (devInfoSet->hmodClassPropPageProvider == NULL) { - SetLastError(rc); - goto cleanup; - } - PropPageProvider[dwLength / sizeof(WCHAR)] = 0; + hKey = SetupDiOpenClassRegKeyExW(devInfo ? &devInfo->ClassGuid : &devInfoSet->ClassGuid, KEY_QUERY_VALUE, + DIOCR_INSTALLER, NULL/*devInfoSet->MachineName + 2*/, NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + rc = SETUP_GetValueString(hKey, REGSTR_VAL_ENUMPROPPAGES_32, &PropPageProvider); + if (rc == ERROR_SUCCESS) + { + rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); + if (rc != ERROR_SUCCESS) + { + SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); + goto cleanup; + } - rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); - if (rc != ERROR_SUCCESS) - { - SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); - goto cleanup; - } + devInfoSet->hmodClassPropPageProvider = hModule; + devInfoSet->pClassPropPageProvider = pPropPageProvider; - if (DeviceInfoData) - { - struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + HeapFree(GetProcessHeap(), 0, PropPageProvider); + PropPageProvider = NULL; + } - if (devInfo->hmodDevicePropPageProvider == NULL) - { - devInfo->hmodDevicePropPageProvider = hModule; - devInfo->pDevicePropPageProvider = pPropPageProvider; + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; } } - else - { - struct DeviceInfoSet *devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; - if (devInfoSet->hmodClassPropPageProvider == NULL) + /* Get the device property page provider */ + if (devInfo != NULL && devInfo->hmodDevicePropPageProvider == NULL) + { + hKey = SETUPDI_OpenDrvKey(devInfoSet->HKLM, devInfo, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) { - devInfoSet->hmodClassPropPageProvider = hModule; - devInfoSet->pClassPropPageProvider = pPropPageProvider; + rc = SETUP_GetValueString(hKey, REGSTR_VAL_ENUMPROPPAGES_32, &PropPageProvider); + if (rc == ERROR_SUCCESS) + { + rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); + if (rc != ERROR_SUCCESS) + { + SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); + goto cleanup; + } + + devInfo->hmodDevicePropPageProvider = hModule; + devInfo->pDevicePropPageProvider = pPropPageProvider; + + HeapFree(GetProcessHeap(), 0, PropPageProvider); + PropPageProvider = NULL; + } + + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; } } @@ -1357,7 +1386,13 @@ SetupDiGetClassDevPropertySheetsW( PropPageData.NumberOfPages = 0; PropPageData.DontCancel = (RequiredSize != NULL) ? TRUE : FALSE; - pPropPageProvider(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + /* Call the class property page provider */ + if (devInfoSet->pClassPropPageProvider != NULL) + ((PROPERTY_PAGE_PROVIDER)devInfoSet->pClassPropPageProvider)(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + + /* Call the device property page provider */ + if (devInfo != NULL && devInfo->pDevicePropPageProvider != NULL) + ((PROPERTY_PAGE_PROVIDER)devInfo->pDevicePropPageProvider)(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); if (RequiredSize) *RequiredSize = PropPageData.NumberOfPages; @@ -1374,7 +1409,9 @@ SetupDiGetClassDevPropertySheetsW( cleanup: if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, PropPageProvider); + + if (PropPageProvider != NULL) + HeapFree(GetProcessHeap(), 0, PropPageProvider); } TRACE("Returning %d\n", ret);

1 0

01/01: [MSPORTS] Add russian translation
by Stanislav Motylkov 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68c6641781b353038c4af… commit 68c6641781b353038c4af6539a44f28ac19a8e6c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Sep 25 17:36:48 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 25 22:50:02 2018 +0200 [MSPORTS] Add russian translation Addendum to 69e834f. --- dll/win32/msports/lang/ru-RU.rc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dll/win32/msports/lang/ru-RU.rc b/dll/win32/msports/lang/ru-RU.rc index e4d593c166..d6ac1e7f60 100644 --- a/dll/win32/msports/lang/ru-RU.rc +++ b/dll/win32/msports/lang/ru-RU.rc @@ -1,4 +1,8 @@ -/* Russian translation by Kudratov Olimjon (olim98(a)bk.ru) */ +/* + Translators: + Kudratov Olimjon (olim98(a)bk.ru) + Stanislav Motylkov (binarymaster(a)mail.ru) +*/ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -11,7 +15,7 @@ BEGIN COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL RTEXT "Б&иты данных:", -1, 6, 40, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL - RTEXT "&Четность:", -1, 6, 61, 130, 8, WS_GROUP + RTEXT "&Чётность:", -1, 6, 61, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL RTEXT "С&топовые биты:", -1, 6, 82, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL @@ -37,7 +41,7 @@ END STRINGTABLE BEGIN - IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_PARITY "Чёт,Нечёт,Нет,Маркер,Пробел" IDS_STOPBITS "1,1.5,2" - IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_FLOWCONTROL "Xon / Xoff,Аппаратное,Нет" END

1 0

01/01: [DEVCPUX] Make the CPU property sheet page a little nicer and make it translatable
by Eric Kohl 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793e2a38b4265deb673a9… commit 793e2a38b4265deb673a93f92ce91ad4f4e07c18 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 25 21:51:19 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 25 21:51:19 2018 +0200 [DEVCPUX] Make the CPU property sheet page a little nicer and make it translatable --- dll/shellext/devcpux/lang/en-US.rc | 36 ++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 20 ++++++-------------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dll/shellext/devcpux/lang/en-US.rc b/dll/shellext/devcpux/lang/en-US.rc new file mode 100644 index 0000000000..4ea9377e0a --- /dev/null +++ b/dll/shellext/devcpux/lang/en-US.rc @@ -0,0 +1,36 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "Model:", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "Stepping:", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "Core Speed:", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "<test>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "Model:", -1, 7, 49, 50, 8 + LTEXT "<test>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "Stepping:", -1, 7, 75, 50, 8 + LTEXT "<test>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "Core Speed:", -1, 7, 101, 50, 8 + LTEXT "<test>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ \ No newline at end of file diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index ffe16771bf..e98f907589 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -9,17 +9,9 @@ #define REACTOS_STR_ORIGINAL_FILENAME "processorext.dll" #include <reactos/version.rc> -DLG_PROCESSORINFO DIALOGEX 0, 0, 200, 220 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "CPU" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Features:", -1, 5, 23, 50, 51 - LTEXT "Test", IDC_FEATURES, 50, 23, 80, 51 - LTEXT "Model:", -1, 5, 33, 50, 51 - LTEXT "test", IDC_MODEL, 50, 33, 80, 51 - LTEXT "Stepping:", -1, 5, 43, 50, 51 - LTEXT "test", IDC_STEPPING, 50, 43, 80, 51 - LTEXT "Core Speed:", -1, 5, 53, 50, 51 - LTEXT "test", IDC_CORESPEED, 50, 53, 80, 51 -END +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif \ No newline at end of file

1 0

01/01: [MSPORTS] Hackfix the code to determine the serial and parallel port numbers.
by Eric Kohl 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af37e0e565b581fcb3c75… commit af37e0e565b581fcb3c750040384b0a48496726a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 25 17:48:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 25 17:48:27 2018 +0200 [MSPORTS] Hackfix the code to determine the serial and parallel port numbers. Now that SetupDiCreateDevRegKeyW is working as expected, we can no longer (ab)use it to retrieve a ports resources. Use SetupDiGetDeviceInstanceIdW instead and open the registry keys manually. --- dll/win32/msports/classinst.c | 127 ++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 43 deletions(-) diff --git a/dll/win32/msports/classinst.c b/dll/win32/msports/classinst.c index 3a261d87e8..255fd3ed71 100644 --- a/dll/win32/msports/classinst.c +++ b/dll/win32/msports/classinst.c @@ -29,6 +29,8 @@ GetBootResourceList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PCM_RESOURCE_LIST *ppResourceList) { + WCHAR DeviceInstanceIdBuffer[128]; + HKEY hEnumKey = NULL; HKEY hDeviceKey = NULL; HKEY hConfigKey = NULL; LPBYTE lpBuffer = NULL; @@ -36,17 +38,41 @@ GetBootResourceList(HDEVINFO DeviceInfoSet, LONG lError; BOOL ret = FALSE; + FIXME("GetBootResourceList()\n"); + *ppResourceList = NULL; - hDeviceKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, - DeviceInfoData, - DICS_FLAG_GLOBAL, - 0, - DIREG_DEV, - NULL, - NULL); - if (!hDeviceKey) + if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, + DeviceInfoData, + DeviceInstanceIdBuffer, + ARRAYSIZE(DeviceInstanceIdBuffer), + &dwDataSize)) + { + ERR("SetupDiGetDeviceInstanceIdW() failed\n"); return FALSE; + } + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Enum", + 0, + KEY_QUERY_VALUE, + &hEnumKey); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW() failed (Error %lu)\n", lError); + goto done; + } + + lError = RegOpenKeyExW(hEnumKey, + DeviceInstanceIdBuffer, + 0, + KEY_QUERY_VALUE, + &hDeviceKey); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW() failed (Error %lu)\n", lError); + goto done; + } lError = RegOpenKeyExW(hDeviceKey, L"LogConf", @@ -54,7 +80,10 @@ GetBootResourceList(HDEVINFO DeviceInfoSet, KEY_QUERY_VALUE, &hConfigKey); if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW() failed (Error %lu)\n", lError); goto done; + } /* Get the configuration data size */ lError = RegQueryValueExW(hConfigKey, @@ -64,12 +93,18 @@ GetBootResourceList(HDEVINFO DeviceInfoSet, NULL, &dwDataSize); if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW() failed (Error %lu)\n", lError); goto done; + } /* Allocate the buffer */ lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwDataSize); if (lpBuffer == NULL) + { + ERR("Failed to allocate the resource list buffer\n"); goto done; + } /* Retrieve the configuration data */ lError = RegQueryValueExW(hConfigKey, @@ -79,7 +114,10 @@ GetBootResourceList(HDEVINFO DeviceInfoSet, (LPBYTE)lpBuffer, &dwDataSize); if (lError == ERROR_SUCCESS) + { + ERR("RegQueryValueExW() failed (Error %lu)\n", lError); ret = TRUE; + } done: if (ret == FALSE && lpBuffer != NULL) @@ -91,6 +129,9 @@ done: if (hDeviceKey) RegCloseKey(hDeviceKey); + if (hEnumKey) + RegCloseKey(hEnumKey); + if (ret != FALSE) *ppResourceList = (PCM_RESOURCE_LIST)lpBuffer; @@ -442,42 +483,42 @@ InstallParallelPort(IN HDEVINFO DeviceInfoSet, if (dwPortNumber != 0) { - /* Set the 'PortName' value */ - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, - DeviceInfoData, - DICS_FLAG_GLOBAL, - 0, - DIREG_DEV, - NULL, - NULL); - if (hKey != INVALID_HANDLE_VALUE) - { - RegSetValueExW(hKey, - L"PortName", - 0, - REG_SZ, - (LPBYTE)szPortName, - (wcslen(szPortName) + 1) * sizeof(WCHAR)); - - /* - * FIXME / HACK: - * This is to get the w2k3 parport.sys to work until we have our own. - * This setting makes the driver accept resources with an IRQ instead - * of only resources without an IRQ. - * - * We should probably also fix IO manager to actually give devices a - * chance to register without an IRQ. CORE-9645 - */ - dwValue = 0; - RegSetValueExW(hKey, - L"FilterResourceMethod", - 0, - REG_DWORD, - (LPBYTE)&dwValue, - sizeof(dwValue)); + /* Set the 'PortName' value */ + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + NULL, + NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + RegSetValueExW(hKey, + L"PortName", + 0, + REG_SZ, + (LPBYTE)szPortName, + (wcslen(szPortName) + 1) * sizeof(WCHAR)); + + /* + * FIXME / HACK: + * This is to get the w2k3 parport.sys to work until we have our own. + * This setting makes the driver accept resources with an IRQ instead + * of only resources without an IRQ. + * + * We should probably also fix IO manager to actually give devices a + * chance to register without an IRQ. CORE-9645 + */ + dwValue = 0; + RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); - RegCloseKey(hKey); - } + RegCloseKey(hKey); + } } /* Install the device */

1 0

01/01: [MSPORTS] Implement serial port settings
by Eric Kohl 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69e834fa543abca654ccc… commit 69e834fa543abca654ccc65c57bc2861e853f808 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 25 14:27:10 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 25 14:28:29 2018 +0200 [MSPORTS] Implement serial port settings - Fix the control styles and grouping in the dialogs. - Implement reading, modifying and writing of the serial port settings. --- dll/win32/msports/classinst.c | 4 +- dll/win32/msports/lang/bg-BG.rc | 38 +-- dll/win32/msports/lang/de-DE.rc | 38 +-- dll/win32/msports/lang/en-US.rc | 38 +-- dll/win32/msports/lang/es-ES.rc | 38 +-- dll/win32/msports/lang/he-IL.rc | 38 +-- dll/win32/msports/lang/it-IT.rc | 38 +-- dll/win32/msports/lang/ja-JP.rc | 38 +-- dll/win32/msports/lang/pl-PL.rc | 38 +-- dll/win32/msports/lang/ro-RO.rc | 38 +-- dll/win32/msports/lang/ru-RU.rc | 38 +-- dll/win32/msports/lang/sq-AL.rc | 38 +-- dll/win32/msports/lang/tr-TR.rc | 38 +-- dll/win32/msports/lang/uk-UA.rc | 38 +-- dll/win32/msports/lang/zh-CN.rc | 38 +-- dll/win32/msports/lang/zh-TW.rc | 38 +-- dll/win32/msports/precomp.h | 3 + dll/win32/msports/resource.h | 18 +- dll/win32/msports/serial.c | 590 +++++++++++++++++++++++++++++++++++++++- 19 files changed, 876 insertions(+), 309 deletions(-) diff --git a/dll/win32/msports/classinst.c b/dll/win32/msports/classinst.c index a1df8ed92b..3a261d87e8 100644 --- a/dll/win32/msports/classinst.c +++ b/dll/win32/msports/classinst.c @@ -603,7 +603,7 @@ InstallDeviceData(IN HDEVINFO DeviceInfoSet, TRACE("Done\n"); -done:; +done: if (hKey != NULL) RegCloseKey(hKey); @@ -660,7 +660,7 @@ GetPortType(IN HDEVINFO DeviceInfoSet, PortType = SerialPort; } -done:; +done: if (hKey != NULL) RegCloseKey(hKey); diff --git a/dll/win32/msports/lang/bg-BG.rc b/dll/win32/msports/lang/bg-BG.rc index 25f6ca9177..de8fa745bd 100644 --- a/dll/win32/msports/lang/bg-BG.rc +++ b/dll/win32/msports/lang/bg-BG.rc @@ -6,17 +6,17 @@ CAPTION "Настройки на излаза (порта)" FONT 8, "MS Shell Dlg" BEGIN RTEXT "&Разряда в секунда:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Байта &данни:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Четност:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Спиращи разряди:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Управление на &потока:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Раз&ширени...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Връщане на под&разбираните", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Байта &данни:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Четност:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Спиращи разряди:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Управление на &потока:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "Раз&ширени...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Връщане на под&разбираните", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Настройки на излаза (порта)" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Enable legacy Plug and Play detection", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/de-DE.rc b/dll/win32/msports/lang/de-DE.rc index fe28cbf14f..b968518dbe 100644 --- a/dll/win32/msports/lang/de-DE.rc +++ b/dll/win32/msports/lang/de-DE.rc @@ -6,17 +6,17 @@ CAPTION "Porteinstellungen" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&its pro Sekunde:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Datenbits:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parität:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Stoppbits:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Flusssteuerung:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Erweitert...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "Wieder&herstellen", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Datenbits:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Parität:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Stoppbits:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Flusssteuerung:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Erweitert...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Wieder&herstellen", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Porteinstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ressourcenmethode", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Interrupt möglichst nicht verwenden", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Ressourcenmethode", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Interrupt möglichst nicht verwenden", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Interrupt nie verwenden", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Jeden dem Port zugeweisenen Interrupt verwenden", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Legacyerkennung für Plug & Play aktivieren", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Jeden dem Port zugeweisenen Interrupt verwenden", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Legacyerkennung für Plug & Play aktivieren", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT-Portnummer:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Gerade,Ungerade,Keine,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,Keine" END diff --git a/dll/win32/msports/lang/en-US.rc b/dll/win32/msports/lang/en-US.rc index fdc5f0cad9..baf2725041 100644 --- a/dll/win32/msports/lang/en-US.rc +++ b/dll/win32/msports/lang/en-US.rc @@ -6,17 +6,17 @@ CAPTION "Port Settings" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&its per second:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Data bits:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parity:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Stop bits:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Flow control:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Advanced...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Restore Defaults", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Data bits:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Parity:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Stop bits:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Flow control:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Advanced...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Restore Defaults", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Port Settings" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Enable legacy Plug and Play detection", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/es-ES.rc b/dll/win32/msports/lang/es-ES.rc index 78a3f04ce1..dd6587b6bf 100644 --- a/dll/win32/msports/lang/es-ES.rc +++ b/dll/win32/msports/lang/es-ES.rc @@ -6,17 +6,17 @@ CAPTION "Ajustes de puertos" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&its por segundo:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bits de &datos:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Paridad:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bits de &parada:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Control de &flujo:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Avanzado...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Por defecto", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Bits de &datos:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Paridad:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Bits de &parada:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Control de &flujo:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Avanzado...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Por defecto", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ajustes de puertos" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Método de filtrado de recursos", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Intentar no usar interrupciones", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Método de filtrado de recursos", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Intentar no usar interrupciones", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Nunca usar interrupciones", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Utilizar cualquier interrupción asignada al puerto", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Activar detección PnP para hardware antiguo", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Utilizar cualquier interrupción asignada al puerto", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Activar detección PnP para hardware antiguo", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "Número de puerto LPT:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/he-IL.rc b/dll/win32/msports/lang/he-IL.rc index fe1d4f9759..e6fef329c3 100644 --- a/dll/win32/msports/lang/he-IL.rc +++ b/dll/win32/msports/lang/he-IL.rc @@ -6,17 +6,17 @@ CAPTION "הגדרות יציאה" FONT 8, "MS Shell Dlg" BEGIN RTEXT "סיביות לשניה:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "סיביות מידע:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parity:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "סיביות עצירה:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "בקרת זרימה:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "מתקדם...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "שחזר ברירת מחדל", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "סיביות מידע:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Parity:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "סיביות עצירה:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "בקרת זרימה:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "מתקדם...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "שחזר ברירת מחדל", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "הגדרות יציאה" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Enable legacy Plug and Play detection", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/it-IT.rc b/dll/win32/msports/lang/it-IT.rc index 3a3d90f4a5..eeaad20568 100644 --- a/dll/win32/msports/lang/it-IT.rc +++ b/dll/win32/msports/lang/it-IT.rc @@ -6,17 +6,17 @@ CAPTION "Impostazioni della Porta" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&it per secondo:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bit di &Dati:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parit�:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bit di &Stop:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Controllo di &Flusso:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Avanzate...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Ripristina", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Bit di &Dati:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Parit�:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Bit di &Stop:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Controllo di &Flusso:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Avanzate...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ripristina", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Impostazioni della Porta" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Metodo di filtraggio delle Risorse", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Prova a non usare un interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Metodo di filtraggio delle Risorse", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Prova a non usare un interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Non usare mai un interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Usare qualsiasi interrupt assegnato alla porta", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Attiva rilevamento Plug and Play obsoleto", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Usare qualsiasi interrupt assegnato alla porta", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Attiva rilevamento Plug and Play obsoleto", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "Numero di Porta LPT:", -1, 6, 107, 76, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 88, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 88, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/ja-JP.rc b/dll/win32/msports/lang/ja-JP.rc index 02113d27be..25e5dfca79 100644 --- a/dll/win32/msports/lang/ja-JP.rc +++ b/dll/win32/msports/lang/ja-JP.rc @@ -6,17 +6,17 @@ CAPTION "ポート設定" FONT 9, "MS UI Gothic" BEGIN RTEXT "一秒ごとのビット数(&I):", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "データビット(&D):", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "パリティ(&P):", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "ストップビット(&S):", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "フロー制御(&F):", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "上級者向け(&A)...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "既定値を復元(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "データビット(&D):", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "パリティ(&P):", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "ストップビット(&S):", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "フロー制御(&F):", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "上級者向け(&A)...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "既定値を復元(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,18 +24,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ポート設定" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "リソースふるい分け方式", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "一度割り込みを使わないで試す", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "リソースふるい分け方式", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "一度割り込みを使わないで試す", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "割り込みを使わない", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "ポートに割り当てられたすべての割り込みを使う", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "レガシーなプラグアンドプレイ検出を有効にする", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "ポートに割り当てられたすべての割り込みを使う", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "レガシーなプラグアンドプレイ検出を有効にする", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPTポート番号:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/pl-PL.rc b/dll/win32/msports/lang/pl-PL.rc index abc86c87c2..d7af8e7626 100644 --- a/dll/win32/msports/lang/pl-PL.rc +++ b/dll/win32/msports/lang/pl-PL.rc @@ -14,17 +14,17 @@ CAPTION "Ustawienia portu" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&itów na sekundę:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Bity danych:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parzystość:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bi&ty stopu:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Kontrola przepływu:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Zaawansowane...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "P&rzywróć domyślne", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Bity danych:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Parzystość:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Bi&ty stopu:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Kontrola przepływu:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Zaawansowane...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "P&rzywróć domyślne", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -32,18 +32,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia portu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Metoda sposobu filtrowania", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Spróbuj nie używać przerwania", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Metoda sposobu filtrowania", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Spróbuj nie używać przerwania", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Nigdy nie używaj przerwania", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Użyj dowolnego przerwania przypisanego do portu", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Włącz wykrywanie starszego sprzętu Plug and Play", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Użyj dowolnego przerwania przypisanego do portu", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Włącz wykrywanie starszego sprzętu Plug and Play", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "Numer portu LPT:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/ro-RO.rc b/dll/win32/msports/lang/ro-RO.rc index 09aa42b378..caa284ef72 100644 --- a/dll/win32/msports/lang/ro-RO.rc +++ b/dll/win32/msports/lang/ro-RO.rc @@ -12,17 +12,17 @@ CAPTION "Configurația portului" FONT 8, "MS Shell Dlg" BEGIN RTEXT "&Biți pe secundă:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Biți de &date:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Paritate:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Biți de st&op:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Controlul fluxului:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "A&vansate…", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "Valori i&mplicite", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Biți de &date:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Paritate:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Biți de st&op:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Controlul fluxului:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "A&vansate…", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Valori i&mplicite", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -30,18 +30,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configurația portului" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Metoda de filtrare a resurselor", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Încearcă evitarea uzului de întreruperi", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Metoda de filtrare a resurselor", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Încearcă evitarea uzului de întreruperi", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Nu folosi întreruperi", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Folosește orice întrerupere asociată portului", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Activează detecția PnP (moștenire)", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Folosește orice întrerupere asociată portului", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Activează detecția PnP (moștenire)", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "Număr port LPT:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/ru-RU.rc b/dll/win32/msports/lang/ru-RU.rc index 6fc2d250a1..e4d593c166 100644 --- a/dll/win32/msports/lang/ru-RU.rc +++ b/dll/win32/msports/lang/ru-RU.rc @@ -8,17 +8,17 @@ CAPTION "Параметры порта" FONT 8, "MS Shell Dlg" BEGIN RTEXT "&Бит в секунду:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Б&иты данных:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Четность:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "С&топовые биты:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Управление потоком:", -1, 63, 102, 73, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "До&полнительно...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&По умолчанию", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "Б&иты данных:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Четность:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "С&топовые биты:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Управление потоком:", -1, 63, 102, 73, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "До&полнительно...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&По умолчанию", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -26,18 +26,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Параметры порта" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Метод фильтрации ресурсов", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "По возможности не использовать прерывание", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Метод фильтрации ресурсов", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "По возможности не использовать прерывание", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Не использовать прерывание в любом случае", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Использовать любое прерывание, назначенное порту", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Разрешить обнаружение старого Plug and Play порта", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Использовать любое прерывание, назначенное порту", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Разрешить обнаружение старого Plug and Play порта", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "Номер LPT порта:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/sq-AL.rc b/dll/win32/msports/lang/sq-AL.rc index e7126c41c8..73cc86ada1 100644 --- a/dll/win32/msports/lang/sq-AL.rc +++ b/dll/win32/msports/lang/sq-AL.rc @@ -10,17 +10,17 @@ CAPTION "Cilësimet Portit" FONT 8, "MS Shell Dlg" BEGIN RTEXT "B&its per sekonda:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Data bits:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Barayi:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ndalo bits:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Kontrolli i rrjedhjes:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Përparuar...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Data bits:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Barayi:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Ndalo bits:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Kontrolli i rrjedhjes:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Përparuar...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -28,18 +28,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Cilësimet Portit" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Enable legacy Plug and Play detection", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/tr-TR.rc b/dll/win32/msports/lang/tr-TR.rc index de111a3858..39bad63929 100644 --- a/dll/win32/msports/lang/tr-TR.rc +++ b/dll/win32/msports/lang/tr-TR.rc @@ -8,17 +8,17 @@ CAPTION "Giriş Ayarları" FONT 8, "MS Shell Dlg" BEGIN RTEXT "&Sâniyedeki Bit Sayısı:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Veri Bitleri:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Eşlik:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Dur Bitleri:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Akış Denetimi:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Gelişmiş...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&Ön Tanımlıları Geri Getir", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Veri Bitleri:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Eşlik:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Dur Bitleri:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Akış Denetimi:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Gelişmiş...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ön Tanımlıları Geri Getir", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -26,18 +26,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Giriş Ayarları" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Süzgeç Kaynak Yöntemi", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Bir Kesme Kullanmayı Deneme", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Süzgeç Kaynak Yöntemi", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Bir Kesme Kullanmayı Deneme", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Tüm Zamanlarda Bir Kesme Kullanma", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Giriş İçin Atanmış Bir Kesme Kullan", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Eskiden Kalan Tak ve Çalıştır Algılamasını Etkinleştir", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Giriş İçin Atanmış Bir Kesme Kullan", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Eskiden Kalan Tak ve Çalıştır Algılamasını Etkinleştir", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Giriş Numarası:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/uk-UA.rc b/dll/win32/msports/lang/uk-UA.rc index d2608ccb1d..0f161170f5 100644 --- a/dll/win32/msports/lang/uk-UA.rc +++ b/dll/win32/msports/lang/uk-UA.rc @@ -14,17 +14,17 @@ CAPTION "Параметри порту" FONT 8, "MS Shell Dlg" BEGIN RTEXT "Бі&тів на секунду:", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Біти даних:", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Паритет:", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Стопові біти:", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Керування потоком:", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Розширені...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "&За замовчуванням", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Біти даних:", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Паритет:", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Стопові біти:", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "&Керування потоком:", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Розширені...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&За замовчуванням", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -32,18 +32,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Параметри порту" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "Enable legacy Plug and Play detection", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/zh-CN.rc b/dll/win32/msports/lang/zh-CN.rc index beba275387..9f17ba41c1 100644 --- a/dll/win32/msports/lang/zh-CN.rc +++ b/dll/win32/msports/lang/zh-CN.rc @@ -8,17 +8,17 @@ CAPTION "端口设置" FONT 9, "宋体" BEGIN RTEXT "每秒位数:(&I)", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "数据位:(&D)", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "奇偶校验:(&P)", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "停止位:(&S)", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "流量控制:(&F)", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "高级...(&A)", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "还原默认值(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "数据位:(&D)", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "奇偶校验:(&P)", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "停止位:(&S)", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "流量控制:(&F)", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "高级...(&A)", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "还原默认值(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -26,18 +26,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "端口设置" FONT 9, "宋体" BEGIN - GROUPBOX "筛选资源方法", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "尽量不要使用中断", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "筛选资源方法", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "尽量不要使用中断", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "不要使用中断", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "使用指派给此端口的任何中断", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "启用旧式即插即用检测", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "使用指派给此端口的任何中断", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "启用旧式即插即用检测", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT 端口号:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/lang/zh-TW.rc b/dll/win32/msports/lang/zh-TW.rc index 9880b5acbc..cfaf247a3e 100644 --- a/dll/win32/msports/lang/zh-TW.rc +++ b/dll/win32/msports/lang/zh-TW.rc @@ -8,17 +8,17 @@ CAPTION "埠設定" FONT 9, "新細明體" BEGIN RTEXT "每秒位數:(&I)", -1, 6, 19, 130, 8, WS_GROUP - COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "資料位:(&D)", -1, 6, 40, 130, 8 - COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "奇偶校驗:(&P)", -1, 6, 61, 130, 8 - COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "停止位:(&S)", -1, 6, 82, 130, 8 - COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "流量控制:(&F)", -1, 6, 102, 130, 8 - COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "高階...(&A)", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP - PUSHBUTTON "還原預設值(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "資料位:(&D)", -1, 6, 40, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "奇偶校驗:(&P)", -1, 6, 61, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "停止位:(&S)", -1, 6, 82, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + RTEXT "流量控制:(&F)", -1, 6, 102, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "高階...(&A)", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "還原預設值(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -26,19 +26,19 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "埠設定" FONT 9, "新細明體" BEGIN - GROUPBOX "篩選資源方法", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "儘量不要使用中斷", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + GROUPBOX "篩選資源方法", -1, 6, 6, 237, 75 + AUTORADIOBUTTON "儘量不要使用中斷", IDC_TRY_INTERRUPT, 11, 22, 227, 10, WS_GROUP AUTORADIOBUTTON "不要使用中斷", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 - AUTORADIOBUTTON "使用指派給此埠的任何中斷", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP - AUTOCHECKBOX "啟用舊式即插即用檢測", -1, 6, 90, 237, 10 + AUTORADIOBUTTON "使用指派給此埠的任何中斷", IDC_ANY_INTERRUPT, 11, 66, 227, 10 + AUTOCHECKBOX "啟用舊式即插即用檢測", IDC_PARALLEL_LEGACY, 6, 90, 237, 10, WS_TABSTOP LTEXT "LPT 埠號:", -1, 6, 107, 140, 10, WS_GROUP - COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | WS_VSCROLL END STRINGTABLE BEGIN - IDS_LPT1 "LPT1" - IDS_LPT2 "LPT2" - IDS_LPT3 "LPT3" + IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_STOPBITS "1,1.5,2" + IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" END diff --git a/dll/win32/msports/precomp.h b/dll/win32/msports/precomp.h index 0b25e4d765..6b16ba7bae 100644 --- a/dll/win32/msports/precomp.h +++ b/dll/win32/msports/precomp.h @@ -2,6 +2,8 @@ #define _MSPORTS_PCH_ #include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -11,6 +13,7 @@ #include <winbase.h> #include <winreg.h> #include <winuser.h> +#include <windowsx.h> #include <msports.h> #include <setupapi.h> diff --git a/dll/win32/msports/resource.h b/dll/win32/msports/resource.h index 772a041e31..c9d716859d 100644 --- a/dll/win32/msports/resource.h +++ b/dll/win32/msports/resource.h @@ -8,13 +8,15 @@ #define IDC_SERIAL_FLOWCONTROL 205 #define IDC_SERIAL_ADVANCED 206 #define IDC_SERIAL_RESTORE 207 -#define IDC_PARALLEL_NAME 208 -#define IDC_TRY_INTERRUPT 209 -#define IDC_NEVER_INTERRUPT 210 -#define IDC_ANY_INTERRUPT 211 -#define IDS_LPT1 212 -#define IDS_LPT2 213 -#define IDS_LPT3 214 +#define IDD_PARALLELSETTINGS 220 +#define IDC_TRY_INTERRUPT 221 +#define IDC_NEVER_INTERRUPT 222 +#define IDC_ANY_INTERRUPT 223 +#define IDC_PARALLEL_LEGACY 224 +#define IDC_PARALLEL_NAME 225 -#define IDD_PARALLELSETTINGS 220 + +#define IDS_PARITY 11 +#define IDS_STOPBITS 12 +#define IDS_FLOWCONTROL 13 diff --git a/dll/win32/msports/serial.c b/dll/win32/msports/serial.c index b4d3d6c6e8..b248072a30 100644 --- a/dll/win32/msports/serial.c +++ b/dll/win32/msports/serial.c @@ -8,17 +8,553 @@ #include "precomp.h" + +typedef struct _PORT_DATA +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + + WCHAR szPortName[16]; + INT nBaudRateIndex; + INT nParityIndex; + INT nDataBitsIndex; + INT nStopBitsIndex; + INT nFlowControlIndex; + + BOOL bChanged; +} PORT_DATA, *PPORT_DATA; + +#define DEFAULT_BAUD_RATE_INDEX 11 +#define DEFAULT_DATA_BITS_INDEX 4 +#define DEFAULT_PARITY_INDEX 2 +#define DEFAULT_STOP_BITS_INDEX 0 +#define DEFAULT_FLOW_CONTROL_INDEX 2 + +DWORD BaudRates[] = {75, 110, 134, 150, 300, 600, 1200, 1800, 2400, 4800, + 7200, 9600, 14400, 19200, 38400, 57600, 115200, 128000}; +PWSTR Paritys[] = {L"e", L"o", L"n", L"m", L"s"}; +PWSTR DataBits[] = {L"4", L"5", L"6", L"7", L"8"}; +PWSTR StopBits[] = {L"1", L"1.5", L"2"}; +PWSTR FlowControls[] = {L"x", L"p"}; + + +static +VOID +FillComboBox( + HWND hwnd, + PWSTR szBuffer) +{ + PWSTR pStart, pEnd; + + pStart = szBuffer; + for (;;) + { + pEnd = wcschr(pStart, L','); + if (pEnd != NULL) + *pEnd = UNICODE_NULL; + + ComboBox_AddString(hwnd, pStart); + + if (pEnd == NULL) + break; + + pStart = pEnd + 1; + } +} + + +static +VOID +ReadPortSettings( + PPORT_DATA pPortData) +{ + WCHAR szPortData[32]; + WCHAR szParity[4]; + WCHAR szDataBits[4]; + WCHAR szStopBits[4]; + WCHAR szFlowControl[4]; + DWORD dwType, dwSize; + DWORD dwBaudRate = 0; + HKEY hKey; + INT n, i; + LONG lError; + + TRACE("ReadPortSettings(%p)\n", pPortData); + + pPortData->nBaudRateIndex = DEFAULT_BAUD_RATE_INDEX; /* 9600 */ + pPortData->nParityIndex = DEFAULT_PARITY_INDEX; /* None */ + pPortData->nDataBitsIndex = DEFAULT_DATA_BITS_INDEX; /* 8 Data Bits */ + pPortData->nStopBitsIndex = DEFAULT_STOP_BITS_INDEX; /* 1 Stop Bit */ + pPortData->nFlowControlIndex = DEFAULT_FLOW_CONTROL_INDEX; /* None */ + pPortData->bChanged = FALSE; + + hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_READ); + if (hKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return; + } + + dwSize = sizeof(pPortData->szPortName); + lError = RegQueryValueExW(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)pPortData->szPortName, + &dwSize); + RegCloseKey(hKey); + + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + return; + } + + wcscat(pPortData->szPortName, L":"); + TRACE("PortName: '%S'\n", pPortData->szPortName); + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Ports", + 0, + KEY_READ, + &hKey); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed (Error %lu)\n", lError); + return; + } + + dwSize = sizeof(szPortData); + lError = RegQueryValueExW(hKey, + pPortData->szPortName, + NULL, + &dwType, + (LPBYTE)szPortData, + &dwSize); + RegCloseKey(hKey); + + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + return; + } + + if ((dwType != REG_SZ) || (dwSize > sizeof(szPortData))) + { + ERR("Wrong type or size\n"); + return; + } + + TRACE("szPortData: '%S'\n", szPortData); + + /* Replace commas by spaces */ + for (i = 0; i < wcslen(szPortData); i++) + { + if (szPortData[i] == L',') + szPortData[i] = L' '; + } + + TRACE("szPortData: '%S'\n", szPortData); + + /* Parse the port settings */ + n = swscanf(szPortData, + L"%lu %3s %3s %3s %3s", + &dwBaudRate, + &szParity, + &szDataBits, + &szStopBits, + &szFlowControl); + + TRACE("dwBaudRate: %lu\n", dwBaudRate); + TRACE("szParity: '%S'\n", szParity); + TRACE("szDataBits: '%S'\n", szDataBits); + TRACE("szStopBits: '%S'\n", szStopBits); + TRACE("szFlowControl: '%S'\n", szFlowControl); + + if (n > 0) + { + for (i = 0; i < ARRAYSIZE(BaudRates); i++) + { + if (dwBaudRate == BaudRates[i]) + pPortData->nBaudRateIndex = i; + } + } + + if (n > 1) + { + for (i = 0; i < ARRAYSIZE(Paritys); i++) + { + if (_wcsicmp(szParity, Paritys[i]) == 0) + pPortData->nParityIndex = i; + } + } + + if (n > 2) + { + for (i = 0; i < ARRAYSIZE(DataBits); i++) + { + if (_wcsicmp(szDataBits, DataBits[i]) == 0) + pPortData->nDataBitsIndex = i; + } + } + + if (n > 3) + { + for (i = 0; i < ARRAYSIZE(StopBits); i++) + { + if (_wcsicmp(szStopBits, StopBits[i]) == 0) + pPortData->nStopBitsIndex = i; + } + } + + if (n > 4) + { + for (i = 0; i < ARRAYSIZE(FlowControls); i++) + { + if (_wcsicmp(szFlowControl, FlowControls[i]) == 0) + pPortData->nFlowControlIndex = i; + } + } +} + + +static +VOID +WritePortSettings( + HWND hwnd, + PPORT_DATA pPortData) +{ + WCHAR szPortData[32]; + HWND hwndControl; + INT nBaudRateIndex; + INT nDataBitsIndex; + INT nParityIndex; + INT nStopBitsIndex; + INT nFlowControlIndex; + HKEY hKey; + LONG lError; + + TRACE("WritePortSettings(%p)\n", pPortData); + + if (pPortData->bChanged == FALSE) + { + TRACE("Nothing changed. Done!\n"); + return; + } + + nBaudRateIndex = pPortData->nBaudRateIndex; + nDataBitsIndex = pPortData->nDataBitsIndex; + nParityIndex = pPortData->nParityIndex; + nStopBitsIndex = pPortData->nStopBitsIndex; + nFlowControlIndex = pPortData->nFlowControlIndex; + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_BITSPERSECOND); + if (hwndControl) + { + nBaudRateIndex = ComboBox_GetCurSel(hwndControl); + } + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_DATABITS); + if (hwndControl) + { + nDataBitsIndex = ComboBox_GetCurSel(hwndControl); + } + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_PARITY); + if (hwndControl) + { + nParityIndex = ComboBox_GetCurSel(hwndControl); + } + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_STOPBITS); + if (hwndControl) + { + nStopBitsIndex = ComboBox_GetCurSel(hwndControl); + } + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_FLOWCONTROL); + if (hwndControl) + { + nFlowControlIndex = ComboBox_GetCurSel(hwndControl); + } + + swprintf(szPortData, + L"%lu,%s,%s,%s", + BaudRates[nBaudRateIndex], + Paritys[nParityIndex], + DataBits[nDataBitsIndex], + StopBits[nStopBitsIndex]); + if (nFlowControlIndex < 2) + { + wcscat(szPortData, L","); + wcscat(szPortData, FlowControls[nFlowControlIndex]); + } + + TRACE("szPortData: '%S'\n", szPortData); + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Ports", + 0, + KEY_WRITE, + &hKey); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed (Error %lu)\n", lError); + return; + } + + lError = RegSetValueExW(hKey, + pPortData->szPortName, + 0, + REG_SZ, + (LPBYTE)szPortData, + (wcslen(szPortData) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + + if (lError != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed (Error %lu)\n", lError); + return; + } + + TRACE("Done!\n"); +} + + static BOOL -OnInitDialog(HWND hwnd, - WPARAM wParam, - LPARAM lParam) +OnInitDialog( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) { - FIXME("Port_OnInit()\n"); + PPORT_DATA pPortData; + WCHAR szBuffer[256]; + UINT i; + HWND hwndControl; + + TRACE("OnInitDialog()\n"); + + pPortData = (PPORT_DATA)((LPPROPSHEETPAGEW)lParam)->lParam; + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return FALSE; + } + + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)pPortData); + + /* Read and parse the port settings */ + ReadPortSettings(pPortData); + + /* Fill the 'Bits per second' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_BITSPERSECOND); + if (hwndControl) + { + for (i = 0; i < ARRAYSIZE(BaudRates); i++) + { + _ultow(BaudRates[i], szBuffer, 10); + ComboBox_AddString(hwndControl, szBuffer); + } + + ComboBox_SetCurSel(hwndControl, pPortData->nBaudRateIndex); + } + + /* Fill the 'Data bits' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_DATABITS); + if (hwndControl) + { + for (i = 0; i < ARRAYSIZE(DataBits); i++) + { + ComboBox_AddString(hwndControl, DataBits[i]); + } + + ComboBox_SetCurSel(hwndControl, pPortData->nDataBitsIndex); + } + + /* Fill the 'Parity' combobox */ + LoadStringW(hInstance, IDS_PARITY, szBuffer, ARRAYSIZE(szBuffer)); + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_PARITY); + if (hwndControl) + { + FillComboBox(hwndControl, szBuffer); + ComboBox_SetCurSel(hwndControl, pPortData->nParityIndex); + } + + /* Fill the 'Stop bits' combobox */ + LoadStringW(hInstance, IDS_STOPBITS, szBuffer, ARRAYSIZE(szBuffer)); + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_STOPBITS); + if (hwndControl) + { + FillComboBox(hwndControl, szBuffer); + ComboBox_SetCurSel(hwndControl, pPortData->nStopBitsIndex); + } + + /* Fill the 'Flow control' combobox */ + LoadStringW(hInstance, IDS_FLOWCONTROL, szBuffer, ARRAYSIZE(szBuffer)); + + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_FLOWCONTROL); + if (hwndControl) + { + FillComboBox(hwndControl, szBuffer); + ComboBox_SetCurSel(hwndControl, pPortData->nFlowControlIndex); + } + + /* Disable the 'Advanced' button */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_ADVANCED); + if (hwndControl) + EnableWindow(hwndControl, FALSE); + return TRUE; } +static +VOID +RestoreDefaultValues( + HWND hwnd, + PPORT_DATA pPortData) +{ + HWND hwndControl; + + /* Reset the 'Bits per second' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_BITSPERSECOND); + if (hwndControl) + { + ComboBox_SetCurSel(hwndControl, DEFAULT_BAUD_RATE_INDEX); + } + + /* Reset the 'Data bits' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_DATABITS); + if (hwndControl) + { + ComboBox_SetCurSel(hwndControl, DEFAULT_DATA_BITS_INDEX); + } + + /* Reset the 'Parity' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_PARITY); + if (hwndControl) + { + ComboBox_SetCurSel(hwndControl, DEFAULT_PARITY_INDEX); + } + + /* Reset the 'Stop bits' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_STOPBITS); + if (hwndControl) + { + ComboBox_SetCurSel(hwndControl, DEFAULT_STOP_BITS_INDEX); + } + + /* Reset the 'Flow control' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_SERIAL_FLOWCONTROL); + if (hwndControl) + { + ComboBox_SetCurSel(hwndControl, DEFAULT_FLOW_CONTROL_INDEX); + } + + pPortData->bChanged = TRUE; +} + + +static +VOID +OnCommand( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPORT_DATA pPortData; + + TRACE("OnCommand()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + switch (LOWORD(wParam)) + { + case IDC_SERIAL_BITSPERSECOND: + case IDC_SERIAL_DATABITS: + case IDC_SERIAL_PARITY: + case IDC_SERIAL_STOPBITS: + case IDC_SERIAL_FLOWCONTROL: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + pPortData->bChanged = TRUE; + } + break; + +// case IDC_SERIAL_ADVANCED: + + case IDC_SERIAL_RESTORE: + RestoreDefaultValues(hwnd, pPortData); + break; + + default: + break; + } +} + + +static +VOID +OnNotify( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPORT_DATA pPortData; + + TRACE("OnCommand()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + FIXME("PSN_APPLY!\n"); + WritePortSettings(hwnd, pPortData); + } +} + + +static +VOID +OnDestroy( + HWND hwnd) +{ + PPORT_DATA pPortData; + + TRACE("OnDestroy()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + HeapFree(GetProcessHeap(), 0, pPortData); + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)NULL); +} + + static INT_PTR CALLBACK @@ -27,12 +563,24 @@ SerialSettingsDlgProc(HWND hwnd, WPARAM wParam, LPARAM lParam) { - FIXME("SerialSettingsDlgProc()\n"); + TRACE("SerialSettingsDlgProc()\n"); switch (uMsg) { case WM_INITDIALOG: return OnInitDialog(hwnd, wParam, lParam); + + case WM_COMMAND: + OnCommand(hwnd, wParam, lParam); + break; + + case WM_NOTIFY: + OnNotify(hwnd, wParam, lParam); + break; + + case WM_DESTROY: + OnDestroy(hwnd); + break; } return FALSE; @@ -41,44 +589,58 @@ SerialSettingsDlgProc(HWND hwnd, BOOL WINAPI -SerialPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, - LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, - LPARAM lParam) +SerialPortPropPageProvider( + PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + LPARAM lParam) { PROPSHEETPAGEW PropSheetPage; HPROPSHEETPAGE hPropSheetPage; + PPORT_DATA pPortData; - FIXME("SerialPortPropPageProvider(%p %p %lx)\n", + TRACE("SerialPortPropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + pPortData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PORT_DATA)); + if (pPortData == NULL) + { + ERR("Port data allocation failed!\n"); + return FALSE; + } + + pPortData->DeviceInfoSet = lpPropSheetPageRequest->DeviceInfoSet; + pPortData->DeviceInfoData = lpPropSheetPageRequest->DeviceInfoData; + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) { - FIXME("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + TRACE("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); PropSheetPage.dwFlags = 0; PropSheetPage.hInstance = hInstance; PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_SERIALSETTINGS); PropSheetPage.pfnDlgProc = SerialSettingsDlgProc; - PropSheetPage.lParam = 0; + PropSheetPage.lParam = (LPARAM)pPortData; PropSheetPage.pfnCallback = NULL; hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); if (hPropSheetPage == NULL) { - FIXME("CreatePropertySheetPageW() failed!\n"); + ERR("CreatePropertySheetPageW() failed!\n"); return FALSE; } if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) { - FIXME("lpfnAddPropSheetPageProc() failed!\n"); + ERR("lpfnAddPropSheetPageProc() failed!\n"); DestroyPropertySheetPage(hPropSheetPage); return FALSE; } } - FIXME("Done!\n"); + TRACE("Done!\n"); return TRUE; }

1 0

01/01: [INF] Add russian translation to machine.inf
by Stanislav Motylkov 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1c2ec0de6290916dd9fa… commit f1c2ec0de6290916dd9fa2bb22a8ab11a72864b0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Sep 25 11:41:34 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 25 11:20:25 2018 +0200 [INF] Add russian translation to machine.inf Addendum to 68eb0fd. --- media/inf/machine.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 270528714e..ac2eb8d75f 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -554,7 +554,7 @@ GenericMfg = "(Стандартные системные устройства)" *PNP0C0E.DeviceDesc = "Кнопка спящего режима ACPI" *PNP0C0F.DeviceDesc = "Контроллер прервываний PCI" ACPI\FixedButton.DeviceDesc = "Кнопка фиксированной возможности ACPI" -PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" +PCI\CC_0500.DeviceDesc = "Стандартный контроллер PCI RAM" PCI\CC_0600.DeviceDesc = "Стандартный процессор на мосте PCI" PCI\CC_0601.DeviceDesc = "Стандартный PCI на ISA мосте" PCI\CC_0604.DeviceDesc = "Стандартный PCI на PCI мосте"

1 0

01/01: [INF] machine.inf: Add settings for PCI RAM controllers
by Eric Kohl 24 Sep '18

24 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68eb0fd2027baad145d1d… commit 68eb0fd2027baad145d1d2bd9d190768a9f94b33 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 24 16:15:46 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 24 16:15:46 2018 +0200 [INF] machine.inf: Add settings for PCI RAM controllers --- media/inf/machine.inf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 16b1624061..270528714e 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -49,6 +49,7 @@ HKR, , Icon, 0, "-27" %SWENUM.DeviceDesc% = SWENUM_Inst, ROOT\SWENUM %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton +%PCI\CC_0500.DeviceDesc% = NO_DRV,PCI\CC_0500 %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 %PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 @@ -169,6 +170,7 @@ GenericMfg = "(Generic system devices)" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge" PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" @@ -211,6 +213,7 @@ GenericMfg = "(Obecná systémová zařízení)" *PNP0C0E.DeviceDesc = "ACPI tlačítko spánku" *PNP0C0F.DeviceDesc = "PCI linkové zařízení přerušení" ACPI\FixedButton.DeviceDesc = "ACPI tlačítko s pevnou vlastností" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standardní most CPU na PCI" PCI\CC_0601.DeviceDesc = "Standardní most PCI na ISA" PCI\CC_0604.DeviceDesc = "Standardní most PCI na PCI" @@ -244,6 +247,7 @@ GenericMfg = "(Generische Systemgeräte)" *PNP0C02.DeviceDesc = "Motherboard Ressourcen" *PNP0C04.DeviceDesc = "mathematischer Koprozessor" *PNP0C0B.DeviceDesc = "ACPI Ventilator" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM-Controller" PCI\CC_0600.DeviceDesc = "Standard CPU zu PCI Brücke" PCI\CC_0601.DeviceDesc = "Standard PCI zu ISA Brücke" PCI\CC_0604.DeviceDesc = "Standard PCI zu PCI Brücke" @@ -275,6 +279,7 @@ GenericMfg = "(Πρότυπες συσκευές συστήματος)" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Πρότυπη γέφυρα από CPU σε PCI" PCI\CC_0601.DeviceDesc = "Πρότυπη γέφυρα από PCI σε ISA" PCI\CC_0604.DeviceDesc = "Πρότυπη γέφυρα από PCI σε PCI" @@ -314,6 +319,7 @@ GenericMfg = "(Dispositivos del sistema estándar)" *PNP0C0E.DeviceDesc = "Botón de suspensión ACPI" *PNP0C0F.DeviceDesc = "Dispositivo de interrupción de enlaces PCI" ACPI\FixedButton.DeviceDesc = "Botón de funcionalidad fija ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Puente CPU-PCI estándar" PCI\CC_0601.DeviceDesc = "Puente PCI-ISA estándar" PCI\CC_0604.DeviceDesc = "Puente PCI-PCI estándar" @@ -352,6 +358,7 @@ GenericMfg = "(Périphériques systèmes génériques)" *PNP0C0E.DeviceDesc = "Périphérique de bouton de veille ACPI" *PNP0C0F.DeviceDesc = "Périphérique de lien d'interruption PCI" ACPI\FixedButton.DeviceDesc = "Bouton de fonction définie ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Pont standard CPU vers PCI" PCI\CC_0601.DeviceDesc = "Pont standard PCI vers ISA" PCI\CC_0604.DeviceDesc = "Pont standard PCI vers PCI" @@ -386,6 +393,7 @@ GenericMfg = "(標準システムデバイス)" *PNP0C0E.DeviceDesc = "ACPI スリープボタンデバイス" *PNP0C0F.DeviceDesc = "PCI 割り込みリンクデバイス" ACPI\FixedButton.DeviceDesc = "ACPI 固定機能ボタン" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "スタンダード CPU to PCI ブリッジ" PCI\CC_0601.DeviceDesc = "スタンダード PCI to ISA ブリッジ" PCI\CC_0604.DeviceDesc = "スタンダード PCI to PCI ブリッジ" @@ -426,6 +434,7 @@ GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C0E.DeviceDesc = "Przycisk zasypiania ACPI" *PNP0C0F.DeviceDesc = "Urządzenie PCI interrupt link" ACPI\FixedButton.DeviceDesc = "Przycisk ACPI Fixed Feature" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standardowy mostek CPU do PCI" PCI\CC_0601.DeviceDesc = "Standardowy mostek PCI do ISA" PCI\CC_0604.DeviceDesc = "Standardowy mostek PCI do PCI" @@ -464,6 +473,7 @@ GenericMfg = "(Dispositivos de sistema padrão)" *PNP0C0E.DeviceDesc = "Botão dormir ACPI" *PNP0C0F.DeviceDesc = "Dispositivo de interrupção de ligações PCI" ACPI\FixedButton.DeviceDesc = "Botão de recurso fixo ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Ponte padrão CPU - PCI" PCI\CC_0601.DeviceDesc = "Ponte PCI - ISA" PCI\CC_0604.DeviceDesc = "Ponte PCI - PCI" @@ -505,6 +515,7 @@ GenericMfg = "(dispozitiv generic de sistem)" *PNP0C0E.DeviceDesc = "Dispozitiv buton de repaus ACPI" *PNP0C0F.DeviceDesc = "Dispozitiv de întrerupere legătură PCI" ACPI\FixedButton.DeviceDesc = "Buton de funcție fixă ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Punte standard CPU spre PCI" PCI\CC_0601.DeviceDesc = "Punte standard PCI spre ISA" PCI\CC_0604.DeviceDesc = "Punte standard PCI spre PCI" @@ -543,6 +554,7 @@ GenericMfg = "(Стандартные системные устройства)" *PNP0C0E.DeviceDesc = "Кнопка спящего режима ACPI" *PNP0C0F.DeviceDesc = "Контроллер прервываний PCI" ACPI\FixedButton.DeviceDesc = "Кнопка фиксированной возможности ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Стандартный процессор на мосте PCI" PCI\CC_0601.DeviceDesc = "Стандартный PCI на ISA мосте" PCI\CC_0604.DeviceDesc = "Стандартный PCI на PCI мосте" @@ -579,6 +591,7 @@ GenericMfg = "(Generické systémové zariadenia)" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Štandardný most CPU na PCI" PCI\CC_0601.DeviceDesc = "Štandardný most PCI na ISA" PCI\CC_0604.DeviceDesc = "Štandardný most PCI na PCI" @@ -619,6 +632,7 @@ GenericMfg = "(Umûmî Dizge Aygıtları)" *PNP0C0E.DeviceDesc = "ACPI Uyku Düğmesi Aygıtı" *PNP0C0F.DeviceDesc = "PCI Kesme Bağlantı Aygıtı" ACPI\FixedButton.DeviceDesc = "ACPI Sâbit Husûsîyet Düğmesi" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Ölçünlü CPU'dan PCI'ya Köprü" PCI\CC_0601.DeviceDesc = "Ölçünlü PCI'dan ISA'ya Köprü" PCI\CC_0604.DeviceDesc = "Ölçünlü PCI'dan PCI'ya Köprü" @@ -661,6 +675,7 @@ GenericMfg = "(Стандартні системні пристрої)" *PNP0C0E.DeviceDesc = "Кнопка сплячого режиму ACPI" *PNP0C0F.DeviceDesc = "Контроллер переривань PCI" ACPI\FixedButton.DeviceDesc = "Кнопка фіксованої можливості ACPI" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Стандартний міст CPU на PCI" PCI\CC_0601.DeviceDesc = "Стандартний міст PCI на ISA" PCI\CC_0604.DeviceDesc = "Стандартний міст PCI на PCI" @@ -697,6 +712,7 @@ GenericMfg = "(Standartiniai sisteminiai įrenginiai)" *PNP0C0E.DeviceDesc = "ACPI miego mygtukas" *PNP0C0F.DeviceDesc = "PCI pertraukimo sąsajos įrenginys" ACPI\FixedButton.DeviceDesc = "ACPI fiksuotos galimybės mygtukas" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standartinis CPU į PCI tiltas" PCI\CC_0601.DeviceDesc = "Standartinis PCI į ISA tiltas" PCI\CC_0604.DeviceDesc = "Standartinis PCI į PCI tiltas" @@ -736,6 +752,7 @@ GenericMfg = "(通用系统设备)" *PNP0C0E.DeviceDesc = "ACPI 休眠按钮设备" *PNP0C0F.DeviceDesc = "PCI 中断链接设备" ACPI\FixedButton.DeviceDesc = "ACPI 固定功能按钮" +PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "标准 CPU - PCI 桥" PCI\CC_0601.DeviceDesc = "标准 PCI - ISA 桥" PCI\CC_0604.DeviceDesc = "标准 PCI - PCI 桥"

1 0

01/01: [NETSHELL] Read, write and display the 'Notify me when this connection...' option for network connections.
by Eric Kohl 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=185a8fd8350e6a38dbe66… commit 185a8fd8350e6a38dbe66a5a8061aaef991f0637 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 23 23:31:00 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 23 23:31:00 2018 +0200 [NETSHELL] Read, write and display the 'Notify me when this connection...' option for network connections. --- dll/shellext/netshell/connectmanager.cpp | 20 ++++++++++++++++++-- dll/shellext/netshell/lanconnectui.cpp | 7 ++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 1376c24d0d..8b33b59ce0 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -239,7 +239,7 @@ CNetConnection::GetProperties(NETCON_PROPERTIES **ppProps) HKEY hKey; LPOLESTR pStr; WCHAR szName[140]; - DWORD dwShowIcon, dwType, dwSize; + DWORD dwShowIcon, dwNotifyDisconnect, dwType, dwSize; NETCON_PROPERTIES * pProperties; HRESULT hr; @@ -288,6 +288,16 @@ CNetConnection::GetProperties(NETCON_PROPERTIES **ppProps) else pProperties->dwCharacter &= ~NCCF_SHOW_ICON; } + + dwSize = sizeof(dwNotifyDisconnect); + if (RegQueryValueExW(hKey, L"IpCheckingEnabled", NULL, &dwType, (LPBYTE)&dwNotifyDisconnect, &dwSize) == ERROR_SUCCESS && dwType == REG_DWORD) + { + if (dwNotifyDisconnect) + pProperties->dwCharacter |= NCCF_NOTIFY_DISCONNECTED; + else + pProperties->dwCharacter &= ~NCCF_NOTIFY_DISCONNECTED; + } + dwSize = sizeof(szName); if (RegQueryValueExW(hKey, L"Name", NULL, &dwType, (LPBYTE)szName, &dwSize) == ERROR_SUCCESS) { @@ -503,7 +513,7 @@ NormalizeOperStatus( BOOL CNetConnectionManager::EnumerateINetConnections() { - DWORD dwSize, dwResult, dwIndex, dwAdapterIndex, dwShowIcon; + DWORD dwSize, dwResult, dwIndex, dwAdapterIndex, dwShowIcon, dwNotifyDisconnect; MIB_IFTABLE *pIfTable; MIB_IFROW IfEntry; IP_ADAPTER_INFO * pAdapterInfo; @@ -641,6 +651,12 @@ CNetConnectionManager::EnumerateINetConnections() if (dwShowIcon) pNew->Props.dwCharacter |= NCCF_SHOW_ICON; } + dwSize = sizeof(dwNotifyDisconnect); + if (RegQueryValueExW(hSubKey, L"IpCheckingEnabled", NULL, NULL, (LPBYTE)&dwNotifyDisconnect, &dwSize) == ERROR_SUCCESS) + { + if (dwNotifyDisconnect) + pNew->Props.dwCharacter |= NCCF_NOTIFY_DISCONNECTED; + } RegCloseKey(hSubKey); } diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index b5ef94bbc5..6d1037f6bf 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -350,7 +350,7 @@ CNetConnectionPropertyUi::LANPropertiesUIDlg( PNET_ITEM pItem; CNetConnectionPropertyUi * This; LPPSHNOTIFY lppsn; - DWORD dwShowIcon; + DWORD dwShowIcon, dwNotifyDisconnect; HRESULT hr; WCHAR szKey[200]; LPOLESTR pStr; @@ -382,6 +382,10 @@ CNetConnectionPropertyUi::LANPropertiesUIDlg( else dwShowIcon = 0; + if (SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_GETCHECK, 0, 0) == BST_CHECKED) + dwNotifyDisconnect = 1; + else + dwNotifyDisconnect = 0; if (StringFromCLSID((CLSID)This->m_pProperties->guidId, &pStr) == ERROR_SUCCESS) { @@ -390,6 +394,7 @@ CNetConnectionPropertyUi::LANPropertiesUIDlg( if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) { RegSetValueExW(hKey, L"ShowIcon", 0, REG_DWORD, (LPBYTE)&dwShowIcon, sizeof(DWORD)); + RegSetValueExW(hKey, L"IpCheckingEnabled", 0, REG_DWORD, (LPBYTE)&dwNotifyDisconnect, sizeof(DWORD)); RegCloseKey(hKey); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs