Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 01/01: [UMPNPMGR] Add checks to PNP_GetRelatedDeviceInstance

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cc5163bfa5972597bc28… commit 7cc5163bfa5972597bc2827393626e880b8ec311 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 17 13:52:59 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 17 13:52:59 2022 +0200 [UMPNPMGR] Add checks to PNP_GetRelatedDeviceInstance PNP_GetRelatedDeviceInstance must fail if we try to retrieve the parent or a sibling of the root device. --- base/services/umpnpmgr/rpcserver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 34bdf848966..470a9b67622 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -781,6 +781,14 @@ PNP_GetRelatedDeviceInstance( if (!IsValidDeviceInstanceID(pDeviceID)) return CR_INVALID_DEVINST; + /* The root device does not have a parent device or sibling devices */ + if ((ulRelationship == PNP_GET_PARENT_DEVICE_INSTANCE) || + (ulRelationship == PNP_GET_SIBLING_DEVICE_INSTANCE)) + { + if (IsRootDeviceInstanceID(pDeviceID)) + return CR_NO_SUCH_DEVINST; + } + RtlInitUnicodeString(&PlugPlayData.TargetDeviceInstance, pDeviceID);

2 years, 8 months

[reactos] 01/01: [WIN32SS] Rewrite LDEVOBJ reference counting

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1744b01ad9e41e57e6450… commit 1744b01ad9e41e57e6450badedeab175166bfac3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 09:42:23 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 17 08:48:33 2022 +0200 [WIN32SS] Rewrite LDEVOBJ reference counting - introduce LDEVOBJ_vDisableDriver (reversal of LDEVOBJ_bEnableDriver) - introduce LDEVOBJ_bUnloadImage (reversal of LDEVOBJ_pLoadDriver) - introduce LDEVOBJ_vDereference, to remove a reference to a LDEVOBJ Also: - correctly handle success to unload the image, by removing it from pldev list - correctly handle failure to unload the image, by re-enabling the driver - simplify EngUnloadImage, as a wrapper around LDEVOBJ_vDereference - move LDEVOBJ_ulGetDriverModes lower to prevent forward declaration of LDEVOBJ_vDereference Unfortunately, disable driver unloading as long as ntoskrnl can't reload a driver it just unloaded... --- win32ss/gdi/eng/ldevobj.c | 244 +++++++++++++++++++++++++++------------------- 1 file changed, 146 insertions(+), 98 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 6321c8ad88d..03b9223e4a9 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -160,37 +160,6 @@ LDEVOBJ_bLoadImage( return TRUE; } -static -VOID -LDEVOBJ_vUnloadImage( - _Inout_ PLDEVOBJ pldev) -{ - NTSTATUS Status; - - /* Make sure we have a driver info */ - ASSERT(pldev && pldev->pGdiDriverInfo != NULL); - - /* Check if we have loaded a driver */ - if (pldev->pfn.DisableDriver) - { - /* Call the unload function */ - pldev->pfn.DisableDriver(); - } - - /* Unload the driver */ - Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, - &pldev->pGdiDriverInfo->SectionPointer, - sizeof(HANDLE)); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to unload the driver, this is bad.\n"); - } - - /* Free the driver info structure */ - ExFreePoolWithTag(pldev->pGdiDriverInfo, GDITAG_LDEV); - pldev->pGdiDriverInfo = NULL; -} - static BOOL LDEVOBJ_bEnableDriver( @@ -200,7 +169,10 @@ LDEVOBJ_bEnableDriver( DRVENABLEDATA ded; ULONG i; + TRACE("LDEVOBJ_bEnableDriver('%wZ')\n", &pldev->pGdiDriverInfo->DriverName); + ASSERT(pldev); + ASSERT(pldev->cRefs == 0); /* Call the drivers DrvEnableDriver function */ RtlZeroMemory(&ded, sizeof(ded)); @@ -223,58 +195,21 @@ LDEVOBJ_bEnableDriver( return TRUE; } -ULONG -LDEVOBJ_ulGetDriverModes( - _In_ LPWSTR pwszDriverName, - _In_ HANDLE hDriver, - _Out_ PDEVMODEW *ppdm) +static +VOID +LDEVOBJ_vDisableDriver( + _Inout_ PLDEVOBJ pldev) { - PLDEVOBJ pldev = NULL; - ULONG cbSize = 0; - PDEVMODEW pdm = NULL; - - TRACE("LDEVOBJ_ulGetDriverModes('%ls', %p)\n", pwszDriverName, hDriver); - - pldev = LDEVOBJ_pLoadDriver(pwszDriverName, LDEV_DEVICE_DISPLAY); - if (!pldev) - goto cleanup; - - /* Mirror drivers may omit this function */ - if (!pldev->pfn.GetModes) - goto cleanup; - - /* Call the driver to get the required size */ - cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); - if (!cbSize) - { - ERR("DrvGetModes returned 0\n"); - goto cleanup; - } + ASSERT(pldev); + ASSERT(pldev->cRefs == 0); - /* Allocate a buffer for the DEVMODE array */ - pdm = ExAllocatePoolWithTag(PagedPool, cbSize, GDITAG_DEVMODE); - if (!pdm) - { - ERR("Could not allocate devmodeinfo\n"); - goto cleanup; - } + TRACE("LDEVOBJ_vDisableDriver('%wZ')\n", &pldev->pGdiDriverInfo->DriverName); - /* Call the driver again to fill the buffer */ - cbSize = pldev->pfn.GetModes(hDriver, cbSize, pdm); - if (!cbSize) + if (pldev->pfn.DisableDriver) { - /* Could not get modes */ - ERR("DrvrGetModes returned 0 on second call\n"); - ExFreePoolWithTag(pdm, GDITAG_DEVMODE); - pdm = NULL; + /* Call the unload function */ + pldev->pfn.DisableDriver(); } - -cleanup: - if (pldev) - LDEVOBJ_vUnloadImage(pldev); - - *ppdm = pdm; - return cbSize; } static @@ -323,6 +258,41 @@ LDEVOBJ_pvFindImageProcAddress( return pvProcAdress; } +static +BOOL +LDEVOBJ_bUnloadImage( + _Inout_ PLDEVOBJ pldev) +{ + NTSTATUS Status; + + /* Make sure we have a driver info */ + ASSERT(pldev && pldev->pGdiDriverInfo != NULL); + ASSERT(pldev->cRefs == 0); + + TRACE("LDEVOBJ_bUnloadImage('%wZ')\n", &pldev->pGdiDriverInfo->DriverName); + + /* Unload the driver */ +#if 0 + Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, + &pldev->pGdiDriverInfo->SectionPointer, + sizeof(HANDLE)); +#else + /* Unfortunately, ntoskrnl allows unloading a driver, but fails loading + * it again with STATUS_IMAGE_ALREADY_LOADED. Prevent this problem by + * never unloading any driver. + */ + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; +#endif + if (!NT_SUCCESS(Status)) + return FALSE; + + ExFreePoolWithTag(pldev->pGdiDriverInfo, GDITAG_LDEV); + pldev->pGdiDriverInfo = NULL; + + return TRUE; +} + PLDEVOBJ LDEVOBJ_pLoadInternal( _In_ PFN_DrvEnableDriver pfnEnableDriver, @@ -469,7 +439,7 @@ LDEVOBJ_pLoadDriver( ERR("LDEVOBJ_bEnableDriver failed\n"); /* Unload the image. */ - LDEVOBJ_vUnloadImage(pldev); + LDEVOBJ_bUnloadImage(pldev); LDEVOBJ_vFreeLDEV(pldev); pldev = NULL; goto leave; @@ -491,6 +461,102 @@ leave: return pldev; } +static +VOID +LDEVOBJ_vDereference( + _Inout_ PLDEVOBJ pldev) +{ + /* Lock loader */ + EngAcquireSemaphore(ghsemLDEVList); + + /* Decrement reference count */ + ASSERT(pldev->cRefs > 0); + pldev->cRefs--; + + /* More references left? */ + if (pldev->cRefs > 0) + { + EngReleaseSemaphore(ghsemLDEVList); + return; + } + + LDEVOBJ_vDisableDriver(pldev); + + if (LDEVOBJ_bUnloadImage(pldev)) + { + /* Remove ldev from the list */ + RemoveEntryList(&pldev->leLink); + + /* Free the driver info structure */ + LDEVOBJ_vFreeLDEV(pldev); + } + else + { + WARN("Failed to unload driver '%wZ', trying to re-enable it.\n", &pldev->pGdiDriverInfo->DriverName); + LDEVOBJ_bEnableDriver(pldev, pldev->pGdiDriverInfo->EntryPoint); + + /* Increment again reference count */ + pldev->cRefs++; + } + + /* Unlock loader */ + EngReleaseSemaphore(ghsemLDEVList); +} + +ULONG +LDEVOBJ_ulGetDriverModes( + _In_ LPWSTR pwszDriverName, + _In_ HANDLE hDriver, + _Out_ PDEVMODEW *ppdm) +{ + PLDEVOBJ pldev = NULL; + ULONG cbSize = 0; + PDEVMODEW pdm = NULL; + + TRACE("LDEVOBJ_ulGetDriverModes('%ls', %p)\n", pwszDriverName, hDriver); + + pldev = LDEVOBJ_pLoadDriver(pwszDriverName, LDEV_DEVICE_DISPLAY); + if (!pldev) + goto cleanup; + + /* Mirror drivers may omit this function */ + if (!pldev->pfn.GetModes) + goto cleanup; + + /* Call the driver to get the required size */ + cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); + if (!cbSize) + { + ERR("DrvGetModes returned 0\n"); + goto cleanup; + } + + /* Allocate a buffer for the DEVMODE array */ + pdm = ExAllocatePoolWithTag(PagedPool, cbSize, GDITAG_DEVMODE); + if (!pdm) + { + ERR("Could not allocate devmodeinfo\n"); + goto cleanup; + } + + /* Call the driver again to fill the buffer */ + cbSize = pldev->pfn.GetModes(hDriver, cbSize, pdm); + if (!cbSize) + { + /* Could not get modes */ + ERR("DrvrGetModes returned 0 on second call\n"); + ExFreePoolWithTag(pdm, GDITAG_DEVMODE); + pdm = NULL; + } + +cleanup: + if (pldev) + LDEVOBJ_vDereference(pldev); + + *ppdm = pdm; + return cbSize; +} + BOOL LDEVOBJ_bBuildDevmodeList( _Inout_ PGRAPHICS_DEVICE pGraphicsDevice) @@ -691,25 +757,7 @@ EngUnloadImage( /* Make sure the LDEV is in the list */ ASSERT((pldev->leLink.Flink != NULL) && (pldev->leLink.Blink != NULL)); - /* Lock loader */ - EngAcquireSemaphore(ghsemLDEVList); - - /* Decrement reference count */ - pldev->cRefs--; - - /* No more references left? */ - if (pldev->cRefs == 0) - { - /* Remove ldev from the list */ - RemoveEntryList(&pldev->leLink); - - /* Unload the image and free the LDEV */ - LDEVOBJ_vUnloadImage(pldev); - LDEVOBJ_vFreeLDEV(pldev); - } - - /* Unlock loader */ - EngReleaseSemaphore(ghsemLDEVList); + LDEVOBJ_vDereference(pldev); }

2 years, 8 months

[reactos] 01/01: [WIN32SS] Fix use of unitialized variable

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a1a2aa16f44ba7c42ec9… commit 3a1a2aa16f44ba7c42ec95b38e4db28fa61c2a24 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 17 08:08:12 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 17 08:46:09 2022 +0200 [WIN32SS] Fix use of unitialized variable --- win32ss/gdi/eng/pdevobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 410e8998146..e1f9da54c69 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -768,7 +768,7 @@ PDEVOBJ_lChangeDisplaySettings( _Out_ PMDEVOBJ *ppmdevNew, _In_ BOOL bSearchClosestMode) { - PGRAPHICS_DEVICE pGraphicsDevice; + PGRAPHICS_DEVICE pGraphicsDevice = NULL; PMDEVOBJ pmdev = NULL; PDEVMODEW pdm = NULL; ULONG lRet = DISP_CHANGE_SUCCESSFUL;

2 years, 8 months

[reactos] 04/04: [FREELDR:NTLDR] Rewrite RegInitCurrentControlSet() using CmpFindControlSet().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=736331973ecf4f82e0da1… commit 736331973ecf4f82e0da1c5e9037d536b347057d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 2 03:26:46 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 04:57:43 2022 +0200 [FREELDR:NTLDR] Rewrite RegInitCurrentControlSet() using CmpFindControlSet(). Also remove useless "success" traces at the end of some registry functions. (Only show when they enter and when they fail.) --- boot/freeldr/freeldr/ntldr/registry.c | 111 +++++++------------------------- boot/freeldr/freeldr/ntldr/registry.h | 2 +- boot/freeldr/freeldr/ntldr/wlregistry.c | 2 +- 3 files changed, 26 insertions(+), 89 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 88046036e53..566f1bfa189 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -21,6 +21,7 @@ #include <freeldr.h> #include <cmlib.h> #include "registry.h" +#include <internal/cmboot.h> #include <debug.h> DBG_DEFAULT_CHANNEL(REGISTRY); @@ -99,106 +100,44 @@ RegImportBinaryHive( ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); HvReleaseCell(SystemHive, SystemRootCell); - TRACE("RegImportBinaryHive done\n"); return TRUE; } -LONG +BOOLEAN RegInitCurrentControlSet( _In_ BOOLEAN LastKnownGood) { - WCHAR ControlSetKeyName[80]; - HKEY SelectKey; - HKEY SystemKey; - ULONG CurrentSet = 0; - ULONG DefaultSet = 0; - ULONG LastKnownGoodSet = 0; - ULONG DataSize; - LONG Error; + UNICODE_STRING ControlSetName; + HCELL_INDEX ControlCell; + PCM_KEY_NODE KeyNode; + BOOLEAN AutoSelect; TRACE("RegInitCurrentControlSet\n"); - Error = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM\\Select", - &SelectKey); - if (Error != ERROR_SUCCESS) - { - ERR("RegOpenKey('SYSTEM\\Select') failed (Error %lu)\n", Error); - return Error; - } - - DataSize = sizeof(ULONG); - Error = RegQueryValue(SelectKey, - L"Default", - NULL, - (PUCHAR)&DefaultSet, - &DataSize); - if (Error != ERROR_SUCCESS) - { - ERR("RegQueryValue('Default') failed (Error %lu)\n", Error); - RegCloseKey(SelectKey); - return Error; - } - - DataSize = sizeof(ULONG); - Error = RegQueryValue(SelectKey, - L"LastKnownGood", - NULL, - (PUCHAR)&LastKnownGoodSet, - &DataSize); - if (Error != ERROR_SUCCESS) - { - ERR("RegQueryValue('LastKnownGood') failed (Error %lu)\n", Error); - RegCloseKey(SelectKey); - return Error; - } - - RegCloseKey(SelectKey); - - CurrentSet = (LastKnownGood) ? LastKnownGoodSet : DefaultSet; - wcscpy(ControlSetKeyName, L"ControlSet"); - switch(CurrentSet) - { - case 1: - wcscat(ControlSetKeyName, L"001"); - break; - case 2: - wcscat(ControlSetKeyName, L"002"); - break; - case 3: - wcscat(ControlSetKeyName, L"003"); - break; - case 4: - wcscat(ControlSetKeyName, L"004"); - break; - case 5: - wcscat(ControlSetKeyName, L"005"); - break; - } + /* Choose which control set to open and set it as the new "Current" */ + RtlInitUnicodeString(&ControlSetName, + LastKnownGood ? L"LastKnownGood" + : L"Default"); - Error = RegOpenKey(NULL, - L"\\Registry\\Machine\\SYSTEM", - &SystemKey); - if (Error != ERROR_SUCCESS) + ControlCell = CmpFindControlSet(SystemHive, + SystemRootCell, + &ControlSetName, + &AutoSelect); + if (ControlCell == HCELL_NIL) { - ERR("RegOpenKey('SYSTEM') failed (Error %lu)\n", Error); - return Error; + ERR("CmpFindControlSet('%wZ') failed\n", &ControlSetName); + return FALSE; } - Error = RegOpenKey(SystemKey, - ControlSetKeyName, - &CurrentControlSetKey); - - RegCloseKey(SystemKey); + CurrentControlSetKey = (HKEY)ControlCell; - if (Error != ERROR_SUCCESS) - { - ERR("RegOpenKey('%S') failed (Error %lu)\n", ControlSetKeyName, Error); - return Error; - } + /* Verify it is accessible */ + KeyNode = (PCM_KEY_NODE)HvGetCell(SystemHive, ControlCell); + ASSERT(KeyNode); + ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); + HvReleaseCell(SystemHive, ControlCell); - TRACE("RegInitCurrentControlSet done\n"); - return ERROR_SUCCESS; + return TRUE; } static @@ -429,7 +368,6 @@ RegOpenKey( HvReleaseCell(Hive, CellIndex); *Key = (HKEY)CellIndex; - TRACE("RegOpenKey done\n"); return ERROR_SUCCESS; } @@ -513,7 +451,6 @@ RegQueryValue( HvReleaseCell(Hive, CellIndex); - TRACE("RegQueryValue success\n"); return ERROR_SUCCESS; } diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index 23626756986..96ed98d7e52 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -30,7 +30,7 @@ RegImportBinaryHive( _In_ PVOID ChunkBase, _In_ ULONG ChunkSize); -LONG +BOOLEAN RegInitCurrentControlSet( _In_ BOOLEAN LastKnownGood); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index e36aae18f2a..88f8c1731ae 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -149,7 +149,7 @@ WinLdrInitSystemHive( } /* Initialize the 'CurrentControlSet' link */ - if (RegInitCurrentControlSet(FALSE) != ERROR_SUCCESS) + if (!RegInitCurrentControlSet(FALSE)) { UiMessageBox("Initializing CurrentControlSet link failed!"); return FALSE;

2 years, 8 months

[reactos] 03/04: [FREELDR:NTLDR] Use NTOS kernel's CMBOOT functions to enumerate and build the boot-time driver list.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94874baf198fb86536ee4… commit 94874baf198fb86536ee41a71e016a47e37799b4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 22 04:14:35 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 04:57:42 2022 +0200 [FREELDR:NTLDR] Use NTOS kernel's CMBOOT functions to enumerate and build the boot-time driver list. They are correct and are more performant. - Rewrite WinLdrAddDriverToList() on the model of CmpAddDriverToList() with support for CmpIsDriverInList(). - Disable RegEnumKey() as it is now unused. --- boot/freeldr/freeldr/CMakeLists.txt | 1 + boot/freeldr/freeldr/ntldr/registry.c | 2 + boot/freeldr/freeldr/ntldr/registry.h | 2 + boot/freeldr/freeldr/ntldr/setupldr.c | 62 +++- boot/freeldr/freeldr/ntldr/winldr.c | 39 +- boot/freeldr/freeldr/ntldr/winldr.h | 30 +- boot/freeldr/freeldr/ntldr/wlregistry.c | 626 ++++++++++++-------------------- 7 files changed, 333 insertions(+), 429 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 592f0af85c1..00d6dc8271b 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -48,6 +48,7 @@ list(APPEND FREELDR_BOOTLIB_SOURCE lib/mm/heap.c) list(APPEND FREELDR_NTLDR_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c ntldr/conversion.c ntldr/registry.c ntldr/winldr.c diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 132309eb6d1..88046036e53 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -242,6 +242,7 @@ GetNextPathElement( return TRUE; } +#if 0 LONG RegEnumKey( _In_ HKEY Key, @@ -312,6 +313,7 @@ RegEnumKey( TRACE("RegEnumKey done -> %u, '%.*S'\n", *NameSize, *NameSize, Name); return ERROR_SUCCESS; } +#endif LONG RegOpenKey( diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index 028f75042d6..23626756986 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -44,6 +44,7 @@ extern HKEY CurrentControlSetKey; */ #define RegCloseKey(hKey) (ERROR_SUCCESS) +#if 0 LONG RegEnumKey( _In_ HKEY Key, @@ -51,6 +52,7 @@ RegEnumKey( _Out_ PWCHAR Name, _Inout_ PULONG NameSize, _Out_opt_ PHKEY SubKey); +#endif LONG RegOpenKey( diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index b300be50813..576222378f7 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -135,17 +135,22 @@ SetupLdrInitErrataInf( } static VOID -SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, PCSTR SearchPath) +SetupLdrScanBootDrivers( + _Inout_ PLIST_ENTRY BootDriverListHead, + _In_ HINF InfHandle, + _In_ PCSTR SearchPath) { INFCONTEXT InfContext, dirContext; - BOOLEAN Success; PCSTR Media, DriverName, dirIndex, ImagePath; - WCHAR ServiceName[256]; - WCHAR ImagePathW[256]; + BOOLEAN Success; + WCHAR ImagePathW[MAX_PATH]; + WCHAR DriverNameW[256]; - /* Open inf section */ + UNREFERENCED_PARAMETER(SearchPath); + + /* Open INF section */ if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext)) - return; + goto Quit; /* Load all listed boot drivers */ do @@ -158,30 +163,51 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, PCSTR Se InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) && InfGetDataField(&dirContext, 1, &ImagePath)) { - /* Convert name to widechar */ - swprintf(ServiceName, L"%S", DriverName); - /* Prepare image path */ - swprintf(ImagePathW, L"%S", ImagePath); - wcscat(ImagePathW, L"\\"); - wcscat(ImagePathW, ServiceName); + RtlStringCbPrintfW(ImagePathW, sizeof(ImagePathW), + L"%S\\%S", ImagePath, DriverName); - /* Remove .sys extension */ - ServiceName[wcslen(ServiceName) - 4] = 0; + /* Convert name to unicode and remove .sys extension */ + RtlStringCbPrintfW(DriverNameW, sizeof(DriverNameW), + L"%S", DriverName); + DriverNameW[wcslen(DriverNameW) - 4] = UNICODE_NULL; /* Add it to the list */ Success = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + FALSE, + DriverNameW, ImagePathW, - ServiceName); + NULL, + SERVICE_ERROR_NORMAL, + -1); if (!Success) { - ERR("Could not add boot driver '%s', '%s'\n", SearchPath, DriverName); - return; + ERR("Could not add boot driver '%s'\n", DriverName); + /* Ignore and continue adding other drivers */ } } } } while (InfFindNextLine(&InfContext, &InfContext)); + +Quit: + /* Finally, add the boot filesystem driver to the list */ + if (BootFileSystem) + { + TRACE("Adding filesystem driver %S\n", BootFileSystem); + Success = WinLdrAddDriverToList(BootDriverListHead, + FALSE, + BootFileSystem, + NULL, + L"Boot File System", + SERVICE_ERROR_CRITICAL, + -1); + if (!Success) + ERR("Failed to add filesystem driver %S\n", BootFileSystem); + } + else + { + TRACE("No required filesystem driver\n"); + } } diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 5427b14fe22..9f51a541721 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -10,6 +10,7 @@ #include "winldr.h" #include "ntldropts.h" #include "registry.h" +#include <internal/cmboot.h> #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); @@ -26,6 +27,7 @@ extern BOOLEAN WinLdrTerminalConnected; extern VOID WinLdrSetupEms(IN PCSTR BootOptions); PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; +/**/PCWSTR BootFileSystem = NULL;/**/ BOOLEAN VirtualBias = FALSE; BOOLEAN SosEnabled = FALSE; @@ -363,23 +365,30 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, PCSTR BootPath) { PLIST_ENTRY NextBd; + PBOOT_DRIVER_NODE DriverNode; PBOOT_DRIVER_LIST_ENTRY BootDriver; BOOLEAN Success; BOOLEAN ret = TRUE; - // Walk through the boot drivers list + /* Walk through the boot drivers list */ NextBd = LoaderBlock->BootDriverListHead.Flink; - while (NextBd != &LoaderBlock->BootDriverListHead) { - BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link); + DriverNode = CONTAINING_RECORD(NextBd, + BOOT_DRIVER_NODE, + ListEntry.Link); + BootDriver = &DriverNode->ListEntry; - TRACE("BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, - BootDriver->LdrEntry, &BootDriver->RegistryPath); + /* Get the next list entry as we may remove the current one on failure */ + NextBd = BootDriver->Link.Flink; + + TRACE("BootDriver %wZ DTE %08X RegPath: %wZ\n", + &BootDriver->FilePath, BootDriver->LdrEntry, + &BootDriver->RegistryPath); // Paths are relative (FIXME: Are they always relative?) - // Load it + /* Load it */ UiIndicateProgress(); Success = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, BootPath, @@ -388,23 +397,25 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, &BootDriver->LdrEntry); if (Success) { - // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore + /* Convert the addresses to VA since we are not going to use them anymore */ BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer); BootDriver->FilePath.Buffer = PaToVa(BootDriver->FilePath.Buffer); BootDriver->LdrEntry = PaToVa(BootDriver->LdrEntry); + + if (DriverNode->Group.Buffer) + DriverNode->Group.Buffer = PaToVa(DriverNode->Group.Buffer); + DriverNode->Name.Buffer = PaToVa(DriverNode->Name.Buffer); } else { - // Loading failed - cry loudly - ERR("Can't load boot driver '%wZ'!\n", &BootDriver->FilePath); - UiMessageBox("Can't load boot driver '%wZ'!", &BootDriver->FilePath); + /* Loading failed: cry loudly */ + ERR("Cannot load boot driver '%wZ'!\n", &BootDriver->FilePath); + UiMessageBox("Cannot load boot driver '%wZ'!", &BootDriver->FilePath); ret = FALSE; - // Remove it from the list and try to continue - RemoveEntryList(NextBd); + /* Remove it from the list and try to continue */ + RemoveEntryList(&BootDriver->Link); } - - NextBd = BootDriver->Link.Flink; } return ret; diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index ab06855f14f..20a20ba7cce 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -61,6 +61,7 @@ typedef struct _LOADER_SYSTEM_BLOCK } LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK; extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; +/**/extern PCWSTR BootFileSystem;/**/ // conversion.c @@ -71,7 +72,6 @@ VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); #endif VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); - // winldr.c extern BOOLEAN SosEnabled; #ifdef _M_IX86 @@ -117,14 +117,6 @@ WinLdrInitSystemHive( BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR SystemRoot); -// winldr.c -VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - PCSTR Options, - PCSTR SystemPath, - PCSTR BootPath, - USHORT VersionToBoot); - BOOLEAN WinLdrLoadNLSData( _Inout_ PLOADER_PARAMETER_BLOCK LoaderBlock, @@ -135,10 +127,22 @@ WinLdrLoadNLSData( _In_ PCUNICODE_STRING OemHalFileName); BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - PWSTR RegistryPath, - PWSTR ImagePath, - PWSTR ServiceName); +WinLdrAddDriverToList( + _Inout_ PLIST_ENTRY DriverListHead, + _In_ BOOLEAN InsertAtHead, + _In_ PCWSTR DriverName, + _In_opt_ PCWSTR ImagePath, + _In_opt_ PCWSTR GroupName, + _In_ ULONG ErrorControl, + _In_ ULONG Tag); + +// winldr.c +VOID +WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, + PCSTR Options, + PCSTR SystemPath, + PCSTR BootPath, + USHORT VersionToBoot); VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index cc139b77111..e36aae18f2a 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -11,6 +11,7 @@ #include <freeldr.h> #include "winldr.h" #include "registry.h" +#include <internal/cmboot.h> #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); @@ -26,9 +27,9 @@ WinLdrGetNLSNames( _Inout_ PUNICODE_STRING LangFileName, // CaseTable _Inout_ PUNICODE_STRING OemHalFileName); -static VOID -WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, - IN PCSTR SystemRoot); +static BOOLEAN +WinLdrScanRegistry( + IN OUT PLIST_ENTRY BootDriverListHead); /* FUNCTIONS **************************************************************/ @@ -47,7 +48,6 @@ WinLdrLoadSystemHive( PVOID HiveDataPhysical; PVOID HiveDataVirtual; ULONG BytesRead; - PCWSTR FsService; /* Concatenate path and filename to get the full name */ RtlStringCbCopyA(FullHiveName, sizeof(FullHiveName), DirectoryPath); @@ -99,23 +99,8 @@ WinLdrLoadSystemHive( return FALSE; } - /* Add boot filesystem driver to the list */ - FsService = FsGetServiceName(FileId); - if (FsService) - { - BOOLEAN Success; - TRACE("Adding filesystem service %S\n", FsService); - Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - NULL, - (PWSTR)FsService); - if (!Success) - TRACE("Failed to add filesystem service\n"); - } - else - { - TRACE("No required filesystem service\n"); - } + // FIXME: HACK: Get the boot filesystem driver name now... + BootFileSystem = FsGetServiceName(FileId); ArcClose(FileId); return TRUE; @@ -184,7 +169,12 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, CHAR SearchPath[1024]; /* Scan registry and prepare boot drivers list */ - WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, SystemRoot); + Success = WinLdrScanRegistry(&LoaderBlock->BootDriverListHead); + if (!Success) + { + UiMessageBox("Failed to load boot drivers!"); + return FALSE; + } /* Get names of NLS files */ Success = WinLdrGetNLSNames(CurrentControlSetKey, @@ -517,412 +507,280 @@ Quit: return (Status == ESUCCESS); } -static VOID -WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, - IN PCSTR SystemRoot) +static BOOLEAN +WinLdrScanRegistry( + IN OUT PLIST_ENTRY BootDriverListHead) { - LONG rc = 0; - HKEY hOrderKey, hServiceKey, hGroupKey, hDriverKey; - PWSTR GroupNameBuffer = NULL; - WCHAR ServiceName[256]; - ULONG OrderList[128]; - ULONG BufferSize; - ULONG Index; - ULONG TagIndex; - PWSTR GroupName; - - ULONG ValueSize; - ULONG ValueType; - ULONG StartValue; - ULONG TagValue; - WCHAR DriverGroup[256]; - ULONG DriverGroupSize; - - CHAR ImagePath[256]; - WCHAR TempImagePath[256]; - BOOLEAN Success; - /* Get 'group order list' key */ - rc = RegOpenKey(CurrentControlSetKey, L"Control\\GroupOrderList", &hOrderKey); - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "Failed to open the 'GroupOrderList' key (rc %d)\n", (int)rc); - return; - } - - /* Get 'services' key */ - rc = RegOpenKey(CurrentControlSetKey, L"Services", &hServiceKey); - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc); - RegCloseKey(hOrderKey); - return; - } - - /* Get 'service group order' key */ - rc = RegOpenKey(CurrentControlSetKey, L"Control\\ServiceGroupOrder", &hGroupKey); - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "Failed to open the 'ServiceGroupOrder' key (rc %d)\n", (int)rc); + /* Find all boot drivers */ + Success = CmpFindDrivers(SystemHive, + (HCELL_INDEX)CurrentControlSetKey, + BootLoad, + BootFileSystem, + BootDriverListHead); + if (!Success) goto Quit; - } - /* Get the Group Order List */ - BufferSize = 4096; - GroupNameBuffer = FrLdrHeapAlloc(BufferSize, TAG_WLDR_NAME); - if (!GroupNameBuffer) - { - TRACE_CH(REACTOS, "Failed to allocate buffer\n"); - RegCloseKey(hGroupKey); + /* Sort by group/tag */ + Success = CmpSortDriverList(SystemHive, + (HCELL_INDEX)CurrentControlSetKey, + BootDriverListHead); + if (!Success) goto Quit; - } - rc = RegQueryValue(hGroupKey, L"List", NULL, (PUCHAR)GroupNameBuffer, &BufferSize); - RegCloseKey(hGroupKey); - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "Failed to query the 'List' value (rc %d)\n", (int)rc); + /* Remove circular dependencies (cycles) and sort */ + Success = CmpResolveDriverDependencies(BootDriverListHead); + if (!Success) goto Quit; - } - TRACE_CH(REACTOS, "BufferSize: %d\n", (int)BufferSize); - TRACE_CH(REACTOS, "GroupNameBuffer: '%S'\n", GroupNameBuffer); - - /* Loop through each group */ - GroupName = GroupNameBuffer; - while (*GroupName) - { - TRACE("Driver group: '%S'\n", GroupName); - - /* Query the Order */ - BufferSize = sizeof(OrderList); - rc = RegQueryValue(hOrderKey, GroupName, NULL, (PUCHAR)OrderList, &BufferSize); - if (rc != ERROR_SUCCESS) OrderList[0] = 0; - - /* Enumerate all drivers */ - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) - { - for (Index = 0; TRUE; Index++) - { - /* Get the Driver's Name */ - ValueSize = sizeof(ServiceName); - rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey); - TRACE("RegEnumKey(): rc %d\n", (int)rc); - - /* Make sure it's valid, and check if we're done */ - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto Quit; - //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName); - - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x\n", (int)StartValue); - - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x\n", (int)TagValue); - - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S'\n", DriverGroup); - - /* Make sure it should be started */ - if ((StartValue == 0) && - (TagValue == OrderList[TagIndex]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) - { - /* Get the Driver's Location */ - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - - /* Write the whole path if it succeeded, else prepare to fail */ - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s\\system32\\drivers\\%S.sys", SystemRoot, ServiceName); - } - else if (TempImagePath[0] != L'\\') - { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", SystemRoot, TempImagePath); - } - else - { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - - TRACE("Adding boot driver: '%s'\n", ImagePath); - - Success = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - if (!Success) - ERR("Failed to add boot driver\n"); - } - else - { - //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n", - // ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName); - } - - RegCloseKey(hDriverKey); - } - } - - for (Index = 0; TRUE; Index++) - { - /* Get the Driver's Name */ - ValueSize = sizeof(ServiceName); - rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize, &hDriverKey); - - //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto Quit; - TRACE("Service %d: '%S'\n", (int)Index, ServiceName); - - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x\n", (int)StartValue); - - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x\n", (int)TagValue); - - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S'\n", DriverGroup); - - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) - { - if (TagValue == OrderList[TagIndex]) break; - } - - if ((StartValue == 0) && - (TagIndex > OrderList[0]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) - { - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - if (rc != ERROR_SUCCESS) - { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%ssystem32\\drivers\\%S.sys", SystemRoot, ServiceName); - } - else if (TempImagePath[0] != L'\\') - { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", SystemRoot, TempImagePath); - } - else - { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - TRACE(" Adding boot driver: '%s'\n", ImagePath); - - Success = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - if (!Success) - ERR(" Failed to add boot driver\n"); - } - else - { - //TRACE(" Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n", - // ServiceName, StartValue, TagValue, DriverGroup, GroupName); - } - - RegCloseKey(hDriverKey); - } - - /* Move to the next group name */ - GroupName = GroupName + wcslen(GroupName) + 1; - } Quit: - /* Free allocated memory */ - if (GroupNameBuffer) - FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); + /* In case of failure, free the boot driver list */ + if (!Success) + CmpFreeDriverList(SystemHive, BootDriverListHead); - /* Close the registry key handles */ - RegCloseKey(hServiceKey); - RegCloseKey(hOrderKey); + return Success; } -static +/** + * @brief + * Inserts the specified driver entry into the driver list, or updates + * an existing entry with new ImagePath, ErrorControl, Group and Tag values. + * + * @param[in,out] DriverListHead + * The driver list where to insert the driver entry. + * + * @param[in] InsertAtHead + * Whether to insert the driver at the head (TRUE) or at the tail (FALSE) + * of the driver list. + * + * @param[in] DriverName + * The driver's name. + * + * @param[in] ImagePath + * Optional path the the driver's image. If none is specified, + * a default path is constructed out of the driver's name. + * + * @param[in] GroupName + * Optional driver group name. + * + * @param[in] ErrorControl + * @param[in] Tag + * The ErrorControl and group Tag values for the driver. + * + * @return + * TRUE if the driver has been inserted into the list or updated, FALSE if not. + **/ BOOLEAN -InsertInBootDriverList( - PLIST_ENTRY BootDriverListHead, - PBOOT_DRIVER_LIST_ENTRY BootDriverEntry) +WinLdrAddDriverToList( + _Inout_ PLIST_ENTRY DriverListHead, + _In_ BOOLEAN InsertAtHead, + _In_ PCWSTR DriverName, + _In_opt_ PCWSTR ImagePath, + _In_opt_ PCWSTR GroupName, + _In_ ULONG ErrorControl, + _In_ ULONG Tag) { + PBOOT_DRIVER_NODE DriverNode; PBOOT_DRIVER_LIST_ENTRY DriverEntry; - PLIST_ENTRY ListEntry; - - ASSERT(BootDriverEntry->FilePath.Buffer != NULL); - ASSERT(BootDriverEntry->RegistryPath.Buffer != NULL); - - for (ListEntry = BootDriverListHead->Flink; - ListEntry != BootDriverListHead; - ListEntry = ListEntry->Flink) - { - DriverEntry = CONTAINING_RECORD(ListEntry, - BOOT_DRIVER_LIST_ENTRY, - Link); - if ((DriverEntry->FilePath.Buffer != NULL) && - RtlEqualUnicodeString(&BootDriverEntry->FilePath, - &DriverEntry->FilePath, - TRUE)) - { - return FALSE; - } - - if ((DriverEntry->RegistryPath.Buffer != NULL) && - RtlEqualUnicodeString(&BootDriverEntry->RegistryPath, - &DriverEntry->RegistryPath, - TRUE)) - { - return FALSE; - } + BOOLEAN AlreadyInserted; + USHORT PathLength; + UNICODE_STRING DriverNameU; + UNICODE_STRING RegistryPath; + UNICODE_STRING FilePath = {0}; + UNICODE_STRING RegistryString = {0}; + UNICODE_STRING GroupString = {0}; + + /* Check whether the driver is already in the list */ + RtlInitUnicodeString(&DriverNameU, DriverName); + AlreadyInserted = CmpIsDriverInList(DriverListHead, + &DriverNameU, + &DriverNode); + if (AlreadyInserted) + { + /* If so, we have obtained its node */ + ASSERT(DriverNode); + DriverEntry = &DriverNode->ListEntry; } + else + { + /* Allocate a driver node and initialize it */ + DriverNode = CmpAllocate(sizeof(BOOT_DRIVER_NODE), FALSE, TAG_CM); + if (!DriverNode) + return FALSE; - InsertTailList(BootDriverListHead, &BootDriverEntry->Link); - return TRUE; -} - -BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - PWSTR RegistryPath, - PWSTR ImagePath, - PWSTR ServiceName) -{ - PBOOT_DRIVER_LIST_ENTRY BootDriverEntry; - NTSTATUS Status; - USHORT PathLength; + RtlZeroMemory(DriverNode, sizeof(BOOT_DRIVER_NODE)); + DriverEntry = &DriverNode->ListEntry; - BootDriverEntry = FrLdrHeapAlloc(sizeof(BOOT_DRIVER_LIST_ENTRY), TAG_WLDR_BDE); - if (!BootDriverEntry) - return FALSE; + /* Driver Name */ + RtlInitEmptyUnicodeString(&DriverNode->Name, + CmpAllocate(DriverNameU.Length, FALSE, TAG_CM), + DriverNameU.Length); + if (!DriverNode->Name.Buffer) + goto Failure; - // DTE will be filled during actual load of the driver - BootDriverEntry->LdrEntry = NULL; + if (!NT_SUCCESS(RtlAppendUnicodeStringToString(&DriverNode->Name, &DriverNameU))) + goto Failure; + } - // Check - if we have a valid ImagePath, if not - we need to build it - // like "System32\\Drivers\\blah.sys" - if (ImagePath && (ImagePath[0] != 0)) + /* Check whether we have a valid ImagePath. If not, we need + * to build it like "System32\\Drivers\\blah.sys" */ + if (ImagePath && *ImagePath) { - // Just copy ImagePath to the corresponding field in the structure - PathLength = (USHORT)wcslen(ImagePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + /* Just copy ImagePath to the corresponding field in the structure */ + PathLength = (USHORT)(wcslen(ImagePath)) * sizeof(WCHAR); + RtlInitEmptyUnicodeString(&FilePath, + CmpAllocate(PathLength, FALSE, TAG_WLDR_NAME), + PathLength); + if (!FilePath.Buffer) + goto Failure; - BootDriverEntry->FilePath.Length = 0; - BootDriverEntry->FilePath.MaximumLength = PathLength; - BootDriverEntry->FilePath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); - if (!BootDriverEntry->FilePath.Buffer) - { - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; - } - - Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, ImagePath); - if (!NT_SUCCESS(Status)) - { - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; - } + if (!NT_SUCCESS(RtlAppendUnicodeToString(&FilePath, ImagePath))) + goto Failure; } else { - // we have to construct ImagePath ourselves - PathLength = (USHORT)wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys"); - BootDriverEntry->FilePath.Length = 0; - BootDriverEntry->FilePath.MaximumLength = PathLength; - BootDriverEntry->FilePath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); - if (!BootDriverEntry->FilePath.Buffer) + /* We have to construct ImagePath ourselves */ + PathLength = DriverNode->Name.Length + sizeof(L"system32\\drivers\\.sys"); + RtlInitEmptyUnicodeString(&FilePath, + CmpAllocate(PathLength, FALSE, TAG_WLDR_NAME), + PathLength); + if (!FilePath.Buffer) + goto Failure; + + if (!NT_SUCCESS(RtlAppendUnicodeToString(&FilePath, L"system32\\drivers\\")) || + !NT_SUCCESS(RtlAppendUnicodeStringToString(&FilePath, &DriverNode->Name)) || + !NT_SUCCESS(RtlAppendUnicodeToString(&FilePath, L".sys"))) { - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; + goto Failure; } + } - Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, L"system32\\drivers\\"); - if (!NT_SUCCESS(Status)) - { - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; - } + /* Registry path */ + RtlInitUnicodeString(&RegistryPath, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + PathLength = RegistryPath.Length + DriverNode->Name.Length; + RtlInitEmptyUnicodeString(&RegistryString, + CmpAllocate(PathLength, FALSE, TAG_WLDR_NAME), + PathLength); + if (!RegistryString.Buffer) + goto Failure; - Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, ServiceName); - if (!NT_SUCCESS(Status)) - { - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; - } + if (!NT_SUCCESS(RtlAppendUnicodeStringToString(&RegistryString, &RegistryPath)) || + !NT_SUCCESS(RtlAppendUnicodeStringToString(&RegistryString, &DriverNode->Name))) + { + goto Failure; + } - Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, L".sys"); - if (!NT_SUCCESS(Status)) - { - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; - } + /* Group */ + if (GroupName && *GroupName) + { + /* + * NOTE: Here we can use our own allocator as we alone maintain the + * group string. This is different from the other allocated strings, + * where we instead need to use the same (hive) allocator as the + * one used by CmpAddDriverToList(), for interoperability purposes. + */ + RtlCreateUnicodeString(&GroupString, GroupName); + if (!GroupString.Buffer) + goto Failure; + } + else + { + RtlInitEmptyUnicodeString(&GroupString, NULL, 0); } - // Add registry path - PathLength = (USHORT)(wcslen(RegistryPath) + wcslen(ServiceName))*sizeof(WCHAR) + sizeof(UNICODE_NULL); - BootDriverEntry->RegistryPath.Length = 0; - BootDriverEntry->RegistryPath.MaximumLength = PathLength; - BootDriverEntry->RegistryPath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); - if (!BootDriverEntry->RegistryPath.Buffer) + /* Set or replace the driver node's file path */ + if (DriverEntry->FilePath.Buffer) { - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; + CmpFree(DriverEntry->FilePath.Buffer, + DriverEntry->FilePath.MaximumLength); } + DriverEntry->FilePath = FilePath; + FilePath.Buffer = NULL; - Status = RtlAppendUnicodeToString(&BootDriverEntry->RegistryPath, RegistryPath); - if (!NT_SUCCESS(Status)) + /* Set or replace the driver node's registry path */ + if (DriverEntry->RegistryPath.Buffer) { - FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; + CmpFree(DriverEntry->RegistryPath.Buffer, + DriverEntry->RegistryPath.MaximumLength); } + DriverEntry->RegistryPath = RegistryString; + RegistryString.Buffer = NULL; - Status = RtlAppendUnicodeToString(&BootDriverEntry->RegistryPath, ServiceName); - if (!NT_SUCCESS(Status)) + /* Set or replace the driver node's group */ + if (DriverNode->Group.Buffer) { - FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); - return FALSE; + /* + * If the buffer is inside the registry hive's memory, this means that + * it has been set by CmpAddDriverToList() to point to some data within + * the hive; thus we should not free the buffer but just replace it. + * Otherwise, this is a buffer previously allocated by ourselves, that + * we can free. + * + * NOTE: This function does not have an explicit LoaderBlock input + * parameter pointer, since it does not need it, except for this + * very place. So instead, use the global WinLdrSystemBlock pointer. + */ + PLOADER_PARAMETER_BLOCK LoaderBlock = + (WinLdrSystemBlock ? &WinLdrSystemBlock->LoaderBlock : NULL); + + if (!LoaderBlock || !LoaderBlock->RegistryBase || !LoaderBlock->RegistryLength || + ((ULONG_PTR)DriverNode->Group.Buffer < + (ULONG_PTR)VaToPa(LoaderBlock->RegistryBase)) || + ((ULONG_PTR)DriverNode->Group.Buffer >= + (ULONG_PTR)VaToPa(LoaderBlock->RegistryBase) + LoaderBlock->RegistryLength)) + { + RtlFreeUnicodeString(&DriverNode->Group); + } } + DriverNode->Group = GroupString; + GroupString.Buffer = NULL; + + /* ErrorControl and Tag */ + DriverNode->ErrorControl = ErrorControl; + DriverNode->Tag = Tag; - // Insert entry into the list - if (!InsertInBootDriverList(BootDriverListHead, BootDriverEntry)) + /* Insert the entry into the list if it does not exist there already */ + if (!AlreadyInserted) { - // It was already there, so delete our entry - FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); + if (InsertAtHead) + InsertHeadList(DriverListHead, &DriverEntry->Link); + else + InsertTailList(DriverListHead, &DriverEntry->Link); } return TRUE; + +Failure: + if (GroupString.Buffer) + RtlFreeUnicodeString(&GroupString); + if (RegistryString.Buffer) + CmpFree(RegistryString.Buffer, RegistryString.MaximumLength); + if (FilePath.Buffer) + CmpFree(FilePath.Buffer, FilePath.MaximumLength); + + /* If it does not exist in the list already, free the allocated + * driver node, otherwise keep the original one in place. */ + if (!AlreadyInserted) + { + if (DriverEntry->RegistryPath.Buffer) + { + CmpFree(DriverEntry->RegistryPath.Buffer, + DriverEntry->RegistryPath.MaximumLength); + } + if (DriverEntry->FilePath.Buffer) + { + CmpFree(DriverEntry->FilePath.Buffer, + DriverEntry->FilePath.MaximumLength); + } + if (DriverNode->Name.Buffer) + { + CmpFree(DriverNode->Name.Buffer, + DriverNode->Name.MaximumLength); + } + CmpFree(DriverNode, sizeof(BOOT_DRIVER_NODE)); + } + + return FALSE; }

2 years, 8 months

[reactos] 02/04: [BOOTDATA] Remove hackish entries that really caused the CDFS to be loaded twice in the LiveCD.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02e659d248c78ee5812cb… commit 02e659d248c78ee5812cb8859b67a4b0de16e6a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 31 02:11:52 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 04:57:41 2022 +0200 [BOOTDATA] Remove hackish entries that really caused the CDFS to be loaded twice in the LiveCD. They date back from commit a880f2ee (r9611), and were the root cause for the bug that was tentatively fixed by commit 81a9ce44e (PR #755). On Windows, boot file system drivers have either the SERVICE_DEMAND_START or the SERVICE_DISABLED start type, and only the filesystem to access the boot media is manually loaded by the OS loader (other FSes that are needed later are loaded by the FSRecognizer). Also there is no need to disable NTFS anymore. --- boot/bootdata/livecd.inf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index eae91147fa4..ad88590eb13 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -10,15 +10,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" ; Default locale for the keyboard layout HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00000000,"00000409" -; Cdfs (ISO96660) filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000 - ; Cdrom class driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000000 -; FIXME: Disable NTFS driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004 - ; Reset BootExecute to an empty value: AutoChk should not start in MiniNT mode HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute",0x00010000,""

2 years, 8 months

[reactos] 01/04: [FREELDR:NTLDR] Adapt the registry code to access from outside the underlying HHIVE and HCELL_INDEX (needed for cmboot).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93d8a1b7b194a7a155b4a… commit 93d8a1b7b194a7a155b4ad0205051248a94fd3a2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 22 04:16:22 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 04:57:40 2022 +0200 [FREELDR:NTLDR] Adapt the registry code to access from outside the underlying HHIVE and HCELL_INDEX (needed for cmboot). --- boot/freeldr/freeldr/ntldr/registry.c | 97 +++++++++++++++++++++++------------ boot/freeldr/freeldr/ntldr/registry.h | 3 ++ 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index ea68cc340dc..132309eb6d1 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -25,9 +25,15 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(REGISTRY); -static PCMHIVE CmHive; -static PCM_KEY_NODE RootKeyNode; -HKEY CurrentControlSetKey; +static PCMHIVE CmSystemHive; +static HCELL_INDEX SystemRootCell; + +PHHIVE SystemHive = NULL; +HKEY CurrentControlSetKey = NULL; + +#define GET_HHIVE(CmHive) (&((CmHive)->Hive)) +#define GET_HHIVE_FROM_HKEY(hKey) GET_HHIVE(CmSystemHive) +#define GET_CM_KEY_NODE(hHive, hKey) ((PCM_KEY_NODE)HvGetCell(hHive, (HCELL_INDEX)hKey)) PVOID NTAPI @@ -37,9 +43,7 @@ CmpAllocate( IN ULONG Tag) { UNREFERENCED_PARAMETER(Paged); - UNREFERENCED_PARAMETER(Tag); - - return FrLdrTempAlloc(Size, Tag); + return FrLdrHeapAlloc(Size, Tag); } VOID @@ -49,7 +53,7 @@ CmpFree( IN ULONG Quota) { UNREFERENCED_PARAMETER(Quota); - FrLdrTempFree(Ptr, 0); + FrLdrHeapFree(Ptr, 0); } BOOLEAN @@ -58,12 +62,13 @@ RegImportBinaryHive( _In_ ULONG ChunkSize) { NTSTATUS Status; + PCM_KEY_NODE KeyNode; TRACE("RegImportBinaryHive(%p, 0x%lx)\n", ChunkBase, ChunkSize); /* Allocate and initialize the hive */ - CmHive = CmpAllocate(sizeof(CMHIVE), FALSE, 'eviH'); - Status = HvInitialize(&CmHive->Hive, + CmSystemHive = FrLdrTempAlloc(sizeof(CMHIVE), 'eviH'); + Status = HvInitialize(GET_HHIVE(CmSystemHive), HINIT_FLAT, // HINIT_MEMORY_INPLACE 0, 0, @@ -79,12 +84,20 @@ RegImportBinaryHive( if (!NT_SUCCESS(Status)) { ERR("Corrupted hive %p!\n", ChunkBase); - CmpFree(CmHive, 0); + FrLdrTempFree(CmSystemHive, 'eviH'); return FALSE; } /* Save the root key node */ - RootKeyNode = (PCM_KEY_NODE)HvGetCell(&CmHive->Hive, CmHive->Hive.BaseBlock->RootCell); + SystemHive = GET_HHIVE(CmSystemHive); + SystemRootCell = SystemHive->BaseBlock->RootCell; + ASSERT(SystemRootCell != HCELL_NIL); + + /* Verify it is accessible */ + KeyNode = (PCM_KEY_NODE)HvGetCell(SystemHive, SystemRootCell); + ASSERT(KeyNode); + ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); + HvReleaseCell(SystemHive, SystemRootCell); TRACE("RegImportBinaryHive done\n"); return TRUE; @@ -237,7 +250,7 @@ RegEnumKey( _Inout_ PULONG NameSize, _Out_opt_ PHKEY SubKey) { - PHHIVE Hive = &CmHive->Hive; + PHHIVE Hive = GET_HHIVE_FROM_HKEY(Key); PCM_KEY_NODE KeyNode, SubKeyNode; HCELL_INDEX CellIndex; USHORT NameLength; @@ -246,7 +259,8 @@ RegEnumKey( Key, Index, Name, NameSize, NameSize ? *NameSize : 0); /* Get the key node */ - KeyNode = (PCM_KEY_NODE)Key; + KeyNode = GET_CM_KEY_NODE(Hive, Key); + ASSERT(KeyNode); ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); CellIndex = CmpFindSubKeyByNumber(Hive, KeyNode, Index); @@ -254,8 +268,10 @@ RegEnumKey( { TRACE("RegEnumKey index out of bounds (%d) in key (%.*s)\n", Index, KeyNode->NameLength, KeyNode->Name); + HvReleaseCell(Hive, (HCELL_INDEX)Key); return ERROR_NO_MORE_ITEMS; } + HvReleaseCell(Hive, (HCELL_INDEX)Key); /* Get the value cell */ SubKeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); @@ -288,12 +304,10 @@ RegEnumKey( *NameSize = NameLength + sizeof(WCHAR); - /**/HvReleaseCell(Hive, CellIndex);/**/ + HvReleaseCell(Hive, CellIndex); if (SubKey != NULL) - *SubKey = (HKEY)SubKeyNode; - // else - // RegCloseKey((HKEY)SubKeyNode); + *SubKey = (HKEY)CellIndex; TRACE("RegEnumKey done -> %u, '%.*S'\n", *NameSize, *NameSize, Name); return ERROR_SUCCESS; @@ -307,7 +321,7 @@ RegOpenKey( { UNICODE_STRING RemainingPath, SubKeyName; UNICODE_STRING CurrentControlSet = RTL_CONSTANT_STRING(L"CurrentControlSet"); - PHHIVE Hive = &CmHive->Hive; + PHHIVE Hive = (ParentKey ? GET_HHIVE_FROM_HKEY(ParentKey) : GET_HHIVE(CmSystemHive)); PCM_KEY_NODE KeyNode; HCELL_INDEX CellIndex; @@ -316,11 +330,8 @@ RegOpenKey( /* Initialize the remaining path name */ RtlInitUnicodeString(&RemainingPath, KeyName); - /* Get the parent key node */ - KeyNode = (PCM_KEY_NODE)ParentKey; - /* Check if we have a parent key */ - if (KeyNode == NULL) + if (ParentKey == NULL) { UNICODE_STRING SubKeyName1, SubKeyName2, SubKeyName3; UNICODE_STRING RegistryPath = RTL_CONSTANT_STRING(L"Registry"); @@ -358,13 +369,16 @@ RegOpenKey( } /* Use the root key */ - KeyNode = RootKeyNode; + CellIndex = SystemRootCell; + } + else + { + /* Use the parent key */ + CellIndex = (HCELL_INDEX)ParentKey; } - - ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); /* Check if this is the root key */ - if (KeyNode == RootKeyNode) + if (CellIndex == SystemRootCell) { UNICODE_STRING TempPath = RemainingPath; @@ -375,20 +389,29 @@ RegOpenKey( if (RtlEqualUnicodeString(&SubKeyName, &CurrentControlSet, TRUE)) { /* Use the CurrentControlSetKey and update the remaining path */ - KeyNode = (PCM_KEY_NODE)CurrentControlSetKey; + CellIndex = (HCELL_INDEX)CurrentControlSetKey; RemainingPath = TempPath; } } + /* Get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); + ASSERT(KeyNode); + ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); + TRACE("RegOpenKey: RemainingPath '%wZ'\n", &RemainingPath); /* Loop while there are path elements */ while (GetNextPathElement(&SubKeyName, &RemainingPath)) { + HCELL_INDEX NextCellIndex; + TRACE("RegOpenKey: next element '%wZ'\n", &SubKeyName); /* Get the next sub key */ - CellIndex = CmpFindSubKeyByName(Hive, KeyNode, &SubKeyName); + NextCellIndex = CmpFindSubKeyByName(Hive, KeyNode, &SubKeyName); + HvReleaseCell(Hive, CellIndex); + CellIndex = NextCellIndex; if (CellIndex == HCELL_NIL) { WARN("Did not find sub key '%wZ' (full: %S)\n", &SubKeyName, KeyName); @@ -398,9 +421,11 @@ RegOpenKey( /* Get the found key */ KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); ASSERT(KeyNode); + ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); } - *Key = (HKEY)KeyNode; + HvReleaseCell(Hive, CellIndex); + *Key = (HKEY)CellIndex; TRACE("RegOpenKey done\n"); return ERROR_SUCCESS; @@ -452,7 +477,7 @@ RegQueryValue( _Out_opt_ PUCHAR Data, _Inout_opt_ PULONG DataSize) { - PHHIVE Hive = &CmHive->Hive; + PHHIVE Hive = GET_HHIVE_FROM_HKEY(Key); PCM_KEY_NODE KeyNode; PCM_KEY_VALUE ValueCell; HCELL_INDEX CellIndex; @@ -462,7 +487,8 @@ RegQueryValue( Key, ValueName, Type, Data, DataSize); /* Get the key node */ - KeyNode = (PCM_KEY_NODE)Key; + KeyNode = GET_CM_KEY_NODE(Hive, Key); + ASSERT(KeyNode); ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); /* Initialize value name string */ @@ -472,8 +498,10 @@ RegQueryValue( { TRACE("RegQueryValue value not found in key (%.*s)\n", KeyNode->NameLength, KeyNode->Name); + HvReleaseCell(Hive, (HCELL_INDEX)Key); return ERROR_FILE_NOT_FOUND; } + HvReleaseCell(Hive, (HCELL_INDEX)Key); /* Get the value cell */ ValueCell = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); @@ -503,7 +531,7 @@ RegEnumValue( _Out_opt_ PUCHAR Data, _Inout_opt_ PULONG DataSize) { - PHHIVE Hive = &CmHive->Hive; + PHHIVE Hive = GET_HHIVE_FROM_HKEY(Key); PCM_KEY_NODE KeyNode; PCELL_DATA ValueListCell; PCM_KEY_VALUE ValueCell; @@ -513,7 +541,8 @@ RegEnumValue( Key, Index, ValueName, NameSize, Type, Data, DataSize, *DataSize); /* Get the key node */ - KeyNode = (PCM_KEY_NODE)Key; + KeyNode = GET_CM_KEY_NODE(Hive, Key); + ASSERT(KeyNode); ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); /* Check if the index is valid */ @@ -522,6 +551,7 @@ RegEnumValue( (Index >= KeyNode->ValueList.Count)) { ERR("RegEnumValue: index invalid\n"); + HvReleaseCell(Hive, (HCELL_INDEX)Key); return ERROR_NO_MORE_ITEMS; } @@ -563,6 +593,7 @@ RegEnumValue( HvReleaseCell(Hive, ValueListCell->KeyList[Index]); HvReleaseCell(Hive, KeyNode->ValueList.List); + HvReleaseCell(Hive, (HCELL_INDEX)Key); TRACE("RegEnumValue done -> %u, '%.*S'\n", *NameSize, *NameSize, ValueName); return ERROR_SUCCESS; diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index 0743be4866e..028f75042d6 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -21,6 +21,8 @@ #ifndef __REGISTRY_H #define __REGISTRY_H +#include <cmlib.h> + typedef HANDLE HKEY, *PHKEY; BOOLEAN @@ -32,6 +34,7 @@ LONG RegInitCurrentControlSet( _In_ BOOLEAN LastKnownGood); +extern PHHIVE SystemHive; extern HKEY CurrentControlSetKey; /*

2 years, 8 months

[reactos] 01/01: [NTUSER] Add 'Win:' comments to some functions (#4453)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=567b0700fe6c36328a4be… commit 567b0700fe6c36328a4beeef92994324bb11a23f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 17 06:53:37 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 17 06:53:37 2022 +0900 [NTUSER] Add 'Win:' comments to some functions (#4453) --- win32ss/gdi/eng/error.c | 1 + win32ss/user/ntuser/desktop.c | 2 ++ win32ss/user/ntuser/input.c | 1 + win32ss/user/ntuser/misc.c | 1 + win32ss/user/ntuser/ntuser.c | 3 +++ win32ss/user/ntuser/painting.c | 3 +++ win32ss/user/ntuser/userfuncs.h | 1 + win32ss/user/ntuser/window.c | 5 ++++- win32ss/user/ntuser/winpos.c | 2 ++ 9 files changed, 18 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/eng/error.c b/win32ss/gdi/eng/error.c index 2ff36883b78..380869bfd6e 100644 --- a/win32ss/gdi/eng/error.c +++ b/win32ss/gdi/eng/error.c @@ -21,6 +21,7 @@ EngGetLastError(VOID) /* * @implemented * http://msdn.microsoft.com/en-us/library/ff565015%28VS.85%29.aspx + * Win: UserSetLastError */ VOID APIENTRY diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 11f3de29c78..ad00fc0c00e 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1344,6 +1344,7 @@ PWND FASTCALL co_GetDesktopWindow(PWND pWnd) return NULL; } +// Win: _GetDesktopWindow HWND FASTCALL IntGetDesktopWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); @@ -1368,6 +1369,7 @@ PWND FASTCALL UserGetDesktopWindow(VOID) return UserGetWindowObject(pdo->DesktopWindow); } +// Win: _GetMessageWindow HWND FASTCALL IntGetMessageWindow(VOID) { PDESKTOP pdo = IntGetActiveDesktop(); diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index 3f68406368f..cc0c8cf047f 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -475,6 +475,7 @@ IsRemoveAttachThread(PTHREADINFO pti) return Ret; } +// Win: zzzAttachThreadInput NTSTATUS FASTCALL UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach) { diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 970d1b6c46d..5b1d3ecad83 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -35,6 +35,7 @@ _scwprintf( /* * Test the Thread to verify and validate it. Hard to the core tests are required. + * Win: PtiFromThreadId */ PTHREADINFO FASTCALL diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index 220ed8db6af..b75e7b9b41b 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -238,12 +238,14 @@ VOID FASTCALL CleanupUserImpl(VOID) ExDeleteResourceLite(&UserLock); } +// Win: EnterSharedCrit VOID FASTCALL UserEnterShared(VOID) { KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&UserLock, TRUE); } +// Win: EnterCrit VOID FASTCALL UserEnterExclusive(VOID) { ASSERT_NOGDILOCKS(); @@ -252,6 +254,7 @@ VOID FASTCALL UserEnterExclusive(VOID) gptiCurrent = PsGetCurrentThreadWin32Thread(); } +// Win: LeaveCrit VOID FASTCALL UserLeave(VOID) { ASSERT_NOGDILOCKS(); diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index e0e4893a4b0..352c934564d 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -1430,6 +1430,7 @@ IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) return Ret; } +// Win: xxxBeginPaint HDC FASTCALL IntBeginPaint(PWND Window, PPAINTSTRUCT Ps) { @@ -1526,6 +1527,7 @@ IntBeginPaint(PWND Window, PPAINTSTRUCT Ps) return Ps->hdc; } +// Win: xxxEndPaint BOOL FASTCALL IntEndPaint(PWND Wnd, PPAINTSTRUCT Ps) { @@ -1548,6 +1550,7 @@ IntEndPaint(PWND Wnd, PPAINTSTRUCT Ps) return TRUE; } +// Win: xxxFillWindow BOOL FASTCALL IntFillWindow(PWND pWndParent, PWND pWnd, diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index 3bae17d5567..f91058dd539 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -1,5 +1,6 @@ #pragma once +// Win: ValidateHmenu FORCEINLINE PMENU UserGetMenuObject(HMENU hMenu) { PMENU pMenu = UserGetObject(gHandleTable, hMenu, TYPE_MENU); diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 025e80e578f..da8da6cf68e 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -121,6 +121,7 @@ PWND FASTCALL ValidateHwndNoErr(HWND hWnd) } /* Temp HACK */ +// Win: ValidateHwnd PWND FASTCALL UserGetWindowObject(HWND hWnd) { PWND Window; @@ -1263,6 +1264,7 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent) return WndOldParent; } +// Win: xxxSetParent HWND FASTCALL co_UserSetParent(HWND hWndChild, HWND hWndNewParent) { @@ -2128,6 +2130,7 @@ Error: /* * @implemented + * Win: xxxCreateWindowEx */ PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW* Cs, @@ -2742,7 +2745,7 @@ cleanup: return hwnd; } - +// Win: xxxDestroyWindow BOOLEAN co_UserDestroyWindow(PVOID Object) { HWND hWnd; diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index eba590fad13..27f594e554c 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -551,6 +551,7 @@ WinPosInitInternalPos(PWND Wnd, RECTL *RestoreRect) } } +// Win: _GetWindowPlacement BOOL FASTCALL IntGetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *lpwndpl) @@ -2484,6 +2485,7 @@ co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) /* ShowWindow does not set SWP_FRAMECHANGED!!! Fix wine msg test_SetParent:WmSetParentSeq_2:23 wParam bits! + Win: xxxShowWindow */ BOOLEAN FASTCALL co_WinPosShowWindow(PWND Wnd, INT Cmd)

2 years, 8 months

[reactos] 01/01: [NTOS:CM] Adapt cmboot.c for usage in NT/ReactOS bootloader.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ff02323684cac98a944b… commit 6ff02323684cac98a944b54916ad3fb652a1304d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 23:16:19 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 16 18:37:45 2022 +0200 [NTOS:CM] Adapt cmboot.c for usage in NT/ReactOS bootloader. - Add a new cmboot.h header to isolate the boot-support definitions shared with the NT/ReactOS bootloader. - Move CmpFreeDriverList() to cmboot.c so that we can use it for cleanup paths in the NT/ReactOS bootloader. - CmpFindControlSet(): Directly build the control set name in UNICODE, instead of doing an ANSI->UNICODE conversion. - Directly assign the CurrentControlSet\Services constant string, instead of going the route of init-empty-string + append-string. This is possible since that string is not modified later. - Remove ASSERT(FALSE), replacing them with correct failure handling. - Add cleanup paths in CmpAddDriverToList(). - Simplify and fix CmpFreeDriverList(): it's the full DriverNode that needs to be freed; not the LIST_ENTRY pointer. - Add other validity checks: * Registry value types and data sizes; * For multi-strings, verify that they are NULL-terminated. * For (multi-)strings, check whether they are NULL-terminated before optionally removing their trailing NULL character from the count. Check also whether they are of zero-length and take appropriate action where necessary. - Add CmpIsDriverInList() for future usage in CMBOOT compiled in bootloader mode. - Add SAL annotations and Doxygen documentation. - Add debug traces. - Formatting / code style fixes. ** TODO: Fix SafeBoot support ** --- ntoskrnl/config/cmboot.c | 953 +++++++++++++++++++++++++++---------- ntoskrnl/config/cmsysini.c | 49 -- ntoskrnl/include/internal/cm.h | 52 +- ntoskrnl/include/internal/cmboot.h | 80 ++++ ntoskrnl/include/internal/io.h | 24 +- 5 files changed, 786 insertions(+), 372 deletions(-) diff --git a/ntoskrnl/config/cmboot.c b/ntoskrnl/config/cmboot.c index 98dd2a053ef..fdd1a6ed6c4 100644 --- a/ntoskrnl/config/cmboot.c +++ b/ntoskrnl/config/cmboot.c @@ -1,166 +1,260 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/config/cmboot.c - * PURPOSE: Configuration Manager - Boot Initialization - * PROGRAMMERS: ReactOS Portable Systems Group - * Alex Ionescu (alex.ionescu(a)reactos.org) + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Configuration Manager - Boot Initialization + * COPYRIGHT: Copyright 2007 Alex Ionescu (alex.ionescu(a)reactos.org) + * Copyright 2010 ReactOS Portable Systems Group + * Copyright 2022 Hermès Bélusca-Maïto + * + * NOTE: This module is shared by both the kernel and the bootloader. */ /* INCLUDES *******************************************************************/ -#include "ntoskrnl.h" +#include <ntoskrnl.h> + #define NDEBUG -#include "debug.h" +#include <debug.h> -/* GLOBALS ********************************************************************/ +#ifdef _BLDR_ + +#undef CODE_SEG +#define CODE_SEG(...) + +#include <ntstrsafe.h> +#include <cmlib.h> +#include "internal/cmboot.h" + +// HACK: This is part of non-NT-compatible SafeBoot support in kernel. +ULONG InitSafeBootMode = 0; + +DBG_DEFAULT_CHANNEL(REGISTRY); +#define CMTRACE(x, fmt, ...) TRACE(fmt, ##__VA_ARGS__) // DPRINT + +#endif /* _BLDR_ */ + + +/* DEFINES ********************************************************************/ + +#define CM_BOOT_DEBUG 0x20 + +#define IS_NULL_TERMINATED(Buffer, Size) \ + (((Size) >= sizeof(WCHAR)) && ((Buffer)[(Size) / sizeof(WCHAR) - 1] == UNICODE_NULL)) -extern ULONG InitSafeBootMode; /* FUNCTIONS ******************************************************************/ +// HACK: This is part of non-NT-compatible SafeBoot support in kernel. +extern ULONG InitSafeBootMode; + +CODE_SEG("INIT") +static +BOOLEAN +CmpIsSafe( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX SafeBootCell, + _In_ HCELL_INDEX DriverCell); + +/** + * @brief + * Finds the corresponding "HKLM\SYSTEM\ControlSetXXX" system control set + * registry key, according to the "Current", "Default", or "LastKnownGood" + * values in the "HKLM\SYSTEM\Select" registry key. + * + * @param[in] SystemHive + * The SYSTEM hive. + * + * @param[in] RootCell + * The root cell of the SYSTEM hive. + * + * @param[in] SelectKeyName + * The control set to check for: either "Current", "Default", or + * "LastKnownGood", the value of which selects the corresponding + * "HKLM\SYSTEM\ControlSetXXX" control set registry key. + * + * @param[out] AutoSelect + * Value of the "AutoSelect" registry value (unused). + * + * @return + * The control set registry key's hive cell (if found), or HCELL_NIL. + **/ CODE_SEG("INIT") HCELL_INDEX NTAPI -CmpFindControlSet(IN PHHIVE SystemHive, - IN HCELL_INDEX RootCell, - IN PUNICODE_STRING SelectKeyName, - OUT PBOOLEAN AutoSelect) +CmpFindControlSet( + _In_ PHHIVE SystemHive, + _In_ HCELL_INDEX RootCell, + _In_ PCUNICODE_STRING SelectKeyName, + _Out_ PBOOLEAN AutoSelect) { - UNICODE_STRING KeyName; + UNICODE_STRING Name; PCM_KEY_NODE Node; HCELL_INDEX SelectCell, AutoSelectCell, SelectValueCell, ControlSetCell; HCELL_INDEX CurrentValueCell; - PCM_KEY_VALUE KeyValue; + PCM_KEY_VALUE Value; ULONG Length; - PULONG ControlSetId; - ANSI_STRING ControlSetAnsiName; - CHAR Buffer[128]; - WCHAR WideBuffer[128]; NTSTATUS Status; PULONG CurrentData; + PULONG ControlSetId; + WCHAR Buffer[128]; - /* Sanity check */ + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(SystemHive->ReleaseCellRoutine == NULL); - /* Get the Select subkey */ - RtlInitUnicodeString(&KeyName, L"select"); + /* Get the Select key */ + RtlInitUnicodeString(&Name, L"select"); Node = (PCM_KEY_NODE)HvGetCell(SystemHive, RootCell); if (!Node) return HCELL_NIL; - SelectCell = CmpFindSubKeyByName(SystemHive, Node, &KeyName); - if (SelectCell == HCELL_NIL) return SelectCell; + SelectCell = CmpFindSubKeyByName(SystemHive, Node, &Name); + if (SelectCell == HCELL_NIL) return HCELL_NIL; /* Get AutoSelect value */ - RtlInitUnicodeString(&KeyName, L"AutoSelect"); + RtlInitUnicodeString(&Name, L"AutoSelect"); Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); if (!Node) return HCELL_NIL; - AutoSelectCell = CmpFindValueByName(SystemHive, Node, &KeyName); + AutoSelectCell = CmpFindValueByName(SystemHive, Node, &Name); if (AutoSelectCell == HCELL_NIL) { - /* Assume TRUE if the value is missing. */ + /* Assume TRUE if the value is missing */ *AutoSelect = TRUE; } else { /* Read the value */ - KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, AutoSelectCell); - if (KeyValue == NULL) return HCELL_NIL; + Value = (PCM_KEY_VALUE)HvGetCell(SystemHive, AutoSelectCell); + if (!Value) return HCELL_NIL; + // if (Value->Type != REG_DWORD) return HCELL_NIL; /* Convert it to a boolean */ - *AutoSelect = *(PBOOLEAN)CmpValueToData(SystemHive, KeyValue, &Length); + CurrentData = (PULONG)CmpValueToData(SystemHive, Value, &Length); + if (!CurrentData) return HCELL_NIL; + // if (Length < sizeof(ULONG)) return HCELL_NIL; + + *AutoSelect = *(PBOOLEAN)CurrentData; } /* Now find the control set being looked up */ Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); if (!Node) return HCELL_NIL; SelectValueCell = CmpFindValueByName(SystemHive, Node, SelectKeyName); - if (SelectValueCell == HCELL_NIL) return SelectValueCell; + if (SelectValueCell == HCELL_NIL) return HCELL_NIL; /* Read the value (corresponding to the CCS ID) */ - KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, SelectValueCell); - if (!KeyValue) return HCELL_NIL; - if (KeyValue->Type != REG_DWORD) return HCELL_NIL; - ControlSetId = (PULONG)CmpValueToData(SystemHive, KeyValue, &Length); - - /* Now build an Ansi String for the CCS's Name */ - sprintf(Buffer, "ControlSet%03lu", *ControlSetId); - ControlSetAnsiName.Length = (USHORT)strlen(Buffer); - ControlSetAnsiName.MaximumLength = (USHORT)strlen(Buffer); - ControlSetAnsiName.Buffer = Buffer; - - /* And convert it to Unicode... */ - KeyName.MaximumLength = 256; - KeyName.Buffer = WideBuffer; - Status = RtlAnsiStringToUnicodeString(&KeyName, - &ControlSetAnsiName, - FALSE); + Value = (PCM_KEY_VALUE)HvGetCell(SystemHive, SelectValueCell); + if (!Value) return HCELL_NIL; + if (Value->Type != REG_DWORD) return HCELL_NIL; + ControlSetId = (PULONG)CmpValueToData(SystemHive, Value, &Length); + if (!ControlSetId) return HCELL_NIL; + if (Length < sizeof(ULONG)) return HCELL_NIL; + + /* Now build the CCS's Name */ + Status = RtlStringCbPrintfW(Buffer, sizeof(Buffer), + L"ControlSet%03lu", *ControlSetId); if (!NT_SUCCESS(Status)) return HCELL_NIL; + /* RtlStringCbPrintfW ensures the buffer to be NULL-terminated */ + RtlInitUnicodeString(&Name, Buffer); /* Now open it */ Node = (PCM_KEY_NODE)HvGetCell(SystemHive, RootCell); if (!Node) return HCELL_NIL; - ControlSetCell = CmpFindSubKeyByName(SystemHive, Node, &KeyName); - if (ControlSetCell == HCELL_NIL) return ControlSetCell; + ControlSetCell = CmpFindSubKeyByName(SystemHive, Node, &Name); + if (ControlSetCell == HCELL_NIL) return HCELL_NIL; /* Get the value of the "Current" CCS */ - RtlInitUnicodeString(&KeyName, L"Current"); + RtlInitUnicodeString(&Name, L"Current"); Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); if (!Node) return HCELL_NIL; - CurrentValueCell = CmpFindValueByName(SystemHive, Node, &KeyName); + CurrentValueCell = CmpFindValueByName(SystemHive, Node, &Name); /* Make sure it exists */ if (CurrentValueCell != HCELL_NIL) { - /* Get the current value and make sure its a ULONG */ - KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, CurrentValueCell); - if (!KeyValue) return HCELL_NIL; - if (KeyValue->Type == REG_DWORD) + /* Get the current value and make sure it's a ULONG */ + Value = (PCM_KEY_VALUE)HvGetCell(SystemHive, CurrentValueCell); + if (!Value) return HCELL_NIL; + if (Value->Type == REG_DWORD) { /* Get the data and update it */ - CurrentData = (PULONG)CmpValueToData(SystemHive, - KeyValue, - &Length); + CurrentData = (PULONG)CmpValueToData(SystemHive, Value, &Length); if (!CurrentData) return HCELL_NIL; + if (Length < sizeof(ULONG)) return HCELL_NIL; + *CurrentData = *ControlSetId; } } - /* Return the CCS Cell */ + /* Return the CCS cell */ return ControlSetCell; } +/** + * @brief + * Finds the index of the driver's "Tag" value + * in its corresponding group ordering list. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] TagCell + * The driver's "Tag" registry value's hive cell. + * + * @param[in] GroupOrderCell + * The hive cell of the "Control\GroupOrderList" registry key + * inside the currently selected control set. + * + * @param[in] GroupName + * The driver's group name. + * + * @return + * The corresponding tag index, or -1 (last position), + * or -2 (next-to-last position). + **/ CODE_SEG("INIT") +static ULONG -NTAPI -CmpFindTagIndex(IN PHHIVE Hive, - IN HCELL_INDEX TagCell, - IN HCELL_INDEX GroupOrderCell, - IN PUNICODE_STRING GroupName) +CmpFindTagIndex( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX TagCell, + _In_ HCELL_INDEX GroupOrderCell, + _In_ PCUNICODE_STRING GroupName) { PCM_KEY_VALUE TagValue, Value; + PCM_KEY_NODE Node; HCELL_INDEX OrderCell; - PULONG TagOrder, DriverTag; + PULONG DriverTag, TagOrder; ULONG CurrentTag, Length; - PCM_KEY_NODE Node; BOOLEAN BufferAllocated; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Get the tag */ Value = (PCM_KEY_VALUE)HvGetCell(Hive, TagCell); - ASSERT(Value); + if (!Value) return -2; + if (Value->Type != REG_DWORD) return -2; DriverTag = (PULONG)CmpValueToData(Hive, Value, &Length); - ASSERT(DriverTag); + if (!DriverTag) return -2; + if (Length < sizeof(ULONG)) return -2; /* Get the order array */ Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrderCell); - ASSERT(Node); + if (!Node) return -2; OrderCell = CmpFindValueByName(Hive, Node, GroupName); if (OrderCell == HCELL_NIL) return -2; /* And read it */ TagValue = (PCM_KEY_VALUE)HvGetCell(Hive, OrderCell); - CmpGetValueData(Hive, TagValue, &Length, (PVOID*)&TagOrder, &BufferAllocated, &OrderCell); - ASSERT(TagOrder); + if (!TagValue) return -2; + if (!CmpGetValueData(Hive, + TagValue, + &Length, + (PVOID*)&TagOrder, + &BufferAllocated, + &OrderCell) + || !TagOrder) + { + return -2; + } /* Parse each tag */ for (CurrentTag = 1; CurrentTag <= TagOrder[0]; CurrentTag++) @@ -169,58 +263,154 @@ CmpFindTagIndex(IN PHHIVE Hive, if (TagOrder[CurrentTag] == *DriverTag) { /* Found it -- return the tag */ - if (BufferAllocated) ExFreePool(TagOrder); + if (BufferAllocated) Hive->Free(TagOrder, Length); return CurrentTag; } } /* No matches, so assume next to last ordering */ - if (BufferAllocated) ExFreePool(TagOrder); + if (BufferAllocated) Hive->Free(TagOrder, Length); return -2; } +#ifdef _BLDR_ + +/** + * @brief + * Checks whether the specified named driver is already in the driver list. + * Optionally returns its corresponding driver node. + * + * @remarks Used in bootloader only. + * + * @param[in] DriverListHead + * The driver list. + * + * @param[in] DriverName + * The name of the driver to search for. + * + * @param[out] FoundDriver + * Optional pointer that receives in output the address of the + * matching driver node, if any, or NULL if none has been found. + * + * @return + * TRUE if the driver has been found, FALSE if not. + **/ CODE_SEG("INIT") BOOLEAN NTAPI -CmpAddDriverToList(IN PHHIVE Hive, - IN HCELL_INDEX DriverCell, - IN HCELL_INDEX GroupOrderCell, - IN PUNICODE_STRING RegistryPath, - IN PLIST_ENTRY BootDriverListHead) +CmpIsDriverInList( + _In_ PLIST_ENTRY DriverListHead, + _In_ PCUNICODE_STRING DriverName, + _Out_opt_ PBOOT_DRIVER_NODE* FoundDriver) +{ + PLIST_ENTRY Entry; + PBOOT_DRIVER_NODE DriverNode; + + for (Entry = DriverListHead->Flink; + Entry != DriverListHead; + Entry = Entry->Flink) + { + DriverNode = CONTAINING_RECORD(Entry, + BOOT_DRIVER_NODE, + ListEntry.Link); + + if (RtlEqualUnicodeString(&DriverNode->Name, + DriverName, + TRUE)) + { + /* The driver node has been found */ + if (FoundDriver) + *FoundDriver = DriverNode; + return TRUE; + } + } + + /* None has been found */ + if (FoundDriver) + *FoundDriver = NULL; + return FALSE; +} + +#endif /* _BLDR_ */ + +/** + * @brief + * Inserts the specified driver entry into the driver list. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] DriverCell + * The registry key's hive cell of the driver to be added, inside + * the "Services" sub-key of the currently selected control set. + * + * @param[in] GroupOrderCell + * The hive cell of the "Control\GroupOrderList" registry key + * inside the currently selected control set. + * + * @param[in] RegistryPath + * Constant UNICODE_STRING pointing to + * "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\". + * + * @param[in,out] DriverListHead + * The driver list where to insert the driver entry. + * + * @return + * TRUE if the driver has been inserted into the list, FALSE if not. + **/ +CODE_SEG("INIT") +BOOLEAN +NTAPI +CmpAddDriverToList( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX DriverCell, + _In_ HCELL_INDEX GroupOrderCell, + _In_ PCUNICODE_STRING RegistryPath, + _Inout_ PLIST_ENTRY DriverListHead) { PBOOT_DRIVER_NODE DriverNode; PBOOT_DRIVER_LIST_ENTRY DriverEntry; PCM_KEY_NODE Node; + PCM_KEY_VALUE Value; ULONG Length; USHORT NameLength; - HCELL_INDEX ValueCell, TagCell; PCM_KEY_VALUE Value; - PUNICODE_STRING FileName, RegistryString; - UNICODE_STRING UnicodeString; + HCELL_INDEX ValueCell, TagCell; + PUNICODE_STRING FilePath, RegistryString; + UNICODE_STRING Name; PULONG ErrorControl; PWCHAR Buffer; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Allocate a driver node and initialize it */ - DriverNode = CmpAllocate(sizeof(BOOT_DRIVER_NODE), FALSE, TAG_CM); - if (!DriverNode) return FALSE; + DriverNode = Hive->Allocate(sizeof(BOOT_DRIVER_NODE), FALSE, TAG_CM); + if (!DriverNode) + return FALSE; + + RtlZeroMemory(DriverNode, sizeof(BOOT_DRIVER_NODE)); DriverEntry = &DriverNode->ListEntry; - DriverEntry->RegistryPath.Buffer = NULL; - DriverEntry->FilePath.Buffer = NULL; /* Get the driver cell */ Node = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell); - ASSERT(Node); + if (!Node) + goto Failure; /* Get the name from the cell */ - DriverNode->Name.Length = Node->Flags & KEY_COMP_NAME ? - CmpCompressedNameSize(Node->Name, Node->NameLength) : - Node->NameLength; - DriverNode->Name.MaximumLength = DriverNode->Name.Length; - NameLength = DriverNode->Name.Length; + NameLength = (Node->Flags & KEY_COMP_NAME) ? + CmpCompressedNameSize(Node->Name, Node->NameLength) : + Node->NameLength; + if (NameLength < sizeof(WCHAR)) + goto Failure; /* Now allocate the buffer for it and copy the name */ - DriverNode->Name.Buffer = CmpAllocate(NameLength, FALSE, TAG_CM); - if (!DriverNode->Name.Buffer) return FALSE; + RtlInitEmptyUnicodeString(&DriverNode->Name, + Hive->Allocate(NameLength, FALSE, TAG_CM), + NameLength); + if (!DriverNode->Name.Buffer) + goto Failure; + + DriverNode->Name.Length = NameLength; if (Node->Flags & KEY_COMP_NAME) { /* Compressed name */ @@ -236,98 +426,134 @@ CmpAddDriverToList(IN PHHIVE Hive, } /* Now find the image path */ - RtlInitUnicodeString(&UnicodeString, L"ImagePath"); - ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); + RtlInitUnicodeString(&Name, L"ImagePath"); + ValueCell = CmpFindValueByName(Hive, Node, &Name); if (ValueCell == HCELL_NIL) { - /* Couldn't find it, so assume the drivers path */ + /* Could not find it, so assume the drivers path */ Length = sizeof(L"System32\\Drivers\\") + NameLength + sizeof(L".sys"); /* Allocate the path name */ - FileName = &DriverEntry->FilePath; - FileName->Length = 0; - FileName->MaximumLength = (USHORT)Length; - FileName->Buffer = CmpAllocate(Length, FALSE,TAG_CM); - if (!FileName->Buffer) return FALSE; + FilePath = &DriverEntry->FilePath; + RtlInitEmptyUnicodeString(FilePath, + Hive->Allocate(Length, FALSE, TAG_CM), + (USHORT)Length); + if (!FilePath->Buffer) + goto Failure; /* Write the path name */ - RtlAppendUnicodeToString(FileName, L"System32\\Drivers\\"); - RtlAppendUnicodeStringToString(FileName, &DriverNode->Name); - RtlAppendUnicodeToString(FileName, L".sys"); + if (!NT_SUCCESS(RtlAppendUnicodeToString(FilePath, L"System32\\Drivers\\")) || + !NT_SUCCESS(RtlAppendUnicodeStringToString(FilePath, &DriverNode->Name)) || + !NT_SUCCESS(RtlAppendUnicodeToString(FilePath, L".sys"))) + { + goto Failure; + } } else { /* Path name exists, so grab it */ Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); - ASSERT(Value); + if (!Value) + goto Failure; + if ((Value->Type != REG_SZ) && (Value->Type != REG_EXPAND_SZ)) + goto Failure; + Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); + if (!Buffer) + goto Failure; + if (IS_NULL_TERMINATED(Buffer, Length)) + Length -= sizeof(UNICODE_NULL); + if (Length < sizeof(WCHAR)) + goto Failure; /* Allocate and setup the path name */ - FileName = &DriverEntry->FilePath; - Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); - FileName->MaximumLength = FileName->Length = (USHORT)Length; - FileName->Buffer = CmpAllocate(Length, FALSE, TAG_CM); + FilePath = &DriverEntry->FilePath; + RtlInitEmptyUnicodeString(FilePath, + Hive->Allocate(Length, FALSE, TAG_CM), + (USHORT)Length); + if (!FilePath->Buffer) + goto Failure; /* Transfer the data */ - if (!(FileName->Buffer) || !(Buffer)) return FALSE; - RtlCopyMemory(FileName->Buffer, Buffer, Length); + RtlCopyMemory(FilePath->Buffer, Buffer, Length); + FilePath->Length = (USHORT)Length; } /* Now build the registry path */ RegistryString = &DriverEntry->RegistryPath; - RegistryString->Length = 0; - RegistryString->MaximumLength = RegistryPath->Length + NameLength; - RegistryString->Buffer = CmpAllocate(RegistryString->MaximumLength, FALSE, TAG_CM); - if (!RegistryString->Buffer) return FALSE; + Length = RegistryPath->Length + NameLength; + RtlInitEmptyUnicodeString(RegistryString, + Hive->Allocate(Length, FALSE, TAG_CM), + (USHORT)Length); + if (!RegistryString->Buffer) + goto Failure; /* Add the driver name to it */ - RtlAppendUnicodeStringToString(RegistryString, RegistryPath); - RtlAppendUnicodeStringToString(RegistryString, &DriverNode->Name); + if (!NT_SUCCESS(RtlAppendUnicodeStringToString(RegistryString, RegistryPath)) || + !NT_SUCCESS(RtlAppendUnicodeStringToString(RegistryString, &DriverNode->Name))) + { + goto Failure; + } /* The entry is done, add it */ - InsertHeadList(BootDriverListHead, &DriverEntry->Link); + InsertHeadList(DriverListHead, &DriverEntry->Link); /* Now find error control settings */ - RtlInitUnicodeString(&UnicodeString, L"ErrorControl"); - ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); + RtlInitUnicodeString(&Name, L"ErrorControl"); + ValueCell = CmpFindValueByName(Hive, Node, &Name); if (ValueCell == HCELL_NIL) { - /* Couldn't find it, so assume default */ + /* Could not find it, so assume default */ DriverNode->ErrorControl = NormalError; } else { /* Otherwise, read whatever the data says */ Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); - ASSERT(Value); + if (!Value) + goto Failure; + if (Value->Type != REG_DWORD) + goto Failure; ErrorControl = (PULONG)CmpValueToData(Hive, Value, &Length); - ASSERT(ErrorControl); + if (!ErrorControl) + goto Failure; + if (Length < sizeof(ULONG)) + goto Failure; + DriverNode->ErrorControl = *ErrorControl; } /* Next, get the group cell */ - RtlInitUnicodeString(&UnicodeString, L"group"); - ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); + RtlInitUnicodeString(&Name, L"group"); + ValueCell = CmpFindValueByName(Hive, Node, &Name); if (ValueCell == HCELL_NIL) { - /* Couldn't find, so set an empty string */ + /* Could not find it, so set an empty string */ RtlInitEmptyUnicodeString(&DriverNode->Group, NULL, 0); } else { /* Found it, read the group value */ Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); - ASSERT(Value); + if (!Value) + goto Failure; + if (Value->Type != REG_SZ) // REG_EXPAND_SZ not really allowed there. + goto Failure; /* Copy it into the node */ - DriverNode->Group.Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); - if (!DriverNode->Group.Buffer) return FALSE; - DriverNode->Group.Length = (USHORT)Length - sizeof(UNICODE_NULL); + Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); + if (!Buffer) + goto Failure; + if (IS_NULL_TERMINATED(Buffer, Length)) + Length -= sizeof(UNICODE_NULL); + + DriverNode->Group.Buffer = Buffer; + DriverNode->Group.Length = (USHORT)Length; DriverNode->Group.MaximumLength = DriverNode->Group.Length; } /* Finally, find the tag */ - RtlInitUnicodeString(&UnicodeString, L"Tag"); - TagCell = CmpFindValueByName(Hive, Node, &UnicodeString); + RtlInitUnicodeString(&Name, L"Tag"); + TagCell = CmpFindValueByName(Hive, Node, &Name); if (TagCell == HCELL_NIL) { /* No tag, so load last */ @@ -342,63 +568,135 @@ CmpAddDriverToList(IN PHHIVE Hive, &DriverNode->Group); } + CMTRACE(CM_BOOT_DEBUG, "Adding boot driver: '%wZ', '%wZ'\n", + &DriverNode->Name, &DriverEntry->FilePath); + /* All done! */ return TRUE; + +Failure: + if (DriverEntry->RegistryPath.Buffer) + { + Hive->Free(DriverEntry->RegistryPath.Buffer, + DriverEntry->RegistryPath.MaximumLength); + } + if (DriverEntry->FilePath.Buffer) + { + Hive->Free(DriverEntry->FilePath.Buffer, + DriverEntry->FilePath.MaximumLength); + } + if (DriverNode->Name.Buffer) + { + Hive->Free(DriverNode->Name.Buffer, + DriverNode->Name.MaximumLength); + } + Hive->Free(DriverNode, sizeof(BOOT_DRIVER_NODE)); + + return FALSE; } +/** + * @brief + * Checks whether the specified driver has the expected load type. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] DriverCell + * The registry key's hive cell of the driver, inside the + * "Services" sub-key of the currently selected control set. + * + * @param[in] LoadType + * The load type the driver should match. + * + * @return + * TRUE if the driver's load type matches, FALSE if not. + **/ CODE_SEG("INIT") +static BOOLEAN -NTAPI -CmpIsLoadType(IN PHHIVE Hive, - IN HCELL_INDEX Cell, - IN SERVICE_LOAD_TYPE LoadType) +CmpIsLoadType( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX Cell, + _In_ SERVICE_LOAD_TYPE LoadType) { PCM_KEY_NODE Node; - HCELL_INDEX ValueCell; - UNICODE_STRING ValueString = RTL_CONSTANT_STRING(L"Start"); PCM_KEY_VALUE Value; + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"Start"); + HCELL_INDEX ValueCell; ULONG Length; - PLONG Data; + PULONG Data; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the start cell */ Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); - ASSERT(Node); - ValueCell = CmpFindValueByName(Hive, Node, &ValueString); + if (!Node) return FALSE; + ValueCell = CmpFindValueByName(Hive, Node, &Name); if (ValueCell == HCELL_NIL) return FALSE; /* Read the start value */ Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell); - ASSERT(Value); - Data = (PLONG)CmpValueToData(Hive, Value, &Length); - ASSERT(Data); + if (!Value) return FALSE; + if (Value->Type != REG_DWORD) return FALSE; + Data = (PULONG)CmpValueToData(Hive, Value, &Length); + if (!Data) return FALSE; + if (Length < sizeof(ULONG)) return FALSE; /* Return if the type matches */ return (*Data == LoadType); } +/** + * @brief + * Enumerates all drivers within the given control set and load type, + * present in the "Services" sub-key, and inserts them into the driver list. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] ControlSet + * The control set registry key's hive cell. + * + * @param[in] LoadType + * The load type the driver should match. + * + * @param[in] BootFileSystem + * Optional name of the boot file system, for which to insert + * its corresponding driver. + * + * @param[in,out] DriverListHead + * The driver list where to insert the enumerated drivers. + * + * @return + * TRUE if the drivers have been successfully enumerated and inserted, + * FALSE if not. + **/ CODE_SEG("INIT") BOOLEAN NTAPI -CmpFindDrivers(IN PHHIVE Hive, - IN HCELL_INDEX ControlSet, - IN SERVICE_LOAD_TYPE LoadType, - IN PWCHAR BootFileSystem OPTIONAL, - IN PLIST_ENTRY DriverListHead) +CmpFindDrivers( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX ControlSet, + _In_ SERVICE_LOAD_TYPE LoadType, + _In_opt_ PCWSTR BootFileSystem, + _Inout_ PLIST_ENTRY DriverListHead) { HCELL_INDEX ServicesCell, ControlCell, GroupOrderCell, DriverCell; HCELL_INDEX SafeBootCell = HCELL_NIL; - UNICODE_STRING Name; ULONG i; - WCHAR Buffer[128]; - UNICODE_STRING UnicodeString, KeyPath; - PBOOT_DRIVER_NODE FsNode; + UNICODE_STRING Name; + UNICODE_STRING KeyPath; PCM_KEY_NODE ControlNode, ServicesNode, Node; + PBOOT_DRIVER_NODE FsNode; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the control set key */ ControlNode = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet); - ASSERT(ControlNode); + if (!ControlNode) return FALSE; /* Get services cell */ RtlInitUnicodeString(&Name, L"Services"); @@ -407,7 +705,7 @@ CmpFindDrivers(IN PHHIVE Hive, /* Open services key */ ServicesNode = (PCM_KEY_NODE)HvGetCell(Hive, ServicesCell); - ASSERT(ServicesNode); + if (!ServicesNode) return FALSE; /* Get control cell */ RtlInitUnicodeString(&Name, L"Control"); @@ -415,26 +713,26 @@ CmpFindDrivers(IN PHHIVE Hive, if (ControlCell == HCELL_NIL) return FALSE; /* Get the group order cell and read it */ - RtlInitUnicodeString(&Name, L"GroupOrderList"); Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell); - ASSERT(Node); + if (!Node) return FALSE; + RtlInitUnicodeString(&Name, L"GroupOrderList"); GroupOrderCell = CmpFindSubKeyByName(Hive, Node, &Name); if (GroupOrderCell == HCELL_NIL) return FALSE; /* Get Safe Boot cell */ - if(InitSafeBootMode) + if (InitSafeBootMode) { /* Open the Safe Boot key */ RtlInitUnicodeString(&Name, L"SafeBoot"); Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell); - ASSERT(Node); + if (!Node) return FALSE; SafeBootCell = CmpFindSubKeyByName(Hive, Node, &Name); if (SafeBootCell == HCELL_NIL) return FALSE; /* Open the correct start key (depending on the mode) */ Node = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell); - ASSERT(Node); - switch(InitSafeBootMode) + if (!Node) return FALSE; + switch (InitSafeBootMode) { /* NOTE: Assumes MINIMAL (1) and DSREPAIR (3) load same items */ case 1: @@ -443,14 +741,13 @@ CmpFindDrivers(IN PHHIVE Hive, default: return FALSE; } SafeBootCell = CmpFindSubKeyByName(Hive, Node, &Name); - if(SafeBootCell == HCELL_NIL) return FALSE; + if (SafeBootCell == HCELL_NIL) return FALSE; } /* Build the root registry path */ - RtlInitEmptyUnicodeString(&KeyPath, Buffer, sizeof(Buffer)); - RtlAppendUnicodeToString(&KeyPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + RtlInitUnicodeString(&KeyPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - /* Find the first subkey (ie: the first driver or service) */ + /* Enumerate each sub-key */ i = 0; DriverCell = CmpFindSubKeyByNumber(Hive, ServicesNode, i); while (DriverCell != HCELL_NIL) @@ -460,15 +757,17 @@ CmpFindDrivers(IN PHHIVE Hive, CmpIsSafe(Hive, SafeBootCell, DriverCell)) { /* Add it to the list */ - CmpAddDriverToList(Hive, - DriverCell, - GroupOrderCell, - &KeyPath, - DriverListHead); - + if (!CmpAddDriverToList(Hive, + DriverCell, + GroupOrderCell, + &KeyPath, + DriverListHead)) + { + CMTRACE(CM_BOOT_DEBUG, " Failed to add boot driver\n"); + } } - /* Try the next subkey */ + /* Go to the next sub-key */ DriverCell = CmpFindSubKeyByNumber(Hive, ServicesNode, ++i); } @@ -476,22 +775,30 @@ CmpFindDrivers(IN PHHIVE Hive, if (BootFileSystem) { /* Find it */ - RtlInitUnicodeString(&UnicodeString, BootFileSystem); - DriverCell = CmpFindSubKeyByName(Hive, ServicesNode, &UnicodeString); + RtlInitUnicodeString(&Name, BootFileSystem); + DriverCell = CmpFindSubKeyByName(Hive, ServicesNode, &Name); if (DriverCell != HCELL_NIL) { + CMTRACE(CM_BOOT_DEBUG, "Adding Boot FileSystem '%S'\n", + BootFileSystem); + /* Always add it to the list */ - CmpAddDriverToList(Hive, - DriverCell, - GroupOrderCell, - &KeyPath, - DriverListHead); - - /* Mark it as critical so it always loads */ - FsNode = CONTAINING_RECORD(DriverListHead->Flink, - BOOT_DRIVER_NODE, - ListEntry.Link); - FsNode->ErrorControl = SERVICE_ERROR_CRITICAL; + if (!CmpAddDriverToList(Hive, + DriverCell, + GroupOrderCell, + &KeyPath, + DriverListHead)) + { + CMTRACE(CM_BOOT_DEBUG, " Failed to add boot driver\n"); + } + else + { + /* Mark it as critical so it always loads */ + FsNode = CONTAINING_RECORD(DriverListHead->Flink, + BOOT_DRIVER_NODE, + ListEntry.Link); + FsNode->ErrorControl = SERVICE_ERROR_CRITICAL; + } } } @@ -499,15 +806,32 @@ CmpFindDrivers(IN PHHIVE Hive, return TRUE; } +/** + * @brief + * Performs the driver list sorting, according to the ordering list. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] ControlSet + * The control set registry key's hive cell. + * + * @param[in,out] DriverListHead + * The driver list to sort. + * + * @return + * TRUE if sorting has been successfully done, FALSE if not. + **/ CODE_SEG("INIT") +static BOOLEAN -NTAPI -CmpDoSort(IN PLIST_ENTRY DriverListHead, - IN PUNICODE_STRING OrderList) +CmpDoSort( + _Inout_ PLIST_ENTRY DriverListHead, + _In_ PCUNICODE_STRING OrderList) { PWCHAR Current, End = NULL; - PLIST_ENTRY NextEntry; UNICODE_STRING GroupName; + PLIST_ENTRY NextEntry; PBOOT_DRIVER_NODE CurrentNode; /* We're going from end to start, so get to the last group and keep going */ @@ -536,11 +860,11 @@ CmpDoSort(IN PLIST_ENTRY DriverListHead, ListEntry.Link); /* Get the next entry now since we'll do a relink */ - NextEntry = CurrentNode->ListEntry.Link.Flink; + NextEntry = NextEntry->Flink; /* Is there a group name and does it match the current group? */ - if ((CurrentNode->Group.Buffer) && - (RtlEqualUnicodeString(&GroupName, &CurrentNode->Group, TRUE))) + if (CurrentNode->Group.Buffer && + RtlEqualUnicodeString(&GroupName, &CurrentNode->Group, TRUE)) { /* Remove from this location and re-link in the new one */ RemoveEntryList(&CurrentNode->ListEntry.Link); @@ -549,67 +873,89 @@ CmpDoSort(IN PLIST_ENTRY DriverListHead, } /* Move on */ - Current--; + --Current; } /* All done */ return TRUE; } +/** + * @brief + * Sorts the driver list, according to the drivers' group load ordering. + * + * @param[in] Hive + * The SYSTEM hive. + * + * @param[in] ControlSet + * The control set registry key's hive cell. + * + * @param[in,out] DriverListHead + * The driver list to sort. + * + * @return + * TRUE if sorting has been successfully done, FALSE if not. + **/ CODE_SEG("INIT") BOOLEAN NTAPI -CmpSortDriverList(IN PHHIVE Hive, - IN HCELL_INDEX ControlSet, - IN PLIST_ENTRY DriverListHead) +CmpSortDriverList( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX ControlSet, + _Inout_ PLIST_ENTRY DriverListHead) { - HCELL_INDEX Controls, GroupOrder, ListCell; - UNICODE_STRING Name, DependList; - PCM_KEY_VALUE ListNode; - ULONG Length; PCM_KEY_NODE Node; + PCM_KEY_VALUE ListValue; + HCELL_INDEX ControlCell, GroupOrder, ListCell; + UNICODE_STRING Name, OrderList; + ULONG Length; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Open the control key */ Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet); - ASSERT(Node); + if (!Node) return FALSE; RtlInitUnicodeString(&Name, L"Control"); - Controls = CmpFindSubKeyByName(Hive, Node, &Name); - if (Controls == HCELL_NIL) return FALSE; + ControlCell = CmpFindSubKeyByName(Hive, Node, &Name); + if (ControlCell == HCELL_NIL) return FALSE; /* Open the service group order */ - Node = (PCM_KEY_NODE)HvGetCell(Hive, Controls); - ASSERT(Node); + Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell); + if (!Node) return FALSE; RtlInitUnicodeString(&Name, L"ServiceGroupOrder"); GroupOrder = CmpFindSubKeyByName(Hive, Node, &Name); if (GroupOrder == HCELL_NIL) return FALSE; /* Open the list key */ Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrder); - ASSERT(Node); + if (!Node) return FALSE; RtlInitUnicodeString(&Name, L"list"); ListCell = CmpFindValueByName(Hive, Node, &Name); if (ListCell == HCELL_NIL) return FALSE; - /* Now read the actual list */ - ListNode = (PCM_KEY_VALUE)HvGetCell(Hive, ListCell); - ASSERT(ListNode); - if (ListNode->Type != REG_MULTI_SZ) return FALSE; + /* Read the actual list */ + ListValue = (PCM_KEY_VALUE)HvGetCell(Hive, ListCell); + if (!ListValue) return FALSE; + if (ListValue->Type != REG_MULTI_SZ) return FALSE; /* Copy it into a buffer */ - DependList.Buffer = (PWCHAR)CmpValueToData(Hive, ListNode, &Length); - if (!DependList.Buffer) return FALSE; - DependList.Length = DependList.MaximumLength = (USHORT)Length - sizeof(UNICODE_NULL); - - /* And start the recurive sort algorithm */ - return CmpDoSort(DriverListHead, &DependList); + OrderList.Buffer = (PWCHAR)CmpValueToData(Hive, ListValue, &Length); + if (!OrderList.Buffer) return FALSE; + if (!IS_NULL_TERMINATED(OrderList.Buffer, Length)) return FALSE; + OrderList.Length = (USHORT)Length - sizeof(UNICODE_NULL); + OrderList.MaximumLength = OrderList.Length; + + /* And start the sort algorithm */ + return CmpDoSort(DriverListHead, &OrderList); } CODE_SEG("INIT") +static BOOLEAN -NTAPI -CmpOrderGroup(IN PBOOT_DRIVER_NODE StartNode, - IN PBOOT_DRIVER_NODE EndNode) +CmpOrderGroup( + _In_ PBOOT_DRIVER_NODE StartNode, + _In_ PBOOT_DRIVER_NODE EndNode) { PBOOT_DRIVER_NODE CurrentNode, PreviousNode; PLIST_ENTRY ListEntry; @@ -668,10 +1014,21 @@ CmpOrderGroup(IN PBOOT_DRIVER_NODE StartNode, return TRUE; } +/** + * @brief + * Removes potential circular dependencies (cycles) and sorts the driver list. + * + * @param[in,out] DriverListHead + * The driver list to sort. + * + * @return + * Always TRUE. + **/ CODE_SEG("INIT") BOOLEAN NTAPI -CmpResolveDriverDependencies(IN PLIST_ENTRY DriverListHead) +CmpResolveDriverDependencies( + _Inout_ PLIST_ENTRY DriverListHead) { PLIST_ENTRY NextEntry; PBOOT_DRIVER_NODE StartNode, EndNode, CurrentNode; @@ -719,60 +1076,76 @@ CmpResolveDriverDependencies(IN PLIST_ENTRY DriverListHead) } CODE_SEG("INIT") +static BOOLEAN -NTAPI -CmpIsSafe(IN PHHIVE Hive, - IN HCELL_INDEX SafeBootCell, - IN HCELL_INDEX DriverCell) +CmpIsSafe( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX SafeBootCell, + _In_ HCELL_INDEX DriverCell) { PCM_KEY_NODE SafeBootNode; PCM_KEY_NODE DriverNode; PCM_KEY_VALUE KeyValue; HCELL_INDEX CellIndex; - ULONG Length = 0; + ULONG Length; UNICODE_STRING Name; - PWCHAR OriginalName; + PWCHAR Buffer; + + /* Sanity check: We shouldn't need to release any acquired cells */ ASSERT(Hive->ReleaseCellRoutine == NULL); /* Driver key node (mandatory) */ ASSERT(DriverCell != HCELL_NIL); DriverNode = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell); - ASSERT(DriverNode); + if (!DriverNode) return FALSE; /* Safe boot key node (optional but return TRUE if not present) */ - if(SafeBootCell == HCELL_NIL) return TRUE; + if (SafeBootCell == HCELL_NIL) return TRUE; SafeBootNode = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell); - if(!SafeBootNode) return FALSE; + if (!SafeBootNode) return FALSE; /* Search by the name from the group */ RtlInitUnicodeString(&Name, L"Group"); CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); - if(CellIndex != HCELL_NIL) + if (CellIndex != HCELL_NIL) { KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); - ASSERT(KeyValue); - if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) + if (!KeyValue) return FALSE; + + if (KeyValue->Type == REG_SZ) // REG_EXPAND_SZ not really allowed there. { /* Compose the search 'key' */ - Name.Buffer = (PWCHAR)CmpValueToData(Hive, KeyValue, &Length); - if (!Name.Buffer) return FALSE; - Name.Length = (USHORT)Length - sizeof(UNICODE_NULL); + Buffer = (PWCHAR)CmpValueToData(Hive, KeyValue, &Length); + if (!Buffer) + return FALSE; + if (IS_NULL_TERMINATED(Buffer, Length)) + Length -= sizeof(UNICODE_NULL); + + Name.Buffer = Buffer; + Name.Length = (USHORT)Length; Name.MaximumLength = Name.Length; + /* Search for corresponding key in the Safe Boot key */ CellIndex = CmpFindSubKeyByName(Hive, SafeBootNode, &Name); - if(CellIndex != HCELL_NIL) return TRUE; + if (CellIndex != HCELL_NIL) return TRUE; } } /* Group has not been found - find driver name */ - Name.Length = DriverNode->Flags & KEY_COMP_NAME ? - CmpCompressedNameSize(DriverNode->Name, - DriverNode->NameLength) : - DriverNode->NameLength; - Name.MaximumLength = Name.Length; + Length = (DriverNode->Flags & KEY_COMP_NAME) ? + CmpCompressedNameSize(DriverNode->Name, DriverNode->NameLength) : + DriverNode->NameLength; + if (Length < sizeof(WCHAR)) + return FALSE; + /* Now allocate the buffer for it and copy the name */ - Name.Buffer = CmpAllocate(Name.Length, FALSE, TAG_CM); - if (!Name.Buffer) return FALSE; + RtlInitEmptyUnicodeString(&Name, + Hive->Allocate(Length, FALSE, TAG_CM), + (USHORT)Length); + if (!Name.Buffer) + return FALSE; + + Name.Length = (USHORT)Length; if (DriverNode->Flags & KEY_COMP_NAME) { /* Compressed name */ @@ -786,38 +1159,102 @@ CmpIsSafe(IN PHHIVE Hive, /* Normal name */ RtlCopyMemory(Name.Buffer, DriverNode->Name, DriverNode->NameLength); } + CellIndex = CmpFindSubKeyByName(Hive, SafeBootNode, &Name); - RtlFreeUnicodeString(&Name); - if(CellIndex != HCELL_NIL) return TRUE; + Hive->Free(Name.Buffer, Name.MaximumLength); + if (CellIndex != HCELL_NIL) return TRUE; /* Not group or driver name - search by image name */ RtlInitUnicodeString(&Name, L"ImagePath"); CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); - if(CellIndex != HCELL_NIL) + if (CellIndex != HCELL_NIL) { KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); - ASSERT(KeyValue); - if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) + if (!KeyValue) return FALSE; + + if ((KeyValue->Type == REG_SZ) || (KeyValue->Type == REG_EXPAND_SZ)) { /* Compose the search 'key' */ - OriginalName = (PWCHAR)CmpValueToData(Hive, KeyValue, &Length); - if (!OriginalName) return FALSE; + Buffer = (PWCHAR)CmpValueToData(Hive, KeyValue, &Length); + if (!Buffer) return FALSE; + if (Length < sizeof(WCHAR)) return FALSE; + /* Get the base image file name */ - Name.Buffer = wcsrchr(OriginalName, L'\\'); + // FIXME: wcsrchr() may fail if Buffer is *not* NULL-terminated! + Name.Buffer = wcsrchr(Buffer, OBJ_NAME_PATH_SEPARATOR); if (!Name.Buffer) return FALSE; ++Name.Buffer; - /* Length of the base name must be >=1 */ - Name.Length = (USHORT)Length - (USHORT)((PUCHAR)Name.Buffer - (PUCHAR)OriginalName) - - sizeof(UNICODE_NULL); - if(Name.Length < 1) return FALSE; + + /* Length of the base name must be >=1 WCHAR */ + if (((ULONG_PTR)Name.Buffer - (ULONG_PTR)Buffer) >= Length) + return FALSE; + Length -= ((ULONG_PTR)Name.Buffer - (ULONG_PTR)Buffer); + if (IS_NULL_TERMINATED(Name.Buffer, Length)) + Length -= sizeof(UNICODE_NULL); + if (Length < sizeof(WCHAR)) return FALSE; + + Name.Length = (USHORT)Length; Name.MaximumLength = Name.Length; + /* Search for corresponding key in the Safe Boot key */ CellIndex = CmpFindSubKeyByName(Hive, SafeBootNode, &Name); - if(CellIndex != HCELL_NIL) return TRUE; + if (CellIndex != HCELL_NIL) return TRUE; } } + /* Nothing found - nothing else to search */ return FALSE; } +/** + * @brief + * Empties the driver list and frees all allocated driver nodes in it. + * + * @param[in] Hive + * The SYSTEM hive (used only for the Hive->Free() memory deallocator). + * + * @param[in,out] DriverListHead + * The driver list to free. + * + * @return None + **/ +CODE_SEG("INIT") +VOID +NTAPI +CmpFreeDriverList( + _In_ PHHIVE Hive, + _Inout_ PLIST_ENTRY DriverListHead) +{ + PLIST_ENTRY Entry; + PBOOT_DRIVER_NODE DriverNode; + + /* Loop through the list and remove each driver node */ + while (!IsListEmpty(DriverListHead)) + { + /* Get the driver node */ + Entry = RemoveHeadList(DriverListHead); + DriverNode = CONTAINING_RECORD(Entry, + BOOT_DRIVER_NODE, + ListEntry.Link); + + /* Free any allocated string buffers, then the node */ + if (DriverNode->ListEntry.RegistryPath.Buffer) + { + Hive->Free(DriverNode->ListEntry.RegistryPath.Buffer, + DriverNode->ListEntry.RegistryPath.MaximumLength); + } + if (DriverNode->ListEntry.FilePath.Buffer) + { + Hive->Free(DriverNode->ListEntry.FilePath.Buffer, + DriverNode->ListEntry.FilePath.MaximumLength); + } + if (DriverNode->Name.Buffer) + { + Hive->Free(DriverNode->Name.Buffer, + DriverNode->Name.MaximumLength); + } + Hive->Free(DriverNode, sizeof(BOOT_DRIVER_NODE)); + } +} + /* EOF */ diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 9b9c37bd27a..5260cb69a42 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1721,55 +1721,6 @@ CmInitSystem1(VOID) return TRUE; } -CODE_SEG("INIT") -VOID -NTAPI -CmpFreeDriverList(IN PHHIVE Hive, - IN PLIST_ENTRY DriverList) -{ - PLIST_ENTRY NextEntry, OldEntry; - PBOOT_DRIVER_NODE DriverNode; - PAGED_CODE(); - - /* Parse the current list */ - NextEntry = DriverList->Flink; - while (NextEntry != DriverList) - { - /* Get the driver node */ - DriverNode = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_NODE, ListEntry.Link); - - /* Get the next entry now, since we're going to free it later */ - OldEntry = NextEntry; - NextEntry = NextEntry->Flink; - - /* Was there a name? */ - if (DriverNode->Name.Buffer) - { - /* Free it */ - CmpFree(DriverNode->Name.Buffer, DriverNode->Name.Length); - } - - /* Was there a registry path? */ - if (DriverNode->ListEntry.RegistryPath.Buffer) - { - /* Free it */ - CmpFree(DriverNode->ListEntry.RegistryPath.Buffer, - DriverNode->ListEntry.RegistryPath.MaximumLength); - } - - /* Was there a file path? */ - if (DriverNode->ListEntry.FilePath.Buffer) - { - /* Free it */ - CmpFree(DriverNode->ListEntry.FilePath.Buffer, - DriverNode->ListEntry.FilePath.MaximumLength); - } - - /* Now free the node, and move on */ - CmpFree(OldEntry, sizeof(BOOT_DRIVER_NODE)); - } -} - CODE_SEG("INIT") PUNICODE_STRING* NTAPI diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index a251ab1bead..bd3dbe515e8 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -5,9 +5,12 @@ * PURPOSE: Internal header for the Configuration Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#define _CM_ -#include "cmlib.h" + +#pragma once + +#include <cmlib.h> #include <cmreslist.h> +#include "cmboot.h" // // Define this if you want debugging support @@ -1168,16 +1171,6 @@ CmpCreateLinkNode( // // Boot Routines // -CODE_SEG("INIT") -HCELL_INDEX -NTAPI -CmpFindControlSet( - IN PHHIVE SystemHive, - IN HCELL_INDEX RootCell, - IN PUNICODE_STRING SelectKeyName, - OUT PBOOLEAN AutoSelect -); - CODE_SEG("INIT") VOID NTAPI @@ -1453,41 +1446,6 @@ CmGetSystemDriverList( VOID ); -CODE_SEG("INIT") -BOOLEAN -NTAPI -CmpFindDrivers( - IN PHHIVE Hive, - IN HCELL_INDEX ControlSet, - IN SERVICE_LOAD_TYPE LoadType, - IN PWSTR BootFileSystem OPTIONAL, - IN PLIST_ENTRY DriverListHead -); - -CODE_SEG("INIT") -BOOLEAN -NTAPI -CmpSortDriverList( - IN PHHIVE Hive, - IN HCELL_INDEX ControlSet, - IN PLIST_ENTRY DriverListHead -); - -CODE_SEG("INIT") -BOOLEAN -NTAPI -CmpResolveDriverDependencies( - IN PLIST_ENTRY DriverListHead -); - -CODE_SEG("INIT") -BOOLEAN -NTAPI -CmpIsSafe( - IN PHHIVE Hive, - IN HCELL_INDEX SafeBootCell, - IN HCELL_INDEX DriverCell); - // // Global variables accessible from all of Cm // diff --git a/ntoskrnl/include/internal/cmboot.h b/ntoskrnl/include/internal/cmboot.h new file mode 100644 index 00000000000..39d0ce098c2 --- /dev/null +++ b/ntoskrnl/include/internal/cmboot.h @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Configuration Manager - Boot Initialization Internal header + * COPYRIGHT: Copyright 2010 ReactOS Portable Systems Group + * + * NOTE: This module is shared by both the kernel and the bootloader. + */ + +// +// Boot Driver Node +// +typedef struct _BOOT_DRIVER_NODE +{ + BOOT_DRIVER_LIST_ENTRY ListEntry; + UNICODE_STRING Group; + UNICODE_STRING Name; + ULONG Tag; + ULONG ErrorControl; +} BOOT_DRIVER_NODE, *PBOOT_DRIVER_NODE; + + +// +// Boot Routines +// +CODE_SEG("INIT") +HCELL_INDEX +NTAPI +CmpFindControlSet( + _In_ PHHIVE SystemHive, + _In_ HCELL_INDEX RootCell, + _In_ PCUNICODE_STRING SelectKeyName, + _Out_ PBOOLEAN AutoSelect); + + +// +// Driver List Routines +// +#ifdef _BLDR_ + +CODE_SEG("INIT") +BOOLEAN +NTAPI +CmpIsDriverInList( + _In_ PLIST_ENTRY DriverListHead, + _In_ PCUNICODE_STRING DriverName, + _Out_opt_ PBOOT_DRIVER_NODE* FoundDriver); + +#endif /* _BLDR_ */ + +CODE_SEG("INIT") +BOOLEAN +NTAPI +CmpFindDrivers( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX ControlSet, + _In_ SERVICE_LOAD_TYPE LoadType, + _In_opt_ PCWSTR BootFileSystem, + _Inout_ PLIST_ENTRY DriverListHead); + +CODE_SEG("INIT") +BOOLEAN +NTAPI +CmpSortDriverList( + _In_ PHHIVE Hive, + _In_ HCELL_INDEX ControlSet, + _Inout_ PLIST_ENTRY DriverListHead); + +CODE_SEG("INIT") +BOOLEAN +NTAPI +CmpResolveDriverDependencies( + _Inout_ PLIST_ENTRY DriverListHead); + +CODE_SEG("INIT") +VOID +NTAPI +CmpFreeDriverList( + _In_ PHHIVE Hive, + _Inout_ PLIST_ENTRY DriverListHead); diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 46470e9835c..ca18912a941 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/include/internal/io.h -* PURPOSE: Internal header for the I/O Manager -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/internal/io.h + * PURPOSE: Internal header for the I/O Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ #include "ntdddisk.h" @@ -410,18 +410,6 @@ typedef struct _DRIVER_INFORMATION NTSTATUS Status; } DRIVER_INFORMATION, *PDRIVER_INFORMATION; -// -// Boot Driver Node -// -typedef struct _BOOT_DRIVER_NODE -{ - BOOT_DRIVER_LIST_ENTRY ListEntry; - UNICODE_STRING Group; - UNICODE_STRING Name; - ULONG Tag; - ULONG ErrorControl; -} BOOT_DRIVER_NODE, *PBOOT_DRIVER_NODE; - // // List of Bus Type GUIDs //

2 years, 8 months

[reactos] 01/01: [SDK:CMLIB] Use Hive->Allocate / Hive->Free where possible.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a03fb7099eb4b1a36e24… commit 6a03fb7099eb4b1a36e24d9c99e36265d2948bfc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 27 18:44:53 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 16 18:33:24 2022 +0200 [SDK:CMLIB] Use Hive->Allocate / Hive->Free where possible. --- sdk/lib/cmlib/cmindex.c | 14 +++++--------- sdk/lib/cmlib/cmvalue.c | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sdk/lib/cmlib/cmindex.c b/sdk/lib/cmlib/cmindex.c index 0e6ccf04c2a..9ab2ae9931e 100644 --- a/sdk/lib/cmlib/cmindex.c +++ b/sdk/lib/cmlib/cmindex.c @@ -793,9 +793,7 @@ CmpMarkIndexDirty(IN PHHIVE Hive, SearchName.Length = CmpCompressedNameSize(Node->Name, Node->NameLength); SearchName.MaximumLength = SearchName.Length; - SearchName.Buffer = CmpAllocate(SearchName.Length, - TRUE, - TAG_CM); + SearchName.Buffer = Hive->Allocate(SearchName.Length, TRUE, TAG_CM); if (!SearchName.Buffer) { /* Fail */ @@ -889,7 +887,7 @@ CmpMarkIndexDirty(IN PHHIVE Hive, if (Child != HCELL_NIL) { /* We found it, free the name now */ - if (IsCompressed) CmpFree(SearchName.Buffer, 0); + if (IsCompressed) Hive->Free(SearchName.Buffer, 0); /* Release the parent key */ HvReleaseCell(Hive, ParentKey); @@ -914,7 +912,7 @@ Quickie: if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); /* Free the search name and return failure */ - if (IsCompressed) CmpFree(SearchName.Buffer, 0); + if (IsCompressed) Hive->Free(SearchName.Buffer, 0); return FALSE; } @@ -1731,9 +1729,7 @@ CmpRemoveSubKey(IN PHHIVE Hive, if (SearchName.MaximumLength > sizeof(Buffer)) { /* Allocate one */ - SearchName.Buffer = CmpAllocate(SearchName.Length, - TRUE, - TAG_CM); + SearchName.Buffer = Hive->Allocate(SearchName.Length, TRUE, TAG_CM); if (!SearchName.Buffer) return FALSE; } else @@ -1872,7 +1868,7 @@ Exit: if ((IsCompressed) && (SearchName.MaximumLength > sizeof(Buffer))) { /* Free the buffer we allocated */ - CmpFree(SearchName.Buffer, 0); + Hive->Free(SearchName.Buffer, 0); } /* Return the result */ diff --git a/sdk/lib/cmlib/cmvalue.c b/sdk/lib/cmlib/cmvalue.c index a9c46a9fcdf..2a5e69d4175 100644 --- a/sdk/lib/cmlib/cmvalue.c +++ b/sdk/lib/cmlib/cmvalue.c @@ -194,7 +194,7 @@ CmpValueToData(IN PHHIVE Hive, if (BufferAllocated) { /* Free the buffer and bugcheck */ - CmpFree(Buffer, 0); + Hive->Free(Buffer, 0); KeBugCheckEx(REGISTRY_ERROR, 8, 0, (ULONG_PTR)Hive, (ULONG_PTR)Value); }

2 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2022