Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[jimtabor] 43277: - Dont need this then.
by jimtabor＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: jimtabor Date: Sun Oct 4 01:42:06 2009 New Revision: 43277 URL: http://svn.reactos.org/svn/reactos?rev=43277&view=rev Log: - Dont need this then. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Oct 4 01:42:06 2009 @@ -117,7 +117,6 @@ /* ReactOS */ LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - BOOLEAN IsExiting; // Use TIF_INCLEANUP SINGLE_LIST_ENTRY ReferencesList; } THREADINFO;

1 0

[jimtabor] 43276: - Use TIF in cleanup flag.
by jimtabor＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: jimtabor Date: Sun Oct 4 01:39:30 2009 New Revision: 43276 URL: http://svn.reactos.org/svn/reactos?rev=43276&view=rev Log: - Use TIF in cleanup flag. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -264,7 +264,7 @@ } } } - Win32Thread->IsExiting = FALSE; + Win32Thread->TIF_flags &= ~TIF_INCLEANUP; co_IntDestroyCaret(Win32Thread); Win32Thread->ppi = PsGetCurrentProcessWin32Process(); pTeb = NtCurrentTeb(); @@ -283,7 +283,6 @@ DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); - Win32Thread->IsExiting = TRUE; Win32Thread->TIF_flags |= TIF_INCLEANUP; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -1008,7 +1008,7 @@ PTHREADINFO OldBlock; ASSERT(W32Thread); - if(!W32Thread->Desktop || (W32Thread->IsExiting && BlockIt)) + if(!W32Thread->Desktop || ((W32Thread->TIF_flags & TIF_INCLEANUP) && BlockIt)) { /* * fail blocking if exiting the thread Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -1513,7 +1513,7 @@ if (NULL != Win32Thread && Window->MessageQueue == Win32Thread->MessageQueue) { - if (Win32Thread->IsExiting) + if (Win32Thread->TIF_flags & TIF_INCLEANUP) { /* Never send messages to exiting threads */ RETURN( FALSE);

1 0

[cgutman] 43275: - Add cancellation support for IOCTL_AFD_SELECT - Fix release build
by cgutman＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: cgutman Date: Sat Oct 3 23:34:34 2009 New Revision: 43275 URL: http://svn.reactos.org/svn/reactos?rev=43275&view=rev Log: - Add cancellation support for IOCTL_AFD_SELECT - Fix release build Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/include/afd.h 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] Sat Oct 3 23:34:34 2009 @@ -517,6 +517,10 @@ PAFD_SEND_INFO SendReq; PLIST_ENTRY CurrentEntry; PIRP CurrentIrp; + PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; + KIRQL OldIrql; + PAFD_ACTIVE_POLL Poll; + PAFD_POLL_INFO PollReq; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -553,9 +557,38 @@ Function = FUNCTION_PREACCEPT; break; + case IOCTL_AFD_SELECT: + KeAcquireSpinLock(&DeviceExt->Lock, &OldIrql); + + CurrentEntry = DeviceExt->Polls.Flink; + while (CurrentEntry != &DeviceExt->Polls) + { + Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); + CurrentIrp = Poll->Irp; + PollReq = CurrentIrp->AssociatedIrp.SystemBuffer; + + if (CurrentIrp == Irp) + { + ZeroEvents(PollReq->Handles, PollReq->HandleCount); + SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + break; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + + /* IRP already completed by SignalSocket */ + SocketStateUnlock(FCB); + return; + default: ASSERT(FALSE); - break; + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + return; } CurrentEntry = FCB->PendingIrpList[Function].Flink; Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Oct 3 23:34:34 2009 @@ -43,7 +43,7 @@ } } -static VOID ZeroEvents( PAFD_HANDLE HandleArray, +VOID ZeroEvents( PAFD_HANDLE HandleArray, UINT HandleCount ) { UINT i; @@ -55,7 +55,7 @@ /* you must pass either Poll OR Irp */ -static VOID SignalSocket( +VOID SignalSocket( PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, PAFD_POLL_INFO PollReq, @@ -89,6 +89,7 @@ UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -244,6 +245,7 @@ Status = STATUS_PENDING; IoMarkIrpPending( Irp ); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); } else { AFD_DbgPrint(MAX_TRACE, ("FIXME: do something with the IRP!\n")); Status = STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 3 23:34:34 2009 @@ -315,6 +315,11 @@ VOID PollReeval( PAFD_DEVICE_EXTENSION DeviceObject, PFILE_OBJECT FileObject ); VOID KillSelectsForFCB( PAFD_DEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, BOOLEAN ExclusiveOnly ); +VOID ZeroEvents( PAFD_HANDLE HandleArray, + UINT HandleCount ); +VOID SignalSocket( + PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, + PAFD_POLL_INFO PollReq, NTSTATUS Status); /* tdi.c */

1 0

[cgutman] 43274: - Implement IRP cancellation for AFD - Fixes "Broken driver did not complete!" showing up in the debug log (especially during winetests)
by cgutman＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: cgutman Date: Sat Oct 3 22:52:54 2009 New Revision: 43274 URL: http://svn.reactos.org/svn/reactos?rev=43274&view=rev Log: - Implement IRP cancellation for AFD - Fixes "Broken driver did not complete!" showing up in the debug log (especially during winetests) Modified: trunk/reactos/drivers/network/afd/afd/connect.c 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/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -99,6 +99,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -120,6 +121,7 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } 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] Sat Oct 3 22:52:54 2009 @@ -60,6 +60,7 @@ if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_NO_MEMORY; } @@ -79,6 +80,7 @@ Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS; + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_SUCCESS; } @@ -106,6 +108,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } 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] Sat Oct 3 22:52:54 2009 @@ -302,6 +302,7 @@ SocketStateUnlock( FCB ); } else { if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + (void)IoSetCancelRoutine(Irp, NULL); SocketStateUnlock( FCB ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } @@ -322,7 +323,7 @@ NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { InsertTailList( &FCB->PendingIrpList[Function], &Irp->Tail.Overlay.ListEntry ); - IoMarkIrpPending(Irp); - Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0 ); } 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] Sat Oct 3 22:52:54 2009 @@ -505,6 +505,78 @@ return (Status); } +VOID NTAPI +AfdCancelHandler(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + 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; + PLIST_ENTRY CurrentEntry; + PIRP CurrentIrp; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + if (!SocketAcquireStateLock(FCB)) + return; + + ASSERT(IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL); + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + 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; + + case IOCTL_AFD_CONNECT: + Function = FUNCTION_CONNECT; + break; + + case IOCTL_AFD_WAIT_FOR_LISTEN: + Function = FUNCTION_PREACCEPT; + break; + + default: + ASSERT(FALSE); + break; + } + + CurrentEntry = FCB->PendingIrpList[Function].Flink; + while (CurrentEntry != &FCB->PendingIrpList[Function]) + { + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + if (CurrentIrp == Irp) + { + RemoveEntryList(CurrentEntry); + break; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); +} + static VOID NTAPI AfdUnload(PDRIVER_OBJECT DriverObject) { Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -154,6 +154,7 @@ RetBytesCopied = TotalBytesCopied; } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } @@ -210,6 +211,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -292,6 +294,7 @@ } else if( Status == STATUS_PENDING ) { AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); IoMarkIrpPending( Irp ); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); } else { AFD_DbgPrint(MID_TRACE,("Completed with status %x\n", Status)); } @@ -427,6 +430,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -489,6 +493,7 @@ NextIrp->IoStatus.Information = DatagramRecv->Len; UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } else { AFD_DbgPrint(MID_TRACE,("Satisfying\n")); @@ -499,6 +504,7 @@ UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } 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] Sat Oct 3 22:52:54 2009 @@ -57,6 +57,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -82,7 +83,7 @@ NextIrp->IoStatus.Information = 0; if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -197,6 +198,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -279,6 +279,8 @@ VOID OskitDumpBuffer( PCHAR Buffer, UINT Len ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); VOID DestroySocket( PAFD_FCB FCB ); +VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, + PIRP Irp); /* read.c */

1 0

[hpoussin] 43273: WINLDR: Finally, set Windows boot style as default Many thanks to Fireball and Alex for your hard work on Windows boot style
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 22:09:57 2009 New Revision: 43273 URL: http://svn.reactos.org/svn/reactos?rev=43273&view=rev Log: WINLDR: Finally, set Windows boot style as default Many thanks to Fireball and Alex for your hard work on Windows boot style Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/bootcd.ini trunk/reactos/boot/bootdata/livecd.ini Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -415,13 +415,13 @@ /* ReactOS */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS", L"\"ReactOS\"", - L"ReactOS", ArcPath, + L"Windows2003", ArcPath, L""); /* ReactOS_Debug */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Debug", L"\"ReactOS (Debug)\"", - L"ReactOS", ArcPath, + L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG @@ -431,18 +431,24 @@ L"ReactOS", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); - /* ReactOS_WinLdr */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - /* ReactOS_Ram */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", L"ReactOS", L"ramdisk(0)\\ReactOS", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif + + /* ReactOS_old */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_old", L"\"ReactOS (old boot method)\"", + L"ReactOS", ArcPath, + L""); + + /* ReactOS_Debug_old */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot method)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=Setup -Timeout=0 +Timeout=1 [Display] TitleText=ReactOS Setup @@ -21,6 +21,10 @@ [Operating Systems] Setup="Setup" +Setup_old="Setup (old boot method)" [Setup] -BootType=ReactOSSetup +BootType=ReactOSSetup2 + +[Setup_old] +BootType=ReactOSSetup Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=ReactOS -Timeout=0 +Timeout=1 [Display] TitleText=ReactOS Boot Manager @@ -21,8 +21,14 @@ [Operating Systems] ReactOS="ReactOS" +Reactos_old="ReactOS (old boot method)" [ReactOS] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/DEBUGPORT=COM1 /SOS /MININT + +[Reactos_old] BootType=ReactOS SystemPath=LiveCD\reactos Options=/DEBUGPORT=COM1 /SOS

1 0

[hpoussin] 43272: [usetup] Simplify creation of entries in freeldr.ini
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 21:43:29 2009 New Revision: 43272 URL: http://svn.reactos.org/svn/reactos?rev=43272&view=rev Log: [usetup] Simplify creation of entries in freeldr.ini Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Oct 3 21:43:29 2009 @@ -352,6 +352,52 @@ NTSTATUS +CreateFreeLoaderEntry( + PINICACHE IniCache, + PINICACHESECTION OSSection, + PWCHAR Section, + PWCHAR Description, + PWCHAR BootType, + PWCHAR ArcPath, + PWCHAR Options) +{ + PINICACHESECTION IniSection; + + /* Insert entry into "Operating Systems" section */ + IniCacheInsertKey(OSSection, + NULL, + INSERT_LAST, + Section, + Description); + + /* Create new section */ + IniSection = IniCacheAppendSection(IniCache, Section); + + /* BootType= */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + BootType); + + /* SystemPath= */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"SystemPath", + ArcPath); + + /* Options=*/ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"Options", + Options); + + return STATUS_SUCCESS; +} + +NTSTATUS CreateFreeLoaderIniForReactos(PWCHAR IniPath, PWCHAR ArcPath) { @@ -366,172 +412,36 @@ IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); - /* ReactOS="ReactOS" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS", - L"\"ReactOS\""); - - /* ReactOS_Debug="ReactOS (Debug)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Debug", - L"\"ReactOS (Debug)\""); + /* ReactOS */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS", L"\"ReactOS\"", + L"ReactOS", ArcPath, + L""); + + /* ReactOS_Debug */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Debug", L"\"ReactOS (Debug)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG - /* ReactOS_KdSerial="ReactOS (RosDbg)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_KdSerial", - L"\"ReactOS (RosDbg)\""); - - /* ReactOS_WinLdr="ReactOS (WinLdr)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_WinLdr", - L"\"ReactOS (WinLdr)\""); - - /* ReactOS_Ram="ReactOS (RAM Disk)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Ram", - L"\"ReactOS (RAM Disk)\""); -#endif - - /* Create "ReactOS" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L""); - - /* Create "ReactOS_Debug" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_Debug"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - -#if DBG - - /* Create "ReactOS_KdSerial" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_KdSerial"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); - -/* ------------------------------------------------------------------------------ */ - - /* Create "ReactOS_WinLdr" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_WinLdr"); - - /* BootType=Windows2003 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"Windows2003"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - - /* Create "ReactOS_Ram" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_Ram"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=ramdisk(0)\\ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - L"ramdisk(0)\\ReactOS"); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); - + /* ReactOS_KdSerial */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); + + /* ReactOS_WinLdr */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); + + /* ReactOS_Ram */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", + L"ReactOS", L"ramdisk(0)\\ReactOS", + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif /* Save the ini file */

1 0

[hpoussin] 43271: [freeldr] Remove MachDiskGetPartitionEntry, and directly use the correct one Remove PpcDiskNormalizeSystemPath(), it was the same as DiskNormalizeSystemPath()
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 20:41:10 2009 New Revision: 43271 URL: http://svn.reactos.org/svn/reactos?rev=43271&view=rev Log: [freeldr] Remove MachDiskGetPartitionEntry, and directly use the correct one Remove PpcDiskNormalizeSystemPath(), it was the same as DiskNormalizeSystemPath() Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -203,7 +203,6 @@ // MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; - MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; // // We can now print to the console Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -440,7 +440,7 @@ SectorSize = (DrivePartition == 0xff ? 2048 : 512); if (DrivePartition != 0xff && DrivePartition != 0) { - if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) + if (!DiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) return EINVAL; SectorOffset = PartitionTableEntry.SectorCountBeforePartition; SectorCount = PartitionTableEntry.PartitionSectorCount; @@ -565,7 +565,7 @@ /* Add partitions */ i = 1; DiskReportError(FALSE); - while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) + while (DiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) { if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -47,7 +47,6 @@ MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.GetTime = PcGetTime; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -50,7 +50,6 @@ MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; MachVtbl.GetTime = XboxGetTime; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -141,7 +141,7 @@ SectorSize = (DrivePartition == 0xff ? 2048 : 512); if (DrivePartition != 0xff && DrivePartition != 0) { - if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) + if (!XboxDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) return EINVAL; SectorOffset = PartitionTableEntry.SectorCountBeforePartition; SectorCount = PartitionTableEntry.PartitionSectorCount; @@ -266,7 +266,7 @@ /* Add partitions */ i = 1; DiskReportError(FALSE); - while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) + while (XboxDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) { if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -279,12 +279,6 @@ rlen = ofw_read( part_handle, Buffer, (ULONG)(SectorCount * 512) ); return rlen > 0; -} - -BOOLEAN PpcDiskGetPartitionEntry( ULONG DriveNumber, ULONG PartitionNumber, - PPARTITION_TABLE_ENTRY PartitionTableEntry ) { - printf("GetPartitionEntry(%d,%d)\n", DriveNumber, PartitionNumber); - return FALSE; } BOOLEAN PpcDiskGetDriveGeometry( ULONG DriveNumber, PGEOMETRY DriveGeometry ) { @@ -420,44 +414,6 @@ return RootKey; } -BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { - CHAR BootPath[256]; - ULONG PartitionNumber; - ULONG DriveNumber; - PARTITION_TABLE_ENTRY PartEntry; - char *p; - - if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) - { - return FALSE; - } - - if (0 != PartitionNumber) - { - return TRUE; - } - - if (! DiskGetActivePartitionEntry(DriveNumber, - &PartEntry, - &PartitionNumber) || - PartitionNumber < 1 || 9 < PartitionNumber) - { - return FALSE; - } - - p = SystemPath; - while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { - p++; - } - p = strchr(p, ')'); - if (NULL == p || '0' != *(p - 1)) { - return FALSE; - } - *(p - 1) = '0' + PartitionNumber; - - return TRUE; -} - /* Compatibility functions that don't do much */ VOID PpcVideoPrepareForReactOS(BOOLEAN Setup) { } @@ -484,10 +440,9 @@ MachVtbl.GetMemoryMap = PpcGetMemoryMap; - MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; MachVtbl.DiskReadLogicalSectors = PpcDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = PpcDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PpcDiskGetCacheableBlockCount; Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -65,7 +65,6 @@ BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); BOOLEAN (*DiskNormalizeSystemPath)(char *SystemPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); - BOOLEAN (*DiskGetPartitionEntry)(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG (*DiskGetCacheableBlockCount)(ULONG DriveNumber); @@ -99,7 +98,6 @@ BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size); BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOLEAN MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber); TIMEINFO* ArcGetTime(VOID); @@ -127,7 +125,6 @@ #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskNormalizeSystemPath(Path, Size) MachVtbl.DiskNormalizeSystemPath((Path), (Size)) #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) -#define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) #define MachHwDetect() MachVtbl.HwDetect() Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Oct 3 20:41:10 2009 @@ -39,7 +39,6 @@ #undef MachDiskGetBootPath #undef MachDiskNormalizeSystemPath #undef MachDiskReadLogicalSectors -#undef MachDiskGetPartitionEntry #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount #undef MachHwDetect @@ -167,12 +166,6 @@ } BOOLEAN -MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - return MachVtbl.DiskGetPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); -} - -BOOLEAN MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry) { return MachVtbl.DiskGetDriveGeometry(DriveNumber, DriveGeometry);

1 0

[cgutman] 43270: - Fix the crash in ws2_32_winetest during the ioctlsocket test - Pass the blocking mode down to AFD - Dedicated to encoded
by cgutman＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: cgutman Date: Sat Oct 3 20:21:14 2009 New Revision: 43270 URL: http://svn.reactos.org/svn/reactos?rev=43270&view=rev Log: - Fix the crash in ws2_32_winetest during the ioctlsocket test - Pass the blocking mode down to AFD - Dedicated to encoded Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Oct 3 20:21:14 2009 @@ -1735,12 +1735,18 @@ switch( dwIoControlCode ) { case FIONBIO: - if( cbInBuffer < sizeof(INT) ) + if( cbInBuffer < sizeof(INT) || IS_INTRESOURCE(lpvInBuffer) ) + { + *lpErrno = WSAEFAULT; return SOCKET_ERROR; - Socket->SharedData.NonBlocking = *((PINT)lpvInBuffer) ? 1 : 0; - AFD_DbgPrint(MID_TRACE,("[%x] Set nonblocking %d\n", Handle, Socket->SharedData.NonBlocking)); - return 0; + } + return SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL); case FIONREAD: + if( cbOutBuffer < sizeof(INT) || IS_INTRESOURCE(lpvOutBuffer) ) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } return GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); default: *lpErrno = WSAEINVAL;

1 0

[mkupfer] 43269: - consider DragFullWindows-value from Registry
by mkupfer＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: mkupfer Date: Sat Oct 3 19:13:02 2009 New Revision: 43269 URL: http://svn.reactos.org/svn/reactos?rev=43269&view=rev Log: - consider DragFullWindows-value from Registry Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sat Oct 3 19:13:02 2009 @@ -212,6 +212,9 @@ gspv.im.iVertSpacing = SpiLoadMetric(L"IconVerticalspacing", 64); gspv.im.iTitleWrap = SpiLoadMetric(L"IconTitleWrap", 0); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); + + /* Load desktop settings */ + gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); /* Some hardcoded values for now */ gspv.tmCaptionFont.tmAveCharWidth = 6;

1 0

[hpoussin] 43268: [freeldr] Remove (Mach)DiskGetBootDevice, DiskGetBootVolume, DiskGetSystemVolume, FsRecognizeVolume This commit breaks ext2 driver in freeldr, which needs to use ArcSeek/ArcRead/Arc* instead of DiskGetBootVolume/MachDiskReadLogicalSectors
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 19:00:29 2009 New Revision: 43268 URL: http://svn.reactos.org/svn/reactos?rev=43268&view=rev Log: [freeldr] Remove (Mach)DiskGetBootDevice, DiskGetBootVolume, DiskGetSystemVolume, FsRecognizeVolume This commit breaks ext2 driver in freeldr, which needs to use ArcSeek/ArcRead/Arc* instead of DiskGetBootVolume/MachDiskReadLogicalSectors Removed: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c trunk/reactos/boot/freeldr/freeldr/include/fsrec.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -202,7 +202,6 @@ // Now set default disk handling routines -- we don't need to override // MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -45,7 +45,6 @@ MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -48,7 +48,6 @@ MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -250,10 +250,6 @@ BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { strncpy( OutBootPath, BootPath, Size ); return TRUE; -} - -VOID PpcDiskGetBootDevice( PULONG BootDevice ) { - BootDevice[0] = BootDevice[1] = 0; } BOOLEAN PpcDiskReadLogicalSectors( ULONG DriveNumber, ULONGLONG SectorNumber, @@ -490,7 +486,6 @@ MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; - MachVtbl.DiskGetBootDevice = PpcDiskGetBootDevice; MachVtbl.DiskReadLogicalSectors = PpcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = PpcDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -101,231 +101,6 @@ return TRUE; } -BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - ULONG ActivePartition; - - DPRINTM(DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", BootDrive, BootPartition); - - // Check and see if it is a floppy drive - // If so then just assume FAT12 file system type - if (DiskIsDriveRemovable(BootDrive)) - { - DPRINTM(DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n"); - - *DriveNumber = BootDrive; - *StartSector = 0; - *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ - *FsType = FS_FAT; - return TRUE; - } - - // Check for ISO9660 file system type - if (BootDrive >= 0x80 && FsRecIsIso9660(BootDrive)) - { - DPRINTM(DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n"); - - *DriveNumber = BootDrive; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - // Get the requested partition entry - if (BootPartition == 0) - { - // Partition requested was zero which means the boot partition - if (! DiskGetActivePartitionEntry(BootDrive, &PartitionTableEntry, &ActivePartition)) - { - /* Try partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - else if (0xff == BootPartition) - { - /* Partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - else - { - // Get requested partition - if (! MachDiskGetPartitionEntry(BootDrive, BootPartition, &PartitionTableEntry)) - { - return FALSE; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - - // Try to recognize the file system - if (!FsRecognizeVolume(BootDrive, *StartSector, &VolumeType)) - { - return FALSE; - } - - *DriveNumber = BootDrive; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return TRUE; -} - -VOID -DiskGetBootDevice(PULONG BootDevice) -{ - ((char *)BootDevice)[0] = (char)BootDrive; - ((char *)BootDevice)[1] = (char)BootPartition; -} - -#define IsRecognizedPartition(P) \ - ((P) == PARTITION_FAT_12 || \ - (P) == PARTITION_FAT_16 || \ - (P) == PARTITION_HUGE || \ - (P) == PARTITION_IFS || \ - (P) == PARTITION_EXT2 || \ - (P) == PARTITION_FAT32 || \ - (P) == PARTITION_FAT32_XINT13 || \ - (P) == PARTITION_XINT13) - -#define IsContainerPartition(P) \ - ((P) == PARTITION_EXTENDED || \ - (P) == PARTITION_XINT13_EXTENDED) - -BOOLEAN DiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device) -{ - ULONG PartitionNumber; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - CHAR BootPath[256]; - unsigned i, RosPartition; - ULONG DriveNumber; - - /* - * Verify system path - */ - if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) - { - return FALSE; - } - if (NULL != RemainingPath) - { - strcpy(RemainingPath, BootPath); - } - - /* 0xff -> no partition table present, use whole device */ - if (0xff == PartitionNumber) - { - PartitionTableEntry.SectorCountBeforePartition = 0; - i = 0xff; - } - else - { - /* recalculate the boot partition for freeldr */ - i = 0; - RosPartition = 0; - while (1) - { - if (!MachDiskGetPartitionEntry(DriveNumber, ++i, &PartitionTableEntry)) - { - return FALSE; - } - if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && - PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) - { - if (++RosPartition == PartitionNumber) - { - break; - } - } - } - } - - /* Check for ISO9660 file system type */ - if (DriveNumber >= 0x80 && FsRecIsIso9660(DriveNumber)) - { - DPRINTM(DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n"); - - if (NULL != Device) - { - ((char *)Device)[0] = (char)DriveNumber; - ((char *)Device)[1] = (char)i; - } - return TRUE; - } - - if (!FsRecognizeVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) - { - return FALSE; - } - - if (NULL != Device) - { - ((char *)Device)[0] = (char)DriveNumber; - ((char *)Device)[1] = (char)i; - } - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - case PARTITION_EXT2: - case PARTITION_NTFS: - return TRUE; - default: - return FALSE; - } - - return FALSE; -} - BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -31,7 +31,6 @@ <file>ext2.c</file> <file>fat.c</file> <file>fs.c</file> - <file>fsrec.c</file> <file>iso.c</file> <file>ntfs.c</file> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -59,6 +59,15 @@ ULONG Ext2GroupCount = 0; // Number of groups in this file system ULONG Ext2InodesPerBlock = 0; // Number of inodes in one block ULONG Ext2GroupDescPerBlock = 0; // Number of group descriptors in one block + +BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +{ + *DriveNumber = 0; + *StartSector = 0; + *SectorCount = 0; + *FsType = 0; + return FALSE; +} BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) { Removed: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c (removed) @@ -1,131 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <freeldr.h> - -#define NDEBUG -#include <debug.h> - -///////////////////////////////////////////////////////////////////////////////////////////// -// FUNCTIONS -///////////////////////////////////////////////////////////////////////////////////////////// - -/* - * - * BOOLEAN FsRecognizeVolume(ULONG DriveNumber, ULONG VolumeStartSector, UCHAR* VolumeType); - * - */ -BOOLEAN FsRecognizeVolume(ULONG DriveNumber, ULONG VolumeStartSector, UCHAR* VolumeType) -{ - - DPRINTM(DPRINT_FILESYSTEM, "FsRecognizeVolume() DriveNumber: 0x%x VolumeStartSector: %d\n", DriveNumber, VolumeStartSector); - - if (FsRecIsFat(DriveNumber, VolumeStartSector)) - { - *VolumeType = PARTITION_FAT32; - return TRUE; - } - else if (FsRecIsNtfs(DriveNumber, VolumeStartSector)) - { - *VolumeType = PARTITION_NTFS; - return TRUE; - } - else if (FsRecIsExt2(DriveNumber, VolumeStartSector)) - { - *VolumeType = PARTITION_EXT2; - return TRUE; - } - - return FALSE; -} - -BOOLEAN FsRecIsIso9660(ULONG DriveNumber) -{ - PUCHAR Sector = (PUCHAR)DISKREADBUFFER; - - if (!MachDiskReadLogicalSectors(DriveNumber, 16, 1, Sector)) - { - FileSystemError("Failed to read the PVD."); - return FALSE; - } - - return (Sector[0] == 1 && - Sector[1] == 'C' && - Sector[2] == 'D' && - Sector[3] == '0' && - Sector[4] == '0' && - Sector[5] == '1'); -} - -BOOLEAN FsRecIsExt2(ULONG DriveNumber, ULONG VolumeStartSector) -{ - PEXT2_SUPER_BLOCK SuperBlock = (PEXT2_SUPER_BLOCK)DISKREADBUFFER; - - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector + 2, 2, SuperBlock)) - { - FileSystemError("Failed to read the super block."); - return FALSE; - } - - if (SuperBlock->magic == EXT2_MAGIC) - { - return TRUE; - } - - return FALSE; -} - -BOOLEAN FsRecIsFat(ULONG DriveNumber, ULONG VolumeStartSector) -{ - PFAT_BOOTSECTOR BootSector = (PFAT_BOOTSECTOR)DISKREADBUFFER; - PFAT32_BOOTSECTOR BootSector32 = (PFAT32_BOOTSECTOR)DISKREADBUFFER; - PFATX_BOOTSECTOR BootSectorX = (PFATX_BOOTSECTOR)DISKREADBUFFER; - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, BootSector)) - { - FileSystemError("Failed to read the boot sector."); - return FALSE; - } - - if (strncmp(BootSector->FileSystemType, "FAT12 ", 8) == 0 || - strncmp(BootSector->FileSystemType, "FAT16 ", 8) == 0 || - strncmp(BootSector32->FileSystemType, "FAT32 ", 8) == 0 || - strncmp(BootSectorX->FileSystemType, "FATX", 4) == 0) - { - return TRUE; - } - - return FALSE; -} - -BOOLEAN FsRecIsNtfs(ULONG DriveNumber, ULONG VolumeStartSector) -{ - PNTFS_BOOTSECTOR BootSector = (PNTFS_BOOTSECTOR)DISKREADBUFFER; - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, BootSector)) - { - FileSystemError("Failed to read the boot sector."); - return FALSE; - } - - if (RtlEqualMemory(BootSector->SystemId, "NTFS", 4)) - { - return TRUE; - } - - return FALSE; -} Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -127,12 +127,7 @@ extern ULONG BootDrive; extern ULONG BootPartition; -BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -BOOLEAN DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device); BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); -VOID DiskGetBootDevice(PULONG BootDevice); BOOLEAN DiskNormalizeSystemPath(char *SystemPath, unsigned Size); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -59,7 +59,6 @@ #include <reactos.h> #include <registry.h> #include <winldr.h> -#include <fsrec.h> /* file system headers */ #include <fs/ext2.h> #include <fs/fat.h> Removed: trunk/reactos/boot/freeldr/freeldr/include/fsrec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fsrec.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fsrec.h (removed) @@ -1,29 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __FSREC_H -#define __FSREC_H - -BOOLEAN FsRecognizeVolume(ULONG DriveNumber, ULONG VolumeStartSector, UCHAR* VolumeType); -BOOLEAN FsRecIsIso9660(ULONG DriveNumber); -BOOLEAN FsRecIsExt2(ULONG DriveNumber, ULONG VolumeStartSector); -BOOLEAN FsRecIsFat(ULONG DriveNumber, ULONG VolumeStartSector); -BOOLEAN FsRecIsNtfs(ULONG DriveNumber, ULONG VolumeStartSector); - -#endif // #defined __FSREC_H Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -63,7 +63,6 @@ ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); - VOID (*DiskGetBootDevice)(PULONG BootDevice); BOOLEAN (*DiskNormalizeSystemPath)(char *SystemPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN (*DiskGetPartitionEntry)(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); @@ -98,7 +97,6 @@ VOID MachBeep(VOID); MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); -VOID MachDiskGetBootDevice(PULONG BootDevice); BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size); BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); @@ -127,7 +125,6 @@ #define MachBeep() MachVtbl.Beep() #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) -#define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) #define MachDiskNormalizeSystemPath(Path, Size) MachVtbl.DiskNormalizeSystemPath((Path), (Size)) #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -37,7 +37,6 @@ #undef MachBeep #undef MachPrepareForReactOS #undef MachDiskGetBootPath -#undef MachDiskGetBootDevice #undef MachDiskNormalizeSystemPath #undef MachDiskReadLogicalSectors #undef MachDiskGetPartitionEntry @@ -155,12 +154,6 @@ return MachVtbl.DiskGetBootPath(BootPath, Size); } -VOID -MachDiskGetBootDevice(PULONG BootDevice) -{ - MachVtbl.DiskGetBootDevice(BootDevice); -} - BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Oct 3 19:00:29 2009 @@ -755,14 +755,11 @@ // RamDiskSwitchFromBios(); - /* - * Try to get system volume - */ - if (!DiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) - { - UiMessageBox("Failed to get system volume."); - return; - } + /* Get boot path */ + if (strchr(SystemPath, '\\') != NULL) + strcpy(szBootPath, strchr(SystemPath, '\\')); + else + szBootPath[0] = '\0'; /* append a backslash */ if ((strlen(szBootPath)==0) ||

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009