Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

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

01/01: [SETUPAPI] Replace the remaining internal calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKeyW by calls to SETUPDI_OpenDrvKey, SETUPDI_CreateDevKey or SETUPDI_CreateDrvKey.
by Eric Kohl 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df36ee9fe24de5e9d7498… commit df36ee9fe24de5e9d7498ea3927c8c724bd0c0e3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 23 20:17:35 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 23 20:19:26 2018 +0200 [SETUPAPI] Replace the remaining internal calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKeyW by calls to SETUPDI_OpenDrvKey, SETUPDI_CreateDevKey or SETUPDI_CreateDrvKey. --- dll/win32/setupapi/devinst.c | 389 +++++++++++++++++++--------------- dll/win32/setupapi/setupapi_private.h | 2 + 2 files changed, 218 insertions(+), 173 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index a4d102e3b8..10ffd29251 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1414,17 +1414,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo; HKEY key = INVALID_HANDLE_VALUE; - LPWSTR lpGuidString = NULL; - LPWSTR DriverKey = NULL; /* {GUID}\Index */ - LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ - DWORD Index; /* Index used in the DriverKey name */ - DWORD dwSize; - DWORD Disposition; DWORD rc; HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = NULL; - HKEY hClassKey = NULL; - HKEY hDeviceKey = INVALID_HANDLE_VALUE; HKEY hKey = NULL; HKEY RootKey; @@ -1482,41 +1473,13 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( if (KeyType == DIREG_DEV) { - - rc = RegCreateKeyExW( - RootKey, - REGSTR_PATH_SYSTEMENUM, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_CREATE_SUB_KEY, - NULL, - &hEnumKey, - NULL); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegCreateKeyExW( - hEnumKey, - deviceInfo->instanceId, - 0, - NULL, - REG_OPTION_NON_VOLATILE, #if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, + hKey = SETUPDI_CreateDevKey(RootKey, deviceInfo, KEY_READ | KEY_WRITE); #else - KEY_ALL_ACCESS, + hKey = SETUPDI_CreateDevKey(RootKey, deviceInfo, KEY_ALL_ACCESS); #endif - NULL, - &hKey, - NULL); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); + if (hKey == INVALID_HANDLE_VALUE) goto cleanup; - } if (Scope == DICS_FLAG_GLOBAL) { @@ -1541,123 +1504,13 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( } else /* KeyType == DIREG_DRV */ { - /* Open device key, to read Driver value */ - hDeviceKey = SETUPDI_OpenDevKey(RootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); - if (hDeviceKey == INVALID_HANDLE_VALUE) - goto cleanup; - - rc = RegOpenKeyExW(RootKey, REGSTR_PATH_CLASS_NT, 0, KEY_CREATE_SUB_KEY, &hClassKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, NULL, &dwSize); - if (rc != ERROR_SUCCESS) - { - /* Create a new driver key */ - - if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) != RPC_S_OK) - goto cleanup; - - /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ - DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - DriverKey[0] = '{'; - strcpyW(&DriverKey[1], lpGuidString); - pDeviceInstance = &DriverKey[strlenW(DriverKey)]; - *pDeviceInstance++ = '}'; - *pDeviceInstance++ = '\\'; - - /* Try all values for Index between 0 and 9999 */ - Index = 0; - while (Index <= 9999) - { - sprintfW(pDeviceInstance, InstanceKeyFormat, Index); - rc = RegCreateKeyExW(hClassKey, - DriverKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, #if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, + hKey = SETUPDI_CreateDrvKey(RootKey, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); #else - KEY_ALL_ACCESS, + hKey = SETUPDI_CreateDrvKey(RootKey, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); #endif - NULL, - &hKey, - &Disposition); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (Disposition == REG_CREATED_NEW_KEY) - break; - RegCloseKey(hKey); - hKey = NULL; - Index++; - } - - if (Index > 9999) - { - /* Unable to create more than 9999 devices within the same class */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - - /* Write the new Driver value */ - rc = RegSetValueExW(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - } - else - { - /* Open the existing driver key */ - - DriverKey = HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, (LPBYTE)DriverKey, &dwSize); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - - rc = RegCreateKeyExW(hClassKey, - DriverKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, -#if _WIN32_WINNT >= 0x502 - KEY_READ | KEY_WRITE, -#else - KEY_ALL_ACCESS, -#endif - NULL, - &hKey, - &Disposition); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - } + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; } /* Do installation of the specified section */ @@ -1669,17 +1522,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( key = hKey; cleanup: - if (lpGuidString) - RpcStringFreeW(&lpGuidString); - HeapFree(GetProcessHeap(), 0, DriverKey); if (hHWProfileKey != INVALID_HANDLE_VALUE) RegCloseKey(hHWProfileKey); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - if (hClassKey != NULL) - RegCloseKey(hClassKey); - if (hDeviceKey != INVALID_HANDLE_VALUE) - RegCloseKey(hDeviceKey); if (hKey != NULL && hKey != key) RegCloseKey(hKey); @@ -4315,7 +4159,6 @@ BOOL WINAPI SetupDiCallClassInstaller( if (CanHandle & DEVICE_COINSTALLER) { -// hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { @@ -5218,8 +5061,10 @@ SetupDiChangeState( IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; PSP_PROPCHANGE_PARAMS PropChange; - HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hRootKey = INVALID_HANDLE_VALUE, hKey = INVALID_HANDLE_VALUE; LPCWSTR RegistryValueName; DWORD dwConfigFlags, dwLength, dwRegType; LONG rc; @@ -5247,10 +5092,19 @@ SetupDiChangeState( case DICS_ENABLE: case DICS_DISABLE: { + if (PropChange->Scope == DICS_FLAG_GLOBAL) + hRootKey = set->HKLM; + else /* PropChange->Scope == DICS_FLAG_CONFIGSPECIFIC */ + { + hRootKey = OpenHardwareProfileKey(set->HKLM, PropChange->HwProfile, KEY_CREATE_SUB_KEY); + if (hRootKey == INVALID_HANDLE_VALUE) + goto cleanup; + } + /* Enable/disable device in registry */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); + hKey = SETUPDI_OpenDrvKey(hRootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, PropChange->Scope, PropChange->HwProfile, DIREG_DEV, NULL, NULL); + hKey = SETUPDI_CreateDevKey(hRootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) break; dwLength = sizeof(DWORD); @@ -5315,6 +5169,9 @@ SetupDiChangeState( } cleanup: + if (hRootKey != INVALID_HANDLE_VALUE && hRootKey != set->HKLM) + RegCloseKey(hRootKey); + if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); @@ -5344,6 +5201,8 @@ SetupDiRegisterCoDeviceInstallers( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; BOOL ret = FALSE; /* Return value */ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); @@ -5390,14 +5249,20 @@ SetupDiRegisterCoDeviceInstallers( goto cleanup; lstrcatW(SectionName, DotCoInstallers); + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_READ | KEY_WRITE); #else - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); +#if _WIN32_WINNT >= 0x502 + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); +#else + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); +#endif if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5490,6 +5355,8 @@ SetupDiInstallDevice( IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; SP_DEVINSTALL_PARAMS_W InstallParams; struct DriverInfoElement *SelectedDriver; SYSTEMTIME DriverDate; @@ -5633,14 +5500,20 @@ SetupDiInstallDevice( strcpyW(SelectedDriver->Details.InfFileName, NewFileName); } + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_READ | KEY_WRITE); #else - hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(set->HKLM, deviceInfo, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); +#if _WIN32_WINNT >= 0x502 + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_READ | KEY_WRITE); +#else + hKey = SETUPDI_CreateDrvKey(set->HKLM, deviceInfo, (UUID*)&DeviceInfoData->ClassGuid, KEY_ALL_ACCESS); +#endif if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5780,6 +5653,176 @@ cleanup: return ret; } +HKEY SETUPDI_CreateDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +{ + HKEY enumKey, key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(RootKey, REGSTR_PATH_SYSTEMENUM, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &enumKey, NULL); + if (!l) + { + l = RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, REG_OPTION_NON_VOLATILE, samDesired, NULL, &key, NULL); + RegCloseKey(enumKey); + } + if (l) + SetLastError(l); + return key; +} + +HKEY SETUPDI_CreateDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, UUID *ClassGuid, REGSAM samDesired) +{ + HKEY key = INVALID_HANDLE_VALUE; + LPWSTR lpGuidString = NULL; + LPWSTR DriverKey = NULL; /* {GUID}\Index */ + LPWSTR pDeviceInstance; /* Points into DriverKey, on the Index field */ + DWORD Index; /* Index used in the DriverKey name */ + DWORD dwSize; + DWORD Disposition; + DWORD rc; + HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hClassKey = NULL; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; + + /* Open device key, to read Driver value */ + hDeviceKey = SETUPDI_OpenDevKey(RootKey, devInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); + if (hDeviceKey == INVALID_HANDLE_VALUE) + goto cleanup; + + rc = RegOpenKeyExW(RootKey, REGSTR_PATH_CLASS_NT, 0, KEY_CREATE_SUB_KEY, &hClassKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, NULL, &dwSize); + if (rc != ERROR_SUCCESS) + { + /* Create a new driver key */ + + if (UuidToStringW(ClassGuid, &lpGuidString) != RPC_S_OK) + goto cleanup; + + /* The driver key is in \System\CurrentControlSet\Control\Class\{GUID}\Index */ + DriverKey = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpGuidString) + 7) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + DriverKey[0] = '{'; + strcpyW(&DriverKey[1], lpGuidString); + pDeviceInstance = &DriverKey[strlenW(DriverKey)]; + *pDeviceInstance++ = '}'; + *pDeviceInstance++ = '\\'; + + /* Try all values for Index between 0 and 9999 */ + Index = 0; + while (Index <= 9999) + { + sprintfW(pDeviceInstance, InstanceKeyFormat, Index); + rc = RegCreateKeyExW(hClassKey, + DriverKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + &Disposition); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + if (Disposition == REG_CREATED_NEW_KEY) + break; + RegCloseKey(hKey); + hKey = NULL; + Index++; + } + + if (Index > 9999) + { + /* Unable to create more than 9999 devices within the same class */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Write the new Driver value */ + rc = RegSetValueExW(hDeviceKey, REGSTR_VAL_DRIVER, 0, REG_SZ, (const BYTE *)DriverKey, (strlenW(DriverKey) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + else + { + /* Open the existing driver key */ + + DriverKey = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + rc = RegQueryValueExW(hDeviceKey, REGSTR_VAL_DRIVER, NULL, NULL, (LPBYTE)DriverKey, &dwSize); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + rc = RegCreateKeyExW(hClassKey, + DriverKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 + KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif + NULL, + &hKey, + &Disposition); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + + key = hKey; + +cleanup: + if (lpGuidString) + RpcStringFreeW(&lpGuidString); + HeapFree(GetProcessHeap(), 0, DriverKey); + if (hHWProfileKey != INVALID_HANDLE_VALUE) + RegCloseKey(hHWProfileKey); + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (hDeviceKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDeviceKey); + if (hKey != NULL && hKey != key) + RegCloseKey(hKey); + + TRACE("Returning 0x%p\n", hKey); + return hKey; +} + HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 8625ae7d2c..63c391867b 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -312,6 +312,8 @@ SETUP_CreateDevicesList( IN CONST GUID *Class OPTIONAL, IN PCWSTR Enumerator OPTIONAL); +HKEY SETUPDI_CreateDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); +HKEY SETUPDI_CreateDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, UUID *ClassGuid, REGSAM samDesired); HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired);

1 0

02/02: [WIN32K] Work around GCC builds inventing dead keys. CORE-14948
by Mark Jansen 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3bd4e77e71e96699589… commit 3d3bd4e77e71e96699589d642d8c6e903df6219b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 23 19:28:09 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 23 20:03:14 2018 +0200 [WIN32K] Work around GCC builds inventing dead keys. CORE-14948 --- win32ss/user/ntuser/keyboard.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 6167f9d6ff..f72e275cf2 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -467,17 +467,30 @@ IntToUnicodeEx(UINT wVirtKey, WCHAR wchFirst, wchSecond; TRACE("Previous dead char: %lc (%x)\n", wchDead, wchDead); - for (i = 0; pKbdTbl->pDeadKey[i].dwBoth; i++) + if (pKbdTbl->pDeadKey) { - wchFirst = pKbdTbl->pDeadKey[i].dwBoth >> 16; - wchSecond = pKbdTbl->pDeadKey[i].dwBoth & 0xFFFF; - if (wchFirst == wchDead && wchSecond == wchTranslatedChar) + for (i = 0; pKbdTbl->pDeadKey[i].dwBoth; i++) { - wchTranslatedChar = pKbdTbl->pDeadKey[i].wchComposed; + wchFirst = pKbdTbl->pDeadKey[i].dwBoth >> 16; + wchSecond = pKbdTbl->pDeadKey[i].dwBoth & 0xFFFF; + if (wchFirst == wchDead && wchSecond == wchTranslatedChar) + { + wchTranslatedChar = pKbdTbl->pDeadKey[i].wchComposed; + wchDead = 0; + bDead = FALSE; + break; + } + } + } + else + { +#if defined(__GNUC__) + if (wchDead == 0x8000) + { + ERR("GCC is inventing bits, ignoring fake dead key\n"); wchDead = 0; - bDead = FALSE; - break; } +#endif } TRACE("Final char: %lc (%x)\n", wchTranslatedChar, wchTranslatedChar);

1 0

01/02: [SHELL32_APITEST] Speed up the CUserNotification test in the failure case.
by Mark Jansen 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7882b6cfe34885170ab0f… commit 7882b6cfe34885170ab0fc34310805362fc2e12d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 23 19:27:02 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 23 20:03:08 2018 +0200 [SHELL32_APITEST] Speed up the CUserNotification test in the failure case. --- modules/rostests/apitests/shell32/CUserNotification.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp index acfd6023a8..ec40f42584 100644 --- a/modules/rostests/apitests/shell32/CUserNotification.cpp +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -200,8 +200,8 @@ START_TEST(CUserNotification) return; } - /* Wait a maximum of 1:30 for the thread to finish (the timeout tests take some time) */ - dwWait = WaitForSingleObject(hThread, 90 * 1000); + /* Wait a maximum of 60 seconds for the thread to finish (the timeout tests take some time) */ + dwWait = WaitForSingleObject(hThread, 60 * 1000); ok(dwWait == WAIT_OBJECT_0, "WaitForSingleObject returned %lu, expected WAIT_OBJECT_0\n", dwWait); /* Cleanup and return */

1 0

01/01: [SERVICES] Simplify the implementation of RGetServiceDisplayNameA/W() and RGetServiceKeyNameA/W().
by Hermès Bélusca-Maïto 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf164caae8670898de159… commit bf164caae8670898de1594dc0e30f9c7c2c97891 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 22 15:41:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 23 18:09:10 2018 +0200 [SERVICES] Simplify the implementation of RGetServiceDisplayNameA/W() and RGetServiceKeyNameA/W(). Also comment about the observed behaviour of the returned number of "characters" returned by the ANSI versions of these APIs (which is tested by advapi32_winetest:service). [ADVAPI32:SCM] Add a comment concerning wide characters vs. bytes mismatch. --- base/system/services/rpcserver.c | 315 +++++++++++++++++++++------------------ dll/win32/advapi32/service/scm.c | 10 ++ 2 files changed, 181 insertions(+), 144 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 454181bb66..f21df10e57 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2947,7 +2947,7 @@ ROpenServiceW( lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); + DPRINT("Could not find the service!\n"); dwError = ERROR_SERVICE_DOES_NOT_EXIST; goto Done; } @@ -3310,8 +3310,9 @@ RGetServiceDisplayNameW( LPWSTR lpDisplayName, DWORD *lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService; + LPCWSTR lpSvcDisplayName; DWORD dwLength; DWORD dwError; @@ -3321,56 +3322,42 @@ RGetServiceDisplayNameW( DPRINT("lpDisplayName: %p\n", lpDisplayName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif /* Get service database entry */ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is less than 2, windows - puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < sizeof(WCHAR)) - { - *lpcchBuffer = sizeof(WCHAR); - if (lpDisplayName != NULL) - { - *lpDisplayName = 0; - } - } - + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } - if (!lpService->lpDisplayName) + if (lpService->lpDisplayName) + lpSvcDisplayName = lpService->lpDisplayName; + else + lpSvcDisplayName = lpService->lpServiceName; + + dwLength = (DWORD)wcslen(lpSvcDisplayName); + + if (*lpcchBuffer > dwLength) { - dwLength = (DWORD)wcslen(lpService->lpServiceName); + if (lpDisplayName != NULL) + wcscpy(lpDisplayName, lpSvcDisplayName); - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - wcscpy(lpDisplayName, lpService->lpServiceName); - } + dwError = ERROR_SUCCESS; } else { - dwLength = (DWORD)wcslen(lpService->lpDisplayName); - - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - wcscpy(lpDisplayName, lpService->lpDisplayName); - } + dwError = ERROR_INSUFFICIENT_BUFFER; } - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - *lpcchBuffer = dwLength; return dwError; @@ -3386,7 +3373,7 @@ RGetServiceKeyNameW( LPWSTR lpServiceName, DWORD *lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService; DWORD dwLength; DWORD dwError; @@ -3397,44 +3384,36 @@ RGetServiceKeyNameW( DPRINT("lpServiceName: %p\n", lpServiceName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif /* Get service database entry */ lpService = ScmGetServiceEntryByDisplayName(lpDisplayName); if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is less than 2, windows - puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < sizeof(WCHAR)) - { - *lpcchBuffer = sizeof(WCHAR); - if (lpServiceName != NULL) - { - *lpServiceName = 0; - } - } - + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } dwLength = (DWORD)wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && - *lpcchBuffer > dwLength) + if (*lpcchBuffer > dwLength) { - wcscpy(lpServiceName, lpService->lpServiceName); - *lpcchBuffer = dwLength; - return ERROR_SUCCESS; - } + if (lpServiceName != NULL) + wcscpy(lpServiceName, lpService->lpServiceName); - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + dwError = ERROR_SUCCESS; + } + else + { + dwError = ERROR_INSUFFICIENT_BUFFER; + } *lpcchBuffer = dwLength; @@ -4474,11 +4453,11 @@ RGetServiceDisplayNameA( LPSTR lpDisplayName, LPBOUNDED_DWORD_4K lpcchBuffer) { -// PMANAGER_HANDLE hManager; + // PMANAGER_HANDLE hManager; PSERVICE lpService = NULL; - DWORD dwLength; - DWORD dwError; + LPCWSTR lpSvcDisplayName; LPWSTR lpServiceNameW; + DWORD dwLength; DPRINT("RGetServiceDisplayNameA() called\n"); DPRINT("hSCManager = %p\n", hSCManager); @@ -4486,13 +4465,16 @@ RGetServiceDisplayNameA( DPRINT("lpDisplayName: %p\n", lpDisplayName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); -// hManager = (PMANAGER_HANDLE)hSCManager; -// if (hManager->Handle.Tag != MANAGER_TAG) -// { -// DPRINT("Invalid manager handle!\n"); -// return ERROR_INVALID_HANDLE; -// } +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif + /* Get service database entry */ if (lpServiceName != NULL) { dwLength = (DWORD)(strlen(lpServiceName) + 1); @@ -4516,61 +4498,71 @@ RGetServiceDisplayNameA( if (lpService == NULL) { - DPRINT("Could not find a service!\n"); - - /* If the service could not be found and lpcchBuffer is 0, windows - puts null in lpDisplayName and puts 1 in lpcchBuffer */ - if (*lpcchBuffer == 0) - { - *lpcchBuffer = sizeof(CHAR); - if (lpDisplayName != NULL) - { - *lpDisplayName = 0; - } - } + DPRINT("Could not find the service!\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } - if (!lpService->lpDisplayName) + if (lpService->lpDisplayName) + lpSvcDisplayName = lpService->lpDisplayName; + else + lpSvcDisplayName = lpService->lpServiceName; + + /* + * NOTE: On Windows the comparison on *lpcchBuffer is made against + * the number of (wide) characters of the UNICODE display name, and + * not against the number of bytes needed to store the ANSI string. + */ + dwLength = (DWORD)wcslen(lpSvcDisplayName); + + if (*lpcchBuffer > dwLength) { - dwLength = (DWORD)wcslen(lpService->lpServiceName); if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { WideCharToMultiByte(CP_ACP, 0, - lpService->lpServiceName, - (int)wcslen(lpService->lpServiceName), + lpSvcDisplayName, + -1, lpDisplayName, - dwLength + 1, + (int)*lpcchBuffer, NULL, - NULL); - return ERROR_SUCCESS; + NULL) == 0) + { + /* + * But then, if *lpcchBuffer was greater than the number of + * (wide) characters of the UNICODE display name, yet smaller + * than the number of bytes needed due to the possible presence + * of DBCS characters, the *exact* number of bytes is returned + * (without the NULL terminator). + */ + dwLength = (DWORD)WideCharToMultiByte(CP_ACP, + 0, + lpSvcDisplayName, + (int)dwLength, + NULL, + 0, + NULL, + NULL); + *lpDisplayName = 0; + *lpcchBuffer = dwLength; + return ERROR_INSUFFICIENT_BUFFER; } + + /* + * NOTE: On Windows, RGetServiceDisplayNameA() does not update + * *lpcchBuffer on success, contrary to RGetServiceDisplayNameW(). + */ + return ERROR_SUCCESS; } else { - dwLength = (DWORD)wcslen(lpService->lpDisplayName); - if (lpDisplayName != NULL && - *lpcchBuffer > dwLength) - { - WideCharToMultiByte(CP_ACP, - 0, - lpService->lpDisplayName, - (int)wcslen(lpService->lpDisplayName), - lpDisplayName, - dwLength + 1, - NULL, - NULL); - return ERROR_SUCCESS; - } + /* + * NOTE: On Windows, if *lpcchBuffer is smaller than the number of + * (wide) characters of the UNICODE display name, only an upper + * estimation is returned by doubling the string length, to account + * for the presence of any possible DBCS characters. + */ + *lpcchBuffer = dwLength * sizeof(WCHAR); + return ERROR_INSUFFICIENT_BUFFER; } - - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - - *lpcchBuffer = dwLength * 2; - - return dwError; } @@ -4583,10 +4575,10 @@ RGetServiceKeyNameA( LPSTR lpServiceName, LPBOUNDED_DWORD_4K lpcchBuffer) { + // PMANAGER_HANDLE hManager; PSERVICE lpService; - DWORD dwLength; - DWORD dwError; LPWSTR lpDisplayNameW; + DWORD dwLength; DPRINT("RGetServiceKeyNameA() called\n"); DPRINT("hSCManager = %p\n", hSCManager); @@ -4594,6 +4586,17 @@ RGetServiceKeyNameA( DPRINT("lpServiceName: %p\n", lpServiceName); DPRINT("*lpcchBuffer: %lu\n", *lpcchBuffer); +#if 0 + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } +#endif + + /* Get service database entry */ + dwLength = (DWORD)(strlen(lpDisplayName) + 1); lpDisplayNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -4615,41 +4618,65 @@ RGetServiceKeyNameA( if (lpService == NULL) { DPRINT("Could not find the service!\n"); - - /* If the service could not be found and lpcchBuffer is 0, - put null in lpDisplayName and puts 1 in lpcchBuffer, verified WINXP. */ - if (*lpcchBuffer == 0) - { - *lpcchBuffer = sizeof(CHAR); - if (lpServiceName != NULL) - { - *lpServiceName = 0; - } - } - return ERROR_SERVICE_DOES_NOT_EXIST; } + /* + * NOTE: On Windows the comparison on *lpcchBuffer is made against + * the number of (wide) characters of the UNICODE service name, and + * not against the number of bytes needed to store the ANSI string. + */ dwLength = (DWORD)wcslen(lpService->lpServiceName); - if (lpServiceName != NULL && - *lpcchBuffer > dwLength) + + if (*lpcchBuffer > dwLength) { - WideCharToMultiByte(CP_ACP, - 0, - lpService->lpServiceName, - (int)wcslen(lpService->lpServiceName), - lpServiceName, - dwLength + 1, - NULL, - NULL); + if (lpServiceName != NULL && + WideCharToMultiByte(CP_ACP, + 0, + lpService->lpServiceName, + -1, + lpServiceName, + (int)*lpcchBuffer, + NULL, + NULL) == 0) + { + /* + * But then, if *lpcchBuffer was greater than the number of + * (wide) characters of the UNICODE service name, yet smaller + * than the number of bytes needed due to the possible presence + * of DBCS characters, the *exact* number of bytes is returned + * (without the NULL terminator). + */ + dwLength = (DWORD)WideCharToMultiByte(CP_ACP, + 0, + lpService->lpServiceName, + (int)dwLength, + NULL, + 0, + NULL, + NULL); + *lpServiceName = 0; + *lpcchBuffer = dwLength; + return ERROR_INSUFFICIENT_BUFFER; + } + + /* + * NOTE: On Windows, RGetServiceKeyNameA() does not update + * *lpcchBuffer on success, contrary to RGetServiceKeyNameW(). + */ return ERROR_SUCCESS; } - - dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - - *lpcchBuffer = dwLength * 2; - - return dwError; + else + { + /* + * NOTE: On Windows, if *lpcchBuffer is smaller than the number of + * (wide) characters of the UNICODE service name, only an upper + * estimation is returned by doubling the string length, to account + * for the presence of any possible DBCS characters. + */ + *lpcchBuffer = dwLength * sizeof(WCHAR); + return ERROR_INSUFFICIENT_BUFFER; + } } diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index b28055a968..1fe96213a1 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -1693,6 +1693,11 @@ GetServiceDisplayNameW(SC_HANDLE hSCManager, return FALSE; } + /* + * NOTE: A size of 1 character would be enough, but tests show that + * Windows returns 2 characters instead, certainly due to a WCHAR/bytes + * mismatch in their code. + */ if (!lpDisplayName || *lpcchBuffer < sizeof(WCHAR)) { lpNameBuffer = szEmptyName; @@ -1810,6 +1815,11 @@ GetServiceKeyNameW(SC_HANDLE hSCManager, return FALSE; } + /* + * NOTE: A size of 1 character would be enough, but tests show that + * Windows returns 2 characters instead, certainly due to a WCHAR/bytes + * mismatch in their code. + */ if (!lpServiceName || *lpcchBuffer < sizeof(WCHAR)) { lpNameBuffer = szEmptyName;

1 0

01/01: [SETUPAPI] Do not use SetupDiOpenDevRegKey in other SetupDi functions. Use SETUPDI_OpenDevKey or SETUPDI_OpenDrvKey instead.
by Eric Kohl 23 Sep '18

23 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60e166535ae2cf95dda33… commit 60e166535ae2cf95dda330f236ae723b4f4a1ba2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 23 16:15:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 23 16:16:12 2018 +0200 [SETUPAPI] Do not use SetupDiOpenDevRegKey in other SetupDi functions. Use SETUPDI_OpenDevKey or SETUPDI_OpenDrvKey instead. Note: The remaining calls to SetupDiOpenDevRegKey and SetupDiCreateDevRegKey will be fixed in another patch. Fixes CORE-15091 --- dll/win32/setupapi/devclass.c | 2 +- dll/win32/setupapi/devinst.c | 31 +++++++++++++++++++------------ dll/win32/setupapi/driver.c | 8 +------- dll/win32/setupapi/setupapi_private.h | 3 +++ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 4982e67290..5f88f40ab8 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1279,7 +1279,7 @@ SetupDiGetClassDevPropertySheetsW( DWORD rc; if (DeviceInfoData) - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDrvKey(list->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); else { hKey = SetupDiOpenClassRegKeyExW(&list->ClassGuid, KEY_QUERY_VALUE, diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 91356c3f54..a4d102e3b8 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1412,6 +1412,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( PCWSTR InfSectionName) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; HKEY key = INVALID_HANDLE_VALUE; LPWSTR lpGuidString = NULL; LPWSTR DriverKey = NULL; /* {GUID}\Index */ @@ -1467,6 +1468,8 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( return INVALID_HANDLE_VALUE; } + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Scope == DICS_FLAG_GLOBAL) RootKey = set->HKLM; else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ @@ -1479,7 +1482,6 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( if (KeyType == DIREG_DEV) { - struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; rc = RegCreateKeyExW( RootKey, @@ -1540,7 +1542,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( else /* KeyType == DIREG_DRV */ { /* Open device key, to read Driver value */ - hDeviceKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, Scope, HwProfile, DIREG_DEV, KEY_QUERY_VALUE | KEY_SET_VALUE); + hDeviceKey = SETUPDI_OpenDevKey(RootKey, deviceInfo, KEY_QUERY_VALUE | KEY_SET_VALUE); if (hDeviceKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -3429,7 +3431,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( { HKEY hKey; size = PropertyBufferSize; - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDevKey(set->HKLM, devInfo, KEY_QUERY_VALUE); if (hKey == INVALID_HANDLE_VALUE) return FALSE; lError = RegQueryValueExW(hKey, PropertyMap[Property].nameW, @@ -3524,6 +3526,7 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( { BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo; TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, PropertyBuffer, PropertyBufferSize); @@ -3544,13 +3547,16 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) && PropertyMap[Property].nameW && PropertyMap[Property].nameA) { HKEY hKey; LONG l; - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + hKey = SETUPDI_OpenDevKey(set->HKLM, deviceInfo, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) return FALSE; /* Write new data */ @@ -4309,7 +4315,8 @@ BOOL WINAPI SetupDiCallClassInstaller( if (CanHandle & DEVICE_COINSTALLER) { - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); +// hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); if (hKey != INVALID_HANDLE_VALUE) { rc = RegQueryValueExW(hKey, REGSTR_VAL_COINSTALLERS_32, NULL, &dwRegType, NULL, &dwLength); @@ -5385,9 +5392,9 @@ SetupDiRegisterCoDeviceInstallers( /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); #else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); @@ -5628,9 +5635,9 @@ SetupDiInstallDevice( /* Open/Create driver key information */ #if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_READ | KEY_WRITE); #else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + hKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_ALL_ACCESS); #endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); @@ -5718,7 +5725,7 @@ SetupDiInstallDevice( RebootRequired = TRUE; /* Open device registry key */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + hKey = SETUPDI_OpenDevKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_SET_VALUE); if (hKey == INVALID_HANDLE_VALUE) goto cleanup; @@ -5773,7 +5780,7 @@ cleanup: return ret; } -static HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; LONG l; @@ -5789,7 +5796,7 @@ static HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM return key; } -static HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) { LPWSTR DriverKey = NULL; DWORD dwLength = 0; diff --git a/dll/win32/setupapi/driver.c b/dll/win32/setupapi/driver.c index 356a95c08d..2b4476df1a 100644 --- a/dll/win32/setupapi/driver.c +++ b/dll/win32/setupapi/driver.c @@ -808,13 +808,7 @@ SetupDiBuildDriverInfoList( strcatW(InfFileName, InfDirectory); /* Read some information from registry, before creating the driver structure */ - hDriverKey = SetupDiOpenDevRegKey( - DeviceInfoSet, - DeviceInfoData, - DICS_FLAG_GLOBAL, - 0, - DIREG_DRV, - KEY_QUERY_VALUE); + hDriverKey = SETUPDI_OpenDrvKey(((struct DeviceInfoSet *)DeviceInfoSet)->HKLM, devInfo, KEY_QUERY_VALUE); if (hDriverKey == INVALID_HANDLE_VALUE) goto done; RequiredSize = (len - strlenW(InfFileName)) * sizeof(WCHAR); diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 8bb89b56f9..8625ae7d2c 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -312,6 +312,9 @@ SETUP_CreateDevicesList( IN CONST GUID *Class OPTIONAL, IN PCWSTR Enumerator OPTIONAL); +HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); +HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired); + /* driver.c */ struct InfFileDetails *

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018