Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52155: [CRT] Remove duplicate wtol
by tkreuzer＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tkreuzer Date: Thu Jun 9 12:08:16 2011 New Revision: 52155 URL: http://svn.reactos.org/svn/reactos?rev=52155&view=rev Log: [CRT] Remove duplicate wtol Modified: trunk/reactos/lib/sdk/crt/string/atol.c Modified: trunk/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] Thu Jun 9 12:08:16 2011 @@ -9,14 +9,9 @@ return (long)_atoi64(str); } -long _wtol(const wchar_t *str) -{ - return (long)_wtoi64(str); -} - int _atoldbl(_LDOUBLE *value, char *str) { /* FIXME needs error checking for huge/small values */ //*value = strtold(str,0); return -1; -} +}

1 0

[akhaldi] 52154: [FREELDR] * Add a ExFreePoolWithTag stub and forward it to ExFreePool. Fixes freeldr msvc build.
by akhaldi＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: akhaldi Date: Thu Jun 9 11:49:42 2011 New Revision: 52154 URL: http://svn.reactos.org/svn/reactos?rev=52154&view=rev Log: [FREELDR] * Add a ExFreePoolWithTag stub and forward it to ExFreePool. Fixes freeldr msvc build. Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Thu Jun 9 11:49:42 2011 @@ -371,6 +371,17 @@ MmHeapFree(P); } +#undef ExFreePoolWithTag +NTKERNELAPI +VOID +NTAPI +ExFreePoolWithTag( + IN PVOID P, + IN ULONG Tag) +{ + ExFreePool(P); +} + PVOID NTAPI RtlAllocateHeap(

1 0

[tkreuzer] 52153: [ISOBOOT] Fix portable bootsector and make it gas compatible (its opcode identical to the nasm compiled one and works correctly)
by tkreuzer＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: tkreuzer Date: Thu Jun 9 11:23:01 2011 New Revision: 52153 URL: http://svn.reactos.org/svn/reactos?rev=52153&view=rev Log: [ISOBOOT] Fix portable bootsector and make it gas compatible (its opcode identical to the nasm compiled one and works correctly) Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Thu Jun 9 11:23:01 2011 @@ -94,7 +94,7 @@ //align open_file_t_size absolute HEX(5060) -resb Files, MAX_OPEN * open_file_t_size +resb Files, (MAX_OPEN * open_file_t_size) /******************************************************************************/ @@ -104,7 +104,7 @@ cli // Disable interrupts xor ax, ax // ax = segment zero mov ss, ax // Initialize stack segment - mov sp, start // Set up stack + mov sp, offset start // Set up stack mov ds, ax // Initialize other segment registers mov es, ax mov fs, ax @@ -150,7 +150,7 @@ // Display the 'Press key' message and wait for a maximum of 5 seconds call crlf - mov si, presskey_msg // si points to 'Press key' message + mov si, offset presskey_msg // si points to 'Press key' message call writestr // display the message mov byte ptr ds:[TimeoutCount], 5 @@ -166,7 +166,7 @@ cmp eax, ebx jnz .poll_again - mov si, dot_msg // print '.' + mov si, offset dot_msg // print '.' call writestr dec byte ptr ds:[TimeoutCount] // decrement timeout counter jz .boot_harddisk @@ -215,7 +215,7 @@ // at least some BIOSes will get the wrong value otherwise mov ax, HEX(4B01) // Get disk emulation status mov dl, byte ptr ds:[DriveNo] - mov si, spec_packet + mov si, offset spec_packet int HEX(13) jc spec_query_failed // Shouldn't happen (BIOS bug) mov dl, byte ptr ds:[DriveNo] @@ -430,7 +430,7 @@ inc di and cl,cl jz .isfile - cmp cl, '\' + cmp cl, 92 // '\' jne .scan mov byte ptr ds:[di-1], 0 // Terminate at directory name mov cl,2 // Search for directory @@ -519,7 +519,7 @@ pop di // Next filename pointer // restore the backslash in the filename - mov byte ptr ds:[di-1], '\' + mov byte ptr ds:[di-1], 92 // '\' mov byte ptr ds:[ISOFlags], cl // Restore the flags jz .failure // Did we fail? If so fail for real! @@ -656,9 +656,9 @@ .test_loop: pusha mov ax, HEX(4B01) - mov si, spec_packet - mov byte ptr ds:[si], 13 ; Size of buffer - int 13h + mov si, offset spec_packet + mov byte ptr ds:[si], 13 // Size of buffer + int HEX(13) popa jc .still_broken @@ -704,7 +704,7 @@ writemsg: push ax push si - mov si, isolinux_str + mov si, offset isolinux_str call writestr pop si call writestr @@ -714,7 +714,7 @@ // // crlf: Print a newline crlf: - mov si, crlf_msg + mov si, offset crlf_msg // Fall through // @@ -758,7 +758,7 @@ .loop: rol eax, 4 push eax - and al, 0Fh + and al, HEX(0F) cmp al, 10 jae .high .low: @@ -808,7 +808,7 @@ // BP - Sector count // getlinsec: - mov si, dapa // Load up the DAPA + mov si, offset dapa // Load up the DAPA mov word ptr ds:[si+4], bx mov bx, es mov word ptr ds:[si+6], bx @@ -841,7 +841,7 @@ mov byte ptr ds:[RetryCount], retry_count .try: pushad - int 13h + int HEX(13) jc .error add sp, 8*4 // Clean up stack ret @@ -892,7 +892,7 @@ mov fs, ax mov gs, ax sti - mov si, err_bootfailed + mov si, offset err_bootfailed call writestr xor ax, ax // Wait for keypress int HEX(16) @@ -985,88 +985,88 @@ // .align 8 spec_packet: - db HEX(13) // Size of packet + .byte HEX(13) // Size of packet sp_media: - db 0 // Media type + .byte 0 // Media type sp_drive: - db 0 // Drive number + .byte 0 // Drive number sp_controller: - db 0 // Controller index + .byte 0 // Controller index sp_lba: - dd 0 // LBA for emulated disk image + .long 0 // LBA for emulated disk image sp_devspec: - dw 0 // IDE/SCSI information + .word 0 // IDE/SCSI information sp_buffer: - dw 0 // User-provided buffer + .word 0 // User-provided buffer sp_loadseg: - dw 0 // Load segment + .word 0 // Load segment sp_sectors: - dw 0 // Sector count + .word 0 // Sector count sp_chs: - db 0,0,0 // Simulated CHS geometry + .byte 0,0,0 // Simulated CHS geometry sp_dummy: - db 0 // Scratch, safe to overwrite + .byte 0 // Scratch, safe to overwrite // // EBIOS drive parameter packet // .align 8 drive_params: - dw 30 // Buffer size + .word 30 // Buffer size dp_flags: - dw 0 // Information flags + .word 0 // Information flags dp_cyl: - dd 0 // Physical cylinders + .long 0 // Physical cylinders dp_head: - dd 0 // Physical heads + .long 0 // Physical heads dp_sec: - dd 0 // Physical sectors/track + .long 0 // Physical sectors/track dp_totalsec: - dd 0,0 // Total sectors + .long 0,0 // Total sectors dp_secsize: - dw 0 // Bytes per sector + .word 0 // Bytes per sector dp_dpte: - dd 0 // Device Parameter Table + .long 0 // Device Parameter Table dp_dpi_key: - dw 0 // 0BEDDh if rest valid + .word 0 // 0BEDDh if rest valid dp_dpi_len: - db 0 // DPI len - db 0 - dw 0 + .byte 0 // DPI len + .byte 0 + .word 0 dp_bus: - db 0,0,0,0 // Host bus type + .byte 0,0,0,0 // Host bus type dp_interface: - db 0,0,0,0,0,0,0,0 // Interface type + .byte 0,0,0,0,0,0,0,0 // Interface type db_i_path: - dd 0,0 // Interface path + .long 0,0 // Interface path db_d_path: - dd 0,0 // Device path - db 0 + .long 0,0 // Device path + .byte 0 db_dpi_csum: - db 0 // Checksum for DPI info + .byte 0 // Checksum for DPI info // // EBIOS disk address packet // .align 8 dapa: - dw 16 // Packet size + .word 16 // Packet size .count: - dw 0 // Block count + .word 0 // Block count .off: - dw 0 // Offset of buffer + .word 0 // Offset of buffer .seg: - dw 0 // Segment of buffer + .word 0 // Segment of buffer .lba: - dd 0 // LBA (LSW) - dd 0 // LBA (MSW) + .long 0 // LBA (LSW) + .long 0 // LBA (MSW) .align 4 MaxTransfer: - dw 2 //32 // Max sectors per transfer - -.org 2047 // Pad to file offset 2046 -.word 0aa55h // BootSector signature + .word 2 //32 // Max sectors per transfer + +.org 2046 // Pad to file offset 2046 +.word HEX(0aa55) // BootSector signature .endcode16

1 0

[cgutman] 52152: [AFD] - Fix a bug in some completion routines that resulted in failures being treated as successes - Fix various cancellation bugs - Fixes termination of programs that open listeni...
by cgutman＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: cgutman Date: Wed Jun 8 22:15:27 2011 New Revision: 52152 URL: http://svn.reactos.org/svn/reactos?rev=52152&view=rev Log: [AFD] - Fix a bug in some completion routines that resulted in failures being treated as successes - Fix various cancellation bugs - Fixes termination of programs that open listening sockets (Firefox, server.exe, tcpsvcs.exe, telnetd.exe, etc) and should increase stability in these programs as well Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Wed Jun 8 22:15:27 2011 @@ -140,7 +140,13 @@ } AFD_DbgPrint(MID_TRACE,("Completing listen request.\n")); - AFD_DbgPrint(MID_TRACE,("IoStatus was %x\n", FCB->ListenIrp.Iosb.Status)); + AFD_DbgPrint(MID_TRACE,("IoStatus was %x\n", Irp->IoStatus.Status)); + + if (Irp->IoStatus.Status != STATUS_SUCCESS) + { + SocketStateUnlock(FCB); + return Irp->IoStatus.Status; + } Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Jun 8 22:15:27 2011 @@ -252,10 +252,38 @@ } NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { + NTSTATUS Status; + + /* Add the IRP to the queue in all cases (so AfdCancelHandler will work properly) */ InsertTailList( &FCB->PendingIrpList[Function], - &Irp->Tail.Overlay.ListEntry ); - IoMarkIrpPending(Irp); - (void)IoSetCancelRoutine(Irp, AfdCancelHandler); + &Irp->Tail.Overlay.ListEntry ); + + /* Acquire the cancel spin lock and check the cancel bit */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + if (!Irp->Cancel) + { + /* We are not cancelled; we're good to go so + * set the cancel routine, release the cancel spin lock, + * mark the IRP as pending, and + * return STATUS_PENDING to the caller + */ + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); + IoReleaseCancelSpinLock(Irp->CancelIrql); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + } + else + { + /* We were already cancelled before we were able to register our cancel routine + * so we are to call the cancel routine ourselves right here to cancel the IRP + * (which handles all the stuff we do above) and return STATUS_CANCELLED to the caller + */ + AfdCancelHandler(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, + Irp); + Status = STATUS_CANCELLED; + } + SocketStateUnlock( FCB ); - return STATUS_PENDING; -} + + return Status; +} Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Wed Jun 8 22:15:27 2011 @@ -762,6 +762,33 @@ return (Status); } +VOID +CleanupPendingIrp(PIRP Irp, PIO_STACK_LOCATION IrpSp, PAFD_ACTIVE_POLL Poll) +{ + PAFD_RECV_INFO RecvReq; + PAFD_SEND_INFO SendReq; + PAFD_POLL_INFO PollReq; + + if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_RECV || + IrpSp->MajorFunction == IRP_MJ_READ) + { + RecvReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SEND || + IrpSp->MajorFunction == IRP_MJ_WRITE) + { + SendReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SELECT) + { + PollReq = Irp->AssociatedIrp.SystemBuffer; + ZeroEvents(PollReq->Handles, PollReq->HandleCount); + SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + } +} + VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -769,39 +796,46 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - UINT Function; - PAFD_RECV_INFO RecvReq; - PAFD_SEND_INFO SendReq; + ULONG Function, IoctlCode; + PIRP CurrentIrp; PLIST_ENTRY CurrentEntry; - PIRP CurrentIrp; PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; KIRQL OldIrql; PAFD_ACTIVE_POLL Poll; - PAFD_POLL_INFO PollReq; IoReleaseCancelSpinLock(Irp->CancelIrql); - + if (!SocketAcquireStateLock(FCB)) return; - - ASSERT(IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL); - - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + + switch (IrpSp->MajorFunction) + { + case IRP_MJ_DEVICE_CONTROL: + IoctlCode = IrpSp->Parameters.DeviceIoControl.IoControlCode; + break; + + case IRP_MJ_READ: + IoctlCode = IOCTL_AFD_RECV; + break; + + case IRP_MJ_WRITE: + IoctlCode = IOCTL_AFD_SEND; + break; + + default: + ASSERT(FALSE); + SocketStateUnlock(FCB); + return; + } + + switch (IoctlCode) { case IOCTL_AFD_RECV: - RecvReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); - /* Fall through */ - case IOCTL_AFD_RECV_DATAGRAM: Function = FUNCTION_RECV; break; case IOCTL_AFD_SEND: - SendReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - /* Fall through */ - case IOCTL_AFD_SEND_DATAGRAM: Function = FUNCTION_SEND; break; @@ -821,14 +855,13 @@ while (CurrentEntry != &DeviceExt->Polls) { Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); - CurrentIrp = Poll->Irp; - PollReq = CurrentIrp->AssociatedIrp.SystemBuffer; - - if (CurrentIrp == Irp) + + if (Irp == Poll->Irp) { - ZeroEvents(PollReq->Handles, PollReq->HandleCount); - SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); - break; + CleanupPendingIrp(Irp, IrpSp, Poll); + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + SocketStateUnlock(FCB); + return; } else { @@ -838,8 +871,9 @@ KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); - /* IRP already completed by SignalSocket */ SocketStateUnlock(FCB); + + DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (IOCTL_AFD_SELECT)\n"); return; default: @@ -856,7 +890,9 @@ if (CurrentIrp == Irp) { RemoveEntryList(CurrentEntry); - break; + CleanupPendingIrp(Irp, IrpSp, NULL); + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + return; } else { @@ -864,7 +900,9 @@ } } - UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + SocketStateUnlock(FCB); + + DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (Function: %d)\n", Function); } static VOID NTAPI Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Wed Jun 8 22:15:27 2011 @@ -185,9 +185,12 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); + if (Irp->IoStatus.Status == STATUS_SUCCESS) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } if( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */

1 0

[tkreuzer] 52151: [ASM] Add some more protability macros
by tkreuzer＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: tkreuzer Date: Wed Jun 8 19:06:01 2011 New Revision: 52151 URL: http://svn.reactos.org/svn/reactos?rev=52151&view=rev Log: [ASM] Add some more protability macros Modified: trunk/reactos/include/asm/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=52… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Wed Jun 8 19:06:01 2011 @@ -47,15 +47,16 @@ .ASCII MACRO text DB text ENDM +.ascii MACRO text + DB text +ENDM /* MASM doesn't have an ASCIZ macro */ .ASCIZ MACRO text DB text, 0 ENDM -#define asciz ASCIZ - -ljmp MACRO segment, offset - DB 0 +.asciz MACRO text + DB text, 0 ENDM .code64 MACRO @@ -69,11 +70,12 @@ .code16 MACRO ASSUME nothing - .text16 SEGMENT use16 + .text SEGMENT use16 + .586 ENDM .endcode16 MACRO - .text16 ENDS + .text ENDS ENDM .bss MACRO @@ -144,6 +146,16 @@ UNIMPLEMENTED MACRO name ENDM +absolute MACRO address + __absolute__address__ = address +ENDM + +resb MACRO name, size + name = __absolute__address__ + __absolute__address__ = __absolute__address__ + size +ENDM + + /* We need this to distinguish repeat from macros */ #define ENDR ENDM @@ -261,6 +273,15 @@ .macro .endprolog .endm + +.macro absolute address + __absolute__address__ = \address +ENDM + +.macro resb name, size + \name = __absolute__address__ + __absolute__address__ = __absolute__address__ + \size +ENDM .macro UNIMPLEMENTED2 file, line, func

1 0

[tkreuzer] 52150: [ISOBOOT] Add portable asm version of iso boot sector
by tkreuzer＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: tkreuzer Date: Wed Jun 8 18:48:34 2011 New Revision: 52150 URL: http://svn.reactos.org/svn/reactos?rev=52150&view=rev Log: [ISOBOOT] Add portable asm version of iso boot sector Added: trunk/reactos/boot/freeldr/bootsect/isoboot.S (with props) Added: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S (added) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Wed Jun 8 18:48:34 2011 @@ -1,0 +1,1073 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Bootsector for ISO file system + * FILE: + * PURPOSE: + * PROGRAMMERS: ? + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +.code16 + +// **************************************************************************** +// +// isolinux.asm +// +// A program to boot Linux kernels off a CD-ROM using the El Torito +// boot standard in "no emulation" mode, making the entire filesystem +// available. It is based on the SYSLINUX boot loader for MS-DOS +// floppies. +// +// Copyright (C) 1994-2001 H. Peter Anvin +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, +// USA; either version 2 of the License, or (at your option) any later +// version; incorporated herein by reference. +// +// **************************************************************************** +// +// THIS FILE IS A MODIFIED VERSION OF ISOLINUX.ASM +// MODIFICATION DONE BY MICHAEL K TER LOUW +// LAST UPDATED 3-9-2002 +// SEE "COPYING" FOR INFORMATION ABOUT THE LICENSE THAT APPLIES TO THIS RELEASE +// +// **************************************************************************** +// +// This file is a modified version of ISOLINUX.ASM. +// Modification done by Eric Kohl +// Last update 04-25-2002 +// +// **************************************************************************** + +//#define DEBUG_MESSAGES /* Uncomment to get debugging messages */ +#define WAIT_FOR_KEY + + +// **************************************************************************** +// BEGIN THE BIOS/CODE/DATA SEGMENT +// **************************************************************************** +serial_base = HEX(0400) // Base addresses for 4 serial ports (4 words) +BIOS_fbm = HEX(0413) // Free Base Memory (kilobytes) (1 word) +BIOS_timer = HEX(046C) // Timer ticks (1 word) +BIOS_magic = HEX(0472) // BIOS reset magic (1 word) +BIOS_vidrows = HEX(0484) // Number of screen rows (1 byte) + +// Memory below this point is reserved for the BIOS and the MBR +trackbuf = HEX(1000) // Track buffer goes here (8192 bytes) +trackbufsize = 8192 // trackbuf ends at 3000h + +// struct open_file_t +file_sector = 0 // Sector pointer (0 = structure free) +file_left = 4 // Number of sectors left + +//struct dir_t +dir_lba = 0 // Directory start (LBA) +dir_len = 4 // Length in bytes +dir_clust = 8 // Length in clusters + +#define dir_t_size 12 +#define open_file_t_size 8 + +MAX_OPEN_LG2 = 2 // log2(Max number of open files) +MAX_OPEN = 4 +SECTORSIZE_LG2 = 11 // 2048 bytes/sector (El Torito requirement) +SECTORSIZE = 2048 +retry_count = 6 // How patient are we with the BIOS? + +/******************************************************************************/ +absolute HEX(5000) // Here we keep our BSS stuff + +resb DriveNo, 1 // CD-ROM BIOS drive number (BYTE) +resb DiskError, 1 // Error code for disk I/O (BYTE) +resb RetryCount, 1 // Used for disk access retries (BYTE) +resb TimeoutCount, 1 // Timeout counter (BYTE) +resb ISOFlags, 1 // Flags for ISO directory search (BYTE) +resb RootDir, dir_t_size // Root directory (dir_t_size BYTES) +resb CurDir, dir_t_size // Current directory (dir_t_size BYTES) +resb ISOFileName, 64 // ISO filename canonicalization buffer +resb ISOFileNameEnd, 1 + +//align open_file_t_size +absolute HEX(5060) +resb Files, MAX_OPEN * open_file_t_size + + +/******************************************************************************/ + + +start: + cli // Disable interrupts + xor ax, ax // ax = segment zero + mov ss, ax // Initialize stack segment + mov sp, start // Set up stack + mov ds, ax // Initialize other segment registers + mov es, ax + mov fs, ax + mov gs, ax + sti // Enable interrupts + cld // Increment pointers + + mov cx, 2048 / 4 // Copy the bootsector + mov si, HEX(7C00) // from 0000:7C00 + mov di, HEX(7000) // to 0000:7000 + rep movsd // copy the program + + ljmp16 0, relocate // jump into relocated code + +relocate: +#ifdef DEBUG_MESSAGES + // Display the banner and copyright + mov si, offset isolinux_banner // si points to hello message + call writestr // display the message + mov si, offset copyright_str + call writestr +#endif + + // Make sure the keyboard buffer is empty +#ifdef WAIT_FOR_KEY + call pollchar_and_empty + + // Check for MBR on harddisk + pusha + mov ax, HEX(0201) + mov dx, HEX(0080) + mov cx, HEX(0001) + mov bx, trackbuf + int HEX(13) + popa + jc .boot_cdrom // could not read hdd + + push ax + mov ax, word ptr ds:[trackbuf] + cmp ax, 0 + je .boot_cdrom // no boot sector found (hopefully there are no weird bootsectors which begin with 0) + pop ax + + // Display the 'Press key' message and wait for a maximum of 5 seconds + call crlf + mov si, presskey_msg // si points to 'Press key' message + call writestr // display the message + + mov byte ptr ds:[TimeoutCount], 5 +.next_second: + mov eax, ds:[BIOS_timer] // load current tick counter + add eax, 19 + +.poll_again: + call pollchar_and_empty + jnz .boot_cdrom + + mov ebx, ds:[BIOS_timer] + cmp eax, ebx + jnz .poll_again + + mov si, dot_msg // print '.' + call writestr + dec byte ptr ds:[TimeoutCount] // decrement timeout counter + jz .boot_harddisk + jmp .next_second + +.boot_harddisk: + call crlf + + // Boot first harddisk (drive 0x80) + mov ax, HEX(0201) + mov dx, HEX(0080) + mov cx, HEX(0001) + mov bx, HEX(7C00) + int HEX(13) + jnc .go_hd + jmp kaboom +.go_hd: + mov ax, cs + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov dx, HEX(0080) + + ljmp16 0, HEX(7C00) +#endif + +.boot_cdrom: +#ifdef WAIT_FOR_KEY + call crlf + call crlf +#endif + + // Save and display the boot drive number + mov byte ptr ds:[DriveNo], dl +#ifdef DEBUG_MESSAGES + mov si, offset startup_msg + call writemsg + mov al, dl + call writehex2 + call crlf +#endif + + // Now figure out what we're actually doing + // Note: use passed-in DL value rather than 7Fh because + // at least some BIOSes will get the wrong value otherwise + mov ax, HEX(4B01) // Get disk emulation status + mov dl, byte ptr ds:[DriveNo] + mov si, spec_packet + int HEX(13) + jc spec_query_failed // Shouldn't happen (BIOS bug) + mov dl, byte ptr ds:[DriveNo] + cmp byte ptr ds:[sp_drive], dl // Should contain the drive number + jne spec_query_failed + +#ifdef DEBUG_MESSAGES + mov si, offset spec_ok_msg + call writemsg + mov al, byte ptr ds:[sp_drive] + call writehex2 + call crlf +#endif + +found_drive: + // Get drive information + mov ah, HEX(48) + mov dl, byte ptr ds:[DriveNo] + mov si, offset drive_params + int HEX(13) + jnc params_ok + + // mov si, nosecsize_msg No use in reporting this + // call writemsg + +params_ok: + // Check for the sector size (should be 2048, but + // some BIOSes apparently think we're 512-byte media) + // + // FIX: We need to check what the proper behaviour + // is for getlinsec when the BIOS thinks the sector + // size is 512!!! For that, we need such a BIOS, though... +#ifdef DEBUG_MESSAGES + mov si, offset secsize_msg + call writemsg + mov ax, word ptr ds:[dp_secsize] + call writehex4 + call crlf +#endif + + + // + // Clear Files structures + // + mov di, Files + mov cx, (MAX_OPEN*open_file_t_size)/4 + xor eax, eax + rep stosd + + // + // Now, we need to sniff out the actual filesystem data structures. + // mkisofs gave us a pointer to the primary volume descriptor + // (which will be at 16 only for a single-session disk!); from the PVD + // we should be able to find the rest of what we need to know. + // +get_fs_structures: + mov eax, 16 // Primary Volume Descriptor (sector 16) + mov bx, trackbuf + call getonesec + + mov eax, dword ptr ds:[trackbuf+156+2] + mov dword ptr ds:[RootDir+dir_lba],eax + mov dword ptr ds:[CurDir+dir_lba],eax +#ifdef DEBUG_MESSAGES + mov si, offset rootloc_msg + call writemsg + call writehex8 + call crlf +#endif + + mov eax, dword ptr ds:[trackbuf+156+10] + mov dword ptr ds:[RootDir+dir_len],eax + mov dword ptr ds:[CurDir+dir_len],eax +#ifdef DEBUG_MESSAGES + mov si, offset rootlen_msg + call writemsg + call writehex8 + call crlf +#endif + add eax,SECTORSIZE-1 + shr eax,SECTORSIZE_LG2 + mov dword ptr ds:[RootDir+dir_clust],eax + mov dword ptr ds:[CurDir+dir_clust],eax +#ifdef DEBUG_MESSAGES + mov si, offset rootsect_msg + call writemsg + call writehex8 + call crlf +#endif + + // Look for the "REACTOS" directory, and if found, + // make it the current directory instead of the root + // directory. + mov di, offset isolinux_dir + mov al, 2 // Search for a directory + call searchdir_iso + jnz .dir_found + mov si, offset no_dir_msg + call writemsg + jmp kaboom + +.dir_found: + mov dword ptr ds:[CurDir+dir_len],eax + mov eax, dword ptr ds:[si+file_left] + mov dword ptr ds:[CurDir+dir_clust],eax + xor eax,eax // Free this file pointer entry + xchg eax,dword ptr ds:[si+file_sector] + mov dword ptr ds:[CurDir+dir_lba],eax + + + mov di, offset isolinux_bin // di points to Isolinux filename + call searchdir // look for the file + jnz .isolinux_opened // got the file + mov si, offset no_isolinux_msg // si points to error message + call writemsg // display the message + jmp kaboom // fail boot + +.isolinux_opened: + mov di, si // save file pointer + +#ifdef DEBUG_MESSAGES + mov si, offset filelen_msg + call writemsg + call writehex8 + call crlf +#endif + + mov ecx, eax // calculate sector count + shr ecx, 11 + test eax, HEX(7FF) + jz .full_sector + inc ecx +.full_sector: + +#ifdef DEBUG_MESSAGES + mov eax, ecx + mov si, offset filesect_msg + call writemsg + call writehex8 + call crlf +#endif + + mov bx, HEX(8000) // bx = load address + mov si, di // restore file pointer + mov cx, HEX(0FFFF) // load the whole file + call getfssec // get the whole file + +#ifdef DEBUG_MESSAGES + mov si, offset startldr_msg + call writemsg + call crlf +#endif + + mov dl, byte ptr ds:[DriveNo] // dl = boot drive + mov dh, 0 // dh = boot partition + push 0 // push segment (0x0000) + mov eax, dword ptr ds:[HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax + add eax, HEX(8000) // RVA -> VA + push ax // push offset + retf // Transfer control to ROSLDR + + +// +// searchdir: +// +// Open a file +// +// On entry: +// DS:DI = filename +// If successful: +// ZF clear +// SI = file pointer +// DX:AX or EAX = file length in bytes +// If unsuccessful +// ZF set +// + +// +// searchdir_iso is a special entry point for ISOLINUX only. In addition +// to the above, searchdir_iso passes a file flag mask in AL. This is useful +// for searching for directories. +// +alloc_failure: + xor ax,ax // ZF <- 1 + ret + +searchdir: + xor al, al +searchdir_iso: + mov byte ptr ds:[ISOFlags],al + call allocate_file // Temporary file structure for directory + jnz alloc_failure + push es + push ds + pop es // ES = DS + mov si, offset CurDir + cmp byte ptr ds:[di], 92 //'\' // If filename begins with slash + jne .not_rooted + inc di // Skip leading slash + mov si, offset RootDir // Reference root directory instead +.not_rooted: + mov eax, dword ptr ds:[si+dir_clust] + mov dword ptr ds:[bx+file_left],eax + mov eax,dword ptr ds:[si+dir_lba] + mov dword ptr ds:[bx+file_sector],eax + mov edx,dword ptr ds:[si+dir_len] + +.look_for_slash: + mov ax,di +.scan: + mov cl, byte ptr ds:[di] + inc di + and cl,cl + jz .isfile + cmp cl, '\' + jne .scan + mov byte ptr ds:[di-1], 0 // Terminate at directory name + mov cl,2 // Search for directory + xchg cl, byte ptr ds:[ISOFlags] + push di + push cx + push offset .resume // Where to "return" to + push es +.isfile: + xchg ax,di + +.getsome: + // Get a chunk of the directory + mov si,trackbuf + pushad + xchg bx,si + mov cx,1 // load one sector + call getfssec + popad + +.compare: + movzx eax, byte ptr ds:[si] // Length of directory entry + cmp al, 33 + jb .next_sector + mov cl, byte ptr ds:[si+25] + xor cl, byte ptr ds:[ISOFlags] + test cl, HEX(8E) // Unwanted file attributes! + jnz .not_file + pusha + movzx cx, byte ptr ds:[si+32] // File identifier length + add si, 33 // File identifier offset + call iso_compare_names + popa + je .success +.not_file: + sub edx, eax // Decrease bytes left + jbe .failure + add si, ax // Advance pointer + +.check_overrun: + // Did we finish the buffer? + cmp si, trackbuf+trackbufsize + jb .compare // No, keep going + + jmp .getsome // Get some more directory + +.next_sector: + // Advance to the beginning of next sector + lea ax, [si+SECTORSIZE-1] + and ax, not (SECTORSIZE-1) + sub ax, si + jmp .not_file // We still need to do length checks + +.failure: +#ifdef DEBUG_MESSAGES + mov si, offset findfail_msg + call writemsg + call crlf +#endif + xor eax, eax // ZF = 1 + mov dword ptr ds:[bx+file_sector], eax + pop es + ret + +.success: + mov eax, dword ptr ds:[si+2] // Location of extent + mov dword ptr ds:[bx+file_sector], eax + mov eax, dword ptr ds:[si+10] // Data length + push eax + add eax, SECTORSIZE-1 + shr eax, SECTORSIZE_LG2 + mov dword ptr ds:[bx+file_left], eax + pop eax + mov edx, eax + shr edx, 16 + and bx, bx // ZF = 0 + mov si, bx + pop es + ret + +.resume: + // We get here if we were only doing part of a lookup + // This relies on the fact that .success returns bx == si + xchg edx, eax // Directory length in edx + pop cx // Old ISOFlags + pop di // Next filename pointer + + // restore the backslash in the filename + mov byte ptr ds:[di-1], '\' + + mov byte ptr ds:[ISOFlags], cl // Restore the flags + jz .failure // Did we fail? If so fail for real! + jmp .look_for_slash // Otherwise, next level + +// +// allocate_file: Allocate a file structure +// +// If successful: +// ZF set +// BX = file pointer +// In unsuccessful: +// ZF clear +// +allocate_file: + push cx + mov bx, Files + mov cx, MAX_OPEN +.check: + cmp dword ptr ds:[bx], 0 + je .found + add bx, open_file_t_size // ZF = 0 + loop .check + // ZF = 0 if we fell out of the loop +.found: + pop cx + ret + +// +// iso_compare_names: +// Compare the names DS:SI and DS:DI and report if they are +// equal from an ISO 9660 perspective. SI is the name from +// the filesystem; CX indicates its length, and ';' terminates. +// DI is expected to end with a null. +// +// Note: clobbers AX, CX, SI, DI; assumes DS == ES == base segment +// +iso_compare_names: + // First, terminate and canonicalize input filename + push di + mov di, offset ISOFileName +.canon_loop: + jcxz .canon_end + lodsb + dec cx + cmp al, ';' + je .canon_end + and al, al + je .canon_end + stosb + cmp di, offset ISOFileNameEnd-1 // Guard against buffer overrun + jb .canon_loop +.canon_end: + cmp di, ISOFileName + jbe .canon_done + cmp byte ptr ds:[di-1], '.' // Remove terminal dots + jne .canon_done + dec di + jmp short .canon_end +.canon_done: + mov byte ptr ds:[di], 0 // Null-terminate string + pop di + mov si, ISOFileName +.compare2: + lodsb + mov ah, byte ptr ds:[di] + inc di + and ax, ax + jz .success2 // End of string for both + and al, al // Is either one end of string? + jz .failure2 // If so, failure + and ah, ah + jz .failure2 + or ax, HEX(2020) // Convert to lower case + cmp al, ah + je .compare2 +.failure2: + and ax, ax // ZF = 0 (at least one will be nonzero) +.success2: + ret + + + + + + + +// +// getfssec: Get multiple clusters from a file, given the file pointer. +// +// On entry: +// ES:BX -> Buffer +// SI -> File pointer +// CX -> Cluster count; 0FFFFh = until end of file +// On exit: +// SI -> File pointer (or 0 on EOF) +// CF = 1 -> Hit EOF +// +getfssec: + cmp cx, word ptr ds:[si+file_left] + jna .ok_size + mov cx, word ptr ds:[si+file_left] + +.ok_size: + mov bp, cx + push cx + push si + mov eax, dword ptr ds:[si+file_sector] + call getlinsec + xor ecx, ecx + pop si + pop cx + + add dword ptr ds:[si+file_sector], ecx + sub dword ptr ds:[si+file_left], ecx + ja .not_eof // CF = 0 + + xor ecx, ecx + mov dword ptr ds:[si+file_sector], ecx // Mark as unused + xor si,si + stc + +.not_eof: + ret + + +// INT 13h, AX=4B01h, DL=<passed in value> failed. +// Try to scan the entire 80h-FFh from the end. +spec_query_failed: + mov si, offset spec_err_msg + call writemsg + + mov dl, HEX(0FF) +.test_loop: + pusha + mov ax, HEX(4B01) + mov si, spec_packet + mov byte ptr ds:[si], 13 ; Size of buffer + int 13h + popa + jc .still_broken + + mov si, offset maybe_msg + call writemsg + mov al, dl + call writehex2 + call crlf + + cmp byte ptr ds:[sp_drive], dl + jne .maybe_broken + + // Okay, good enough... + mov si, offset alright_msg + call writemsg + mov byte ptr ds:[DriveNo], dl +.found_drive: + jmp found_drive + + // Award BIOS 4.51 apparently passes garbage in sp_drive, + // but if this was the drive number originally passed in + // DL then consider it "good enough" +.maybe_broken: + cmp byte ptr ds:[DriveNo], dl + je .found_drive + +.still_broken: + dec dx + cmp dl, HEX(80) + jnb .test_loop + +fatal_error: + mov si, offset nothing_msg + call writemsg + +.norge: + jmp .norge + + + +// Information message (DS:SI) output +// Prefix with "isolinux: " +writemsg: + push ax + push si + mov si, isolinux_str + call writestr + pop si + call writestr + pop ax + ret + +// +// crlf: Print a newline +crlf: + mov si, crlf_msg + // Fall through + +// +// writestr: write a null-terminated string to the console, saving +// registers on entry. +// +writestr: + pushfd + pushad +writestr_top: + lodsb + and al, al + jz writestr_end + call writechr + jmp short writestr_top +writestr_end: + popad + popfd + ret + +// +// writehex[248]: Write a hex number in (AL, AX, EAX) to the console +// +writehex2: + pushfd + pushad + shl eax, 24 + mov cx, 2 + jmp short writehex_common +writehex4: + pushfd + pushad + shl eax, 16 + mov cx, 4 + jmp short writehex_common +writehex8: + pushfd + pushad + mov cx, 8 +writehex_common: +.loop: + rol eax, 4 + push eax + and al, 0Fh + cmp al, 10 + jae .high +.low: + add al, '0' + jmp short .ischar +.high: + add al, 'A'-10 +.ischar: + call writechr + pop eax + loop .loop + popad + popfd + ret + +// +// writechr: Write a character to the screen. There is a more "sophisticated" +// version of this in the subsequent code, so we patch the pointer +// when appropriate. +writechr: + pushfd + pushad + mov ah, HEX(0E) + xor bx, bx + int HEX(10) + popad + popfd + ret + +// +// Get one sector. Convenience entry point. +// +getonesec: + mov bp, 1 + // Fall through to getlinsec + +// +// Get linear sectors - EBIOS LBA addressing, 2048-byte sectors. +// +// Note that we can't always do this as a single request, because at least +// Phoenix BIOSes has a 127-sector limit. To be on the safe side, stick +// to 32 sectors (64K) per request. +// +// Input: +// EAX - Linear sector number +// ES:BX - Target buffer +// BP - Sector count +// +getlinsec: + mov si, dapa // Load up the DAPA + mov word ptr ds:[si+4], bx + mov bx, es + mov word ptr ds:[si+6], bx + mov dword ptr ds:[si+8], eax +.loop2: + push bp // Sectors left + cmp bp, word ptr ds:[MaxTransfer] + jbe .bp_ok + mov bp, word ptr ds:[MaxTransfer] +.bp_ok: + mov word ptr ds:[si+2], bp + push si + mov dl, byte ptr ds:[DriveNo] + mov ah, HEX(42) // Extended Read + call xint13 + pop si + pop bp + movzx eax,word ptr ds:[si+2] // Sectors we read + add dword ptr ds:[si+8], eax // Advance sector pointer + sub bp, ax // Sectors left + shl ax, SECTORSIZE_LG2-4 // 2048-byte sectors -> segment + add word ptr ds:[si+6], ax // Advance buffer pointer + and bp, bp + jnz .loop2 + mov eax, dword ptr ds:[si+8] // Next sector + ret + + // INT 13h with retry +xint13: + mov byte ptr ds:[RetryCount], retry_count +.try: + pushad + int 13h + jc .error + add sp, 8*4 // Clean up stack + ret +.error: + mov byte ptr ds:[DiskError], ah // Save error code + popad + dec byte ptr ds:[RetryCount] + jz .real_error + push ax + mov al, byte ptr ds:[RetryCount] + mov ah, byte ptr ds:[dapa+2] // Sector transfer count + cmp al,2 // Only 2 attempts left + ja .nodanger + mov ah,1 // Drop transfer size to 1 + jmp short .setsize +.nodanger: + cmp al, retry_count-2 + ja .again // First time, just try again + shr ah,1 // Otherwise, try to reduce + adc ah,0 // the max transfer size, but not to 0 +.setsize: + mov byte ptr ds:[MaxTransfer],ah + mov byte ptr ds:[dapa+2],ah +.again: + pop ax + jmp .try + +.real_error: + mov si, offset diskerr_msg + call writemsg + mov al, byte ptr ds:[DiskError] + call writehex2 + mov si, offset ondrive_str + call writestr + mov al, dl + call writehex2 + call crlf + // Fall through to kaboom + +// +// kaboom: write a message and bail out. Wait for a user keypress, +// then do a hard reboot. +// +kaboom: + mov ax, cs + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + sti + mov si, err_bootfailed + call writestr + xor ax, ax // Wait for keypress + int HEX(16) + cli + mov word ptr ds:[BIOS_magic], 0 // Cold reboot + ljmp16 HEX(0F000), HEX(0FFF0) // Reset vector address + + +// +// pollchar_and_empty: check if we have an input character pending (ZF = 0) and empty the input buffer afterwards +// +pollchar_and_empty: + pushad + mov ah, 1 // Did the user press a key? + int HEX(16) + jz .end // No, then we're done + mov ah, 0 // Otherwise empty the buffer by reading it + int HEX(16) +.end: + popad + ret + + +isolinux_banner: + .asciz "\r\nLoading IsoBoot...\r\n" +copyright_str: + .asciz " (C) 1994-2002 H. Peter Anvin\r\n" +presskey_msg: + .asciz "Press any key to boot from CD" +dot_msg: + .asciz "." + +#ifdef DEBUG_MESSAGES +startup_msg: + .asciz "Startup, DL = '" +spec_ok_msg: + .asciz "packet OK, drive = " +secsize_msg: + .asciz "size appears to be " +rootloc_msg: + .asciz "Root dir loc: " +rootlen_msg: + .asciz "Root dir len: " +rootsect_msg: + .asciz "Root dir len(sect): " +fileloc_msg: + .asciz "SETUPLDR loc: " +filelen_msg: + .asciz "SETUPLDR len: " +filesect_msg: + .asciz "SETUPLDR len(sect): " +findfail_msg: + .asciz "Failed to find file!" +startldr_msg: + .asciz "Starting SETUPLDR.SYS" +#endif + +spec_err_msg: + .asciz "Load spec failed, trying wing ...\r\n" +maybe_msg: + .asciz "Found smth at drive = " +alright_msg: + .asciz "might be ok, continuing...\r\n" +nothing_msg: + .asciz "Failed locate CD-ROM; boot failed.\r\n" + +isolinux_str: + .asciz "IsoBoot: " +crlf_msg: + .asciz "\r\n" +diskerr_msg: + .asciz "Disk error " +ondrive_str: + .asciz ", drive " + +err_bootfailed: + .asciz "\r\nfailed.." +isolinux_dir: + .asciz "\\LOADER" +no_dir_msg: + .asciz "LOADER dir not found.\r\n" +isolinux_bin: + .asciz "SETUPLDR.SYS" +no_isolinux_msg: + .asciz "SETUPLDR not found.\r\n" + + +// +// El Torito spec packet +// +.align 8 +spec_packet: + db HEX(13) // Size of packet +sp_media: + db 0 // Media type +sp_drive: + db 0 // Drive number +sp_controller: + db 0 // Controller index +sp_lba: + dd 0 // LBA for emulated disk image +sp_devspec: + dw 0 // IDE/SCSI information +sp_buffer: + dw 0 // User-provided buffer +sp_loadseg: + dw 0 // Load segment +sp_sectors: + dw 0 // Sector count +sp_chs: + db 0,0,0 // Simulated CHS geometry +sp_dummy: + db 0 // Scratch, safe to overwrite + +// +// EBIOS drive parameter packet +// +.align 8 +drive_params: + dw 30 // Buffer size +dp_flags: + dw 0 // Information flags +dp_cyl: + dd 0 // Physical cylinders +dp_head: + dd 0 // Physical heads +dp_sec: + dd 0 // Physical sectors/track +dp_totalsec: + dd 0,0 // Total sectors +dp_secsize: + dw 0 // Bytes per sector +dp_dpte: + dd 0 // Device Parameter Table +dp_dpi_key: + dw 0 // 0BEDDh if rest valid +dp_dpi_len: + db 0 // DPI len + db 0 + dw 0 +dp_bus: + db 0,0,0,0 // Host bus type +dp_interface: + db 0,0,0,0,0,0,0,0 // Interface type +db_i_path: + dd 0,0 // Interface path +db_d_path: + dd 0,0 // Device path + db 0 +db_dpi_csum: + db 0 // Checksum for DPI info + +// +// EBIOS disk address packet +// +.align 8 +dapa: + dw 16 // Packet size +.count: + dw 0 // Block count +.off: + dw 0 // Offset of buffer +.seg: + dw 0 // Segment of buffer +.lba: + dd 0 // LBA (LSW) + dd 0 // LBA (MSW) + +.align 4 +MaxTransfer: + dw 2 //32 // Max sectors per transfer + +.org 2047 // Pad to file offset 2046 +.word 0aa55h // BootSector signature + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/bootsect/isoboot.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rharabien] 52149: [WIN32K] - Revert r51139. Fixes incorrect reading of all REG_MULTI_SZ values See issue #6295 for more details.
by rharabien＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: rharabien Date: Wed Jun 8 15:37:15 2011 New Revision: 52149 URL: http://svn.reactos.org/svn/reactos?rev=52149&view=rev Log: [WIN32K] - Revert r51139. Fixes incorrect reading of all REG_MULTI_SZ values See issue #6295 for more details. Modified: trunk/reactos/subsystems/win32/win32k/misc/registry.c Modified: trunk/reactos/subsystems/win32/win32k/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/registry.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/registry.c [iso-8859-1] Wed Jun 8 15:37:15 2011 @@ -84,16 +84,14 @@ cbDataSize = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + /* Note: STATUS_BUFFER_OVERFLOW is not a success */ if (NT_SUCCESS(Status)) { /* Did we get the right type */ if (pInfo->Type == ulType) { - /* Copy the contents to the caller. Make sure strings are null terminated */ - if (ulType == REG_SZ || ulType == REG_MULTI_SZ || ulType == REG_EXPAND_SZ) - RtlStringCbCopyNW((LPWSTR)pvData, *pcbValue, (LPWSTR)pInfo->Data, cbDataSize); - else - RtlCopyMemory(pvData, pInfo->Data, cbDataSize); + /* Copy the contents to the caller */ + RtlCopyMemory(pvData, pInfo->Data, cbDataSize); } else Status = STATUS_OBJECT_TYPE_MISMATCH;

1 0

[akhaldi] 52148: [CMAKE] * Fix reactos.cab creation.
by akhaldi＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: akhaldi Date: Wed Jun 8 13:58:33 2011 New Revision: 52148 URL: http://svn.reactos.org/svn/reactos?rev=52148&view=rev Log: [CMAKE] * Fix reactos.cab creation. Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Wed Jun 8 13:58:33 2011 @@ -31,17 +31,11 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff) -# Then we create the actual cab file -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab +# Then we create the actual cab file using a custom target +add_custom_target(reactos_cab COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) -# Finally, we create the reactos_cab target -add_custom_target(reactos_cab ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) - add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[tkreuzer] 52147: [FAT32] Fix the "portable" version of the fat32 bootsector Its now mostly identical to the one we currently use, only a few encoding differences
by tkreuzer＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: tkreuzer Date: Wed Jun 8 12:45:56 2011 New Revision: 52147 URL: http://svn.reactos.org/svn/reactos?rev=52147&view=rev Log: [FAT32] Fix the "portable" version of the fat32 bootsector Its now mostly identical to the one we currently use, only a few encoding differences Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Wed Jun 8 12:45:56 2011 @@ -10,6 +10,8 @@ #include <asm.inc> +#define BP_REL(x) [bp+x-offset start] + .code16 //ORG HEX(7c00) @@ -21,59 +23,59 @@ OEMName: .ASCII "FrLdr1.0" BytesPerSector: - dw 512 + .word 512 SectsPerCluster: - db 0 + .byte 0 ReservedSectors: - dw 32 + .word 32 NumberOfFats: - db 2 + .byte 2 MaxRootEntries: - dw 0 // Always zero for FAT32 volumes + .word 0 // Always zero for FAT32 volumes TotalSectors: - dw 0 // Always zero for FAT32 volumes + .word 0 // Always zero for FAT32 volumes MediaDescriptor: - db HEX(0f8) + .byte HEX(0f8) SectorsPerFat: - dw 0 // Always zero for FAT32 volumes + .word 0 // Always zero for FAT32 volumes SectorsPerTrack: - dw 0 + .word 0 NumberOfHeads: - dw 0 + .word 0 HiddenSectors: - dd 0 + .long 0 TotalSectorsBig: - dd 0 + .long 0 // FAT32 Inserted Info SectorsPerFatBig: - dd 0 + .long 0 ExtendedFlags: - dw 0 + .word 0 FSVersion: - dw 0 + .word 0 RootDirStartCluster: - dd 0 + .long 0 FSInfoSector: - dw 0 + .word 0 BackupBootSector: - dw 6 + .word 6 Reserved1: - db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // End FAT32 Inserted Info BootDrive: - db 0 + .byte 0 Reserved: - db 0 + .byte 0 ExtendSig: - db HEX(29) + .byte HEX(29) SerialNumber: - dd 0 + .long 0 VolumeLabel: - db "NO NAME " + .ascii "NO NAME " FileSystem: - db "FAT32 " + .ascii "FAT32 " main: xor ax,ax // Setup segment registers @@ -83,27 +85,27 @@ mov bp, HEX(7c00) mov sp, HEX(7c00) // Setup a stack - cmp byte ptr ds:[BootDrive], HEX(0ff) // If they have specified a boot drive then use it + cmp byte ptr BP_REL(BootDrive), HEX(0ff) // If they have specified a boot drive then use it jne CheckSectorsPerFat - mov byte ptr ds:[BootDrive], dl // Save the boot drive + mov byte ptr BP_REL(BootDrive), dl // Save the boot drive CheckSectorsPerFat: - cmp word ptr [SectorsPerFat], 0 // Check the old 16-bit value of SectorsPerFat + cmp word ptr BP_REL(SectorsPerFat), 0 // Check the old 16-bit value of SectorsPerFat jnz CheckFailed // If it is non-zero then exit with an error CheckTotalSectors: // Check the old 16-bit value of TotalSectors & MaxRootEntries - cmp word ptr [MaxRootEntries], 0// by comparing the DWORD at offset MaxRootEntries to zero + cmp dword ptr BP_REL(MaxRootEntries), 0// by comparing the DWORD at offset MaxRootEntries to zero jnz CheckFailed // If it is non-zero then exit with an error CheckFileSystemVersion: - cmp word ptr [FSVersion], 0 // Check the file system version word + cmp word ptr BP_REL(FSVersion), 0 // Check the file system version word jna GetDriveParameters // It is zero, so continue CheckFailed: jmp PrintFileSystemError // If it is not zero then exit with an error GetDriveParameters: mov ax, HEX(0800) - mov dl, byte ptr [BootDrive] // Get boot drive in dl + mov dl, byte ptr BP_REL(BootDrive) // Get boot drive in dl int HEX(13) // Request drive parameters from the bios jnc CalcDriveSize // If the call succeeded then calculate the drive size @@ -137,7 +139,7 @@ // First we have to load our extra boot code at // sector 14 into memory at [0000:7e00h] mov eax, HEX(0e) - add eax, dword ptr ds:[HiddenSectors] // Add the number of hidden sectors + add eax, dword ptr BP_REL(HiddenSectors) // Add the number of hidden sectors mov cx, 1 xor bx, bx mov es, bx // Read sector to [0000:7e00h] @@ -160,7 +162,7 @@ CheckInt13hExtensions: // Now check if this computer supports extended reads mov ah, HEX(41) // AH = 41h mov bx, HEX(55aa) // BX = 55AAh - mov dl, byte ptr ds:[BootDrive] // DL = drive (80h-FFh) + mov dl, byte ptr BP_REL(BootDrive) // DL = drive (80h-FFh) int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK jc ReadSectorsCHS // CF set on error (extensions not supported) cmp bx, HEX(0aa55) // BX = AA55h if installed @@ -179,7 +181,7 @@ ReadSectorsSetupDiskAddressPacket: mov word ptr ds:[LBASectorsRead],cx - push 0 + push 0 // push large 0 ? push eax // Put 64-bit logical block address on stack push es // Put transfer segment on stack push bx // Put transfer offset on stack @@ -187,7 +189,7 @@ push 16 // Set size of packet to 10h mov si, sp // Setup disk address packet on stack - mov dl, byte ptr ds:[BootDrive] // Drive number + mov dl, byte ptr BP_REL(BootDrive) // Drive number mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read int HEX(13) // Call BIOS jc PrintDiskError // If the read failed then abort @@ -211,7 +213,7 @@ ret LBASectorsRead: - dd 0 + .long 0 // Reads logical sectors into [ES:BX] @@ -223,15 +225,15 @@ ReadSectorsCHSLoop: pushad xor edx, edx - movzx ecx, word ptr ds:[SectorsPerTrack] + movzx ecx, word ptr BP_REL(SectorsPerTrack) div ecx // Divide logical by SectorsPerTrack inc dl // Sectors numbering starts at 1 not 0 mov cl, dl // Sector in CL mov edx, eax shr edx, 16 - div word ptr ds:[NumberOfHeads] // Divide logical by number of heads + div word ptr BP_REL(NumberOfHeads) // Divide logical by number of heads mov dh, dl // Head in DH - mov dl, byte ptr ds:[BootDrive] // Drive number in DL + mov dl, byte ptr BP_REL(BootDrive) // Drive number in DL mov ch, al // Cylinder in CX ror ah, 1 // Low 8 bits of cylinder in CH, high 2 bits ror ah, 1 // in CL shifted to bits 6 & 7 @@ -267,7 +269,7 @@ // Displays a file system error message // And reboots PrintFileSystemError: - mov si,msgFileSystemError // FreeLdr not found message + mov si, offset msgFileSystemError // FreeLdr not found message call PutChars // Display it Reboot: @@ -286,27 +288,26 @@ int HEX(10) jmp short PutChars Done: - retn + ret BiosCHSDriveSize: - dd 0 + .long 0 msgDiskError: - db "Disk error", 13, 10, 0 + .asciz "Disk error\r\n" msgFileSystemError: - db "File system error", 13, 10, 0 + .asciz "File system error\r\n" msgAnyKey: - db "Press any key to restart", 13, 10, 0 - -// times 509-($-$$) db 0 // Pad to 509 bytes + .asciz "Press any key to restart\r\n" + .org 509 // Pad to 509 bytes BootPartition: - db 0 + .byte 0 BootSignature: - dw 0aa55h // BootSector signature + .word HEX(0aa55) // BootSector signature // End of bootsector // @@ -323,7 +324,7 @@ StartSearch: // Now we must get the first cluster of the root directory - mov eax, dword ptr ds:[RootDirStartCluster] + mov eax, dword ptr BP_REL(RootDirStartCluster) cmp eax, HEX(0ffffff8) // Check to see if this is the last cluster in the chain jb ContinueSearch // If not continue, if so then we didn't find freeldr.sys jmp PrintFileNotFound @@ -336,7 +337,7 @@ // Now we have to find our way through the root directory to // The OSLOADER.SYS file xor bx,bx - mov bl, byte ptr ds:[SectsPerCluster] + mov bl, byte ptr BP_REL(SectsPerCluster) shl bx, 4 // BX = BX * 512 / 32 mov ax, HEX(2000) // We loaded at 2000:0000 mov es, ax @@ -362,9 +363,9 @@ jnz FindFile // Last entry? // Get the next root dir cluster and try again until we run out of clusters - mov eax, dword ptr ds:[RootDirStartCluster] + mov eax, dword ptr BP_REL(RootDirStartCluster) call GetFatEntry - mov dword ptr ds:[RootDirStartCluster], eax + mov dword ptr BP_REL(RootDirStartCluster), eax jmp StartSearch FoundFile: @@ -374,9 +375,9 @@ xor di, di // ES:DI has dir entry xor dx, dx - mov ax, word ptr es:[di+14h] // Get start cluster high word + mov ax, word ptr es:[di+20] // Get start cluster high word shl eax, 16 - mov ax, word ptr es:[di+1ah] // Get start cluster low word + mov ax, word ptr es:[di+26] // Get start cluster low word CheckStartCluster: cmp eax, 2 // Check and see if the start cluster starts at cluster 2 or above @@ -401,7 +402,7 @@ pop es xor bx, bx - mov bl, byte ptr ds:[SectsPerCluster] + mov bl, byte ptr BP_REL(SectsPerCluster) shl bx, 5 // BX = BX * 512 / 16 mov ax, es // Increment the load address by add ax, bx // The size of a cluster @@ -415,7 +416,7 @@ jmp LoadFile // Load the next cluster (if any) LoadFileDone: - mov dl, byte ptr ds:[BootDrive] // Load boot drive into DL + mov dl, byte ptr BP_REL(BootDrive) // Load boot drive into DL mov dh, byte ptr ds:[BootPartition] // Load boot partition into DH push 0 // push segment (0x0000) @@ -432,12 +433,12 @@ shl eax, 2 // EAX = EAX * 4 (since FAT32 entries are 4 bytes) mov ecx, eax // Save this for later in ECX xor edx, edx - movzx ebx, word ptr ds:[BytesPerSector] + movzx ebx, word ptr BP_REL(BytesPerSector) push ebx div ebx // FAT Sector Number = EAX / BytesPerSector - movzx ebx, word ptr ds:[ReservedSectors] + movzx ebx, word ptr BP_REL(ReservedSectors) add eax, ebx // FAT Sector Number += ReservedSectors - mov ebx, dword ptr ds:[HiddenSectors] + mov ebx, dword ptr BP_REL(HiddenSectors) add eax, ebx // FAT Sector Number += HiddenSectors pop ebx dec ebx @@ -449,15 +450,15 @@ // to see which FAT is the active one // and use it, or if they are mirrored then // no worries - movzx ebx, word ptr ds:[ExtendedFlags] // Get extended flags and put into ebx + movzx ebx, word ptr BP_REL(ExtendedFlags) // Get extended flags and put into ebx and bx, HEX(0f) // Mask off upper 8 bits, now we have active fat in bl jz LoadFatSector // If fat is mirrored then skip fat calcs - cmp bl, byte ptr ds:[NumberOfFats] // Compare bl to number of fats + cmp bl, byte ptr BP_REL(NumberOfFats) // Compare bl to number of fats jb GetActiveFatOffset jmp PrintFileSystemError // If bl is bigger than numfats exit with error GetActiveFatOffset: push eax // Save logical FAT sector number - mov eax, dword ptr ds:[SectorsPerFatBig] // Get the number of sectors occupied by one fat in eax + mov eax, dword ptr BP_REL(SectorsPerFatBig) // Get the number of sectors occupied by one fat in eax mul ebx // Multiplied by the active FAT index we have in ebx pop edx // Get logical FAT sector number add eax, edx // Add the current FAT sector offset @@ -486,7 +487,7 @@ ret FatSectorInCache: // This variable tells us which sector we currently have in memory - dd 0ffffffffh // There is no need to re-read the same sector if we don't have to + .long HEX(0ffffffff) // There is no need to re-read the same sector if we don't have to // Reads cluster number in EAX into [ES:0000] @@ -496,19 +497,19 @@ dec eax dec eax xor edx, edx - movzx ebx, byte ptr ds:[SectsPerCluster] + movzx ebx, byte ptr BP_REL(SectsPerCluster) mul ebx push eax xor edx, edx - movzx eax, byte ptr ds:[NumberOfFats] - mul dword ptr ds:[SectorsPerFatBig] - movzx ebx, word ptr ds:[ReservedSectors] + movzx eax, byte ptr BP_REL(NumberOfFats) + mul dword ptr BP_REL(SectorsPerFatBig) + movzx ebx, word ptr BP_REL(ReservedSectors) add eax, ebx - add eax, dword ptr ds:[HiddenSectors] + add eax, dword ptr BP_REL(HiddenSectors) pop ebx add eax, ebx // EAX now contains the logical sector number of the cluster xor bx, bx // We will load it to [ES:0000], ES loaded before function call - movzx cx, byte ptr ds:[SectsPerCluster] + movzx cx, byte ptr BP_REL(SectsPerCluster) call ReadSectors ret @@ -523,15 +524,15 @@ jmp Reboot msgFreeLdr: - db "freeldr.sys not found", 13, 10, 0 + .asciz "freeldr.sys not found\r\n" filename: - db "FREELDR SYS" + .ascii "FREELDR SYS" msgLoading: - db "Loading FreeLoader...", 13, 10, 0 - - //times 1022-($-$$) db 0 // Pad to 1022 bytes - - dw 0aa55h // BootSector signature + .asciz "Loading FreeLoader...\r\n" + +.org 1022 // Pad to 1022 bytes + + .word HEX(0aa55) // BootSector signature .endcode16

1 0

[tkreuzer] 52146: [OBJ2BIN] - Fix relocation for gas build objetcs - Protect from buffer overwrite
by tkreuzer＠svn.reactos.org 08 Jun '11

08 Jun '11

Author: tkreuzer Date: Wed Jun 8 12:42:04 2011 New Revision: 52146 URL: http://svn.reactos.org/svn/reactos?rev=52146&view=rev Log: [OBJ2BIN] - Fix relocation for gas build objetcs - Protect from buffer overwrite Modified: trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Wed Jun 8 12:42:04 2011 @@ -8,13 +8,14 @@ Usage(void) { printf("Converts a coff object file into a raw binary file.\n" - "Syntax: obj2bin <source file> <dest file>\n"); + "Syntax: obj2bin <source file> <dest file> <base address>\n"); } static void RelocateImage( char *pData, + unsigned int nSize, PIMAGE_RELOCATION pReloc, unsigned int cNumRelocs, PIMAGE_SYMBOL pSymbols, @@ -25,15 +26,19 @@ for (i = 0; i < cNumRelocs; i++) { + if (pReloc->VirtualAddress > nSize) continue; + switch (pReloc->Type) { case IMAGE_REL_I386_ABSOLUTE: + case 16: p16 = (void*)(pData + pReloc->VirtualAddress); - *p16 = (WORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset); + *p16 += (WORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset); break; default: - printf("Unknown relocatation type %ld\n", pReloc->Type); + printf("Unknown relocatation type %ld address %ld\n", + pReloc->Type, pReloc->VirtualAddress); } pReloc++; @@ -183,12 +188,14 @@ return -15; } - RelocateImage(pData, pReloc, SectionHeader.NumberOfRelocations, pSymbols, iOffset); + RelocateImage(pData, SectionHeader.SizeOfRawData, + pReloc, SectionHeader.NumberOfRelocations, pSymbols, iOffset); /* Write the section to the destination file */ if (!fwrite(pData, SectionHeader.SizeOfRawData, 1, pDestFile)) { - fprintf(stderr, "Failed to write data\n"); + fprintf(stderr, "Failed to write data %ld\n", + SectionHeader.SizeOfRawData); return -16; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs