diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index 0f0b6f6ec2..e65ab2e7d0 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -159,7 +159,7 @@ gr_table: dw 0x115 , 800 , 600 ; 6 dw 0x118 , 1024 , 768 ; 7 dw 0x11B , 1280 ,1024 ; 8 - dw 0x13, 320, 200 ; 9 + dw 0x13, 640, 480 ; 9 dw 0x12, 640, 480 ; 0 ; table for move to extended memory (int 15h, ah=87h) diff --git a/kernel/trunk/boot/shutdown.inc b/kernel/trunk/boot/shutdown.inc index 072e6e148c..a300002627 100644 --- a/kernel/trunk/boot/shutdown.inc +++ b/kernel/trunk/boot/shutdown.inc @@ -155,7 +155,7 @@ system_shutdown: ; shut down the system mov edx,0x80000 call fileread - mov esi,restart_kernel_4000 ; move kernel re-starter to 0x4000:0 + mov esi,restart_kernel_4000+0x10000 ; move kernel re-starter to 0x4000:0 mov edi,0x40000 mov ecx,1000 rep movsb diff --git a/kernel/trunk/fs/fs_lfn.inc b/kernel/trunk/fs/fs_lfn.inc index 1b4699835a..1fedb519a7 100644 --- a/kernel/trunk/fs/fs_lfn.inc +++ b/kernel/trunk/fs/fs_lfn.inc @@ -501,7 +501,7 @@ fs_OnCd: mov [esp+24], ebx ret .not_impl: - and [hd1_status], 0 + and [cd_status], 0 mov dword [esp+36], 2 ; not implemented ret diff --git a/kernel/trunk/fs/iso9660.inc b/kernel/trunk/fs/iso9660.inc index 0a9be8533c..8debcbb8a1 100644 --- a/kernel/trunk/fs/iso9660.inc +++ b/kernel/trunk/fs/iso9660.inc @@ -225,7 +225,7 @@ fs_CdReadFolder: mov edi,[ebx] sub [edx+4],edi pop ecx edi - xor ebx,ebx + mov ebx, [edx+4] mov eax,ERROR_SUCCESS ret