Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[janderwald] 50097: [AUDIO-BRINGUP] - Partly implement IKsProcessingObject interface, which will be used to handle ks filter-centric based filters - Fix broken check, which failed to construct filt...
by janderwald＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: janderwald Date: Wed Dec 22 15:20:38 2010 New Revision: 50097 URL: http://svn.reactos.org/svn/reactos?rev=50097&view=rev Log: [AUDIO-BRINGUP] - Partly implement IKsProcessingObject interface, which will be used to handle ks filter-centric based filters - Fix broken check, which failed to construct filters, which dont have a FILTER_DISPATCH associated - Add check which fails create requests, when the filter doesnot allow user mode access (i.e. echo cancelation filter) - register ks worker to dispatch processing requests to the IKsProcessingObject - Implement KsFilterAttemptProcessing, KsFilterGetAndGate Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c branches/audio-bringup/drivers/ksfilter/ks/ksiface.h Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Dec 22 15:20:38 2010 @@ -16,6 +16,7 @@ IKsControlVtbl *lpVtblKsControl; IKsFilterFactory * FilterFactory; + IKsProcessingObjectVtbl * lpVtblKsProcessingObject; LONG ref; PKSIOBJECT_HEADER ObjectHeader; @@ -25,6 +26,9 @@ KMUTEX ControlMutex; KMUTEX ProcessingMutex; + PKSWORKER Worker; + WORK_QUEUE_ITEM WorkItem; + KSGATE Gate; PFNKSFILTERPOWER Sleep; PFNKSFILTERPOWER Wake; @@ -70,6 +74,196 @@ } }; +NTSTATUS +NTAPI +IKsProcessingObject_fnQueryInterface( + IKsProcessingObject * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + if (IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->Header.OuterUnknown; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IKsProcessingObject_fnAddRef( + IKsProcessingObject * iface) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IKsProcessingObject_fnRelease( + IKsProcessingObject * iface) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + InterlockedDecrement(&This->ref); + + /* Return new reference count */ + return This->ref; +} + +VOID +NTAPI +IKsProcessingObject_fnProcessingObjectWork( + IKsProcessingObject * iface) +{ + NTSTATUS Status; + LARGE_INTEGER TimeOut; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + DPRINT1("processing object\n"); + /* first check if running at passive level */ + if (KeGetCurrentIrql() == PASSIVE_LEVEL) + { + /* acquire processing mutex */ + KeWaitForSingleObject(&This->ControlMutex, Executive, KernelMode, FALSE, NULL); + } + else + { + /* dispatch level processing */ + if (KeReadStateMutex(&This->ControlMutex) == 0) + { + /* some thread was faster */ + DPRINT1("processing object too slow\n"); + return; + } + + /* acquire processing mutex */ + TimeOut.QuadPart = 0LL; + Status = KeWaitForSingleObject(&This->ControlMutex, Executive, KernelMode, FALSE, &TimeOut); + + if (Status == STATUS_TIMEOUT) + { + /* some thread was faster */ + DPRINT1("processing object too slow\n"); + return; + } + } + + do + { + + /* check if the and-gate has been enabled again */ + if (&This->Gate.Count != 0) + { + /* gate is open */ +DPRINT1("processing object gate open\n"); + break; + } + + DPRINT1("IKsProcessingObject_fnProcessingObjectWork not implemented\n"); + ASSERT(0); + + }while(TRUE); + + /* release process mutex */ + KeReleaseMutex(&This->ProcessingMutex, FALSE); +} + +PKSGATE +NTAPI +IKsProcessingObject_fnGetAndGate( + IKsProcessingObject * iface) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + /* return and gate */ + return &This->Gate; +} + +VOID +NTAPI +IKsProcessingObject_fnProcess( + IKsProcessingObject * iface, + IN BOOLEAN Asynchronous) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + /* should the action be asynchronous */ + if (Asynchronous) + { + /* queue work item */ + KsQueueWorkItem(This->Worker, &This->WorkItem); +DPRINT1("queueing\n"); + /* done */ + return; + } + + /* does the filter require explicit deferred processing */ + if ((This->Filter.Descriptor->Flags & (KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING | KSFILTER_FLAG_CRITICAL_PROCESSING | KSFILTER_FLAG_HYPERCRITICAL_PROCESSING)) && + KeGetCurrentIrql() > PASSIVE_LEVEL) + { + /* queue work item */ + KsQueueWorkItem(This->Worker, &This->WorkItem); +DPRINT1("queueing\n"); + /* done */ + return; + } +DPRINT1("invoke\n"); + /* call worker routine directly */ + iface->lpVtbl->ProcessingObjectWork(iface); +} + +VOID +NTAPI +IKsProcessingObject_fnReset( + IKsProcessingObject * iface) +{ + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtblKsProcessingObject); + + /* acquire processing mutex */ + KeWaitForSingleObject(&This->ProcessingMutex, Executive, KernelMode, FALSE, NULL); + + /* check if the filter supports dispatch routines */ + if (This->Filter.Descriptor->Dispatch) + { + /* has the filter a reset routine */ + if (This->Filter.Descriptor->Dispatch->Reset) + { + /* reset filter */ + This->Filter.Descriptor->Dispatch->Reset(&This->Filter); + } + } + + /* release process mutex */ + KeReleaseMutex(&This->ProcessingMutex, FALSE); +} + +VOID +NTAPI +IKsProcessingObject_fnTriggerNotification( + IKsProcessingObject * iface) +{ + +} + +static IKsProcessingObjectVtbl vt_IKsProcessingObject = +{ + IKsProcessingObject_fnQueryInterface, + IKsProcessingObject_fnAddRef, + IKsProcessingObject_fnRelease, + IKsProcessingObject_fnProcessingObjectWork, + IKsProcessingObject_fnGetAndGate, + IKsProcessingObject_fnProcess, + IKsProcessingObject_fnReset, + IKsProcessingObject_fnTriggerNotification +}; + + +//--------------------------------------------------------------------------------------------------------- NTSTATUS NTAPI IKsControl_fnQueryInterface( @@ -1356,6 +1550,20 @@ }while(TRUE); } +VOID +NTAPI +IKsFilter_FilterCentricWorker( + IN PVOID Ctx) +{ + IKsProcessingObject * Object = (IKsProcessingObject*)Ctx; + + /* sanity check */ + ASSERT(Object); + + /* perform work */ + Object->lpVtbl->ProcessingObjectWork(Object); +} + NTSTATUS NTAPI KspCreateFilter( @@ -1377,17 +1585,27 @@ /* get the filter factory */ Factory = iface->lpVtbl->GetStruct(iface); - if (!Factory || !Factory->FilterDescriptor || !Factory->FilterDescriptor->Dispatch || !Factory->FilterDescriptor->Dispatch->Create) + if (!Factory || !Factory->FilterDescriptor) { /* Sorry it just will not work */ return STATUS_UNSUCCESSFUL; + } + + if (Factory->FilterDescriptor->Flags & KSFILTER_FLAG_DENY_USERMODE_ACCESS) + { + if (Irp->RequestorMode == UserMode) + { + /* filter not accessible from user mode */ + DPRINT1("Access denied\n"); + return STATUS_UNSUCCESSFUL; + } } /* allocate filter instance */ This = AllocateItem(NonPagedPool, sizeof(IKsFilterImpl)); if (!This) { - DPRINT("KspCreateFilter OutOfMemory\n"); + DPRINT1("KspCreateFilter OutOfMemory\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1397,7 +1615,7 @@ { /* no memory */ FreeItem(This); - DPRINT("KspCreateFilter OutOfMemory\n"); + DPRINT1("KspCreateFilter OutOfMemory\n"); return STATUS_INSUFFICIENT_RESOURCES; } KsDevice = (IKsDevice*)&DeviceExtension->DeviceHeader->BasicHeader.OuterUnknown; @@ -1424,11 +1642,9 @@ /* no memory */ FreeItem(This->Filter.Bag); FreeItem(This); - DPRINT("KspCreateFilter OutOfMemory\n"); + DPRINT1("KspCreateFilter OutOfMemory\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - DPRINT("KspCreateFilter Flags %lx\n", Factory->FilterDescriptor->Flags); /* initialize pin create item */ CreateItem[0].Create = IKsFilter_DispatchCreatePin; @@ -1446,11 +1662,13 @@ This->ref = 1; This->Header.OuterUnknown = (PUNKNOWN)&vt_IKsFilter; This->lpVtblKsControl = &vt_IKsControl; + This->lpVtblKsProcessingObject = &vt_IKsProcessingObject; This->Factory = Factory; This->FilterFactory = iface; This->FileObject = IoStack->FileObject; KeInitializeMutex(&This->ProcessingMutex, 0); + /* initialize basic header */ This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; This->Header.Parent.KsFilterFactory = iface->lpVtbl->GetStruct(iface); @@ -1460,16 +1678,38 @@ InitializeListHead(&This->Header.EventList); KeInitializeSpinLock(&This->Header.EventListLock); + /* initialize and gate */ + KsGateInitializeAnd(&This->Gate, NULL); + + /* FIXME initialize and gate based on pin flags */ + + /* initialize work item */ + ExInitializeWorkItem(&This->WorkItem, IKsFilter_FilterCentricWorker, (PVOID)This->lpVtblKsProcessingObject); + + /* allocate counted work item */ + Status = KsRegisterCountedWorker(HyperCriticalWorkQueue, &This->WorkItem, &This->Worker); + if (!NT_SUCCESS(Status)) + { + /* what can go wrong, goes wrong */ + DPRINT1("KsRegisterCountedWorker failed with %lx\n", Status); + FreeItem(This); + FreeItem(CreateItem); + return Status; + } + /* allocate the stream descriptors */ Status = IKsFilter_CreateDescriptors(This, (PKSFILTER_DESCRIPTOR)Factory->FilterDescriptor); if (!NT_SUCCESS(Status)) { /* what can go wrong, goes wrong */ + DPRINT1("IKsFilter_CreateDescriptors failed with %lx\n", Status); + KsUnregisterWorker(This->Worker); FreeItem(This); FreeItem(CreateItem); - DPRINT("IKsFilter_CreateDescriptors failed with %lx\n", Status); return Status; } + + /* does the filter have a filter dispatch */ if (Factory->FilterDescriptor->Dispatch) @@ -1489,6 +1729,7 @@ DPRINT1("Driver: Status %x\n", Status); /* free filter instance */ + KsUnregisterWorker(This->Worker); FreeItem(This); FreeItem(CreateItem); return Status; @@ -1515,7 +1756,7 @@ IKsFilter_AttachFilterToFilterFactory(This, This->Header.Parent.KsFilterFactory); /* completed initialization */ - DPRINT("KspCreateFilter done %lx KsDevice %p\n", Status, This->Header.KsDevice); + DPRINT1("KspCreateFilter done %lx KsDevice %p\n", Status, This->Header.KsDevice); return Status; } @@ -1599,7 +1840,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -1608,7 +1849,21 @@ IN PKSFILTER Filter, IN BOOLEAN Asynchronous) { - //UNIMPLEMENTED + PKSGATE Gate; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(Filter, IKsFilterImpl, Filter); + + /* get gate */ + Gate = This->lpVtblKsProcessingObject->GetAndGate((IKsProcessingObject*)This->lpVtblKsProcessingObject); + + if (!KsGateCaptureThreshold(Gate)) + { + /* filter control gate is closed */ + DPRINT1("Gate %p Closed %x\n", Gate, Gate->Count); + return; + } +DPRINT1("processing\n"); + /* try initiate processing */ + This->lpVtblKsProcessingObject->Process((IKsProcessingObject*)This->lpVtblKsProcessingObject, Asynchronous); } /* @@ -1710,8 +1965,10 @@ KsFilterGetAndGate( IN PKSFILTER Filter) { - UNIMPLEMENTED - return NULL; + IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(Filter, IKsFilterImpl, Filter); + + /* return and-gate */ + return &This->Gate; } /* Modified: branches/audio-bringup/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Wed Dec 22 15:20:38 2010 @@ -309,3 +309,32 @@ }; #undef INTERFACE + + +/***************************************************************************** + * IKsProcessingObject + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsProcessingObject + +DECLARE_INTERFACE_(IKsProcessingObject, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(VOID, ProcessingObjectWork)(THIS) PURE; + + STDMETHOD_(PKSGATE, GetAndGate)(THIS) PURE; + + STDMETHOD_(VOID, Process)(THIS_ + IN BOOLEAN Asynchronous)PURE; + + STDMETHOD_(VOID, Reset)(THIS) PURE; + + STDMETHOD_(VOID, TriggerNotification)(THIS) PURE; + +}; + +#undef INTERFACE +

1 0

[tkreuzer] 50096: [HAL] Convert while (TRUE); to ASSERT(FALSE); on unimplemented pathes.
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 14:31:39 2010 New Revision: 50096 URL: http://svn.reactos.org/svn/reactos?rev=50096&view=rev Log: [HAL] Convert while (TRUE); to ASSERT(FALSE); on unimplemented pathes. Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Wed Dec 22 14:31:39 2010 @@ -72,7 +72,7 @@ /* Disable interrupts */ Flags = __readeflags(); _disable(); - + /* Program the PIT for binary mode */ TimerControl.BcdMode = FALSE; @@ -85,13 +85,13 @@ */ TimerControl.OperatingMode = PitOperatingMode2; TimerControl.Channel = PitChannel0; - + /* Set the access mode that we'll use to program the reload value */ TimerControl.AccessMode = PitAccessModeLowHigh; - + /* Now write the programming bits */ __outbyte(TIMER_CONTROL_PORT, TimerControl.Bits); - + /* Next we write the reload value for channel 0 */ __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver & 0xFF); __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver >> 8); @@ -110,29 +110,29 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) { KIRQL Irql; - + /* Enter trap */ KiEnterInterruptTrap(TrapFrame); - + /* Start the interrupt */ if (HalBeginSystemInterrupt(CLOCK2_LEVEL, PRIMARY_VECTOR_BASE, &Irql)) { /* Update the performance counter */ HalpPerfCounter.QuadPart += HalpCurrentRollOver; HalpPerfCounterCutoff = KiEnableTimerWatchdog; - + /* Check if someone changed the time rate */ if (HalpClockSetMSRate) { /* Not yet supported */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); } - + /* Update the system time -- the kernel will exit this trap */ KeUpdateSystemTime(TrapFrame, HalpCurrentTimeIncrement, Irql); } - + /* Spurious, just end the interrupt */ KiEoiHelper(TrapFrame); } @@ -142,18 +142,18 @@ HalpProfileInterruptHandler(IN PKTRAP_FRAME TrapFrame) { KIRQL Irql; - + /* Enter trap */ KiEnterInterruptTrap(TrapFrame); - + /* Start the interrupt */ if (HalBeginSystemInterrupt(PROFILE_LEVEL, PRIMARY_VECTOR_BASE + 8, &Irql)) { /* Profiling isn't yet enabled */ UNIMPLEMENTED; - while (TRUE); + ASSERT(FALSE); } - + /* Spurious, just end the interrupt */ KiEoiHelper(TrapFrame); }

1 0

[fireball] 50095: [NTOS] - Always initialize TrapFrame segment selectors in KiEnterTrap, because further C code relies on at least TrapFrame->SegFs being correct. Running Arwinss on VirtualBox expo...
by fireball＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: fireball Date: Wed Dec 22 14:26:36 2010 New Revision: 50095 URL: http://svn.reactos.org/svn/reactos?rev=50095&view=rev Log: [NTOS] - Always initialize TrapFrame segment selectors in KiEnterTrap, because further C code relies on at least TrapFrame->SegFs being correct. Running Arwinss on VirtualBox exposed this bug. I wouldn't find solution for this bug without Timo's great help! Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Dec 22 14:26:36 2010 @@ -135,7 +135,17 @@ endif /* Save segment registers? */ - if (NOT (Flags AND KI_DONT_SAVE_SEGS)) + if (Flags AND KI_DONT_SAVE_SEGS) + + /* Initialize TrapFrame segment registers with sane values */ + mov eax, 0x23 + mov ecx, fs + mov [esp - FrameSize + KTRAP_FRAME_DS], eax + mov [esp - FrameSize + KTRAP_FRAME_ES], eax + mov [esp - FrameSize + KTRAP_FRAME_FS], ecx + mov dword ptr [esp - FrameSize + KTRAP_FRAME_GS], 0 + + else /* Check for V86 mode */ test byte ptr [esp + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK / HEX(10000))

1 0

[janderwald] 50094: [PSDK] - Add ks gate functions
by janderwald＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: janderwald Date: Wed Dec 22 13:52:25 2010 New Revision: 50094 URL: http://svn.reactos.org/svn/reactos?rev=50094&view=rev Log: [PSDK] - Add ks gate functions Modified: branches/audio-bringup/include/psdk/ks.h Modified: branches/audio-bringup/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ks.h… ============================================================================== --- branches/audio-bringup/include/psdk/ks.h [iso-8859-1] (original) +++ branches/audio-bringup/include/psdk/ks.h [iso-8859-1] Wed Dec 22 13:52:25 2010 @@ -2928,6 +2928,232 @@ XP / DX8 */ #if defined(_NTDDK_) + +typedef struct _KSGATE KSGATE, *PKSGATE; + +struct _KSGATE { + LONG Count; + PKSGATE NextGate; +}; + +#ifndef _NTOS_ + +static +void +__inline +KsGateTurnInputOn( + IN PKSGATE Gate OPTIONAL) +{ + while (Gate && (InterlockedIncrement(&Gate->Count) == 1)) + { + Gate = Gate->NextGate; + } +} + +static +void +__inline +KsGateTurnInputOff( + IN PKSGATE Gate OPTIONAL) +{ + while (Gate && (InterlockedDecrement(&Gate->Count) == 0)) + { + Gate = Gate->NextGate; + } +} + +static +BOOLEAN +__inline +KsGateGetStateUnsafe( + IN PKSGATE Gate) +{ + ASSERT(Gate); + return((BOOLEAN)(Gate->Count > 0)); +} + +static +BOOLEAN +__inline +KsGateCaptureThreshold( + IN PKSGATE Gate) +{ + BOOLEAN captured; + + ASSERT(Gate); + + captured = (BOOLEAN)(InterlockedCompareExchange(&Gate->Count,0,1) == 1); + + if (captured) + { + KsGateTurnInputOff(Gate->NextGate); + } + + return captured; +} + +static +void +__inline +KsGateInitialize( + IN PKSGATE Gate, + IN LONG InitialCount, + IN PKSGATE NextGate OPTIONAL, + IN BOOLEAN StateToPropagate + ) +{ + ASSERT(Gate); + Gate->Count = InitialCount; + Gate->NextGate = NextGate; + + if (NextGate) + { + if (InitialCount > 0) + { + if (StateToPropagate) + { + KsGateTurnInputOn(NextGate); + } + } + else + { + if (!StateToPropagate) + { + KsGateTurnInputOff(NextGate); + } + } + } +} + +static +void +__inline +KsGateInitializeAnd( + IN PKSGATE AndGate, + IN PKSGATE NextOrGate OPTIONAL) +{ + KsGateInitialize(AndGate,1,NextOrGate,TRUE); +} + +static +void +__inline +KsGateInitializeOr( + IN PKSGATE OrGate, + IN PKSGATE NextAndGate OPTIONAL) +{ + KsGateInitialize(OrGate,0,NextAndGate,FALSE); +} + +static +void +__inline +KsGateAddOnInputToAnd( + IN PKSGATE AndGate) +{ + UNREFERENCED_PARAMETER (AndGate); +} + +static +void +__inline +KsGateAddOffInputToAnd( + IN PKSGATE AndGate) +{ + KsGateTurnInputOff(AndGate); +} + +static +void +__inline +KsGateRemoveOnInputFromAnd( + IN PKSGATE AndGate) +{ + UNREFERENCED_PARAMETER (AndGate); +} + +static +void +__inline +KsGateRemoveOffInputFromAnd( + IN PKSGATE AndGate) +{ + KsGateTurnInputOn(AndGate); +} + +static +void +__inline +KsGateAddOnInputToOr( + IN PKSGATE OrGate) +{ + KsGateTurnInputOn(OrGate); +} + +static +void +__inline +KsGateAddOffInputToOr( + IN PKSGATE OrGate) +{ + UNREFERENCED_PARAMETER (OrGate); +} + +static +void +__inline +KsGateRemoveOnInputFromOr( + IN PKSGATE OrGate) +{ + KsGateTurnInputOff(OrGate); +} + +static +void +__inline +KsGateRemoveOffInputFromOr( + IN PKSGATE OrGate) +{ + UNREFERENCED_PARAMETER (OrGate); +} + +static +void +__inline +KsGateTerminateAnd( + IN PKSGATE AndGate) +{ + ASSERT(AndGate); + if (KsGateGetStateUnsafe(AndGate)) + { + KsGateRemoveOnInputFromOr(AndGate->NextGate); + } + else + { + KsGateRemoveOffInputFromOr(AndGate->NextGate); + } +} + +static +void +__inline +KsGateTerminateOr( + IN PKSGATE OrGate) +{ + ASSERT(OrGate); + if (KsGateGetStateUnsafe(OrGate)) + { + KsGateRemoveOnInputFromAnd(OrGate->NextGate); + } + else + { + KsGateRemoveOffInputFromAnd(OrGate->NextGate); + } +} + +#endif + + struct _KSMAPPING { PHYSICAL_ADDRESS PhysicalAddress; ULONG ByteCount; @@ -2940,13 +3166,7 @@ KSSTREAM_POINTER_STATE_LOCKED } KSSTREAM_POINTER_STATE; -typedef struct _KSGATE KSGATE, *PKSGATE; typedef struct _KSPROCESSPIN_INDEXENTRY KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY; - -struct _KSGATE { - LONG Count; - PKSGATE NextGate; -}; struct _KSSTREAM_POINTER_OFFSET {

1 0

[tkreuzer] 50093: [FORMATTING] Apply indentation of 4 spaces.
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 13:33:09 2010 New Revision: 50093 URL: http://svn.reactos.org/svn/reactos?rev=50093&view=rev Log: [FORMATTING] Apply indentation of 4 spaces. Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=50093&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Wed Dec 22 13:33:09 2010 @@ -22,9 +22,10 @@ BOOLEAN NTAPI -LdrVerifyMappedImageMatchesChecksum(IN PVOID BaseAddress, - IN ULONG NumberOfBytes, - IN ULONG FileLength) +LdrVerifyMappedImageMatchesChecksum( + IN PVOID BaseAddress, + IN ULONG NumberOfBytes, + IN ULONG FileLength) { /* FIXME: TODO */ return TRUE; @@ -33,26 +34,26 @@ /* * @implemented */ -PIMAGE_NT_HEADERS NTAPI -RtlImageNtHeader (IN PVOID BaseAddress) -{ - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_DOS_HEADER DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; - - if (DosHeader && SWAPW(DosHeader->e_magic) != IMAGE_DOS_SIGNATURE) - { - DPRINT1("DosHeader->e_magic %x\n", SWAPW(DosHeader->e_magic)); - DPRINT1("NtHeader 0x%lx\n", ((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew))); - } - - if (DosHeader && SWAPW(DosHeader->e_magic) == IMAGE_DOS_SIGNATURE) - { - NtHeader = (PIMAGE_NT_HEADERS)((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew)); - if (SWAPD(NtHeader->Signature) == IMAGE_NT_SIGNATURE) - return NtHeader; - } - - return NULL; +PIMAGE_NT_HEADERS +NTAPI +RtlImageNtHeader(IN PVOID BaseAddress) +{ + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_DOS_HEADER DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; + + if (DosHeader && SWAPW(DosHeader->e_magic) != IMAGE_DOS_SIGNATURE) + { + DPRINT1("DosHeader->e_magic %x\n", SWAPW(DosHeader->e_magic)); + DPRINT1("NtHeader 0x%lx\n", ((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew))); + } + else + { + NtHeader = (PIMAGE_NT_HEADERS)((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew)); + if (SWAPD(NtHeader->Signature) == IMAGE_NT_SIGNATURE) + return NtHeader; + } + + return NULL; } @@ -61,40 +62,41 @@ */ PVOID NTAPI -RtlImageDirectoryEntryToData(PVOID BaseAddress, - BOOLEAN MappedAsImage, - USHORT Directory, - PULONG Size) -{ - PIMAGE_NT_HEADERS NtHeader; - ULONG Va; - - /* Magic flag for non-mapped images. */ - if ((ULONG_PTR)BaseAddress & 1) - { - BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); - MappedAsImage = FALSE; - } - - - NtHeader = RtlImageNtHeader (BaseAddress); - if (NtHeader == NULL) - return NULL; - - if (Directory >= SWAPD(NtHeader->OptionalHeader.NumberOfRvaAndSizes)) - return NULL; - - Va = SWAPD(NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress); - if (Va == 0) - return NULL; - - *Size = SWAPD(NtHeader->OptionalHeader.DataDirectory[Directory].Size); - - if (MappedAsImage || Va < SWAPD(NtHeader->OptionalHeader.SizeOfHeaders)) - return (PVOID)((ULONG_PTR)BaseAddress + Va); - - /* image mapped as ordinary file, we must find raw pointer */ - return RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL); +RtlImageDirectoryEntryToData( + PVOID BaseAddress, + BOOLEAN MappedAsImage, + USHORT Directory, + PULONG Size) +{ + PIMAGE_NT_HEADERS NtHeader; + ULONG Va; + + /* Magic flag for non-mapped images. */ + if ((ULONG_PTR)BaseAddress & 1) + { + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); + MappedAsImage = FALSE; + } + + + NtHeader = RtlImageNtHeader (BaseAddress); + if (NtHeader == NULL) + return NULL; + + if (Directory >= SWAPD(NtHeader->OptionalHeader.NumberOfRvaAndSizes)) + return NULL; + + Va = SWAPD(NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress); + if (Va == 0) + return NULL; + + *Size = SWAPD(NtHeader->OptionalHeader.DataDirectory[Directory].Size); + + if (MappedAsImage || Va < SWAPD(NtHeader->OptionalHeader.SizeOfHeaders)) + return (PVOID)((ULONG_PTR)BaseAddress + Va); + + /* image mapped as ordinary file, we must find raw pointer */ + return RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL); } @@ -103,28 +105,27 @@ */ PIMAGE_SECTION_HEADER NTAPI -RtlImageRvaToSection ( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva - ) -{ - PIMAGE_SECTION_HEADER Section; - ULONG Va; - ULONG Count; - - Count = SWAPW(NtHeader->FileHeader.NumberOfSections); - Section = IMAGE_FIRST_SECTION(NtHeader); - - while (Count--) - { - Va = SWAPD(Section->VirtualAddress); - if ((Va <= Rva) && - (Rva < Va + SWAPD(Section->Misc.VirtualSize))) - return Section; - Section++; - } - return NULL; +RtlImageRvaToSection( + PIMAGE_NT_HEADERS NtHeader, + PVOID BaseAddress, + ULONG Rva) +{ + PIMAGE_SECTION_HEADER Section; + ULONG Va; + ULONG Count; + + Count = SWAPW(NtHeader->FileHeader.NumberOfSections); + Section = IMAGE_FIRST_SECTION(NtHeader); + + while (Count--) + { + Va = SWAPD(Section->VirtualAddress); + if ((Va <= Rva) && + (Rva < Va + SWAPD(Section->Misc.VirtualSize))) + return Section; + Section++; + } + return NULL; } @@ -133,34 +134,33 @@ */ PVOID NTAPI -RtlImageRvaToVa ( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva, - PIMAGE_SECTION_HEADER *SectionHeader - ) -{ - PIMAGE_SECTION_HEADER Section = NULL; - - if (SectionHeader) - Section = *SectionHeader; - - if (Section == NULL || - Rva < SWAPD(Section->VirtualAddress) || - Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize)) - { - Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); - if (Section == NULL) - return 0; - - if (SectionHeader) - *SectionHeader = Section; - } - - return (PVOID)((ULONG_PTR)BaseAddress + - Rva + - SWAPD(Section->PointerToRawData) - - (ULONG_PTR)SWAPD(Section->VirtualAddress)); +RtlImageRvaToVa( + PIMAGE_NT_HEADERS NtHeader, + PVOID BaseAddress, + ULONG Rva, + PIMAGE_SECTION_HEADER *SectionHeader) +{ + PIMAGE_SECTION_HEADER Section = NULL; + + if (SectionHeader) + Section = *SectionHeader; + + if (Section == NULL || + Rva < SWAPD(Section->VirtualAddress) || + Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->Misc.VirtualSize)) + { + Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); + if (Section == NULL) + return 0; + + if (SectionHeader) + *SectionHeader = Section; + } + + return (PVOID)((ULONG_PTR)BaseAddress + + Rva + + SWAPD(Section->PointerToRawData) - + (ULONG_PTR)SWAPD(Section->VirtualAddress)); } PIMAGE_BASE_RELOCATION @@ -169,8 +169,7 @@ IN ULONG_PTR Address, IN ULONG Count, IN PUSHORT TypeOffset, - IN LONGLONG Delta - ) + IN LONGLONG Delta) { SHORT Offset; USHORT Type; @@ -197,8 +196,8 @@ {*/ switch (Type) { - /* case IMAGE_REL_BASED_SECTION : */ - /* case IMAGE_REL_BASED_REL32 : */ + /* case IMAGE_REL_BASED_SECTION : */ + /* case IMAGE_REL_BASED_REL32 : */ case IMAGE_REL_BASED_ABSOLUTE: break; @@ -242,8 +241,7 @@ IN PCCH LoaderName, IN ULONG Success, IN ULONG Conflict, - IN ULONG Invalid - ) + IN ULONG Invalid) { PIMAGE_NT_HEADERS NtHeaders; PIMAGE_DATA_DIRECTORY RelocationDDir; @@ -275,16 +273,16 @@ RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + SWAPD(RelocationDDir->Size)); while (RelocationDir < RelocationEnd && - SWAPW(RelocationDir->SizeOfBlock) > 0) + SWAPW(RelocationDir->SizeOfBlock) > 0) { Count = (SWAPW(RelocationDir->SizeOfBlock) - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); Address = (ULONG_PTR)RVA(BaseAddress, SWAPD(RelocationDir->VirtualAddress)); TypeOffset = (PUSHORT)(RelocationDir + 1); RelocationDir = LdrProcessRelocationBlockLongLong(Address, - Count, - TypeOffset, - Delta); + Count, + TypeOffset, + Delta); if (RelocationDir == NULL) { @@ -295,4 +293,5 @@ return Success; } + /* EOF */

1 0

[tkreuzer] 50092: [NTDLL] Move RtlPcToFileHeader to rtl/libsupp.c
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 13:07:04 2010 New Revision: 50092 URL: http://svn.reactos.org/svn/reactos?rev=50092&view=rev Log: [NTDLL] Move RtlPcToFileHeader to rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Dec 22 13:07:04 2010 @@ -2665,39 +2665,6 @@ /* * @implemented */ -PVOID NTAPI -RtlPcToFileHeader(IN PVOID PcValue, - PVOID* BaseOfImage) -{ - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PVOID ImageBase = NULL; - - RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); - ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; - Entry = ModuleListHead->Flink; - while (Entry != ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - if ((ULONG_PTR)PcValue >= (ULONG_PTR)Module->DllBase && - (ULONG_PTR)PcValue < (ULONG_PTR)Module->DllBase + Module->SizeOfImage) - { - ImageBase = Module->DllBase; - break; - } - Entry = Entry->Flink; - } - RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); - - *BaseOfImage = ImageBase; - return ImageBase; -} - -/* - * @implemented - */ NTSTATUS NTAPI LdrGetProcedureAddress (IN PVOID BaseAddress, IN PANSI_STRING Name, Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Dec 22 13:07:04 2010 @@ -486,3 +486,36 @@ *ret = resdirptr; return STATUS_SUCCESS; } + +/* + * @implemented + */ +PVOID NTAPI +RtlPcToFileHeader(IN PVOID PcValue, + PVOID* BaseOfImage) +{ + PLIST_ENTRY ModuleListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + PVOID ImageBase = NULL; + + RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); + ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Entry = ModuleListHead->Flink; + while (Entry != ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + if ((ULONG_PTR)PcValue >= (ULONG_PTR)Module->DllBase && + (ULONG_PTR)PcValue < (ULONG_PTR)Module->DllBase + Module->SizeOfImage) + { + ImageBase = Module->DllBase; + break; + } + Entry = Entry->Flink; + } + RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); + + *BaseOfImage = ImageBase; + return ImageBase; +}

1 0

[tkreuzer] 50091: [FORMATTING] Apply indentation of 4 spaces.
by tkreuzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: tkreuzer Date: Wed Dec 22 13:00:47 2010 New Revision: 50091 URL: http://svn.reactos.org/svn/reactos?rev=50091&view=rev Log: [FORMATTING] Apply indentation of 4 spaces. Modified: trunk/reactos/dll/ntdll/ldr/utils.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=…

1 0

[pschweitzer] 50090: [FASTFAT] Fix for a buffer overflow and then a buffer overrun (if ever it fixes something) The way filenames are handled for FAT entries should be REALLY simplified. This would...
by pschweitzer＠svn.reactos.org 22 Dec '10

22 Dec '10

Author: pschweitzer Date: Wed Dec 22 00:13:03 2010 New Revision: 50090 URL: http://svn.reactos.org/svn/reactos?rev=50090&view=rev Log: [FASTFAT] Fix for a buffer overflow and then a buffer overrun (if ever it fixes something) The way filenames are handled for FAT entries should be REALLY simplified. This would prevent such errors. Thus, there are more magic values in fastfat driver than everywhere else in ReactOS which makes proper fixing hard (impossible?). Finally, the code for that fix is crappy, but I don't care, it fits the rest of the fastfat driver code. *pissed off* Fixes CID #2502 Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Wed Dec 22 00:13:03 2010 @@ -220,8 +220,16 @@ } else { - RtlCopyMemory(VolumeLabelDirEntry.Fat.Filename, cString, LabelLen); - memset(&VolumeLabelDirEntry.Fat.Filename[LabelLen], ' ', 11 - LabelLen); + RtlCopyMemory(VolumeLabelDirEntry.Fat.Filename, cString, max(sizeof(VolumeLabelDirEntry.Fat.Filename), LabelLen)); + if (LabelLen > sizeof(VolumeLabelDirEntry.Fat.Filename)) + { + memset(VolumeLabelDirEntry.Fat.Ext, ' ', sizeof(VolumeLabelDirEntry.Fat.Ext)); + RtlCopyMemory(VolumeLabelDirEntry.Fat.Ext, cString + sizeof(VolumeLabelDirEntry.Fat.Filename), LabelLen - sizeof(VolumeLabelDirEntry.Fat.Filename)); + } + else + { + memset(&VolumeLabelDirEntry.Fat.Filename[LabelLen], ' ', sizeof(VolumeLabelDirEntry.Fat.Filename) - LabelLen); + } VolumeLabelDirEntry.Fat.Attrib = 0x08; }

1 0

[tkreuzer] 50089: [SCSIPORT] ScsiPortConvertPhysicalAddressToUlong takes an ULONG_PTR as input, fix function accordingly and do the "calculation" directly instead of calling RtlConvertUlongToLargeI...
by tkreuzer＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: tkreuzer Date: Tue Dec 21 23:48:15 2010 New Revision: 50089 URL: http://svn.reactos.org/svn/reactos?rev=50089&view=rev Log: [SCSIPORT] ScsiPortConvertPhysicalAddressToUlong takes an ULONG_PTR as input, fix function accordingly and do the "calculation" directly instead of calling RtlConvertUlongToLargeInteger Spotted by Samuel. Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/scsiport/stubs.c trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Tue Dec 21 23:48:15 2010 @@ -445,9 +445,12 @@ SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortConvertUlongToPhysicalAddress( - IN ULONG UlongAddress) -{ - return RtlConvertUlongToLargeInteger(UlongAddress); + IN ULONG_PTR UlongAddress) +{ + SCSI_PHYSICAL_ADDRESS Address; + + Address.QuadPart = UlongAddress; + return Address; } VOID @@ -1540,7 +1543,7 @@ { CHAR* Name; PVOID Function; - } ExportTable[] = + } ExportTable[] = { { "ScsiDebugPrint", ScsiDebugPrint }, { "ScsiPortCompleteRequest", ScsiPortCompleteRequest }, @@ -1618,7 +1621,7 @@ ImageDosHeader.e_lfanew = SWAPD((ULONG_PTR)&ImageNtHeaders - (ULONG_PTR)&ImageDosHeader); ImageNtHeaders.Signature = IMAGE_NT_SIGNATURE; ImageNtHeaders.OptionalHeader.NumberOfRvaAndSizes = SWAPD(IMAGE_DIRECTORY_ENTRY_EXPORT + 1); - ImageNtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = + ImageNtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = SWAPW((ULONG_PTR)&ImageExportDirectory - (ULONG_PTR)&ImageDosHeader); ImageNtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size = 1; ImageExportDirectory.NumberOfNames = sizeof(ExportTable) / sizeof(ExportTable[0]); Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/srb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/srb.h [iso-8859-1] Tue Dec 21 23:48:15 2010 @@ -935,7 +935,7 @@ SCSIPORT_API SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortConvertUlongToPhysicalAddress( - ULONG UlongAddress + ULONG_PTR UlongAddress ); SCSIPORT_API Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] Tue Dec 21 23:48:15 2010 @@ -42,9 +42,12 @@ SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortConvertUlongToPhysicalAddress( - IN ULONG UlongAddress) -{ - return RtlConvertUlongToLargeInteger(UlongAddress); + IN ULONG_PTR UlongAddress) +{ + SCSI_PHYSICAL_ADDRESS Address; + + Address.QuadPart = UlongAddress; + return Address; } VOID Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=5008… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Tue Dec 21 23:48:15 2010 @@ -550,7 +550,7 @@ SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortConvertUlongToPhysicalAddress( - IN ULONG UlongAddress); + IN ULONG_PTR UlongAddress); SCSIPORTAPI VOID

1 0

[jgardou] 50088: copy->paste... woops, the comment!
by jgardou＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: jgardou Date: Tue Dec 21 22:28:41 2010 New Revision: 50088 URL: http://svn.reactos.org/svn/reactos?rev=50088&view=rev Log: copy->paste... woops, the comment! Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 21 22:28:41 2010 @@ -534,7 +534,7 @@ else if (CompareToken(pc, "int64")) { exp.nStackBytes += 8; - exp.anArgs[exp.nArgCount] = ARG_INT64; // FIXME: handle strings + exp.anArgs[exp.nArgCount] = ARG_INT64; } else fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010