Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[sginsberg] 56333: - Even while I love having the trap/fpu/context code in C, the bugs this switch introduced continue to amaze me. This time, fix a bug from 45156 when KiFlushNPXState was rewritte...
by sginsberg＠svn.reactos.org 06 Apr '12

06 Apr '12

Author: sginsberg Date: Fri Apr 6 20:13:33 2012 New Revision: 56333 URL: http://svn.reactos.org/svn/reactos?rev=56333&view=rev Log: - Even while I love having the trap/fpu/context code in C, the bugs this switch introduced continue to amaze me. This time, fix a bug from 45156 when KiFlushNPXState was rewritten in C. The C version could miss to restore the interrupt state, which would lead to interrupts being disabled when it was not expected. This "interrupt leak" was seen in the page fault handler if a page fault occurred after interrupts had been disabled (which had sometimes been observed to occur on the test server during exception handling and thread creation when KiFlushNPXState had been called). This didn't completely hang the system because during thread creation (and other system calls where this may have happened) interrupts would be re-enabled when returning to user mode when restoring eflags, and the exception handling would result in a system call which would enable interrupts again (it appears exception handler would have run with interrupts disabled, though!). This is now fixed, as well as any other issues this might have caused. The hack in the page fault handler remains until another issue has been fixed. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Apr 6 20:13:33 2012 @@ -1323,7 +1323,12 @@ if (Thread->NpxState != NPX_STATE_LOADED) { /* If there's nothing to load, quit */ - if (!SaveArea) return; + if (!SaveArea) + { + /* Restore interrupt state and return */ + __writeeflags(EFlags); + return; + } /* Need FXSR support for this */ ASSERT(KeI386FxsrPresent == TRUE);

1 0

[ekohl] 56332: [RTL] Implement RtlCreateBootStatusDataFile, RtlGetSetBootStatusData, RtlLockBootStatusData and RtlUnlockBootStatusData. [SYSSETUP] Call RtlCreateBootStatusDataFile as part of the in...
by ekohl＠svn.reactos.org 06 Apr '12

06 Apr '12

Author: ekohl Date: Fri Apr 6 18:25:18 2012 New Revision: 56332 URL: http://svn.reactos.org/svn/reactos?rev=56332&view=rev Log: [RTL] Implement RtlCreateBootStatusDataFile, RtlGetSetBootStatusData, RtlLockBootStatusData and RtlUnlockBootStatusData. [SYSSETUP] Call RtlCreateBootStatusDataFile as part of the install process. Modified: trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Apr 6 18:25:18 2012 @@ -1750,6 +1750,9 @@ SetupTermDefaultQueueCallback(RegistrationData->DefaultContext); HeapFree(GetProcessHeap(), 0, RegistrationData); + // FIXME: Move this call to a separate cleanup page! + RtlCreateBootStatusDataFile(); + return 0; } @@ -2051,6 +2054,8 @@ return FALSE; } + + BOOL ProcessUnattendInf(HINF hUnattendedInf) { @@ -2260,8 +2265,9 @@ return FALSE; } + VOID -ProcessUnattendSetup() +ProcessUnattendSetup(VOID) { WCHAR szPath[MAX_PATH]; HINF hUnattendedInf; @@ -2311,7 +2317,6 @@ ZeroMemory(&SetupData, sizeof(SETUPDATA)); ProcessUnattendSetup(); - /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE); Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=563… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Fri Apr 6 18:25:18 2012 @@ -12,9 +12,17 @@ #define NDEBUG #include <debug.h> +typedef struct _RTL_BSD_ITEM +{ + ULONG Offset; + ULONG Size; +} RTL_BSD_ITEM, *PRTL_BSD_ITEM; + /* FUNCTIONS *****************************************************************/ static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; + +static RTL_BSD_ITEM BsdItemTable[6] = {{0, 4}, {4, 4,}, {8, 1}, {9, 1}, {10, 1}, {11, 1}}; static NTSTATUS RtlpSysVolCreateSecurityDescriptor(OUT PISECURITY_DESCRIPTOR *SecurityDescriptor, @@ -671,52 +679,187 @@ } /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI RtlCreateBootStatusDataFile(VOID) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER ByteOffset; + UNICODE_STRING FileName; + HANDLE FileHandle; + NTSTATUS Status; + + /* Initialize the file name */ + RtlInitUnicodeString(&FileName, + L"\\SystemRoot\\bootstat.dat"); + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + AllocationSize.QuadPart = 0x800; + + /* Create the boot status data file */ + Status = ZwCreateFile(&FileHandle, + FILE_GENERIC_READ | FILE_GENERIC_WRITE, + &ObjectAttributes, + &IoStatusBlock, + NULL, //&AllocationSize, + FILE_ATTRIBUTE_SYSTEM, + 0, + FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + // FIXME: Initialize the buffer in a better way. + UCHAR Buffer[12] = {0xC,0,0,0, 1,0,0,0, 1, 0x1e, 1, 0}; + + ByteOffset.QuadPart = 0; + Status = ZwWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &Buffer, + 12, //BufferSize, + &ByteOffset, + NULL); + } + + /* Close the file */ + ZwClose(FileHandle); + + return Status; } /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI -RtlGetSetBootStatusData(IN HANDLE Filehandle, +RtlGetSetBootStatusData(IN HANDLE FileHandle, IN BOOLEAN WriteMode, IN RTL_BSD_ITEM_TYPE DataClass, IN PVOID Buffer, IN ULONG BufferSize, OUT PULONG ReturnLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + LARGE_INTEGER ByteOffset; + NTSTATUS Status; + + DPRINT("RtlGetSetBootStatusData (%p %u %u %p %lu %p)\n", + FileHandle, WriteMode, DataClass, Buffer, BufferSize, ReturnLength); + + if (DataClass >= RtlBsdItemMax) + return STATUS_INVALID_PARAMETER; + + if (BufferSize > BsdItemTable[DataClass].Size) + return STATUS_BUFFER_TOO_SMALL; + + ByteOffset.HighPart = 0; + ByteOffset.LowPart = BsdItemTable[DataClass].Offset; + + if (WriteMode) + { + Status = ZwReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + BufferSize, + &ByteOffset, + NULL); + } + else + { + Status = ZwWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + BufferSize, + &ByteOffset, + NULL); + } + + if (NT_SUCCESS(Status)) + { + if (ReturnLength) + *ReturnLength = BsdItemTable[DataClass].Size; + } + + return Status; } /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI -RtlLockBootStatusData(OUT PHANDLE Filehandle) +RtlLockBootStatusData(OUT PHANDLE FileHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING FileName; + HANDLE LocalFileHandle; + NTSTATUS Status; + + /* Intialize the file handle */ + *FileHandle = NULL; + + /* Initialize the file name */ + RtlInitUnicodeString(&FileName, + L"\\SystemRoot\\bootstat.dat"); + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + 0, + NULL, + NULL); + + /* Open the boot status data file */ + Status = ZwOpenFile(&LocalFileHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (NT_SUCCESS(Status)) + { + /* Return the file handle */ + *FileHandle = LocalFileHandle; + } + + return Status; } /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI -RtlUnlockBootStatusData(IN HANDLE Filehandle) +RtlUnlockBootStatusData(IN HANDLE FileHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + + /* Flush the file and close it */ + ZwFlushBuffersFile(FileHandle, + &IoStatusBlock); + + return ZwClose(FileHandle); } /* EOF */

1 0

[cgutman] 56331: [TCPIP] - Fix a crash when a NIC driver indicates the media state before we're expecting it - Fixes bug 6895
by cgutman＠svn.reactos.org 06 Apr '12

06 Apr '12

Author: cgutman Date: Fri Apr 6 16:08:20 2012 New Revision: 56331 URL: http://svn.reactos.org/svn/reactos?rev=56331&view=rev Log: [TCPIP] - Fix a crash when a NIC driver indicates the media state before we're expecting it - Fixes bug 6895 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Apr 6 16:08:20 2012 @@ -810,6 +810,10 @@ PRECONFIGURE_CONTEXT Context; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + /* Ignore the status indication if we have no context yet. We'll get another later */ + if (!Adapter->Context) + return; Context = ExAllocatePool(NonPagedPool, sizeof(RECONFIGURE_CONTEXT)); if (!Context) @@ -1302,6 +1306,7 @@ LLIP_BIND_INFO BindInfo; ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; + NDIS_MEDIA_STATE MediaState; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); @@ -1384,12 +1389,30 @@ sizeof(UINT)); if (NdisStatus != NDIS_STATUS_SUCCESS) return FALSE; - + /* Register interface with IP layer */ IPRegisterInterface(IF); - /* Set adapter state */ + /* Store adapter context */ Adapter->Context = IF; + + /* Get the media state */ + NdisStatus = NDISCall(Adapter, + NdisRequestQueryInformation, + OID_GEN_MEDIA_CONNECT_STATUS, + &MediaState, + sizeof(MediaState)); + if (NdisStatus != NDIS_STATUS_SUCCESS) { + TI_DbgPrint(DEBUG_DATALINK, ("Could not query media status (0x%X).\n", NdisStatus)); + IPUnregisterInterface(IF); + IPDestroyInterface(IF); + return FALSE; + } + + /* Indicate the current media state */ + ProtocolStatus(Adapter, + (MediaState == NdisMediaStateConnected) ? NDIS_STATUS_MEDIA_CONNECT : NDIS_STATUS_MEDIA_DISCONNECT, + NULL, 0); /* Set packet filter so we can send and receive packets */ NdisStatus = NDISCall(Adapter, @@ -1404,9 +1427,6 @@ IPDestroyInterface(IF); return FALSE; } - - /* Indicate media connect (our drivers are broken and don't do this) */ - ProtocolStatus(Adapter, NDIS_STATUS_MEDIA_CONNECT, NULL, 0); return TRUE; }

1 0

[tkreuzer] 56330: [CSRSRV/CSRSRV2] Hard error parameters are ULONG_PTR, no need to truncate them
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 15:02:51 2012 New Revision: 56330 URL: http://svn.reactos.org/svn/reactos?rev=56330&view=rev Log: [CSRSRV/CSRSRV2] Hard error parameters are ULONG_PTR, no need to truncate them Modified: trunk/reactos/subsystems/csr/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c Modified: trunk/reactos/subsystems/csr/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/serv… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] Tue Apr 3 15:02:51 2012 @@ -662,10 +662,10 @@ RtlInitUnicodeString(&ErrorSource, L"Windows SubSystem"); /* Set the parameters */ - ErrorParameters[0] = PtrToUlong(&ErrorSource); + ErrorParameters[0] = (ULONG_PTR)&ErrorSource; ErrorParameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode; - ErrorParameters[2] = PtrToUlong(ExceptionInfo->ExceptionRecord->ExceptionAddress); - ErrorParameters[3] = PtrToUlong(ExceptionInfo->ContextRecord); + ErrorParameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; + ErrorParameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; /* Bugcheck */ Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Tue Apr 3 15:02:51 2012 @@ -226,7 +226,7 @@ /* No, save the pointer to its shared section in our list */ CsrSrvSharedStaticServerData[ServerDll->ServerId] = ServerDll->SharedSection; } - + /* ReactOS Specific hax */ if (ServerDll->HighestApiSupported == 0xDEADBABE) { @@ -673,10 +673,10 @@ RtlInitUnicodeString(&ErrorSource, L"Windows SubSystem"); /* Set the parameters */ - ErrorParameters[0] = PtrToUlong(&ErrorSource); + ErrorParameters[0] = (ULONG_PTR)&ErrorSource; ErrorParameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode; - ErrorParameters[2] = PtrToUlong(ExceptionInfo->ExceptionRecord->ExceptionAddress); - ErrorParameters[3] = PtrToUlong(ExceptionInfo->ContextRecord); + ErrorParameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; + ErrorParameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; /* Bugcheck */ Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED,

1 0

[tkreuzer] 56329: {PORTCLS] forgot this one
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 14:56:58 2012 New Revision: 56329 URL: http://svn.reactos.org/svn/reactos?rev=56329&view=rev Log: {PORTCLS] forgot this one Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Tue Apr 3 14:56:58 2012 @@ -151,7 +151,7 @@ DPRINT("CDmaChannelInit_CopyTo: this %p Destination %p Source %p ByteCount %u\n", this, Destination, Source, ByteCount); RtlCopyMemory(Destination, Source, ByteCount); } - + VOID NTAPI CDmaChannelInit::FreeBuffer() @@ -217,7 +217,7 @@ PHYSICAL_ADDRESS Result; Address->QuadPart = m_Address.QuadPart; - Result.QuadPart = (PtrToUlong(Address)); + Result.QuadPart = (ULONG_PTR)Address; return Result; } @@ -365,7 +365,7 @@ if (!m_DmaStarted) return STATUS_SUCCESS; - m_pAdapter->DmaOperations->FlushAdapterBuffers(m_pAdapter, + m_pAdapter->DmaOperations->FlushAdapterBuffers(m_pAdapter, m_Mdl, m_MapRegisterBase, (PVOID)((ULONG_PTR)m_Mdl->StartVa + m_Mdl->ByteOffset),

1 0

[tkreuzer] 56328: {PORTCLS] Fix more PtrToUlong fun
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 14:54:51 2012 New Revision: 56328 URL: http://svn.reactos.org/svn/reactos?rev=56328&view=rev Log: {PORTCLS] Fix more PtrToUlong fun Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] Tue Apr 3 14:54:51 2012 @@ -165,7 +165,7 @@ Addr = MmGetPhysicalAddress(Buffer); Address->QuadPart = Addr.QuadPart; - Result.QuadPart = (PtrToUlong(Address)); + Result.QuadPart = (ULONG_PTR)Address; return Result; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Tue Apr 3 14:54:51 2012 @@ -134,7 +134,7 @@ IoStatus->Information = Length; break; } - DataRange = (PKSDATARANGE) UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); + DataRange = (PKSDATARANGE)((PUCHAR)DataRange + DataRange->FormatSize); } IoStatus->Status = Status; @@ -230,7 +230,7 @@ // get current irp stack IoStack = IoGetCurrentIrpStackLocation(Irp); - // get dispatch context + // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; // Get the IrpTarget

1 0

[cgutman] 56327: [LIBUSB] - Fix broken pointer arithmetic
by cgutman＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: cgutman Date: Tue Apr 3 14:52:18 2012 New Revision: 56327 URL: http://svn.reactos.org/svn/reactos?rev=56327&view=rev Log: [LIBUSB] - Fix broken pointer arithmetic Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Tue Apr 3 14:52:18 2012 @@ -1124,7 +1124,7 @@ } // move offset - InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)PtrToUlong(InterfaceInfo) + InterfaceInfo->Length); + InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((PUCHAR)InterfaceInfo + InterfaceInfo->Length); } //

1 0

[tkreuzer] 56326: [PORTCLS] Fix broken "pointer arithmetics"
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 14:43:52 2012 New Revision: 56326 URL: http://svn.reactos.org/svn/reactos?rev=56326&view=rev Log: [PORTCLS] Fix broken "pointer arithmetics" Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] Tue Apr 3 14:43:52 2012 @@ -161,7 +161,7 @@ return RtlConvertUlongToLargeInteger(0); } - Buffer = (PVOID)UlongToPtr(PtrToUlong(MmGetSystemAddressForMdlSafe(MemoryDescriptorList, LowPagePriority)) + Index * PAGE_SIZE); + Buffer = (PUCHAR)MmGetSystemAddressForMdlSafe(MemoryDescriptorList, LowPagePriority) + (Index * PAGE_SIZE); Addr = MmGetPhysicalAddress(Buffer); Address->QuadPart = Addr.QuadPart;

1 0

[tkreuzer] 56325: [KS] Fix misuse of UlongToPtr
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 14:31:15 2012 New Revision: 56325 URL: http://svn.reactos.org/svn/reactos?rev=56325&view=rev Log: [KS] Fix misuse of UlongToPtr Modified: trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Apr 3 14:31:15 2012 @@ -877,7 +877,7 @@ break; } - DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); + DataRange = (PKSDATARANGE)((PUCHAR)DataRange + DataRange->FormatSize); /* FIXME make sure its 64 bit aligned */ ASSERT(((ULONG_PTR)DataRange & 0x7) == 0); }

1 0

[tkreuzer] 56324: [NTOSKRNL] Don't truncate pointers to 32 bits in pushlock code
by tkreuzer＠svn.reactos.org 03 Apr '12

03 Apr '12

Author: tkreuzer Date: Tue Apr 3 13:27:45 2012 New Revision: 56324 URL: http://svn.reactos.org/svn/reactos?rev=56324&view=rev Log: [NTOSKRNL] Don't truncate pointers to 32 bits in pushlock code Modified: trunk/reactos/ntoskrnl/ex/pushlock.c Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Tue Apr 3 13:27:45 2012 @@ -245,11 +245,11 @@ ExfWakePushLock(PushLock, OldValue); break; } - + /* Get the wait block */ WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); - + /* Loop the blocks */ FirstWaitBlock = WaitBlock; while (TRUE) @@ -262,32 +262,32 @@ FirstWaitBlock->Last = LastWaitBlock; break; } - + /* Save the block */ PreviousWaitBlock = WaitBlock; - + /* Get the next block */ WaitBlock = WaitBlock->Next; - + /* Save the previous */ WaitBlock->Previous = PreviousWaitBlock; } - + /* Remove the wake bit */ NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; - + /* Sanity checks */ ASSERT(NewValue.Locked); ASSERT(!NewValue.Waking); - + /* Update the value */ NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); - + /* If we updated correctly, leave */ if (NewValue.Value == OldValue.Value) break; - + /* Update value */ OldValue = NewValue; } @@ -523,7 +523,7 @@ EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAKING | EX_PUSH_LOCK_WAITING | - PtrToUlong(WaitBlock); + (ULONG_PTR)WaitBlock; /* Check if the pushlock was already waking */ if (!OldValue.Waking) NeedWake = TRUE; @@ -543,7 +543,7 @@ NewValue.Value = EX_PUSH_LOCK_MULTIPLE_SHARED | EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(WaitBlock); + (ULONG_PTR)WaitBlock; } else { @@ -553,7 +553,7 @@ /* Point to our wait block */ NewValue.Value = EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(WaitBlock); + (ULONG_PTR)WaitBlock; } } @@ -706,7 +706,7 @@ EX_PUSH_LOCK_LOCK)) | EX_PUSH_LOCK_WAKING | EX_PUSH_LOCK_WAITING | - PtrToUlong(WaitBlock); + (ULONG_PTR)WaitBlock; /* Check if the pushlock was already waking */ if (!OldValue.Waking) NeedWake = TRUE; @@ -719,7 +719,7 @@ /* Point to our wait block */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_PTR_BITS) | EX_PUSH_LOCK_WAITING | - PtrToUlong(WaitBlock); + (ULONG_PTR)WaitBlock; } /* Sanity check */ @@ -812,7 +812,7 @@ /* Sanity check */ ASSERT(OldValue.Locked); - + /* Start main loop */ while (TRUE) { @@ -849,13 +849,13 @@ /* Get the wait block */ WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); - + /* Loop until we find the last wait block */ while (TRUE) { /* Get the last wait block */ LastWaitBlock = WaitBlock->Last; - + /* Did it exist? */ if (LastWaitBlock) { @@ -863,22 +863,22 @@ WaitBlock = LastWaitBlock; break; } - + /* Keep searching */ WaitBlock = WaitBlock->Next; } - + /* Make sure the Share Count is above 0 */ if (WaitBlock->ShareCount > 0) { /* This shouldn't be an exclusive wait block */ ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); - + /* Do the decrease and check if the lock isn't shared anymore */ if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } } - + /* * If nobody was waiting on the block, then we possibly reduced the number * of times the pushlock was shared, and we unlocked it. @@ -895,10 +895,10 @@ NewValue.Value = OldValue.Value; NewValue.MultipleShared = FALSE; NewValue.Locked = FALSE; - + /* Sanity check */ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); - + /* Write the new value */ NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, @@ -911,20 +911,20 @@ NewValue.Value = OldValue.Value; NewValue.MultipleShared = FALSE; NewValue.Locked = FALSE; - + /* It's not already waking, so add the wake bit */ NewValue.Waking = TRUE; - + /* Sanity check */ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); - + /* Write the new value */ WakeValue = NewValue; NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; - + /* The write was successful. The pushlock is Unlocked and Waking */ ExfWakePushLock(PushLock, WakeValue); return; @@ -988,13 +988,13 @@ /* Get the wait block */ WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); - + /* Loop until we find the last wait block */ while (TRUE) { /* Get the last wait block */ LastWaitBlock = WaitBlock->Last; - + /* Did it exist? */ if (LastWaitBlock) { @@ -1002,7 +1002,7 @@ WaitBlock = LastWaitBlock; break; } - + /* Keep searching */ WaitBlock = WaitBlock->Next; } @@ -1169,11 +1169,11 @@ * and locked, don't do anything */ if ((OldValue.Waking) || (OldValue.Locked) || !(OldValue.Waiting)) return; - + /* Make it Waking */ NewValue = OldValue; NewValue.Waking = TRUE; - + /* Write the New Value */ if (InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr,

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 April 2012