Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLDR]

Browse source 
Display a message box and bail out if loading imported dlls failed

svn path=/trunk/; revision=52462
This commit is contained in:
Timo Kreuzer 2011-06-25 18:52:38 +00:00
parent 579adc153a
commit cfb6386b45
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/boot/freeldr/freeldr/windows/setupldr2.c
View file

@ -311,10 +311,16 @@ VOID LoadReactOSSetup2(VOID)
/* Load all referenced DLLs for kernel, HAL and kdcom.dll */ /* Load all referenced DLLs for kernel, HAL and kdcom.dll */
strcpy(SearchPath, BootPath); strcpy(SearchPath, BootPath);
strcat(SearchPath, "system32\\"); strcat(SearchPath, "system32\\");
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); Status = WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); Status &= WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
if (KdComDTE) if (KdComDTE)
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); Status &= WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
if (!Status)
{
UiMessageBox("Error loading imported dll.");
return;
}
/* Load NLS data, they are in system32 */ /* Load NLS data, they are in system32 */
SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath); SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);