Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 55423: [NTOSKRNL] - Fix a bug in CmpSetSystemValues, where an uninitialized handle would be closed in the failure path. - Add a hack on top of the MI_GET_ROS_DATA(x) hack so that we can ...
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 23:08:20 2012 New Revision: 55423 URL: http://svn.reactos.org/svn/reactos?rev=55423&view=rev Log: [NTOSKRNL] - Fix a bug in CmpSetSystemValues, where an uninitialized handle would be closed in the failure path. - Add a hack on top of the MI_GET_ROS_DATA(x) hack so that we can squeeze a pointer into a 32 bit field. Make MmInitializeProcessAddressSpace amd64 ready and use a portable way to determine the page table base pfn in MiInitializeWorkingSetList - Make MmProbeAndLockPages ready for 3 and 4 level page tables add MiIsPteOnP*eBoundary macros - use these in MmProbeAndLockPages - Raise IRQL to SYNCH_LEVEL not DISPATCH_LEVEL in KiAcquireDispatcherLock - Add MiNonPagedSystemSize for all architectures - Fix amd64 definition of KERNEL_HANDLE_FLAG - Fix definition of PrototypePte - Fix KiGetLinkedTrapFrame() - Make MmProtectTpPteMask 64 bit wide - Fix definition of MI_PTE_LOOKUP_NEEDED for amd64 - Impllement KiSendEOI() to be able to send an EOI from C code. - Fix some MSVC/amd64 warnings Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/zw.S trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/special.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -333,7 +333,7 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName, ValueName = { 0, 0, NULL }; - HANDLE KeyHandle; + HANDLE KeyHandle = NULL; NTSTATUS Status; ASSERT(LoaderBlock != NULL); @@ -374,7 +374,7 @@ RtlFreeUnicodeString(&ValueName); /* Close the key and return */ - NtClose(KeyHandle); + if (KeyHandle) NtClose(KeyHandle); /* Return the status */ return (ExpInTextModeSetup ? STATUS_SUCCESS : Status); @@ -1098,7 +1098,8 @@ { WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; - ULONG FileStart, i, ErrorResponse, WorkerCount, Length; + ULONG i, ErrorResponse, WorkerCount, Length; + USHORT FileStart; //ULONG RegStart; ULONG PrimaryDisposition, SecondaryDisposition, ClusterSize; PCMHIVE CmHive; @@ -1259,7 +1260,8 @@ UNICODE_STRING TempName, FileName, RegName; HANDLE Thread; NTSTATUS Status; - ULONG RegStart, i; + ULONG i; + USHORT RegStart; PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); @@ -1611,25 +1613,25 @@ PLIST_ENTRY NextEntry, OldEntry; PBOOT_DRIVER_NODE DriverNode; PAGED_CODE(); - + /* Parse the current list */ NextEntry = DriverList->Flink; while (NextEntry != DriverList) { /* Get the driver node */ DriverNode = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_NODE, ListEntry.Link); - + /* Get the next entry now, since we're going to free it later */ OldEntry = NextEntry; NextEntry = NextEntry->Flink; - + /* Was there a name? */ if (DriverNode->Name.Buffer) { /* Free it */ CmpFree(DriverNode->Name.Buffer, DriverNode->Name.Length); } - + /* Was there a registry path? */ if (DriverNode->ListEntry.RegistryPath.Buffer) { @@ -1637,7 +1639,7 @@ CmpFree(DriverNode->ListEntry.RegistryPath.Buffer, DriverNode->ListEntry.RegistryPath.MaximumLength); } - + /* Was there a file path? */ if (DriverNode->ListEntry.FilePath.Buffer) { @@ -1645,7 +1647,7 @@ CmpFree(DriverNode->ListEntry.FilePath.Buffer, DriverNode->ListEntry.FilePath.MaximumLength); } - + /* Now free the node, and move on */ CmpFree(OldEntry, sizeof(BOOT_DRIVER_NODE)); } @@ -1673,7 +1675,7 @@ /* Initialize the driver list */ InitializeListHead(&DriverList); - + /* Open the system hive key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\System"); InitializeObjectAttributes(&ObjectAttributes, @@ -1683,7 +1685,7 @@ NULL); Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) return NULL; - + /* Reference the key object to get the root hive/cell to access directly */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, @@ -1697,38 +1699,38 @@ NtClose(KeyHandle); return NULL; } - + /* Do all this under the registry lock */ CmpLockRegistryExclusive(); - + /* Get the hive and key cell */ Hive = KeyBody->KeyControlBlock->KeyHive; RootCell = KeyBody->KeyControlBlock->KeyCell; - + /* Open the current control set key */ RtlInitUnicodeString(&KeyName, L"Current"); ControlCell = CmpFindControlSet(Hive, RootCell, &KeyName, &AutoSelect); if (ControlCell == HCELL_NIL) goto EndPath; - + /* Find all system drivers */ Success = CmpFindDrivers(Hive, ControlCell, SystemLoad, NULL, &DriverList); if (!Success) goto EndPath; - + /* Sort by group/tag */ if (!CmpSortDriverList(Hive, ControlCell, &DriverList)) goto EndPath; - + /* Remove circular dependencies (cycles) and sort */ if (!CmpResolveDriverDependencies(&DriverList)) goto EndPath; - + /* Loop the list to count drivers */ for (i = 0, NextEntry = DriverList.Flink; NextEntry != &DriverList; i++, NextEntry = NextEntry->Flink); - + /* Allocate the array */ ServicePath = ExAllocatePool(NonPagedPool, (i + 1) * sizeof(PUNICODE_STRING)); if (!ServicePath) KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 2, 1, 0, 0); - + /* Loop the driver list */ for (i = 0, NextEntry = DriverList.Flink; NextEntry != &DriverList; @@ -1743,17 +1745,17 @@ &DriverEntry->RegistryPath, ServicePath[i]); } - + /* Terminate the list */ ServicePath[i] = NULL; - + EndPath: /* Free the driver list if we had one */ if (!IsListEmpty(&DriverList)) CmpFreeDriverList(Hive, &DriverList); - + /* Unlock the registry */ CmpUnlockRegistry(); - + /* Close the key handle and dereference the object, then return the path */ ObDereferenceObject(KeyBody); NtClose(KeyHandle); Modified: trunk/reactos/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zw.S?rev=55423… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -5,7 +5,9 @@ #ifdef _M_IX86 EXTERN _KiSystemService:PROC #elif defined(_M_AMD64) +#include <ksamd64.inc> EXTERN KiSystemService:PROC +EXTERN KiZwSystemService:PROC #endif .code Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -56,6 +56,8 @@ #define AMD64_TSS 9 +#define APIC_EOI_REGISTER 0xFFFFFFFFFFFE00B0ULL + #ifndef __ASM__ #include "intrin_i.h" @@ -67,6 +69,17 @@ UCHAR IstIndex; PVOID ServiceRoutine; } KIDT_INIT, *PKIDT_INIT; + +#include <pshpack1.h> +typedef struct _KI_INTERRUPT_DISPATCH_ENTRY +{ + UCHAR _Op_nop; + UCHAR _Op_push; + UCHAR _Vector; + UCHAR _Op_jmp; + ULONG RelativeAddress; +} KI_INTERRUPT_DISPATCH_ENTRY, *PKI_INTERRUPT_DISPATCH_ENTRY; +#include <poppack.h> extern ULONG Ke386CacheAlignment; extern ULONG KeI386NpxPresent; @@ -95,7 +108,7 @@ ((TrapFrame)->Rip) #define KiGetLinkedTrapFrame(x) \ - (PKTRAP_FRAME)((x)->Rdx) + (PKTRAP_FRAME)((x)->TrapFrame) #define KeGetContextReturnRegister(Context) \ ((Context)->Rax) @@ -235,11 +248,20 @@ VOID FORCEINLINE +KiSendEOI() +{ + /* Write 0 to the apic EOI register */ + *((volatile ULONG*)APIC_EOI_REGISTER) = 0; +} + +VOID +FORCEINLINE KiEndInterrupt(IN KIRQL Irql, IN PKTRAP_FRAME TrapFrame) { /* Make sure this is from the clock handler */ ASSERT(TrapFrame->ErrorCode == 0xc10c4); + //KeLowerIrql(Irql); } BOOLEAN Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -127,8 +127,8 @@ KIRQL KiAcquireDispatcherLock(VOID) { - /* Raise to DPC level */ - return KeRaiseIrqlToDpcLevel(); + /* Raise to synch level */ + return KfRaiseIrql(SYNCH_LEVEL); } FORCEINLINE @@ -303,7 +303,7 @@ /* Let the CPU know that this is a loop */ YieldProcessor(); - } + } /* Try acquiring the lock now */ } while (InterlockedCompareExchange(&Object->Lock, @@ -902,7 +902,7 @@ { ULONG Hand; PKTIMER_TABLE_ENTRY TableEntry; - + /* Remove the timer from the timer list and check if it's empty */ Hand = Timer->Header.Hand; if (RemoveEntryList(&Timer->TimerListEntry)) @@ -962,17 +962,17 @@ OUT PULONG Hand) { LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; - + /* Convert to relative time if needed */ Timer->Header.Absolute = FALSE; if (DueTime.HighPart >= 0) { /* Get System Time */ KeQuerySystemTime(&SystemTime); - + /* Do the conversion */ DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; - + /* Make sure it hasn't already expired */ Timer->Header.Absolute = TRUE; if (DifferenceTime.HighPart >= 0) @@ -984,17 +984,17 @@ *Hand = 0; return FALSE; } - + /* Set the time as Absolute */ DueTime = DifferenceTime; } - + /* Get the Interrupt Time */ InterruptTime.QuadPart = KeQueryInterruptTime(); - + /* Recalculate due time */ Timer->DueTime.QuadPart = InterruptTime.QuadPart - DueTime.QuadPart; - + /* Get the handle */ *Hand = KiComputeTimerTableIndex(Timer->DueTime.QuadPart); Timer->Header.Hand = (UCHAR)*Hand; @@ -1515,7 +1515,7 @@ GuardedMutex->Count = GM_LOCK_BIT; GuardedMutex->Owner = NULL; GuardedMutex->Contention = 0; - + /* Initialize the Wait Gate */ KeInitializeGate(&GuardedMutex->Gate); } @@ -1525,21 +1525,21 @@ _KeAcquireGuardedMutexUnsafe(IN OUT PKGUARDED_MUTEX GuardedMutex) { PKTHREAD Thread = KeGetCurrentThread(); - + /* Sanity checks */ ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (Thread->SpecialApcDisable < 0) || (Thread->Teb == NULL) || (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); ASSERT(GuardedMutex->Owner != Thread); - + /* Remove the lock */ if (!InterlockedBitTestAndReset(&GuardedMutex->Count, GM_LOCK_BIT_V)) { /* The Guarded Mutex was already locked, enter contented case */ KiAcquireGuardedMutex(GuardedMutex); } - + /* Set the Owner */ GuardedMutex->Owner = Thread; } @@ -1549,21 +1549,21 @@ _KeReleaseGuardedMutexUnsafe(IN OUT PKGUARDED_MUTEX GuardedMutex) { LONG OldValue, NewValue; - + /* Sanity checks */ ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (KeGetCurrentThread()->SpecialApcDisable < 0) || (KeGetCurrentThread()->Teb == NULL) || (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); ASSERT(GuardedMutex->Owner == KeGetCurrentThread()); - + /* Destroy the Owner */ GuardedMutex->Owner = NULL; - + /* Add the Lock Bit */ OldValue = InterlockedExchangeAdd(&GuardedMutex->Count, GM_LOCK_BIT); ASSERT((OldValue & GM_LOCK_BIT) == 0); - + /* Check if it was already locked, but not woken */ if ((OldValue) && !(OldValue & GM_LOCK_WAITER_WOKEN)) { @@ -1573,7 +1573,7 @@ /* The mutex will be woken, minus one waiter */ NewValue = OldValue + GM_LOCK_WAITER_WOKEN - GM_LOCK_WAITER_INC; - + /* Remove the Woken bit */ if (InterlockedCompareExchange(&GuardedMutex->Count, NewValue, @@ -1590,21 +1590,21 @@ _KeAcquireGuardedMutex(IN PKGUARDED_MUTEX GuardedMutex) { PKTHREAD Thread = KeGetCurrentThread(); - + /* Sanity checks */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ASSERT(GuardedMutex->Owner != Thread); - + /* Disable Special APCs */ KeEnterGuardedRegion(); - + /* Remove the lock */ if (!InterlockedBitTestAndReset(&GuardedMutex->Count, GM_LOCK_BIT_V)) { /* The Guarded Mutex was already locked, enter contented case */ KiAcquireGuardedMutex(GuardedMutex); } - + /* Set the Owner and Special APC Disable state */ GuardedMutex->Owner = Thread; GuardedMutex->SpecialApcDisable = Thread->SpecialApcDisable; @@ -1615,20 +1615,20 @@ _KeReleaseGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { LONG OldValue, NewValue; - + /* Sanity checks */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ASSERT(GuardedMutex->Owner == KeGetCurrentThread()); ASSERT(KeGetCurrentThread()->SpecialApcDisable == GuardedMutex->SpecialApcDisable); - + /* Destroy the Owner */ GuardedMutex->Owner = NULL; - + /* Add the Lock Bit */ OldValue = InterlockedExchangeAdd(&GuardedMutex->Count, GM_LOCK_BIT); ASSERT((OldValue & GM_LOCK_BIT) == 0); - + /* Check if it was already locked, but not woken */ if ((OldValue) && !(OldValue & GM_LOCK_WAITER_WOKEN)) { @@ -1638,7 +1638,7 @@ /* The mutex will be woken, minus one waiter */ NewValue = OldValue + GM_LOCK_WAITER_WOKEN - GM_LOCK_WAITER_INC; - + /* Remove the Woken bit */ if (InterlockedCompareExchange(&GuardedMutex->Count, NewValue, @@ -1648,7 +1648,7 @@ KeSignalGateBoostPriority(&GuardedMutex->Gate); } } - + /* Re-enable APCs */ KeLeaveGuardedRegion(); } @@ -1658,21 +1658,21 @@ _KeTryToAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { PKTHREAD Thread = KeGetCurrentThread(); - + /* Block APCs */ KeEnterGuardedRegion(); - + /* Remove the lock */ if (!InterlockedBitTestAndReset(&GuardedMutex->Count, GM_LOCK_BIT_V)) { /* Re-enable APCs */ KeLeaveGuardedRegion(); YieldProcessor(); - + /* Return failure */ return FALSE; } - + /* Set the Owner and APC State */ GuardedMutex->Owner = Thread; GuardedMutex->SpecialApcDisable = Thread->SpecialApcDisable; Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -56,8 +56,11 @@ // // Identifies a Kernel Handle // -#define KERNEL_HANDLE_FLAG \ - ((ULONG_PTR)1 << ((sizeof(HANDLE) * 8) - 1)) +#ifdef _WIN64 +#define KERNEL_HANDLE_FLAG 0xFFFFFFFF80000000ULL +#else +#define KERNEL_HANDLE_FLAG 0x80000000 +#endif #define ObIsKernelHandle(Handle, ProcessorMode) \ (((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) && \ ((ProcessorMode) == KernelMode)) Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -1650,7 +1650,8 @@ /* Return the session */ if ((Process = IoGetRequestorProcess(Irp))) { - *pSessionId = Process->Session; + // FIXME: broken + *pSessionId = PtrToUlong(Process->Session); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -281,8 +281,9 @@ // nonpaged pool expansion (above) and the system PTEs. Note that it is // then aligned to a PDE boundary (4MB). // + MiNonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - - (MmNumberOfSystemPtes + 1) * PAGE_SIZE); + MiNonPagedSystemSize); MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & ~(PDE_MAPPED_VA - 1)); Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -593,6 +593,12 @@ NTSTATUS ProbeStatus; PMMPTE PointerPte, LastPte; PMMPDE PointerPde; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; +#endif PFN_NUMBER PageFrameIndex; BOOLEAN UsePfnLock; KIRQL OldIrql; @@ -741,9 +747,11 @@ PointerPte = MiAddressToPte(StartAddress); PointerPde = MiAddressToPde(StartAddress); #if (_MI_PAGING_LEVELS >= 3) - DPRINT1("PAE/x64 Not Implemented\n"); - ASSERT(FALSE); + PointerPpe = MiAddressToPpe(StartAddress); #endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(StartAddress); +#endif // // Sanity check @@ -776,7 +784,7 @@ // // Check if this came from kernel mode // - if (Base >= MM_HIGHEST_USER_ADDRESS) + if (Base > MM_HIGHEST_USER_ADDRESS) { // // We should not have a process @@ -834,11 +842,14 @@ // Assume failure and check for non-mapped pages // *MdlPages = LIST_HEAD; + while ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif #if (_MI_PAGING_LEVELS >= 3) - /* Should be checking the PPE and PXE */ - ASSERT(FALSE); + (PointerPpe->u.Hard.Valid == 0) || #endif - while ((PointerPde->u.Hard.Valid == 0) || + (PointerPde->u.Hard.Valid == 0) || (PointerPte->u.Hard.Valid == 0)) { // @@ -1042,7 +1053,14 @@ PointerPte++; /* Check if we're on a PDE boundary */ - if (!((ULONG_PTR)PointerPte & (PD_SIZE - 1))) PointerPde++; + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -78,6 +78,8 @@ #define PDE_COUNT 1024 #define PTE_COUNT 1024 C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); +#define MiIsPteOnPdeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) #elif _M_ARM #define PD_COUNT 1 #define PDE_COUNT 4096 @@ -164,7 +166,7 @@ #error Define these please! #endif -extern const ULONG MmProtectToPteMask[32]; +extern const ULONG_PTR MmProtectToPteMask[32]; extern const ULONG MmProtectToValue[32]; // @@ -262,7 +264,11 @@ // // Prototype PTEs that don't yet have a pagefile association // +#ifdef _M_AMD64 +#define MI_PTE_LOOKUP_NEEDED 0xffffffffULL +#else #define MI_PTE_LOOKUP_NEEDED 0xFFFFF +#endif // // System views are binned into 64K chunks @@ -444,6 +450,7 @@ extern PFN_NUMBER MmMaximumNonPagedPoolInPages; extern PFN_NUMBER MmSizeOfPagedPoolInPages; extern PVOID MmNonPagedSystemStart; +extern SIZE_T MiNonPagedSystemSize; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; extern PVOID MmNonPagedPoolEnd; @@ -1379,7 +1386,14 @@ // // New ARM3<->RosMM PAGE Architecture // +#ifdef _WIN64 +// HACK ON TOP OF HACK ALERT!!! +#define MI_GET_ROS_DATA(x) \ + (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ + ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) +#else #define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) +#endif #define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) #define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); typedef struct _MMROSPFN Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -93,6 +93,7 @@ // http://www.ditii.com/2007/09/28/windows-memory-management-x86-virtual-addre… // PVOID MmNonPagedSystemStart; +SIZE_T MiNonPagedSystemSize; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -913,7 +913,7 @@ MmWorkingSetList->LastInitializedWsle = 4; /* The rule is that the owner process is always in the FLINK of the PDE's PFN entry */ - Pfn1 = MiGetPfnEntry(MiAddressToPte(PDE_BASE)->u.Hard.PageFrameNumber); + Pfn1 = MiGetPfnEntry(CurrentProcess->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); ASSERT(Pfn1->u4.PteFrame == MiGetPfnEntryIndex(Pfn1)); Pfn1->u1.Event = (PKEVENT)CurrentProcess; } @@ -963,13 +963,23 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Setup the PFN for the PDE base of this process */ +#ifdef _M_AMD64 + PointerPte = MiAddressToPte(PXE_BASE); +#else PointerPte = MiAddressToPte(PDE_BASE); +#endif PageFrameNumber = PFN_FROM_PTE(PointerPte); + ASSERT(Process->Pcb.DirectoryTableBase[0] == PageFrameNumber * PAGE_SIZE); MiInitializePfn(PageFrameNumber, PointerPte, TRUE); /* Do the same for hyperspace */ +#ifdef _M_AMD64 + PointerPde = MiAddressToPxe((PVOID)HYPER_SPACE); +#else PointerPde = MiAddressToPde(HYPER_SPACE); +#endif PageFrameNumber = PFN_FROM_PTE(PointerPde); + //ASSERT(Process->Pcb.DirectoryTableBase[0] == PageFrameNumber * PAGE_SIZE); // we're not lucky MiInitializePfn(PageFrameNumber, (PMMPTE)PointerPde, TRUE); /* Setup the PFN for the PTE for the working set */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -261,7 +261,7 @@ RtlZeroMemory(Header, sizeof(POOL_HEADER)); /* Save allocation size there */ - Header->Ulong1 = NumberOfBytes; + Header->Ulong1 = (ULONG)NumberOfBytes; /* Make sure it's all good */ ASSERT((NumberOfBytes <= PAGE_SIZE - sizeof(POOL_HEADER)) && @@ -286,7 +286,7 @@ That time will be used to check memory consistency within the allocated page. */ Header->PoolTag = Tag; - Header->BlockSize = TickCount.LowPart; + Header->BlockSize = (USHORT)TickCount.LowPart; DPRINT1("%p\n", Entry); return Entry; } @@ -305,7 +305,7 @@ Ptr = P + BytesRequested; /* Calculate how many bytes to check */ - BytesToCheck = (PUCHAR)PAGE_ALIGN(P) + PAGE_SIZE - Ptr; + BytesToCheck = (ULONG)((PUCHAR)PAGE_ALIGN(P) + PAGE_SIZE - Ptr); /* Remove pool header size if we're catching underruns */ if (((ULONG_PTR)P & (PAGE_SIZE - 1)) == 0) @@ -335,7 +335,7 @@ KIRQL Irql = KeGetCurrentIrql(); POOL_TYPE PoolType; ULONG BytesRequested, BytesReal = 0; - ULONG_PTR PtrOffset; + ULONG PtrOffset; PUCHAR b; PMI_FREED_SPECIAL_POOL FreedHeader; LARGE_INTEGER TickCount; @@ -358,7 +358,7 @@ } /* Determine if it's a underruns or overruns pool pointer */ - PtrOffset = (ULONG_PTR)P & (PAGE_SIZE - 1); + PtrOffset = (ULONG)((ULONG_PTR)P & (PAGE_SIZE - 1)); if (PtrOffset) { /* Pool catches overruns */ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=5542… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -165,7 +165,8 @@ ExAcquireRundownProtection(&Process->RundownProtect); if(NT_SUCCESS(Status)) { - if(Process->Job == NULL && Process->Session == Job->SessionId) + // FIXME: This is broken + if(Process->Job == NULL && PtrToUlong(Process->Session) == Job->SessionId) { /* Just store the pointer to the job object in the process, we'll assign it later. The reason we can't do this here is that locking @@ -269,7 +270,7 @@ /* setup the job object */ InitializeListHead(&Job->ProcessListHead); - Job->SessionId = CurrentProcess->Session; /* inherit the session id from the caller */ + Job->SessionId = PtrToUlong(CurrentProcess->Session); /* inherit the session id from the caller, FIXME: broken */ Status = ExInitializeResource(&Job->JobLock); if(!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -1113,7 +1113,8 @@ NTAPI PsGetCurrentProcessSessionId(VOID) { - return PsGetCurrentProcess()->Session; + // FIXME: this is broken! + return PtrToUlong(PsGetCurrentProcess()->Session); } /* Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Feb 4 23:08:20 2012 @@ -419,7 +419,7 @@ _SEH2_TRY { /* Write back the Session ID */ - SessionInfo->SessionId = Process->Session; //MmGetSessionId(Process); + SessionInfo->SessionId = PtrToUlong(PsGetProcessSessionId(Process)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -818,32 +818,32 @@ } _SEH2_END; break; - + case ProcessImageInformation: DPRINT1("Image Information Query Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessDebugObjectHandle: DPRINT1("Debug Object Query Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessHandleTracing: DPRINT1("Handle tracing Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessLUIDDeviceMapsEnabled: DPRINT1("LUID Device Maps Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessExecuteFlags: DPRINT1("No execute Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessWow64Information: case ProcessLdtInformation: case ProcessWx86Information: @@ -855,12 +855,12 @@ DPRINT1("WS Watch Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessPooledUsageAndLimits: DPRINT1("Pool limits Not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + /* Not supported by Server 2003 */ default: DPRINT1("Unsupported info class: %lx\n", ProcessInformationClass); @@ -978,7 +978,7 @@ Status = STATUS_PRIVILEGE_NOT_HELD; break; } - + /* Get the LPC Port */ Status = ObReferenceObjectByHandle(PortHandle, 0, @@ -1050,10 +1050,10 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Set the mode */ Process->DefaultHardErrorProcessing = DefaultHardErrorMode; - + /* Call Ke for the update */ if (DefaultHardErrorMode & SEM_NOALIGNMENTFAULTEXCEPT) { @@ -1219,7 +1219,7 @@ PsProcessPriorityBackground); Status = STATUS_SUCCESS; break; - + case ProcessBasePriority: /* Validate input length */ @@ -1242,7 +1242,7 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Extract the memory priority out of there */ if (BasePriority & 0x80000000) { @@ -1253,22 +1253,22 @@ { MemoryPriority = MEMORY_PRIORITY_BACKGROUND; } - + /* Validate the number */ if ((BasePriority > HIGH_PRIORITY) || (BasePriority <= LOW_PRIORITY)) { return STATUS_INVALID_PARAMETER; } - + /* Check if the new base is higher */ if (BasePriority > Process->Pcb.BasePriority) { DPRINT1("Should check privilege\n"); } - + /* Call Ke */ KeSetPriorityAndQuantumProcess(&Process->Pcb, BasePriority, 0); - + /* Now set the memory priority */ MmSetMemoryPriorityProcess(Process, MemoryPriority); Status = STATUS_SUCCESS; @@ -1351,14 +1351,14 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Setting 'break on termination' requires the SeDebugPrivilege */ if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) { Status = STATUS_PRIVILEGE_NOT_HELD; break; } - + /* Set or clear the flag */ if (Break) { @@ -1370,9 +1370,9 @@ } break; - + case ProcessAffinityMask: - + /* Check buffer length */ if (ProcessInformationLength != sizeof(KAFFINITY)) { @@ -1393,7 +1393,7 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Make sure it's valid for the CPUs present */ ValidAffinity = Affinity & KeActiveProcessors; if (!Affinity || (ValidAffinity != Affinity)) @@ -1435,7 +1435,7 @@ Status = STATUS_PROCESS_IS_TERMINATING; } break; - + /* Priority Boosting status */ case ProcessPriorityBoost: @@ -1469,7 +1469,7 @@ /* Call Ke to do the work */ KeSetDisableBoostProcess(&Process->Pcb, DisableBoost); - + /* Loop the threads too */ for (Next = Process->ThreadListHead.Flink; Next != &Process->ThreadListHead; @@ -1494,7 +1494,7 @@ Status = STATUS_PROCESS_IS_TERMINATING; } break; - + case ProcessDebugFlags: /* Check buffer length */ @@ -1516,7 +1516,7 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Set the mode */ if (DebugFlags & ~1) { @@ -1537,7 +1537,7 @@ /* Done */ Status = STATUS_SUCCESS; break; - + case ProcessEnableAlignmentFaultFixup: /* Check buffer length */ @@ -1559,7 +1559,7 @@ _SEH2_YIELD(break); } _SEH2_END; - + /* Set the mode */ if (EnableFixup) { @@ -1569,12 +1569,12 @@ { Process->DefaultHardErrorProcessing &= ~SEM_NOALIGNMENTFAULTEXCEPT; } - + /* Call Ke for the update */ KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); Status = STATUS_SUCCESS; break; - + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: @@ -1584,32 +1584,32 @@ DPRINT1("VDM/16-bit Request not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessQuotaLimits: DPRINT1("Quota Limits not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessWorkingSetWatch: DPRINT1("WS watch not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessDeviceMap: DPRINT1("Device map not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessHandleTracing: DPRINT1("Handle tracing not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - + case ProcessExecuteFlags: DPRINT1("No execute support not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - + /* Anything else is invalid */ default: DPRINT1("Invalid Server 2003 Info Class: %lx\n", ProcessInformationClass);

1 0

[pschweitzer] 55422: [MOUNTMGR] Implement DeleteRemoteDatabaseEntry
by pschweitzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: pschweitzer Date: Sat Feb 4 22:01:12 2012 New Revision: 55422 URL: http://svn.reactos.org/svn/reactos?rev=55422&view=rev Log: [MOUNTMGR] Implement DeleteRemoteDatabaseEntry Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/database.c branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.c Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte… ============================================================================== --- branches/usb-bringup-trunk/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/filters/mountmgr/database.c [iso-8859-1] Sat Feb 4 22:01:12 2012 @@ -194,11 +194,92 @@ return Entry; } +/* + * @implemented + */ NTSTATUS DeleteRemoteDatabaseEntry(IN HANDLE Database, IN LONG StartingOffset) { - return STATUS_NOT_IMPLEMENTED; + LONG EndSize; + PVOID TmpBuffer; + NTSTATUS Status; + LONG DatabaseSize; + PDATABASE_ENTRY Entry; + IO_STATUS_BLOCK IoStatusBlock; + LARGE_INTEGER EndEntriesOffset; + + /* First, get database size */ + DatabaseSize = GetRemoteDatabaseSize(Database); + if (!DatabaseSize) + { + return STATUS_INVALID_PARAMETER; + } + + /* Then, get the entry to remove */ + Entry = GetRemoteDatabaseEntry(Database, StartingOffset); + if (!Entry) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validate parameters: ensure we won't get negative size */ + if (Entry->EntrySize + StartingOffset > DatabaseSize) + { + /* If we get invalid parameters, truncate the whole database + * starting the wrong entry. We can't rely on the rest + */ + FreePool(Entry); + return TruncateRemoteDatabase(Database, StartingOffset); + } + + /* Now, get the size of the remaining entries (those after the one to remove) */ + EndSize = DatabaseSize - Entry->EntrySize - StartingOffset; + /* Allocate a buffer big enough to hold them */ + TmpBuffer = AllocatePool(EndSize); + if (!TmpBuffer) + { + FreePool(Entry); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get the offset of the entry right after the one to delete */ + EndEntriesOffset.QuadPart = Entry->EntrySize + StartingOffset; + /* We don't need the entry any more */ + FreePool(Entry); + + /* Read the ending entries */ + Status = ZwReadFile(Database, NULL, NULL, NULL, &IoStatusBlock, + TmpBuffer, EndSize, &EndEntriesOffset, NULL); + if (!NT_SUCCESS(Status)) + { + FreePool(TmpBuffer); + return Status; + } + + /* Ensure nothing went wrong - we don't want to corrupt the DB */ + if (IoStatusBlock.Information != EndSize) + { + FreePool(TmpBuffer); + return STATUS_INVALID_PARAMETER; + } + + /* Remove the entry */ + Status = TruncateRemoteDatabase(Database, StartingOffset + EndSize); + if (!NT_SUCCESS(Status)) + { + FreePool(TmpBuffer); + return Status; + } + + /* Now, shift the ending entries to erase the entry */ + EndEntriesOffset.QuadPart = StartingOffset; + Status = ZwWriteFile(Database, NULL, NULL, NULL, &IoStatusBlock, + TmpBuffer, EndSize, &EndEntriesOffset, NULL); + + FreePool(TmpBuffer); + + return Status; } /* Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte… ============================================================================== --- branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sat Feb 4 22:01:12 2012 @@ -41,7 +41,6 @@ /* * TODO: - * - DeleteRemoteDatabaseEntry * - MountMgrQueryDosVolumePath * - MountMgrQueryDosVolumePaths * - MountMgrQueryVolumePaths

1 0

[tkreuzer] 55421: [FREELDR] - Don't map the low 1 MB into kernel space, it's pointless and leads to inconsistencies between reported memory type and what is found in the page tables. On x86 it work...
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 21:53:09 2012 New Revision: 55421 URL: http://svn.reactos.org/svn/reactos?rev=55421&view=rev Log: [FREELDR] - Don't map the low 1 MB into kernel space, it's pointless and leads to inconsistencies between reported memory type and what is found in the page tables. On x86 it works, because it uses an overcomplicated pfn initialization wih redundent checks. Anyway this memory, containing freeldr and real mode code, was simply wasted. - Silence some debug prints - Fix warnings Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Sat Feb 4 21:53:09 2012 @@ -236,7 +236,7 @@ BOOLEAN WinLdrMapSpecialPages() { - PHARDWARE_PTE PpeBase, PdeBase, PteBase; + PHARDWARE_PTE PpeBase, PdeBase; /* Map the PCR page */ if (!MempMapSinglePage(KIP0PCRADDRESS, PcrBasePage * PAGE_SIZE)) @@ -308,7 +308,7 @@ /* Set the new Gdt */ __lgdt(&GdtDesc.Limit); - DbgPrint("Gdtr.Base = %p, num = %ld\n", GdtDesc.Base, NUM_GDT); + TRACE("Gdtr.Base = %p, num = %ld\n", GdtDesc.Base, NUM_GDT); } @@ -329,7 +329,7 @@ /* Set the new IDT */ __lidt(&IdtDesc.Limit); - DbgPrint("Idtr.Base = %p\n", IdtDesc.Base); + TRACE("Idtr.Base = %p\n", IdtDesc.Base); } Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Feb 4 21:53:09 2012 @@ -91,7 +91,8 @@ CHAR HalPath[] = "\\"; CHAR ArcBoot[256]; CHAR MiscFiles[256]; - ULONG i, PathSeparator; + ULONG i; + ULONG_PTR PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; /* Construct SystemRoot and ArcBoot from SystemPath */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sat Feb 4 21:53:09 2012 @@ -200,7 +200,7 @@ PPAGE_LOOKUP_TABLE_ITEM MemoryMap; ULONG NoEntries; //PKTSS Tss; - BOOLEAN Status; + //BOOLEAN Status; // // Creating a suitable memory map for the Windows can be tricky, so let's @@ -241,7 +241,7 @@ MemoryMapSizeInPages = (NoEntries * sizeof(PAGE_LOOKUP_TABLE_ITEM) + MM_PAGE_SIZE - 1) / MM_PAGE_SIZE; TRACE("Got memory map with %d entries\n", NoEntries); - +#if 0 // Always contiguously map low 1Mb of memory Status = MempSetupPaging(0, 0x100, FALSE); if (!Status) @@ -249,7 +249,7 @@ ERR("Error during MempSetupPaging of low 1Mb\n"); return FALSE; } - +#endif // Construct a good memory map from what we've got, // but mark entries which the memory allocation bitmap takes // as free entries (this is done in order to have the ability @@ -412,4 +412,3 @@ return; } -

1 0

[cgutman] 55420: [PSDK] - Define USBDI_VERSION to 0x500 instead 0x600 because we support none of the Vista APIs so USBD will report the correct version
by cgutman＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: cgutman Date: Sat Feb 4 21:50:44 2012 New Revision: 55420 URL: http://svn.reactos.org/svn/reactos?rev=55420&view=rev Log: [PSDK] - Define USBDI_VERSION to 0x500 instead 0x600 because we support none of the Vista APIs so USBD will report the correct version Modified: branches/usb-bringup-trunk/include/psdk/usb.h Modified: branches/usb-bringup-trunk/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/… ============================================================================== --- branches/usb-bringup-trunk/include/psdk/usb.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/psdk/usb.h [iso-8859-1] Sat Feb 4 21:50:44 2012 @@ -40,7 +40,7 @@ #endif #endif -#define USBDI_VERSION 0x00000600 +#define USBDI_VERSION 0x00000500 #include "usb200.h"

1 0

[spetreolle] 55419: [ADVAPI32] Don't export Vista+, unused and unimplemented APIs. Some apps / tests detect their presence and try to use them.
by spetreolle＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: spetreolle Date: Sat Feb 4 21:42:22 2012 New Revision: 55419 URL: http://svn.reactos.org/svn/reactos?rev=55419&view=rev Log: [ADVAPI32] Don't export Vista+, unused and unimplemented APIs. Some apps / tests detect their presence and try to use them. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Feb 4 21:42:22 2012 @@ -479,8 +479,8 @@ @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyW(long wstr ptr) @ stdcall RegDeleteKeyA(long str) -@ stdcall RegDeleteKeyExA(long str long long) -@ stdcall RegDeleteKeyExW(long wstr long long) +;@ stdcall RegDeleteKeyExA(long str long long) +;@ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) @ stdcall RegDeleteKeyValueA(ptr str str) @ stdcall RegDeleteKeyValueW(ptr wstr wstr)

1 0

[tkreuzer] 55418: [NDK] Fix amd64 definitions of SYNCH_LEVEL, DISPATCH_LENGTH, KINTERRUPT, KTHREAD, KPROCESS, EPROCESS - add MM_SHARED_USER_DATA_VA - Add PsGetProcessSessionId prototype - Remove du...
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 21:16:52 2012 New Revision: 55418 URL: http://svn.reactos.org/svn/reactos?rev=55418&view=rev Log: [NDK] Fix amd64 definitions of SYNCH_LEVEL, DISPATCH_LENGTH, KINTERRUPT, KTHREAD, KPROCESS, EPROCESS - add MM_SHARED_USER_DATA_VA - Add PsGetProcessSessionId prototype - Remove duplicated RtlWow64Get/SetThreadContext prototypes Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/amd64/mmtypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/xdk/generate.bat Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5541… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -1033,7 +1033,11 @@ struct _KWAIT_BLOCK *NextWaitBlock; USHORT WaitKey; UCHAR WaitType; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) volatile UCHAR BlockState; +#else + UCHAR SpareByte; +#endif #if defined(_WIN64) LONG SpareLong; #endif @@ -1875,7 +1879,7 @@ VOID KeLowerIrql(IN KIRQL NewIrql) { - //ASSERT(KeGetCurrentIrql() >= NewIrql); + ASSERT((KIRQL)__readcr8() >= NewIrql); __writecr8(NewIrql); } @@ -1886,7 +1890,7 @@ KIRQL OldIrql; OldIrql = (KIRQL)__readcr8(); - //ASSERT(OldIrql <= NewIrql); + ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; } Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -184,11 +184,7 @@ // // Synchronization-level IRQL // -#ifndef CONFIG_SMP -#define SYNCH_LEVEL DISPATCH_LEVEL -#else -#define SYNCH_LEVEL (IPI_LEVEL - 2) -#endif +#define SYNCH_LEVEL 12 #define NMI_STACK_SIZE 0x2000 Modified: trunk/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -32,6 +32,11 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L + +// +// Address of the shared user page +// +#define MM_SHARED_USER_DATA_VA 0x7FFE0000ULL // // Sanity checks for Paging Macros Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -112,7 +112,9 @@ // // Number of dispatch codes supported by KINTERRUPT // -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#ifdef _M_AMD64 +#define DISPATCH_LENGTH 4 +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) #define DISPATCH_LENGTH 135 #else #define DISPATCH_LENGTH 106 @@ -648,6 +650,10 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONGLONG Rsvd1; #endif +#ifdef _M_AMD64 + PKTRAP_FRAME TrapFrame; + PVOID Reserved; +#endif ULONG DispatchCode[DISPATCH_LENGTH]; } KINTERRUPT; @@ -690,7 +696,7 @@ LIST_ENTRY MutantListHead; #endif PVOID InitialStack; - ULONG_PTR StackLimit; + ULONG_PTR StackLimit; // FIXME: PVOID PVOID KernelStack; KSPIN_LOCK ThreadLock; union @@ -698,7 +704,11 @@ KAPC_STATE ApcState; struct { +#ifdef _M_AMD64 + UCHAR ApcStateFill[43]; // 23 / 43 +#else UCHAR ApcStateFill[23]; +#endif UCHAR ApcQueueable; volatile UCHAR NextProcessor; volatile UCHAR DeferredProcessor; @@ -707,11 +717,13 @@ }; }; KSPIN_LOCK ApcQueueLock; +#ifndef _M_AMD64 ULONG ContextSwitches; volatile UCHAR State; UCHAR NpxState; KIRQL WaitIrql; KPROCESSOR_MODE WaitMode; +#endif LONG_PTR WaitStatus; union { @@ -749,6 +761,7 @@ SINGLE_LIST_ENTRY SwapListEntry; }; PKQUEUE Queue; +#ifndef _M_AMD64 ULONG WaitTime; union { @@ -759,13 +772,14 @@ }; ULONG CombinedApcDisable; }; +#endif struct _TEB *Teb; union { KTIMER Timer; struct { - UCHAR TimerFill[40]; + UCHAR TimerFill[FIELD_OFFSET(KTIMER, Period) + sizeof(LONG)]; // 40 / 60 union { struct @@ -790,7 +804,7 @@ KWAIT_BLOCK WaitBlock[THREAD_WAIT_OBJECTS + 1]; struct { - UCHAR WaitBlockFill0[23]; + UCHAR WaitBlockFill0[FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 32bit = 23, 64bit = 43 #if (NTDDI_VERSION >= NTDDI_LONGHORN) UCHAR IdealProcessor; #else @@ -799,19 +813,52 @@ }; struct { - UCHAR WaitBlockFill1[47]; + UCHAR WaitBlockFill1[1 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 47 / 91 CCHAR PreviousMode; }; struct { - UCHAR WaitBlockFill2[71]; + UCHAR WaitBlockFill2[2 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 71 / 139 UCHAR ResourceIndex; }; struct { - UCHAR WaitBlockFill3[95]; + UCHAR WaitBlockFill3[3 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 95 / 187 UCHAR LargeStack; }; +#ifdef _M_AMD64 + struct + { + UCHAR WaitBlockFill4[FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; + ULONG ContextSwitches; + }; + struct + { + UCHAR WaitBlockFill5[1 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; + UCHAR State; + UCHAR NpxState; + UCHAR WaitIrql; + CHAR WaitMode; + }; + struct + { + UCHAR WaitBlockFill6[2 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; + ULONG WaitTime; + }; + struct + { + UCHAR WaitBlockFill7[3 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; + union + { + struct + { + SHORT KernelApcDisable; + SHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; + }; +#endif }; LIST_ENTRY QueueListEntry; PKTRAP_FRAME TrapFrame; @@ -820,6 +867,9 @@ #endif PVOID CallbackStack; PVOID ServiceTable; +#ifdef _M_AMD64 + ULONG KernelLimit; +#endif UCHAR ApcStateIndex; #if (NTDDI_VERSION < NTDDI_LONGHORN) UCHAR IdealProcessor; @@ -829,6 +879,10 @@ BOOLEAN CalloutActive; #else BOOLEAN ProcessReadyQueue; +#ifdef _M_AMD64 + PVOID Win32kTable; + ULONG Win32kLimit; +#endif BOOLEAN KernelStackResident; #endif SCHAR BasePriority; @@ -847,7 +901,7 @@ KAPC_STATE SavedApcState; struct { - UCHAR SavedApcStateFill[23]; + UCHAR SavedApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; // 23 / 43 CCHAR FreezeCount; CCHAR SuspendCount; UCHAR UserIdealProcessor; @@ -890,7 +944,7 @@ }; struct { - UCHAR SuspendApcFill3[36]; + UCHAR SuspendApcFill3[FIELD_OFFSET(KAPC, SystemArgument1)]; #if (NTDDI_VERSION >= NTDDI_LONGHORN) PKPRCB WaitPrcb; #else @@ -899,12 +953,12 @@ }; struct { - UCHAR SuspendApcFill4[40]; + UCHAR SuspendApcFill4[FIELD_OFFSET(KAPC, SystemArgument2)]; // 40 / 72 PVOID LegoData; }; struct { - UCHAR SuspendApcFill5[47]; + UCHAR SuspendApcFill5[FIELD_OFFSET(KAPC, Inserted) + 1]; // 47 / 83 UCHAR PowerState; ULONG UserTime; }; @@ -914,7 +968,7 @@ KSEMAPHORE SuspendSemaphore; struct { - UCHAR SuspendSemaphorefill[20]; + UCHAR SuspendSemaphorefill[FIELD_OFFSET(KSEMAPHORE, Limit) + 4]; // 20 / 28 ULONG SListFaultCount; }; }; @@ -925,6 +979,14 @@ PVOID SListFaultAddress; #if (NTDDI_VERSION >= NTDDI_LONGHORN) PVOID MdlForLockedteb; +#endif +#ifdef _M_AMD64 + LONG64 ReadOperationCount; + LONG64 WriteOperationCount; + LONG64 OtherOperationCount; + LONG64 ReadTransferCount; + LONG64 WriteTransferCount; + LONG64 OtherTransferCount; #endif } KTHREAD; @@ -947,7 +1009,9 @@ #if defined(_M_IX86) KGDTENTRY LdtDescriptor; KIDTENTRY Int21Descriptor; +#endif USHORT IopmOffset; +#if defined(_M_IX86) UCHAR Iopl; UCHAR Unused; #endif Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -192,9 +192,15 @@ PEPROCESS Process ); -NTKERNELAPI -BOOLEAN -NTAPI +HANDLE +NTAPI +PsGetProcessSessionId( + IN PEPROCESS Process +); + +NTKERNELAPI +BOOLEAN +NTAPI PsGetProcessExitProcessCalled( PEPROCESS Process ); Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -1056,11 +1056,11 @@ EX_RUNDOWN_REF RundownProtect; HANDLE UniqueProcessId; LIST_ENTRY ActiveProcessLinks; - ULONG QuotaUsage[3]; /* 0=PagedPool, 1=NonPagedPool, 2=Pagefile */ - ULONG QuotaPeak[3]; /* ditto */ - ULONG CommitCharge; - ULONG PeakVirtualSize; - ULONG VirtualSize; + SIZE_T QuotaUsage[3]; /* 0=PagedPool, 1=NonPagedPool, 2=Pagefile */ + SIZE_T QuotaPeak[3]; /* ditto */ + SIZE_T CommitCharge; + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; LIST_ENTRY SessionProcessLinks; PVOID DebugPort; #if (NTDDI_VERSION >= NTDDI_LONGHORN) @@ -1075,7 +1075,7 @@ #endif PHANDLE_TABLE ObjectTable; EX_FAST_REF Token; - ULONG WorkingSetPage; + PFN_NUMBER WorkingSetPage; #if (NTDDI_VERSION >= NTDDI_LONGHORN) EX_PUSH_LOCK AddressCreationLock; PETHREAD RotateInProgress; @@ -1084,11 +1084,11 @@ KSPIN_LOCK HyperSpaceLock; #endif PETHREAD ForkInProgress; - ULONG HardwareTrigger; + ULONG_PTR HardwareTrigger; PMM_AVL_TABLE PhysicalVadRoot; PVOID CloneRoot; - ULONG NumberOfPrivatePages; - ULONG NumberOfLockedPages; + PFN_NUMBER NumberOfPrivatePages; + PFN_NUMBER NumberOfLockedPages; PVOID *Win32Process; struct _EJOB *Job; PVOID SectionObject; @@ -1112,7 +1112,7 @@ HARDWARE_PTE PageDirectoryPte; ULONGLONG Filler; }; - ULONG Session; + ULONG Session; // FIXME: PVOID CHAR ImageFileName[16]; LIST_ENTRY JobLinks; PVOID LockedPagesList; @@ -1135,12 +1135,16 @@ LARGE_INTEGER ReadTransferCount; LARGE_INTEGER WriteTransferCount; LARGE_INTEGER OtherTransferCount; - ULONG CommitChargeLimit; - ULONG CommitChargePeak; + SIZE_T CommitChargeLimit; + SIZE_T CommitChargePeak; PVOID AweInfo; SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; MMSUPPORT Vm; +#ifdef _M_AMD64 + ULONG Spares[2]; +#else LIST_ENTRY MmProcessLinks; +#endif ULONG ModifiedPageCount; #if (NTDDI_VERSION >= NTDDI_LONGHORN) union Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -2089,25 +2089,6 @@ PCANSI_STRING String2, BOOLEAN CaseInsensitive ); - -#ifdef _M_X64 -NTSYSAPI -NTSTATUS -NTAPI -RtlWow64GetThreadContext( - IN HANDLE ThreadHandle, - IN OUT PWOW64_CONTEXT ThreadContext -); - - -NTSYSAPI -NTSTATUS -NTAPI -RtlWow64SetThreadContext( - IN HANDLE ThreadHandle, - IN PWOW64_CONTEXT ThreadContext -); -#endif NTSYSAPI BOOLEAN @@ -3907,7 +3888,7 @@ RtlGUIDFromString( IN PUNICODE_STRING GuidString, OUT GUID *Guid); - + NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r… ============================================================================== --- trunk/reactos/include/xdk/generate.bat [iso-8859-1] (original) +++ trunk/reactos/include/xdk/generate.bat [iso-8859-1] Sat Feb 4 21:16:52 2012 @@ -1,6 +1,6 @@ -..\..\output-i386\tools\hpp\hpp.exe wdm.template.h wdm.h -..\..\output-i386\tools\hpp\hpp.exe ntddk.template.h ntddk.h -..\..\output-i386\tools\hpp\hpp.exe ntifs.template.h ntifs.h -..\..\output-i386\tools\hpp\hpp.exe devioctl.template.h devioctl.h +hpp.exe wdm.template.h wdm.h +hpp.exe ntddk.template.h ntddk.h +hpp.exe ntifs.template.h ntifs.h +hpp.exe devioctl.template.h devioctl.h

1 0

[ekohl] 55417: [ADVAPI32] Add or fix parameter checks.
by ekohl＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: ekohl Date: Sat Feb 4 19:56:21 2012 New Revision: 55417 URL: http://svn.reactos.org/svn/reactos?rev=55417&view=rev Log: [ADVAPI32] Add or fix parameter checks. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sat Feb 4 19:56:21 2012 @@ -452,7 +452,7 @@ TRACE("%p, %p\n", hEventLog, NumberOfRecords); - if(!NumberOfRecords) + if (NumberOfRecords == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -497,7 +497,7 @@ TRACE("%p, %p\n", hEventLog, OldestRecord); - if(!OldestRecord) + if (OldestRecord == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -630,16 +630,15 @@ if (lpFileName == NULL) { - RtlInitUnicodeString(&FileNameW, NULL); - } - else - { - if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileNameW, - NULL, NULL)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileNameW, + NULL, NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } RpcTryExcept @@ -802,22 +801,32 @@ { NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; + DWORD dwFlags; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - if(!pnBytesRead || !pnMinNumberOfBytesNeeded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from - trying to access a null pointer */ - if (!lpBuffer) - { - nNumberOfBytesToRead = 0; + if (lpBuffer == NULL || + pnBytesRead == NULL || + pnMinNumberOfBytesNeeded == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); + if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); + if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } RpcTryExcept @@ -872,22 +881,32 @@ { NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; + DWORD dwFlags; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - if(!pnBytesRead || !pnMinNumberOfBytesNeeded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from - trying to access a null pointer */ - if (!lpBuffer) - { - nNumberOfBytesToRead = 0; + if (lpBuffer == NULL || + pnBytesRead == NULL || + pnMinNumberOfBytesNeeded == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); + if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); + if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } RpcTryExcept

1 0

[cgutman] 55416: [USBD] - Add and fix missing exports - Add UNIMPLEMENTED to unimplemented functions - Fix completely broken USBD_GetPdoRegistryParameter (which wasn't even exported because somebod...
by cgutman＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: cgutman Date: Sat Feb 4 18:39:09 2012 New Revision: 55416 URL: http://svn.reactos.org/svn/reactos?rev=55416&view=rev Log: [USBD] - Add and fix missing exports - Add UNIMPLEMENTED to unimplemented functions - Fix completely broken USBD_GetPdoRegistryParameter (which wasn't even exported because somebody made a typo and couldn't figure it out) - My Linksys USB300M driver now loads but it runs into some unimplemented code paths in usbehci Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Sat Feb 4 18:39:09 2012 @@ -102,6 +102,7 @@ PVOID NTAPI USBD_AllocateDeviceName(ULONG Unknown) { + UNIMPLEMENTED return NULL; } @@ -139,6 +140,7 @@ ULONG NTAPI USBD_Dispatch(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4) { + UNIMPLEMENTED return 1; } @@ -148,6 +150,7 @@ VOID NTAPI USBD_FreeDeviceMutex(PVOID Unknown) { + UNIMPLEMENTED } /* @@ -156,6 +159,7 @@ VOID NTAPI USBD_FreeDeviceName(PVOID Unknown) { + UNIMPLEMENTED } /* @@ -164,6 +168,7 @@ VOID NTAPI USBD_WaitDeviceMutex(PVOID Unknown) { + UNIMPLEMENTED } /* @@ -172,6 +177,7 @@ ULONG NTAPI USBD_GetSuspendPowerState(ULONG Unknown1) { + UNIMPLEMENTED return 0; } @@ -182,6 +188,7 @@ USBD_InitializeDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4, ULONG Unknown5, ULONG Unknown6) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -193,6 +200,7 @@ ULONG Unknown4, ULONG Unknown5, ULONG Unknown6, ULONG Unknown7, ULONG Unknown8, ULONG Unknown9, ULONG Unknown10) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -202,6 +210,7 @@ NTSTATUS NTAPI USBD_GetDeviceInformation(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -212,6 +221,7 @@ USBD_CreateDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4, ULONG Unknown5) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -221,6 +231,7 @@ NTSTATUS NTAPI USBD_RemoveDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -230,6 +241,7 @@ VOID NTAPI USBD_CompleteRequest(ULONG Unknown1, ULONG Unknown2) { + UNIMPLEMENTED } /* @@ -241,6 +253,7 @@ PDEVICE_OBJECT FilterDeviceObject ) { + UNIMPLEMENTED } /* @@ -249,6 +262,7 @@ VOID NTAPI USBD_SetSuspendPowerState(ULONG Unknown1, ULONG Unknown2) { + UNIMPLEMENTED } /* @@ -257,6 +271,7 @@ NTSTATUS NTAPI USBD_MakePdoName(ULONG Unknown1, ULONG Unknown2) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -269,6 +284,7 @@ PULONG CurrentFrame ) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -283,7 +299,7 @@ if (Version != NULL) { Version->USBDI_Version = USBDI_VERSION; - Version->Supported_USB_Version = 0x100; + Version->Supported_USB_Version = 0x200; } } @@ -293,6 +309,7 @@ NTSTATUS NTAPI USBD_RestoreDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) { + UNIMPLEMENTED return STATUS_NOT_SUPPORTED; } @@ -303,6 +320,7 @@ USBD_RegisterHcDeviceCapabilities(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) { + UNIMPLEMENTED } /* @@ -586,28 +604,58 @@ NTSTATUS Status; HANDLE DevInstRegKey; + /* Open the device key */ Status = IoOpenDeviceRegistryKey(PhysicalDeviceObject, - PLUGPLAY_REGKEY_DRIVER, STANDARD_RIGHTS_ALL, &DevInstRegKey); + PLUGPLAY_REGKEY_DEVICE, STANDARD_RIGHTS_ALL, &DevInstRegKey); if (NT_SUCCESS(Status)) { - PKEY_VALUE_FULL_INFORMATION FullInfo; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo; UNICODE_STRING ValueName; ULONG Length; - RtlInitUnicodeString(&ValueName, KeyName); - Length = ParameterLength + KeyNameLength + sizeof(KEY_VALUE_FULL_INFORMATION); - FullInfo = ExAllocatePool(PagedPool, Length); - if (FullInfo) + /* Initialize the unicode string based on caller data */ + ValueName.Buffer = KeyName; + ValueName.Length = ValueName.MaximumLength = KeyNameLength; + + Length = ParameterLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION); + PartialInfo = ExAllocatePool(PagedPool, Length); + if (PartialInfo) { Status = ZwQueryValueKey(DevInstRegKey, &ValueName, - KeyValueFullInformation, FullInfo, Length, &Length); + KeyValuePartialInformation, PartialInfo, Length, &Length); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + /* The caller doesn't want all the data */ + ExFreePool(PartialInfo); + PartialInfo = ExAllocatePool(PagedPool, Length); + if (PartialInfo) + { + Status = ZwQueryValueKey(DevInstRegKey, &ValueName, + KeyValuePartialInformation, PartialInfo, Length, &Length); + } + else + { + Status = STATUS_NO_MEMORY; + } + } + if (NT_SUCCESS(Status)) { + /* Compute the length to copy back */ + if (ParameterLength < PartialInfo->DataLength) + Length = ParameterLength; + else + Length = PartialInfo->DataLength; + RtlCopyMemory(Parameter, - ((PUCHAR)FullInfo) + FullInfo->DataOffset, - ParameterLength /*FullInfo->DataLength*/); + PartialInfo->Data, + Length); } - ExFreePool(FullInfo); + + if (PartialInfo) + { + ExFreePool(PartialInfo); + } } else Status = STATUS_NO_MEMORY; ZwClose(DevInstRegKey); Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec [iso-8859-1] Sat Feb 4 18:39:09 2012 @@ -1,5 +1,6 @@ @ stdcall USBD_Debug_GetHeap(long long long long) @ stdcall USBD_Debug_RetHeap(ptr long long) +@ stdcall USBD_Debug_LogEntry(ptr ptr ptr ptr) @ stdcall USBD_CalculateUsbBandwidth(long long long) @ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) @ stdcall USBD_CreateConfigurationRequest(ptr ptr) @@ -7,4 +8,6 @@ @ stdcall USBD_ParseConfigurationDescriptor(ptr long long) @ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) @ stdcall USBD_ParseDescriptors(ptr long ptr long) -;USBD_GetPdoRegistryParameters +@ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long) +@ stdcall USBD_GetUSBDIVersion(ptr) +@ stdcall USBD_QueryBusTime(ptr ptr)

1 0

[tkreuzer] 55415: [RTL] - Fix RtlLengthSecurityDescriptor - Implement amd64 version of Implement RtlInitializeContext - Add unwind info to amd64 debug asm functions - Fix 64 bit HEAP_COMMON_ENTRY s...
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 18:35:56 2012 New Revision: 55415 URL: http://svn.reactos.org/svn/reactos?rev=55415&view=rev Log: [RTL] - Fix RtlLengthSecurityDescriptor - Implement amd64 version of Implement RtlInitializeContext - Add unwind info to amd64 debug asm functions - Fix 64 bit HEAP_COMMON_ENTRY structure The resulting version doesn't exactly match the original windows one, but its compatible, as every field, except the dummy fields - which are omitted - is at its correct position. Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S trunk/reactos/lib/rtl/amd64/stubs.c trunk/reactos/lib/rtl/heap.h Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/debug_asm.S?… ============================================================================== --- trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Sat Feb 4 18:35:56 2012 @@ -22,20 +22,31 @@ .code64 -DbgBreakPointNoBugCheck: +.PROC DbgBreakPointNoBugCheck + .endprolog int 3 ret +.ENDP -DbgBreakPoint: DbgUserBreakPoint: +.PROC DbgBreakPoint + .endprolog int 3 ret +.ENDP -DbgBreakPointWithStatus: +.PROC DbgBreakPointWithStatus + .endprolog mov eax, ecx -RtlpBreakWithStatusInstruction: int 3 ret +.ENDP + +.PROC RtlpBreakWithStatusInstruction + .endprolog + int 3 + ret +.ENDP DebugService2: ret Modified: trunk/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/stubs.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Sat Feb 4 18:35:56 2012 @@ -11,6 +11,7 @@ #include <rtl.h> #define NDEBUG #include <debug.h> +#include "amd64/ketypes.h" /* PUBLIC FUNCTIONS **********************************************************/ @@ -23,9 +24,60 @@ OUT PCONTEXT ThreadContext, IN PVOID ThreadStartParam OPTIONAL, IN PTHREAD_START_ROUTINE ThreadStartAddress, - IN PINITIAL_TEB InitialTeb) + IN PINITIAL_TEB StackBase) { - UNIMPLEMENTED; + + ThreadContext->Rax = 0; + ThreadContext->Rbx = 0; + ThreadContext->Rcx = (ULONG64)ThreadStartParam; + ThreadContext->Rdx = 0; + ThreadContext->Rsi = 0; + ThreadContext->Rdi = 0; + ThreadContext->Rbp = 0; + ThreadContext->R8 = 0; + ThreadContext->R9 = 0; + ThreadContext->R10 = 0; + ThreadContext->R11 = 0; + ThreadContext->R12 = 0; + + /* Set the Selectors */ + if ((LONG64)ThreadStartAddress < 0) + { + /* Initialize kernel mode segments */ + ThreadContext->SegCs = KGDT64_R0_CODE; + ThreadContext->SegDs = KGDT64_R3_DATA; + ThreadContext->SegEs = KGDT64_R3_DATA; + ThreadContext->SegFs = KGDT64_R3_CMTEB; + ThreadContext->SegGs = KGDT64_R3_DATA; + ThreadContext->SegSs = KGDT64_R0_DATA; + } + else + { + /* Initialize user mode segments */ + ThreadContext->SegCs = KGDT64_R3_CODE | RPL_MASK; + ThreadContext->SegDs = KGDT64_R3_DATA | RPL_MASK; + ThreadContext->SegEs = KGDT64_R3_DATA | RPL_MASK; + ThreadContext->SegFs = KGDT64_R3_CMTEB | RPL_MASK; + ThreadContext->SegGs = KGDT64_R3_DATA | RPL_MASK; + ThreadContext->SegSs = KGDT64_R3_DATA | RPL_MASK; + } + + /* Enable Interrupts */ + ThreadContext->EFlags = EFLAGS_INTERRUPT_MASK; + + /* Settings passed */ + ThreadContext->Rip = (ULONG64)ThreadStartAddress; + ThreadContext->Rsp = (ULONG64)StackBase - 6 * sizeof(PVOID); + + /* Align stack by 16 and substract 8 (unaligned on function entry) */ + ThreadContext->Rsp &= ~15; + ThreadContext->Rsp -= 8; + + /* Only the basic Context is initialized */ + ThreadContext->ContextFlags = CONTEXT_CONTROL | + CONTEXT_INTEGER | + CONTEXT_SEGMENTS; + return; } Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=55415&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sat Feb 4 18:35:56 2012 @@ -78,6 +78,9 @@ /* Heap structures */ struct _HEAP_COMMON_ENTRY { +#ifdef _M_AMD64 + PVOID PreviousBlockPrivateData; +#endif union { struct @@ -88,7 +91,11 @@ }; struct { +#ifndef _M_AMD64 PVOID SubSegmentCode; +#else + ULONG SubSegmentCodeDummy; +#endif USHORT PreviousSize; union {

1 0

[tkreuzer] 55414: [NTDLL] - Implement amd64 version of LdrInitializeThunk and KiUserApcDispatcher - Export ExpInterlockedPopEntrySList* on amd64, too - Fix some 64 bit issues
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 18:25:25 2012 New Revision: 55414 URL: http://svn.reactos.org/svn/reactos?rev=55414&view=rev Log: [NTDLL] - Implement amd64 version of LdrInitializeThunk and KiUserApcDispatcher - Export ExpInterlockedPopEntrySList* on amd64, too - Fix some 64 bit issues Added: trunk/reactos/dll/ntdll/dispatch/amd64/dispatch.S (with props) Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Feb 4 18:25:25 2012 @@ -27,7 +27,7 @@ if(ARCH MATCHES i386) list(APPEND SOURCE dispatch/i386/dispatch.S) elseif(ARCH MATCHES amd64) - list(APPEND SOURCE dispatch/amd64/stubs.c) + list(APPEND SOURCE dispatch/amd64/dispatch.S) elseif(ARCH MATCHES arm) list(APPEND SOURCE dispatch/arm/stubs_asm.s) else() Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Feb 4 18:25:25 2012 @@ -60,9 +60,9 @@ @ stdcall -arch=i386 KiFastSystemCall() @ stdcall -arch=i386 KiFastSystemCallRet() @ stdcall -arch=i386 KiIntSystemCall() -@ stdcall -arch=i386 ExpInterlockedPopEntrySListEnd() -@ stdcall -arch=i386 ExpInterlockedPopEntrySListFault() -@ stdcall -arch=i386 ExpInterlockedPopEntrySListResume() +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListEnd() +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListFault() +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListResume() @ stdcall KiRaiseUserExceptionDispatcher() @ stdcall KiUserApcDispatcher(ptr ptr ptr ptr) @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME Added: trunk/reactos/dll/ntdll/dispatch/amd64/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/amd64/d… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/amd64/dispatch.S (added) +++ trunk/reactos/dll/ntdll/dispatch/amd64/dispatch.S [iso-8859-1] Sat Feb 4 18:25:25 2012 @@ -1,0 +1,75 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntdll/dispatch/amd64/dispatch.S + * PURPOSE: Usermode dispatcher stubs + * + * PROGRAMMER: Timo kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> +#include <ksamd64.inc> + +EXTERN NtContinue:PROC +EXTERN LdrpInit:PROC + +.code + +PUBLIC LdrInitializeThunk +.PROC LdrInitializeThunk + mov rbp, 0 + .setframe rbp, 0 + .endprolog + + /* First parameter is the APC context */ + mov rcx, r9 + jmp LdrpInit + +.ENDP + +PUBLIC KiUserApcDispatcher +.PROC KiUserApcDispatcher + .endprolog + /* We enter with a 16 byte aligned stack */ + + mov rcx, [rsp + CONTEXT_P1Home] /* NormalContext */ + mov rdx, [rsp + CONTEXT_P2Home] /* SystemArgument1 */ + mov r8, [rsp + CONTEXT_P3Home] /* SystemArgument2 */ + lea r9, [rsp] /* Context */ + call qword ptr [rsp + CONTEXT_P4Home] /* NormalRoutine */ + + /* NtContinue(Context, TRUE); */ + lea rcx, [rsp] + mov dl, 1 + call NtContinue + + nop + int 3 +.ENDP + + +PUBLIC KiRaiseUserExceptionDispatcher +.PROC KiRaiseUserExceptionDispatcher + .endprolog + int 3 + +.ENDP + +PUBLIC KiUserCallbackDispatcher +.PROC KiUserCallbackDispatcher + .endprolog + int 3 + +.ENDP + +PUBLIC KiUserExceptionDispatcher +.PROC KiUserExceptionDispatcher + .endprolog + int 3 + +.ENDP + +END + Propchange: trunk/reactos/dll/ntdll/dispatch/amd64/dispatch.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Feb 4 18:25:25 2012 @@ -124,7 +124,7 @@ /* Setup the object attributes */ InitializeObjectAttributes(&ObjectAttributes, - Wow64 ? + Wow64 ? &Wow64OptionsString : &ImageExecOptionsString, OBJ_CASE_INSENSITIVE, NULL, @@ -441,7 +441,7 @@ { PULONG_PTR Cookie; LARGE_INTEGER Counter; - ULONG NewCookie; + ULONG_PTR NewCookie; /* Fetch address of the cookie */ Cookie = LdrpFetchAddressOfSecurityCookie(LdrEntry->DllBase, LdrEntry->SizeOfImage); @@ -536,7 +536,7 @@ EntryPoint = LdrEntry->EntryPoint; /* Check if we are ready to call it */ - if ((EntryPoint) && + if ((EntryPoint) && (LdrEntry->Flags & LDRP_PROCESS_ATTACH_CALLED) && (LdrEntry->Flags & LDRP_IMAGE_DLL)) { @@ -939,7 +939,7 @@ EntryPoint = LdrEntry->EntryPoint; /* Check if we are ready to call it */ - if (EntryPoint && + if (EntryPoint && (LdrEntry->Flags & LDRP_PROCESS_ATTACH_CALLED) && LdrEntry->Flags) { @@ -1212,7 +1212,7 @@ PTEB Teb = NtCurrentTeb(); PLIST_ENTRY NextEntry, ListHead; PLDRP_TLS_DATA TlsData; - ULONG TlsDataSize; + SIZE_T TlsDataSize; PVOID *TlsVector; /* Check if we have any entries */ @@ -1236,7 +1236,7 @@ NextEntry = NextEntry->Flink; /* Allocate this vector */ - TlsDataSize = TlsData->TlsDirectory.EndAddressOfRawData - + TlsDataSize = TlsData->TlsDirectory.EndAddressOfRawData - TlsData->TlsDirectory.StartAddressOfRawData; TlsVector[TlsData->TlsDirectory.Characteristics] = RtlAllocateHeap(RtlGetProcessHeap(), 0,

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