Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

03/03: [NETCFGX] Update russian translation
by Stanislav Motylkov 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=732a6b0801d82110e5246… commit 732a6b0801d82110e5246e9338c38733548e6775 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Oct 6 23:46:30 2018 +0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Oct 7 18:28:43 2018 +0200 [NETCFGX] Update russian translation --- dll/win32/netcfgx/lang/ru-RU.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 38a6519a1d..b264aa5827 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -197,18 +197,18 @@ END IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Advanced" +CAPTION "Дополнительно" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP - LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LTEXT "Для этого сетевого адаптера можно задать свойства, перечисленные ниже. Выберите свойство для изменения слева, и задайте значение для него справа.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Свойство:", -1, 7, 37, 60, 8, WS_GROUP LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP - LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + LTEXT "&Значение:", -1, 151, 37, 60, 8, WS_GROUP EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "&Отсутствует", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE

1 0

02/03: [MSPORTS] Update russian translation
by Stanislav Motylkov 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0934d4f171d58dacd0142… commit 0934d4f171d58dacd01423399cb4abd542c84dab Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Oct 6 23:45:49 2018 +0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Oct 7 18:28:43 2018 +0200 [MSPORTS] Update russian translation --- dll/win32/msports/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msports/lang/ru-RU.rc b/dll/win32/msports/lang/ru-RU.rc index f90eb9c157..27fee8bb0a 100644 --- a/dll/win32/msports/lang/ru-RU.rc +++ b/dll/win32/msports/lang/ru-RU.rc @@ -44,5 +44,5 @@ BEGIN IDS_PARITY "Чёт,Нечёт,Нет,Маркер,Пробел" IDS_STOPBITS "1,1.5,2" IDS_FLOWCONTROL "Xon / Xoff,Аппаратное,Нет" - IDS_PORT_IN_USE " (in use)" + IDS_PORT_IN_USE " (используется)" END

1 0

01/03: [DEVMGR] Update russian translation
by Stanislav Motylkov 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10b7b94f459822992ec94… commit 10b7b94f459822992ec94b608cb71e53660d488f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Oct 6 23:44:36 2018 +0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Oct 7 18:28:43 2018 +0200 [DEVMGR] Update russian translation --- dll/win32/devmgr/lang/ru-RU.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index d00633c678..7996cf44b9 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -179,10 +179,10 @@ BEGIN LTEXT "Просмотр сведений о файлах драйверов.", -1, 91, 110, 154, 17, SS_NOPREFIX PUSHBUTTON "&Обновить...", IDC_UPDATEDRIVER, 7, 134, 75, 15 LTEXT "Обновление драйверов для устройства.", -1, 91, 138, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 - LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX - PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 - LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX + PUSHBUTTON "От&катить", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "Если устройство не работает после обновления драйвера, выполните откат к ранее установленному драйверу.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Удалить", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "Удаление драйвера (для опытных).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230

1 0

01/01: [NETCFGX] NetPropPageProvider: Store the parameters in the registry
by Eric Kohl 06 Oct '18

06 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45cd6d5e4ed199ecac6fb… commit 45cd6d5e4ed199ecac6fb040787b3e25768553f8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 6 23:57:17 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 6 23:57:17 2018 +0200 [NETCFGX] NetPropPageProvider: Store the parameters in the registry --- dll/win32/netcfgx/propertypage.c | 188 +++++++++++++++++++++++++++++++++++---- 1 file changed, 171 insertions(+), 17 deletions(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 2db6e377d2..37a731e2ce 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -29,6 +29,7 @@ typedef struct _PARAMETER PWSTR pszName; PWSTR pszDescription; PWSTR pszValue; + DWORD cchValueLength; PWSTR pszDefault; BOOL bOptional; BOOL bPresent; @@ -39,11 +40,12 @@ typedef struct _PARAMETER BOOL bUpperCase; INT iTextLimit; - } PARAMETER, *PPARAMETER; typedef struct _PARAMETER_ARRAY { + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; PPARAMETER pCurrentParam; DWORD dwCount; PARAMETER Array[0]; @@ -93,9 +95,10 @@ FreeParameterArray( static DWORD GetStringValue( - IN HKEY hKey, - IN PWSTR pValueName, - OUT PWSTR *pString) + _In_ HKEY hKey, + _In_ PWSTR pValueName, + _Out_ PWSTR *pString, + _Out_opt_ PDWORD pdwStringLength) { PWSTR pBuffer; DWORD dwLength = 0; @@ -123,6 +126,8 @@ GetStringValue( pBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; *pString = pBuffer; + if (pdwStringLength) + *pdwStringLength = dwLength; return ERROR_SUCCESS; } @@ -385,7 +390,7 @@ BuildParameterArray( goto done; } - FIXME("Sub keys: %lu\n", dwSubKeys); + TRACE("Sub keys: %lu\n", dwSubKeys); if (dwSubKeys == 0) { @@ -402,6 +407,8 @@ BuildParameterArray( goto done; } + ParamArray->DeviceInfoSet = DeviceInfoSet; + ParamArray->DeviceInfoData = DeviceInfoData; ParamArray->dwCount = dwSubKeys; dwMaxSubKeyLen++; @@ -429,7 +436,7 @@ BuildParameterArray( if (lError != ERROR_SUCCESS) break; - FIXME("Sub key '%S'\n", ParamArray->Array[dwIndex].pszName); + TRACE("Sub key '%S'\n", ParamArray->Array[dwIndex].pszName); lError = RegOpenKeyExW(hParamsKey, ParamArray->Array[dwIndex].pszName, @@ -440,11 +447,13 @@ BuildParameterArray( { GetStringValue(hParamKey, L"ParamDesc", - &ParamArray->Array[dwIndex].pszDescription); + &ParamArray->Array[dwIndex].pszDescription, + NULL); GetStringValue(hParamKey, L"Type", - &pszType); + &pszType, + NULL); if (pszType != NULL) { if (_wcsicmp(pszType, L"int") == 0) @@ -468,7 +477,8 @@ BuildParameterArray( GetStringValue(hParamKey, L"Default", - &ParamArray->Array[dwIndex].pszDefault); + &ParamArray->Array[dwIndex].pszDefault, + NULL); GetBooleanValue(hParamKey, L"Optional", @@ -505,7 +515,8 @@ BuildParameterArray( lError = GetStringValue(hDriverKey, ParamArray->Array[dwIndex].pszName, - &ParamArray->Array[dwIndex].pszValue); + &ParamArray->Array[dwIndex].pszValue, + &ParamArray->Array[dwIndex].cchValueLength); if ((lError == ERROR_SUCCESS) || (ParamArray->Array[dwIndex].pszDefault != NULL)) { @@ -530,11 +541,119 @@ done: } +static +VOID +ReadParameterValue( + HWND hwnd, + PPARAMETER pParam) +{ + INT iIndex, iLength; + + if (pParam->Type == ENUM_TYPE) + { + iIndex = ComboBox_GetCurSel(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST)); + if (iIndex != CB_ERR && iIndex < pParam->dwEnumOptions) + { + iLength = wcslen(pParam->pEnumOptions[iIndex].pszValue); + if (iLength > pParam->cchValueLength) + { + if (pParam->pszValue != NULL) + HeapFree(GetProcessHeap(), 0, pParam->pszValue); + + pParam->pszValue = HeapAlloc(GetProcessHeap(), 0, (iLength + 1) * sizeof(WCHAR)); + } + + if (pParam->pszValue != NULL) + { + wcscpy(pParam->pszValue, + pParam->pEnumOptions[iIndex].pszValue); + pParam->cchValueLength = iLength; + } + } + } + else + { + iLength = Edit_GetTextLength(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT)); + if (iLength > pParam->cchValueLength) + { + if (pParam->pszValue != NULL) + HeapFree(GetProcessHeap(), 0, pParam->pszValue); + + pParam->pszValue = HeapAlloc(GetProcessHeap(), 0, (iLength + 1) * sizeof(WCHAR)); + } + + if (pParam->pszValue != NULL) + { + Edit_GetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), + pParam->pszValue, + iLength + 1); + pParam->cchValueLength = iLength; + } + } +} + + +static +VOID +WriteParameterArray( + _In_ HWND hwnd, + _In_ PPARAMETER_ARRAY ParamArray) +{ + PPARAMETER Param; + HKEY hDriverKey; + INT i; + + if (ParamArray == NULL) + return; + + hDriverKey = SetupDiOpenDevRegKey(ParamArray->DeviceInfoSet, + ParamArray->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_WRITE); + if (hDriverKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return; + } + + for (i = 0; i < ParamArray->dwCount; i++) + { + Param = &ParamArray->Array[i]; + + if (Param == ParamArray->pCurrentParam) + { + ReadParameterValue(hwnd, Param); + } + + if (Param->bPresent) + { + TRACE("Set '%S' --> '%S'\n", Param->pszName, Param->pszValue); + RegSetValueExW(hDriverKey, + Param->pszName, + 0, + REG_SZ, + (LPBYTE)Param->pszValue, + (wcslen(Param->pszValue) + 1) * sizeof(WCHAR)); + } + else + { + TRACE("Delete '%S'\n", Param->pszName); + RegDeleteValueW(hDriverKey, + Param->pszName); + } + } + + RegCloseKey(hDriverKey); +} + + static VOID DisplayParameter( - HWND hwnd, - PPARAMETER Parameter) + _In_ HWND hwnd, + _In_ PPARAMETER Parameter) { HWND hwndControl; LONG_PTR Style; @@ -653,7 +772,7 @@ OnInitDialog( PWSTR pszText; DWORD i; - FIXME("OnInitDialog()\n"); + TRACE("OnInitDialog()\n"); pParamArray = (PPARAMETER_ARRAY)((LPPROPSHEETPAGEW)lParam)->lParam; if (pParamArray == NULL) @@ -710,6 +829,11 @@ OnCommand( if ((LOWORD(wParam) == IDC_PROPERTY_NAME) && (HIWORD(wParam) == LBN_SELCHANGE)) { + if (pParamArray->pCurrentParam != NULL) + { + ReadParameterValue(hwnd, pParamArray->pCurrentParam); + } + iIndex = ListBox_GetCurSel((HWND)lParam); if (iIndex != LB_ERR && iIndex < pParamArray->dwCount) { @@ -734,6 +858,32 @@ OnCommand( } +static +VOID +OnNotify( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPARAMETER_ARRAY pParamArray; + + TRACE("OnNotify()\n"); + + pParamArray = (PPARAMETER_ARRAY)GetWindowLongPtr(hwnd, DWLP_USER); + if (pParamArray == NULL) + { + ERR("pParamArray is NULL\n"); + return; + } + + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + TRACE("PSN_APPLY!\n"); + WriteParameterArray(hwnd, pParamArray); + } +} + + static VOID OnDestroy( @@ -741,7 +891,7 @@ OnDestroy( { PPARAMETER_ARRAY pParamArray; - FIXME("OnDestroy()\n"); + TRACE("OnDestroy()\n"); pParamArray = (PPARAMETER_ARRAY)GetWindowLongPtr(hwnd, DWLP_USER); if (pParamArray == NULL) @@ -773,6 +923,10 @@ NetPropertyPageDlgProc( OnCommand(hwnd, wParam, lParam); break; + case WM_NOTIFY: + OnNotify(hwnd, wParam, lParam); + break; + case WM_DESTROY: OnDestroy(hwnd); break; @@ -796,7 +950,7 @@ NetPropPageProvider( HPROPSHEETPAGE hPropSheetPage; PPARAMETER_ARRAY ParameterArray = NULL; - ERR("NetPropPageProvider(%p %p %lx)\n", + TRACE("NetPropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); if (!BuildParameterArray(lpPropSheetPageRequest->DeviceInfoSet, @@ -806,7 +960,7 @@ NetPropPageProvider( if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) { - ERR("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + TRACE("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); PropSheetPage.dwFlags = 0; @@ -831,7 +985,7 @@ NetPropPageProvider( } } - ERR("Done!\n"); + TRACE("Done!\n"); return TRUE; }

1 0

01/01: [NETCFGX] NetPropPageProvider: Improve the handling of optional parameters
by Eric Kohl 06 Oct '18

06 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ad65a377345060b61933… commit 7ad65a377345060b61933828e5e69fc0b360f313 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 6 14:32:50 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 6 14:33:48 2018 +0200 [NETCFGX] NetPropPageProvider: Improve the handling of optional parameters - Add a pointer to the current parameter. - Change the 'present' and 'not present' radio buttons to auto radio buttons. - Display present and non-present optional parameters properly. --- dll/win32/netcfgx/lang/bg-BG.rc | 4 ++-- dll/win32/netcfgx/lang/cs-CZ.rc | 4 ++-- dll/win32/netcfgx/lang/da-DK.rc | 4 ++-- dll/win32/netcfgx/lang/de-DE.rc | 4 ++-- dll/win32/netcfgx/lang/el-GR.rc | 4 ++-- dll/win32/netcfgx/lang/en-US.rc | 4 ++-- dll/win32/netcfgx/lang/es-ES.rc | 4 ++-- dll/win32/netcfgx/lang/fr-FR.rc | 4 ++-- dll/win32/netcfgx/lang/he-IL.rc | 4 ++-- dll/win32/netcfgx/lang/hu-HU.rc | 4 ++-- dll/win32/netcfgx/lang/id-ID.rc | 4 ++-- dll/win32/netcfgx/lang/it-IT.rc | 4 ++-- dll/win32/netcfgx/lang/ja-JP.rc | 4 ++-- dll/win32/netcfgx/lang/nl-NL.rc | 4 ++-- dll/win32/netcfgx/lang/no-NO.rc | 4 ++-- dll/win32/netcfgx/lang/pl-PL.rc | 4 ++-- dll/win32/netcfgx/lang/ro-RO.rc | 4 ++-- dll/win32/netcfgx/lang/ru-RU.rc | 4 ++-- dll/win32/netcfgx/lang/sk-SK.rc | 4 ++-- dll/win32/netcfgx/lang/sq-AL.rc | 4 ++-- dll/win32/netcfgx/lang/sv-SE.rc | 4 ++-- dll/win32/netcfgx/lang/tr-TR.rc | 4 ++-- dll/win32/netcfgx/lang/uk-UA.rc | 4 ++-- dll/win32/netcfgx/lang/zh-CN.rc | 4 ++-- dll/win32/netcfgx/lang/zh-TW.rc | 4 ++-- dll/win32/netcfgx/propertypage.c | 47 +++++++++++++++++++++++++++++++++------- 26 files changed, 89 insertions(+), 58 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index bd32f6909c..7f2ca37b5a 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index 073c80c6ed..46e2f78a09 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -213,8 +213,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index bb9fd14bac..dda0cbce76 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index f81f50bdb3..642e8acb15 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Nicht vorhanden", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Nicht vorhanden", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index bbb34b01f4..3821ba2667 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 2c29dcbda2..c4650e9059 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 950015b1ff..e5fed5041f 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -209,8 +209,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index eb29c4b294..d782733739 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 056affbb53..165e30ffef 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index 6fe00e2a77..171f29baed 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index bc341c134e..53676d4c90 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index a5af3dc350..be3b8508b1 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index 242fab9325..0620a00a95 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index dd893c8061..a578ca654b 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 96f254bf6a..4537cfc0d4 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index 5bd9bf8995..3f53ba0b8a 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -214,8 +214,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index 97f9869328..762525d004 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -213,8 +213,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 4437d73127..38a6519a1d 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index 38ba38296a..fa0952d793 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index 694945b1a6..4eac8f192c 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -212,8 +212,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index 3ab171db76..c84639ce8b 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index ad6db04169..43a46c38a3 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -209,8 +209,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index ac53abf3df..63aa795461 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -207,8 +207,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index 54b030f174..90a55c952b 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -215,8 +215,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index b60cf4857a..7aa4838f2c 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -215,8 +215,8 @@ BEGIN EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP - RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 3cf5f56c58..2db6e377d2 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -31,6 +31,7 @@ typedef struct _PARAMETER PWSTR pszValue; PWSTR pszDefault; BOOL bOptional; + BOOL bPresent; PARAM_TYPE Type; DWORD dwEnumOptions; @@ -43,6 +44,7 @@ typedef struct _PARAMETER typedef struct _PARAMETER_ARRAY { + PPARAMETER pCurrentParam; DWORD dwCount; PARAMETER Array[0]; } PARAMETER_ARRAY, *PPARAMETER_ARRAY; @@ -501,9 +503,14 @@ BuildParameterArray( RegCloseKey(hParamKey); } - GetStringValue(hDriverKey, - ParamArray->Array[dwIndex].pszName, - &ParamArray->Array[dwIndex].pszValue); + lError = GetStringValue(hDriverKey, + ParamArray->Array[dwIndex].pszName, + &ParamArray->Array[dwIndex].pszValue); + if ((lError == ERROR_SUCCESS) || + (ParamArray->Array[dwIndex].pszDefault != NULL)) + { + ParamArray->Array[dwIndex].bPresent = TRUE; + } } *ParameterArray = ParamArray; @@ -538,8 +545,10 @@ DisplayParameter( ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), (Parameter->bOptional) ? SW_SHOW : SW_HIDE); if (Parameter->bOptional) { - Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_PRESENT), (Parameter->pszValue) ? BST_UNCHECKED : BST_CHECKED); - Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), (Parameter->pszValue) ? BST_CHECKED : BST_UNCHECKED); + if (Parameter->bPresent) + Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_PRESENT), BST_CHECKED); + else + Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), BST_CHECKED); } switch (Parameter->Type) @@ -548,10 +557,14 @@ DisplayParameter( case LONG_TYPE: case WORD_TYPE: case DWORD_TYPE: - ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN); + EnableWindow(hwndControl, Parameter->bPresent); + ShowWindow(hwndControl, SW_SHOW); + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT); + EnableWindow(hwndControl, Parameter->bPresent); ShowWindow(hwndControl, SW_SHOW); Style = GetWindowLongPtr(hwndControl, GWL_STYLE); @@ -571,6 +584,7 @@ DisplayParameter( ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT); + EnableWindow(hwndControl, Parameter->bPresent); ShowWindow(hwndControl, SW_SHOW); Style = GetWindowLongPtr(hwndControl, GWL_STYLE); @@ -594,6 +608,7 @@ DisplayParameter( ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_HIDE); hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST); + EnableWindow(hwndControl, Parameter->bPresent); ShowWindow(hwndControl, SW_SHOW); ComboBox_ResetContent(hwndControl); @@ -665,7 +680,8 @@ OnInitDialog( if (pParamArray->dwCount > 0) { ListBox_SetCurSel(hwndControl, 0); - DisplayParameter(hwnd, &pParamArray->Array[0]); + pParamArray->pCurrentParam = &pParamArray->Array[0]; + DisplayParameter(hwnd, pParamArray->pCurrentParam); } } @@ -697,9 +713,24 @@ OnCommand( iIndex = ListBox_GetCurSel((HWND)lParam); if (iIndex != LB_ERR && iIndex < pParamArray->dwCount) { - DisplayParameter(hwnd, &pParamArray->Array[iIndex]); + pParamArray->pCurrentParam = &pParamArray->Array[iIndex]; + DisplayParameter(hwnd, pParamArray->pCurrentParam); } } + else if ((LOWORD(wParam) == IDC_PROPERTY_PRESENT) && (HIWORD(wParam) == BN_CLICKED)) + { + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), TRUE); + pParamArray->pCurrentParam->bPresent = TRUE; + } + else if ((LOWORD(wParam) == IDC_PROPERTY_NOT_PRESENT) && (HIWORD(wParam) == BN_CLICKED)) + { + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), FALSE); + pParamArray->pCurrentParam->bPresent = FALSE; + } }

1 0

01/01: [KMTESTS:CC] A pin BCB has a node type code
by Pierre Schweitzer 06 Oct '18

06 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d90b4dd5f899ab2653f4… commit 0d90b4dd5f899ab2653f4fb1b56764af30deacc3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 6 12:08:25 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 6 12:09:07 2018 +0200 [KMTESTS:CC] A pin BCB has a node type code --- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 0295378615..26ae0edf8c 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -172,6 +172,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, TestContext->Buffer); @@ -184,6 +185,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, TestContext->Buffer); @@ -196,6 +198,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, TestContext->Buffer); @@ -223,6 +226,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); @@ -235,6 +239,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); @@ -247,6 +252,7 @@ PinInAnotherThread(IN PVOID Context) if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); @@ -387,6 +393,7 @@ PerformTest( if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_ulong(Buffer[(0x3000 - TestId * 0x1000) / sizeof(ULONG)], 0xDEADBABE); CcUnpinData(Bcb); @@ -420,6 +427,8 @@ PerformTest( { PKTHREAD ThreadHandle; + ok(*(PUSHORT)TestContext->Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)TestContext->Bcb); + #ifdef _X86_ /* FIXME: Should be fixed, will fail under certains conditions */ ok(TestContext->Buffer > (PVOID)0xC1000000 && TestContext->Buffer < (PVOID)0xDCFFFFFF, @@ -432,7 +441,6 @@ PerformTest( skip(FALSE, "System space mapping not defined\n"); #endif #endif - TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; ThreadHandle = KmtStartThread(PinInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL); @@ -452,6 +460,8 @@ PerformTest( { PKTHREAD ThreadHandle; + ok(*(PUSHORT)TestContext->Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)TestContext->Bcb); + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; ThreadHandle = KmtStartThread(PinInAnotherThreadExclusive, TestContext); KmtFinishThread(ThreadHandle, NULL); @@ -472,6 +482,7 @@ PerformTest( if (!skip(Ret == TRUE, "CcPinRead failed\n")) { + ok(*(PUSHORT)Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)Bcb); ok_eq_ulong(Buffer[0x2000 / sizeof(ULONG)], 0); CcUnpinData(Bcb);

1 0

01/01: [MSPORTS] When the LPT port number gets changed, update the PortName and FriendlyName values in the registry.
by Eric Kohl 06 Oct '18

06 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c603c54ab00fc3064526d… commit c603c54ab00fc3064526dd64f3c0dfbfd44fbc42 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 6 11:11:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 6 11:12:16 2018 +0200 [MSPORTS] When the LPT port number gets changed, update the PortName and FriendlyName values in the registry. --- dll/win32/msports/parallel.c | 94 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index 076bb20d44..b06fd9eef6 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -159,6 +159,89 @@ ReadPortSettings( } +static +DWORD +ChangePortNumber( + _In_ PPORT_DATA pPortData, + _In_ DWORD dwNewPortNumber) +{ + WCHAR szDeviceDescription[256]; + WCHAR szFriendlyName[256]; + WCHAR szNewPortName[16]; + HKEY hDeviceKey = INVALID_HANDLE_VALUE; + DWORD dwError; + + /* We are done if old and new port number are the same */ + if (pPortData->dwPortNumber == dwNewPortNumber) + return ERROR_SUCCESS; + + /* Build the new port name */ + swprintf(szNewPortName, L"LPT%lu", dwNewPortNumber); + + /* Open the devices hardware key */ + hDeviceKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_READ | KEY_WRITE); + if (hDeviceKey == INVALID_HANDLE_VALUE) + { + return GetLastError(); + } + + /* Set the new 'PortName' value */ + dwError = RegSetValueExW(hDeviceKey, + L"PortName", + 0, + REG_SZ, + (LPBYTE)szNewPortName, + (wcslen(szNewPortName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Save the new port name and number */ + wcscpy(pPortData->szPortName, szNewPortName); + pPortData->dwPortNumber = dwNewPortNumber; + + /* Get the device description... */ + if (SetupDiGetDeviceRegistryProperty(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + SPDRP_DEVICEDESC, + NULL, + (PBYTE)szDeviceDescription, + sizeof(szDeviceDescription), + NULL)) + { + /* ... and use it to build a new friendly name */ + swprintf(szFriendlyName, + L"%s (%s)", + szDeviceDescription, + szNewPortName); + } + else + { + /* ... or build a generic friendly name */ + swprintf(szFriendlyName, + L"Parallel Port (%s)", + szNewPortName); + } + + /* Set the friendly name for the device */ + SetupDiSetDeviceRegistryProperty(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + SPDRP_FRIENDLYNAME, + (PBYTE)szFriendlyName, + (wcslen(szFriendlyName) + 1) * sizeof(WCHAR)); + +done: + if (hDeviceKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDeviceKey); + + return dwError; +} + + static VOID WritePortSettings( @@ -169,6 +252,7 @@ WritePortSettings( DWORD dwFilterResourceMethod; DWORD dwLegacy; DWORD dwPortNumber; + DWORD dwPortMap; HKEY hKey; DWORD dwError; @@ -248,10 +332,16 @@ WritePortSettings( dwPortNumber++; if (dwPortNumber != pPortData->dwPortNumber) { - FIXME("Port name changed! LPT%lu --> LPT%lu", pPortData->dwPortNumber, dwPortNumber); + GetUsedPorts(&dwPortMap); + if (dwPortMap & 1 << dwPortNumber) + { + ERR("Port LPT%lu is already in use!\n", dwPortNumber); + return; + } -// pPortData->dwPortNumber = dwPortNumber; + ChangePortNumber(pPortData, + dwPortNumber); } } }

1 0

05/05: [KMTESTS:CC] Fix a typo
by Pierre Schweitzer 05 Oct '18

05 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52ccfcf6febd4cdc2088d… commit 52ccfcf6febd4cdc2088dc3e924e07413a494b88 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Oct 5 21:25:28 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 5 21:26:16 2018 +0200 [KMTESTS:CC] Fix a typo --- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index d827766fc5..0295378615 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -486,7 +486,7 @@ PerformTest( KmtStartSeh(); Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - ok(Ret == FALSE, "CcMapData succeed\n"); + ok(Ret == FALSE, "CcPinRead succeed\n"); if (Ret) {

1 0

04/05: [NTOSKRNL] Implement support for PIN_IF_BCB flag
by Pierre Schweitzer 05 Oct '18

05 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd39459f89da7e5031b2b… commit bd39459f89da7e5031b2b30266521df362759e52 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Oct 5 21:17:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 5 21:26:16 2018 +0200 [NTOSKRNL] Implement support for PIN_IF_BCB flag --- ntoskrnl/cc/pin.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index f40405e6c5..3e89cacddf 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -329,6 +329,12 @@ CcPinRead ( if (iBcb == NULL) { + /* We failed to find an already existing BCB */ + if (BooleanFlagOn(Flags, PIN_IF_BCB)) + { + return FALSE; + } + /* Map first */ if (!CcpMapData(SharedCacheMap, FileOffset, Length, Flags, Bcb, Buffer)) {

1 0

03/05: [NTOSKRNL] When pinning data, try to find an already pinned BCB
by Pierre Schweitzer 05 Oct '18

05 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fd2751c873a59f449b7f… commit 7fd2751c873a59f449b7f3421bdb17488f53253e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Oct 5 21:14:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 5 21:26:16 2018 +0200 [NTOSKRNL] When pinning data, try to find an already pinned BCB If found, attempt to lock it and return it. This fixes a lot of CcPinRead tests (and seems to speed up a bit ReactOS) --- ntoskrnl/cc/pin.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 0d23211da9..f40405e6c5 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -299,6 +299,9 @@ CcPinRead ( OUT PVOID * Bcb, OUT PVOID * Buffer) { + KIRQL OldIrql; + BOOLEAN Result; + PINTERNAL_BCB iBcb; PROS_SHARED_CACHE_MAP SharedCacheMap; CCTRACE(CC_API_DEBUG, "FileOffset=%p FileOffset=%p Length=%lu Flags=0x%lx\n", @@ -320,17 +323,47 @@ CcPinRead ( ++CcPinReadNoWait; } - /* Map first */ - if (!CcpMapData(SharedCacheMap, FileOffset, Length, Flags, Bcb, Buffer)) + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + iBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, TRUE); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + + if (iBcb == NULL) { - return FALSE; - } + /* Map first */ + if (!CcpMapData(SharedCacheMap, FileOffset, Length, Flags, Bcb, Buffer)) + { + return FALSE; + } - /* Pin then */ - if (!CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) + /* Pin then */ + if (!CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) + { + CcUnpinData(*Bcb); + return FALSE; + } + } + /* We found a BCB, lock it and return it */ + else { - CcUnpinData(*Bcb); - return FALSE; + if (BooleanFlagOn(Flags, PIN_EXCLUSIVE)) + { + Result = ExAcquireResourceExclusiveLite(&iBcb->Lock, BooleanFlagOn(Flags, PIN_WAIT)); + } + else + { + Result = ExAcquireSharedStarveExclusive(&iBcb->Lock, BooleanFlagOn(Flags, PIN_WAIT)); + } + + if (!Result) + { + return FALSE; + } + + ++iBcb->PinCount; + ++iBcb->RefCount; + + *Bcb = iBcb; + *Buffer = (PUCHAR)iBcb->Vacb->BaseAddress + FileOffset->QuadPart % VACB_MAPPING_GRANULARITY; } return TRUE;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
36
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 October 2018