Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[akhaldi] 69457: [SCHANNEL] Fix missing p in the function pointers. By Ismael Ferreras Morezuelas. CORE-9065
by akhaldi＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: akhaldi Date: Mon Oct 5 11:43:41 2015 New Revision: 69457 URL: http://svn.reactos.org/svn/reactos?rev=69457&view=rev Log: [SCHANNEL] Fix missing p in the function pointers. By Ismael Ferreras Morezuelas. CORE-9065 Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] Mon Oct 5 11:43:41 2015 @@ -137,35 +137,35 @@ /* seamlessly redirect the function pointers with some preprocessor magic */ -#define mbedtls_ctr_drbg_free mbedtls_ctr_drbg_free -#define mbedtls_ctr_drbg_init mbedtls_ctr_drbg_init -#define mbedtls_ctr_drbg_random mbedtls_ctr_drbg_random -#define mbedtls_entropy_free mbedtls_entropy_free -#define mbedtls_entropy_func mbedtls_entropy_func -#define mbedtls_entropy_init mbedtls_entropy_init -#define mbedtls_ssl_ciphersuite_from_id mbedtls_ssl_ciphersuite_from_id -#define mbedtls_ssl_free mbedtls_ssl_free -#define mbedtls_ssl_get_ciphersuite mbedtls_ssl_get_ciphersuite -#define mbedtls_ssl_get_ciphersuite_id mbedtls_ssl_get_ciphersuite_id -#define mbedtls_ssl_get_max_frag_len mbedtls_ssl_get_max_frag_len -#define mbedtls_ssl_get_version mbedtls_ssl_get_version -#define mbedtls_ssl_handshake mbedtls_ssl_handshake -#define mbedtls_ssl_init mbedtls_ssl_init -#define mbedtls_ssl_read mbedtls_ssl_read -#define mbedtls_ssl_conf_authmode mbedtls_ssl_conf_authmode -#define mbedtls_ssl_set_bio mbedtls_ssl_set_bio -#define mbedtls_ssl_conf_endpoint mbedtls_ssl_conf_endpoint -#define mbedtls_ssl_set_hostname mbedtls_ssl_set_hostname -#define mbedtls_ssl_conf_max_version mbedtls_ssl_conf_max_version -#define mbedtls_ssl_conf_min_version mbedtls_ssl_conf_min_version -#define mbedtls_ssl_conf_rng mbedtls_ssl_conf_rng -#define mbedtls_ssl_write mbedtls_ssl_write -#define mbedtls_ssl_get_peer_cert mbedtls_ssl_get_peer_cert -#define mbedtls_ssl_config_init mbedtls_ssl_config_init -#define mbedtls_ssl_config_defaults mbedtls_ssl_config_defaults -#define mbedtls_ssl_conf_dbg mbedtls_ssl_conf_dbg -#define mbedtls_ssl_setup mbedtls_ssl_setup -#define mbedtls_cipher_info_from_type mbedtls_cipher_info_from_type -#define mbedtls_md_info_from_type mbedtls_md_info_from_type -#define mbedtls_pk_get_bitlen mbedtls_pk_get_bitlen -#define mbedtls_ctr_drbg_seed mbedtls_ctr_drbg_seed +#define mbedtls_ctr_drbg_free pmbedtls_ctr_drbg_free +#define mbedtls_ctr_drbg_init pmbedtls_ctr_drbg_init +#define mbedtls_ctr_drbg_random pmbedtls_ctr_drbg_random +#define mbedtls_entropy_free pmbedtls_entropy_free +#define mbedtls_entropy_func pmbedtls_entropy_func +#define mbedtls_entropy_init pmbedtls_entropy_init +#define mbedtls_ssl_ciphersuite_from_id pmbedtls_ssl_ciphersuite_from_id +#define mbedtls_ssl_free pmbedtls_ssl_free +#define mbedtls_ssl_get_ciphersuite pmbedtls_ssl_get_ciphersuite +#define mbedtls_ssl_get_ciphersuite_id pmbedtls_ssl_get_ciphersuite_id +#define mbedtls_ssl_get_max_frag_len pmbedtls_ssl_get_max_frag_len +#define mbedtls_ssl_get_version pmbedtls_ssl_get_version +#define mbedtls_ssl_handshake pmbedtls_ssl_handshake +#define mbedtls_ssl_init pmbedtls_ssl_init +#define mbedtls_ssl_read pmbedtls_ssl_read +#define mbedtls_ssl_conf_authmode pmbedtls_ssl_conf_authmode +#define mbedtls_ssl_set_bio pmbedtls_ssl_set_bio +#define mbedtls_ssl_conf_endpoint pmbedtls_ssl_conf_endpoint +#define mbedtls_ssl_set_hostname pmbedtls_ssl_set_hostname +#define mbedtls_ssl_conf_max_version pmbedtls_ssl_conf_max_version +#define mbedtls_ssl_conf_min_version pmbedtls_ssl_conf_min_version +#define mbedtls_ssl_conf_rng pmbedtls_ssl_conf_rng +#define mbedtls_ssl_write pmbedtls_ssl_write +#define mbedtls_ssl_get_peer_cert pmbedtls_ssl_get_peer_cert +#define mbedtls_ssl_config_init pmbedtls_ssl_config_init +#define mbedtls_ssl_config_defaults pmbedtls_ssl_config_defaults +#define mbedtls_ssl_conf_dbg pmbedtls_ssl_conf_dbg +#define mbedtls_ssl_setup pmbedtls_ssl_setup +#define mbedtls_cipher_info_from_type pmbedtls_cipher_info_from_type +#define mbedtls_md_info_from_type pmbedtls_md_info_from_type +#define mbedtls_pk_get_bitlen pmbedtls_pk_get_bitlen +#define mbedtls_ctr_drbg_seed pmbedtls_ctr_drbg_seed

1 0

[tfaber] 69456: [RAPPS] - Fix another potential buffer overflow
by tfaber＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: tfaber Date: Mon Oct 5 11:25:49 2015 New Revision: 69456 URL: http://svn.reactos.org/svn/reactos?rev=69456&view=rev Log: [RAPPS] - Fix another potential buffer overflow Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Mon Oct 5 11:25:49 2015 @@ -408,10 +408,11 @@ if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; - urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); - urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); - urlComponents.dwHostNameLength = urlLength*sizeof(WCHAR); - urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength); + urlLength /= sizeof(WCHAR); + urlComponents.dwSchemeLength = urlLength + 1; + urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); + urlComponents.dwHostNameLength = urlLength + 1; + urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end;

1 0

[tfaber] 69455: [RAPPS] - Fix buffer overflow when displaying the URL in download dialog
by tfaber＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: tfaber Date: Mon Oct 5 09:17:21 2015 New Revision: 69455 URL: http://svn.reactos.org/svn/reactos?rev=69455&view=rev Log: [RAPPS] - Fix buffer overflow when displaying the URL in download dialog Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Mon Oct 5 09:17:21 2015 @@ -143,27 +143,28 @@ Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS); if (Item && szStatusText && wcslen(szStatusText) > 0 && This->UrlHasBeenCopied == FALSE) { - DWORD len = wcslen(szStatusText) * sizeof(WCHAR); - PWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + DWORD len = wcslen(szStatusText) + 1; + PWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); if (buf) { /* beautify our url for display purposes */ InternetCanonicalizeUrl(szStatusText, buf, &len, ICU_DECODE | ICU_NO_ENCODE); - - /* paste it into our dialog, free the temp buffer - and don't do it again in this instance */ - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf); + } + else + { + /* just use the original */ + buf = (PWSTR)szStatusText; + } + + /* paste it into our dialog and don't do it again in this instance */ + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf); + This->UrlHasBeenCopied = TRUE; + + if (buf != szStatusText) + { HeapFree(GetProcessHeap(), 0, buf); } - else - { - /* our computer is old and rusty and does not have enough ram for this, - use the ugly version and call it a day */ - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)szStatusText); - } - - This->UrlHasBeenCopied = TRUE; } SetLastError(0);

1 0

[ion] 69454: [BOOTLIB]: - Implement BiInitializeAndValidateHive, BiLoadHive. Leveraging our existing cmlib and the previously committed code, we are now able to read the BCD file, parse it as a reg...
by ion＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: ion Date: Mon Oct 5 07:25:27 2015 New Revision: 69454 URL: http://svn.reactos.org/svn/reactos?rev=69454&view=rev Log: [BOOTLIB]: - Implement BiInitializeAndValidateHive, BiLoadHive. Leveraging our existing cmlib and the previously committed code, we are now able to read the BCD file, parse it as a registry hive, and lookup the BCD Objects subkey! The BCD Data Store is now available to the Boot Manager (which also validates that reading from ETFS works). Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Oct 5 07:25:27 2015 @@ -373,7 +373,7 @@ /* Build the error string */ swprintf(FormatString, - L"\nAn error occurred (%08x) while attempting" + L"\nAn error occurred (%08x) while attempting " L"to read the boot configuration data file %s\n", ErrorStatus, Buffer); @@ -685,7 +685,7 @@ PBL_RETURN_ARGUMENTS ReturnArguments; BOOLEAN RebootOnError; PGUID AppIdentifier; - // HANDLE BcdHandle; + HANDLE BcdHandle; EfiPrintf(L"ReactOS UEFI Boot Manager Initializing...\n"); @@ -733,8 +733,8 @@ BmFwInitializeBootDirectoryPath(); /* Load and initialize the boot configuration database (BCD) */ - //Status = BmOpenDataStore(&BcdHandle); - //EfiPrintf(L"BCD Open: %lx\r\n", Status); + Status = BmOpenDataStore(&BcdHandle); + EfiPrintf(L"BCD Open: %lx\r\n", Status); /* do more stuff!! */ EfiPrintf(L"We are A-OK!\r\n"); Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Mon Oct 5 07:25:27 2015 @@ -451,15 +451,18 @@ return Status; } -#define BI_FLUSH_HIVE 0x01 +#define BI_FLUSH_HIVE 0x01 +#define BI_HIVE_WRITEABLE 0x02 typedef struct _BI_KEY_HIVE { - PVOID ImageBase; + PHBASE_BLOCK BaseBlock; + ULONG HiveSize; PBL_FILE_PATH_DESCRIPTOR FilePath; CMHIVE Hive; LONG ReferenceCount; ULONG Flags; + PCM_KEY_NODE RootNode; } BI_KEY_HIVE, *PBI_KEY_HIVE; typedef struct _BI_KEY_OBJECT @@ -646,7 +649,7 @@ } /* We found it -- get the key node out of it */ - ParentNode = (PCM_KEY_NODE)Hive->GetCellRoutine(Hive, KeyCell); + ParentNode = (PCM_KEY_NODE)HvGetCell(Hive, KeyCell); if (!ParentNode) { Status = STATUS_REGISTRY_CORRUPT; @@ -699,16 +702,386 @@ return Status; } +BOOLEAN BiHiveHashLibraryInitialized; +ULONGLONG HvSymcryptSeed; + +BOOLEAN +HvIsInPlaceBaseBlockValid ( + _In_ PHBASE_BLOCK BaseBlock + ) +{ + ULONG HiveLength, HeaderSum; + BOOLEAN Valid; + + /* Assume failure */ + Valid = FALSE; + + /* Check for incorrect signature, type, version, or format */ + if ((BaseBlock->Signature == 'fger') && + (BaseBlock->Type == 0) && + (BaseBlock->Major <= 1) && + (BaseBlock->Minor <= 5) && + (BaseBlock->Minor >= 3) && + (BaseBlock->Format == 1)) + { + /* Check for invalid hive size */ + HiveLength = BaseBlock->Length; + if (HiveLength) + { + /* Check for misaligned or too large hive size */ + if (!(HiveLength & 0xFFF) && HiveLength <= 0x7FFFE000) + { + /* Check for invalid header checksum */ + HeaderSum = HvpHiveHeaderChecksum(BaseBlock); + if (HeaderSum == BaseBlock->CheckSum) + { + /* All good */ + Valid = TRUE; + } + } + } + } + + /* Return validity */ + return Valid; +} + +NTSTATUS +BiInitializeAndValidateHive ( + _In_ PBI_KEY_HIVE Hive + ) +{ + ULONG HiveSize; + NTSTATUS Status; + + /* Make sure the hive is at least the size of a base block */ + if (Hive->HiveSize < sizeof(HBASE_BLOCK)) + { + return STATUS_REGISTRY_CORRUPT; + } + + /* Make sure that the base block accurately describes the size of the hive */ + HiveSize = Hive->BaseBlock->Length + sizeof(HBASE_BLOCK); + if ((HiveSize < sizeof(HBASE_BLOCK)) || (HiveSize > Hive->HiveSize)) + { + return STATUS_REGISTRY_CORRUPT; + } + + /* Initialize a flat memory hive */ + RtlZeroMemory(&Hive->Hive, sizeof(Hive->Hive)); + Status = HvInitialize(&Hive->Hive.Hive, + HINIT_FLAT, + 0, + 0, + Hive->BaseBlock, + CmpAllocate, + CmpFree, + NULL, + NULL, + NULL, + NULL, + 0, + NULL); + if (NT_SUCCESS(Status)) + { + /* Cleanup volatile/old data */ + CmPrepareHive(&Hive->Hive.Hive); // CmCheckRegistry + Status = STATUS_SUCCESS; + } + + /* Return the final status */ + return Status; +} + NTSTATUS BiLoadHive ( _In_ PBL_FILE_PATH_DESCRIPTOR FilePath, _Out_ PHANDLE HiveHandle ) { - /* This is TODO */ - EfiPrintf(L"Loading a hive is not yet implemented\r\n"); - *HiveHandle = NULL; - return STATUS_NOT_IMPLEMENTED; + ULONG DeviceId; + PHBASE_BLOCK BaseBlock, NewBaseBlock; + PBI_KEY_OBJECT KeyObject; + PBI_KEY_HIVE BcdHive; + PBL_DEVICE_DESCRIPTOR BcdDevice; + ULONG PathLength, DeviceLength, HiveSize, HiveLength, NewHiveSize; + PWCHAR HiveName, LogName; + BOOLEAN HaveWriteAccess; + NTSTATUS Status; + PVOID LogData; + PHHIVE Hive; + UNICODE_STRING KeyString; + PCM_KEY_NODE RootNode; + HCELL_INDEX CellIndex; + + /* Initialize variables */ + DeviceId = -1; + BaseBlock = NULL; + BcdHive = NULL; + KeyObject = NULL; + LogData = NULL; + LogName = NULL; + + /* Initialize the crypto seed */ + if (!BiHiveHashLibraryInitialized) + { + HvSymcryptSeed = 0x82EF4D887A4E55C5; + BiHiveHashLibraryInitialized = TRUE; + } + + /* Extract and validate the input path */ + BcdDevice = (PBL_DEVICE_DESCRIPTOR)&FilePath->Path; + PathLength = FilePath->Length; + DeviceLength = BcdDevice->Size; + HiveName = (PWCHAR)((ULONG_PTR)BcdDevice + BcdDevice->Size); + if (PathLength <= DeviceLength) + { + /* Doesn't make sense, bail out */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Attempt to open the underlying device for RW access */ + HaveWriteAccess = TRUE; + Status = BlpDeviceOpen(BcdDevice, + BL_DEVICE_READ_ACCESS | BL_DEVICE_WRITE_ACCESS, + 0, + &DeviceId); + if (!NT_SUCCESS(Status)) + { + /* Try for RO access instead */ + HaveWriteAccess = FALSE; + Status = BlpDeviceOpen(BcdDevice, BL_DEVICE_READ_ACCESS, 0, &DeviceId); + if (!NT_SUCCESS(Status)) + { + /* No access at all -- bail out */ + goto Quickie; + } + } + + /* Now try to load the hive on disk */ + Status = BlImgLoadImageWithProgress2(DeviceId, + BlLoaderRegistry, + HiveName, + (PVOID*)&BaseBlock, + &HiveSize, + 0, + FALSE, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Hive read failure: % lx\r\n", Status); + goto Quickie; + } + + /* Allocate a hive structure */ + BcdHive = BlMmAllocateHeap(sizeof(*BcdHive)); + if (!BcdHive) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Initialize it */ + RtlZeroMemory(BcdHive, sizeof(*BcdHive)); + BcdHive->BaseBlock = BaseBlock; + BcdHive->HiveSize = HiveSize; + if (HaveWriteAccess) + { + BcdHive->Flags |= BI_HIVE_WRITEABLE; + } + + /* Make sure the hive was at least one bin long */ + if (HiveSize < sizeof(*BaseBlock)) + { + Status = STATUS_REGISTRY_CORRUPT; + goto Quickie; + } + + /* Make sure the hive contents are at least one bin long */ + HiveLength = BaseBlock->Length; + if (BaseBlock->Length < sizeof(*BaseBlock)) + { + Status = STATUS_REGISTRY_CORRUPT; + goto Quickie; + } + + /* Validate the initial bin (the base block) */ + if (!HvIsInPlaceBaseBlockValid(BaseBlock)) + { + EfiPrintf(L"Recovery not implemented\r\n"); + Status = STATUS_REGISTRY_CORRUPT; + goto Quickie; + } + + /* Check if there's log recovery that needs to happen */ + if (BaseBlock->Sequence1 != BaseBlock->Sequence2) + { + EfiPrintf(L"Log fix not implemented: %lx %lx\r\n"); + Status = STATUS_REGISTRY_CORRUPT; + goto Quickie; + } + + /* + * Check if the whole hive doesn't fit in the buffer. + * Note: HiveLength does not include the size of the baseblock itself + */ + if (HiveSize < (HiveLength + sizeof(*BaseBlock))) + { + EfiPrintf(L"Need bigger hive buffer path\r\n"); + + /* Allocate a slightly bigger buffer */ + NewHiveSize = HiveLength + sizeof(*BaseBlock); + Status = MmPapAllocatePagesInRange((PVOID*)&NewBaseBlock, + BlLoaderRegistry, + NewHiveSize >> PAGE_SHIFT, + 0, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Copy the current data in there */ + RtlCopyMemory(NewBaseBlock, BaseBlock, HiveSize); + + /* Free the old data */ + EfiPrintf(L"Leaking old hive buffer\r\n"); + //MmPapFreePages(BaseBlock, 1); + + /* Update our pointers */ + BaseBlock = NewBaseBlock; + HiveSize = NewHiveSize; + BcdHive->BaseBlock = BaseBlock; + BcdHive->HiveSize = HiveSize; + } + + /* Check if any log stuff needs to happen */ + if (LogData) + { + EfiPrintf(L"Log fix not implemented: %lx %lx\r\n"); + Status = STATUS_REGISTRY_CORRUPT; + goto Quickie; + } + + /* Call Hv to setup the hive library */ + Status = BiInitializeAndValidateHive(BcdHive); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Now get the root node */ + Hive = &BcdHive->Hive.Hive; + RootNode = (PCM_KEY_NODE)HvGetCell(Hive, Hive->BaseBlock->RootCell); + if (!RootNode) + { + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + /* Find the Objects subkey under it to see if it's a real BCD hive */ + RtlInitUnicodeString(&KeyString, L"Objects"); + CellIndex = CmpFindSubKeyByName(Hive, RootNode, &KeyString); + if (CellIndex == HCELL_NIL) + { + EfiPrintf(L"No OBJECTS subkey found!\r\n"); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + /* This is a valid BCD hive, store its root node here */ + BcdHive->RootNode = RootNode; + + /* Allocate a copy of the file path */ + BcdHive->FilePath = BlMmAllocateHeap(FilePath->Length); + if (!BcdHive->FilePath) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Make a copy of it */ + RtlCopyMemory(BcdHive->FilePath, FilePath, FilePath->Length); + + /* Create a key object to describe the rot */ + KeyObject = BlMmAllocateHeap(sizeof(*KeyObject)); + if (!KeyObject) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Fill out the details */ + KeyObject->KeyNode = RootNode; + KeyObject->KeyHive = BcdHive; + KeyObject->KeyName = NULL; + KeyObject->KeyCell = Hive->BaseBlock->RootCell; + + /* One reference for the key object, plus one lifetime reference */ + BcdHive->ReferenceCount = 2; + + /* This is the hive handle */ + *HiveHandle = KeyObject; + + /* We're all good */ + Status = STATUS_SUCCESS; + +Quickie: + /* If we had a log name, free it */ + if (LogName) + { + BlMmFreeHeap(LogName); + } + + /* If we had logging data, free it */ + if (LogData) + { + EfiPrintf(L"Leaking log buffer\r\n"); + //MmPapFreePages(LogData, 1); + } + + /* Check if this is the failure path */ + if (!NT_SUCCESS(Status)) + { + /* If we mapped the hive, free it */ + if (BaseBlock) + { + EfiPrintf(L"Leaking base block on failure\r\n"); + //MmPapFreePages(BaseBlock, 1u); + } + + /* If we opened the device, close it */ + if (DeviceId != -1) + { + BlDeviceClose(DeviceId); + } + + /* Did we create a hive object? */ + if (BcdHive) + { + /* Free the file path if we made a copy of it */ + if (BcdHive->FilePath) + { + BlMmFreeHeap(BcdHive->FilePath); + } + + /* Free the hive itself */ + BlMmFreeHeap(BcdHive); + } + + /* Finally, free the root key object if we created one */ + if (KeyObject) + { + BlMmFreeHeap(KeyObject); + } + } + + /* Return the final status */ + return Status; } NTSTATUS @@ -759,7 +1132,6 @@ /* Assume failure */ LocalHandle = NULL; - EfiPrintf(L"Opening BCD store: %wZ\n", FileName); /* Allocate a path descriptor */ Length = FileName->Length + sizeof(*FilePath);

1 0

[ion] 69453: [HIVEBCD]: - The Objects key is in the root, not under Description. [MKHIVE]: - Make it *actually* build a BCD hive. It was doing nothing before, because it turns out that irrespective...
by ion＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: ion Date: Mon Oct 5 07:22:11 2015 New Revision: 69453 URL: http://svn.reactos.org/svn/reactos?rev=69453&view=rev Log: [HIVEBCD]: - The Objects key is in the root, not under Description. [MKHIVE]: - Make it *actually* build a BCD hive. It was doing nothing before, because it turns out that irrespective of what appear to be dynamic, command-line driven behavior modes, all of mkhive's logic is deeply tied together through C-level changes and knowledge. (for example, that's why calling it with a single .inf, it still wants to build 6 hives for you). There were also some copy/pasta bugs in the BCD handling code, now fixed. Modified: trunk/reactos/boot/bootdata/hivebcd.inf trunk/reactos/tools/mkhive/mkhive.c trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/boot/bootdata/hivebcd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] Mon Oct 5 07:22:11 2015 @@ -3,9 +3,9 @@ [AddReg] -HKLM,"BCD00000000\Description\Control","System",0x00010003,1 -HKLM,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 -HKLM,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" -HKLM,"BCD00000000\Description\Objects",,0x00000012 +BCD,"BCD00000000\Description\Control","System",0x00010003,1 +BCD,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 +BCD,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" +BCD,"BCD00000000\Objects",,0x00000012 ; EOF Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Mon Oct 5 07:22:11 2015 @@ -146,7 +146,7 @@ convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "BCD"); - if (!ExportBinaryHive (FileName, &SystemHive)) + if (!ExportBinaryHive (FileName, &BcdHive)) { return 1; } Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Oct 5 07:22:11 2015 @@ -53,11 +53,13 @@ static const WCHAR HKLM[] = {'H','K','L','M',0}; static const WCHAR HKU[] = {'H','K','U',0}; static const WCHAR HKR[] = {'H','K','R',0}; +static const WCHAR BCD[] = {'B','C','D',0}; static const WCHAR HKCRPath[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','O','F','T','W','A','R','E','\\','C','l','a','s','s','e','s','\\',0}; static const WCHAR HKCUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\','.','D','E','F','A','U','L','T','\\',0}; static const WCHAR HKLMPath[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\',0}; static const WCHAR HKUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\',0}; +static const WCHAR BCDPath[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\',0}; static const WCHAR AddReg[] = {'A','d','d','R','e','g',0}; static const WCHAR DelReg[] = {'D','e','l','R','e','g',0}; @@ -88,6 +90,12 @@ if (!strcmpiW (Name, HKU)) { strcpyW (Name, HKUPath); + return TRUE; + } + + if (!strcmpiW (Name, BCD)) + { + strcpyW (Name, BCDPath); return TRUE; } Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Mon Oct 5 07:22:11 2015 @@ -47,6 +47,7 @@ CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ +CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ static PMEMKEY CreateInMemoryStructure( @@ -552,6 +553,11 @@ &SoftwareHive, L"Registry\\Machine\\SOFTWARE"); + /* Create BCD key */ + ConnectRegistry(NULL, + &BcdHive, + L"Registry\\Machine\\BCD00000000"); + /* Create SYSTEM key */ ConnectRegistry(NULL, &SystemHive, Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.h [iso-8859-1] Mon Oct 5 07:22:11 2015 @@ -30,6 +30,7 @@ extern CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ extern CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ extern CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ +extern CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ #define ERROR_SUCCESS 0L #define ERROR_UNSUCCESSFUL 1L

1 0

[ion] 69452: [BOOTLIB]: - Fix multiple bugs in ETFS code (confusion between file offset vs. disk offset) - Implement EtfsGetInformation, EtfsSetInformation, and fix ETFS_FILE definition to make thi...
by ion＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: ion Date: Mon Oct 5 05:53:40 2015 New Revision: 69452 URL: http://svn.reactos.org/svn/reactos?rev=69452&view=rev Log: [BOOTLIB]: - Fix multiple bugs in ETFS code (confusion between file offset vs. disk offset) - Implement EtfsGetInformation, EtfsSetInformation, and fix ETFS_FILE definition to make this easy. - Implement EtfsRead. - Fix multiple bugs in file I/O code (swapped/reversed validation checks) - Make BlStatusPrint call EfiPrintf on debug builds, even without BD. - Add some additional error logging. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/etfs.c trunk/reactos/boot/environ/lib/io/file.c trunk/reactos/boot/environ/lib/misc/debug.c trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -49,7 +49,7 @@ ULONG Size; } BL_PACKED_BOOT_ERROR, *PBL_PACKED_BOOT_ERROR; -#define BL_FATAL_ERROR_BCD_READ 0x02 +#define BL_FATAL_ERROR_BCD_READ 0x01 /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -321,7 +321,7 @@ _In_ struct _BL_FILE_ENTRY* FileEntry, _In_ PVOID Buffer, _In_ ULONG Size, - _Out_ PULONG BytesRead + _Out_opt_ PULONG BytesRead ); typedef @@ -786,8 +786,10 @@ typedef struct _BL_FILE_INFORMATION { - ULONGLONG FileSize; - ULONGLONG CurrentOffset; + ULONGLONG Size; + ULONGLONG Offset; + PWCHAR FsName; + ULONG Flags; } BL_FILE_INFORMATION, *PBL_FILE_INFORMATION; typedef struct _BL_FILE_CALLBACKS @@ -809,7 +811,7 @@ ULONG Flags; ULONG ReferenceCount; ULONG Unknown; - ULONGLONG Unknown1; + ULONGLONG TotalBytesRead; ULONGLONG Unknown2; BL_FILE_CALLBACKS Callbacks; PVOID FsSpecificData; Modified: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -36,12 +36,12 @@ typedef struct _BL_ETFS_FILE { + ULONG DiskOffset; ULONG DirOffset; ULONG DirEntOffset; - ULONGLONG Size; - ULONGLONG Offset; - PWCHAR FsName; - ULONG Flags; + + BL_FILE_INFORMATION; + ULONG DeviceId; } BL_ETFS_FILE, *PBL_ETFS_FILE; @@ -56,9 +56,35 @@ _Out_ PBL_FILE_ENTRY *FileEntry ); +NTSTATUS +EtfsGetInformation ( + _In_ PBL_FILE_ENTRY FileEntry, + _Out_ PBL_FILE_INFORMATION FileInfo + ); + +NTSTATUS +EtfsSetInformation ( + _In_ PBL_FILE_ENTRY FileEntry, + _In_ PBL_FILE_INFORMATION FileInfo + ); + +NTSTATUS +EtfsRead ( + _In_ PBL_FILE_ENTRY FileEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _Out_opt_ PULONG BytesReturned + ); + BL_FILE_CALLBACKS EtfsFunctionTable = { EtfsOpen, + NULL, + EtfsRead, + NULL, + NULL, + EtfsGetInformation, + EtfsSetInformation }; /* FUNCTIONS *****************************************************************/ @@ -205,7 +231,7 @@ EtfsFile = DirectoryEntry->FsSpecificData; DeviceId = EtfsFile->DeviceId; - FileOffset = EtfsFile->Offset; + FileOffset = EtfsFile->DiskOffset; EtfsDevice = EtfsDeviceTable[DeviceId]; DirectoryOffset = *DirentOffset; @@ -362,7 +388,7 @@ DirentOffset = EtfsFile->DirEntOffset; if ((KeepOffset) || - (ALIGN_DOWN_BY((DirentOffset + EtfsFile->Offset), CD_SECTOR_SIZE) == + (ALIGN_DOWN_BY((DirentOffset + EtfsFile->DiskOffset), CD_SECTOR_SIZE) == EtfsDevice->Offset)) { Status = EtfspGetDirent(DirectoryEntry, &Dirent, &DirentOffset); @@ -404,6 +430,108 @@ } return Status; +} + +NTSTATUS +EtfsRead ( + _In_ PBL_FILE_ENTRY FileEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _Out_opt_ PULONG BytesReturned + ) +{ + ULONG BytesRead; + PBL_ETFS_FILE EtfsFile; + NTSTATUS Status; + + /* Assume failure for now */ + BytesRead = 0; + + /* Make sure that the read is within the file's boundaries */ + EtfsFile = FileEntry->FsSpecificData; + if ((Size + EtfsFile->Offset) > EtfsFile->Size) + { + /* Bail out otherwise */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Read the offset that matches this file's offset, on the disk */ + Status = BlDeviceReadAtOffset(FileEntry->DeviceId, + Size, + EtfsFile->Offset + EtfsFile->DiskOffset, + Buffer, + &BytesRead); + if (NT_SUCCESS(Status)) + { + /* Update the file offset and return the size as having been read */ + EtfsFile->Offset += Size; + BytesRead = Size; + } + } + + /* Check if caller wanted to know how many bytes were read */ + if (BytesReturned) + { + /* Return the value */ + *BytesReturned = BytesRead; + } + + /* All done */ + return Status; +} + +NTSTATUS +EtfsSetInformation ( + _In_ PBL_FILE_ENTRY FileEntry, + _In_ PBL_FILE_INFORMATION FileInfo + ) +{ + PBL_ETFS_FILE EtfsFile; + BL_FILE_INFORMATION LocalFileInfo; + + /* Get the underlying ETFS file data structure */ + EtfsFile = (PBL_ETFS_FILE)FileEntry->FsSpecificData; + + /* Make a copy of the incoming attributes, but ignore the new offset */ + LocalFileInfo = *FileInfo; + LocalFileInfo.Offset = EtfsFile->Offset; + + /* Check if these match exactly the current file */ + if (!RtlEqualMemory(&LocalFileInfo, &EtfsFile->Size, sizeof(*FileInfo))) + { + /* Nope -- which means caller is trying to change an immutable */ + EfiPrintf(L"Incorrect information change\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Is the offset past the end of the file? */ + if (FileInfo->Offset >= EtfsFile->Size) + { + /* Don't allow EOF */ + EfiPrintf(L"Offset too large: %lx vs %lx \r\n", FileInfo->Offset, EtfsFile->Size); + return STATUS_INVALID_PARAMETER; + } + + /* Update the offset */ + EtfsFile->Offset = FileInfo->Offset; + return STATUS_SUCCESS; +} + +NTSTATUS +EtfsGetInformation ( + _In_ PBL_FILE_ENTRY FileEntry, + _Out_ PBL_FILE_INFORMATION FileInfo + ) +{ + PBL_ETFS_FILE EtfsFile; + + /* Get the underlying ETFS file data structure */ + EtfsFile = (PBL_ETFS_FILE)FileEntry->FsSpecificData; + + /* Copy the cached information structure within it */ + RtlCopyMemory(FileInfo, &EtfsFile->Size, sizeof(*FileInfo)); + return STATUS_SUCCESS; } NTSTATUS @@ -486,7 +614,7 @@ RtlCopyMemory(&NewFile->Callbacks, &EtfsFunctionTable, sizeof(NewFile->Callbacks)); - EtfsFile->Offset = FileOffset; + EtfsFile->DiskOffset = FileOffset; EtfsFile->DirOffset = DirOffset; EtfsFile->Size = FileSize; EtfsFile->DeviceId = DeviceId; @@ -794,7 +922,7 @@ RootEntry->FsSpecificData = EtfsFile; EtfsFile->DeviceId = DeviceId; EtfsFile->Flags |= 1; - EtfsFile->Offset = EtfsDevice->RootDirOffset; + EtfsFile->DiskOffset = EtfsDevice->RootDirOffset; EtfsFile->DirOffset = 0; EtfsFile->Size = EtfsDevice->RootDirSize; EtfsFile->FsName = L"cdfs"; Modified: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -434,7 +434,7 @@ if (++FileEntry->ReferenceCount == 1) { /* Reset unknowns */ - FileEntry->Unknown1 = 0; + FileEntry->TotalBytesRead = 0; FileEntry->Unknown2 = 0; } @@ -548,7 +548,7 @@ } /* Validate file ID */ - if (FileEntries > FileId) + if (FileId > FileEntries) { return STATUS_INVALID_PARAMETER; } @@ -579,7 +579,7 @@ } /* Validate file ID */ - if (FileEntries > FileId) + if (FileId > FileEntries) { return STATUS_INVALID_PARAMETER; } @@ -612,7 +612,7 @@ Size = 0; /* Make sure we didn't overshoot */ - if (FileInformation->CurrentOffset > FileInformation->FileSize) + if (FileInformation->Offset > FileInformation->Size) { /* Bail out */ Status = STATUS_INVALID_PARAMETER; @@ -621,9 +621,9 @@ /* Compute the appropriate 32-bit size of this read, based on file size */ Size = ULONG_MAX; - if ((FileInformation->FileSize - FileInformation->CurrentOffset) <= ULONG_MAX) - { - Size = (ULONG)(FileInformation->FileSize) - (ULONG)(FileInformation->CurrentOffset); + if ((FileInformation->Size - FileInformation->Offset) <= ULONG_MAX) + { + Size = (ULONG)(FileInformation->Size) - (ULONG)(FileInformation->Offset); } /* Check if the caller has an input buffer */ @@ -683,7 +683,7 @@ } /* Bail out of the file ID is invalid */ - if (FileEntries > FileId) + if (FileId > FileEntries) { return STATUS_INVALID_PARAMETER; } @@ -774,7 +774,7 @@ } /* Increment the number of bytes read */ - FileEntry->Unknown1 += RequiredSize; + FileEntry->TotalBytesRead += RequiredSize; /* Check if the unknown flag on the device was changed during this routine */ if (ChangedUnknown) @@ -811,8 +811,8 @@ } /* Save the current offset, and overwrite it with the one we want */ - FileOffset = FileInfo.CurrentOffset; - FileInfo.CurrentOffset = ByteOffset; + FileOffset = FileInfo.Offset; + FileInfo.Offset = ByteOffset; /* Check the validity of the read and the actual size to read */ RequiredSize = Size; @@ -824,11 +824,12 @@ if (!NT_SUCCESS(Status)) { /* Bail out if the read is invalid */ + EfiPrintf(L"File info check failure: %lx\n", Status); return Status; } /* Check if the offset we're requesting is not the current offset */ - if (FileInfo.CurrentOffset != FileOffset) + if (FileInfo.Offset != FileOffset) { /* Set the new offset to use */ Status = BlFileSetInformation(FileId, &FileInfo); @@ -848,10 +849,10 @@ if (!NT_SUCCESS(Status)) { /* The read failed -- had we modified the offset? */ - if (FileInfo.CurrentOffset != FileOffset) + if (FileInfo.Offset != FileOffset) { /* Restore the offset back to its original value */ - FileInfo.CurrentOffset = FileOffset; + FileInfo.Offset = FileOffset; BlFileSetInformation(FileId, &FileInfo); } } Modified: trunk/reactos/boot/environ/lib/misc/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/debu… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/debug.c [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -83,11 +83,19 @@ va_start(va, Format); /* Check if the boot debugger is enabled */ - if (BlBdDebuggerEnabled()) + if (BlBdDebuggerEnabled() +#if (defined(DBG)) + || TRUE +#endif + ) { /* Print the string out into a buffer */ if (vswprintf(BlScratchBuffer, Format, va) > 0) { +#if defined(DBG) + EfiPrintf(BlScratchBuffer); + EfiPrintf(L"\r\n"); +#endif /* Make it a UNICODE_STRING */ RtlInitUnicodeString(&UnicodeString, BlScratchBuffer); Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Mon Oct 5 05:53:40 2015 @@ -39,8 +39,8 @@ } /* We only support files less than 4GB in the Image Mapped */ - Size = FileInformation.FileSize; - if (FileInformation.FileSize > ULONG_MAX) + Size = FileInformation.Size; + if (FileInformation.Size > ULONG_MAX) { return STATUS_NOT_SUPPORTED; } @@ -392,6 +392,7 @@ Status = ImgpOpenFile(DeviceId, FileName, DeviceId, &FileHandle); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Error opening file: %lx\r\n", Status); goto Quickie; } @@ -399,6 +400,7 @@ Status = ImgpGetFileSize(&FileHandle, &ImageSize); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Error getting file size: %lx\r\n", Status); goto Quickie; }

1 0

[ion] 69451: [BOOTLIB]: - Fix a regression - Add a few more flags - Don't look for BCD in "Microsoft" directory
by ion＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: ion Date: Mon Oct 5 04:51:32 2015 New Revision: 69451 URL: http://svn.reactos.org/svn/reactos?rev=69451&view=rev Log: [BOOTLIB]: - Fix a regression - Add a few more flags - Don't look for BCD in "Microsoft" directory Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/etfs.c trunk/reactos/boot/environ/lib/io/file.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Oct 5 04:51:32 2015 @@ -196,7 +196,7 @@ } /* Save the boot directory */ - BootDirectory = L"\\EFI\\Microsoft\\Boot"; + BootDirectory = L"\\EFI\\Boot"; /* Should be EFI\\ReactOS\\Boot */ Quickie: /* Free all the allocations we made */ @@ -560,7 +560,6 @@ /* Otherwise, compute the hardcoded path of the BCD */ Status = BmpFwGetFullPath(L"\\BCD", &FullPath); - EfiPrintf(L"Status: %lx %s\r\n", Status, FullPath); if (!NT_SUCCESS(Status)) { /* User the raw path */ @@ -686,7 +685,7 @@ PBL_RETURN_ARGUMENTS ReturnArguments; BOOLEAN RebootOnError; PGUID AppIdentifier; - HANDLE BcdHandle; + // HANDLE BcdHandle; EfiPrintf(L"ReactOS UEFI Boot Manager Initializing...\n"); @@ -734,8 +733,8 @@ BmFwInitializeBootDirectoryPath(); /* Load and initialize the boot configuration database (BCD) */ - Status = BmOpenDataStore(&BcdHandle); - EfiPrintf(L"BCD Open: %lx\r\n", Status); + //Status = BmOpenDataStore(&BcdHandle); + //EfiPrintf(L"BCD Open: %lx\r\n", Status); /* do more stuff!! */ EfiPrintf(L"We are A-OK!\r\n"); Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Oct 5 04:51:32 2015 @@ -93,6 +93,9 @@ #define BL_FILE_WRITE_ACCESS 0x02 #define BL_DIRECTORY_ACCESS 0x04 #define BL_UNKNOWN_ACCESS 0x10 + +#define BL_DEVICE_READ_ACCESS 0x01 +#define BL_DEVICE_WRITE_ACCESS 0x02 #define BL_DEVICE_ENTRY_OPENED 0x01 #define BL_DEVICE_ENTRY_READ_ACCESS 0x02 @@ -226,6 +229,7 @@ BlLoaderReferencePage = 0xD0000007, BlLoaderRamDisk = 0xD0000008, BlLoaderData = 0xD000000A, + BlLoaderRegistry = 0xD000000B, BlLoaderBlockMemory = 0xD000000C, BlLoaderSelfMap = 0xD000000F, @@ -1639,6 +1643,21 @@ _Out_ PULONG BytesRead ); +/* IMAGE ROUTINES ************************************************************/ + +NTSTATUS +BlImgLoadImageWithProgress2 ( + _In_ ULONG DeviceId, + _In_ BL_MEMORY_TYPE MemoryType, + _In_ PWCHAR FileName, + _Inout_ PVOID* MappedBase, + _Inout_ PULONG MappedSize, + _In_ ULONG ImageFlags, + _In_ BOOLEAN ShowProgress, + _Out_opt_ PUCHAR* HashBuffer, + _Out_opt_ PULONG HashSize + ); + /* FILE I/O ROUTINES *********************************************************/ NTSTATUS Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Mon Oct 5 04:51:32 2015 @@ -1914,8 +1914,8 @@ goto Quickie; } - /* Check for unsupported flags */ - if (!(Flags & 3)) + /* Make sure both read and write access are set */ + if (!(Flags & (BL_DEVICE_READ_ACCESS | BL_DEVICE_WRITE_ACCESS))) { /* Bail out */ Status = STATUS_INVALID_PARAMETER; @@ -1982,7 +1982,9 @@ /* Fill it out */ RtlZeroMemory(DeviceEntry, sizeof(*DeviceEntry)); DeviceEntry->ReferenceCount = 1; - DeviceEntry->Flags |= 7; + DeviceEntry->Flags |= (BL_DEVICE_ENTRY_OPENED | + BL_DEVICE_ENTRY_READ_ACCESS | + BL_DEVICE_ENTRY_WRITE_ACCESS); DeviceEntry->Unknown = Unknown; /* Save flag 8 if needed */ Modified: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Mon Oct 5 04:51:32 2015 @@ -797,7 +797,6 @@ EtfsFile->Offset = EtfsDevice->RootDirOffset; EtfsFile->DirOffset = 0; EtfsFile->Size = EtfsDevice->RootDirSize; - EfiPrintf(L"Root offset: %I64x Size: %I64x\r\n", EtfsFile->Offset, EtfsFile->Size); EtfsFile->FsName = L"cdfs"; *FileEntry = RootEntry; Modified: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Mon Oct 5 04:51:32 2015 @@ -345,7 +345,7 @@ Unknown, FileTableCompareWithSubsetAttributes, &DirectoryEntry); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { goto Quickie; }

1 0

[ion] 69450: [BOOTLIB]: - Fix BCD bugs.
by ion＠svn.reactos.org 05 Oct '15

05 Oct '15

Author: ion Date: Mon Oct 5 01:02:56 2015 New Revision: 69450 URL: http://svn.reactos.org/svn/reactos?rev=69450&view=rev Log: [BOOTLIB]: - Fix BCD bugs. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/efiemu.c trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Oct 5 01:02:56 2015 @@ -505,6 +505,7 @@ PVOID FinalBuffer; UNICODE_STRING BcdString; + /* Initialize variables */ PathBuffer = NULL; BcdDevice = NULL; BcdPath = NULL; @@ -559,6 +560,7 @@ /* Otherwise, compute the hardcoded path of the BCD */ Status = BmpFwGetFullPath(L"\\BCD", &FullPath); + EfiPrintf(L"Status: %lx %s\r\n", Status, FullPath); if (!NT_SUCCESS(Status)) { /* User the raw path */ Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Mon Oct 5 01:02:56 2015 @@ -803,7 +803,7 @@ /* Calculate where the next option should go */ Option = (PVOID)((ULONG_PTR)Option + Size); - /* Convert the path oprtion */ + /* Convert the path option */ Status = EfiInitpConvertEfiFilePath(OsDevicePath, BcdOSLoaderString_SystemRoot, Option, Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Mon Oct 5 01:02:56 2015 @@ -20,7 +20,7 @@ ) { ULONG_PTR NextOption = 0, ListOption; - PBL_BCD_OPTION Option; + PBL_BCD_OPTION Option, FoundOption; /* No options, bail out */ if (!List) @@ -29,12 +29,14 @@ } /* Loop while we find an option */ - while (TRUE) + FoundOption = NULL; + do { /* Get the next option and see if it matches the type */ Option = (PBL_BCD_OPTION)((ULONG_PTR)List + NextOption); if ((Option->Type == Type) && !(Option->Empty)) { + FoundOption = Option; break; } @@ -49,20 +51,18 @@ Option = MiscGetBootOption((PBL_BCD_OPTION)((ULONG_PTR)Option + ListOption), Type); - - /* Found one, return it */ if (Option) { - return Option; + /* Return it */ + FoundOption = Option; + break; } } - } - - /* We found the option, return it */ - return Option; -} - - + } while (NextOption); + + /* Return the option that was found, if any */ + return FoundOption; +} /*++ * @name BlGetBootOptionListSize @@ -94,7 +94,7 @@ /* Update the offset */ NextOffset = NextOption->NextEntryOffset; - } while (NextOffset != 0); + } while (NextOffset); /* Return final computed size */ return Size; @@ -119,7 +119,7 @@ ULONG Size, Offset; /* Check if there's any data */ - if (BcdOption->DataOffset != 0) + if (BcdOption->DataOffset) { /* Add the size of the data */ Size = BcdOption->DataOffset + BcdOption->DataSize; @@ -132,7 +132,7 @@ /* Any associated options? */ Offset = BcdOption->ListOffset; - if (Offset != 0) + if (Offset) { /* Go get those too */ Size += BlGetBootOptionListSize((PVOID)((ULONG_PTR)BcdOption + Offset)); @@ -167,11 +167,13 @@ { /* Extract the string */ String = (PWCHAR)((ULONG_PTR)Option + Option->DataOffset); + Status = STATUS_SUCCESS; } else { /* No string is present */ String = NULL; + Status = STATUS_NOT_FOUND; } /* Compute the data size */ @@ -182,9 +184,7 @@ AppIdentifier = BlGetApplicationIdentifier(); Status = BlpBootOptionCallbackString(AppIdentifier, Type, String, StringLength, &String, &StringLength); #else - Status = STATUS_SUCCESS; #endif - /* Check if we have space for one more character */ CopyLength = StringLength + 1; if (CopyLength < StringLength) @@ -192,11 +192,6 @@ /* Nope, we'll overflow */ CopyLength = -1; Status = STATUS_INTEGER_OVERFLOW; - } - else - { - /* Go ahead */ - Status = STATUS_SUCCESS; } /* No overflow? */ @@ -331,7 +326,6 @@ } #else /* No secure boot, so the secure descriptors are the standard ones */ - Status = STATUS_SUCCESS; SecureDescriptor = DeviceDescriptor; SecureListData = ListCopy; #endif @@ -765,6 +759,7 @@ /* Assume failure */ LocalHandle = NULL; + EfiPrintf(L"Opening BCD store: %wZ\n", FileName); /* Allocate a path descriptor */ Length = FileName->Length + sizeof(*FilePath);

1 0

[ekohl] 69449: [INTL] - Improve the internal locale storage. Replace the array of strings by a customized struct. - Implement the locale customization properly. The customization property sheet mod...
by ekohl＠svn.reactos.org 04 Oct '15

04 Oct '15

Author: ekohl Date: Sun Oct 4 21:57:03 2015 New Revision: 69449 URL: http://svn.reactos.org/svn/reactos?rev=69449&view=rev Log: [INTL] - Improve the internal locale storage. Replace the array of strings by a customized struct. - Implement the locale customization properly. The customization property sheet modifies the internal locale storage rather than the registry. Now, cancelling changes works properly. CORE-10074 Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=69… Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=69… Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=69… Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=69… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=69…

1 0

[ion] 69448: People's local builds use PCH by default, rosbuilds do not. A recipe for success.
by ion＠svn.reactos.org 04 Oct '15

04 Oct '15

Author: ion Date: Sun Oct 4 21:11:48 2015 New Revision: 69448 URL: http://svn.reactos.org/svn/reactos?rev=69448&view=rev Log: People's local builds use PCH by default, rosbuilds do not. A recipe for success. Modified: trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Sun Oct 4 21:11:48 2015 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include "bl.h" +#include <bcd.h> /* FUNCTIONS *****************************************************************/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015