Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43533: - Quick & dirty implementation of WIDM_RESET / WODM_RESET
by janderwald＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: janderwald Date: Sat Oct 17 17:08:01 2009 New Revision: 43533 URL: http://svn.reactos.org/svn/reactos?rev=43533&view=rev Log: - Quick & dirty implementation of WIDM_RESET / WODM_RESET Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sat Oct 17 17:08:01 2009 @@ -64,6 +64,10 @@ { HeaderExtension = (PWAVEHDR_EXTENSION) Header->reserved; SND_ASSERT( HeaderExtension ); + + /* Saniy checks */ + SND_ASSERT(Header->dwFlags & WHDR_PREPARED); + SND_ASSERT(Header->dwFlags & WHDR_INQUEUE); /* Can never be *above* the length */ SND_ASSERT( HeaderExtension->BytesCommitted <= Header->dwBufferLength ); @@ -170,6 +174,8 @@ WaveHdr = (PWAVEHDR) SoundOverlapped->Header; SND_ASSERT( WaveHdr ); + SND_ASSERT( ERROR_SUCCESS == dwErrorCode ); + HdrExtension = (PWAVEHDR_EXTENSION) WaveHdr->reserved; SND_ASSERT( HdrExtension ); @@ -239,8 +245,13 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { - /* TODO */ - return MMSYSERR_NOTSUPPORTED; + /* complete all pending headers */ + while(SoundDeviceInstance->HeadWaveHeader) + CompleteWaveHeader(SoundDeviceInstance, SoundDeviceInstance->HeadWaveHeader); + + SND_ASSERT( NULL == SoundDeviceInstance->HeadWaveHeader ); + SND_ASSERT( NULL == SoundDeviceInstance->TailWaveHeader ); + return MMSYSERR_NOERROR; } MMRESULT @@ -262,8 +273,7 @@ if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); - /* FIXME: What about wave input? */ - if ( DeviceType != WAVE_OUT_DEVICE_TYPE ) + if ( DeviceType != WAVE_OUT_DEVICE_TYPE && DeviceType != WAVE_IN_DEVICE_TYPE ) return MMSYSERR_NOTSUPPORTED; return CallSoundThread(SoundDeviceInstance,

1 0

[sginsberg] 43532: - ntdll: Remove deprecated LdrpLoadUserModuleSymbols that doesn't actually do anything since the hack in NtSystemDebugControl was removed almost 3 years ago. - Cc: Remove weird check for DBG or KDBG -- debug code should always be wrapped under #if DBG.
by sginsberg＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: sginsberg Date: Sat Oct 17 17:03:54 2009 New Revision: 43532 URL: http://svn.reactos.org/svn/reactos?rev=43532&view=rev Log: - ntdll: Remove deprecated LdrpLoadUserModuleSymbols that doesn't actually do anything since the hack in NtSystemDebugControl was removed almost 3 years ago. - Cc: Remove weird check for DBG or KDBG -- debug code should always be wrapped under #if DBG. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Oct 17 17:03:54 2009 @@ -28,10 +28,6 @@ ULONG ul_reason_for_call, LPVOID lpReserved); -#if defined(KDBG) || DBG -VOID -LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule); -#endif extern HANDLE WindowsApiPort; /* EOF */ Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Oct 17 17:03:54 2009 @@ -428,12 +428,6 @@ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, &NtModule->InInitializationOrderModuleList); -#if DBG || defined(KDBG) - - LdrpLoadUserModuleSymbols(NtModule); - -#endif /* DBG || KDBG */ - /* add entry for executable (becomes first list entry) */ ExeModule = (PLDR_DATA_TABLE_ENTRY) RtlAllocateHeap(Peb->ProcessHeap, @@ -477,12 +471,6 @@ &ExeModule->InLoadOrderLinks); LdrpInitLoader(); - -#if DBG || defined(KDBG) - - LdrpLoadUserModuleSymbols(ExeModule); - -#endif /* DBG || KDBG */ EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL); ExeModule->EntryPoint = EntryPoint; 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] Sat Oct 17 17:03:54 2009 @@ -62,22 +62,6 @@ static VOID LdrpDetachProcess(BOOLEAN UnloadAll); /* FUNCTIONS *****************************************************************/ - -#if DBG || defined(KDBG) - -VOID -LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule) -{ - NtSystemDebugControl( - SysDbgQueryVersion, - (PVOID)LdrModule, - 0, - NULL, - 0, - NULL); -} - -#endif /* DBG || KDBG */ BOOLEAN LdrMappedAsDataFile(PVOID *BaseAddress) @@ -2268,9 +2252,7 @@ DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status); return Status; } -#if DBG || defined(KDBG) - LdrpLoadUserModuleSymbols(*Module); -#endif /* DBG || KDBG */ + RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList, &(*Module)->InInitializationOrderModuleList); Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=435… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Oct 17 17:03:54 2009 @@ -70,7 +70,7 @@ static NPAGED_LOOKASIDE_LIST BcbLookasideList; static NPAGED_LOOKASIDE_LIST CacheSegLookasideList; -#if DBG || defined(KDBG) +#if DBG static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) { ++cs->ReferenceCount; @@ -108,7 +108,7 @@ PBCB Bcb, BOOLEAN Trace ) { -#if DBG || defined(KDBG) +#if DBG KIRQL oldirql; PLIST_ENTRY current_entry; PCACHE_SEGMENT current; @@ -587,7 +587,7 @@ current->PageOut = FALSE; current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize); current->Bcb = Bcb; -#if DBG || defined(KDBG) +#if DBG if ( Bcb->Trace ) { DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current ); @@ -619,7 +619,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); -#if DBG || defined(KDBG) +#if DBG if ( Bcb->Trace ) { DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n", @@ -865,7 +865,7 @@ KIRQL oldIrql; #endif DPRINT("Freeing cache segment 0x%p\n", CacheSeg); -#if DBG || defined(KDBG) +#if DBG if ( CacheSeg->Bcb->Trace ) { DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg ); @@ -1065,7 +1065,7 @@ } InsertHeadList(&FreeList, &current->BcbSegmentListEntry); } -#if DBG || defined(KDBG) +#if DBG Bcb->Trace = FALSE; #endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Oct 17 17:03:54 2009 @@ -116,7 +116,7 @@ PVOID LazyWriteContext; KSPIN_LOCK BcbLock; ULONG RefCount; -#if DBG || defined(KDBG) +#if DBG BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ #endif } BCB, *PBCB;

1 0

[hpoussin] 43531: Fix warning
by hpoussin＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: hpoussin Date: Sat Oct 17 16:55:50 2009 New Revision: 43531 URL: http://svn.reactos.org/svn/reactos?rev=43531&view=rev Log: Fix warning Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Oct 17 16:55:50 2009 @@ -796,7 +796,7 @@ // // Check if current entry is a directory // - if (!FatFileInfo.Attributes & ATTR_DIRECTORY) + if (!(FatFileInfo.Attributes & ATTR_DIRECTORY)) { MmFreeMemory(FatFileInfo.FileFatChain); return ENOTDIR;

1 0

[sginsberg] 43530: - Add STATUS_SUCCESS to asm.h and make use of it. - Implement Bus and I/O space read and write support. - Implement support for AUTOENABLE, DISABLE and NOUMEX subparameters to /debug. Add the missing string scan and set and respect the related globals properly. Add support for disabling the debugger and suspending breakpoints. - Add and implement KdIsThisAKdTrap to determine if the kernel debugger can't ignore a particular trap -- returns true for software breakpoints and debu
by sginsberg＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: sginsberg Date: Sat Oct 17 16:31:38 2009 New Revision: 43530 URL: http://svn.reactos.org/svn/reactos?rev=43530&view=rev Log: - Add STATUS_SUCCESS to asm.h and make use of it. - Implement Bus and I/O space read and write support. - Implement support for AUTOENABLE, DISABLE and NOUMEX subparameters to /debug. Add the missing string scan and set and respect the related globals properly. Add support for disabling the debugger and suspending breakpoints. - Add and implement KdIsThisAKdTrap to determine if the kernel debugger can't ignore a particular trap -- returns true for software breakpoints and debug service calls (DbgPrint for example). Called from KiDispatchException to determine whether to override NOUMEX (otherwise, DbgPrint and friends will kill user mode applications). Stub this for KDBG as it implements its own scheme for ignoring user mode. - KiDispatchException: Clean up some goto and support NOUMEX. Also don't check if KiDebugRoutine is NULL -- it will never be. - KdEnableDebuggerWithLock should initialize the debugger even if KdDisableCount is 0 (but only if called internally) as this means that the debugger was never initialized in the first place. Required for AUTOENABLE and for enabling the debugger during a bugcheck. Add the globals to kdbg too but don't set or respect them there as kdbg does not support it. - Enable KdEnableDebugger and implement KdDisableDebugger for KD as KdDisableDebuggerWithLock is now implemented. - Only build kdmemsup.c if KDBG is defined. Modified: trunk/reactos/include/ndk/i386/asm.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c trunk/reactos/ntoskrnl/kd64/arm/kdsup.c trunk/reactos/ntoskrnl/kd64/i386/kdsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -527,6 +527,7 @@ // NTSTATUS, Bugcheck Codes and Debug Codes // #ifdef __ASM__ +#define STATUS_SUCCESS 0x00000000 #define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_IN_PAGE_ERROR 0xC0000006 #define STATUS_GUARD_PAGE_VIOLATION 0x80000001 Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -22,6 +22,7 @@ extern BOOLEAN _KdDebuggerNotPresent; extern BOOLEAN KdBreakAfterSymbolLoad; extern BOOLEAN KdPitchDebugger; +extern BOOLEAN KdIgnoreUmExceptions; BOOLEAN NTAPI @@ -131,6 +132,14 @@ PEXCEPTION_RECORD ExceptionRecord, PCONTEXT Context, PKTRAP_FRAME TrapFrame +); + +BOOLEAN +NTAPI +KdIsThisAKdTrap( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode ); /* INIT ROUTINES *************************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -72,6 +72,17 @@ ); // +// Determines if the kernel debugger must handle a particular trap +// +BOOLEAN +NTAPI +KdIsThisAKdTrap( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode +); + +// // Multi-Processor Switch Support // BOOLEAN @@ -147,7 +158,7 @@ ); // -// Debugger Enable, Enter and Exit +// Debugger Enter, Exit, Enable and Disable // BOOLEAN NTAPI @@ -165,6 +176,12 @@ NTSTATUS NTAPI KdEnableDebuggerWithLock( + IN BOOLEAN NeedLock +); + +NTSTATUS +NTAPI +KdDisableDebuggerWithLock( IN BOOLEAN NeedLock ); @@ -242,10 +259,10 @@ // // Breakpoint Support // -VOID -NTAPI -KdpRestoreAllBreakpoints( - VOID +ULONG +NTAPI +KdpAddBreakpoint( + IN PVOID Address ); BOOLEAN @@ -261,10 +278,22 @@ IN PVOID Limit ); -ULONG -NTAPI -KdpAddBreakpoint( - IN PVOID Address +VOID +NTAPI +KdpSuspendBreakPoint( + IN ULONG BpEntry +); + +VOID +NTAPI +KdpRestoreAllBreakpoints( + VOID +); + +VOID +NTAPI +KdpSuspendAllBreakPoints( + VOID ); // @@ -323,8 +352,8 @@ IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength ); @@ -335,8 +364,8 @@ IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength ); @@ -428,6 +457,8 @@ extern BOOLEAN _KdDebuggerNotPresent; extern BOOLEAN _KdDebuggerEnabled; extern BOOLEAN KdAutoEnableOnEvent; +extern BOOLEAN KdBlockEnable; +extern BOOLEAN KdIgnoreUmExceptions; extern BOOLEAN KdPreviouslyEnabled; extern BOOLEAN KdpDebuggerStructuresInitialized; extern BOOLEAN KdEnteredDebugger; Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -18,8 +18,9 @@ BOOLEAN KdDebuggerNotPresent = TRUE; BOOLEAN KiEnableTimerWatchdog = FALSE; BOOLEAN KdBreakAfterSymbolLoad = FALSE; -BOOLEAN KdpBreakPending; +BOOLEAN KdpBreakPending = FALSE; BOOLEAN KdPitchDebugger = TRUE; +BOOLEAN KdIgnoreUmExceptions = FALSE; VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); typedef struct @@ -200,6 +201,16 @@ return TRUE; } +BOOLEAN +NTAPI +KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode) +{ + /* KDBG has its own mechanism for ignoring user mode exceptions */ + return FALSE; +} + /* PUBLIC FUNCTIONS *********************************************************/ /* Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -68,8 +68,8 @@ KdpSysReadBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { @@ -83,8 +83,8 @@ KdpSysWriteBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { Modified: trunk/reactos/ntoskrnl/kd64/arm/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -68,8 +68,8 @@ KdpSysReadBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { @@ -83,8 +83,8 @@ KdpSysWriteBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { Modified: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -11,9 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#undef UNIMPLEMENTED -#define UNIMPLEMENTED KdpDprintf("%s is unimplemented\n", __FUNCTION__) /* FUNCTIONS *****************************************************************/ @@ -148,14 +145,21 @@ KdpSysReadBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Just forward to HAL */ + *ActualLength = HalGetBusDataByOffset(BusDataType, + BusNumber, + SlotNumber, + Buffer, + Offset, + Length); + + /* Return status */ + return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -163,14 +167,21 @@ KdpSysWriteBusData(IN ULONG BusDataType, IN ULONG BusNumber, IN ULONG SlotNumber, + IN ULONG Offset, IN PVOID Buffer, - IN ULONG Offset, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Just forward to HAL */ + *ActualLength = HalSetBusDataByOffset(BusDataType, + BusNumber, + SlotNumber, + Buffer, + Offset, + Length); + + /* Return status */ + return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -185,7 +196,7 @@ ULONG RealLength; /* Make sure that this is a valid request */ - if (((ULONG)BaseAddress < sizeof(KPROCESSOR_STATE)) && + if ((BaseAddress < sizeof(KPROCESSOR_STATE)) && (Processor < KeNumberProcessors)) { /* Get the actual length */ @@ -223,7 +234,7 @@ PVOID ControlStart; /* Make sure that this is a valid request */ - if ((((ULONG)BaseAddress + Length) <= sizeof(KPROCESSOR_STATE)) && + if (((BaseAddress + Length) <= sizeof(KPROCESSOR_STATE)) && (Processor < KeNumberProcessors)) { /* Set the proper address */ @@ -256,9 +267,75 @@ IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + NTSTATUS Status; + + /* Verify parameters */ + if ((InterfaceType != Isa) || + (BusNumber != 0) || + (AddressSpace != 1)) + { + /* Fail, we don't support this */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Check the size */ + switch (DataSize) + { + case sizeof(UCHAR): + + /* Read 1 byte */ + *(PUCHAR)DataValue = + READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)IoAddress); + *ActualDataSize = sizeof(UCHAR); + Status = STATUS_SUCCESS; + break; + + case sizeof(USHORT): + + /* Make sure the address is aligned */ + if ((IoAddress & (sizeof(USHORT) - 1)) != 0) + { + /* It isn't, bail out */ + *ActualDataSize = 0; + Status = STATUS_DATATYPE_MISALIGNMENT; + break; + } + + /* Read 2 bytes */ + *(PUSHORT)DataValue = + READ_PORT_USHORT((PUSHORT)(ULONG_PTR)IoAddress); + *ActualDataSize = sizeof(USHORT); + Status = STATUS_SUCCESS; + break; + + case sizeof(ULONG): + + /* Make sure the address is aligned */ + if ((IoAddress & (sizeof(ULONG) - 1)) != 0) + { + /* It isn't, bail out */ + *ActualDataSize = 0; + Status = STATUS_DATATYPE_MISALIGNMENT; + break; + } + + /* Read 4 bytes */ + *(PULONG)DataValue = + READ_PORT_ULONG((PULONG)(ULONG_PTR)IoAddress); + *ActualDataSize = sizeof(ULONG); + Status = STATUS_SUCCESS; + break; + + default: + + /* Invalid size, fail */ + *ActualDataSize = 0; + Status = STATUS_INVALID_PARAMETER; + } + + /* Return status */ + return Status; } NTSTATUS @@ -271,16 +348,81 @@ IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED; - while (TRUE); + NTSTATUS Status; + + /* Verify parameters */ + if ((InterfaceType != Isa) || + (BusNumber != 0) || + (AddressSpace != 1)) + { + /* Fail, we don't support this */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Check the size */ + switch (DataSize) + { + case sizeof(UCHAR): + + /* Write 1 byte */ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)IoAddress, + *(PUCHAR)DataValue); + *ActualDataSize = sizeof(UCHAR); + Status = STATUS_SUCCESS; + break; + + case sizeof(USHORT): + + /* Make sure the address is aligned */ + if ((IoAddress & (sizeof(USHORT) - 1)) != 0) + { + /* It isn't, bail out */ + *ActualDataSize = 0; + Status = STATUS_DATATYPE_MISALIGNMENT; + break; + } + + /* Write 2 bytes */ + WRITE_PORT_USHORT((PUSHORT)(ULONG_PTR)IoAddress, + *(PUSHORT)DataValue); + *ActualDataSize = sizeof(USHORT); + Status = STATUS_SUCCESS; + break; + + case sizeof(ULONG): + + /* Make sure the address is aligned */ + if ((IoAddress & (sizeof(ULONG) - 1)) != 0) + { + /* It isn't, bail out */ + *ActualDataSize = 0; + Status = STATUS_DATATYPE_MISALIGNMENT; + break; + } + + /* Write 4 bytes */ + WRITE_PORT_ULONG((PULONG)(ULONG_PTR)IoAddress, + *(PULONG)DataValue); + *ActualDataSize = sizeof(ULONG); + Status = STATUS_SUCCESS; + break; + + default: + + /* Invalid size, fail */ + *ActualDataSize = 0; + Status = STATUS_INVALID_PARAMETER; + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) +{ + /* Stubbed as we don't support PAE */ return STATUS_UNSUCCESSFUL; } - -NTSTATUS -NTAPI -KdpSysCheckLowMemory(IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -} Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -602,7 +602,7 @@ else { /* SMP not yet handled */ - KdpDprintf("SMP UNHANDLED\n"); + KdpDprintf("KdpGetContext: SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -653,7 +653,7 @@ else { /* SMP not yet handled */ - KdpDprintf("SMP UNHANDLED\n"); + KdpDprintf("KdpSetContext: SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -770,8 +770,8 @@ State->ReturnStatus = KdpSysReadBusData(GetBusData->BusDataType, GetBusData->BusNumber, GetBusData->SlotNumber, + GetBusData->Offset, Data->Buffer, - GetBusData->Offset, Length, &Length); @@ -803,8 +803,8 @@ State->ReturnStatus = KdpSysWriteBusData(SetBusData->BusDataType, SetBusData->BusNumber, SetBusData->SlotNumber, + SetBusData->Offset, Data->Buffer, - SetBusData->Offset, SetBusData->Length, &Length); @@ -1476,6 +1476,22 @@ return KeQueryPerformanceCounter(NULL); } +NTSTATUS +NTAPI +KdpAllowDisable(VOID) +{ + /* Check if we are on MP */ + if (KeNumberProcessors > 1) + { + /* TODO */ + KdpDprintf("KdpAllowDisable: SMP UNHANDLED\n"); + while (TRUE); + } + + /* Allow disable */ + return STATUS_SUCCESS; +} + BOOLEAN NTAPI KdEnterDebugger(IN PKTRAP_FRAME TrapFrame, @@ -1575,6 +1591,13 @@ OldIrql = PASSIVE_LEVEL; #endif + /* Check if enabling the debugger is blocked */ + if (KdBlockEnable) + { + /* It is, fail the enable */ + return STATUS_ACCESS_DENIED; + } + /* Check if we need to acquire the lock */ if (NeedLock) { @@ -1592,10 +1615,21 @@ /* Do the unlock */ KeLowerIrql(OldIrql); KdpPortUnlock(); - } - - /* Fail: We're already enabled */ - return STATUS_INVALID_PARAMETER; + + /* Fail: We're already enabled */ + return STATUS_INVALID_PARAMETER; + } + else + { + /* + * This can only happen if we are called from a bugcheck + * and were never initialized, so initialize the debugger now. + */ + KdInitSystem(0, NULL); + + /* Return success since we initialized */ + return STATUS_SUCCESS; + } } /* Decrease the disable count */ @@ -1609,6 +1643,98 @@ KdpRestoreAllBreakpoints(); } } + + /* Check if we had locked the port before */ + if (NeedLock) + { + /* Yes, now unlock it */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + } + + /* We're done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdDisableDebuggerWithLock(IN BOOLEAN NeedLock) +{ + KIRQL OldIrql; + NTSTATUS Status; + +#if defined(__GNUC__) + /* Make gcc happy */ + OldIrql = PASSIVE_LEVEL; +#endif + + /* + * If enabling the debugger is blocked + * then there is nothing to disable (duh) + */ + if (KdBlockEnable) + { + /* Fail */ + return STATUS_ACCESS_DENIED; + } + + /* Check if we need to acquire the lock */ + if (NeedLock) + { + /* Lock the port */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + KdpPortLock(); + } + + /* Check if we're not disabled */ + if (!KdDisableCount) + { + /* Check if the debugger was never actually initialized */ + if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) + { + /* It wasn't, so don't re-enable it later */ + KdPreviouslyEnabled = FALSE; + } + else + { + /* It was, so we will re-enable it later */ + KdPreviouslyEnabled = TRUE; + } + + /* Check if we were called from the exported API and are enabled */ + if ((NeedLock) && (KdPreviouslyEnabled)) + { + /* Check if it is safe to disable the debugger */ + Status = KdpAllowDisable(); + if (!NT_SUCCESS(Status)) + { + /* Release the lock and fail */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + return Status; + } + } + + /* Only disable the debugger if it is enabled */ + if (KdDebuggerEnabled) + { + /* + * Disable the debugger; suspend breakpoints + * and reset the debug stub + */ + KdpSuspendAllBreakPoints(); + KiDebugRoutine = KdpStub; + + /* We are disabled now */ + KdDebuggerEnabled = FALSE; +#undef KdDebuggerEnabled + SharedUserData->KdDebuggerEnabled = FALSE; +#define KdDebuggerEnabled _KdDebuggerEnabled + } + } + + /* Increment the disable count */ + KdDisableCount++; /* Check if we had locked the port before */ if (NeedLock) @@ -1632,9 +1758,18 @@ KdEnableDebugger(VOID) { /* Use the internal routine */ - KdpDprintf("KdEnableDebugger called\n"); - while (TRUE); return KdEnableDebuggerWithLock(TRUE); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KdDisableDebugger(VOID) +{ + /* Use the internal routine */ + return KdDisableDebuggerWithLock(TRUE); } /* @@ -1684,17 +1819,6 @@ /* * @unimplemented */ -NTSTATUS -NTAPI -KdDisableDebugger(VOID) -{ - /* HACK */ - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ BOOLEAN NTAPI KdRefreshDebuggerNotPresent(VOID) @@ -1721,4 +1845,3 @@ /* HACK */ return STATUS_SUCCESS; } - Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -183,7 +183,7 @@ BreakpointsSuspended = FALSE; /* Loop the breakpoints */ - for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++ ) + for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Check if they are valid, suspended breakpoints */ if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && @@ -195,3 +195,36 @@ } } } + +VOID +NTAPI +KdpSuspendBreakPoint(IN ULONG BpEntry) +{ + ULONG BpIndex = BpEntry - 1; + + /* Check if this is a valid, unsuspended breakpoint */ + if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && + !(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + { + /* Suspend it */ + KdpBreakpointTable[BpIndex].Flags |= KdpBreakpointSuspended; + KdpLowWriteContent(BpIndex); + } +} + +VOID +NTAPI +KdpSuspendAllBreakPoints(VOID) +{ + ULONG BpEntry; + + /* Breakpoints are suspended */ + BreakpointsSuspended = TRUE; + + /* Loop every breakpoint */ + for (BpEntry = 1; BpEntry <= KD_BREAKPOINT_MAX; BpEntry++) + { + /* Suspend it */ + KdpSuspendBreakPoint(BpEntry); + } +} Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -68,6 +68,8 @@ BOOLEAN _KdDebuggerNotPresent; BOOLEAN _KdDebuggerEnabled; BOOLEAN KdAutoEnableOnEvent; +BOOLEAN KdBlockEnable; +BOOLEAN KdIgnoreUmExceptions; BOOLEAN KdPreviouslyEnabled; BOOLEAN KdpDebuggerStructuresInitialized; BOOLEAN KdEnteredDebugger; @@ -83,6 +85,9 @@ BOOLEAN BreakpointsSuspended; ULONG KdpNumInternalBreakpoints; +// +// Symbol Data +// ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; // Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -72,14 +72,19 @@ KdInitSystem(IN ULONG BootPhase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN EnableKd; - LPSTR CommandLine, DebugLine; + BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable; + LPSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd; ANSI_STRING ImageName; PLDR_DATA_TABLE_ENTRY LdrEntry; PLIST_ENTRY NextEntry; - ULONG i, j, Length; + ULONG i, j, Length, DebugOptionLength; CHAR NameBuffer[256]; PWCHAR Name; + +#if defined(__GNUC__) + /* Make gcc happy */ + BlockEnable = FALSE; +#endif /* Check if this is Phase 1 */ if (BootPhase) @@ -166,10 +171,87 @@ /* Enable KD */ EnableKd = TRUE; - /* Check if there was additional data */ + /* Check if there are any options */ if (DebugLine[5] == '=') { - /* FIXME: Check for NOUMEX, DISABLE, AUTOENABLE */ + /* Save pointers */ + DebugOptionStart = DebugOptionEnd = &DebugLine[6]; + + /* Scan the string for debug options */ + for (;;) + { + /* Loop until we reach the end of the string */ + while (*DebugOptionEnd != ANSI_NULL) + { + /* Check if this is a comma, a space or a tab */ + if ((*DebugOptionEnd == ',') || + (*DebugOptionEnd == ' ') || + (*DebugOptionEnd == ' ')) + { + /* + * We reached the end of the option or + * the end of the string, break out + */ + break; + } + else + { + /* Move on to the next character */ + DebugOptionEnd++; + } + } + + /* Calculate the length of the current option */ + DebugOptionLength = ((ULONG_PTR)DebugOptionEnd - + (ULONG_PTR)DebugOptionStart); + + /* + * Break out if we reached the last option + * or if there were no options at all + */ + if (!DebugOptionLength) break; + + /* Now check which option this is */ + if ((DebugOptionLength == 10) && + !(strncmp(DebugOptionStart, "AUTOENABLE", 10))) + { + /* + * Disable the debugger, but + * allow it to be reenabled + */ + DisableKdAfterInit = TRUE; + BlockEnable = FALSE; + KdAutoEnableOnEvent = TRUE; + } + else if ((DebugOptionLength == 7) && + !(strncmp(DebugOptionStart, "DISABLE", 7))) + { + /* Disable the debugger */ + DisableKdAfterInit = TRUE; + BlockEnable = TRUE; + KdAutoEnableOnEvent = FALSE; + } + else if ((DebugOptionLength == 6) && + !(strncmp(DebugOptionStart, "NOUMEX", 6))) + { + /* Ignore user mode exceptions */ + KdIgnoreUmExceptions = TRUE; + } + + /* + * If there are more options then + * the next character should be a comma + */ + if (*DebugOptionEnd != ',') + { + /* It isn't, break out */ + break; + } + + /* Move on to the next option */ + DebugOptionEnd++; + DebugOptionStart = DebugOptionEnd; + } } } } @@ -182,7 +264,7 @@ } else { - /* Called from a bugcheck...Save the Kernel Base */ + /* Called from a bugcheck or a re-enable. Save the Kernel Base */ KdVersionBlock.KernBase = (ULONG64)(LONG_PTR)PsNtosImageBase; /* Unconditionally enable KD */ @@ -225,6 +307,20 @@ #undef KdDebuggerEnabled SharedUserData->KdDebuggerEnabled = TRUE; #define KdDebuggerEnabled _KdDebuggerEnabled + + /* Check if the debugger should be disabled initially */ + if (DisableKdAfterInit) + { + /* Disable it */ + KdDisableDebuggerWithLock(FALSE); + + /* + * Save the enable block state and return initialized + * (the debugger is active but disabled). + */ + KdBlockEnable = BlockEnable; + return TRUE; + } /* Check if we have a loader block */ if (LoaderBlock) Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -289,3 +289,24 @@ return FALSE; } } + +BOOLEAN +NTAPI +KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode) +{ + /* Check if this is a breakpoint or a valid debug service */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->NumberParameters > 0) && + (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) + { + /* Then we have to handle it */ + return TRUE; + } + else + { + /* We don't have to handle it */ + return FALSE; + } +} Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -928,11 +928,19 @@ /* User mode exception, was it first-chance? */ if (FirstChance) { - /* Make sure a debugger is present, and ignore user-mode if requested */ - if ((KiDebugRoutine) && - (!(PsGetCurrentProcess()->DebugPort))) - { - /* Call the debugger */ + /* + * Break into the kernel debugger unless a user mode debugger + * is present or user mode exceptions are ignored, unless this is + * a breakpoint or a debug service in which case we have to + * handle it. + */ + if ((!(PsGetCurrentProcess()->DebugPort) && + !(KdIgnoreUmExceptions)) || + (KdIsThisAKdTrap(ExceptionRecord, + &Context, + PreviousMode))) + { + /* Call the kernel debugger */ if (KiDebugRoutine(TrapFrame, ExceptionFrame, ExceptionRecord, @@ -946,7 +954,7 @@ } /* Forward exception to user mode debugger */ - if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) goto Exit; + if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) return; /* Set up the user-stack */ DispatchToUser: @@ -1032,12 +1040,12 @@ if (DbgkForwardException(ExceptionRecord, TRUE, TRUE)) { /* Handled, get out */ - goto Exit; + return; } else if (DbgkForwardException(ExceptionRecord, FALSE, TRUE)) { /* Handled, get out */ - goto Exit; + return; } /* 3rd strike, kill the process */ @@ -1061,7 +1069,6 @@ TrapFrame, Context.ContextFlags, PreviousMode); -Exit: return; } Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -781,7 +781,7 @@ TRAP_PROLOG kit3_a, kit3_t /* Set status code */ - mov eax, 0 //STATUS_SUCCESS + mov eax, STATUS_SUCCESS /* Check for V86 */ PrepareInt3: Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Oct 17 16:31:38 2009 @@ -271,13 +271,15 @@ <file>pnproot.c</file> </directory> </directory> - <directory name="kd"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>kdmemsup.c</file> - </directory> - </if> - </directory> + <if property="KDBG" value="1"> + <directory name="kd"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>kdmemsup.c</file> + </directory> + </if> + </directory> + </if> <if property="_WINKD_" value="0"> <directory name="kdbg"> <if property="ARCH" value="i386">

1 0

[hpoussin] 43529: [freeldr] FAT driver: check for directory attribute before parsing the next part of filename Implement OpenDirectory mode in FAT driver
by hpoussin＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: hpoussin Date: Sat Oct 17 16:05:34 2009 New Revision: 43529 URL: http://svn.reactos.org/svn/reactos?rev=43529&view=rev Log: [freeldr] FAT driver: check for directory attribute before parsing the next part of filename Implement OpenDirectory mode in FAT driver Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Oct 17 16:05:34 2009 @@ -1,6 +1,7 @@ /* * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2009 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -598,6 +599,7 @@ // // We found the entry, now fill in the FAT_FILE_INFO struct // + FatFileInfoPointer->Attributes = DirEntry->Attr; FatFileInfoPointer->FileSize = DirEntry->Size; FatFileInfoPointer->FilePointer = 0; @@ -791,6 +793,14 @@ // if ((i+1) < NumberOfPathParts) { + // + // Check if current entry is a directory + // + if (!FatFileInfo.Attributes & ATTR_DIRECTORY) + { + MmFreeMemory(FatFileInfo.FileFatChain); + return ENOTDIR; + } DirectoryStartCluster = FatFileInfo.FileFatChain[0]; } MmFreeMemory(FatFileInfo.FileFatChain); @@ -1347,9 +1357,10 @@ FAT_FILE_INFO TempFileInfo; PFAT_FILE_INFO FileHandle; ULONG DeviceId; + BOOLEAN IsDirectory; LONG ret; - if (OpenMode != OpenReadOnly) + if (OpenMode != OpenReadOnly && OpenMode != OpenDirectory) return EACCES; DeviceId = FsGetDeviceId(*FileId); @@ -1361,6 +1372,15 @@ ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) return ENOENT; + + // + // Check if caller opened what he expected (dir vs file) + // + IsDirectory = (TempFileInfo.Attributes & ATTR_DIRECTORY) != 0; + if (IsDirectory && OpenMode != OpenDirectory) + return EISDIR; + else if (!IsDirectory && OpenMode != OpenReadOnly) + return ENOTDIR; FileHandle = MmHeapAlloc(sizeof(FAT_FILE_INFO)); if (!FileHandle) Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] Sat Oct 17 16:05:34 2009 @@ -148,6 +148,7 @@ typedef struct { + UCHAR Attributes; /* File attributes */ ULONG FileSize; /* File size */ ULONG FilePointer; /* File pointer */ ULONG* FileFatChain; /* File fat chain array */

1 0

[fireball] 43528: [fastfat_new] - Implement FatiOpenExistingFcb. - Make FatGetFcbUnicodeName supporting DCBs. - Implement FF_OpenW wrapper around FullFAT to support opening files/dirs using a unicode name.
by fireball＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: fireball Date: Sat Oct 17 15:18:29 2009 New Revision: 43528 URL: http://svn.reactos.org/svn/reactos?rev=43528&view=rev Log: [fastfat_new] - Implement FatiOpenExistingFcb. - Make FatGetFcbUnicodeName supporting DCBs. - Implement FF_OpenW wrapper around FullFAT to support opening files/dirs using a unicode name. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c trunk/reactos/drivers/filesystems/fastfat_new/lock.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -10,16 +10,6 @@ #define NDEBUG #include "fastfat.h" - -NTSYSAPI -NTSTATUS -NTAPI -RtlUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING DestinationString, - IN PCUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString -); - /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -34,6 +34,15 @@ { \ ExReleaseResourceLite(&(FatGlobalData.Resource)); \ } + +NTSYSAPI +NTSTATUS +NTAPI +RtlUpcaseUnicodeStringToCountedOemString( + IN OUT POEM_STRING DestinationString, + IN PCUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); /* ------------------------------------------------------ shutdown.c */ @@ -211,6 +220,14 @@ NTSTATUS NTAPI FatLockControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +VOID NTAPI +FatOplockComplete(IN PVOID Context, + IN PIRP Irp); + +VOID NTAPI +FatPrePostIrp(IN PVOID Context, + IN PIRP Irp); + /* --------------------------------------------------------- fsctl.c */ NTSTATUS NTAPI @@ -220,6 +237,10 @@ NTSTATUS NTAPI FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +/* --------------------------------------------------------- fullfat.c */ + +FF_FILE *FF_OpenW(FF_IOMAN *pIoman, PUNICODE_STRING pathW, FF_T_UINT8 Mode, FF_ERROR *pError); /* --------------------------------------------------------- iface.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -133,9 +133,10 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define VCB_STATE_FLAG_LOCKED 0x01 -#define VCB_STATE_FLAG_DIRTY 0x02 -#define VCB_STATE_MOUNTED_DIRTY 0x04 +#define VCB_STATE_FLAG_LOCKED 0x01 +#define VCB_STATE_FLAG_DIRTY 0x02 +#define VCB_STATE_MOUNTED_DIRTY 0x04 +#define VCB_STATE_CREATE_IN_PROGRESS 0x08 typedef enum _VCB_CONDITION { @@ -249,6 +250,8 @@ #define FCB_STATE_HAS_NAMES 0x01 #define FCB_STATE_HAS_UNICODE_NAME 0x02 +#define FCB_STATE_PAGEFILE 0x04 +#define FCB_STATE_DELAY_CLOSE 0x08 typedef struct _FCB { @@ -264,7 +267,6 @@ ERESOURCE Resource; // nonpaged! ERESOURCE PagingIoResource; // nonpaged! - FILE_LOCK Lock; /* First cluster in the fat allocation chain */ ULONG FirstClusterOfFile; /* A list of all FCBs of that DCB */ @@ -307,6 +309,13 @@ { struct { + /* File and Op locks */ + FILE_LOCK Lock; + OPLOCK Oplock; + } Fcb; + + struct + { /* A list of all FCBs/DCBs opened under this DCB */ LIST_ENTRY ParentDcbList; /* Directory data stream (just handy to have it). */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -191,9 +191,243 @@ OUT PBOOLEAN OplockPostIrp) { IO_STATUS_BLOCK Iosb = {{0}}; - - Iosb.Status = STATUS_NOT_IMPLEMENTED; - UNIMPLEMENTED; + ACCESS_MASK AddedAccess = 0; + BOOLEAN Hidden; + BOOLEAN System; + PCCB Ccb = NULL; + NTSTATUS Status; + + /* Acquire exclusive FCB lock */ + (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); + + *OplockPostIrp = FALSE; + + /* Check if there is a batch oplock */ + if (FsRtlCurrentBatchOplock(&Fcb->Fcb.Oplock)) + { + /* Return with a special information field */ + Iosb.Information = FILE_OPBATCH_BREAK_UNDERWAY; + + /* Check the oplock */ + Iosb.Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + IrpContext->Irp, + IrpContext, + FatOplockComplete, + FatPrePostIrp); + + if (Iosb.Status != STATUS_SUCCESS && + Iosb.Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) + { + /* The Irp needs to be queued */ + *OplockPostIrp = TRUE; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + } + + /* Validate parameters and modify access */ + if (CreateDisposition == FILE_CREATE) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + else if (CreateDisposition == FILE_SUPERSEDE) + { + SetFlag(AddedAccess, DELETE & ~(*DesiredAccess)); + *DesiredAccess |= DELETE; + } + else if ((CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + SetFlag(AddedAccess, + (FILE_WRITE_DATA | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES) + & ~(*DesiredAccess) ); + + *DesiredAccess |= FILE_WRITE_DATA | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES; + } + + // TODO: Check desired access + + // TODO: Check if this file is readonly and DeleteOnClose is set + + /* Validate disposition information */ + if ((CreateDisposition == FILE_SUPERSEDE) || + (CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + // TODO: Get this attributes from the dirent + Hidden = FALSE; + System = FALSE; + + if ((Hidden && !FlagOn(FileAttributes, FILE_ATTRIBUTE_HIDDEN)) || + (System && !FlagOn(FileAttributes, FILE_ATTRIBUTE_SYSTEM))) + { + DPRINT1("Hidden/system attributes don't match\n"); + + Iosb.Status = STATUS_ACCESS_DENIED; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + // TODO: Check for write protected volume + } + + /* Check share access */ + Iosb.Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Fcb->ShareAccess, + FALSE); + if (!NT_SUCCESS(Iosb.Status)) + { + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + /* Check the oplock status after checking for share access */ + Iosb.Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + IrpContext->Irp, + IrpContext, + FatOplockComplete, + FatPrePostIrp ); + + if (Iosb.Status != STATUS_SUCCESS && + Iosb.Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) + { + /* The Irp needs to be queued */ + *OplockPostIrp = TRUE; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + /* Set Fast I/O flag */ + Fcb->Header.IsFastIoPossible = FALSE; //FatiIsFastIoPossible(Fcb); + + /* Make sure image is not mapped */ + if (DeleteOnClose || FlagOn(*DesiredAccess, FILE_WRITE_DATA)) + { + /* Try to flush the image section */ + if (!MmFlushImageSection(&Fcb->SectionObjectPointers, MmFlushForWrite)) + { + /* Yes, image section exists, set correct status code */ + if (DeleteOnClose) + Iosb.Status = STATUS_CANNOT_DELETE; + else + Iosb.Status = STATUS_SHARING_VIOLATION; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + } + + /* Flush the cache if it's non-cached non-pagefile access */ + if (FlagOn(FileObject->Flags, FO_NO_INTERMEDIATE_BUFFERING) && + Fcb->SectionObjectPointers.DataSectionObject && + !FlagOn(Fcb->State, FCB_STATE_PAGEFILE)) + { + /* Set the flag that create is in progress */ + SetFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + + /* Flush the cache */ + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + + /* Acquire and release Paging I/O resource before purging the cache section + to let lazy writer finish */ + ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE); + ExReleaseResourceLite( Fcb->Header.PagingIoResource ); + + /* Delete the cache section */ + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + + /* Clear the flag */ + ClearFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + } + + /* Check create disposition flags and branch accordingly */ + if (CreateDisposition == FILE_OPEN || + CreateDisposition == FILE_OPEN_IF) + { + DPRINT("Opening a file\n"); + + /* Check if we need to bother with EA */ + if (NoEaKnowledge && FALSE /* FatIsFat32(Vcb)*/) + { + UNIMPLEMENTED; + } + + /* Set up file object */ + Ccb = FatCreateCcb(IrpContext); + FatSetFileObject(FileObject, + UserFileOpen, + Fcb, + Ccb); + + FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + /* The file is opened */ + Iosb.Information = FILE_OPENED; + goto SuccComplete; + } + else if ((CreateDisposition == FILE_SUPERSEDE) || + (CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + UNIMPLEMENTED; + ASSERT(FALSE); + } + else + { + /* We can't get here */ + KeBugCheckEx(0x23, CreateDisposition, 0, 0, 0); + } + + +SuccComplete: + /* If all is fine */ + if (Iosb.Status != STATUS_PENDING && + NT_SUCCESS(Iosb.Status)) + { + /* Update access if needed */ + if (AddedAccess) + { + /* Remove added access flags from desired access */ + ClearFlag(*DesiredAccess, AddedAccess); + + /* Check share access */ + Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Fcb->ShareAccess, + TRUE); + + /* Make sure it's success */ + ASSERT(Status == STATUS_SUCCESS); + } + else + { + /* Update the share access */ + IoUpdateShareAccess(FileObject, &Fcb->ShareAccess); + } + + /* Clear the delay close */ + ClearFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + + /* Increase global volume counter */ + Vcb->OpenFileCount++; + + // TODO: Handle DeleteOnClose and OpenedAsDos by storing those flags in CCB + } return Iosb; } @@ -213,11 +447,16 @@ OEM_STRING LongNameOem; NTSTATUS Status; - /* We support only files now, not directories */ - if (Fcb->Header.NodeTypeCode != FAT_NTC_FCB) - { - UNIMPLEMENTED; - ASSERT(FALSE); + /* Make sure this FCB has a FullFAT handle associated with it */ + if (Fcb->FatHandle == NULL && + FatNodeType(Fcb) == FAT_NTC_DCB) + { + /* Open the dir with FullFAT */ + Fcb->FatHandle = FF_OpenW(Fcb->Vcb->Ioman, &Fcb->FullFileName, FF_MODE_DIR, NULL); + if (!Fcb->FatHandle) + { + ASSERT(FALSE); + } } /* Get the dir entry */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -77,4 +77,27 @@ return Count; } +FF_FILE *FF_OpenW(FF_IOMAN *pIoman, PUNICODE_STRING pathW, FF_T_UINT8 Mode, FF_ERROR *pError) +{ + OEM_STRING AnsiName; + CHAR AnsiNameBuf[512]; + NTSTATUS Status; + + /* Convert the name to ANSI */ + AnsiName.Buffer = AnsiNameBuf; + AnsiName.Length = 0; + AnsiName.MaximumLength = sizeof(AnsiNameBuf); + RtlZeroMemory(AnsiNameBuf, sizeof(AnsiNameBuf)); + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiName, pathW, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + DPRINT1("Opening '%s'\n", AnsiName.Buffer); + + /* Call FullFAT's handler */ + return FF_Open(pIoman, AnsiName.Buffer, Mode, pError); +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -21,4 +21,20 @@ return STATUS_NOT_IMPLEMENTED; } +VOID +NTAPI +FatOplockComplete(IN PVOID Context, + IN PIRP Irp) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +FatPrePostIrp(IN PVOID Context, + IN PIRP Irp) +{ + UNIMPLEMENTED; +} + /* EOF */

1 0

[fireball] 43527: [fastfat_new] - Search FCBs with unicode name too, besides of OEM. - Create an infrastructure for opening existing FCB/DCBs.
by fireball＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: fireball Date: Sat Oct 17 12:57:48 2009 New Revision: 43527 URL: http://svn.reactos.org/svn/reactos?rev=43527&view=rev Log: [fastfat_new] - Search FCBs with unicode name too, besides of OEM. - Create an infrastructure for opening existing FCB/DCBs. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -353,10 +353,11 @@ IO_STATUS_BLOCK Iosb; PIO_STACK_LOCATION IrpSp; BOOLEAN EndBackslash = FALSE, OpenedAsDos; - UNICODE_STRING RemainingPart, FirstName, NextName; + UNICODE_STRING RemainingPart, FirstName, NextName, FileNameUpcased; OEM_STRING AnsiFirstName; FF_ERROR FfError; TYPE_OF_OPEN TypeOfOpen; + BOOLEAN OplockPostIrp = FALSE; Iosb.Status = STATUS_SUCCESS; @@ -684,10 +685,22 @@ &OpenedAsDos); } - /* Check if we found anything */ + /* If nothing found - try with unicode */ if (!NextFcb && Fcb->Dcb.SplayLinksUnicode) { - ASSERT(FALSE); + FileNameUpcased.Buffer = FsRtlAllocatePool(PagedPool, FirstName.Length); + FileNameUpcased.Length = 0; + FileNameUpcased.MaximumLength = FirstName.Length; + + /* Downcase and then upcase to normalize it */ + Status = RtlDowncaseUnicodeString(&FileNameUpcased, &FirstName, FALSE); + Status = RtlUpcaseUnicodeString(&FileNameUpcased, &FileNameUpcased, FALSE); + + /* Try to find FCB again using unicode name */ + NextFcb = FatFindFcb(IrpContext, + &Fcb->Dcb.SplayLinksUnicode, + (PSTRING)&FileNameUpcased, + &OpenedAsDos); } /* Move to the next FCB */ @@ -729,8 +742,116 @@ /* We have a valid FCB now */ if (!RemainingPart.Length) { - DPRINT1("It's possible to open an existing FCB\n"); - ASSERT(FALSE); + /* Check for target dir open */ + if (OpenTargetDirectory) + { + DPRINT1("Opening target dir is missing\n"); + ASSERT(FALSE); + } + + /* Check this FCB's type */ + if (FatNodeType(Fcb) == FAT_NTC_ROOT_DCB || + FatNodeType(Fcb) == FAT_NTC_DCB) + { + /* Open a directory */ + if (NonDirectoryFile) + { + /* Forbidden */ + Iosb.Status = STATUS_FILE_IS_A_DIRECTORY; + ASSERT(FALSE); + return Iosb.Status; + } + + /* Open existing DCB */ + Iosb = FatiOpenExistingDcb(IrpContext, + FileObject, + Vcb, + Fcb, + DesiredAccess, + ShareAccess, + CreateDisposition, + NoEaKnowledge, + DeleteOnClose); + + /* Save information */ + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } + else if (FatNodeType(Fcb) == FAT_NTC_FCB) + { + /* Open a file */ + if (OpenDirectory) + { + /* Forbidden */ + Iosb.Status = STATUS_NOT_A_DIRECTORY; + ASSERT(FALSE); + return Iosb.Status; + } + + /* Check for trailing backslash */ + if (EndBackslash) + { + /* Forbidden */ + Iosb.Status = STATUS_OBJECT_NAME_INVALID; + ASSERT(FALSE); + return Iosb.Status; + } + + Iosb = FatiOpenExistingFcb(IrpContext, + FileObject, + Vcb, + Fcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + NoEaKnowledge, + DeleteOnClose, + OpenedAsDos, + &OplockPostIrp); + + /* Check if it's pending */ + if (Iosb.Status != STATUS_PENDING) + { + /* In case of success set cache supported flag */ + if (NT_SUCCESS(Iosb.Status) && !NoIntermediateBuffering) + { + SetFlag(FileObject->Flags, FO_CACHE_SUPPORTED); + } + + /* Save information */ + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } + else + { + /* Queue this IRP */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + } + else + { + /* Unexpected FCB type */ + KeBugCheckEx(/*FAT_FILE_SYSTEM*/0x23, __LINE__, (ULONG_PTR)Fcb, 0, 0); + } } /* During parsing we encountered a part which has no attached FCB/DCB. Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -173,4 +173,24 @@ return Fcb; } +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Dcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + + Iosb.Status = STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + + return Iosb; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -86,6 +86,17 @@ IN PVCB Vcb, IN PFCB ParentDcb, IN FF_FILE *FileHandle); + +IO_STATUS_BLOCK NTAPI +FatiOpenExistingDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Dcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose); /* -------------------------------------------------------- create.c */ @@ -296,6 +307,23 @@ IN PFCB ParentDcb, IN FF_FILE *FileHandle); +IO_STATUS_BLOCK NTAPI +FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose, + IN BOOLEAN OpenedAsDos, + OUT PBOOLEAN OplockPostIrp); + PFCB NTAPI FatFindFcb(PFAT_IRP_CONTEXT IrpContext, PRTL_SPLAY_LINKS *RootNode, Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -170,6 +170,32 @@ Ccb->NodeByteSize = sizeof(CCB); return Ccb; +} + +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose, + IN BOOLEAN OpenedAsDos, + OUT PBOOLEAN OplockPostIrp) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + + Iosb.Status = STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + + return Iosb; } VOID

1 0

[cfinck] 43526: Add a newline after KDBG is hit for the second time, so that the following SysregPrintf message can be properly detected by Testman's BuildBot Aggregator script.
by cfinck＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: cfinck Date: Sat Oct 17 12:13:48 2009 New Revision: 43526 URL: http://svn.reactos.org/svn/reactos?rev=43526&view=rev Log: Add a newline after KDBG is hit for the second time, so that the following SysregPrintf message can be properly detected by Testman's BuildBot Aggregator script. Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=43526&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Oct 17 12:13:48 2009 @@ -179,6 +179,7 @@ else { /* We hit it yet another time, give up here */ + printf("\n"); Ret = EXIT_CONTINUE; goto cleanup; }

1 0

[dreimer] 43525: Added 11 new Backs for my bavarian cards dll. Way better than 12 times the same ; -)
by dreimer＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: dreimer Date: Sat Oct 17 02:09:51 2009 New Revision: 43525 URL: http://svn.reactos.org/svn/reactos?rev=43525&view=rev Log: Added 11 new Backs for my bavarian cards dll. Way better than 12 times the same ;-) Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp (with props) Removed: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp Modified: trunk/reactos/dll/win32/cards/cards.rc Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] Sat Oct 17 02:09:51 2009 @@ -152,18 +152,18 @@ 51 BITMAP "res/bavarian/GrasOber.bmp" 52 BITMAP "res/bavarian/GrasKoenig.bmp" 53 BITMAP "res/bavarian/FreeCard.bmp" - 54 BITMAP "res/bavarian/Ruecken.bmp" - 55 BITMAP "res/bavarian/Ruecken.bmp" - 56 BITMAP "res/bavarian/Ruecken.bmp" - 57 BITMAP "res/bavarian/Ruecken.bmp" - 58 BITMAP "res/bavarian/Ruecken.bmp" - 59 BITMAP "res/bavarian/Ruecken.bmp" - 60 BITMAP "res/bavarian/Ruecken.bmp" - 61 BITMAP "res/bavarian/Ruecken.bmp" - 62 BITMAP "res/bavarian/Ruecken.bmp" - 63 BITMAP "res/bavarian/Ruecken.bmp" - 64 BITMAP "res/bavarian/Ruecken.bmp" - 65 BITMAP "res/bavarian/Ruecken.bmp" + 54 BITMAP "res/bavarian/Ruecken1.bmp" + 55 BITMAP "res/bavarian/Ruecken2.bmp" + 56 BITMAP "res/bavarian/Ruecken3.bmp" + 57 BITMAP "res/bavarian/Ruecken4.bmp" + 58 BITMAP "res/bavarian/Ruecken5.bmp" + 59 BITMAP "res/bavarian/Ruecken6.bmp" + 60 BITMAP "res/bavarian/Ruecken7.bmp" + 61 BITMAP "res/bavarian/Ruecken8.bmp" + 62 BITMAP "res/bavarian/Ruecken9.bmp" + 63 BITMAP "res/bavarian/Ruecken10.bmp" + 64 BITMAP "res/bavarian/Ruecken11.bmp" + 65 BITMAP "res/bavarian/Ruecken12.bmp" 66 BITMAP "res/bavarian/Joker.bmp" 67 BITMAP "res/bavarian/XSign.bmp" 68 BITMAP "res/bavarian/OSign.bmp" Removed: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 43524: ULONG -> ULONG_PTR when casting handles
by tkreuzer＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: tkreuzer Date: Sat Oct 17 01:11:28 2009 New Revision: 43524 URL: http://svn.reactos.org/svn/reactos?rev=43524&view=rev Log: ULONG -> ULONG_PTR when casting handles Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sat Oct 17 01:11:28 2009 @@ -1815,7 +1815,7 @@ if (DeviceInfo->Flags == MIXER_GETLINEINFOF_DESTINATION) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); @@ -1826,7 +1826,7 @@ /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DESTINATION_LINE); ASSERT(MixerLineSrc); /* copy cached data */ @@ -1835,13 +1835,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_SOURCE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DESTINATION_LINE); ASSERT(MixerLineSrc); if (DeviceInfo->u.MixLine.dwSource >= MixerLineSrc->Line.cConnections) @@ -1851,7 +1851,7 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLine(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwSource); + MixerLineSrc = GetSourceMixerLine(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwSource); if (MixerLineSrc) { DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); @@ -1861,13 +1861,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_LINEID) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); if (!MixerLineSrc) { DPRINT1("Failed to find Line with id %u\n", DeviceInfo->u.MixLine.dwLineID); @@ -1880,13 +1880,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); + MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); ASSERT(MixerLineSrc); /* copy cached data */ @@ -1923,13 +1923,13 @@ if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ALL) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); ASSERT(MixerLineSrc); if (MixerLineSrc) { @@ -1939,13 +1939,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); ASSERT(MixerLineSrc); Index = 0; @@ -1963,13 +1963,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYID) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - DPRINT1("MixerId %u ControlId %u\n",(ULONG)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); + DPRINT1("MixerId %u ControlId %u\n",(ULONG_PTR)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); if (NT_SUCCESS(Status)) { RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); @@ -2173,7 +2173,7 @@ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get mixer control */ - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); if (!NT_SUCCESS(Status)) { @@ -2225,7 +2225,7 @@ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get mixer control */ - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); if (!NT_SUCCESS(Status)) {

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