Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

02/05: [UDMIHELP] Initialize output buffer if DMI string is NULL
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bae6e075e0412d0a32769… commit bae6e075e0412d0a32769aad6041c48bcf60b517 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Aug 15 20:43:01 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:11:08 2018 +0300 [UDMIHELP] Initialize output buffer if DMI string is NULL --- sdk/lib/udmihelp/udmihelp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/lib/udmihelp/udmihelp.c b/sdk/lib/udmihelp/udmihelp.c index a7070eb33d..4b9695c4f2 100644 --- a/sdk/lib/udmihelp/udmihelp.c +++ b/sdk/lib/udmihelp/udmihelp.c @@ -151,7 +151,13 @@ GetSMBiosStringW( SIZE_T cChars; if (!DmiString) + { + if (cchBuf >= 1) + { + *pBuf = 0; + } return 0; + } cChars = MultiByteToWideChar(CP_OEMCP, 0, DmiString, -1, pBuf, cchBuf);

1 0

01/05: [DMILIB] Process SKU and Family strings
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3568045502799c90da5f… commit c3568045502799c90da5f258e4d31c99995cc347 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 27 22:02:17 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:10:48 2018 +0300 [DMILIB] Process SKU and Family strings --- sdk/lib/dmilib/dmi.h | 2 ++ sdk/lib/dmilib/dmilib.c | 2 ++ sdk/lib/dmilib/dmilib.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sdk/lib/dmilib/dmi.h b/sdk/lib/dmilib/dmi.h index 855b69703e..07dfc5dd0f 100644 --- a/sdk/lib/dmilib/dmi.h +++ b/sdk/lib/dmilib/dmi.h @@ -87,6 +87,8 @@ enum _DMI_FIELD_OFFSETS DMI_SYS_PRODUCT = 0x05, DMI_SYS_VERSION = 0x06, DMI_SYS_SERIAL = 0x07, + DMI_SYS_SKU = 0x19, + DMI_SYS_FAMILY = 0x1a, DMI_SYS_SIZE = 0x1b, /* Type = 2: DMI_ENTRY_BASEBOARD */ diff --git a/sdk/lib/dmilib/dmilib.c b/sdk/lib/dmilib/dmilib.c index 7571fcaf71..e7469befc5 100644 --- a/sdk/lib/dmilib/dmilib.c +++ b/sdk/lib/dmilib/dmilib.c @@ -73,6 +73,8 @@ ParseSMBiosTables( Strings[SYS_PRODUCT] = GetDmiString(Header, DMI_SYS_PRODUCT); Strings[SYS_VERSION] = GetDmiString(Header, DMI_SYS_VERSION); Strings[SYS_SERIAL] = GetDmiString(Header, DMI_SYS_SERIAL); + Strings[SYS_SKU] = GetDmiString(Header, DMI_SYS_SKU); + Strings[SYS_FAMILY] = GetDmiString(Header, DMI_SYS_FAMILY); break; case DMI_ENTRY_BASEBOARD: diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h index 22f2331725..9bfcf5f507 100644 --- a/sdk/lib/dmilib/dmilib.h +++ b/sdk/lib/dmilib/dmilib.h @@ -18,6 +18,8 @@ enum _ID_STRINGS SYS_PRODUCT, SYS_VERSION, SYS_SERIAL, + SYS_SKU, + SYS_FAMILY, BOARD_VENDOR, BOARD_NAME, BOARD_VERSION,

1 0

01/01: [MSPORTS] Implement the 'Filter Resource Method' setting for parallel ports
by Eric Kohl 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=133611fed8d99cf0de81e… commit 133611fed8d99cf0de81eb1532008894973a4e09 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 14:58:55 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 14:58:55 2018 +0200 [MSPORTS] Implement the 'Filter Resource Method' setting for parallel ports --- dll/win32/msports/parallel.c | 235 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 230 insertions(+), 5 deletions(-) diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index 864c22576b..e50d358ac7 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -8,17 +8,222 @@ #include "precomp.h" +typedef struct _PORT_DATA +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + + WCHAR szPortName[16]; + DWORD dwFilterResourceMethod; +} PORT_DATA, *PPORT_DATA; + + +static +VOID +ReadPortSettings( + PPORT_DATA pPortData) +{ + DWORD dwSize; + HKEY hKey; + LONG lError; + + TRACE("ReadPortSettings(%p)\n", pPortData); + + pPortData->dwFilterResourceMethod = 1; /* Never use an interrupt */ + + 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); + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + } + + dwSize = sizeof(pPortData->dwFilterResourceMethod); + lError = RegQueryValueExW(hKey, + L"FilterResourceMethod", + NULL, + NULL, + (PBYTE)&pPortData->dwFilterResourceMethod, + &dwSize); + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + } + + RegCloseKey(hKey); +} + + +static +VOID +WritePortSettings( + HWND hwnd, + PPORT_DATA pPortData) +{ + DWORD dwFilterResourceMethod; + HKEY hKey; + LONG lError; + + TRACE("WritePortSettings(%p)\n", pPortData); + + dwFilterResourceMethod = 1; + if (Button_GetCheck(GetDlgItem(hwnd, IDC_TRY_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 0; + else if (Button_GetCheck(GetDlgItem(hwnd, IDC_NEVER_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 1; + else if (Button_GetCheck(GetDlgItem(hwnd, IDC_ANY_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 2; + + if (dwFilterResourceMethod != pPortData->dwFilterResourceMethod) + { + hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_WRITE); + if (hKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return; + } + + lError = RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (PBYTE)&dwFilterResourceMethod, + sizeof(dwFilterResourceMethod)); + if (lError != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed (Error %lu)\n", lError); + } + + RegCloseKey(hKey); + + pPortData->dwFilterResourceMethod = dwFilterResourceMethod; + } + +} + + static BOOL OnInitDialog(HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("Port_OnInit()\n"); + PPORT_DATA pPortData; + HWND hwndControl; + WCHAR szBuffer[256]; + UINT i; + + 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); + + /* Set the 'Filter Resource Method' radiobuttons */ + hwndControl = GetDlgItem(hwnd, + IDC_TRY_INTERRUPT + pPortData->dwFilterResourceMethod); + if (hwndControl) + Button_SetCheck(hwndControl, BST_CHECKED); + + /* Disable the 'Enable legacy PNP detection' checkbox */ + hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_LEGACY); + EnableWindow(hwndControl, FALSE); + + /* Fill the 'LPT Port Number' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_NAME); + if (hwndControl) + { + for (i = 0; i < 3; i++) + { + swprintf(szBuffer, L"LPT%lu", i + 1); + ComboBox_AddString(hwndControl, szBuffer); + } + + /* Disable it */ + EnableWindow(hwndControl, FALSE); + } + return TRUE; } +static +VOID +OnNotify( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPORT_DATA pPortData; + + TRACE("OnNotify()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + TRACE("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 @@ -32,8 +237,15 @@ ParallelSettingsDlgProc(HWND hwnd, switch (uMsg) { case WM_INITDIALOG: - SendDlgItemMessage(hwnd, IDC_NEVER_INTERRUPT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); return OnInitDialog(hwnd, wParam, lParam); + + case WM_NOTIFY: + OnNotify(hwnd, wParam, lParam); + break; + + case WM_DESTROY: + OnDestroy(hwnd); + break; } return FALSE; @@ -48,10 +260,23 @@ ParallelPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, { PROPSHEETPAGEW PropSheetPage; HPROPSHEETPAGE hPropSheetPage; + PPORT_DATA pPortData; TRACE("ParallelPortPropPageProvider(%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) { TRACE("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); @@ -61,19 +286,19 @@ ParallelPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, PropSheetPage.hInstance = hInstance; PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_PARALLELSETTINGS); PropSheetPage.pfnDlgProc = ParallelSettingsDlgProc; - PropSheetPage.lParam = 0; + PropSheetPage.lParam = (LPARAM)pPortData; PropSheetPage.pfnCallback = NULL; hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); if (hPropSheetPage == NULL) { - TRACE("CreatePropertySheetPageW() failed!\n"); + ERR("CreatePropertySheetPageW() failed!\n"); return FALSE; } if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) { - TRACE("lpfnAddPropSheetPageProc() failed!\n"); + ERR("lpfnAddPropSheetPageProc() failed!\n"); DestroyPropertySheetPage(hPropSheetPage); return FALSE; }

1 0

01/01: [DEVCPUX] Add French translation
by Pierre Schweitzer 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f85e4fe9f7c43db0ffe0… commit 1f85e4fe9f7c43db0ffe0a257599bd4100c8737b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 29 11:36:45 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 29 11:36:45 2018 +0200 [DEVCPUX] Add French translation --- dll/shellext/devcpux/lang/fr-FR.rc | 41 ++++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 3 +++ 2 files changed, 44 insertions(+) diff --git a/dll/shellext/devcpux/lang/fr-FR.rc b/dll/shellext/devcpux/lang/fr-FR.rc new file mode 100644 index 0000000000..c2b565e694 --- /dev/null +++ b/dll/shellext/devcpux/lang/fr-FR.rc @@ -0,0 +1,41 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Processeur" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fonctionnalités :", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "Modèle :", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "Révision :", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "Fréquence :", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "<test>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "Model:", -1, 7, 49, 50, 8 + LTEXT "<test>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "Stepping:", -1, 7, 75, 50, 8 + LTEXT "<test>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "Core Speed:", -1, 7, 101, 50, 8 + LTEXT "<test>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 0771485902..3ee900eb9d 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif

1 0

01/01: [NTOSKRNL] Reference the file object before issuing the unlock all IRP
by Pierre Schweitzer 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=207ff9444e946e3736f34… commit 207ff9444e946e3736f34ef6eaf32ab065cf8ca9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 29 11:21:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 29 11:22:22 2018 +0200 [NTOSKRNL] Reference the file object before issuing the unlock all IRP This fixes the last kmode assert triggered by httpd on ReactOS. CORE-12045 --- ntoskrnl/io/iomgr/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 8e3b626cdf..e7633a331f 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1985,6 +1985,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, Irp->RequestorMode = KernelMode; Irp->Flags = IRP_SYNCHRONOUS_API; Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + ObReferenceObject(FileObject); /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp);

1 0

01/01: [msports] Notify the system of changes to the serial port settings.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f155de483f53429d7f138… commit f155de483f53429d7f13802740adf55cde000e85 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 01:57:59 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 01:57:59 2018 +0200 [msports] Notify the system of changes to the serial port settings. --- dll/win32/msports/serial.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/msports/serial.c b/dll/win32/msports/serial.c index b248072a30..768fedf604 100644 --- a/dll/win32/msports/serial.c +++ b/dll/win32/msports/serial.c @@ -323,6 +323,12 @@ WritePortSettings( return; } + /* Notify the system */ + PostMessageW(HWND_BROADCAST, + WM_WININICHANGE, + 0, + (LPARAM)pPortData->szPortName); + TRACE("Done!\n"); }

1 0

01/01: [SERVICES] Control set code clean-up
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f939e057c23e1585acab… commit 8f939e057c23e1585acab1b2f4d08bf7bf549a58 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 01:31:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 01:31:58 2018 +0200 [SERVICES] Control set code clean-up - Flush the new control set after the control set has been created. - Make sure that we create a new control set only on the first boot after setup. - Move the control set copy code to a separate function. - Get rid of the global control set values. --- base/system/services/controlset.c | 272 +++++++++++++++++++++----------------- base/system/services/services.c | 7 +- base/system/services/services.h | 4 +- 3 files changed, 157 insertions(+), 126 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index 948f3ddc79..6cd74204c0 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -17,24 +17,16 @@ /* GLOBALS *******************************************************************/ -static DWORD dwCurrentControlSet; -static DWORD dwDefaultControlSet; -static DWORD dwFailedControlSet; -static DWORD dwLastKnownGoodControlSet; - /* FUNCTIONS *****************************************************************/ +#if (_WIN32_WINNT < 0x0600) static DWORD -ScmCopyKey(HKEY hDstKey, - HKEY hSrcKey) +ScmCopyTree( + HKEY hSrcKey, + HKEY hDstKey) { -#if (_WIN32_WINNT >= 0x0600) - return RegCopyTreeW(hSrcKey, - NULL, - hDstKey); -#else FILETIME LastWrite; DWORD dwSubKeys; DWORD dwValues; @@ -53,7 +45,7 @@ ScmCopyKey(HKEY hDstKey, HKEY hSrcSubKey; DWORD dwError; - DPRINT("ScmCopyKey()\n"); + DPRINT("ScmCopyTree()\n"); dwError = RegQueryInfoKey(hSrcKey, NULL, @@ -147,8 +139,8 @@ ScmCopyKey(HKEY hDstKey, return dwError; } - dwError = ScmCopyKey(hDstSubKey, - hSrcSubKey); + dwError = ScmCopyTree(hSrcSubKey, + hDstSubKey); if (dwError != ERROR_SUCCESS) { DPRINT1("Error: %lu\n", dwError); @@ -245,89 +237,93 @@ ScmCopyKey(HKEY hDstKey, lpNameBuffer); } - DPRINT("ScmCopyKey() done \n"); + DPRINT("ScmCopyTree() done \n"); return ERROR_SUCCESS; -#endif } +#endif static -BOOL -ScmGetControlSetValues(VOID) +DWORD +ScmGetControlSetValues( + PDWORD pdwCurrentControlSet, + PDWORD pdwDefaultControlSet, + PDWORD pdwFailedControlSet, + PDWORD pdwLastKnownGoodControlSet) { HKEY hSelectKey; DWORD dwType; DWORD dwSize; - LONG lError; + DWORD dwError; DPRINT("ScmGetControlSetValues() called\n"); - lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\Select", - 0, - KEY_READ, - &hSelectKey); - if (lError != ERROR_SUCCESS) - return FALSE; + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\Select", + 0, + KEY_READ, + &hSelectKey); + if (dwError != ERROR_SUCCESS) + return dwError; dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Current", - 0, - &dwType, - (LPBYTE)&dwCurrentControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Current", + 0, + &dwType, + (LPBYTE)pdwCurrentControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwCurrentControlSet = 0; + *pdwCurrentControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Default", - 0, - &dwType, - (LPBYTE)&dwDefaultControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Default", + 0, + &dwType, + (LPBYTE)pdwDefaultControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwDefaultControlSet = 0; + *pdwDefaultControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Failed", - 0, - &dwType, - (LPBYTE)&dwFailedControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Failed", + 0, + &dwType, + (LPBYTE)pdwFailedControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwFailedControlSet = 0; + *pdwFailedControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"LastKnownGood", - 0, - &dwType, - (LPBYTE)&dwLastKnownGoodControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"LastKnownGood", + 0, + &dwType, + (LPBYTE)pdwLastKnownGoodControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwLastKnownGoodControlSet = 0; + *pdwLastKnownGoodControlSet = 0; } RegCloseKey(hSelectKey); DPRINT("ControlSets:\n"); - DPRINT("Current: %lu\n", dwCurrentControlSet); - DPRINT("Default: %lu\n", dwDefaultControlSet); - DPRINT("Failed: %lu\n", dwFailedControlSet); - DPRINT("LastKnownGood: %lu\n", dwLastKnownGoodControlSet); + DPRINT("Current: %lu\n", *pdwCurrentControlSet); + DPRINT("Default: %lu\n", *pdwDefaultControlSet); + DPRINT("Failed: %lu\n", *pdwFailedControlSet); + DPRINT("LastKnownGood: %lu\n", *pdwLastKnownGoodControlSet); - return TRUE; + return dwError; } @@ -354,6 +350,7 @@ ScmSetLastKnownGoodControlSet( (LPBYTE)&dwControlSet, sizeof(dwControlSet)); + RegFlushKey(hSelectKey); RegCloseKey(hSelectKey); return dwError; @@ -396,91 +393,124 @@ ScmGetSetupInProgress(VOID) } -BOOL -ScmUpdateControlSets(VOID) +static +DWORD +ScmCopyControlSet( + DWORD dwSourceControlSet, + DWORD dwDestinationControlSet) { - WCHAR szCurrentControlSetName[32]; - WCHAR szNewControlSetName[32]; - HKEY hCurrentControlSetKey = NULL; - HKEY hNewControlSetKey = NULL; - DWORD dwNewControlSet, dwDisposition; + WCHAR szSourceControlSetName[32]; + WCHAR szDestinationControlSetName[32]; + HKEY hSourceControlSetKey = NULL; + HKEY hDestinationControlSetKey = NULL; + DWORD dwDisposition; DWORD dwError; - /* Do not create a new control set when the system setup is running */ - if (ScmGetSetupInProgress() != 0) - { - DPRINT1("No new control set because we are in setup mode!\n"); - return TRUE; - } - - /* Get the control set values */ - if (!ScmGetControlSetValues()) - return FALSE; - - /* Search for a new control set number */ - for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) - { - if ((dwNewControlSet != dwCurrentControlSet) && - (dwNewControlSet != dwDefaultControlSet) && - (dwNewControlSet != dwFailedControlSet) && - (dwNewControlSet != dwLastKnownGoodControlSet)) - break; - } - - /* Fail if we did not find an unused control set!*/ - if (dwNewControlSet >= 1000) - { - DPRINT1("Too many control sets!\n"); - return FALSE; - } - - /* Create the current control set name */ - swprintf(szCurrentControlSetName, L"SYSTEM\\ControlSet%03lu", dwCurrentControlSet); - DPRINT("Current control set: %S\n", szCurrentControlSetName); + /* Create the source control set name */ + swprintf(szSourceControlSetName, L"SYSTEM\\ControlSet%03lu", dwSourceControlSet); + DPRINT("Source control set: %S\n", szSourceControlSetName); - /* Create the new control set name */ - swprintf(szNewControlSetName, L"SYSTEM\\ControlSet%03lu", dwNewControlSet); - DPRINT("New control set: %S\n", szNewControlSetName); + /* Create the destination control set name */ + swprintf(szDestinationControlSetName, L"SYSTEM\\ControlSet%03lu", dwDestinationControlSet); + DPRINT("Destination control set: %S\n", szDestinationControlSetName); - /* Open the current control set key */ + /* Open the source control set key */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - szCurrentControlSetName, + szSourceControlSetName, 0, KEY_READ, - &hCurrentControlSetKey); + &hSourceControlSetKey); if (dwError != ERROR_SUCCESS) goto done; - /* Create the new control set key */ + /* Create the destination control set key */ dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, - szNewControlSetName, + szDestinationControlSetName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, - &hNewControlSetKey, + &hDestinationControlSetKey, &dwDisposition); if (dwError != ERROR_SUCCESS) goto done; - /* Copy the current control set to the new control set */ - dwError = ScmCopyKey(hNewControlSetKey, - hCurrentControlSetKey); + /* Copy the source control set to the destination control set */ +#if (_WIN32_WINNT >= 0x0600) + dwError = RegCopyTreeW(hSourceControlSetKey, + NULL, + hDestinationControlSetKey); +#else + dwError = ScmCopyTree(hSourceControlSetKey, + hDestinationControlSetKey); +#endif if (dwError != ERROR_SUCCESS) goto done; - /* Set the new 'LastKnownGood' control set */ - dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + RegFlushKey(hDestinationControlSetKey); done: - if (hNewControlSetKey != NULL) - RegCloseKey(hNewControlSetKey); + if (hDestinationControlSetKey != NULL) + RegCloseKey(hDestinationControlSetKey); + + if (hSourceControlSetKey != NULL) + RegCloseKey(hSourceControlSetKey); + + return dwError; +} + + +DWORD +ScmCreateLastKnownGoodControlSet(VOID) +{ + DWORD dwCurrentControlSet, dwDefaultControlSet; + DWORD dwFailedControlSet, dwLastKnownGoodControlSet; + DWORD dwNewControlSet; + DWORD dwError; + + /* Get the control set values */ + dwError = ScmGetControlSetValues(&dwCurrentControlSet, + &dwDefaultControlSet, + &dwFailedControlSet, + &dwLastKnownGoodControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* First boot after setup? */ + if ((ScmGetSetupInProgress() == 0) && + (dwCurrentControlSet == dwLastKnownGoodControlSet)) + { + DPRINT("First boot after setup!\n"); + + /* Search for a new control set number */ + for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) + { + if ((dwNewControlSet != dwCurrentControlSet) && + (dwNewControlSet != dwDefaultControlSet) && + (dwNewControlSet != dwFailedControlSet) && + (dwNewControlSet != dwLastKnownGoodControlSet)) + break; + } + + /* Fail if we did not find an unused control set!*/ + if (dwNewControlSet >= 1000) + { + DPRINT1("Too many control sets!\n"); + return ERROR_NO_MORE_ITEMS; + } + + /* Copy the current control set */ + dwError = ScmCopyControlSet(dwCurrentControlSet, + dwNewControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; - if (hCurrentControlSetKey != NULL) - RegCloseKey(hCurrentControlSetKey); + /* Set the new 'LastKnownGood' control set */ + dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + } - return (dwError == ERROR_SUCCESS); + return dwError; } /* EOF */ diff --git a/base/system/services/services.c b/base/system/services/services.c index 591c5a7062..75bfeeb195 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -178,10 +178,11 @@ wWinMain(HINSTANCE hInstance, /* FIXME: more initialization */ - /* Update the control sets */ - if (!ScmUpdateControlSets()) + /* Create the 'Last Known Good' control set */ + dwError = ScmCreateLastKnownGoodControlSet(); + if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: Failed to update the control sets\n"); + DPRINT1("SERVICES: Failed to create the 'Last Known Good' control set (Error %lu)\n", dwError); goto done; } diff --git a/base/system/services/services.h b/base/system/services/services.h index 57c873d670..74943372c6 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -159,8 +159,8 @@ ScmDecryptPassword( /* controlset.c */ -BOOL -ScmUpdateControlSets(VOID); +DWORD +ScmCreateLastKnownGoodControlSet(VOID); /* database.c */

1 0

01/01: [NTOSKRNL] Unlock file if required on last process handle close
by Pierre Schweitzer 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5472c1db82570a1ecd928… commit 5472c1db82570a1ecd928c8c617320ee12ebfe15 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 28 23:34:28 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 28 23:34:28 2018 +0200 [NTOSKRNL] Unlock file if required on last process handle close --- ntoskrnl/io/iomgr/file.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 15504adaca..8e3b626cdf 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1938,6 +1938,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, NTSTATUS Status; PDEVICE_OBJECT DeviceObject; KIRQL OldIrql; + IO_STATUS_BLOCK IoStatusBlock; IOTRACE(IO_FILE_DEBUG, "ObjectBody: %p\n", ObjectBody); /* If this isn't the last handle for the current process, quit */ @@ -1946,8 +1947,70 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, /* Check if the file is locked and has more then one handle opened */ if ((FileObject->LockOperation) && (SystemHandleCount != 1)) { - DPRINT1("We need to unlock this file!\n"); - ASSERT(FALSE); + /* Check if this is a direct open or not */ + if (BooleanFlagOn(FileObject->Flags, FO_DIRECT_DEVICE_OPEN)) + { + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + /* Get the FO's device */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if this is a sync FO and lock it */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopLockFileObject(FileObject); + } + + /* Go the FastIO path if possible, otherwise fall back to IRP */ + if (DeviceObject->DriverObject->FastIoDispatch == NULL || + DeviceObject->DriverObject->FastIoDispatch->FastIoUnlockAll == NULL || + !DeviceObject->DriverObject->FastIoDispatch->FastIoUnlockAll(FileObject, PsGetCurrentProcess(), &IoStatusBlock, DeviceObject)) + { + /* Clear and set up Events */ + KeClearEvent(&FileObject->Event); + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Allocate an IRP */ + Irp = IopAllocateIrpMustSucceed(DeviceObject->StackSize); + + /* Set it up */ + Irp->UserEvent = &Event; + Irp->UserIosb = &Irp->IoStatus; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Flags = IRP_SYNCHRONOUS_API; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + + /* Set up Stack Pointer Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; + StackPtr->MinorFunction = IRP_MN_UNLOCK_ALL; + StackPtr->FileObject = FileObject; + + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Call the FS Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); + } + + /* IO will unqueue & free for us */ + } + + /* Release the lock if we were holding it */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopUnlockFileObject(FileObject); + } } /* Make sure this is the last handle */

1 0

01/01: [SERVICES] RChangeServiceConfigW / RCreateServiceW: Use SecureZeroMemory to wipe clear-text passwords after use.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04683639f06a6e8d46694… commit 04683639f06a6e8d4669448e2c583f3c885e8efa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 17:51:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 17:51:12 2018 +0200 [SERVICES] RChangeServiceConfigW / RCreateServiceW: Use SecureZeroMemory to wipe clear-text passwords after use. --- base/system/services/rpcserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index f21df10e57..7f251c8760 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2244,8 +2244,8 @@ done: if (lpClearTextPassword != NULL) { /* Wipe and release the password buffer */ - ZeroMemory(lpClearTextPassword, - (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpClearTextPassword); } @@ -2648,8 +2648,8 @@ done: if (lpClearTextPassword != NULL) { /* Wipe and release the password buffer */ - ZeroMemory(lpClearTextPassword, - (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpClearTextPassword); }

1 0

01/01: [SERVICES] Fixed a missing comma
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9aeb5bfbd6f3a558cca1… commit b9aeb5bfbd6f3a558cca13260d467b3db250844d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 17:29:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 17:29:31 2018 +0200 [SERVICES] Fixed a missing comma --- base/system/services/services.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/services/services.h b/base/system/services/services.h index cbbf6eb008..57c873d670 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -160,7 +160,7 @@ ScmDecryptPassword( /* controlset.c */ BOOL -ScmUpdateControlSets(VOID) +ScmUpdateControlSets(VOID); /* database.c */

1 0

← Newer
1
2
3
4
5
6
7
8
...
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