Fixed bug with calling RtlFreeUnicodeString too early in LdrFixupForward

svn path=/trunk/; revision=1735

reactos/Makefile

@@ -56,7 +56,7 @@ NET_DEVICE_DRIVERS = ne2000
 SYS_APPS = shell winlogon services
 
 APPS = args hello test cat bench apc shm lpc thread event file gditest \
-       pteb consume dump_shared_data vmtest regtest alive
+       pteb consume dump_shared_data vmtest regtest alive uitest
 
 #       objdir
 

reactos/lib/ntdll/ldr/utils.c

@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.41 2001/02/10 22:51:08 dwelch Exp $
+/* $Id: utils.c,v 1.42 2001/03/26 16:33:10 dwelch Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -516,18 +516,18 @@ LdrFixupForward(PCHAR ForwardName)
 				 0,
 				 &DllName,
 				 &BaseAddress);
-	     RtlFreeUnicodeString (&DllName);
 	     if (!NT_SUCCESS(Status))
 	       {
 		  DbgPrint("LdrFixupForward: failed to load %wZ\n", &DllName);
+		  RtlFreeUnicodeString (&DllName);
 		  return NULL;
 	       }
 	  }
 
-	  RtlFreeUnicodeString (&DllName);
-	  DPRINT("BaseAddress: %p\n", BaseAddress);
-
-	  return LdrGetExportByName(BaseAddress, p+1, -1);
+	RtlFreeUnicodeString (&DllName);
+	DPRINT("BaseAddress: %p\n", BaseAddress);
+	
+	return LdrGetExportByName(BaseAddress, p+1, -1);
      }
 
    return NULL;

reactos/loaders/dos/loadros.asm

@@ -284,16 +284,28 @@ entry:
 	mov	[_multiboot_mem_lower],ebx
         mov	ax, 0xe801
         int	015h
-	cmp	ebx,ebx
-	jz	.oldstylemem
+	jc	.oldstylemem
+	cmp	ax, 0
+	je	.cmem
 
         and	ebx, 0xffff
-	shl	 ebx,6
+	shl	ebx,6
 	mov	[_multiboot_mem_upper],ebx
         and	eax,0xffff
         add	dword [_multiboot_mem_upper],eax
 	jmp	.done_mem
 
+.cmem
+	cmp	cx, 0
+	je	.oldstylemem
+
+	add	edx, 0xFFFF
+	shl	edx, 6
+	mov	[_multiboot_mem_upper], edx
+	and	ecx, 0xFFFF
+	add	dword [_multiboot_mem_upper], ecx
+	jmp	.done_mem
+	
 .oldstylemem:
 	;; int 15h opt e801 don't work , try int 15h, option 88h
         mov	ah, 088h