Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 35499: Merge aicom-network-fixes up to 35486
by arty＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: arty Date: Wed Aug 20 22:38:49 2008 New Revision: 35499 URL: http://svn.reactos.org/svn/reactos?rev=35499&view=rev Log: Merge aicom-network-fixes up to 35486 Modified: trunk/reactos/drivers/network/afd/afd/info.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/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Wed Aug 20 22:38:49 2008 @@ -135,22 +135,21 @@ if( NT_SUCCESS(Status) ) { Status = TdiQueryInformation - ( FCB->AddressFile.Object, + ( FCB->Connection.Object, TDI_QUERY_CONNECTION_INFO, SysMdl ); } if( NT_SUCCESS(Status) ) { TransAddr = - (PTRANSPORT_ADDRESS)MmMapLockedPages - ( Mdl, IoModifyAccess ); - } + (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); - if( TransAddr ) - RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, - TaLengthOfTransportAddress - ( ConnInfo->RemoteAddress ) ); - else Status = STATUS_INSUFFICIENT_RESOURCES; + if( TransAddr ) + RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, + TaLengthOfTransportAddress + ( ConnInfo->RemoteAddress ) ); + else Status = STATUS_INSUFFICIENT_RESOURCES; + } if( ConnInfo ) ExFreePool( ConnInfo ); if( SysMdl ) IoFreeMdl( SysMdl ); 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 Aug 20 22:38:49 2008 @@ -87,14 +87,14 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; + if( Irp->Cancel ) { + if( FCB ) FCB->ListenIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ListenIrp.InFlightRequest = NULL; - - if( Irp->Cancel ) { - SocketStateUnlock( FCB ); - return STATUS_SUCCESS; - } if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); 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 Aug 20 22:38:49 2008 @@ -15,6 +15,8 @@ /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { + BOOLEAN LockFailed = FALSE; + Irp->MdlAddress = IoAllocateMdl( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, IrpSp->Parameters.DeviceIoControl.InputBufferLength, @@ -22,14 +24,34 @@ FALSE, NULL ); if( Irp->MdlAddress ) { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + _SEH_TRY { + MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + } _SEH_HANDLE { + LockFailed = TRUE; + } _SEH_END; + + if( LockFailed ) { + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer = MmMapLockedPages( Irp->MdlAddress, KernelMode ); + + if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer ) { + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + return IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; } else return NULL; } VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { + if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer || !Irp->MdlAddress ) return; + MmUnmapLockedPages( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, Irp->MdlAddress ); MmUnlockPages( Irp->MdlAddress ); 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 Aug 20 22:38:49 2008 @@ -190,9 +190,7 @@ if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); - InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; - InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; - IoCancelIrp( InFlightRequest[i]->InFlightRequest ); + InFlightRequest[i]->InFlightRequest = NULL; } } 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] Wed Aug 20 22:38:49 2008 @@ -233,6 +233,11 @@ ASSERT_IRQL(APC_LEVEL); + if( Irp->Cancel ) { + if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ReceiveIrp.InFlightRequest = NULL; @@ -448,6 +453,11 @@ UINT DGSize = Irp->IoStatus.Information + sizeof( AFD_STORED_DATAGRAM ); AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + + if( Irp->Cancel ) { + if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; 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 Aug 20 22:38:49 2008 @@ -40,6 +40,11 @@ ASSERT_IRQL(APC_LEVEL); + if( Irp->Cancel ) { + if( FCB ) FCB->SendIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->SendIrp.InFlightRequest = NULL; @@ -170,6 +175,11 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); + if( Irp->Cancel ) { + if( FCB ) FCB->SendIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + /* It's ok if the FCB already died */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS; @@ -264,30 +274,28 @@ return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL ); + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); + + if( !SendReq->BufferArray ) { + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + Irp, 0, NULL ); + } + AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { AFD_DbgPrint(MID_TRACE,("Queuing request\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } - } - - AFD_DbgPrint(MID_TRACE,("We already have %d bytes waiting.\n", - FCB->Send.BytesUsed)); - - SendReq->BufferArray = LockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - NULL, NULL, - FALSE, FALSE ); - - if( !SendReq->BufferArray ) { - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL ); } AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n", @@ -362,6 +370,7 @@ if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Aug 20 22:38:49 2008 @@ -52,34 +52,6 @@ return IRPFinish(Irp, STATUS_CANCELLED); } - - -VOID DispCancelComplete( - PVOID Context) -/* - * FUNCTION: Completes a cancel request - * ARGUMENTS: - * Context = Pointer to context information (FILE_OBJECT) - */ -{ - /*KIRQL OldIrql;*/ - PFILE_OBJECT FileObject; - PTRANSPORT_CONTEXT TranContext; - - TI_DbgPrint(DEBUG_IRP, ("Called.\n")); - - FileObject = (PFILE_OBJECT)Context; - TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext; - - /* Set the cleanup event */ - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - /* We are expected to release the cancel spin lock */ - /*IoReleaseCancelSpinLock(OldIrql);*/ - - TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); -} - VOID DispDataRequestComplete( PVOID Context, @@ -155,8 +127,6 @@ TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(DisType->FileObject); } VOID NTAPI DispCancelRequest( @@ -209,24 +179,20 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); - break; + return; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); - break; } - - /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/ break; case TDI_RECEIVE_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); - break; } - /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/ + DGRemoveIRP(TranContext->Handle.AddressHandle, Irp); break; default: @@ -235,6 +201,7 @@ } IoReleaseCancelSpinLock(Irp->CancelIrql); + IoCompleteRequest(Irp, IO_NO_INCREMENT); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -279,8 +246,6 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(FileObject); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Aug 20 22:38:49 2008 @@ -138,7 +138,6 @@ } CP Context->CancelIrps = FALSE; - KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE); CP IrpSp = IoGetCurrentIrpStackLocation(Irp); IrpSp->FileObject->FsContext = Context; @@ -253,36 +252,6 @@ return Status; } - -VOID TiCleanupFileObjectComplete( - PVOID Context, - NTSTATUS Status) -/* - * FUNCTION: Completes an object cleanup IRP I/O request - * ARGUMENTS: - * Context = Pointer to the IRP for this request - * Status = Final status of the operation - */ -{ - PIRP Irp; - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT TranContext; - KIRQL OldIrql; - - Irp = (PIRP)Context; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; - - Irp->IoStatus.Status = Status; - - IoAcquireCancelSpinLock(&OldIrql); - - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - IoReleaseCancelSpinLock(OldIrql); -} - - /* * FUNCTION: Releases resources used by a file object * ARGUMENTS: @@ -313,12 +282,8 @@ IoAcquireCancelSpinLock(&OldIrql); Context->CancelIrps = TRUE; - KeResetEvent(&Context->CleanupEvent); IoReleaseCancelSpinLock(OldIrql); - - Request.RequestNotifyObject = TiCleanupFileObjectComplete; - Request.RequestContext = Irp; switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: @@ -345,19 +310,8 @@ Context->CancelIrps = FALSE; IoReleaseCancelSpinLock(OldIrql); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - return Irp->IoStatus.Status; - } - - if (Status != STATUS_PENDING) - { - IoAcquireCancelSpinLock(&OldIrql); - KeSetEvent(&Context->CleanupEvent, 0, FALSE); - IoReleaseCancelSpinLock(OldIrql); - - KeWaitForSingleObject(&Context->CleanupEvent, - UserRequest, KernelMode, FALSE, NULL); + Status = STATUS_INVALID_PARAMETER; + } Irp->IoStatus.Status = Status;

1 0

[gbrunmar] 35498: Added some more parameter error checking to D3D9::CreateDevice()
by gbrunmar＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: gbrunmar Date: Wed Aug 20 22:19:02 2008 New Revision: 35498 URL: http://svn.reactos.org/svn/reactos?rev=35498&view=rev Log: Added some more parameter error checking to D3D9::CreateDevice() Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] Wed Aug 20 22:19:02 2008 @@ -923,7 +923,42 @@ if (hFocusWindow != NULL && FALSE == IsWindow(hFocusWindow)) { - DPRINT1("Invalid hFocusWindow parameter specified"); + DPRINT1("Invalid hFocusWindow parameter specified, expected NULL or a valid HWND"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == pPresentationParameters) + { + DPRINT1("Invalid pPresentationParameters parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (pPresentationParameters->hDeviceWindow != NULL && FALSE == IsWindow(pPresentationParameters->hDeviceWindow)) + { + DPRINT1("Invalid pPresentationParameters->hDeviceWindow parameter specified, expected NULL or a valid HWND"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (FALSE == pPresentationParameters->Windowed && hFocusWindow == NULL) + { + DPRINT1("When pPresentationParameters->Windowed is not set, hFocusWindow must be a valid HWND"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == hFocusWindow && NULL == pPresentationParameters->hDeviceWindow) + { + DPRINT1("Any of pPresentationParameters->Windowed and hFocusWindow must be set to a valid HWND"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Adapter > 0 && NULL == pPresentationParameters->hDeviceWindow) + { + DPRINT1("Invalid pPresentationParameters->hDeviceWindow, must be set to a valid unique HWND when Adapter is greater than 0"); UNLOCK_D3D9(); return D3DERR_INVALIDCALL; }

1 0

[gbrunmar] 35497: * Removed unused header file * Fixed signed/unsigned comparison warning
by gbrunmar＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: gbrunmar Date: Wed Aug 20 21:34:28 2008 New Revision: 35497 URL: http://svn.reactos.org/svn/reactos?rev=35497&view=rev Log: * Removed unused header file * Fixed signed/unsigned comparison warning Removed: trunk/reactos/dll/directx/d3d9/d3d9.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Removed: trunk/reactos/dll/directx/d3d9/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.h?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.h (removed) @@ -1,3 +1,0 @@ -#include <windows.h> - -#define DLLAPI __declspec(dllexport) Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] Wed Aug 20 21:34:28 2008 @@ -38,7 +38,7 @@ return TRUE; } -HRESULT SafeFormatString(OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ) +HRESULT SafeFormatString(OUT LPSTR Buffer, IN DWORD BufferSize, IN LPCSTR FormatString, ... ) { DWORD BytesWritten; va_list vargs; Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] Wed Aug 20 21:34:28 2008 @@ -16,7 +16,7 @@ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); /* Safe string formatting */ -HRESULT SafeFormatString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); +HRESULT SafeFormatString(IN OUT LPSTR Buffer, IN DWORD BufferSize, IN LPCSTR FormatString, ... ); HRESULT SafeCopyString(OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src); HRESULT SafeAppendString(IN OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src);

1 0

[tkreuzer] 35496: Fix KiSystemStartupReal, KiGetMachineBootPointers and KiInitializePcr. Add trap.S for ISRs (unimplemented). Add except.c with KiInterruptInitTable and KeInitExceptions, initializing the IDT. Add irql.c for IRQL functions (unimplemented). Update stubs file. Based on info from http://www.msuiche.net/papers/Windows_Vista_64bits_and_unexported_kernel_symbols.pdf. We now reach KiSetupStackAndInitializeKernel, but there's a few things still missing.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 18:54:52 2008 New Revision: 35496 URL: http://svn.reactos.org/svn/reactos?rev=35496&view=rev Log: Fix KiSystemStartupReal, KiGetMachineBootPointers and KiInitializePcr. Add trap.S for ISRs (unimplemented). Add except.c with KiInterruptInitTable and KeInitExceptions, initializing the IDT. Add irql.c for IRQL functions (unimplemented). Update stubs file. Based on info from http://www.msuiche.net/papers/Windows_Vista_64bits_and_unexported_kernel_sy…. We now reach KiSetupStackAndInitializeKernel, but there's a few things still missing. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/irql.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -1,17 +1,13 @@ - -#define STUB(x) void x() {} +unsigned long (*FrLdrDbgPrint)(const char *Format, ...); + + + +#define STUB(x) void x() {FrLdrDbgPrint("Sorry, %s is only a stub!\n", __FUNCTION__);} STUB(KdpEnableSafeMem) -STUB(KfLowerIrql) -STUB(KeRaiseIrql) -STUB(KeLowerIrql) -STUB(KeRaiseIrqlToSynchLevel) -STUB(KeRaiseIrqlToDpcLevel) STUB(KiIdleLoop) -STUB(KeGetCurrentIrql) STUB(KeAcquireInStackQueuedSpinLockRaiseToSynch) -STUB(KeNumberProcessors) STUB(KeBugcheckCallbackListHead) STUB(ExpInterlockedPushEntrySList) STUB(NtContinue) @@ -173,7 +169,6 @@ STUB(KeUpdateSystemTime) STUB(KeUserModeCallback) STUB(KeWaitForMutexObject) -STUB(KfRaiseIrql) STUB(KiBugCheckData) STUB(KiCpuId) STUB(MmCommitSessionMappedView) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -1,0 +1,59 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/amd64/cpu.c + * PURPOSE: Routines for CPU-level support + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* The Boot TSS */ +KTSS64 KiBootTss; + +/* The TSS to use for Double Fault Traps (INT 0x9) */ +UCHAR KiDoubleFaultTSS[KTSS_IO_MAPS]; + +/* The TSS to use for NMI Fault Traps (INT 0x2) */ +UCHAR KiNMITSS[KTSS_IO_MAPS]; + +/* CPU Features and Flags */ +ULONG KeI386MachineType; + +CHAR KeNumberProcessors = 0; + +/* FUNCTIONS *****************************************************************/ + + +VOID +FASTCALL +Ki386InitializeTss(IN PKTSS Tss, + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt) +{ + // UNIMPLEMENTED; +} + +VOID +NTAPI +KeFlushCurrentTb(VOID) +{ + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +VOID +NTAPI +KiInitializeMachineType(VOID) +{ + /* Set the Machine Type we got from NTLDR */ + KeI386MachineType = KeLoaderBlock->u.I386.MachineType & 0x000FF; +} + + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -1,0 +1,90 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/exp.c + * PURPOSE: Exception Dispatching and Context<->Trap Frame Conversion + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Gregor Anich + * Skywing (skywing(a)valhallalegends.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +KIDT_INIT KiInterruptInitTable[] = +{ + {0x00, 0x00, 0x00, KiDivideErrorFault}, + {0x01, 0x00, 0x00, KiDebugTrapOrFault}, + {0x02, 0x00, 0x03, KiNmiInterrupt}, + {0x03, 0x03, 0x00, KiBreakpointTrap}, + {0x04, 0x03, 0x00, KiOverflowTrap}, + {0x05, 0x00, 0x00, KiBoundFault}, + {0x06, 0x00, 0x00, KiInvalidOpcodeFault}, + {0x07, 0x00, 0x00, KiNpxNotAvailableFault}, + {0x08, 0x00, 0x01, KiDoubleFaultAbort}, + {0x09, 0x00, 0x00, KiNpxSegmentOverrunAbort}, + {0x0A, 0x00, 0x00, KiInvalidTssFault}, + {0x0B, 0x00, 0x00, KiSegmentNotPresentFault}, + {0x0C, 0x00, 0x00, KiStackFault}, + {0x0D, 0x00, 0x00, KiGeneralProtectionFault}, + {0x0E, 0x00, 0x00, KiPageFault}, + {0x10, 0x00, 0x00, KiFloatingErrorFault}, + {0x11, 0x00, 0x00, KiAlignmentFault}, + {0x12, 0x00, 0x02, KiMcheckAbort}, + {0x13, 0x00, 0x00, KiXmmException}, + {0x1F, 0x00, 0x00, KiApcInterrupt}, + {0x2C, 0x03, 0x00, KiRaiseAssertion}, + {0x2D, 0x03, 0x00, KiDebugServiceTrap}, + {0x2F, 0x00, 0x00, KiDpcInterrupt}, + {0xE1, 0x00, 0x00, KiIpiInterrupt}, + {0, 0} +}; + +KIDTENTRY64 KiIdt[256]; +KDESCRIPTOR KiIdtDescriptor = {{0}, sizeof(KiIdt) - 1, KiIdt}; + +/* FUNCTIONS *****************************************************************/ + + + +VOID +INIT_FUNCTION +NTAPI +KeInitExceptions(VOID) +{ + int i, j; + + /* Initialize the Idt */ + for (j = i = 0; i < 256; i++) + { + ULONG64 Offset; + + if (KiInterruptInitTable[j].InterruptId == i) + { + Offset = (ULONG64)KiInterruptInitTable[j].ServiceRoutine; + KiIdt[i].Dpl = KiInterruptInitTable[j].Dpl; + j++; + } + else + { + Offset = (ULONG64)KiUnexpectedInterrupt; + KiIdt[i].Dpl = 0; + } + KiIdt[i].OffsetLow = Offset & 0xffff; + KiIdt[i].Selector = KGDT_64_R0_CODE; + KiIdt[i].Type = 0x0e; + KiIdt[i].IstIndex = 0; + KiIdt[i].Reserved0 = 0; + KiIdt[i].Present = 1; + KiIdt[i].OffsetMiddle = (Offset >> 16) & 0xffff; + KiIdt[i].OffsetHigh = (Offset >> 32); + KiIdt[i].Reserved1 = 0; + } + +} + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/irql.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/irql.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/irql.c [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -1,0 +1,70 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Routines for IRQL-level support + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef UNIMPLEMENTED + +#define UNIMPLEMENTED \ + FrLdrDbgPrint("Sorry, %s is unimplemented!\n", __FUNCTION__) + +/* FUNCTIONS ****************************************************************/ + +#undef KeGetCurrentIrql +NTKERNELAPI +KIRQL +KeGetCurrentIrql(VOID) +{ + UNIMPLEMENTED; + return 0; +} + + +NTKERNELAPI +VOID +KfLowerIrql(IN KIRQL NewIrql) +{ + UNIMPLEMENTED; +} + +NTKERNELAPI +KIRQL +KfRaiseIrql(IN KIRQL NewIrql) +{ + UNIMPLEMENTED; + return 0; +} + +NTKERNELAPI +KIRQL +KeRaiseIrqlToDpcLevel(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +NTKERNELAPI +KIRQL +KeRaiseIrqlToSynchLevel(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +NTKERNELAPI +VOID +KeLowerIrql(IN KIRQL NewIrql) +{ + UNIMPLEMENTED; + return 0; +} + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/irql.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -21,6 +21,8 @@ /* BIOS Memory Map. Not NTLDR-compliant yet */ extern ULONG KeMemoryMapRangeCount; extern ADDRESS_RANGE KeMemoryMap[64]; + +KIPCR KiInitialPcr; /* FUNCTIONS *****************************************************************/ @@ -331,57 +333,48 @@ IN PKTHREAD IdleThread, IN PVOID DpcStack) { -#if 0 - /* Setup the TIB */ - Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - Pcr->NtTib.StackBase = 0; - Pcr->NtTib.StackLimit = 0; - Pcr->NtTib.Self = NULL; - /* Set the Current Thread */ - Pcr->PrcbData.CurrentThread = IdleThread; + Pcr->Prcb.CurrentThread = IdleThread; /* Set pointers to ourselves */ Pcr->Self = (PKPCR)Pcr; - Pcr->Prcb = &Pcr->PrcbData; + Pcr->CurrentPrcb = &Pcr->Prcb; /* Set the PCR Version */ Pcr->MajorVersion = PCR_MAJOR_VERSION; Pcr->MinorVersion = PCR_MINOR_VERSION; /* Set the PCRB Version */ - Pcr->PrcbData.MajorVersion = 1; - Pcr->PrcbData.MinorVersion = 1; + Pcr->Prcb.MajorVersion = 1; + Pcr->Prcb.MinorVersion = 1; /* Set the Build Type */ - Pcr->PrcbData.BuildType = 0; + Pcr->Prcb.BuildType = 0; #ifndef CONFIG_SMP - Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR; + Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif #ifdef DBG - Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG; + Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; #endif /* Set the Processor Number and current Processor Mask */ - Pcr->PrcbData.Number = (UCHAR)ProcessorNumber; - Pcr->PrcbData.SetMember = 1 << ProcessorNumber; + Pcr->Prcb.Number = (UCHAR)ProcessorNumber; + Pcr->Prcb.SetMember = 1 << ProcessorNumber; /* Set the PRCB for this Processor */ - KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; + KiProcessorBlock[ProcessorNumber] = &Pcr->Prcb; /* Start us out at PASSIVE_LEVEL */ - Pcr->Irql = PASSIVE_LEVEL; +// Pcr->Irql = PASSIVE_LEVEL; /* Set the GDI, IDT, TSS and DPC Stack */ - Pcr->GDT = (PVOID)Gdt; - Pcr->IDT = Idt; - Pcr->TSS = Tss; - Pcr->TssCopy = Tss; - Pcr->PrcbData.DpcStack = DpcStack; + Pcr->GdtBase = (PVOID)Gdt; + Pcr->IdtBase = Idt; + Pcr->TssBase = Tss; + Pcr->Prcb.DpcStack = DpcStack; /* Setup the processor set */ - Pcr->PrcbData.MultiThreadProcessorSet = Pcr->PrcbData.SetMember; -#endif + Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; } VOID @@ -616,14 +609,20 @@ IN PKIPCR *Pcr, IN PKTSS *Tss) { -#if 0 - KDESCRIPTOR GdtDescriptor = {0}, IdtDescriptor = {0}; - KGDTENTRY TssSelector, PcrSelector; - USHORT Tr = 0, Fs; + KDESCRIPTOR GdtDescriptor = {{0},0,0}, IdtDescriptor = {{0},0,0}; + KGDTENTRY64 TssSelector; + USHORT Tr = 0; /* Get GDT and IDT descriptors */ - Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&GdtDescriptor.Limit); - Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + Ke386GetGlobalDescriptorTable(GdtDescriptor.Limit); + Ke386GetInterruptDescriptorTable(IdtDescriptor.Limit); + + // FIXME: for some strange reason the gdt needs some time before it's finished... + if (!GdtDescriptor.Base) + { + FrLdrDbgPrint("1. Base = %p, Limit = 0x%x\n", GdtDescriptor.Base, GdtDescriptor.Limit); + } + FrLdrDbgPrint("2. Base = %p, Limit = 0x%x\n", GdtDescriptor.Base, GdtDescriptor.Limit); /* Save IDT and GDT */ *Gdt = (PKGDTENTRY)GdtDescriptor.Base; @@ -632,24 +631,15 @@ /* Get TSS and FS Selectors */ Ke386GetTr(Tr); if (Tr != KGDT_TSS) Tr = KGDT_TSS; // FIXME: HACKHACK - Fs = Ke386GetFs(); - - /* Get PCR Selector, mask it and get its GDT Entry */ - PcrSelector = *(PKGDTENTRY)((ULONG_PTR)*Gdt + (Fs & ~RPL_MASK)); - - /* Get the KPCR itself */ - *Pcr = (PKIPCR)(ULONG_PTR)(PcrSelector.BaseLow | - PcrSelector.HighWord.Bytes.BaseMid << 16 | - PcrSelector.HighWord.Bytes.BaseHi << 24); /* Get TSS Selector, mask it and get its GDT Entry */ TssSelector = *(PKGDTENTRY)((ULONG_PTR)*Gdt + (Tr & ~RPL_MASK)); /* Get the KTSS itself */ *Tss = (PKTSS)(ULONG_PTR)(TssSelector.BaseLow | - TssSelector.HighWord.Bytes.BaseMid << 16 | - TssSelector.HighWord.Bytes.BaseHi << 24); -#endif + TssSelector.Bytes.BaseMiddle << 16 | + TssSelector.Bytes.BaseHigh << 24 | + (ULONG64)TssSelector.BaseUpper << 32); } VOID @@ -657,26 +647,30 @@ KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { FrLdrDbgPrint("Enter KiSystemStartupReal()\n"); - for(;;); - -#if 0 + ULONG Cpu; PKTHREAD InitialThread; - ULONG InitialStack; + ULONG64 InitialStack; PKGDTENTRY Gdt; PKIDTENTRY Idt; - KIDTENTRY NmiEntry, DoubleFaultEntry; +// KIDTENTRY NmiEntry, DoubleFaultEntry; PKTSS Tss; PKIPCR Pcr; /* Save the loader block and get the current CPU */ KeLoaderBlock = LoaderBlock; + + /* Get Pcr from loader block */ +// Pcr = CONTAINING_RECORD(LoaderBlock->Prcb, KIPCR, Prcb); + Pcr = &KiInitialPcr; + Cpu = KeNumberProcessors; - if (!Cpu) - { - /* If this is the boot CPU, set FS and the CPU Number*/ - Ke386SetFs(KGDT_R0_PCR); - __writefsdword(KPCR_PROCESSOR_NUMBER, Cpu); + if (Cpu == 0) + { + /* If this is the boot CPU, set GS base and the CPU Number*/ + __writemsr(X86_MSR_GSBASE, (ULONG64)Pcr); + __writemsr(X86_MSR_KERNEL_GSBASE, (ULONG64)Pcr); + Pcr->Prcb.Number = Cpu; /* Set the initial stack and idle thread as well */ LoaderBlock->KernelStack = (ULONG_PTR)P0BootStack; @@ -684,7 +678,7 @@ } /* Save the initial thread and stack */ - InitialStack = LoaderBlock->KernelStack; + InitialStack = LoaderBlock->KernelStack; // Chekme InitialThread = (PKTHREAD)LoaderBlock->Thread; /* Clean the APC List Head */ @@ -694,53 +688,59 @@ KiInitializeMachineType(); /* Skip initial setup if this isn't the Boot CPU */ - if (Cpu) goto AppCpuInit; - - /* Get GDT, IDT, PCR and TSS pointers */ - KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); - - /* Setup the TSS descriptors and entries */ - Ki386InitializeTss(Tss, Idt, Gdt); - - /* Initialize the PCR */ - RtlZeroMemory(Pcr, PAGE_SIZE); - KiInitializePcr(Cpu, - Pcr, - Idt, - Gdt, - Tss, - InitialThread, - KiDoubleFaultStack); - - /* Set us as the current process */ - InitialThread->ApcState.Process = &KiInitialProcess.Pcb; - - /* Clear DR6/7 to cleanup bootloader debugging */ - __writefsdword(KPCR_TEB, 0); - __writefsdword(KPCR_DR6, 0); - __writefsdword(KPCR_DR7, 0); - - /* Setup the IDT */ - KeInitExceptions(); - - /* Load Ring 3 selectors for DS/ES */ - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - - /* Save NMI and double fault traps */ - RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); - RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ - RtlCopyMemory(Idt, - (PVOID)KiIdtDescriptor.Base, - KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ - RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); - RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); - -AppCpuInit: + if (Cpu == 0) + { + /* Get GDT, IDT, PCR and TSS pointers */ + KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); + +FrLdrDbgPrint("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); + + /* Setup the TSS descriptors and entries */ + Ki386InitializeTss(Tss, Idt, Gdt); + + /* Initialize the PCR */ + RtlZeroMemory(Pcr, PAGE_SIZE); + KiInitializePcr(Cpu, + Pcr, + Idt, + Gdt, + Tss, + InitialThread, + KiDoubleFaultStack); + + /* Set us as the current process */ + InitialThread->ApcState.Process = &KiInitialProcess.Pcb; + + /* Clear DR6/7 to cleanup bootloader debugging */ + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr6 = 0; + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr7 = 0; + + /* Setup the IDT */ + KeInitExceptions(); + + /* Load Ring 3 selectors for DS/ES/FS */ + Ke386SetDs(KGDT_64_DATA | RPL_MASK); + Ke386SetEs(KGDT_64_DATA | RPL_MASK); +// Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); + + /* LDT is unused */ + Ke386SetLocalDescriptorTable(0); + + /* Save NMI and double fault traps */ +// RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); +// RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ +// RtlCopyMemory(Idt, +// (PVOID)KiIdtDescriptor.Base, +// KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ +// RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); +// RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); + } + + /* Loop until we can release the freeze lock */ do { @@ -749,26 +749,24 @@ } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); /* Setup CPU-related fields */ - __writefsdword(KPCR_NUMBER, Cpu); - __writefsdword(KPCR_SET_MEMBER, 1 << Cpu); - __writefsdword(KPCR_SET_MEMBER_COPY, 1 << Cpu); - __writefsdword(KPCR_PRCB_SET_MEMBER, 1 << Cpu); + Pcr->Prcb.Number = Cpu; + Pcr->Prcb.SetMember = 1 << Cpu; /* Initialize the Processor with HAL */ - HalInitializeProcessor(Cpu, KeLoaderBlock); +// HalInitializeProcessor(Cpu, KeLoaderBlock); /* Set active processors */ - KeActiveProcessors |= __readfsdword(KPCR_SET_MEMBER); + KeActiveProcessors |= 1 << Cpu; KeNumberProcessors++; /* Check if this is the boot CPU */ - if (!Cpu) + if (Cpu == 0) { /* Initialize debugging system */ - KdInitSystem(0, KeLoaderBlock); +// KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ - if (KdPollBreakIn()) DbgBreakPointWithStatus(1); +// if (KdPollBreakIn()) DbgBreakPointWithStatus(1); } /* Raise to HIGH_LEVEL */ @@ -776,13 +774,15 @@ /* Align stack and make space for the trap frame and NPX frame */ InitialStack &= ~(KTRAP_FRAME_ALIGN - 1); + +FrLdrDbgPrint("Before KiSetupStackAndInitializeKernel\n"); +for(;;); /* Switch to new kernel stack and start kernel bootstrapping */ KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, InitialThread, (PVOID)InitialStack, - (PKPRCB)__readfsdword(KPCR_PRCB), + &Pcr->Prcb, (CCHAR)Cpu, KeLoaderBlock); -#endif } Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -1,0 +1,131 @@ +/* + * FILE: ntoskrnl/ke/amd64/trap.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Traps, Entrypoints and Exitpoints + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * NOTE: See asmmacro.S for the shared entry/exit code. + */ + +/* INCLUDES ******************************************************************/ + +//#include <asm.h> +//#include <internal/amd64/asmmacro.S> +.intel_syntax noprefix +.code64 + +/* GLOBALS *******************************************************************/ + +.data + +_MsgGeneralProtFault: +.ascii "General protection fault at %p!\n\0" + +_MsgBreakpointTrap: +.ascii "BreakpointTrap at %p\n\0" + +_MsgUnexpectedInterrupt: +.ascii "UnexpectedInterrupt\n\0" + + +/* SOFTWARE INTERRUPT SERVICES ***********************************************/ +.text +.code64 + +.global _KiDivideErrorFault +_KiDivideErrorFault: + +.global _KiDebugTrapOrFault +_KiDebugTrapOrFault: + +.global _KiNmiInterrupt +_KiNmiInterrupt: + +.global _KiBreakpointTrap +_KiBreakpointTrap: +// mov rdx, [rsp] + sub rsp, 0x10 +// movabs rcx, offset _MsgBreakpointTrap +// movabs rax, offset _FrLdrDbgPrint +// call [rax] + add rsp, 0x10 + iret + +.global _KiOverflowTrap +_KiOverflowTrap: + +.global _KiBoundFault +_KiBoundFault: + +.global _KiInvalidOpcodeFault +_KiInvalidOpcodeFault: + +.global _KiNpxNotAvailableFault +_KiNpxNotAvailableFault: + +.global _KiDoubleFaultAbort +_KiDoubleFaultAbort: + +.global _KiNpxSegmentOverrunAbort +_KiNpxSegmentOverrunAbort: + +.global _KiInvalidTssFault +_KiInvalidTssFault: + +.global _KiSegmentNotPresentFault +_KiSegmentNotPresentFault: + +.global _KiStackFault +_KiStackFault: + +jmp $ + + +.global _KiGeneralProtectionFault +_KiGeneralProtectionFault: + mov rdx, 0 + mov dx, ss + movabs rcx, offset _MsgGeneralProtFault + movabs rax, offset _FrLdrDbgPrint + call [rax] + jmp $ + + +.global _KiPageFault +_KiPageFault: + +.global _KiFloatingErrorFault +_KiFloatingErrorFault: + +.global _KiAlignmentFault +_KiAlignmentFault: + +.global _KiMcheckAbort +_KiMcheckAbort: + +.global _KiXmmException +_KiXmmException: + +.global _KiApcInterrupt +_KiApcInterrupt: + + +.global _KiRaiseAssertion +_KiRaiseAssertion: + +.global _KiDebugServiceTrap +_KiDebugServiceTrap: + +.global _KiDpcInterrupt +_KiDpcInterrupt: + + +.global _KiIpiInterrupt +_KiIpiInterrupt: + iret + +.global _KiUnexpectedInterrupt +_KiUnexpectedInterrupt: + movabs rcx, offset _MsgUnexpectedInterrupt + movabs rax, offset _FrLdrDbgPrint + call [rax] + jmp $ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -91,7 +91,11 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file first="true">boot.S</file> + <file>cpu.c</file> + <file>except.c</file> + <file>irql.c</file> <file>kiinit.c</file> + <file>trap.S</file> </directory> </if> <file>apc.c</file> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Wed Aug 20 18:54:52 2008 @@ -6,7 +6,6 @@ ; KfAcquireSpinLock KfReleaseSpinLock -KeRaiseIrql KefAcquireSpinLockAtDpcLevel KefReleaseSpinLockFromDpcLevel KeInitializeSpinLock

1 0

[tkreuzer] 35495: Also initialize data segment descriptor in the gdt.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 18:48:28 2008 New Revision: 35495 URL: http://svn.reactos.org/svn/reactos?rev=35495&view=rev Log: Also initialize data segment descriptor in the gdt. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Wed Aug 20 18:48:28 2008 @@ -256,6 +256,10 @@ Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_CODE); *(PULONG64)Entry = 0x0020980000000000ULL; + /* Setup KGDT_64_DATA */ + Entry = KiGetGdtEntry(pGdt, KGDT_64_DATA); + *(PULONG64)Entry = 0x0000F00000000000ULL; + /* Setup TSS entry */ Entry = KiGetGdtEntry(pGdt, KGDT_TSS); KiInitGdtEntry(Entry, TssBase, I386_TSS, 0);

1 0

[tkreuzer] 35494: - Add X86_MSR_GSBASE, X86_MSR_KERNEL_GSBASE constants - Add KIDT_INIT structure for the idt init table - Add prototypes for ISRs
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:55:59 2008 New Revision: 35494 URL: http://svn.reactos.org/svn/reactos?rev=35494&view=rev Log: - Add X86_MSR_GSBASE, X86_MSR_KERNEL_GSBASE constants - Add KIDT_INIT structure for the idt init table - Add prototypes for ISRs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Aug 20 17:55:59 2008 @@ -43,9 +43,20 @@ #define FRAME_EDITED 0xFFF8 +#define X86_MSR_GSBASE 0xC0000101 +#define X86_MSR_KERNEL_GSBASE 0xC0000102 + #ifndef __ASM__ #include "intrin_i.h" + +typedef struct _KIDT_INIT +{ + UCHAR InterruptId; + UCHAR Dpl; + UCHAR Type; + PVOID ServiceRoutine; +} KIDT_INIT, *PKIDT_INIT; //#define KeArchFnInit() Ke386FnInit() #define KeArchFnInit() DbgPrint("KeArchFnInit is unimplemented!\n"); @@ -66,6 +77,31 @@ IN PKIDTENTRY Idt, IN PKGDTENTRY Gdt ); + +VOID KiDivideErrorFault(); +VOID KiDebugTrapOrFault(); +VOID KiNmiInterrupt(); +VOID KiBreakpointTrap(); +VOID KiOverflowTrap(); +VOID KiBoundFault(); +VOID KiInvalidOpcodeFault(); +VOID KiNpxNotAvailableFault(); +VOID KiDoubleFaultAbort(); +VOID KiNpxSegmentOverrunAbort(); +VOID KiInvalidTssFault(); +VOID KiSegmentNotPresentFault(); +VOID KiStackFault(); +VOID KiGeneralProtectionFault(); +VOID KiPageFault(); +VOID KiFloatingErrorFault(); +VOID KiAlignmentFault(); +VOID KiMcheckAbort(); +VOID KiXmmException(); +VOID KiApcInterrupt(); +VOID KiRaiseAssertion(); +VOID KiDebugServiceTrap(); +VOID KiDpcInterrupt(); +VOID KiIpiInterrupt(); VOID KiGdtPrepareForApplicationProcessorInit(ULONG Id);

1 0

[tkreuzer] 35493: Setup a page for the Idt and a page for the gdt + tss. Setup the newly created gdt accordingly. Set gdtr and idtr.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:48:47 2008 New Revision: 35493 URL: http://svn.reactos.org/svn/reactos?rev=35493&view=rev Log: Setup a page for the Idt and a page for the gdt + tss. Setup the newly created gdt accordingly. Set gdtr and idtr. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Wed Aug 20 17:48:47 2008 @@ -27,9 +27,11 @@ /* Page Directory and Tables for non-PAE Systems */ extern ULONG_PTR NextModuleBase; extern ULONG_PTR KernelBase; +ULONG_PTR GdtBase, IdtBase, TssBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; PPAGE_DIRECTORY_AMD64 pPML4; +PVOID pIdt, pGdt; /* FUNCTIONS *****************************************************************/ @@ -92,6 +94,8 @@ /* Set the new PML4 */ __writecr3((ULONGLONG)pPML4); + FrLdrSetupGdtIdt(); + LoaderBlock.FrLdrDbgPrint = DbgPrint; // DumpLoaderBlock(); @@ -220,5 +224,56 @@ DbgPrint("Could not map %d kernel pages.\n", KernelPages); } -} - + /* Setup a page for the idt */ + pIdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + IdtBase = KernelBase + KernelPages * PAGE_SIZE; + if (!FrLdrMapSinglePage(IdtBase, (ULONGLONG)pIdt)) + { + DbgPrint("Could not map idt page.\n", KernelPages); + } + + /* Setup a page for the gdt & tss */ + pGdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + GdtBase = IdtBase + PAGE_SIZE; + TssBase = GdtBase + 20 * sizeof(ULONG64); // FIXME: don't hardcode + if (!FrLdrMapSinglePage(GdtBase, (ULONGLONG)pGdt)) + { + DbgPrint("Could not map idt page.\n", KernelPages); + } + + +} + +VOID +FrLdrSetupGdtIdt() +{ + PKGDTENTRY64 Entry; + KDESCRIPTOR Desc; + + RtlZeroMemory(pGdt, PAGE_SIZE); + + /* Setup KGDT_64_R0_CODE */ + Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_CODE); + *(PULONG64)Entry = 0x0020980000000000ULL; + + /* Setup TSS entry */ + Entry = KiGetGdtEntry(pGdt, KGDT_TSS); + KiInitGdtEntry(Entry, TssBase, I386_TSS, 0); + + /* Setup the gdt descriptor */ + Desc.Limit = 12 * sizeof(ULONG64) - 1; + Desc.Base = (PVOID)GdtBase; + + /* Set the new Gdt */ + __lgdt(&Desc.Limit); + DbgPrint("Gdtr.Base = %p\n", Desc.Base); + + /* Setup the idt descriptor */ + Desc.Limit = 12 * sizeof(ULONG64) - 1; + Desc.Base = (PVOID)IdtBase; + + /* Set the new Idt */ + __lidt(&Desc.Limit); + DbgPrint("Idtr.Base = %p\n", Desc.Base); + +} Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Wed Aug 20 17:48:47 2008 @@ -51,6 +51,42 @@ HARDWARE_PTE Pde[512]; } PAGE_DIRECTORY_AMD64, *PPAGE_DIRECTORY_AMD64; +VOID +FORCEINLINE +__lgdt(void *gdt) +{ + asm volatile ("lgdt %0\n" : : "m"(*(short*)gdt)); +} + +VOID +FORCEINLINE +__lidt(void *idt) +{ + asm volatile ("lidt %0\n" : : "m"(*(short*)idt)); +} + +PKGDTENTRY64 +FORCEINLINE +KiGetGdtEntry(PVOID pGdt, USHORT Index) +{ + return (PKGDTENTRY64)((ULONG64)pGdt + (Index & ~RPL_MASK)); +} + +VOID +FORCEINLINE +KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, UCHAR Type, UCHAR Dpl) +{ + Entry->Bits.Type = Type; + Entry->Bits.Present = 1; + Entry->Bits.Dpl = Dpl; + Entry->BaseLow = (USHORT)(Base & 0xFFFF); + Entry->Bytes.BaseMiddle = (UCHAR)(Base >> 16); + Entry->Bytes.BaseHigh = (UCHAR)(Base >> 24); + Entry->BaseUpper = (ULONG)(Base >> 32); +} + +VOID FrLdrSetupGdtIdt(); + #endif #endif /* __AMD64_AMD64_H_ */

1 0

[tkreuzer] 35492: revert my last commit to avoid polluting other files with hack code. I am also not going to need that piece of code for amd64.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:38:23 2008 New Revision: 35492 URL: http://svn.reactos.org/svn/reactos?rev=35492&view=rev Log: revert my last commit to avoid polluting other files with hack code. I am also not going to need that piece of code for amd64. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -1266,15 +1266,42 @@ { PLOADER_PARAMETER_BLOCK NtLoaderBlock; ULONG size, i = 0, *ent; +#if defined(_M_IX86) + PKTSS Tss; + PKGDTENTRY TssEntry; + + /* Load the GDT and IDT */ + Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + + /* Initialize the boot TSS */ + Tss = &KiBootTss; + TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); +#endif + +#if defined(_M_PPC) + // Zero bats. We might have residual bats set that will interfere with + // our mapping of ofwldr. + for (i = 0; i < 4; i++) + { + SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); + } + KiSetupSyscallHandler(); + DbgPrint("Kernel Power (%08x)\n", LoaderBlock); + DbgPrint("ArchExtra (%08x)!\n", LoaderBlock->ArchExtra); +#endif /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; /* Get debugging function */ FrLdrDbgPrint = LoaderBlock->FrLdrDbgPrint; - - /* Per architecture initialisazion code */ - KiArchInitSystem(); /* Save memory manager data */ KeMemoryMapRangeCount = 0; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -1036,24 +1036,3 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } - -VOID -KiArchInitSystem() -{ - PKTSS Tss; - PKGDTENTRY TssEntry; - - /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); - - /* Initialize the boot TSS */ - Tss = &KiBootTss; - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; - TssEntry->HighWord.Bits.Type = I386_TSS; - TssEntry->HighWord.Bits.Pres = 1; - TssEntry->HighWord.Bits.Dpl = 0; - TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); - TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); - TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); -} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -275,19 +275,3 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } - -VOID -KiArchInitSystem() -{ - ULONG i; - - // Zero bats. We might have residual bats set that will interfere with - // our mapping of ofwldr. - for (i = 0; i < 4; i++) - { - SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); - } - KiSetupSyscallHandler(); - DbgPrint("Kernel Power (%08x)\n", KeRosLoaderBlock); - DbgPrint("ArchExtra (%08x)!\n", KeRosLoaderBlock->ArchExtra); -}

1 0

[pschweitzer] 35491: Added a forgotten else
by pschweitzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: pschweitzer Date: Wed Aug 20 16:49:35 2008 New Revision: 35491 URL: http://svn.reactos.org/svn/reactos?rev=35491&view=rev Log: Added a forgotten else Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Wed Aug 20 16:49:35 2008 @@ -278,20 +278,23 @@ if (i == AnsiName->Length - 1) return FALSE; i++; } - switch (AnsiName->Buffer[i]) + else { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; + switch (AnsiName->Buffer[i]) + { + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; + } } } /* check file part is shorter than 8, extension shorter than 3

1 0

[pschweitzer] 35490: - Added support for the lead DBCS in RtlIsNameLegalDOS8Dot3 - Don't allow it to be cut at the end of the filename (as it's done in FsRtl* functions)
by pschweitzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: pschweitzer Date: Wed Aug 20 16:21:42 2008 New Revision: 35490 URL: http://svn.reactos.org/svn/reactos?rev=35490&view=rev Log: - Added support for the lead DBCS in RtlIsNameLegalDOS8Dot3 - Don't allow it to be cut at the end of the filename (as it's done in FsRtl* functions) Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Wed Aug 20 16:21:42 2008 @@ -11,6 +11,11 @@ #define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ + +extern BOOLEAN NlsMbOemCodePageTag; +extern PUSHORT NlsOemLeadByteInfo; /* CONSTANTS *****************************************************************/ @@ -267,20 +272,26 @@ for (i = 0; i < AnsiName->Length; i++) { + /* First make sure the character it's not the Lead DBCS */ + if (NlsMbOemCodePageTag && NlsOemLeadByteInfo[(UCHAR)AnsiName->Buffer[i]]) + { + if (i == AnsiName->Length - 1) return FALSE; + i++; + } switch (AnsiName->Buffer[i]) { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; } } /* check file part is shorter than 8, extension shorter than 3

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