[FREELDR]

- Update isobtrt.asm to handle new PE bootloader, should fix bootcdregtest
- Disable debugging in isoboot.asm

svn path=/trunk/; revision=48136

diff --git a/reactos/boot/freeldr/bootsect/isoboot.asm b/reactos/boot/freeldr/bootsect/isoboot.asm
index 1192443..28bf414 100644 (file)
--- a/reactos/boot/freeldr/bootsect/isoboot.asm
+++ b/reactos/boot/freeldr/bootsect/isoboot.asm
@@ -31,7 +31,7 @@
 ; ****************************************************************************
 
 ; Note: The Makefile builds one version with DEBUG_MESSAGES automatically.
-%define DEBUG_MESSAGES                ; Uncomment to get debugging messages
+;%define DEBUG_MESSAGES                ; Uncomment to get debugging messages
 
 %define WAIT_FOR_KEY
 
@@ -373,20 +373,13 @@ get_fs_structures:
 
        mov     dl, [DriveNo]                   ; dl = boot drive
        mov dh, 0                                       ; dh = boot partition
-
        push 0                                          ; push segment (0x0000)
        mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
-       add eax, 0x8000             ; RVA -> VA
-       push ax                     ; push offset
-       retf                        ; Transfer control to ROSLDR
-
-       mov eax, [0x8000 + 0xA8]        ; load the EntryPoint into eax
-       add eax, 0x8000
-       mov [jmpaddress], eax
+       add eax, 0x8000                         ; RVA -> VA
+       push ax                                         ; push offset
+       retf                                            ; Transfer control to ROSLDR
 
 
-       db 0xea                                         ; jmp instruction
-       jmpaddress dd 0
 
 ;
 ; searchdir:

diff --git a/reactos/boot/freeldr/bootsect/isobtrt.asm b/reactos/boot/freeldr/bootsect/isobtrt.asm
index 92ca764..31b9678 100644 (file)
--- a/reactos/boot/freeldr/bootsect/isobtrt.asm
+++ b/reactos/boot/freeldr/bootsect/isobtrt.asm
@@ -345,7 +345,11 @@ get_fs_structures:
 
        mov     dl, [DriveNo]                   ; dl = boot drive
        mov dh, 0                                       ; dh = boot partition
-       jmp     0:0x8000                        ; jump into OSLoader
+       push 0                                          ; push segment (0x0000)
+       mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+       add eax, 0x8000                         ; RVA -> VA
+       push ax                                         ; push offset
+       retf                                            ; Transfer control to ROSLDR