[ros-diffs] [tkreuzer] 52462: [SETUPLDR] Display a message box and bail out if loading imported dlls failed

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sat Jun 25 18:52:38 2011
New Revision: 52462

URL: http://svn.reactos.org/svn/reactos?rev=52462&view=rev
Log:
[SETUPLDR]
Display a message box and bail out if loading imported dlls failed

Modified:
    trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c

Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c?rev=52462&r1=52461&r2=52462&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sat Jun 25 18:52:38 2011
@@ -311,10 +311,16 @@
     /* Load all referenced DLLs for kernel, HAL and kdcom.dll */
     strcpy(SearchPath, BootPath);
     strcat(SearchPath, "system32\\");
-    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
-    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
+    Status = WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
+    Status &= WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
     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 */
     SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);