Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[ros-arm-bringup] 34469: - Uncomment the check to see if we came from kernel or user mode, since we can now do this after the major trap fixes

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 17:14:43 2008 New Revision: 34469 URL: http://svn.reactos.org/svn/reactos?rev=34469&view=rev Log: - Uncomment the check to see if we came from kernel or user mode, since we can now do this after the major trap fixes Modified: trunk/reactos/ntoskrnl/ke/arm/time.c Modified: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] Sun Jul 13 17:14:43 2008 @@ -182,7 +182,7 @@ // // Check if we came from user mode // - if (0) //(TrapFrame->PreviousMode != KernelMode) + if (TrapFrame->PreviousMode != KernelMode) { // // Increase process user time

16 years, 2 months

[silverblade] 34468: Made parameter checks macro-based, and added other validation and debugging code. Basically a code tidy-up with some additional code to prevent/detect bugs.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 13 15:48:50 2008 New Revision: 34468 URL: http://svn.reactos.org/svn/reactos?rev=34468&view=rev Log: Made parameter checks macro-based, and added other validation and debugging code. Basically a code tidy-up with some additional code to prevent/detect bugs. Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,12 +62,27 @@ } \ } +#define TRACE_ENTRY() \ + TRACE_("entered function\n") + +#define TRACE_EXIT(retval) \ + TRACE_("returning %d (0x%x)\n", (int)retval, (int)retval) + #endif /* Some memory allocation helper macros */ + +#define AllocateMemory(amount) \ + AllocateTaggedMemory(0x00000000, amount) + +#define FreeMemory(ptr) \ + FreeTaggedMemory(0x00000000, ptr) + +#define AllocateTaggedMemoryFor(tag, thing) \ + (thing*) AllocateTaggedMemory(tag, sizeof(thing)) #define AllocateMemoryFor(thing) \ (thing*) AllocateMemory(sizeof(thing)) @@ -85,11 +100,30 @@ CopyMemory(dest, source, StringLengthToBytes(WCHAR, wcslen(source))) +/* + Helps find the minimum/maximum of two values +*/ + #define MinimumOf(value_a, value_b) \ ( value_a < value_b ? value_a : value_b ) #define MaximumOf(value_a, value_b) \ ( value_a > value_b ? value_a : value_b ) + + +/* + Validation +*/ + +#define VALIDATE_MMSYS_PARAMETER(parameter_condition) \ + { \ + if ( ! (parameter_condition) ) \ + { \ + ERR_("Parameter check: %s\n", #parameter_condition); \ + TRACE_EXIT(MMSYSERR_INVALPARAM); \ + return MMSYSERR_INVALPARAM; \ + } \ + } struct _SOUND_DEVICE; @@ -208,6 +242,8 @@ Represents an audio device */ +#define SOUND_DEVICE_TAG "SndD" + typedef struct _SOUND_DEVICE { struct _SOUND_DEVICE* Next; @@ -221,6 +257,8 @@ /* Represents an individual instance of an audio device */ + +#define WAVE_STREAM_INFO_TAG "WavS" typedef struct _WAVE_STREAM_INFO { @@ -237,6 +275,9 @@ DWORD BuffersOutstanding; } WAVE_STREAM_INFO, *PWAVE_STREAM_INFO; + +#define SOUND_DEVICE_INSTANCE_TAG "SndI" + typedef struct _SOUND_DEVICE_INSTANCE { struct _SOUND_DEVICE_INSTANCE* Next; @@ -465,11 +506,13 @@ */ PVOID -AllocateMemory( +AllocateTaggedMemory( + IN DWORD Tag, IN DWORD Size); VOID -FreeMemory( +FreeTaggedMemory( + IN DWORD Tag, IN PVOID Pointer); DWORD @@ -482,6 +525,9 @@ MMRESULT Win32ErrorToMmResult(IN UINT error_code); +MMRESULT +TranslateInternalMmResult(MMRESULT Result); + /* instances.c @@ -521,7 +567,7 @@ MMRESULT GetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUNIVERSAL_CAPS Capabilities); MMRESULT Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -17,16 +17,13 @@ MMRESULT GetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUNIVERSAL_CAPS Capabilities) { - if ( ! Device ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Capabilities ); - if ( ! Capabilities ) - return MMSYSERR_INVALPARAM; - - return Device->Functions.GetCapabilities(Device, Capabilities); + return SoundDevice->Functions.GetCapabilities(SoundDevice, Capabilities); } MMRESULT @@ -41,13 +38,10 @@ MMRESULT Result; DWORD BytesReturned; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Capabilities ); + ZeroMemory(Capabilities, sizeof(UNIVERSAL_CAPS)); - - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! Capabilities ) - return MMSYSERR_INVALPARAM; /* Select appropriate IOCTL and capabilities structure */ switch ( SoundDevice->DeviceType ) @@ -96,7 +90,8 @@ if ( Result != MMSYSERR_NOERROR ) { - return Result; /* OK? */ + Result = TranslateInternalMmResult(Result); + return Result; } /* Call the driver */ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -23,17 +23,27 @@ ULONG SoundDeviceTotals[SOUND_DEVICE_TYPES]; PSOUND_DEVICE SoundDeviceLists[SOUND_DEVICE_TYPES]; +#define DEVICE_TYPE_TO_INDEX(device_type) \ + ( device_type - MIN_SOUND_DEVICE_TYPE ) + ULONG GetSoundDeviceCount( IN UCHAR DeviceType) { + ULONG Count; + TRACE_ENTRY(); + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) { + TRACE_EXIT(0); return 0; } - return SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE]; + Count = SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE]; + + TRACE_EXIT(Count); + return Count; } @@ -42,6 +52,8 @@ IN PSOUND_DEVICE Device, IN PMMFUNCTION_TABLE SourceFunctionTable) { + TRACE_ENTRY(); + Device->Functions.Constructor = DefaultInstanceConstructor; Device->Functions.Destructor = DefaultInstanceDestructor; @@ -56,7 +68,10 @@ Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; if ( ! SourceFunctionTable ) + { + TRACE_EXIT(0); return; + } /* If we get here, the function table is being over-ridden */ @@ -107,6 +122,8 @@ Device->Functions.RestartWaveDevice = SourceFunctionTable->RestartWaveDevice; } + + TRACE_EXIT(0); } @@ -119,10 +136,13 @@ PSOUND_DEVICE NewDevice; UCHAR TypeIndex; + TRACE_ENTRY(); + TRACE_("Adding a sound device to list %d\n", DeviceType); if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) { + TRACE_EXIT(FALSE); return FALSE; } @@ -136,6 +156,7 @@ if ( ! NewDevice ) { + TRACE_EXIT(FALSE); return FALSE; } @@ -153,6 +174,7 @@ { FreeMemory(NewDevice); /*HeapFree(GetProcessHeap(), 0, NewDevice);*/ + TRACE_EXIT(FALSE); return FALSE; } @@ -189,6 +211,7 @@ ++ SoundDeviceTotals[TypeIndex]; TRACE_("Now %d devices of type %d\n", (int) SoundDeviceTotals[TypeIndex], DeviceType); + TRACE_EXIT(TRUE); return TRUE; } @@ -198,13 +221,13 @@ IN PSOUND_DEVICE SoundDevice) { ULONG TypeIndex; + BOOLEAN Done = FALSE; PSOUND_DEVICE CurrentDevice = NULL; PSOUND_DEVICE PreviousDevice = NULL; /*TRACE_("Removing a sound device from list %d\n", DeviceType);*/ - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); TypeIndex = SoundDevice->DeviceType - MIN_SOUND_DEVICE_TYPE; @@ -217,6 +240,7 @@ if ( SoundDeviceLists[TypeIndex] == SoundDevice ) { SoundDeviceLists[TypeIndex] = SoundDevice->Next; + Done = TRUE; } else { @@ -230,6 +254,7 @@ { ASSERT(PreviousDevice != NULL); PreviousDevice->Next = CurrentDevice->Next; + Done = TRUE; break; } @@ -239,10 +264,13 @@ } } + ASSERT(Done); + /* Free the memory associated with the device info */ FreeMemory(SoundDevice->DevicePath); FreeMemory(SoundDevice); + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR;; } @@ -251,15 +279,14 @@ RemoveSoundDevices( IN UCHAR DeviceType) { + MMRESULT Result; PSOUND_DEVICE CurrentDevice; + TRACE_ENTRY(); + TRACE_("Emptying device list for device type %d\n", DeviceType); - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - { - ERR_("Invalid device type - %d\n", DeviceType); - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); /* Clean out the device list. This works by repeatedly removing the @@ -268,13 +295,15 @@ while ( (CurrentDevice = SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE]) ) { - RemoveSoundDevice(CurrentDevice); + Result = RemoveSoundDevice(CurrentDevice); + ASSERT(Result == MMSYSERR_NOERROR); } /* Reset the list content and item count */ SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE] = NULL; SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] = 0; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -283,21 +312,54 @@ RemoveAllSoundDevices() { ULONG i; - - TRACE_("Emptying all device lists\n"); + TRACE_ENTRY(); + + TRACE_("RemoveAllSoundDevices\n"); for ( i = MIN_SOUND_DEVICE_TYPE; i <= MAX_SOUND_DEVICE_TYPE; ++ i ) { RemoveSoundDevices(i); } + + TRACE_EXIT(0); } BOOLEAN IsValidSoundDevice( IN PSOUND_DEVICE SoundDevice) { - /* TODO */ - return ( SoundDevice != NULL ); + UCHAR DeviceType; + PSOUND_DEVICE CurrentDevice; + + /* TRACE_ENTRY(); */ + + if ( ! SoundDevice ) + { + TRACE_EXIT(FALSE); + return FALSE; + } + + for ( DeviceType = MIN_SOUND_DEVICE_TYPE; + DeviceType <= MAX_SOUND_DEVICE_TYPE; + ++DeviceType ) + { + CurrentDevice = SoundDeviceLists[DEVICE_TYPE_TO_INDEX(DeviceType)]; + + while ( CurrentDevice ) + { + if ( CurrentDevice == SoundDevice ) + { + /* TRACE_EXIT(TRUE); */ + return TRUE; + } + + CurrentDevice = CurrentDevice->Next; + } + } + + /* Not found in list */ + TRACE_EXIT(FALSE); + return FALSE; } @@ -310,14 +372,16 @@ ULONG Count = 0; PSOUND_DEVICE CurrentDevice = NULL; - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( Device ); if ( DeviceIndex >= SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] ) + { + TRACE_EXIT(MMSYSERR_BADDEVICEID); return MMSYSERR_BADDEVICEID; - - if ( ! Device ) - return MMSYSERR_INVALPARAM; + } /* We know by now that a device at the index should exist @@ -332,6 +396,7 @@ CurrentDevice = CurrentDevice->Next; } + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -341,15 +406,15 @@ IN PSOUND_DEVICE SoundDevice, OUT LPWSTR* DevicePath) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! DevicePath ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( DevicePath ); MessageBox(0, SoundDevice->DevicePath, L"Foo", MB_TASKMODAL | MB_OK); *DevicePath = SoundDevice->DevicePath; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -359,14 +424,14 @@ IN PSOUND_DEVICE SoundDevice, OUT PUCHAR DeviceType) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! DeviceType ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( DeviceType ); *DeviceType = SoundDevice->DeviceType; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -375,14 +440,14 @@ IN PSOUND_DEVICE SoundDevice, OUT PMMFUNCTION_TABLE* FunctionTable) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! FunctionTable ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( FunctionTable ); *FunctionTable = &SoundDevice->Functions; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -400,7 +465,7 @@ DWORD AccessRights = GENERIC_READ; MMRESULT Result; - TRACE_("Default instance ctor"); + TRACE_ENTRY(); ASSERT(SoundDeviceInstance != NULL); GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -408,10 +473,12 @@ /* If this fails, we have an internal error somewhere */ Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); if ( Result != MMSYSERR_NOERROR ) { - ASSERT(Result != MMSYSERR_NOERROR); - return MMSYSERR_ERROR; + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) @@ -420,11 +487,15 @@ Result = OpenKernelSoundDevice(SoundDevice, AccessRights, &SoundDeviceInstance->Handle); + if ( Result != MMSYSERR_NOERROR ) + { + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(MMSYSERR_NOERROR); return Result; - - TRACE_("Returning from default ctor"); - + } + + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -436,13 +507,14 @@ PSOUND_DEVICE SoundDevice; MMRESULT Result; - TRACE_("Default instance dtor"); + TRACE_ENTRY(); ASSERT(SoundDeviceInstance); GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(SoundDevice); Result = CloseKernelSoundDevice(SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); -} + + TRACE_EXIT(0); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,6 +62,8 @@ MMRESULT Result; PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; + TRACE_ENTRY(); + ASSERT(SoundDevice != NULL); ASSERT(SoundDeviceInstance != NULL); ASSERT(SoundDeviceInstance->Device == NULL); @@ -75,12 +77,18 @@ } else if ( IS_MIDI_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else if ( IS_MIXER_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else if ( IS_AUX_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else { @@ -111,6 +119,8 @@ CurrentInstance = CurrentInstance->Next; } } + + TRACE_EXIT(0); } VOID @@ -119,6 +129,8 @@ { PSOUND_DEVICE SoundDevice; PSOUND_DEVICE_INSTANCE CurrentInstance; + + TRACE_ENTRY(); ASSERT(SoundDeviceInstance != NULL); ASSERT(SoundDeviceInstance->Device != NULL); @@ -145,6 +157,8 @@ /* This is actually the one before the one we want to remove */ CurrentInstance->Next = SoundDeviceInstance->Next; } + + TRACE_EXIT(0); } @@ -160,15 +174,20 @@ PSOUND_DEVICE_INSTANCE CreatedInstance = NULL; MMRESULT Result; - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + TRACE_("Creating instance of PSOUND_DEVICE %p\n", SoundDevice); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); CreatedInstance = AllocateSoundDeviceInstance(); + if ( ! CreatedInstance ) + { + TRACE_EXIT(MMSYSERR_NOMEM); return MMSYSERR_NOMEM; + } /* Add the new instance to the device's instance list */ ListSoundDeviceInstance(SoundDevice, CreatedInstance); @@ -183,10 +202,14 @@ FreeSoundDeviceInstance(CreatedInstance); CreatedInstance = NULL; //DestroySoundDeviceInstance(CreatedInstance); + + Result = TranslateInternalMmResult(Result); } /* Fill the output parameter with this */ *SoundDeviceInstance = CreatedInstance; + + TRACE_EXIT(Result); return Result; } @@ -199,14 +222,14 @@ ASSERT(SoundDeviceInstance); ASSERT(SoundDevice); - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( SoundDevice ); *SoundDevice = SoundDeviceInstance->Device; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -216,8 +239,9 @@ { PSOUND_DEVICE SoundDevice = NULL; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); SoundDevice = SoundDeviceInstance->Device; @@ -233,6 +257,7 @@ FreeSoundDeviceInstance(SoundDeviceInstance); /*HeapFree(GetProcessHeap(), 0, Instance);*/ + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -243,15 +268,18 @@ PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; MMRESULT Result; - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); /* Just munch away at the first item repeatedly */ while ( (CurrentInstance = SoundDevice->FirstInstance) ) { Result = DestroySoundDeviceInstance(CurrentInstance); - } - + ASSERT(Result == MMSYSERR_NOERROR); + } + + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -259,8 +287,21 @@ IsValidSoundDeviceInstance( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - /* TODO - Once multiple instances are supported */ - return ( SoundDeviceInstance != NULL ); + /* TRACE_ENTRY(); */ + + if ( ! SoundDeviceInstance ) + { + TRACE_EXIT(FALSE); + return FALSE; + } + + /* Now what? */ + return TRUE; + + /* TRACE_EXIT(12345678); */ + + TRACE_EXIT(FALSE); + return ( FALSE ); } MMRESULT @@ -271,16 +312,22 @@ MMRESULT Result; PSOUND_DEVICE SoundDevice; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; - - if ( ! DeviceType ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( DeviceType ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); if ( Result != MMSYSERR_NOERROR ) + { + TRACE_EXIT(Result); return Result; - - return GetSoundDeviceType(SoundDevice, DeviceType); -} + } + + Result = GetSoundDeviceType(SoundDevice, DeviceType); + Result = TranslateInternalMmResult(Result); + + TRACE_EXIT(Result); + return Result; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -24,17 +24,8 @@ { DWORD OpenFlags = 0; - if ( ! Handle ) - { - ERR_("No handle ptr\n"); - return MMSYSERR_INVALPARAM; - } - - if ( ! DeviceName ) - { - ERR_("No device name\n"); - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( Handle ); + VALIDATE_MMSYS_PARAMETER( DeviceName ); if ( AccessRights != GENERIC_READ ) { @@ -68,21 +59,14 @@ { MMRESULT Result; - if ( ! SoundDevice ) - { - ERR_("No sound device specified"); - return MMSYSERR_INVALPARAM; - } - - if ( ! Handle ) - { - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Handle ); Result = OpenKernelSoundDeviceByName(SoundDevice->DevicePath, AccessRights, Handle); + Result = TranslateInternalMmResult(Result); return Result; } @@ -112,8 +96,7 @@ BOOLEAN IoResult = FALSE; DWORD AccessRights = GENERIC_READ; - if ( Handle == INVALID_HANDLE_VALUE ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); /* Determine if we actually need to write stuff */ if ( InBuffer != NULL ) @@ -245,18 +228,16 @@ /* TODO: move somewhere else */ MMRESULT WriteSoundDeviceBuffer( - PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - LPVOID Buffer, - DWORD BufferSize, - LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, - LPOVERLAPPED Overlapped) -{ - if ( ( ! SoundDeviceInstance ) || ( ! Buffer ) || ( BufferSize == 0 ) ) - { - ERR_("Invalid parameter in WriteSoundDeviceBuffer!\n"); - return MMSYSERR_INVALPARAM; - } - + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN LPVOID Buffer, + IN DWORD BufferSize, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, + IN LPOVERLAPPED Overlapped) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Buffer ); + VALIDATE_MMSYS_PARAMETER( BufferSize > 0 ); + /*wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle);*/ /*SOUND_DEBUG(msg);*/ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -29,11 +29,8 @@ ULONG KeyLength; PWCHAR ParametersKeyName; - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; - - if ( ! KeyHandle ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); /* Work out how long the string will be */ KeyLength = wcslen(REG_SERVICES_KEY_NAME_U) + 1 @@ -85,11 +82,8 @@ DWORD PathLength; PWCHAR RegPath; - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; - - if ( ! KeyHandle ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); /* Work out the space required to hold the path: @@ -156,14 +150,11 @@ HKEY Key; DWORD KeyIndex = 0; - /* Validate parameters */ - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); /* Device type zero means "all" */ - if ( ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) && - ( DeviceType != 0 ) ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) || + DeviceType == 0 ); while ( OpenSoundDeviceRegKey(ServiceName, KeyIndex, &Key) == MMSYSERR_NOERROR ) { @@ -284,10 +275,7 @@ TRACE_("Detecting NT4 style sound devices of type %d\n", DeviceType); - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - { - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); DeviceNameLength = wcslen(BaseDeviceName); /* Consider the length of the number */ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -96,17 +96,10 @@ { PSOUND_THREAD_OVERLAPPED Overlapped; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! Buffer ) - return MMSYSERR_INVALPARAM; - - if ( BufferSize == 0 ) - return MMSYSERR_INVALPARAM; - - if ( ! IoCompletionHandler ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Buffer ); + VALIDATE_MMSYS_PARAMETER( BufferSize > 0 ); + VALIDATE_MMSYS_PARAMETER( IoCompletionHandler ); /* Allocate memory for the overlapped I/O structure (auto-zeroed) */ Overlapped = AllocateMemoryFor(SOUND_THREAD_OVERLAPPED); @@ -326,8 +319,7 @@ IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, IN PVOID Parameter OPTIONAL) { - if ( ! RequestHandler ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( RequestHandler ); ASSERT(SoundThread != INVALID_HANDLE_VALUE); if ( SoundThread == INVALID_HANDLE_VALUE ) Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -20,11 +20,20 @@ static HANDLE ProcessHeapHandle = INVALID_HANDLE_VALUE; static DWORD CurrentAllocations = 0; +typedef struct _ALLOCATION +{ + DWORD Tag; + DWORD Size; +} ALLOCATION; + PVOID -AllocateMemory( +AllocateTaggedMemory( + IN DWORD Tag, IN DWORD Size) { PVOID Pointer = NULL; + + Size += sizeof(ALLOCATION); if ( ProcessHeapHandle == INVALID_HANDLE_VALUE ) ProcessHeapHandle = GetProcessHeap(); @@ -34,19 +43,31 @@ if ( ! Pointer ) return NULL; + /* Store the tag and size */ + ((ALLOCATION*)Pointer)->Tag = Tag; + ((ALLOCATION*)Pointer)->Size = Size; + ++ CurrentAllocations; - return Pointer; + return ((PCHAR)Pointer) + sizeof(ALLOCATION); } VOID -FreeMemory( +FreeTaggedMemory( + IN DWORD Tag, IN PVOID Pointer) { + ALLOCATION* AllocationInfo; + ASSERT(ProcessHeapHandle != INVALID_HANDLE_VALUE); ASSERT(Pointer); - HeapFree(ProcessHeapHandle, 0, Pointer); + AllocationInfo = (ALLOCATION*)((PCHAR)Pointer - sizeof(ALLOCATION)); + + ASSERT( AllocationInfo->Tag == Tag ); + + ZeroMemory(AllocationInfo, AllocationInfo->Size + sizeof(ALLOCATION)); + HeapFree(ProcessHeapHandle, 0, AllocationInfo); -- CurrentAllocations; } @@ -78,6 +99,12 @@ return Digits; } + + +/* + Result codes +*/ + MMRESULT Win32ErrorToMmResult(UINT error_code) { @@ -108,3 +135,31 @@ return MMSYSERR_ERROR; } + +/* + If a function invokes another function, this aids in translating the result + code so that it is applicable in the context of the original caller. For + example, specifying that an invalid parameter was passed probably does not + make much sense if the parameter wasn't passed by the original caller! + + However, things like MMSYSERR_NOMEM make sense to return to the caller. + + This could potentially highlight internal logic problems. +*/ +MMRESULT +TranslateInternalMmResult(MMRESULT Result) +{ + switch ( Result ) + { + case MMSYSERR_INVALPARAM : + case MMSYSERR_INVALFLAG : + { + ERR_("MMRESULT from an internal routine failed with error %d\n", + (int) Result); + + return MMSYSERR_ERROR; + } + } + + return Result; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -25,11 +25,10 @@ UCHAR DeviceType; MMRESULT Result; - if ( ! IsValidSoundDevice(SoundDevice) ) - return MMSYSERR_INVALPARAM; + TRACE_("QueryWaveDeviceFormatSupport\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceType(SoundDevice, &DeviceType); ASSERT(Result == MMSYSERR_NOERROR); @@ -61,19 +60,17 @@ DWORD BytesReturned = 0; MMRESULT Result; - if ( ! IsValidSoundDevice(SoundDevice) ) - return MMSYSERR_INVALPARAM; + TRACE_("DefaultQueryWaveDeviceFormatSupport\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceType(SoundDevice, &DeviceType); ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); Result = OpenKernelSoundDevice(SoundDevice, GENERIC_READ | GENERIC_WRITE, @@ -105,11 +102,10 @@ PMMFUNCTION_TABLE FunctionTable; MMRESULT Result; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; + TRACE_("SetWaveDeviceFormat\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(Result == MMSYSERR_NOERROR); @@ -118,8 +114,7 @@ ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); /* TODO: Should we check the size? */ @@ -144,11 +139,10 @@ MMRESULT Result; DWORD BytesReturned = 0; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; + TRACE_("DefaultSetWaveDeviceFormat\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(Result == MMSYSERR_NOERROR); @@ -157,8 +151,7 @@ ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); Result = WriteToSoundDevice(SoundDeviceInstance, IOCTL_WAVE_SET_FORMAT, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -23,8 +23,7 @@ { PWAVE_STREAM_INFO StreamInfo; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); StreamInfo = &SoundDeviceInstance->Streaming.Wave; @@ -44,17 +43,11 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEHDR BufferHeader) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->lpData ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->dwBufferLength ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( BufferHeader ); + VALIDATE_MMSYS_PARAMETER( BufferHeader->lpData ); + VALIDATE_MMSYS_PARAMETER( BufferHeader->dwBufferLength > 0 ); + /* TODO: Check anything more about this buffer? */ if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) return WAVERR_UNPREPARED; @@ -74,11 +67,8 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PUCHAR State) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! State ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( State ); return CallUsingSoundThread(SoundDeviceInstance, GetWaveDeviceState_Request, @@ -113,8 +103,7 @@ PauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); return CallUsingSoundThread(SoundDeviceInstance, PauseWaveDevice_Request, @@ -134,8 +123,7 @@ RestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); return CallUsingSoundThread(SoundDeviceInstance, RestartWaveDevice_Request, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -65,7 +65,7 @@ TRACE_("PerformWaveIo\n"); - ASSERT(SoundDeviceInstance); + ASSERT( IsValidSoundDeviceInstance(SoundDeviceInstance) ); /* These shouldn't fail unless we pass them garbage */ Result = GetSoundDeviceFromInstance(SoundDeviceInstance, @@ -210,11 +210,8 @@ PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; PWAVE_STREAM_INFO StreamInfo; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! WaveHeader ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveHeader ); /* To avoid stupidly long variable names we alias this */ StreamInfo = &SoundDeviceInstance->Streaming.Wave; @@ -275,11 +272,8 @@ PMMFUNCTION_TABLE Functions; PUCHAR State = (PUCHAR) Parameter; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! State ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( State ); // *State = SoundDeviceInstance->Streaming.Wave.State; @@ -304,8 +298,7 @@ PSOUND_DEVICE SoundDevice; PMMFUNCTION_TABLE Functions; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -323,8 +316,7 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); if ( SoundDeviceInstance->Streaming.Wave.State != WAVE_DD_STOPPED ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,6 +62,9 @@ TRACE_("In WODM_OPEN\n"); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); + TRACE_("GetSoundDevice == %d\n", (int) Result); + + if ( Result != MMSYSERR_NOERROR ) return Result; @@ -77,6 +80,8 @@ ASSERT(private_handle != 0); Result = CreateSoundDeviceInstance(Device, &Instance); + TRACE_("CreateSoundDeviceInstance == %d\n", (int) Result); + if ( Result != MMSYSERR_NOERROR ) return Result;

16 years, 2 months

[cwittich] 34467: more correct fix by Alex

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 13 14:14:39 2008 New Revision: 34467 URL: http://svn.reactos.org/svn/reactos?rev=34467&view=rev Log: more correct fix by Alex Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sun Jul 13 14:14:39 2008 @@ -209,17 +209,11 @@ { PEPROCESS Process = HandleTable->QuotaProcess; ULONG i, j; - ULONG TableLevel; - ULONG_PTR TableBase; + ULONG_PTR TableCode = HandleTable->TableCode; + ULONG TableLevel = TableCode & 3; + ULONG_PTR TableBase = TableCode & ~3; PHANDLE_TABLE_ENTRY Level1, *Level2, **Level3; PAGED_CODE(); - - /* Get the table code */ - TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; - - /* Extract the table level and actual table base */ - TableLevel = (ULONG)(TableBase & 3); - TableBase = TableBase - TableLevel; /* Check which level we're at */ if (!TableLevel) @@ -504,16 +498,10 @@ PHANDLE_TABLE_ENTRY Low = NULL, *Mid, **High, *SecondLevel, **ThirdLevel; ULONG NewFree, FirstFree; PVOID Value; - ULONG_PTR TableBase; - ULONG TableLevel; - PAGED_CODE(); - - /* Get the table code */ - TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; - - /* Extract the table level and actual table base */ - TableLevel = (ULONG)(TableBase & 3); - TableBase = TableBase - TableLevel; + ULONG_PTR TableCode = HandleTable->TableCode; + ULONG_PTR TableBase = TableCode & ~3; + ULONG TableLevel = (ULONG)(TableCode & 3); + PAGED_CODE(); /* Check how many levels we already have */ if (!TableLevel)

16 years, 2 months

[cwittich] 34466: fix handle table calculations now we can create 4186000 handles instead of 4100 and VLC doesn't BSOD anymore

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 13 13:22:18 2008 New Revision: 34466 URL: http://svn.reactos.org/svn/reactos?rev=34466&view=rev Log: fix handle table calculations now we can create 4186000 handles instead of 4100 and VLC doesn't BSOD anymore Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sun Jul 13 13:22:18 2008 @@ -209,10 +209,17 @@ { PEPROCESS Process = HandleTable->QuotaProcess; ULONG i, j; - ULONG TableLevel = (ULONG)(HandleTable->TableCode & 3); - ULONG_PTR TableBase = HandleTable->TableCode & ~3; + ULONG TableLevel; + ULONG_PTR TableBase; PHANDLE_TABLE_ENTRY Level1, *Level2, **Level3; PAGED_CODE(); + + /* Get the table code */ + TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; + + /* Extract the table level and actual table base */ + TableLevel = (ULONG)(TableBase & 3); + TableBase = TableBase - TableLevel; /* Check which level we're at */ if (!TableLevel) @@ -497,9 +504,16 @@ PHANDLE_TABLE_ENTRY Low = NULL, *Mid, **High, *SecondLevel, **ThirdLevel; ULONG NewFree, FirstFree; PVOID Value; - ULONG_PTR TableBase = HandleTable->TableCode & ~3; - ULONG TableLevel = (ULONG)(TableBase & 3); - PAGED_CODE(); + ULONG_PTR TableBase; + ULONG TableLevel; + PAGED_CODE(); + + /* Get the table code */ + TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; + + /* Extract the table level and actual table base */ + TableLevel = (ULONG)(TableBase & 3); + TableBase = TableBase - TableLevel; /* Check how many levels we already have */ if (!TableLevel)

16 years, 2 months

[pschweitzer] 34465: Added two missing structures in ntifs.h (taken from MSDN)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 13 13:12:14 2008 New Revision: 34465 URL: http://svn.reactos.org/svn/reactos?rev=34465&view=rev Log: Added two missing structures in ntifs.h (taken from MSDN) Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Sun Jul 13 13:12:14 2008 @@ -831,6 +831,24 @@ WCHAR FileName[1]; } FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; +typedef struct _FILE_ID_BOTH_DIR_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION; + typedef struct _FILE_COMPLETION_INFORMATION { HANDLE Port; PVOID Key; @@ -982,6 +1000,22 @@ ULONG EaSize; WCHAR FileName[1]; } FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION; + +typedef struct _FILE_ID_FULL_DIR_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_FULL_DIR_INFORMATION, *PFILE_ID_FULL_DIR_INFORMATION; typedef struct _FILE_GET_EA_INFORMATION { ULONG NextEntryOffset;

16 years, 2 months

[hyperion] 34464: Forgot a file. Fix fucking buildbot already D:<

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Jul 13 13:06:10 2008 New Revision: 34464 URL: http://svn.reactos.org/svn/reactos?rev=34464&view=rev Log: Forgot a file. Fix fucking buildbot already D:< Added: trunk/reactos/include/psdk/idndl.h (with props) Added: trunk/reactos/include/psdk/idndl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/idndl.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/idndl.h (added) +++ trunk/reactos/include/psdk/idndl.h [iso-8859-1] Sun Jul 13 13:06:10 2008 @@ -1,0 +1,18 @@ +#ifndef IDNDL_H_ +#define IDNDL_H_ + +#include <windows.h> + +#ifndef GSS_ALLOW_INHERITED_COMMON +#define GSS_ALLOW_INHERITED_COMMON 1 +#endif + +#ifndef VS_ALLOW_LATIN +#define VS_ALLOW_LATIN 1 +#endif + +int WINAPI DownlevelGetLocaleScripts(LPCWSTR,LPWSTR,int); +int WINAPI DownlevelGetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int); +BOOL WINAPI DownlevelVerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int); + +#endif Propchange: trunk/reactos/include/psdk/idndl.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[hyperion] 34463: modified dll/win32/kernel32/misc/lang.c modified dll/win32/kernel32/kernel32.def Stubbed out GetLocaleInfoEx modified include/psdk/winnls.h Added some Vista and later NLS defines to the SDK modified dll/nls/idndl/idndl.rbuild Correctly set a NULL entry point for idndl.dll modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild Give unique names to the redistributable versions of idndl.dll and normaliz.dll Everything else Scatter

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Jul 13 12:54:53 2008 New Revision: 34463 URL: http://svn.reactos.org/svn/reactos?rev=34463&view=rev Log: modified dll/win32/kernel32/misc/lang.c modified dll/win32/kernel32/kernel32.def Stubbed out GetLocaleInfoEx modified include/psdk/winnls.h Added some Vista and later NLS defines to the SDK modified dll/nls/idndl/idndl.rbuild Correctly set a NULL entry point for idndl.dll modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild Give unique names to the redistributable versions of idndl.dll and normaliz.dll Everything else Scattered NLS modules in the appropriate locations, as per standard source tree layout Added: trunk/reactos/dll/nls/ trunk/reactos/dll/nls/idndl/ - copied from r34425, trunk/reactos/nls/dll/idndl/ trunk/reactos/dll/nls/idndl_redist/ - copied from r34425, trunk/reactos/nls/dll/idndl_redist/ trunk/reactos/dll/nls/nls.rbuild (with props) trunk/reactos/dll/nls/normaliz/ - copied from r34425, trunk/reactos/nls/dll/normaliz/ trunk/reactos/dll/nls/normaliz_redist/ - copied from r34425, trunk/reactos/nls/dll/normaliz_redist/ trunk/reactos/lib/3rdparty/icu4ros/ - copied from r34425, trunk/reactos/nls/3rdparty/ trunk/reactos/lib/nls/ trunk/reactos/lib/nls/idna/ - copied from r34425, trunk/reactos/nls/lib/idna/ trunk/reactos/lib/nls/nls.rbuild (with props) trunk/reactos/lib/nls/normalize/ - copied from r34425, trunk/reactos/nls/lib/normalize/ trunk/reactos/lib/nls/scripts/ - copied from r34425, trunk/reactos/nls/lib/scripts/ Removed: trunk/reactos/nls/ Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/dll/dll.rbuild trunk/reactos/dll/nls/idndl/idndl.rbuild trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/include/psdk/winnls.h trunk/reactos/lib/3rdparty/3rdparty.rbuild trunk/reactos/lib/lib.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -58,9 +58,6 @@ <directory name="modules"> <xi:include href="modules/directory.rbuild" /> </directory> -  <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.rbuild" />  Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=34463&r… ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -13,6 +13,9 @@ <directory name="keyboard"> <xi:include href="keyboard/keyboard.rbuild" /> </directory> +<directory name="nls"> + <xi:include href="nls/nls.rbuild" /> +</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> </directory> Modified: trunk/reactos/dll/nls/idndl/idndl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/idndl.rbuild… ============================================================================== --- trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -4,7 +4,7 @@ <library>kernel32</library> <compilerflag>-fno-exceptions</compilerflag> <compilerflag>-fno-rtti</compilerflag> - <linkerflag>-Wl,--entry,0</linkerflag> + <entrypoint>0</entrypoint> <file>idndl.cpp</file> <importlibrary definition="idndl.def" /> </module> Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl… ============================================================================== --- trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="idndl_redist" type="win32dll" installname="idndl.dll"> +<module name="idndl_redist" type="win32dll" installname="idndl_redist.dll"> <library>kernel32</library> <library>scripts</library> <library>libcntpr</library> Added: trunk/reactos/dll/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/nls.rbuild?rev=344… ============================================================================== --- trunk/reactos/dll/nls/nls.rbuild (added) +++ trunk/reactos/dll/nls/nls.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="idndl"> + <xi:include href="idndl/idndl.rbuild" /> + </directory> + <directory name="idndl_redist"> + <xi:include href="idndl_redist/idndl_redist.rbuild" /> + </directory> + <directory name="normaliz"> + <xi:include href="normaliz/normaliz.rbuild" /> + </directory> + <directory name="normaliz_redist"> + <xi:include href="normaliz_redist/normaliz_redist.rbuild" /> + </directory> +</group> Propchange: trunk/reactos/dll/nls/nls.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… ============================================================================== --- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -4,7 +4,7 @@ <include base="icu4ros">icu/source/common</include> <directory name="data"><file>icudt38.c</file></directory> </module> -<module name="normaliz_redist" type="win32dll" installname="normaliz.dll"> +<module name="normaliz_redist" type="win32dll" installname="normaliz_redist.dll"> <library>normalize</library> <library>idna</library> <library>icu4ros</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -1,4 +1,4 @@ -; +; ; kernel32.def ; ; Exports for KERNEL32 DLL @@ -7,14 +7,14 @@ ; ; Author: Scott Christley <scottc(a)net-community.com> ; Date: 1996 -; +; ; This file is part of the Windows32 API Library. ; ; This library is free software; you can redistribute it and/or ; modify it under the terms of the GNU Library General Public ; License as published by the Free Software Foundation; either ; version 2 of the License, or (at your option) any later version. -; +; ; This library is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -22,10 +22,10 @@ ; ; If you are interested in a warranty or support for this source code, ; contact Scott Christley <scottc(a)net-community.com> for more information. -; +; ; You should have received a copy of the GNU Library General Public ; License along with this library; see the file COPYING.LIB. -; If not, write to the Free Software Foundation, +; If not, write to the Free Software Foundation, ; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ; LIBRARY KERNEL32.DLL @@ -419,6 +419,7 @@ GetLocalTime@4 GetLocaleInfoA@16 GetLocaleInfoW@16 +GetLocaleInfoEx@16 GetLogicalDriveStringsA@8 GetLogicalDriveStringsW@8 GetLogicalDrives@0 Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -1590,6 +1590,18 @@ return nRet; } +int +WINAPI +GetLocaleInfoEx ( + LPCWSTR lpLocaleName, + LCTYPE LCType, + LPWSTR lpLCData, + int cchData + ) +{ + return -1; +} + /* * @implemented */ @@ -1773,8 +1785,8 @@ } -static int compare_unicode_string( - PUNICODE_STRING String1, +static int compare_unicode_string( + PUNICODE_STRING String1, PUNICODE_STRING String2, DWORD Flags ) @@ -1782,7 +1794,7 @@ ULONG len1, len2; PWCHAR s1, s2; WCHAR c1, c2; - + if (String1 && String2) { len1 = String1->Length / sizeof(WCHAR); @@ -1901,8 +1913,8 @@ else Result = RtlCompareUnicodeString( &String1, &String2, (BOOLEAN)(dwCmpFlags & NORM_IGNORECASE)); - - + + if (Result) /* need to translate result */ return (Result < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN; @@ -2177,9 +2189,9 @@ DWORD dwFlags) { static const WCHAR szFormat[] = { '%','x','\0' }; - UNICODE_STRING szNlsKeyName = + UNICODE_STRING szNlsKeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\System\\CurrentControlSet\\Control\\Nls"); - UNICODE_STRING szLangGroupsKeyName = + UNICODE_STRING szLangGroupsKeyName = RTL_CONSTANT_STRING(L"Language Groups"); const int MAX_VALUE_NAME = 16; const int MAX_VALUE_SYMB = 128; Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -122,6 +122,9 @@ #define LOCALE_SISO639LANGNAME 89 #define LOCALE_SISO3166CTRYNAME 90 #define LOCALE_SNAME 92 +#endif +#if (WINVER >= 0x0600) +#define LOCALE_SSCRIPTS 108 #endif #define LOCALE_SYSTEM_DEFAULT 0x800 #define LOCALE_USER_DEFAULT 0x400 @@ -430,6 +433,12 @@ #define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER #define CAL_USE_CP_ACP LOCALE_USE_CP_ACP #endif /* (WINVER >= 0x0500) */ +#if WINVER >= 0x0600 +#define IDN_ALLOW_UNASSIGNED 0x1 +#define IDN_USE_STD3_ASCII_RULES 0x2 +#define VS_ALLOW_LATIN 0x1 +#define GSS_ALLOW_INHERITED_COMMON 0x1 +#endif #ifndef _BASETSD_H typedef long LONG_PTR; #endif @@ -638,8 +647,15 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); #endif /* (WINVER >= 0x0500) */ #if (WINVER >= 0x0600) +WINBASEAPI +int WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,int); +int WINAPI IdnToAscii(DWORD,LPCWSTR,int,LPWSTR,int); +int WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,int,LPWSTR,int); +int WINAPI IdnToUnicode(DWORD,LPCWSTR,int,LPWSTR,int); +BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int); int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int); -BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int); +int WINAPI GetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int); +BOOL WINAPI VerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int); #endif /* (WINVER >= 0x0600) */ #ifdef UNICODE Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… ============================================================================== --- trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -9,6 +9,9 @@ </directory> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> + </directory> + <directory name="icu4ros"> + <xi:include href="icu4ros/icu4ros.rbuild" /> </directory> <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=34463&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -28,6 +28,9 @@ <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> </directory> + <directory name="nls"> + <xi:include href="nls/nls.rbuild" /> + </directory> <directory name="ntdllsys"> <xi:include href="ntdllsys/ntdllsys.rbuild" /> </directory> Added: trunk/reactos/lib/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/nls.rbuild?rev=344… ============================================================================== --- trunk/reactos/lib/nls/nls.rbuild (added) +++ trunk/reactos/lib/nls/nls.rbuild [iso-8859-1] Sun Jul 13 12:54:53 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="idna"> + <xi:include href="idna/idna.rbuild" /> + </directory> + <directory name="normalize"> + <xi:include href="normalize/normalize.rbuild" /> + </directory> + <directory name="scripts"> + <xi:include href="scripts/scripts.rbuild" /> + </directory> +</group> Propchange: trunk/reactos/lib/nls/nls.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[silverblade] 34462: Store the open device handle in the instance structure rather than the device structure, to allow devices to be opened multiple times.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 13 11:26:02 2008 New Revision: 34462 URL: http://svn.reactos.org/svn/reactos?rev=34462&view=rev Log: Store the open device handle in the instance structure rather than the device structure, to allow devices to be opened multiple times. Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -181,6 +181,13 @@ IN struct _SOUND_DEVICE_INSTANCE* Instance, IN PWAVEHDR WaveHeader); +typedef MMRESULT (*MMGETWAVESTATE_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* Instance, + OUT PUCHAR State); + +typedef MMRESULT (*MMSETWAVESTATE_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* Instance); + typedef struct _MMFUNCTION_TABLE { MMCREATEINSTANCE_FUNC Constructor; @@ -190,6 +197,10 @@ MMWAVEQUERYFORMAT_FUNC QueryWaveFormat; MMWAVESETFORMAT_FUNC SetWaveFormat; MMWAVEQUEUEBUFFER_FUNC QueueWaveBuffer; + + MMGETWAVESTATE_FUNC GetWaveDeviceState; + MMSETWAVESTATE_FUNC PauseWaveDevice; + MMSETWAVESTATE_FUNC RestartWaveDevice; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; @@ -203,7 +214,6 @@ struct _SOUND_DEVICE_INSTANCE* FirstInstance; UCHAR DeviceType; LPWSTR DevicePath; - HANDLE Handle; MMFUNCTION_TABLE Functions; } SOUND_DEVICE, *PSOUND_DEVICE; @@ -231,6 +241,9 @@ { struct _SOUND_DEVICE_INSTANCE* Next; PSOUND_DEVICE Device; + + /* The currently opened handle to the device */ + HANDLE Handle; /* PSOUND_THREAD Thread;*/ /* Stuff generously donated to us from WinMM */ @@ -304,10 +317,19 @@ VOID RemoveAllSoundDevices(); +BOOLEAN +IsValidSoundDevice( + IN PSOUND_DEVICE SoundDevice); + MMRESULT GetSoundDeviceType( IN PSOUND_DEVICE Device, OUT PUCHAR DeviceType); + +MMRESULT +GetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + OUT PMMFUNCTION_TABLE* FunctionTable); MMRESULT DefaultInstanceConstructor( @@ -363,16 +385,17 @@ MMRESULT OpenKernelSoundDevice( - IN PSOUND_DEVICE SoundDevice, - IN DWORD AccessRights); + PSOUND_DEVICE SoundDevice, + DWORD AccessRights, + PHANDLE Handle); MMRESULT CloseKernelSoundDevice( - PSOUND_DEVICE SoundDevice); - -MMRESULT -PerformSoundDeviceIo( - IN PSOUND_DEVICE SoundDevice, + IN HANDLE Handle); + +MMRESULT +PerformDeviceIo( + IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, @@ -382,8 +405,8 @@ IN LPOVERLAPPED Overlapped); MMRESULT -ReadSoundDevice( - IN PSOUND_DEVICE SoundDevice, +ReadFromDeviceHandle( + IN HANDLE Handle, IN DWORD IoControlCode, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, @@ -391,8 +414,8 @@ IN LPOVERLAPPED Overlapped); MMRESULT -WriteSoundDevice( - IN PSOUND_DEVICE SoundDevice, +WriteToDeviceHandle( + IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, @@ -400,6 +423,35 @@ IN LPOVERLAPPED Overlapped); MMRESULT +PerformSoundDeviceIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped); + +MMRESULT +ReadFromSoundDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped); + +MMRESULT +WriteToSoundDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped); + +MMRESULT WriteSoundDeviceBuffer( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN LPVOID Buffer, @@ -453,6 +505,15 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PSOUND_DEVICE* SoundDevice); +BOOLEAN +IsValidSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +GetSoundDeviceTypeFromInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR DeviceType); + /* capabilities.c @@ -475,25 +536,25 @@ MMRESULT QueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); MMRESULT DefaultQueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); MMRESULT SetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); MMRESULT DefaultSetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); @@ -535,6 +596,32 @@ QueueWaveDeviceBuffer( IN PSOUND_DEVICE_INSTANCE Instance, IN PWAVEHDR BufferHeader); + +MMRESULT +GetWaveDeviceState( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR State); + +MMRESULT +DefaultGetWaveDeviceState( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR State); + +MMRESULT +PauseWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DefaultPauseWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +RestartWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DefaultRestartWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -31,9 +31,10 @@ MMRESULT DefaultGetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUNIVERSAL_CAPS Capabilities) { + HANDLE Handle; PVOID RawCapsPtr = NULL; ULONG CapsSize = 0; DWORD Ioctl; @@ -42,14 +43,14 @@ ZeroMemory(Capabilities, sizeof(UNIVERSAL_CAPS)); - if ( ! Device ) + if ( ! SoundDevice ) return MMSYSERR_INVALPARAM; if ( ! Capabilities ) return MMSYSERR_INVALPARAM; /* Select appropriate IOCTL and capabilities structure */ - switch ( Device->DeviceType ) + switch ( SoundDevice->DeviceType ) { case WAVE_OUT_DEVICE_TYPE : Ioctl = IOCTL_WAVE_GET_CAPABILITIES; @@ -89,14 +90,25 @@ return MMSYSERR_NOTSUPPORTED; } + Result = OpenKernelSoundDevice(SoundDevice, + GENERIC_READ, + &Handle); + + if ( Result != MMSYSERR_NOERROR ) + { + return Result; /* OK? */ + } + /* Call the driver */ - Result = ReadSoundDevice( - Device, + Result = ReadFromDeviceHandle( + Handle, Ioctl, (LPVOID) RawCapsPtr, CapsSize, &BytesReturned, NULL); + CloseKernelSoundDevice(Handle); + return Result; } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -42,22 +42,70 @@ IN PSOUND_DEVICE Device, IN PMMFUNCTION_TABLE SourceFunctionTable) { - /* Defaults... TODO - Make all these over-rideable! */ Device->Functions.Constructor = DefaultInstanceConstructor; Device->Functions.Destructor = DefaultInstanceDestructor; Device->Functions.GetCapabilities = DefaultGetSoundDeviceCapabilities; + + /* Wave device specific */ Device->Functions.QueryWaveFormat = DefaultQueryWaveDeviceFormatSupport; Device->Functions.SetWaveFormat = DefaultSetWaveDeviceFormat; + Device->Functions.GetWaveDeviceState = DefaultGetWaveDeviceState; + Device->Functions.PauseWaveDevice = DefaultPauseWaveDevice; + Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; + if ( ! SourceFunctionTable ) return; /* If we get here, the function table is being over-ridden */ + + if ( SourceFunctionTable->Constructor ) + { + Device->Functions.Constructor = + SourceFunctionTable->Constructor; + } + + if ( SourceFunctionTable->Destructor ) + { + Device->Functions.Destructor = + SourceFunctionTable->Destructor; + } + if ( SourceFunctionTable->GetCapabilities ) { Device->Functions.GetCapabilities = SourceFunctionTable->GetCapabilities; + } + + if ( SourceFunctionTable->QueryWaveFormat ) + { + Device->Functions.QueryWaveFormat = + SourceFunctionTable->QueryWaveFormat; + } + + if ( SourceFunctionTable->SetWaveFormat ) + { + Device->Functions.SetWaveFormat = + SourceFunctionTable->SetWaveFormat; + } + + if ( SourceFunctionTable->GetWaveDeviceState ) + { + Device->Functions.GetWaveDeviceState = + SourceFunctionTable->GetWaveDeviceState; + } + + if ( SourceFunctionTable->PauseWaveDevice ) + { + Device->Functions.PauseWaveDevice = + SourceFunctionTable->PauseWaveDevice; + } + + if ( SourceFunctionTable->RestartWaveDevice ) + { + Device->Functions.RestartWaveDevice = + SourceFunctionTable->RestartWaveDevice; } } @@ -94,7 +142,6 @@ NewDevice->Next = NULL; NewDevice->FirstInstance = NULL; NewDevice->DeviceType = DeviceType; - NewDevice->Handle = INVALID_HANDLE_VALUE; NewDevice->DevicePath = AllocateWideString(wcslen(DevicePath)); /* @@ -167,13 +214,6 @@ DestroyAllInstancesOfSoundDevice(SoundDevice); } - /* Close handle (if open) */ - if ( SoundDevice->Handle != INVALID_HANDLE_VALUE ) - { - CloseHandle(SoundDevice->Handle); - SoundDevice->Handle = INVALID_HANDLE_VALUE; - } - if ( SoundDeviceLists[TypeIndex] == SoundDevice ) { SoundDeviceLists[TypeIndex] = SoundDevice->Next; @@ -252,6 +292,14 @@ } } +BOOLEAN +IsValidSoundDevice( + IN PSOUND_DEVICE SoundDevice) +{ + /* TODO */ + return ( SoundDevice != NULL ); +} + MMRESULT GetSoundDevice( @@ -308,16 +356,32 @@ MMRESULT GetSoundDeviceType( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUCHAR DeviceType) { - if ( ! Device ) + if ( ! SoundDevice ) return MMSYSERR_INVALPARAM; if ( ! DeviceType ) return MMSYSERR_INVALPARAM; - *DeviceType = Device->DeviceType; + *DeviceType = SoundDevice->DeviceType; + + return MMSYSERR_NOERROR; +} + +MMRESULT +GetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + OUT PMMFUNCTION_TABLE* FunctionTable) +{ + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + if ( ! FunctionTable ) + return MMSYSERR_INVALPARAM; + + *FunctionTable = &SoundDevice->Functions; return MMSYSERR_NOERROR; } @@ -353,7 +417,9 @@ if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) AccessRights |= GENERIC_WRITE; - Result = OpenKernelSoundDevice(SoundDevice, AccessRights); + Result = OpenKernelSoundDevice(SoundDevice, + AccessRights, + &SoundDeviceInstance->Handle); if ( Result != MMSYSERR_NOERROR ) return Result; Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -254,3 +254,33 @@ return MMSYSERR_NOERROR; } + +BOOLEAN +IsValidSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + /* TODO - Once multiple instances are supported */ + return ( SoundDeviceInstance != NULL ); +} + +MMRESULT +GetSoundDeviceTypeFromInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR DeviceType) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) + return MMSYSERR_INVALPARAM; + + if ( ! DeviceType ) + return MMSYSERR_INVALPARAM; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + + return GetSoundDeviceType(SoundDevice, DeviceType); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -63,7 +63,8 @@ MMRESULT OpenKernelSoundDevice( PSOUND_DEVICE SoundDevice, - DWORD AccessRights) + DWORD AccessRights, + PHANDLE Handle) { MMRESULT Result; @@ -73,74 +74,54 @@ return MMSYSERR_INVALPARAM; } - if ( SoundDevice->Handle != INVALID_HANDLE_VALUE ) - { - ERR_("Already open?"); - return MMSYSERR_ERROR; /*MMSYSERR_ALLOC;*/ + if ( ! Handle ) + { + return MMSYSERR_INVALPARAM; } Result = OpenKernelSoundDeviceByName(SoundDevice->DevicePath, AccessRights, - &SoundDevice->Handle); + Handle); return Result; } MMRESULT CloseKernelSoundDevice( - PSOUND_DEVICE SoundDevice) -{ - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( SoundDevice->Handle == INVALID_HANDLE_VALUE ) - return MMSYSERR_ERROR; /* ok? */ - - CloseHandle(SoundDevice->Handle); - SoundDevice->Handle = INVALID_HANDLE_VALUE; - - return MMSYSERR_NOERROR; -} - -MMRESULT -PerformSoundDeviceIo( - PSOUND_DEVICE SoundDevice, - DWORD IoControlCode, - LPVOID InBuffer, - DWORD InBufferSize, - LPVOID OutBuffer, - DWORD OutBufferSize, - LPDWORD BytesReturned, - LPOVERLAPPED Overlapped) -{ - BOOLEAN TemporaryOpen = FALSE; + HANDLE Handle) +{ + if ( Handle == INVALID_HANDLE_VALUE ) + return MMSYSERR_INVALPARAM; + + CloseHandle(Handle); + + return MMSYSERR_NOERROR; +} + +MMRESULT +PerformDeviceIo( + IN HANDLE Handle, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ BOOLEAN IoResult = FALSE; DWORD AccessRights = GENERIC_READ; - MMRESULT Result; - - if ( ! SoundDevice ) + + if ( Handle == INVALID_HANDLE_VALUE ) return MMSYSERR_INVALPARAM; /* Determine if we actually need to write stuff */ if ( InBuffer != NULL ) AccessRights |= GENERIC_WRITE; - /* Open the device temporarily,if it's not open */ - TemporaryOpen = (SoundDevice->Handle == INVALID_HANDLE_VALUE); - - if ( TemporaryOpen ) - { - MessageBox(0, L"Opening sound device", L"Info", MB_OK | MB_TASKMODAL); - - Result = OpenKernelSoundDevice(SoundDevice, AccessRights); - - if ( Result != MMSYSERR_NOERROR ) - return Result; - } - MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL); IoResult = DeviceIoControl( - SoundDevice->Handle, + Handle, IoControlCode, InBuffer, InBufferSize, @@ -154,27 +135,84 @@ return Win32ErrorToMmResult(GetLastError()); } - /* If we opened the device, we must close it here */ - if ( TemporaryOpen ) - { - MessageBox(0, L"Closing sound device", L"Info", MB_OK | MB_TASKMODAL); - CloseHandle(SoundDevice->Handle); - SoundDevice->Handle = INVALID_HANDLE_VALUE; - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -ReadSoundDevice( - PSOUND_DEVICE SoundDevice, - DWORD IoControlCode, - LPVOID OutBuffer, - DWORD OutBufferSize, - LPDWORD BytesReturned, - LPOVERLAPPED Overlapped) -{ - return PerformSoundDeviceIo(SoundDevice, + return MMSYSERR_NOERROR; +} + +MMRESULT +ReadFromDeviceHandle( + IN HANDLE Handle, + IN DWORD IoControlCode, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ + return PerformDeviceIo(Handle, + IoControlCode, + NULL, + 0, + OutBuffer, + OutBufferSize, + BytesReturned, + Overlapped); +} + +MMRESULT +WriteToDeviceHandle( + IN HANDLE Handle, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ + return PerformDeviceIo(Handle, + IoControlCode, + InBuffer, + InBufferSize, + NULL, + 0, + BytesReturned, + Overlapped); +} + +MMRESULT +PerformSoundDeviceIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) + return MMSYSERR_INVALPARAM; + + if ( SoundDeviceInstance->Handle == INVALID_HANDLE_VALUE ) + return MMSYSERR_ERROR; + + return PerformDeviceIo(SoundDeviceInstance->Handle, + IoControlCode, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + BytesReturned, + Overlapped); +} + +MMRESULT +ReadFromSoundDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ + return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, NULL, 0, @@ -185,15 +223,15 @@ } MMRESULT -WriteSoundDevice( - PSOUND_DEVICE SoundDevice, - DWORD IoControlCode, - LPVOID InBuffer, - DWORD InBufferSize, - LPDWORD BytesReturned, - LPOVERLAPPED Overlapped) -{ - return PerformSoundDeviceIo(SoundDevice, +WriteToSoundDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPDWORD BytesReturned, + IN LPOVERLAPPED Overlapped) +{ + return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, InBuffer, InBufferSize, @@ -203,6 +241,8 @@ Overlapped); } + +/* TODO: move somewhere else */ MMRESULT WriteSoundDeviceBuffer( PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -221,13 +261,13 @@ /*SOUND_DEBUG(msg);*/ TRACE_("WriteFileEx(%p, %p, %d, %p, %p)\n", - SoundDeviceInstance->Device->Handle, + SoundDeviceInstance->Handle, Buffer, (int) BufferSize, Overlapped, CompletionRoutine); - if ( ! WriteFileEx(SoundDeviceInstance->Device->Handle, + if ( ! WriteFileEx(SoundDeviceInstance->Handle, Buffer, BufferSize, Overlapped, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -17,96 +17,155 @@ MMRESULT QueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { - if ( ! Device ) + PMMFUNCTION_TABLE FunctionTable; + UCHAR DeviceType; + MMRESULT Result; + + if ( ! IsValidSoundDevice(SoundDevice) ) return MMSYSERR_INVALPARAM; if ( ! WaveFormat ) return MMSYSERR_INVALPARAM; - /* TODO: Should we check the size? */ + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); - return Device->Functions.QueryWaveFormat(Device, WaveFormat, WaveFormatSize); + /* Make sure we have a wave device */ + if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_ERROR; /* FIXME? */ + + /* TODO: Should we check the size here? */ + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &FunctionTable); + ASSERT(Result == MMSYSERR_NOERROR); + ASSERT(FunctionTable->QueryWaveFormat); + + return FunctionTable->QueryWaveFormat(SoundDevice, + WaveFormat, + WaveFormatSize); } MMRESULT DefaultQueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { + HANDLE Handle; + UCHAR DeviceType; + DWORD BytesReturned = 0; MMRESULT Result; - DWORD BytesReturned = 0; - if ( ! Device ) + if ( ! IsValidSoundDevice(SoundDevice) ) return MMSYSERR_INVALPARAM; if ( ! WaveFormat ) return MMSYSERR_INVALPARAM; + Result = GetSoundDeviceType(SoundDevice, + &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); + /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(Device->DeviceType) ) - { - return MMSYSERR_INVALPARAM; - } + if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_INVALPARAM; /* FIXME? */ - Result = WriteSoundDevice(Device, - IOCTL_WAVE_QUERY_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = OpenKernelSoundDevice(SoundDevice, + GENERIC_READ | GENERIC_WRITE, + &Handle); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + + Result = WriteToSoundDevice(Handle, + IOCTL_WAVE_QUERY_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned, + NULL); + + CloseKernelSoundDevice(Handle); return Result; } MMRESULT SetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { - if ( ! Instance ) + UCHAR DeviceType; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE FunctionTable; + MMRESULT Result; + + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) return MMSYSERR_INVALPARAM; if ( ! WaveFormat ) return MMSYSERR_INVALPARAM; + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); + + /* Make sure we have a wave device */ + if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_INVALPARAM; /* FIXME? */ + /* TODO: Should we check the size? */ - return Instance->Device->Functions.SetWaveFormat(Instance, WaveFormat, WaveFormatSize); + Result = GetSoundDeviceFunctionTable(SoundDevice, + &FunctionTable); + ASSERT(Result == MMSYSERR_NOERROR); + ASSERT(FunctionTable->SetWaveFormat); + + return FunctionTable->SetWaveFormat(SoundDeviceInstance, + WaveFormat, + WaveFormatSize); } MMRESULT DefaultSetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { + PSOUND_DEVICE SoundDevice; + UCHAR DeviceType; MMRESULT Result; DWORD BytesReturned = 0; - if ( ! Instance ) + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) return MMSYSERR_INVALPARAM; if ( ! WaveFormat ) return MMSYSERR_INVALPARAM; + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); + /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(Instance->Device->DeviceType) ) - { - return MMSYSERR_INVALPARAM; - } + if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) + return MMSYSERR_INVALPARAM; /* FIXME? */ - Result = WriteSoundDevice(Instance->Device, - IOCTL_WAVE_SET_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = WriteToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned, + NULL); return Result; } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -86,13 +86,67 @@ } MMRESULT +DefaultGetWaveDeviceState( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR State) +{ +// MMRESULT Result; + + ASSERT(SoundDeviceInstance); + ASSERT(State); +/* + Result = WriteSoundDevice(S + +MMRESULT +WriteSoundDevice( + PSOUND_DEVICE SoundDevice, + DWORD IoControlCode, + LPVOID InBuffer, + DWORD InBufferSize, + LPDWORD BytesReturned, + LPOVERLAPPED Overlapped) +*/ + return MMSYSERR_NOERROR; +} + +MMRESULT PauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { if ( ! SoundDeviceInstance ) return MMSYSERR_INVALPARAM; + return CallUsingSoundThread(SoundDeviceInstance, + PauseWaveDevice_Request, + NULL); +} + +MMRESULT +DefaultPauseWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + TRACE_("Pausing device\n"); /* TODO */ - return MMSYSERR_NOERROR; } + +MMRESULT +RestartWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + return CallUsingSoundThread(SoundDeviceInstance, + RestartWaveDevice_Request, + NULL); +} + +MMRESULT +DefaultRestartWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + TRACE_("Restarting device\n"); + /* TODO */ + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -270,6 +270,9 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PVOID Parameter) { + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; PUCHAR State = (PUCHAR) Parameter; if ( ! SoundDeviceInstance ) @@ -278,33 +281,56 @@ if ( ! State ) return MMSYSERR_INVALPARAM; - *State = SoundDeviceInstance->Streaming.Wave.State; + // *State = SoundDeviceInstance->Streaming.Wave.State; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->GetWaveDeviceState(SoundDeviceInstance, + State); +} + +MMRESULT +PauseWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->PauseWaveDevice(SoundDeviceInstance); +} + +MMRESULT +RestartWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( SoundDeviceInstance->Streaming.Wave.State != WAVE_DD_STOPPED ) + { + WARN_("Nothing to do\n"); + return MMSYSERR_NOERROR; + } return MMSYSERR_NOERROR; } - -MMRESULT -PauseWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - /* TODO */ - - return MMSYSERR_NOERROR; -} - -MMRESULT -ContinueWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - /* TODO */ - - return MMSYSERR_NOERROR; -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -28,7 +28,7 @@ IN PVOID Parameter); MMRESULT -ContinueWaveDevice_Request( +RestartWaveDevice_Request( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 11:26:02 2008 @@ -117,13 +117,23 @@ case WODM_WRITE : { ASSERT(Instance != NULL); - ASSERT(parameter1 != 0); + + if ( ! parameter1 ) + return MMSYSERR_INVALPARAM; return QueueWaveDeviceBuffer(Instance, (PWAVEHDR) parameter1); } case WODM_PAUSE : + { + return PauseWaveDevice(Instance); + } + case WODM_RESTART : + { + return RestartWaveDevice(Instance); + } + case WODM_RESET : case WODM_BREAKLOOP : return MMSYSERR_INVALHANDLE;

16 years, 2 months

[mkupfer] 34461: - support of [Strings.LanguageID]-sections for inf-files added in setupapi - inf-files with multi language support are strongly recommended to be in utf-16 encoding (with byte order mark) - at the moment only inf-files for second stage setup can contain translations (due to limitations of inflib) - some of the inf files for hardware installation (/media/inf) are converted to utf-16 and contain a basic German translation in the [Strings.0407] section - for more details read /reac

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jul 13 08:46:54 2008 New Revision: 34461 URL: http://svn.reactos.org/svn/reactos?rev=34461&view=rev Log: - support of [Strings.LanguageID]-sections for inf-files added in setupapi - inf-files with multi language support are strongly recommended to be in utf-16 encoding (with byte order mark) - at the moment only inf-files for second stage setup can contain translations (due to limitations of inflib) - some of the inf files for hardware installation (/media/inf) are converted to utf-16 and contain a basic German translation in the [Strings.0407] section - for more details read /reactos/branches/matthias-i18n/media/inf/README - TODO: for other/further languages add other translations in new string sections Modified: trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=34… Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3446… Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3446… Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3446… Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=344… Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3446… Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=…

16 years, 2 months

[pschweitzer] 34460: - Switched create.c to PSEH, it will probably need further improvements - Also fixed some warnings

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 13 08:43:20 2008 New Revision: 34460 URL: http://svn.reactos.org/svn/reactos?rev=34460&view=rev Log: - Switched create.c to PSEH, it will probably need further improvements - Also fixed some warnings Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/create.c branches/pierre-fsd/drivers/filesystems/ext3fsd/debug.c Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/create.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/create.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/create.c [iso-8859-1] Sun Jul 13 08:43:20 2008 @@ -4,7 +4,9 @@ * FILE: create.c * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net - * UPDATE HISTORY: + * UPDATE HISTORY: 13 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Replaced SEH support with PSEH support + * Fixed some warnings under GCC */ /* INCLUDES *****************************************************************/ @@ -16,6 +18,51 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ + +VOID +Ext2FollowLinkFinal ( + IN PWSTR UniNameBuffer, + IN PCHAR OemNameBuffer, + IN BOOLEAN bOemBuffer ); + +VOID +Ext2LookupFileFinal ( + IN PEXT2_VCB Vcb, + OUT PEXT2_MCB Ext2Mcb, + IN PNTSTATUS pStatus, + IN PEXT2_MCB Mcb, + IN BOOLEAN bDirectory, + IN BOOLEAN LockAcquired ); + +VOID +Ext2ScanDirFinal ( + IN PEXT2_MCB Parent, + IN PEXT2_DIR_ENTRY2 pDir, + IN PWSTR InodeFileNameBuffer ); + +VOID +Ext2CreateFileFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PEXT2_VCB Vcb, + IN PNTSTATUS pStatus, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_FCB Fcb, + IN PEXT2_MCB Mcb, + IN PEXT2_MCB SymLink, + IN PEXT2_CCB Ccb, + IN PEXT2_FCB ParentFcb, + IN PUNICODE_STRING FileName, + IN BOOLEAN bParentFcbCreated, + IN BOOLEAN bCreated, + IN BOOLEAN bMainResourceAcquired, + IN BOOLEAN NoIntermediateBuffering ); + +VOID +Ext2CreateFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PEXT2_VCB Vcb, + IN PNTSTATUS pStatus, + IN BOOLEAN VcbResourceAcquired ); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, Ext2IsNameValid) @@ -31,6 +78,9 @@ #endif +/* FUNCTIONS ***************************************************************/ + + BOOLEAN Ext2IsNameValid(PUNICODE_STRING FileName) { @@ -61,6 +111,35 @@ return TRUE; } +_SEH_DEFINE_LOCALS(Ext2FollowLinkFinal) +{ + PWSTR UniNameBuffer; + PCHAR OemNameBuffer; + BOOLEAN bOemBuffer; +}; + +_SEH_FINALLYFUNC(Ext2FollowLinkFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2FollowLinkFinal); + Ext2FollowLinkFinal(_SEH_VAR(UniNameBuffer), _SEH_VAR(OemNameBuffer), + _SEH_VAR(bOemBuffer)); +} + +VOID +Ext2FollowLinkFinal ( + IN PWSTR UniNameBuffer, + IN PCHAR OemNameBuffer, + IN BOOLEAN bOemBuffer + ) +{ + if (bOemBuffer) { + ExFreePoolWithTag(OemNameBuffer, TAG('N', 'L', '2', 'E')); + } + + if (UniNameBuffer) { + ExFreePoolWithTag(UniNameBuffer, TAG('N', 'L', '2', 'E')); + } +} NTSTATUS Ext2FollowLink ( @@ -75,13 +154,17 @@ UNICODE_STRING UniName; OEM_STRING OemName; - BOOLEAN bOemBuffer = FALSE; PEXT2_MCB Target = NULL; USHORT i; - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2FollowLinkFinal); + _SEH_VAR(UniNameBuffer) = UniName.Buffer; + _SEH_VAR(OemNameBuffer) = OemName.Buffer; + _SEH_VAR(bOemBuffer) = FALSE; RtlZeroMemory(&UniName, sizeof(UNICODE_STRING)); RtlZeroMemory(&OemName, sizeof(OEM_STRING)); @@ -89,13 +172,14 @@ /* exit if we jump into a possible symlink forever loop */ if ((Linkdep + 1) > EXT2_MAX_NESTED_LINKS || IoGetRemainingStackSize() < 1024) { - __leave; + _SEH_LEAVE; } /* read the symlink target path */ if (Mcb->Inode->i_size < EXT2_LINKLEN_IN_INODE) { OemName.Buffer = (PUCHAR) (&Mcb->Inode->i_block[0]); + _SEH_VAR(OemNameBuffer) = OemName.Buffer; OemName.Length = (USHORT)Mcb->Inode->i_size; OemName.MaximumLength = OemName.Length + 1; @@ -105,12 +189,13 @@ OemName.MaximumLength = OemName.Length + 1; OemName.Buffer = ExAllocatePoolWithTag(PagedPool, OemName.MaximumLength, - 'NL2E'); + TAG('N', 'L', '2', 'E')); + _SEH_VAR(OemNameBuffer) = OemName.Buffer; if (OemName.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; - } - bOemBuffer = TRUE; + _SEH_LEAVE; + } + _SEH_VAR(bOemBuffer) = TRUE; RtlZeroMemory(OemName.Buffer, OemName.MaximumLength); Status = Ext2ReadInode( @@ -123,7 +208,7 @@ FALSE, NULL); if (!NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } } @@ -138,22 +223,23 @@ UniName.MaximumLength = (USHORT)Ext2OEMToUnicodeSize(Vcb, &OemName); if (UniName.MaximumLength <= 0) { Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } UniName.MaximumLength += 2; UniName.Buffer = ExAllocatePoolWithTag(PagedPool, UniName.MaximumLength, - 'NL2E'); + TAG('N', 'L', '2', 'E')); + _SEH_VAR(UniNameBuffer) = UniName.Buffer; if (UniName.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } RtlZeroMemory(UniName.Buffer, UniName.MaximumLength); Status = Ext2OEMToUnicode(Vcb, &UniName, &OemName); if (!NT_SUCCESS(Status)) { Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } /* search the real target */ @@ -167,7 +253,7 @@ ); if (!NT_SUCCESS(Status)) { Status = STATUS_LINK_FAILED; - __leave; + _SEH_LEAVE; } /* we get the link target */ @@ -186,16 +272,9 @@ Mcb->FileSize = Target->FileSize; Mcb->FileAttr = Target->FileAttr; - } __finally { - - if (bOemBuffer) { - ExFreePoolWithTag(OemName.Buffer, 'NL2E'); - } - - if (UniName.Buffer) { - ExFreePoolWithTag(UniName.Buffer, 'NL2E'); - } - } + } + _SEH_FINALLY(Ext2FollowLinkFinal_PSEH) + _SEH_END; return Status; } @@ -244,6 +323,51 @@ } return FALSE; +} + +_SEH_DEFINE_LOCALS(Ext2LookupFileFinal) +{ + PEXT2_VCB Vcb; + PEXT2_MCB Ext2Mcb; + PNTSTATUS pStatus; + PEXT2_MCB Mcb; + BOOLEAN bDirectory; + BOOLEAN LockAcquired; +}; + +_SEH_FINALLYFUNC(Ext2LookupFileFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2LookupFileFinal); + Ext2LookupFileFinal(_SEH_VAR(Vcb), _SEH_VAR(Ext2Mcb), _SEH_VAR(pStatus), + _SEH_VAR(Mcb), _SEH_VAR(bDirectory), + _SEH_VAR(LockAcquired)); +} + +VOID Ext2LookupFileFinal ( + IN PEXT2_VCB Vcb, + OUT PEXT2_MCB Ext2Mcb, + IN PNTSTATUS pStatus, + IN PEXT2_MCB Mcb, + IN BOOLEAN bDirectory, + IN BOOLEAN LockAcquired + ) +{ + if (NT_SUCCESS(*pStatus)) { + if (bDirectory) { + if (IsMcbDirectory(Mcb)) { + Ext2Mcb = Mcb; + } else { + Ext2DerefMcb(Mcb); + *pStatus = STATUS_NOT_A_DIRECTORY; + } + } else { + Ext2Mcb = Mcb; + } + } + + if (LockAcquired) { + ExReleaseResourceLite(&Vcb->McbLock); + } } NTSTATUS @@ -265,15 +389,22 @@ ULONG EntryOffset = 0; BOOLEAN bParent = FALSE; - BOOLEAN bDirectory = FALSE; - BOOLEAN LockAcquired = FALSE; - - __try { + + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2LookupFileFinal); + _SEH_VAR(Vcb) = Vcb; + _SEH_VAR(Ext2Mcb) = *Ext2Mcb; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(Mcb) = Mcb; + _SEH_VAR(bDirectory) = FALSE; + _SEH_VAR(LockAcquired) = FALSE; ExAcquireResourceExclusiveLite(&Vcb->McbLock, TRUE); - LockAcquired = TRUE; + _SEH_VAR(LockAcquired) = TRUE; *Ext2Mcb = NULL; + _SEH_VAR(Ext2Mcb) = NULL; DEBUG(DL_RES, ("Ext2LookupFile: %wZ\n", FullName)); @@ -288,6 +419,7 @@ /* default is the parent Mcb*/ Mcb = Parent; + _SEH_VAR(Mcb) = Parent; Ext2ReferMcb(Mcb); /* is empty file name or root node */ @@ -295,12 +427,12 @@ if ( (End == 0) || (End == 1 && FullName->Buffer[0] == L'\\')) { Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } /* is a directory expected ? */ if (FullName->Buffer[End - 1] == L'\\') { - bDirectory = TRUE; + _SEH_VAR(bDirectory) = TRUE; } /* loop with every sub name */ @@ -330,6 +462,7 @@ /* search cached Mcb nodes */ Mcb = Ext2SearchMcbWithoutLock(Parent, &FileName); + _SEH_VAR(Mcb) = Mcb; if (Mcb) { @@ -375,6 +508,7 @@ &Target->FullName, FILE_ATTRIBUTE_NORMAL ); + _SEH_VAR(Mcb) = Mcb; if (!Mcb) { Status = STATUS_INSUFFICIENT_RESOURCES; Ext2DerefMcb(Parent); @@ -436,6 +570,7 @@ Ext2DerefMcb(Parent); Ext2FreeMcb(Vcb, Mcb); Mcb = NULL; + _SEH_VAR(Mcb) = NULL; break; } /* we got the target of this symlink */ @@ -474,29 +609,47 @@ } } - } __finally { - - if (NT_SUCCESS(Status)) { - if (bDirectory) { - if (IsMcbDirectory(Mcb)) { - *Ext2Mcb = Mcb; - } else { - Ext2DerefMcb(Mcb); - Status = STATUS_NOT_A_DIRECTORY; - } - } else { - *Ext2Mcb = Mcb; - } - } - - if (LockAcquired) { - ExReleaseResourceLite(&Vcb->McbLock); - } - } + } + _SEH_FINALLY(Ext2LookupFileFinal_PSEH) + _SEH_END; return Status; } +_SEH_DEFINE_LOCALS(Ext2ScanDirFinal) +{ + PEXT2_MCB Parent; + PEXT2_DIR_ENTRY2 pDir; + PWSTR InodeFileNameBuffer; +}; + +_SEH_FINALLYFUNC(Ext2ScanDirFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2ScanDirFinal); + Ext2ScanDirFinal(_SEH_VAR(Parent), _SEH_VAR(pDir), + _SEH_VAR(InodeFileNameBuffer)); +} + +VOID +Ext2ScanDirFinal ( + IN PEXT2_MCB Parent, + IN PEXT2_DIR_ENTRY2 pDir, + IN PWSTR InodeFileNameBuffer + ) +{ + if (InodeFileNameBuffer != NULL) { + ExFreePoolWithTag(InodeFileNameBuffer, EXT2_INAME_MAGIC); + DEC_MEM_COUNT(PS_INODE_NAME, InodeFileNameBuffer, + (EXT2_NAME_LEN + 1) * 2); + } + + if (pDir) { + ExFreePoolWithTag(pDir, EXT2_DENTRY_MAGIC); + DEC_MEM_COUNT(PS_DIR_ENTRY, pDir, sizeof(EXT2_DIR_ENTRY2)); + } + + Ext2DerefMcb(Parent); +} NTSTATUS Ext2ScanDir ( @@ -511,7 +664,6 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; ULONG ByteOffset = 0; - ULONG inode = Parent->iNo; ULONG dwRet; ULONG RecLen; @@ -527,7 +679,12 @@ /* initialize InodeFileName */ InodeFileName.Buffer = NULL; - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2ScanDirFinal); + _SEH_VAR(Parent) = Parent; + _SEH_VAR(pDir) = NULL; + _SEH_VAR(InodeFileNameBuffer) = NULL; /* grab parent's reference first */ Ext2ReferMcb(Parent); @@ -535,7 +692,7 @@ /* bad request ! Can a man be pregnant ? Maybe:) */ if (!IsMcbDirectory(Parent)) { Status = STATUS_NOT_A_DIRECTORY; - __leave; + _SEH_LEAVE; } /* parent is a symlink ? */ @@ -547,7 +704,7 @@ } else { DbgBreak(); Status = STATUS_NOT_A_DIRECTORY; - __leave; + _SEH_LEAVE; } } @@ -557,11 +714,12 @@ (EXT2_NAME_LEN + 1) * 2, EXT2_INAME_MAGIC ); + _SEH_VAR(InodeFileNameBuffer) = InodeFileName.Buffer; if (!InodeFileName.Buffer) { DEBUG(DL_ERR, ( "Ex2ScanDir: failed to allocate InodeFileName.\n")); Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } INC_MEM_COUNT(PS_INODE_NAME, InodeFileName.Buffer, (EXT2_NAME_LEN + 1) * 2); @@ -571,10 +729,11 @@ sizeof(EXT2_DIR_ENTRY2), EXT2_DENTRY_MAGIC ); + _SEH_VAR(pDir) = pDir; if (!pDir) { DEBUG(DL_ERR, ( "Ex2ScanDir: failed to allocate pDir.\n")); Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } INC_MEM_COUNT(PS_DIR_ENTRY, pDir, sizeof(EXT2_DIR_ENTRY2)); @@ -602,7 +761,7 @@ if (!NT_SUCCESS(Status)) { DEBUG(DL_ERR, ( "Ext2ScanDir: failed to read directory.\n")); - __leave; + _SEH_LEAVE; } if (pDir->rec_len == 0) { @@ -615,7 +774,7 @@ if ((pDir->inode >= INODES_COUNT)) { Status = STATUS_FILE_CORRUPT_ERROR; - __leave; + _SEH_LEAVE; } OemName.Buffer = pDir->name; @@ -627,7 +786,7 @@ if (InodeFileNameLength <= 0) { DEBUG(DL_CP, ("Ext2ScanDir: failed to count unicode length of %s.\n", OemName.Buffer)); Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } InodeFileName.Length = 0; @@ -640,7 +799,7 @@ if (!NT_SUCCESS(Status)) { DEBUG(DL_CP, ("Ext2ScanDir: failed to convert %s to unicode.\n", OemName.Buffer)); Status = STATUS_INSUFFICIENT_RESOURCES; - __leave; + _SEH_LEAVE; } if (!RtlCompareUnicodeString( @@ -666,27 +825,157 @@ Status = STATUS_NO_SUCH_FILE; } - } __finally { - - if (InodeFileName.Buffer != NULL) { - ExFreePoolWithTag(InodeFileName.Buffer, EXT2_INAME_MAGIC); - DEC_MEM_COUNT(PS_INODE_NAME, InodeFileName.Buffer, - (EXT2_NAME_LEN + 1) * 2); - } - - if (pDir) { - ExFreePoolWithTag(pDir, EXT2_DENTRY_MAGIC); - DEC_MEM_COUNT(PS_DIR_ENTRY, pDir, sizeof(EXT2_DIR_ENTRY2)); - } - - Ext2DerefMcb(Parent); - } + } + _SEH_FINALLY(Ext2ScanDirFinal_PSEH) + _SEH_END; return Status; } +_SEH_DEFINE_LOCALS(Ext2CreateFileFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PEXT2_VCB Vcb; + PNTSTATUS pStatus; + PIO_STACK_LOCATION IrpSp; + PEXT2_FCB Fcb; + PEXT2_MCB Mcb; + PEXT2_MCB SymLink; + PEXT2_CCB Ccb; + PEXT2_FCB ParentFcb; + PUNICODE_STRING FileName; + BOOLEAN bParentFcbCreated; + BOOLEAN bCreated; + BOOLEAN bMainResourceAcquired; + BOOLEAN NoIntermediateBuffering; +}; + +_SEH_FINALLYFUNC(Ext2CreateFileFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2CreateFileFinal); + Ext2CreateFileFinal(_SEH_VAR(IrpContext), _SEH_VAR(Vcb), _SEH_VAR(pStatus), + _SEH_VAR(IrpSp), _SEH_VAR(Fcb), _SEH_VAR(Mcb), + _SEH_VAR(SymLink), _SEH_VAR(Ccb), _SEH_VAR(ParentFcb), + _SEH_VAR(FileName), _SEH_VAR(bParentFcbCreated), + _SEH_VAR(bCreated), _SEH_VAR(bMainResourceAcquired), + _SEH_VAR(NoIntermediateBuffering)); +} + +_SEH_FINALLYFUNC(Ext2CreateFileFinal2_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2CreateFileFinal); + ExReleaseResourceLite(&(_SEH_VAR(Fcb)->PagingIoResource)); +} + +VOID +Ext2CreateFileFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PEXT2_VCB Vcb, + IN PNTSTATUS pStatus, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_FCB Fcb, + IN PEXT2_MCB Mcb, + IN PEXT2_MCB SymLink, + IN PEXT2_CCB Ccb, + IN PEXT2_FCB ParentFcb, + IN PUNICODE_STRING FileName, + IN BOOLEAN bParentFcbCreated, + IN BOOLEAN bCreated, + IN BOOLEAN bMainResourceAcquired, + IN BOOLEAN NoIntermediateBuffering + ) +{ + /* cleanup Fcb and Ccb, Mcb if necessary */ + if (!NT_SUCCESS(*pStatus)) { + + if (Ccb != NULL) { + + DbgBreak(); + + ASSERT(Fcb != NULL); + ASSERT(Fcb->Mcb != NULL); + + DEBUG(DL_ERR, ("Ext2CreateFile: failed to create %wZ status = %xh\n", + &Fcb->Mcb->FullName, *pStatus)); + + Ext2DerefXcb(&Fcb->OpenHandleCount); + Ext2DerefXcb(&Fcb->ReferenceCount); + + if (!IsDirectory(Fcb)) { + if (NoIntermediateBuffering) { + Fcb->NonCachedOpenCount--; + } else { + ClearFlag(IrpSp->FileObject->Flags, FO_CACHE_SUPPORTED); + } + } + + Ext2DerefXcb(&Vcb->OpenFileHandleCount); + Ext2DerefXcb(&Vcb->ReferenceCount); + + IoRemoveShareAccess(IrpSp->FileObject, &Fcb->ShareAccess); + + IrpSp->FileObject->FsContext = NULL; + IrpSp->FileObject->FsContext2 = NULL; + IrpSp->FileObject->PrivateCacheMap = NULL; + IrpSp->FileObject->SectionObjectPointer = NULL; + + Ext2FreeCcb(Ccb); + } + } + + if (Fcb && Ext2DerefXcb(&Fcb->ReferenceCount) == 0) { + + if (IsFlagOn(Fcb->Flags, FCB_ALLOC_IN_CREATE)) { + + LARGE_INTEGER Size; + ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); + _SEH_TRY { + Size.QuadPart = 0; + Mcb->FileSize = Fcb->RealSize; + Ext2TruncateFile(IrpContext, Vcb, Mcb, &Size); + } + _SEH_FINALLY(Ext2CreateFileFinal2_PSEH) + _SEH_END; + } + + if (bCreated) { + Ext2DeleteFile(IrpContext, Vcb, Mcb); + } + + Ext2FreeFcb(Fcb); + Fcb = NULL; + bMainResourceAcquired = FALSE; + } + + if (bMainResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + /* free file name buffer */ + if (FileName->Buffer) { + DEC_MEM_COUNT(PS_FILE_NAME, FileName->Buffer, FileName->MaximumLength); + ExFreePoolWithTag(FileName->Buffer, EXT2_FNAME_MAGIC); + } + + /* dereference parent Fcb, free it if it goes to zero */ + if (ParentFcb) { + ClearLongFlag(ParentFcb->Flags, FCB_STATE_BUSY); + if (bParentFcbCreated) { + if (Ext2DerefXcb(&ParentFcb->ReferenceCount) == 0) { + Ext2FreeFcb(ParentFcb); + } + } + } + + /* drop SymLink's refer: If succeeds, Ext2AllocateCcb should refer + it already. It fails, we need release the refer to let it freed */ + if (SymLink) { + Ext2DerefMcb(SymLink); + } +} + NTSTATUS -Ext2CreateFile( +Ext2CreateFile ( PEXT2_IRP_CONTEXT IrpContext, PEXT2_VCB Vcb, PBOOLEAN OpPostIrp @@ -708,18 +997,12 @@ ULONG Options; ULONG CreateDisposition; - BOOLEAN bParentFcbCreated = FALSE; - - BOOLEAN bDir = FALSE; BOOLEAN bFcbAllocated = FALSE; - BOOLEAN bCreated = FALSE; - BOOLEAN bMainResourceAcquired = FALSE; BOOLEAN OpenDirectory; BOOLEAN OpenTargetDirectory; BOOLEAN CreateDirectory; BOOLEAN SequentialOnly; - BOOLEAN NoIntermediateBuffering; BOOLEAN IsPagingFile; BOOLEAN DirectoryFile; BOOLEAN NonDirectoryFile; @@ -743,7 +1026,6 @@ NonDirectoryFile = IsFlagOn(Options, FILE_NON_DIRECTORY_FILE); SequentialOnly = IsFlagOn(Options, FILE_SEQUENTIAL_ONLY); - NoIntermediateBuffering = IsFlagOn( Options, FILE_NO_INTERMEDIATE_BUFFERING ); NoEaKnowledge = IsFlagOn(Options, FILE_NO_EA_KNOWLEDGE); DeleteOnClose = IsFlagOn(Options, FILE_DELETE_ON_CLOSE); @@ -769,13 +1051,30 @@ *OpPostIrp = FALSE; - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2CreateFileFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(Vcb) = Vcb; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(IrpSp) = IrpSp; + _SEH_VAR(Fcb) = NULL; + _SEH_VAR(Mcb) = NULL; + _SEH_VAR(SymLink) = NULL; + _SEH_VAR(Ccb) = NULL; + _SEH_VAR(ParentFcb) = NULL; + _SEH_VAR(FileName) = &FileName; + _SEH_VAR(bParentFcbCreated) = FALSE; + _SEH_VAR(bCreated) = FALSE; + _SEH_VAR(bMainResourceAcquired) = FALSE; + _SEH_VAR(NoIntermediateBuffering) = IsFlagOn( Options, FILE_NO_INTERMEDIATE_BUFFERING );; FileName.MaximumLength = IrpSp->FileObject->FileName.MaximumLength; FileName.Length = IrpSp->FileObject->FileName.Length; if (IrpSp->FileObject->RelatedFileObject) { ParentFcb = (PEXT2_FCB)(IrpSp->FileObject->RelatedFileObject->FsContext); + _SEH_VAR(ParentFcb) = ParentFcb; } if (ParentFcb) { @@ -788,12 +1087,13 @@ if (ParentFcb) { Mcb = ParentFcb->Mcb; + _SEH_VAR(Mcb) = ParentFcb->Mcb; Status = STATUS_SUCCESS; goto McbExisting; } else { DbgBreak(); Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } } @@ -809,7 +1109,7 @@ if (ParentFcb) { Ext2DerefMcb(ParentMcb); } - __leave; + _SEH_LEAVE; } INC_MEM_COUNT(PS_FILE_NAME, FileName.Buffer, FileName.MaximumLength); @@ -840,7 +1140,7 @@ } Status = STATUS_OBJECT_NAME_INVALID; - __leave; + _SEH_LEAVE; } } @@ -849,14 +1149,14 @@ if (ParentFcb) { Ext2DerefMcb(ParentMcb); } - __leave; + _SEH_LEAVE; } DEBUG(DL_INF, ( "Ext2CreateFile: %wZ Paging=%d Option: %xh:" "Dir=%d NonDir=%d OpenTarget=%d NC=%d DeleteOnClose=%d\n", &FileName, IsPagingFile, IrpSp->Parameters.Create.Options, DirectoryFile, NonDirectoryFile, OpenTargetDirectory, - NoIntermediateBuffering, DeleteOnClose )); + _SEH_VAR(NoIntermediateBuffering), DeleteOnClose )); DEBUG(DL_RES, ("Ext2CreateFile: Lookup 1st: %wZ at %S\n", &FileName, ParentMcb ? ParentMcb->FullName.Buffer : L" ")); @@ -876,19 +1176,18 @@ UNICODE_STRING RealName; UNICODE_STRING RemainName; - LONG i = 0; - PathName = FileName; Mcb = NULL; + _SEH_VAR(Mcb) = NULL; if (Status == STATUS_LINK_FAILED) { if (CreateDisposition == FILE_CREATE) { Irp->IoStatus.Information = FILE_EXISTS; Status = STATUS_OBJECT_NAME_COLLISION; - __leave; + _SEH_LEAVE; } else { Status = STATUS_OBJECT_NAME_INVALID; - __leave; + _SEH_LEAVE; } } @@ -898,14 +1197,14 @@ PathName.Buffer[PathName.Length/2] = 0; } else { Status = STATUS_NOT_A_DIRECTORY; - __leave; + _SEH_LEAVE; } } if (!ParentMcb) { if (PathName.Buffer[0] != L'\\') { Status = STATUS_OBJECT_PATH_NOT_FOUND; - __leave; + _SEH_LEAVE; } else { ParentMcb = Vcb->McbTree; } @@ -920,7 +1219,7 @@ (RealName.Length >= 256 * sizeof(WCHAR))) { Status = STATUS_OBJECT_NAME_INVALID; Ext2DerefMcb(ParentMcb); - __leave; + _SEH_LEAVE; } if (RemainName.Length != 0) { @@ -943,7 +1242,7 @@ /* quit name resolving loop */ if (!NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } /* RetMcb is already refered */ @@ -958,7 +1257,7 @@ !Ext2IsNameValid(&RealName)) { Status = STATUS_OBJECT_NAME_INVALID; Ext2DerefMcb(ParentMcb); - __leave; + _SEH_LEAVE; } /* symlink must use it's target */ @@ -975,14 +1274,16 @@ /* get the ParentFcb, allocate it if needed ... */ ParentFcb = ParentMcb->Fcb; + _SEH_VAR(ParentFcb) = ParentMcb->Fcb; if (!ParentFcb) { ParentFcb = Ext2AllocateFcb(Vcb, ParentMcb); + _SEH_VAR(ParentFcb) = ParentFcb; if (!ParentFcb) { Status = STATUS_INSUFFICIENT_RESOURCES; Ext2DerefMcb(ParentMcb); - __leave; - } - bParentFcbCreated = TRUE; + _SEH_LEAVE; + } + _SEH_VAR(bParentFcbCreated) = TRUE; Ext2ReferXcb(&ParentFcb->ReferenceCount); } SetLongFlag(ParentFcb->Flags, FCB_STATE_BUSY); @@ -997,7 +1298,7 @@ if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } if (IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { @@ -1011,13 +1312,13 @@ if (TemporaryFile) { DbgBreak(); Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } } if (!ParentFcb) { Status = STATUS_OBJECT_PATH_NOT_FOUND; - __leave; + _SEH_LEAVE; } /* allocate inode and construct entry for this file */ @@ -1032,10 +1333,10 @@ if (!NT_SUCCESS(Status)) { DbgBreak(); - __leave; - } - - bCreated = TRUE; + _SEH_LEAVE; + } + + _SEH_VAR(bCreated) = TRUE; DEBUG(DL_RES, ("Ext2CreateFile: Confirm creation: %wZ\\%wZ\n", &ParentMcb->FullName, &RealName)); @@ -1055,12 +1356,12 @@ if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } if (!ParentFcb) { Status = STATUS_OBJECT_PATH_NOT_FOUND; - __leave; + _SEH_LEAVE; } RtlZeroMemory( IrpSp->FileObject->FileName.Buffer, @@ -1072,6 +1373,7 @@ RealName.Length ); Fcb = ParentFcb; + _SEH_VAR(Fcb) = ParentFcb; Irp->IoStatus.Information = FILE_DOES_NOT_EXIST; Status = STATUS_SUCCESS; @@ -1079,7 +1381,7 @@ } else { Status = STATUS_OBJECT_NAME_NOT_FOUND; - __leave; + _SEH_LEAVE; } } else { // File / Dir already exists. @@ -1090,7 +1392,7 @@ if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { Status = STATUS_MEDIA_WRITE_PROTECTED; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } Irp->IoStatus.Information = FILE_EXISTS; @@ -1108,6 +1410,7 @@ Ext2ReferMcb(Mcb->Parent); Ext2DerefMcb(Mcb); Mcb = Mcb->Parent; + _SEH_VAR(Mcb) = Mcb->Parent; goto Openit; } @@ -1117,7 +1420,7 @@ Irp->IoStatus.Information = FILE_EXISTS; Status = STATUS_OBJECT_NAME_COLLISION; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } /* directory forbits us to do the followings ... */ @@ -1128,13 +1431,13 @@ Status = STATUS_OBJECT_NAME_COLLISION; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } if (NonDirectoryFile) { Status = STATUS_FILE_IS_A_DIRECTORY; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } if (Mcb->iNo == EXT2_ROOT_INO) { @@ -1142,14 +1445,14 @@ if (DeleteOnClose) { Status = STATUS_CANNOT_DELETE; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } if (OpenTargetDirectory) { DbgBreak(); Status = STATUS_INVALID_PARAMETER; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } } @@ -1158,7 +1461,7 @@ if (DirectoryFile) { Status = STATUS_NOT_A_DIRECTORY;; Ext2DerefMcb(Mcb); - __leave; + _SEH_LEAVE; } } @@ -1175,15 +1478,19 @@ if (IsMcbSymlink(Mcb)) { Ext2ReferMcb(Mcb->Target); SymLink = Mcb; + _SEH_VAR(SymLink) = Mcb; Mcb = Mcb->Target; + _SEH_VAR(Mcb) = Mcb->Target; ASSERT (!IsMcbSymlink(Mcb)); } Fcb = Mcb->Fcb; + _SEH_VAR(Fcb) = Mcb->Fcb; if (Fcb == NULL) { /* allocate Fcb for this file */ Fcb = Ext2AllocateFcb (Vcb, Mcb); + _SEH_VAR(Fcb) = Fcb; if (Fcb) { bFcbAllocated = TRUE; } else { @@ -1193,6 +1500,7 @@ if (IsPagingFile) { Status = STATUS_SHARING_VIOLATION; Fcb = NULL; + _SEH_VAR(Fcb) = NULL; } } @@ -1207,7 +1515,7 @@ Ext2ReferXcb(&Fcb->ReferenceCount); ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - bMainResourceAcquired = TRUE; + _SEH_VAR(bMainResourceAcquired) = TRUE; /* check Mcb reference */ ASSERT(Fcb->Mcb->Refercount > 0); @@ -1215,7 +1523,7 @@ /* file delted ? */ if (IsFlagOn(Fcb->Flags, FCB_FILE_DELETED)) { Status = STATUS_FILE_DELETED; - __leave; + _SEH_LEAVE; } /* check access and oplock access for opened files */ @@ -1236,12 +1544,12 @@ if ( Status != STATUS_SUCCESS && Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) { *OpPostIrp = TRUE; - __leave; + _SEH_LEAVE; } } } - if (bCreated) { + if (_SEH_VAR(bCreated)) { // // This file is just created. @@ -1314,7 +1622,7 @@ if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } if (IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { @@ -1386,7 +1694,7 @@ if ( Status != STATUS_SUCCESS && Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) { *OpPostIrp = TRUE; - __leave; + _SEH_LEAVE; } } } @@ -1400,7 +1708,7 @@ &(Fcb->ShareAccess), TRUE ); if (!NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } } else { @@ -1413,17 +1721,18 @@ } Ccb = Ext2AllocateCcb(SymLink); + _SEH_VAR(Ccb) = Ccb; if (!Ccb) { Status = STATUS_INSUFFICIENT_RESOURCES; DbgBreak(); - __leave; + _SEH_LEAVE; } Ext2ReferXcb(&Fcb->OpenHandleCount); Ext2ReferXcb(&Fcb->ReferenceCount); if (!IsDirectory(Fcb)) { - if (NoIntermediateBuffering) { + if (_SEH_VAR(NoIntermediateBuffering)) { Fcb->NonCachedOpenCount++; } else { SetFlag(IrpSp->FileObject->Flags, FO_CACHE_SUPPORTED); @@ -1443,7 +1752,7 @@ Status = STATUS_SUCCESS; - if (bCreated) { + if (_SEH_VAR(bCreated)) { if (IsDirectory(Fcb)) { Ext2NotifyReportChange( @@ -1472,7 +1781,7 @@ Status = DeleteOnClose ? STATUS_CANNOT_DELETE : STATUS_SHARING_VIOLATION; - __leave; + _SEH_LEAVE; } } @@ -1482,18 +1791,18 @@ if (IsDirectory(Fcb)) { Status = STATUS_FILE_IS_A_DIRECTORY; - __leave; + _SEH_LEAVE; } if (SymLink != NULL) { DbgBreak(); Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } if (IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { @@ -1514,7 +1823,7 @@ if (!NT_SUCCESS(Status)) { DbgBreak(); - __leave; + _SEH_LEAVE; } Ext2NotifyReportChange( @@ -1537,99 +1846,12 @@ } else { DbgBreak(); - __leave; - } - - } __finally { - - /* cleanup Fcb and Ccb, Mcb if necessary */ - if (!NT_SUCCESS(Status)) { - - if (Ccb != NULL) { - - DbgBreak(); - - ASSERT(Fcb != NULL); - ASSERT(Fcb->Mcb != NULL); - - DEBUG(DL_ERR, ("Ext2CreateFile: failed to create %wZ status = %xh\n", - &Fcb->Mcb->FullName, Status)); - - Ext2DerefXcb(&Fcb->OpenHandleCount); - Ext2DerefXcb(&Fcb->ReferenceCount); - - if (!IsDirectory(Fcb)) { - if (NoIntermediateBuffering) { - Fcb->NonCachedOpenCount--; - } else { - ClearFlag(IrpSp->FileObject->Flags, FO_CACHE_SUPPORTED); - } - } - - Ext2DerefXcb(&Vcb->OpenFileHandleCount); - Ext2DerefXcb(&Vcb->ReferenceCount); - - IoRemoveShareAccess(IrpSp->FileObject, &Fcb->ShareAccess); - - IrpSp->FileObject->FsContext = NULL; - IrpSp->FileObject->FsContext2 = NULL; - IrpSp->FileObject->PrivateCacheMap = NULL; - IrpSp->FileObject->SectionObjectPointer = NULL; - - Ext2FreeCcb(Ccb); - } - } - - if (Fcb && Ext2DerefXcb(&Fcb->ReferenceCount) == 0) { - - if (IsFlagOn(Fcb->Flags, FCB_ALLOC_IN_CREATE)) { - - LARGE_INTEGER Size; - ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); - __try { - Size.QuadPart = 0; - Mcb->FileSize = Fcb->RealSize; - Ext2TruncateFile(IrpContext, Vcb, Mcb, &Size); - } __finally { - ExReleaseResourceLite(&Fcb->PagingIoResource); - } - } - - if (bCreated) { - Ext2DeleteFile(IrpContext, Vcb, Mcb); - } - - Ext2FreeFcb(Fcb); - Fcb = NULL; - bMainResourceAcquired = FALSE; - } - - if (bMainResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - /* free file name buffer */ - if (FileName.Buffer) { - DEC_MEM_COUNT(PS_FILE_NAME, FileName.Buffer, FileName.MaximumLength); - ExFreePoolWithTag(FileName.Buffer, EXT2_FNAME_MAGIC); - } - - /* dereference parent Fcb, free it if it goes to zero */ - if (ParentFcb) { - ClearLongFlag(ParentFcb->Flags, FCB_STATE_BUSY); - if (bParentFcbCreated) { - if (Ext2DerefXcb(&ParentFcb->ReferenceCount) == 0) { - Ext2FreeFcb(ParentFcb); - } - } - } - - /* drop SymLink's refer: If succeeds, Ext2AllocateCcb should refer - it already. It fails, we need release the refer to let it freed */ - if (SymLink) { - Ext2DerefMcb(SymLink); - } - } + _SEH_LEAVE; + } + + } + _SEH_FINALLY(Ext2CreateFileFinal_PSEH) + _SEH_END; return Status; } @@ -1723,6 +1945,42 @@ return Status; } +_SEH_DEFINE_LOCALS(Ext2CreateFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PEXT2_VCB Vcb; + PNTSTATUS pStatus; + BOOLEAN VcbResourceAcquired; +}; + +_SEH_FINALLYFUNC(Ext2CreateFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2CreateFinal); + Ext2CreateFinal(_SEH_VAR(IrpContext), _SEH_VAR(Vcb), _SEH_VAR(pStatus), + _SEH_VAR(VcbResourceAcquired)); +} + +VOID +Ext2CreateFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PEXT2_VCB Vcb, + IN PNTSTATUS pStatus, + IN BOOLEAN VcbResourceAcquired + ) +{ + if (VcbResourceAcquired) { + ExReleaseResourceLite(&Vcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + if ( *pStatus == STATUS_PENDING || + *pStatus == STATUS_CANT_WAIT) { + *pStatus = Ext2QueueRequest(IrpContext); + } else { + Ext2CompleteIrpContext(IrpContext, *pStatus); + } + } +} NTSTATUS Ext2Create (IN PEXT2_IRP_CONTEXT IrpContext) @@ -1734,7 +1992,6 @@ NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; PEXT2_FCBVCB Xcb = NULL; BOOLEAN PostIrp = FALSE; - BOOLEAN VcbResourceAcquired = FALSE; DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; @@ -1754,9 +2011,15 @@ return Status; } - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2CreateFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(Vcb) = 0; + _SEH_VAR(VcbResourceAcquired) = FALSE; Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; + _SEH_VAR(Vcb) = Vcb; ASSERT(Vcb->Identifier.Type == EXT2VCB); ASSERT(IsMounted(Vcb)); IrpSp->FileObject->Vpb = Vcb->Vpb; @@ -1764,9 +2027,9 @@ if (!ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE)) { Status = STATUS_PENDING; - __leave; - } - VcbResourceAcquired = TRUE; + _SEH_LEAVE; + } + _SEH_VAR(VcbResourceAcquired) = TRUE; Ext2VerifyVcb(IrpContext, Vcb); @@ -1775,7 +2038,7 @@ if (IsFlagOn(Vcb->Flags, VCB_DISMOUNT_PENDING)) { Status = STATUS_VOLUME_DISMOUNTED; } - __leave; + _SEH_LEAVE; } if ( ((IrpSp->FileObject->FileName.Length == 0) && @@ -1787,21 +2050,9 @@ Status = Ext2CreateFile(IrpContext, Vcb, &PostIrp); } - } __finally { - - if (VcbResourceAcquired) { - ExReleaseResourceLite(&Vcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - if ( Status == STATUS_PENDING || - Status == STATUS_CANT_WAIT) { - Status = Ext2QueueRequest(IrpContext); - } else { - Ext2CompleteIrpContext(IrpContext, Status); - } - } - } + } + _SEH_FINALLY(Ext2CreateFinal_PSEH) + _SEH_END; return Status; } Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/debug.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/debug.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/debug.c [iso-8859-1] Sun Jul 13 08:43:20 2008 @@ -5,6 +5,8 @@ * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net * UPDATE HISTORY: 12 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Fixed some warnings under GCC + * 13 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) * Fixed some warnings under GCC */ @@ -147,7 +149,6 @@ LARGE_INTEGER CurrentTime; TIME_FIELDS TimeFields; CHAR Buffer[DBG_BUF_LEN]; - ULONG i; RtlZeroMemory(Buffer, DBG_BUF_LEN); va_start(ap, DebugMessage); @@ -175,7 +176,6 @@ LARGE_INTEGER CurrentTime; TIME_FIELDS TimeFields; CHAR Buffer[0x100]; - ULONG i; va_start(ap, DebugMessage);

16 years, 2 months

← Newer
1
...
50
51
52
53
54
55
56
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008