Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 34946: Revert r34344, the mess with GetEnvironmentStrings/GetEnvironmentStringsA is expected.
by hpoussin＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: hpoussin Date: Wed Jul 30 03:02:45 2008 New Revision: 34946 URL: http://svn.reactos.org/svn/reactos?rev=34946&view=rev Log: Revert r34344, the mess with GetEnvironmentStrings/GetEnvironmentStringsA is expected. Added: trunk/reactos/include/psdk/winbase.h - copied unchanged from r34943, trunk/reactos/include/psdk/winbase.h

1 0

[hpoussin] 34945: unix define doesn't mean we're on a x86 compatible machine
by hpoussin＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: hpoussin Date: Wed Jul 30 02:29:55 2008 New Revision: 34945 URL: http://svn.reactos.org/svn/reactos?rev=34945&view=rev Log: unix define doesn't mean we're on a x86 compatible machine Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jul 30 02:29:55 2008 @@ -2011,7 +2011,7 @@ } ACL_SIZE_INFORMATION; /* FIXME: add more machines */ -#if defined(_X86_) || defined(unix) && !defined(__PowerPC__) +#if defined(_X86_) && !defined(__PowerPC__) #define SIZE_OF_80387_REGISTERS 80 #define CONTEXT_i386 0x10000 #define CONTEXT_i486 0x10000

1 0

[hpoussin] 34944: Fix GetEnvironmentStrings/GetEnvironmentStringsA mess
by hpoussin＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: hpoussin Date: Wed Jul 30 02:27:33 2008 New Revision: 34944 URL: http://svn.reactos.org/svn/reactos?rev=34944&view=rev Log: Fix GetEnvironmentStrings/GetEnvironmentStringsA mess Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Jul 30 02:27:33 2008 @@ -1465,7 +1465,7 @@ #endif UINT WINAPI GetDriveTypeA(LPCSTR); UINT WINAPI GetDriveTypeW(LPCWSTR); -LPSTR WINAPI GetEnvironmentStrings(void); +LPSTR WINAPI GetEnvironmentStringsA(void); LPWSTR WINAPI GetEnvironmentStringsW(void); DWORD WINAPI GetEnvironmentVariableA(LPCSTR,LPSTR,DWORD); DWORD WINAPI GetEnvironmentVariableW(LPCWSTR,LPWSTR,DWORD); @@ -2401,7 +2401,7 @@ #define GetDllDirectory GetDllDirectoryA #endif #define GetDriveType GetDriveTypeA -#define GetEnvironmentStringsA GetEnvironmentStrings +#define GetEnvironmentStrings GetEnvironmentStringsA #define GetEnvironmentVariable GetEnvironmentVariableA #define GetFileAttributes GetFileAttributesA #define GetFileAttributesEx GetFileAttributesExA

1 0

[arty] 34943: Patch by Cameron Gutman (aicommander (at) gmail (dot) com) - Remove a hack related to cancellation - Make sure not to pass on a bad IRP on failure (in tdi) - Remember connect irp * Note: commit notes are arty's in this case
by arty＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: arty Date: Wed Jul 30 01:05:20 2008 New Revision: 34943 URL: http://svn.reactos.org/svn/reactos?rev=34943&view=rev Log: Patch by Cameron Gutman (aicommander (at) gmail (dot) com) - Remove a hack related to cancellation - Make sure not to pass on a bad IRP on failure (in tdi) - Remember connect irp * Note: commit notes are arty's in this case Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c 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 Jul 30 01:05:20 2008 @@ -165,16 +165,19 @@ InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; InFlightRequest[2] = &FCB->SendIrp; + InFlightRequest[3] = &FCB->ConnectIrp; /* Return early here because we might be called in the mean time. */ if( FCB->Critical || FCB->ListenIrp.InFlightRequest || FCB->ReceiveIrp.InFlightRequest || - FCB->SendIrp.InFlightRequest ) { - AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", + FCB->SendIrp.InFlightRequest || + FCB->ConnectIrp.InFlightRequest ) { + AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x %x)\n", FCB->ListenIrp.InFlightRequest, FCB->ReceiveIrp.InFlightRequest, - FCB->SendIrp.InFlightRequest)); + FCB->SendIrp.InFlightRequest, + FCB->ConnectIrp.InFlightRequest)); ReturnEarly = TRUE; } @@ -183,11 +186,10 @@ /* Cancel our pending requests */ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { - NTSTATUS Status = STATUS_NO_SUCH_FILE; 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; + InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; IoCancelIrp( InFlightRequest[i]->InFlightRequest ); } Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Wed Jul 30 01:05:20 2008 @@ -294,6 +294,11 @@ assert(ConnectionObject); DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } *Irp = TdiBuildInternalDeviceControlIrp(TDI_CONNECT, /* Sub function */ DeviceObject, /* Device object */ @@ -343,6 +348,10 @@ assert(ConnectionObject); DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -391,6 +400,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } Status = TdiBuildNullConnectionInfo(RequestConnectionInfo, TDI_ADDRESS_TYPE_IP); @@ -452,6 +466,10 @@ assert(FileObject); DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -508,6 +526,10 @@ PIRP Irp; DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -553,6 +575,10 @@ PIRP Irp; DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -774,6 +800,7 @@ DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; return STATUS_INVALID_PARAMETER; } @@ -799,6 +826,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); + *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -807,11 +835,13 @@ } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeIrp(*Irp); + *Irp = NULL; Status = STATUS_INSUFFICIENT_RESOURCES; } _SEH_END; if( !NT_SUCCESS(Status) ) { IoFreeIrp(*Irp); + *Irp = NULL; return Status; } @@ -850,6 +880,7 @@ DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; return STATUS_INVALID_PARAMETER; } @@ -875,6 +906,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); + *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -885,11 +917,13 @@ } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeIrp(*Irp); + *Irp = NULL; Status = STATUS_INSUFFICIENT_RESOURCES; } _SEH_END; if( !NT_SUCCESS(Status) ) { IoFreeIrp(*Irp); + *Irp = NULL; return Status; } @@ -945,6 +979,7 @@ DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; return STATUS_INVALID_PARAMETER; } @@ -970,6 +1005,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); + *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -978,6 +1014,7 @@ } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeIrp(*Irp); + *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END; @@ -1033,6 +1070,7 @@ DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + *Irp = NULL; return STATUS_INVALID_PARAMETER; } @@ -1059,6 +1097,7 @@ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); + *Irp = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1067,6 +1106,7 @@ } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeIrp(*Irp); + *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END;

1 0

[tkreuzer] 34942: - add stubbed out mm/amd64/page.c - add amd64 specific mm.h - add a temp hack (can't inline a function with SEH atm) - add baseaddress and entrypoint to ntoskrnl rbuild - add all mm files to ntoskrnl rbuild - update subs file
by tkreuzer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: tkreuzer Date: Tue Jul 29 19:54:12 2008 New Revision: 34942 URL: http://svn.reactos.org/svn/reactos?rev=34942&view=rev Log: - add stubbed out mm/amd64/page.c - add amd64 specific mm.h - add a temp hack (can't inline a function with SEH atm) - add baseaddress and entrypoint to ntoskrnl rbuild - add all mm files to ntoskrnl rbuild - update subs file Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild 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] Tue Jul 29 19:54:12 2008 @@ -15,39 +15,25 @@ STUB(KeBugcheckCallbackListHead) STUB(NtAdjustGroupsToken) STUB(NtAdjustPrivilegesToken) -STUB(NtAllocateUserPhysicalPages) -STUB(NtAreMappedFilesTheSame) -STUB(MmUserProbeAddress) -STUB(MmSizeOfMdl) -STUB(MmBuildMdlForNonPagedPool) -STUB(MmMapViewOfSection) STUB(ExpInterlockedPushEntrySList) -STUB(ExAllocatePool) -STUB(ExFreePool) -STUB(ExFreePoolWithTag) -STUB(ExAllocatePoolWithTag) STUB(PsGetCurrentThreadId) STUB(NtContinue) STUB(NtCreateEvent) STUB(NtCreateMutant) -STUB(NtCreateSection) STUB(NtCreateSemaphore) STUB(NtCreateThread) STUB(NtCreateTimer) STUB(NtCreateToken) STUB(NtDebugContinue) STUB(NtDuplicateToken) -STUB(NtExtendSection) STUB(NtFilterToken) STUB(NtFlushInstructionCache) -STUB(NtFreeUserPhysicalPages) STUB(NtDebugActiveProcess) STUB(KeActiveProcessors) STUB(KeDisableInterrupts) STUB(KiSwapContext) STUB(KeContextToTrapFrame) STUB(KiDispatchException) -STUB(MmSystemRangeStart) STUB(MiGetUserPageDirectoryCount) STUB(MmStats) STUB(PsCreateSystemThread) @@ -55,7 +41,6 @@ STUB(ExReleaseResourceLock) STUB(MiNonPagedPoolLength) STUB(MiNonPagedPoolStart) -STUB(MmGetPfnForProcess) STUB(KiInitializeUserApc) STUB(KiComputeTimerTableIndex) STUB(KeBugcheckReasonCallbackListHead) @@ -67,42 +52,30 @@ STUB(NtCreateDebugObject) STUB(NtCreateIoCompletion) STUB(NtEnumerateSystemEnvironmentValuesEx) -STUB(NtFlushVirtualMemory) -STUB(NtGetWriteWatch) STUB(NtImpersonateAnonymousToken) -STUB(NtLockVirtualMemory) -STUB(NtMapUserPhysicalPages) -STUB(NtMapUserPhysicalPagesScatter) -STUB(NtMapViewOfSection) STUB(NtOpenEvent) STUB(NtOpenIoCompletion) STUB(NtOpenMutant) -STUB(NtOpenSection) STUB(NtOpenSemaphore) STUB(NtOpenThread) STUB(NtOpenThreadToken) STUB(NtOpenTimer) -STUB(NtProtectVirtualMemory) STUB(NtPulseEvent) STUB(NtQueryEvent) STUB(NtQueryInformationToken) STUB(NtQueryIoCompletion) STUB(NtQueryMutant) -STUB(NtQuerySection) STUB(NtQuerySemaphore) STUB(NtQuerySystemEnvironmentValue) STUB(NtQuerySystemEnvironmentValueEx) STUB(NtQuerySystemInformation) STUB(NtQueryTimer) -STUB(NtQueryVirtualMemory) STUB(NtRaiseException) -STUB(NtReadVirtualMemory) STUB(NtReleaseMutant) STUB(NtReleaseSemaphore) STUB(NtRemoveIoCompletion) STUB(NtRemoveProcessDebug) STUB(NtResetEvent) -STUB(NtResetWriteWatch) STUB(NtSetEvent) STUB(NtSetEventBoostPriority) STUB(NtSetInformationTokenNtSetInformationDebugObject) @@ -112,32 +85,22 @@ STUB(NtSetSystemEnvironmentValueEx) STUB(NtSetSystemInformation) STUB(NtSetTimer) -STUB(NtUnlockVirtualMemory) -STUB(NtUnmapViewOfSection) STUB(NtVdmControl) STUB(NtWaitForDebugEvent) -STUB(NtWriteVirtualMemory) STUB(NtGetCurrentProcessorNumber) STUB(NtOpenThreadTokenEx) STUB(NtSetInformationDebugObject) STUB(NtSetInformationToken) STUB(KiSwapProcess) -STUB(MmUpdatePageDir) STUB(KeGetCurrentProcessorNumber) -STUB(MmDeleteKernelStack) -STUB(MmCreateKernelStack) STUB(Ke386InitThreadWithContext) -STUB(MmUnmapLockedPages) STUB(ExpInterlockedPopEntrySList) -STUB(MmGetPhysicalAddress) -STUB(MmFreeSectionSegments) STUB(ExAllocateFromNPagedLookasideList) STUB(ExInitializeNPagedLookasideList) STUB(SeTokenType) STUB(RtlGetCallersAddress) STUB(RtlCompareMemory) STUB(DbgkpSendApiMessage) -STUB(MmGetFileNameForSection) STUB(DbgkpTraceLevel) STUB(ExpInitializeEventImplementation) STUB(ExpInitializeMutantImplementation) @@ -145,31 +108,23 @@ STUB(ExpInitializeTimerImplementation) STUB(ExpEnvironmentLock) STUB(ExpFirmwareTableProviderListHead) -STUB(MmSectionObjectType) STUB(IoAcquireCancelSpinLock) STUB(IoReleaseCancelSpinLock) STUB(ExInterlockedInsertTailList) STUB(ExInterlockedRemoveHeadList) STUB(ExInterlockedAddLargeStatistic) -STUB(MmProbeAndLockPages) STUB(IopCompletionMapping) STUB(CmpInitializeMachineDependentConfiguration) STUB(ExpInitLookasideLists) STUB(ExpFirmwareTableResource) -STUB(MmMapViewInSystemSpace) STUB(MmNumberOfPhysicalPages) -STUB(MmInitSystem) STUB(RtlInitializeRangeListPackage) STUB(ExInitPoolLookasidePointers) STUB(KiInitializeBugCheck) -STUB(MmHighestUserAddress) STUB(DbgkInitialize) -STUB(MmCreateMdl) STUB(MmMapLockedPage) STUB(PsThreadType) -STUB(MiShutdownMemoryManager) STUB(ExfInterlockedCompareExchange64) -STUB(ExAllocatePoolWithQuotaTag) STUB(ExInitializePagedLookasideList) STUB(ExInterlockedInsertHeadList) STUB(IoCheckEaBufferValidity) @@ -179,58 +134,28 @@ STUB(IoCompletionPacketLookaside) STUB(CancelSpinLock) STUB(KdbpCliInit) -STUB(MmUnlockPages) STUB(KeDisconnectInterrupt) STUB(KeInitializeInterrupt) -STUB(MmUnmapViewOfSection) STUB(MiFreeDescriptor) STUB(MmPfnDatabase) STUB(MmHighestPhysicalPage) -STUB(MmIsPagePresent) -STUB(MmCreateVirtualMappingForKernel) -STUB(MmSetPageProtect) STUB(MiFreeDescriptorOrg) -STUB(MmMapLockedPages) STUB(_PsThreadType) STUB(_ExEventObjectType) -STUB(MmCreateHyperspaceMapping) -STUB(MmDeleteHyperspaceMapping) -STUB(MmCreateVirtualMapping) -STUB(MmRawDeleteVirtualMapping) -STUB(MmIsPageSwapEntry) -STUB(MmDeletePageFileMapping) STUB(KeRosDumpStackFrames) STUB(RtlWalkFrameChain) -STUB(MmCommitPagedPoolAddress) -STUB(MmIsDirtyPage) -STUB(MmSetDirtyPage) -STUB(MmSetCleanPage) -STUB(MmPageOutSectionView) -STUB(MmAllocateSection) -STUB(MmDeleteVirtualMapping) STUB(ExSystemLookasideListHead) STUB(PspGetOrSetContextKernelRoutine) STUB(PspW32ThreadCallout) STUB(ExTimerRundown) STUB(KeConnectInterrupt) -STUB(MmWritePageSectionView) STUB(ExInitializeSystemLookasideList) STUB(KeRaiseUserException) STUB(PsIsThreadTerminating) STUB(ExMutantObjectType) STUB(_ExSemaphoreObjectType) -STUB(MmCleanProcessAddressSpace) -STUB(MmDeleteProcessAddressSpace) -STUB(MmDeleteTeb) STUB(DbgkClearProcessDebugObject) -STUB(MmSetMemoryPriorityProcess) -STUB(MmInitializeHandBuiltProcess) -STUB(MmInitializeHandBuiltProcess2) -STUB(MmInitializeProcessAddressSpace) -STUB(MmCreatePeb) -STUB(MmQuerySystemSize) STUB(KeFeatureBits) -STUB(MmGetFileObjectForSection) STUB(SepTokenObjectType) STUB(SeExchangePrimaryToken) STUB(SeIsTokenChild) @@ -255,7 +180,6 @@ STUB(PspW32ProcessCallout) STUB(DbgkDebugObjectType) STUB(DbgkCopyProcessDebugPort) -STUB(MmCreateProcessAddressSpace) STUB(SeAssignPrimaryToken) STUB(SeDeassignPrimaryToken) STUB(SepCreateSystemProcessToken) @@ -287,15 +211,12 @@ STUB(RtlpCreateAtomHandle) STUB(RtlInitializeContext) STUB(RtlpCurrentPeb) - STUB(DbgCommandString) STUB(ExAcquireRundownProtection) STUB(ExAcquireRundownProtectionCacheAware) STUB(ExAcquireRundownProtectionCacheAwareEx) STUB(ExAcquireRundownProtectionEx) STUB(ExAllocateFromPagedLookasideList) -STUB(ExAllocatePoolWithQuota) -STUB(ExAllocatePoolWithTagPriority) STUB(ExDeleteNPagedLookasideList) STUB(ExDeletePagedLookasideList) STUB(ExEnterCriticalRegionAndAcquireResourceShared) @@ -311,7 +232,6 @@ STUB(ExInterlockedPushEntryList) STUB(ExIsProcessorFeaturePresent) STUB(ExQueryDepthSList) -STUB(ExQueryPoolBlockSize) STUB(ExRaiseException) STUB(ExRaiseStatus) STUB(ExReInitializeRundownProtection) @@ -418,51 +338,11 @@ STUB(KfRaiseIrql) STUB(KiBugCheckData) STUB(KiCpuId) -STUB(Mm64BitPhysicalAddress) -STUB(MmAdjustWorkingSetSize) -STUB(MmAdvanceMdl) -STUB(MmAllocateContiguousMemory) -STUB(MmAllocateContiguousMemorySpecifyCache) -STUB(MmAllocateMappingAddress) -STUB(MmAllocateNonCachedMemory) -STUB(MmAllocatePagesForMdl) STUB(MmAllocatePagesForMdlEx) -STUB(MmCanFileBeTruncated) STUB(MmCommitSessionMappedView) STUB(MmCreateMirror) -STUB(MmCreateSection) -STUB(MmDisableModifiedWriteOfSection) -STUB(MmFlushImageSection) -STUB(MmForceSectionClosed) -STUB(MmFreeContiguousMemory) -STUB(MmFreeContiguousMemorySpecifyCache) -STUB(MmFreeMappingAddress) -STUB(MmFreeNonCachedMemory) -STUB(MmFreePagesFromMdl) -STUB(MmGetVirtualForPhysical) -STUB(MmGrowKernelStack) -STUB(MmIsAddressValid) STUB(MmIsIoSpaceActive) -STUB(MmIsNonPagedSystemAddressValid) -STUB(MmIsThisAnNtAsSystem) STUB(MmLockPagableImageSection) -STUB(MmMapLockedPagesSpecifyCache) -STUB(MmMapLockedPagesWithReservedMapping) -STUB(MmMapMemoryDumpMdl) -STUB(MmMapVideoDisplay) -STUB(MmMapViewInSessionSpace) -STUB(MmPrefetchPages) -STUB(MmProbeAndLockProcessPages) -STUB(MmProbeAndLockSelectedPages) -STUB(MmProtectMdlSystemAddress) -STUB(MmSecureVirtualMemory) -STUB(MmSetAddressRangeModified) -STUB(MmSetBankedSection) -STUB(MmUnmapReservedMapping) -STUB(MmUnmapVideoDisplay) -STUB(MmUnmapViewInSessionSpace) -STUB(MmUnmapViewInSystemSpace) -STUB(MmUnsecureVirtualMemory) STUB(NlsOemLeadByteInfo) STUB(ObDeleteCapturedInsertInfo) STUB(ObSetHandleAttributes) @@ -564,11 +444,3 @@ STUB(KeReleaseInStackQueuedSpinLock) STUB(KfAcquireSpinLock) STUB(KeBugCheck) -STUB(MmMapIoSpace) -STUB(MmUnmapIoSpace) -STUB(MmFindRegion) -STUB(MmAlterRegion) -STUB(MmInitializeRegion) -STUB(MmDisableVirtualMapping) -STUB(MmCreatePageFileMapping) -STUB(MmEnableVirtualMapping) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -6,7 +6,7 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H struct _EPROCESS; -PULONG MmGetPageDirectory(VOID); +PULONG_PTR MmGetPageDirectory(VOID); #define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -35,9 +35,13 @@ #define InterlockedExchangeAdd _InterlockedExchangeAdd #include "ke.h" +#ifdef _M_AMD64 +#include "amd64/mm.h" +#else #include "i386/mm.h" #include "i386/fpu.h" #include "i386/v86m.h" +#endif #include "ob.h" #include "mm.h" #include "ex.h" @@ -136,7 +140,11 @@ #define IQS(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ { sizeof(TypeQuery), sizeof(TypeSet), sizeof(AlignmentQuery), sizeof(AlignmentSet), Flags } +#ifndef _M_AMD64 FORCEINLINE +#else +static inline +#endif NTSTATUS DefaultSetInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList, @@ -186,7 +194,11 @@ return Status; } +#ifndef _M_AMD64 FORCEINLINE +#else +static inline +#endif NTSTATUS DefaultQueryInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList, Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -1,0 +1,323 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/i386/page.c + * PURPOSE: Low level memory managment manipulation + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) +#pragma alloc_text(INIT, MiInitPageDirectoryMap) +#endif + + +/* GLOBALS *****************************************************************/ + + + +/* FUNCTIONS ***************************************************************/ + +BOOLEAN MmUnmapPageTable(PULONG Pt); + +ULONG_PTR +NTAPI +MiFlushTlbIpiRoutine(ULONG_PTR Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +MiFlushTlb(PULONG Pt, PVOID Address) +{ + UNIMPLEMENTED; +} + + + +PULONG_PTR +MmGetPageDirectory(VOID) +{ + return (PULONG_PTR)__readcr3(); +} + +static ULONG +ProtectToPTE(ULONG flProtect) +{ + +} + +NTSTATUS +NTAPI +Mmi386ReleaseMmInfo(PEPROCESS Process) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +STDCALL +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmDeletePageTable(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmFreePageTable(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +BOOLEAN MmUnmapPageTable(PULONG Pt) +{ + UNIMPLEMENTED; + return FALSE; +} + +PFN_TYPE +NTAPI +MmGetPfnForProcess(PEPROCESS Process, + PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmRawDeleteVirtualMapping(PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, + SWAPENTRY* SwapEntry) +{ + UNIMPLEMENTED; +} + +BOOLEAN +Mmi386MakeKernelPageTableGlobal(PVOID PAddress) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +MmIsDirtyPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +MmIsPagePresent(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +BOOLEAN +NTAPI +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +NTSTATUS +NTAPI +MmCreateVirtualMappingForKernel(PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +NTSTATUS +NTAPI +MmCreateVirtualMappingUnsafe(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmCreateVirtualMapping(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +MmGetPageProtect(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +PHYSICAL_ADDRESS STDCALL +MmGetPhysicalAddress(PVOID vaddr) +{ + PHYSICAL_ADDRESS ret = {{0}}; + UNIMPLEMENTED; + return ret; +} + +PVOID +NTAPI +MmCreateHyperspaceMapping(PFN_TYPE Page) +{ + UNIMPLEMENTED; + return NULL; +} + +PFN_TYPE +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) +{ + UNIMPLEMENTED; + return 0; +} + +PFN_TYPE +NTAPI +MmDeleteHyperspaceMapping(PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ + UNIMPLEMENTED; +} + +VOID +INIT_FUNCTION +NTAPI +MmInitGlobalKernelPageDirectory(VOID) +{ + UNIMPLEMENTED; +} + +VOID +INIT_FUNCTION +NTAPI +MiInitPageDirectoryMap(VOID) +{ + UNIMPLEMENTED; +} + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c ------------------------------------------------------------------------------ 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] Tue Jul 29 19:54:12 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> -<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true"> +<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="0xfffff80000800000" entrypoint="KiSystemStartup" allowwarnings="true"> <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl_$(ARCH).def" /> <define name="_DISABLE_TIDENTS" /> @@ -358,20 +358,25 @@ <file>page.c</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>page.c</file> + </directory> + </if> <file>anonmem.c</file> <file>aspace.c</file> <file>balance.c</file> -  + <file>cont.c</file> <file>drvlck.c</file> <file>freelist.c</file> -  + <file>iospace.c</file> <file>kmap.c</file> <file>marea.c</file> -  -  -  + <file>mdlsup.c</file> + <file>mm.c</file> + <file>mminit.c</file> <file>mpw.c</file> -  + <file>ncache.c</file> <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file> @@ -380,15 +385,15 @@ <file>paging.c</file> <file>pe.c</file> <file>physical.c</file> -  + <file>pool.c</file> <file>ppool.c</file> -  -  + <file>procsup.c</file> + <file>region.c</file> <file>rmap.c</file> -  + <file>section.c</file> <file>sysldr.c</file> <file>verifier.c</file> -  + <file>virtual.c</file> <file>wset.c</file> <if property="_ELF_" value="1"> <file>elf32.c</file>

1 0

[tkreuzer] 34941: - fix usage of InterlockedExchangeAddSizeT
by tkreuzer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: tkreuzer Date: Tue Jul 29 19:31:41 2008 New Revision: 34941 URL: http://svn.reactos.org/svn/reactos?rev=34941&view=rev Log: - fix usage of InterlockedExchangeAddSizeT Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Tue Jul 29 19:31:41 2008 @@ -934,8 +934,8 @@ ASSERT(PushLock->Waiting || PushLock->Shared == 0); /* Unlock the pushlock */ - OldValue.Value = InterlockedExchangeAddSizeT((PLONG)PushLock, - -(LONG)EX_PUSH_LOCK_LOCK); + OldValue.Value = InterlockedExchangeAddSizeT((PSIZE_T)PushLock, + -(SIZE_T)EX_PUSH_LOCK_LOCK); /* Sanity checks */ ASSERT(OldValue.Locked);

1 0

[tkreuzer] 34940: - fix ExQueryPoolBlockSize prototype - make KI_USER_SHARED_DATA and IMAGE_ORDINAL_FLAG64 a ULONGLONG - fix definition if IMAGE_OPTIONAL_HEADER64 - add KPCR structure - add __readcrx intrinsics -
by tkreuzer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: tkreuzer Date: Tue Jul 29 19:30:00 2008 New Revision: 34940 URL: http://svn.reactos.org/svn/reactos?rev=34940&view=rev Log: - fix ExQueryPoolBlockSize prototype - make KI_USER_SHARED_DATA and IMAGE_ORDINAL_FLAG64 a ULONGLONG - fix definition if IMAGE_OPTIONAL_HEADER64 - add KPCR structure - add __readcrx intrinsics - Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] Tue Jul 29 19:30:00 2008 @@ -2499,7 +2499,7 @@ ); NTKERNELAPI -ULONG +SIZE_T NTAPI ExQueryPoolBlockSize ( IN PVOID PoolBlock, Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Tue Jul 29 19:30:00 2008 @@ -5485,7 +5485,28 @@ #define PROFILE_LEVEL 15 #define HIGH_LEVEL 15 -#define KI_USER_SHARED_DATA 0xFFFFF78000000000 +#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL + +typedef struct _KPCR +{ + NT_TIB NtTib; + struct _KPRCB *CurrentPrcb; + ULONG64 SavedRcx; + ULONG64 SavedR11; + KIRQL Irql; + UCHAR SecondLevelCacheAssociativity; + UCHAR Number; + UCHAR Fill0; + ULONG Irr; + ULONG IrrActive; + ULONG Idr; + USHORT MajorVersion; + USHORT MinorVersion; + ULONG StallScaleFactor; + union _KIDTENTRY64 *IdtBase; + union _KGDTENTRY64 *GdtBase; + struct _KTSS64 *TssBase; +} KPCR, *PKPCR; typedef struct _KFLOATING_SAVE { ULONG Dummy; @@ -5502,6 +5523,13 @@ NTAPI KeGetCurrentThread( VOID); + +FORCEINLINE +ULONG +KeGetCurrentProcessorNumber(VOID) +{ + return (ULONG)__readgsbyte(FIELD_OFFSET(KPCR, Number)); +} #elif defined(__PowerPC__) Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Tue Jul 29 19:30:00 2008 @@ -1050,6 +1050,67 @@ /*** Protected memory management ***/ + +#ifdef _M_AMD64 +static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) +{ + __asm__("movq %q[Data], %%cr0" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) +{ + __asm__("movq %q[Data], %%cr3" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) +{ + __asm__("movq %q[Data], %%cr4" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) unsigned long long __readcr0(void) +{ + unsigned long long value; + __asm__ __volatile__("movq %%cr0, %q[value]" : [value] "=q" (value)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned long long __readcr2(void) +{ + unsigned long long value; + __asm__ __volatile__("movq %%cr2, %q[value]" : [value] "=q" (value)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned long long __readcr3(void) +{ + unsigned long long value; + __asm__ __volatile__("movq %%cr3, %q[value]" : [value] "=q" (value)); + return value; +} + +static __inline__ __attribute__((always_inline)) unsigned long long __readcr4(void) +{ + unsigned long long value; + __asm__ __volatile__("movq %%cr4, %q[value]" : [value] "=q" (value)); + return value; +} + +#else +static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) +{ + __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) +{ + __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) +{ + __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); +} + static __inline__ __attribute__((always_inline)) unsigned long __readcr0(void) { unsigned long value; @@ -1078,36 +1139,6 @@ return value; } -#ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr0" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr3" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) -{ - __asm__("movq %q[Data], %%cr4" : : [Data] "q" (Data) : "memory"); -} -#else -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) -{ - __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); -} #endif static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address) Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Tue Jul 29 19:30:00 2008 @@ -3388,7 +3388,7 @@ WORD MinorImageVersion; WORD MajorSubsystemVersion; WORD MinorSubsystemVersion; - DWORD Reserved1; + DWORD Win32VersionValue; DWORD SizeOfImage; DWORD SizeOfHeaders; DWORD CheckSum; @@ -3647,7 +3647,7 @@ } IMAGE_THUNK_DATA32; typedef IMAGE_THUNK_DATA32 *PIMAGE_THUNK_DATA32; -#define IMAGE_ORDINAL_FLAG64 0x8000000000000000 +#define IMAGE_ORDINAL_FLAG64 0x8000000000000000ULL #define IMAGE_ORDINAL_FLAG32 0x80000000 #define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff) #define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)

1 0

[tkreuzer] 34939: fix several ULONG / ULONG_PTR / SIZE_T issues.
by tkreuzer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: tkreuzer Date: Tue Jul 29 19:25:15 2008 New Revision: 34939 URL: http://svn.reactos.org/svn/reactos?rev=34939&view=rev Log: fix several ULONG / ULONG_PTR / SIZE_T issues. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/cont.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ncache.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/cont.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/cont.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/cont.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -225,7 +225,7 @@ */ VOID STDCALL MmFreeContiguousMemorySpecifyCache(IN PVOID BaseAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { MmLockAddressSpace(MmGetKernelAddressSpace()); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -137,7 +137,7 @@ */ VOID STDCALL MmUnmapIoSpace (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { LONG Offset; PVOID Address = BaseAddress; @@ -163,7 +163,7 @@ */ PVOID STDCALL MmMapVideoDisplay (IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { return MmMapIoSpace (PhysicalAddress, NumberOfBytes, (BOOLEAN)CacheType); @@ -175,7 +175,7 @@ */ VOID STDCALL MmUnmapVideoDisplay (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { MmUnmapIoSpace (BaseAddress, NumberOfBytes); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -81,7 +81,7 @@ NTAPI MmCreateMdl(IN PMDL Mdl, IN PVOID Base, - IN ULONG Length) + IN SIZE_T Length) { ULONG Size; @@ -107,7 +107,7 @@ ULONG NTAPI MmSizeOfMdl(IN PVOID Base, - IN ULONG Length) + IN SIZE_T Length) { /* Return the MDL size */ return sizeof(MDL) + (ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Length) * sizeof(PFN_NUMBER)); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -14,7 +14,7 @@ /* GLOBALS *****************************************************************/ -ULONG MmUserProbeAddress = 0; +ULONG_PTR MmUserProbeAddress = 0; PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; PVOID MmSystemRangeStart = NULL; @@ -394,7 +394,7 @@ NTAPI NtResetWriteWatch(IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG RegionSize) + IN SIZE_T RegionSize) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -374,7 +374,7 @@ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); /* Set the page directory */ - PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); + PsGetCurrentProcess()->Pcb.DirectoryTableBase.QuadPart = (ULONG_PTR)MmGetPageDirectory(); /* Get the size of FreeLDR's image allocations */ MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -115,7 +115,7 @@ * @implemented */ VOID STDCALL MmFreeNonCachedMemory (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -50,7 +50,7 @@ * @implemented */ PVOID STDCALL -ExAllocatePool (POOL_TYPE PoolType, ULONG NumberOfBytes) +ExAllocatePool (POOL_TYPE PoolType, SIZE_T NumberOfBytes) /* * FUNCTION: Allocates pool memory of a specified type and returns a pointer * to the allocated block. This routine is used for general purpose allocation @@ -99,7 +99,7 @@ * @implemented */ PVOID STDCALL -ExAllocatePoolWithTag (POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag) +ExAllocatePoolWithTag (POOL_TYPE PoolType, SIZE_T NumberOfBytes, ULONG Tag) { PVOID Block; @@ -127,7 +127,7 @@ * @implemented */ PVOID STDCALL -ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes) +ExAllocatePoolWithQuota (POOL_TYPE PoolType, SIZE_T NumberOfBytes) { return(ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, TAG_NONE)); } @@ -180,7 +180,7 @@ PVOID NTAPI ExAllocatePoolWithQuotaTag (IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN ULONG Tag) { PEPROCESS Process; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -384,7 +384,7 @@ ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); + (PULONG)&ViewSize); ProbeForRead(ImageConfigData, sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -238,7 +238,7 @@ VOID NTAPI -MmInitializeRegion(PLIST_ENTRY RegionListHead, ULONG Length, ULONG Type, +MmInitializeRegion(PLIST_ENTRY RegionListHead, SIZE_T Length, ULONG Type, ULONG Protect) { PMM_REGION Region; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -12,7 +12,7 @@ typedef unsigned long rulong; -#define R_IS_POOL_PTR(pool,ptr) (void*)(ptr) >= pool->UserBase && (ULONG_PTR)(ptr) < ((ULONG_PTR)pool->UserBase + pool->UserSize) +#define R_IS_POOL_PTR(pool,ptr) (((void*)(ULONG_PTR)(ptr) >= pool->UserBase) && ((ULONG_PTR)(ptr) < ((ULONG_PTR)pool->UserBase + pool->UserSize))) #define R_ASSERT_PTR(pool,ptr) ASSERT( R_IS_POOL_PTR(pool,ptr) ) #define R_ASSERT_SIZE(pool,sz) ASSERT( sz > (sizeof(R_USED)+2*R_RZ) && sz >= sizeof(R_FREE) && sz < pool->UserSize ) @@ -712,7 +712,7 @@ if ( R_IS_POOL_PTR(pool,NumberOfBytes) ) { R_DEBUG("red zone verification requested for block 0x%X\n", NumberOfBytes ); - RUsedRedZoneCheck(pool,RBodyToHdr((void*)NumberOfBytes), (char*)NumberOfBytes, __FILE__, __LINE__ ); + RUsedRedZoneCheck(pool,RBodyToHdr((void*)(ULONG_PTR)NumberOfBytes), (char*)(ULONG_PTR)NumberOfBytes, __FILE__, __LINE__ ); R_RELEASE_MUTEX(pool); return NULL; } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -2382,6 +2382,7 @@ LARGE_INTEGER Offset; CHAR Buffer; FILE_STANDARD_INFORMATION FileInfo; + ULONG Length; /* * Create the section @@ -2444,7 +2445,8 @@ FileStandardInformation, sizeof(FILE_STANDARD_INFORMATION), &FileInfo, - &Iosb.Information); + &Length); + Iosb.Information = Length; if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -4188,8 +4190,8 @@ NtQuerySection(IN HANDLE SectionHandle, IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG SectionInformationLength, - OUT PULONG ResultLength OPTIONAL) + IN SIZE_T SectionInformationLength, + OUT PSIZE_T ResultLength OPTIONAL) { PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; @@ -4740,7 +4742,7 @@ NTSTATUS STDCALL MmMapViewInSystemSpace (IN PVOID SectionObject, OUT PVOID * MappedBase, - IN OUT PULONG ViewSize) + IN OUT PSIZE_T ViewSize) { PROS_SECTION_OBJECT Section; PMM_AVL_TABLE AddressSpace; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -647,7 +647,7 @@ ForwardName->Hint = 0; /* Set the new address */ - *(PULONG)&ForwardThunk.u1.AddressOfData = (ULONG)ForwardName; + ForwardThunk.u1.AddressOfData = (ULONG_PTR)ForwardName; /* Snap the forwarder */ Status = MiSnapThunk(LdrEntry->DllBase, @@ -1289,7 +1289,7 @@ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - PsNtosImageBase = (ULONG)LdrEntry->DllBase; + PsNtosImageBase = (ULONG_PTR)LdrEntry->DllBase; /* Loop the loader block */ while (NextEntry != ListHead) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Tue Jul 29 19:25:15 2008 @@ -678,8 +678,8 @@ NtReadVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead OPTIONAL) + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; @@ -765,8 +765,8 @@ NtWriteVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN PVOID Buffer, - IN ULONG NumberOfBytesToWrite, - OUT PULONG NumberOfBytesWritten OPTIONAL) + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; @@ -950,8 +950,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG UnsafeResultLength) + IN SIZE_T Length, + OUT PSIZE_T UnsafeResultLength) { NTSTATUS Status = STATUS_SUCCESS; ULONG ResultLength = 0; @@ -1062,8 +1062,8 @@ NTAPI NtUnlockVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL) + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL) { UNIMPLEMENTED; if (NumberOfBytesUnlocked) *NumberOfBytesUnlocked = 0;

1 0

[arty] 34938: Patch by Cameron Gutman (aicommander (at) gmail (dot) com) - Remove a hack from DispTdiSendDatagram - Fix a couple of bugs that resulted in clearing the wrong request
by arty＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: arty Date: Tue Jul 29 16:52:09 2008 New Revision: 34938 URL: http://svn.reactos.org/svn/reactos?rev=34938&view=rev Log: Patch by Cameron Gutman (aicommander (at) gmail (dot) com) - Remove a hack from DispTdiSendDatagram - Fix a couple of bugs that resulted in clearing the wrong request Modified: trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c 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] Tue Jul 29 16:52:09 2008 @@ -41,7 +41,7 @@ ASSERT_IRQL(APC_LEVEL); if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->SendIrp.InFlightRequest = NULL; return STATUS_SUCCESS; } @@ -175,7 +175,7 @@ Irp->IoStatus.Information)); if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->SendIrp.InFlightRequest = NULL; return STATUS_SUCCESS; } 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] Tue Jul 29 16:52:09 2008 @@ -1018,9 +1018,6 @@ if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information); - /* Return STATUS_PENDING because DispPrepareIrpForCancel - marks Irp as pending */ - Status = STATUS_PENDING; } else IoMarkIrpPending( Irp ); }

1 0

[tkreuzer] 34937: I reworked the pagetable code a little. Now the first tables are static .bss tables. Later before switching to the kernel, we create a proper 4 level page table. Here we allocate the needed pages. Remove obsolete meminit hack. Add a few useful debug prints to setupldr and comment out return, when ext2 wasn't loaded. We now reach the point where we jump to ntoskrnl, but ntoskrnl is in a bad shape ; -)
by tkreuzer＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: tkreuzer Date: Tue Jul 29 14:09:56 2008 New Revision: 34937 URL: http://svn.reactos.org/svn/reactos?rev=34937&view=rev Log: I reworked the pagetable code a little. Now the first tables are static .bss tables. Later before switching to the kernel, we create a proper 4 level page table. Here we allocate the needed pages. Remove obsolete meminit hack. Add a few useful debug prints to setupldr and comment out return, when ext2 wasn't loaded. We now reach the point where we jump to ntoskrnl, but ntoskrnl is in a bad shape ;-) Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/reactos.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Tue Jul 29 14:09:56 2008 @@ -99,22 +99,27 @@ pusha push es - mov ax, PML4_SEG + /* Get segment of pml4 */ + mov eax, offset _pml4_startup + shr eax, 4 mov es, ax cld xor di, di /* One entry in the PML4 pointing to PDP */ - mov eax, (PDP_PAGENUM << 12) | 0x00f + mov eax, offset _pdp_startup + or eax, 0x00f stosd + /* clear rest */ xor eax, eax mov cx, 0x03ff rep stosd /* One entry in the PDP pointing to PD */ - mov eax, (PD_PAGENUM << 12) | 0x00f + mov eax, offset _pd_startup + or eax, 0x00f stosd - + /* clear rest */ xor eax, eax mov ecx, 0x03ff rep stosd @@ -159,7 +164,7 @@ mov eax, 0x00a0 // Set PAE and PGE: 10100000b mov cr4, eax - mov edx, PML4_ADDRESS // Point cr3 at PML4 + mov edx, offset _pml4_startup // Point cr3 at PML4 mov cr3, edx mov ecx, 0xC0000080 // Specify EFER MSR 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] Tue Jul 29 14:09:56 2008 @@ -22,18 +22,15 @@ #define NDEBUG #include <debug.h> -#undef DbgPrint +//#undef DbgPrint /* Page Directory and Tables for non-PAE Systems */ -extern PAGE_DIRECTORY_X86 startup_pagedirectory; -extern PAGE_DIRECTORY_X86 lowmem_pagetable; -extern PAGE_DIRECTORY_X86 kernel_pagetable; -extern PAGE_DIRECTORY_X86 hyperspace_pagetable; -extern PAGE_DIRECTORY_X86 apic_pagetable; -extern PAGE_DIRECTORY_X86 kpcr_pagetable; -extern PAGE_DIRECTORY_X86 kuser_pagetable; +extern ULONG_PTR NextModuleBase; extern ULONG_PTR KernelBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; + +PPAGE_DIRECTORY_AMD64 pPML4; + /* FUNCTIONS *****************************************************************/ /*++ @@ -56,56 +53,93 @@ NTAPI FrLdrStartup(ULONG Magic) { - ASSERT(FALSE); -#if 0 /* Disable Interrupts */ _disable(); /* Re-initalize EFLAGS */ - Ke386EraseFlags(); + KeAmd64EraseFlags(); /* Initialize the page directory */ FrLdrSetupPageDirectory(); - /* Initialize Paging, Write-Protection and Load NTOSKRNL */ - FrLdrSetupPae(Magic); -#endif -} + /* Set the new PML4 */ + __writecr3((ULONGLONG)pPML4); -/*++ - * FrLdrSetupPae - * INTERNAL - * - * Configures PAE on a MP System, and sets the PDBR if it's supported, or if - * the system is UP. - * - * Params: - * Magic - Multiboot Magic - * - * Returns: - * None. - * - * Remarks: - * None. - * - *--*/ -VOID -FASTCALL -FrLdrSetupPae(ULONG Magic) -{ -#if 0 - ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; - - /* Set the PDBR */ - __writecr3(PageDirectoryBaseAddress); - - /* Enable Paging and Write Protect*/ - __writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP); +DbgPrint((DPRINT_WARNING, "Jumping to kernel @ %p.\n", KernelEntryPoint)); /* Jump to Kernel */ (*KernelEntryPoint)(Magic, &LoaderBlock); -#endif + } + +PPAGE_DIRECTORY_AMD64 +FrLdrGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index) +{ + PPAGE_DIRECTORY_AMD64 pSubDir; + + if (!pDir) + return NULL; + + if (!pDir->Pde[Index].Valid) + { + pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + if (!pSubDir) + return NULL; + RtlZeroMemory(pSubDir, PAGE_SIZE); + pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE; + pDir->Pde[Index].Valid = 1; + pDir->Pde[Index].Write = 1; + } + else + { + pSubDir = (PPAGE_DIRECTORY_AMD64)((ULONGLONG)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); + } + return pSubDir; +} + +BOOLEAN +FrLdrMapSinglePage(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress) +{ + PPAGE_DIRECTORY_AMD64 pDir3, pDir2, pDir1; + ULONG Index; + + pDir3 = FrLdrGetOrCreatePageDir(pPML4, VAtoIndex4(VirtualAddress)); + pDir2 = FrLdrGetOrCreatePageDir(pDir3, VAtoIndex3(VirtualAddress)); + pDir1 = FrLdrGetOrCreatePageDir(pDir2, VAtoIndex2(VirtualAddress)); + + if (!pDir1) + return FALSE; + + Index = VAtoIndex1(VirtualAddress); + if (pDir1->Pde[Index].Valid) + { + return FALSE; + } + + pDir1->Pde[Index].Valid = 1; + pDir1->Pde[Index].Write = 1; + pDir1->Pde[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; + + return TRUE; +} + +ULONG +FrLdrMapRangeOfPages(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress, ULONG cPages) +{ + ULONG i; + + for (i = 0; i < cPages; i++) + { + if (!FrLdrMapSinglePage(VirtualAddress, PhysicalAddress)) + { + return i; + } + VirtualAddress += PAGE_SIZE; + PhysicalAddress += PAGE_SIZE; + } + return i; +} + /*++ * FrLdrSetupPageDirectory @@ -128,89 +162,38 @@ FASTCALL FrLdrSetupPageDirectory(VOID) { -#if 0 - PPAGE_DIRECTORY_X86 PageDir; - ULONG KernelPageTableIndex; - ULONG i; + ULONG KernelPages; - /* Get the Kernel Table Index */ - KernelPageTableIndex = KernelBase >> PDE_SHIFT; + /* Allocate a Page for the PML4 */ + pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory); - /* Get the Startup Page Directory */ - PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; + ASSERT(pPML4); - /* Set up the Low Memory PDE */ - PageDir->Pde[LowMemPageTableIndex].Valid = 1; - PageDir->Pde[LowMemPageTableIndex].Write = 1; - PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); + /* The page tables are located at 0xfffff68000000000 + * We create a recursive self mapping through all 4 levels at + * virtual address 0xfffff6fb7dbedf68 */ + pPML4->Pde[VAtoIndex4(PML4_BASE)].Valid = 1; + pPML4->Pde[VAtoIndex4(PML4_BASE)].Write = 1; + pPML4->Pde[VAtoIndex4(PML4_BASE)].PageFrameNumber = PtrToPfn(PML4_BASE); - /* Set up the Kernel PDEs */ - PageDir->Pde[KernelPageTableIndex].Valid = 1; - PageDir->Pde[KernelPageTableIndex].Write = 1; - PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); - PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; - PageDir->Pde[KernelPageTableIndex + 1].Write = 1; - PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); + ASSERT(VAtoIndex4(PML4_BASE) == 0x1ed); + ASSERT(VAtoIndex3(PML4_BASE) == 0x1ed); + ASSERT(VAtoIndex2(PML4_BASE) == 0x1ed); + ASSERT(VAtoIndex1(PML4_BASE) == 0x1ed); - /* Set up the Startup PDE */ - PageDir->Pde[StartupPageTableIndex].Valid = 1; - PageDir->Pde[StartupPageTableIndex].Write = 1; - PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); + /* Setup low memory pages */ + if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024) + { + DbgPrint((DPRINT_WARNING, "Could not map low memory pages.\n")); + } - /* Set up the Hyperspace PDE */ - PageDir->Pde[HyperspacePageTableIndex].Valid = 1; - PageDir->Pde[HyperspacePageTableIndex].Write = 1; - PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); + /* Setup kernel pages */ + KernelPages = (ROUND_TO_PAGES(NextModuleBase - KERNEL_BASE_PHYS) / PAGE_SIZE); + DbgPrint((DPRINT_WARNING, "Trying to map %d pages for kernel.\n", KernelPages)); + if (FrLdrMapRangeOfPages(KernelBase, KERNEL_BASE_PHYS, KernelPages) != KernelPages) + { + DbgPrint((DPRINT_WARNING, "Could not map %d kernel pages.\n", KernelPages)); + } - /* Set up the HAL PDE */ - PageDir->Pde[HalPageTableIndex].Valid = 1; - PageDir->Pde[HalPageTableIndex].Write = 1; - PageDir->Pde[HalPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); - - /* Set up Low Memory PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; - for (i=0; i<1024; i++) - { - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].Owner = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); - } - - /* Set up Kernel PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; - for (i=0; i<1536; i++) - { - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); - } - - /* Setup APIC Base */ - PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].CacheDisable = 1; - PageDir->Pde[0].WriteThrough = 1; - PageDir->Pde[0].PageFrameNumber = PaToPfn(HAL_BASE); - PageDir->Pde[0x200].Valid = 1; - PageDir->Pde[0x200].Write = 1; - PageDir->Pde[0x200].CacheDisable = 1; - PageDir->Pde[0x200].WriteThrough = 1; - PageDir->Pde[0x200].PageFrameNumber = PaToPfn(HAL_BASE + KERNEL_BASE_PHYS); - - /* Setup KUSER_SHARED_DATA Base */ - PageDir->Pde[0x1F0].Valid = 1; - PageDir->Pde[0x1F0].Write = 1; - PageDir->Pde[0x1F0].PageFrameNumber = 2; - - /* Setup KPCR Base*/ - PageDir->Pde[0x1FF].Valid = 1; - PageDir->Pde[0x1FF].Write = 1; - PageDir->Pde[0x1FF].PageFrameNumber = 1; - - /* Zero shared data */ - RtlZeroMemory((PVOID)(2 << MM_PAGE_SHIFT), PAGE_SIZE); -#endif } Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] Tue Jul 29 14:09:56 2008 @@ -28,16 +28,12 @@ * Here we assume the kernel is loaded at 1mb * This boots the kernel */ - .code32 + .code64 .globl _PageDirectoryStart - .globl _startup_pagedirectory - .globl _lowmem_pagetable - .globl _kernel_pagetable - .globl _hyperspace_pagetable - .globl _apic_pagetable - .globl _kpcr_pagetable - .globl _kuser_pagetable + .globl _pml4_startup + .globl _pdp_startup + .globl _pd_startup .globl _PageDirectoryEnd @@ -55,25 +51,13 @@ .bss _PageDirectoryStart: -_startup_pagedirectory: +_pml4_startup: .fill 4096, 1, 0 -_lowmem_pagetable: +_pdp_startup: .fill 4096, 1, 0 -_kernel_pagetable: - .fill 2*4096, 1, 0 - -_hyperspace_pagetable: - .fill 4096, 1, 0 - -_apic_pagetable: +_pd_startup: .fill 4096, 1, 0 -_kpcr_pagetable: - .fill 4096, 1, 0 - -_kuser_pagetable: - .fill 4096, 1, 0 - _PageDirectoryEnd: 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] Tue Jul 29 14:09:56 2008 @@ -23,51 +23,38 @@ #define STACK64ADDR 0x74000 /* The 64-bit stack top will be at 0x74000 */ +/* Long mode selectors */ #define LMODE_CS 0x08 #define LMODE_DS 0x10 -/* Where we put out initial page tables */ -#define PML4_PAGENUM 60 // Put it high enough so it doesn't interfere with freeldr +#define VA_MASK 0x0000FFFFFFFFFFFFUL +#define PML4_SHIFT (12+9+9+9) +#define PDP_SHIFT (12+9+9) +#define PD_SHIFT (12+9) +#define PT_SHIFT 12 -#define PAGESIZE 4096 -#define PDP_PAGENUM (PML4_PAGENUM + 1) -#define PD_PAGENUM (PDP_PAGENUM + 1) -#define PML4_ADDRESS (PML4_PAGENUM * PAGESIZE) -#define PDP_ADDRESS (PDP_PAGENUM * PAGESIZE) -#define PML4_SEG (PML4_ADDRESS / 16) -#define PML4_PAGES 3 -#define PAGETABLE_SIZE PML4_PAGES * PAGESIZE +#define PtrToPfn(p) \ + ((((ULONGLONG)p) >> PT_SHIFT) & 0xffffffffffULL) -#if 0 +#define VAtoIndex4(va) (((va) >> PML4_SHIFT) & 0x1FF) +#define VAtoIndex3(va) (((va) >> PDP_SHIFT) & 0x1FF) +#define VAtoIndex2(va) (((va) >> PD_SHIFT) & 0x1FF) +#define VAtoIndex1(va) (((va) >> PT_SHIFT) & 0x1FF) + +#define PAGETABLE_BASE 0xfffff68000000000ULL +#define PML4_BASE 0xfffff6fb7dbedf68ULL +#define HYPERSPACE_BASE 0xfffff70000000000ULL +#define HAL_BASE 0xffffffff80000000ULL +#define APIC_BASE 0xffffffffff000000ULL // FIXME + +#define NUM_PAGES_KERNEL + #ifndef ASM -typedef struct +typedef struct _PAGE_DIRECTORY_AMD64 { - unsigned long long rax; - unsigned long long rbx; - unsigned long long rcx; - unsigned long long rdx; + HARDWARE_PTE Pde[512]; +} PAGE_DIRECTORY_AMD64, *PPAGE_DIRECTORY_AMD64; - unsigned long long rsi; - unsigned long long rdi; - - unsigned long long r8; - unsigned long long r9; - unsigned long long r10; - unsigned long long r11; - unsigned long long r12; - unsigned long long r13; - unsigned long long r14; - unsigned long long r15; - - unsigned short ds; - unsigned short es; - unsigned short fs; - unsigned short gs; - - unsigned long long rflags; - -} QWORDREGS; -#endif /* ! ASM */ #endif #endif /* __AMD64_AMD64_H_ */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Tue Jul 29 14:09:56 2008 @@ -22,6 +22,8 @@ /* Base Addres of Kernel in Physical Memory */ #define KERNEL_BASE_PHYS 0x800000 + +#if !defined(_M_AMD64) /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ #define PFN_SHIFT 12 @@ -52,6 +54,8 @@ { HARDWARE_PTE Pde[1024]; } PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; + +#endif /////////////////////////////////////////////////////////////////////////////////////// // Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Jul 29 14:09:56 2008 @@ -106,9 +106,6 @@ MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory -#if defined (_M_AMD64) - MmMarkPagesInLookupTable(PageLookupTableAddress, PML4_PAGENUM, PML4_PAGES, LoaderSpecialMemory); // the page table -#endif #elif __arm__ MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // arm exception handlers MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // arm board block + freeldr stack + cmdline Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Tue Jul 29 14:09:56 2008 @@ -406,7 +406,10 @@ /* Load ext2.sys (could be loaded by the setup prog!) */ if (!LoadDriver(SourcePath, "ext2.sys")) - return; + { + DbgPrint((DPRINT_WARNING, "Could not load ext2\n")); +// return; + } /* Load additional files specified in txtsetup.inf */ if (InfFindFirstLine(InfHandle, @@ -423,7 +426,10 @@ if (strcmp(Media, "x") == 0) { if (!LoadDriver(SourcePath, DriverName)) + { + DbgPrint((DPRINT_WARNING, "could not load %s, %s\n", SourcePath, DriverName)); return; + } } } } while (InfFindNextLine(&InfContext, &InfContext));

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