Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[silverblade] 34599: Re-implemented the device list. Separated allocation/init and cleanup/free of sound device information from the insertion into/removal from the list. Got debug output working in NT4 so this no longer plasters message boxes all over the screen or outputs to command prompt window. "Multimedia" control panel applet in NT4 happily loads and unloads this component, but since the device count is reported but no device names, it doesn't do much more than this. Previously, debugging

by silverblade＠svn.reactos.org

Author: silverblade Date: Sat Jul 19 23:20:29 2008 New Revision: 34599 URL: http://svn.reactos.org/svn/reactos?rev=34599&view=rev Log: Re-implemented the device list. Separated allocation/init and cleanup/free of sound device information from the insertion into/removal from the list. Got debug output working in NT4 so this no longer plasters message boxes all over the screen or outputs to command prompt window. "Multimedia" control panel applet in NT4 happily loads and unloads this component, but since the device count is reported but no device names, it doesn't do much more than this. Previously, debugging these components was quite awkward as the only debug output I could get was via popup messages or spat out to the command prompt window via printf, meaning if I had no console window (such is the case when using a Windows program to interact with the sound device) I'd get less debug info and would have to keep clicking OK to continue. Then it'd crash. Now that NT4 is becoming friends with my sndblst.dll implementation (and the support library I'm developing) and debug info is output to something I can scroll through etc. things should be a bit easier. Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sat Jul 19 23:20:29 2008 @@ -29,7 +29,7 @@ MMRESULT Result; PSOUND_DEVICE SoundDevice = NULL; - POPUP(DevicePath); + SND_TRACE(L"Callback received: %wS\n", DevicePath); /* MMFUNCTION_TABLE FuncTable; @@ -65,7 +65,7 @@ { case DRV_LOAD : { - POPUP(L"DRV_LOAD"); + SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -80,8 +80,7 @@ { CleanupEntrypointMutexes(); - Result = UnlistAllSoundDevices(); - SND_ASSERT( Result == MMSYSERR_NOERROR ); + UnlistAllSoundDevices(); return 0L; } @@ -91,22 +90,32 @@ case DRV_FREE : { - POPUP(L"DRV_FREE"); + SND_TRACE(L"DRV_FREE\n"); + + UnlistAllSoundDevices(); CleanupEntrypointMutexes(); - POPUP(L"Unfreed memory blocks: %d", GetMemoryAllocationCount()); + SND_TRACE(L"Unfreed memory blocks: %d\n", + GetMemoryAllocationCount()); return 1L; } case DRV_QUERYCONFIGURE : + { + SND_TRACE(L"DRV_QUERYCONFIGURE"); return 0L; + } case DRV_CONFIGURE : return DRVCNF_OK; default : - return 1L; + return DefDriverProc(DriverId, + DriverHandle, + Message, + Parameter1, + Parameter2); } } @@ -364,16 +373,16 @@ switch ( fdwReason ) { case DLL_PROCESS_ATTACH : - MessageBox(0, L"DLL_PROCESS_ATTACH", L"DllMain", MB_OK | MB_TASKMODAL); + SND_TRACE(L"DLL_PROCESS_ATTACH\n"); break; case DLL_PROCESS_DETACH : - MessageBox(0, L"DLL_PROCESS_DETACH", L"DllMain", MB_OK | MB_TASKMODAL); + SND_TRACE(L"DLL_PROCESS_DETACH\n"); break; case DLL_THREAD_ATTACH : - MessageBox(0, L"DLL_THREAD_ATTACH", L"DllMain", MB_OK | MB_TASKMODAL); + SND_TRACE(L"DLL_THREAD_ATTACH\n"); break; case DLL_THREAD_DETACH : - MessageBox(0, L"DLL_THREAD_DETACH", L"DllMain", MB_OK | MB_TASKMODAL); + SND_TRACE(L"DLL_THREAD_DETACH\n"); break; } 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] Sat Jul 19 23:20:29 2008 @@ -54,7 +54,9 @@ { \ if ( ! ( condition ) ) \ { \ - SND_ERR(L"ASSERT FAILED: %wS\n", #condition); \ + SND_ERR(L"ASSERT FAILED: %hS\n", #condition); \ + POPUP(L"ASSERT FAILED: %hS\n", #condition); \ + ExitProcess(1); \ } \ } #else @@ -113,7 +115,7 @@ { \ if ( ! (parameter_condition) ) \ { \ - SND_ERR(L"Parameter check: %s\n", #parameter_condition); \ + SND_ERR(L"FAILED parameter check: %hS\n", #parameter_condition); \ return MMSYSERR_INVALPARAM; \ } \ } @@ -127,6 +129,9 @@ typedef struct _SOUND_DEVICE { + struct _SOUND_DEVICE* Next; + MMDEVICE_TYPE Type; + PWSTR Path; } SOUND_DEVICE, *PSOUND_DEVICE; typedef struct _SOUND_DEVICE_INSTANCE @@ -169,7 +174,7 @@ MMRESULT ListSoundDevice( IN MMDEVICE_TYPE DeviceType, - IN LPWSTR DevicePath, + IN LPWSTR DevicePath OPTIONAL, OUT PSOUND_DEVICE* SoundDevice OPTIONAL); MMRESULT @@ -181,7 +186,7 @@ UnlistSoundDevices( IN MMDEVICE_TYPE DeviceType); -MMRESULT +VOID UnlistAllSoundDevices(); MMRESULT Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sat Jul 19 23:20:29 2008 @@ -13,8 +13,79 @@ #include <mmebuddy.h> ULONG SoundDeviceCounts[SOUND_DEVICE_TYPES]; -PSOUND_DEVICE SoundDeviceLists[SOUND_DEVICE_TYPES]; - +PSOUND_DEVICE SoundDeviceListHeads[SOUND_DEVICE_TYPES]; +PSOUND_DEVICE SoundDeviceListTails[SOUND_DEVICE_TYPES]; + +/* + Handles the allocation and initialisation of a SOUND_DEVICE structure. +*/ +MMRESULT +AllocateSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN PWSTR DevicePath OPTIONAL, + OUT PSOUND_DEVICE* SoundDevice) +{ + PSOUND_DEVICE NewDevice; + + SND_ASSERT( IsValidSoundDeviceType(DeviceType) ); + SND_ASSERT( SoundDevice ); + + SND_TRACE(L"Allocating SOUND_DEVICE for %wS\n", DevicePath); + + NewDevice = AllocateStruct(SOUND_DEVICE); + + if ( ! NewDevice ) + return MMSYSERR_NOMEM; + + NewDevice->Type = DeviceType; + + /* Only copy the device path if one was actually passed in */ + if ( DevicePath ) + { + NewDevice->Path = AllocateWideString(wcslen(DevicePath)); + + if ( ! NewDevice->Path ) + { + FreeMemory(NewDevice); + NewDevice = NULL; + return MMSYSERR_NOMEM; + } + + CopyWideString(NewDevice->Path, DevicePath); + } + + /* TODO: Initialise function table */ + + /* Return the new structure to the caller and report success */ + *SoundDevice = NewDevice; + + return MMSYSERR_NOERROR; +} + +/* + Handles the cleanup and freeing of a SOUND_DEVICE structure. +*/ +VOID +FreeSoundDevice( + IN PSOUND_DEVICE SoundDevice) +{ + SND_ASSERT( SoundDevice ); + + SND_TRACE(L"Freeing SOUND_DEVICE for %wS\n", SoundDevice->Path); + + if ( SoundDevice->Path ) + { + FreeMemory(SoundDevice->Path); + } + + FreeMemory(SoundDevice); +} + +/* + Returns the number of devices of the specified type which have been added + to the device lists. If an invalid device type is specified, the function + returns zero. +*/ ULONG GetSoundDeviceCount( IN MMDEVICE_TYPE DeviceType) @@ -29,41 +100,173 @@ return SoundDeviceCounts[Index]; } +/* + Determines if a sound device structure pointer is valid, firstly by + ensuring that it is not NULL, and then by checking that the device itself + exists in one of the device lists. +*/ BOOLEAN IsValidSoundDevice( IN PSOUND_DEVICE SoundDevice) { + if ( ! SoundDevice ) + return FALSE; + + /* TODO */ return TRUE; } +/* + Informs the MME-Buddy library that it should take ownership of a device. + The DevicePath is typically used for storing a device path (for subsequent + opening using CreateFile) but it can be a wide-string representing any + information that makes sense to your MME driver implementation. + + MME components which operate solely in user-mode (for example, MIDI + loopback devices) won't need to communicate with a kernel-mode device, + so in these situations DevicePath is likely to be NULL. + + Upon successful addition to the sound device list, the pointer to the new + device's SOUND_DEVICE structure is returned via SoundDevice. +*/ MMRESULT ListSoundDevice( IN MMDEVICE_TYPE DeviceType, - IN LPWSTR DevicePath, - OUT PSOUND_DEVICE* SoundDevice) -{ - return MMSYSERR_NOTSUPPORTED; -} - + IN LPWSTR DevicePath OPTIONAL, + OUT PSOUND_DEVICE* SoundDevice OPTIONAL) +{ + MMRESULT Result; + PSOUND_DEVICE NewDevice; + UCHAR TypeIndex = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) ); + + Result = AllocateSoundDevice(DeviceType, DevicePath, &NewDevice); + + if ( Result != MMSYSERR_NOERROR ) + { + SND_ERR(L"Failed to allocate SOUND_DEVICE structure\n"); + return Result; + } + + if ( ! SoundDeviceListHeads[TypeIndex] ) + { + SND_TRACE(L"Putting first entry into device list %d\n", DeviceType); + SoundDeviceListHeads[TypeIndex] = NewDevice; + SoundDeviceListTails[TypeIndex] = NewDevice; + } + else + { + SND_TRACE(L"Putting another entry into device list %d\n", DeviceType); + SoundDeviceListTails[TypeIndex]->Next = NewDevice; + SoundDeviceListTails[TypeIndex] = NewDevice; + } + + /* Add to the count */ + ++ SoundDeviceCounts[TypeIndex]; + + /* Fill in the caller's PSOUND_DEVICE */ + if ( SoundDevice ) + { + *SoundDevice = NewDevice; + } + + return MMSYSERR_NOERROR; +} + +/* + Removes a sound device from the list, and frees the memory associated + with its description. +*/ MMRESULT UnlistSoundDevice( IN MMDEVICE_TYPE DeviceType, IN PSOUND_DEVICE SoundDevice) { - return MMSYSERR_NOTSUPPORTED; + PSOUND_DEVICE CurrentDevice, PreviousDevice; + + UCHAR TypeIndex = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + + PreviousDevice = NULL; + CurrentDevice = SoundDeviceListHeads[TypeIndex]; + + while ( CurrentDevice ) + { + if ( CurrentDevice == SoundDevice ) + { + if ( ! PreviousDevice ) + { + /* This is the head node */ + SND_TRACE(L"Removing head node from device list %d\n", DeviceType); + SoundDeviceListHeads[TypeIndex] = + SoundDeviceListHeads[TypeIndex]->Next; + } + else + { + SND_TRACE(L"Removing node from device list %d\n", DeviceType); + /* There are nodes before this one - cut our device out */ + PreviousDevice->Next = CurrentDevice->Next; + } + + if ( ! CurrentDevice->Next ) + { + /* This is the tail node */ + SND_TRACE(L"Removing tail node from device list %d\n", DeviceType); + SoundDeviceListTails[TypeIndex] = PreviousDevice; + } + } + + PreviousDevice = CurrentDevice; + CurrentDevice = CurrentDevice->Next; + } + + /* Subtract from the count */ + -- SoundDeviceCounts[TypeIndex]; + + /* Finally, free up the deleted entry */ + FreeSoundDevice(SoundDevice); + + return MMSYSERR_NOERROR; } MMRESULT UnlistSoundDevices( IN MMDEVICE_TYPE DeviceType) { - return MMSYSERR_NOTSUPPORTED; -} - -MMRESULT + UCHAR TypeIndex; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) ); + + SND_TRACE(L"Unlisting all sound devices of type %d\n", DeviceType); + + TypeIndex = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + /* Munch away at the head of the list until it's drained */ + while ( SoundDeviceCounts[TypeIndex] > 0 ) + { + MMRESULT Result; + Result = UnlistSoundDevice(DeviceType, SoundDeviceListHeads[TypeIndex]); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + } + + return MMSYSERR_NOERROR; +} + +VOID UnlistAllSoundDevices() { - return MMSYSERR_NOTSUPPORTED; + MMDEVICE_TYPE Type; + + SND_TRACE(L"Unlisting all sound devices\n"); + + for ( Type = MIN_SOUND_DEVICE_TYPE; Type <= MAX_SOUND_DEVICE_TYPE; ++ Type ) + { + MMRESULT Result; + Result = UnlistSoundDevices(Type); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + } } MMRESULT Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ (removed) @@ -1,25 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> - <include base="ReactOS">include/reactos/libs/sound</include> - <define name="DEBUG_NT4">1</define> - <file>devicelist.c</file> - <file>reentrancy.c</file> - <file>utility.c</file> - <file>nt4.c</file> - <file>kernel.c</file> - <directory name="wave"> - <file>widMessage.c</file> - <file>wodMessage.c</file> - </directory> - <directory name="midi"> - <file>midMessage.c</file> - <file>modMessage.c</file> - </directory> - <directory name="mixer"> - <file>mxdMessage.c</file> - </directory> - <directory name="auxiliary"> - <file>auxMessage.c</file> - </directory> -</module> 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] Sat Jul 19 23:20:29 2008 @@ -50,6 +50,8 @@ ServiceName, REG_PARAMETERS_KEY_NAME_U); + SND_TRACE(L"Opening reg key: %wS\n", ParametersKeyName); + /* Perform the open */ if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, ParametersKeyName, @@ -58,6 +60,7 @@ KeyHandle) != ERROR_SUCCESS ) { /* Couldn't open the key */ + SND_ERR(L"Failed to open reg key: %wS\n", ParametersKeyName); FreeMemory(ParametersKeyName); return MMSYSERR_ERROR; } @@ -114,6 +117,8 @@ REG_DEVICE_KEY_NAME_U, DeviceIndex); + SND_TRACE(L"Opening reg key: %wS\n", RegPath); + /* Perform the open */ if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, RegPath, @@ -122,6 +127,7 @@ KeyHandle) != ERROR_SUCCESS ) { /* Couldn't open the key */ + SND_ERR(L"Failed to open reg key: %wS\n", RegPath); FreeMemory(RegPath); return MMSYSERR_ERROR; } @@ -173,6 +179,7 @@ &MaxNameLength, NULL, NULL, NULL) != ERROR_SUCCESS ) { + SND_ERR(L"Failed to query registry key information\n"); RegCloseKey(DevicesKey); RegCloseKey(Key); @@ -217,6 +224,7 @@ if ( ( DeviceType == 0 ) || ( DeviceType == ValueData ) ) { + SND_TRACE(L"Found device: %wS\n", DevicePath); SoundDeviceDetectedProc(ValueData, DevicePath); } } @@ -262,7 +270,7 @@ { ULONG DeviceNameLength = 0; PWSTR DeviceName = NULL; - ULONG Index = 0, Count = 0; + ULONG Index = 0; HANDLE DeviceHandle; BOOLEAN DoSearch = TRUE; @@ -290,10 +298,8 @@ &DeviceHandle) == MMSYSERR_NOERROR ) { /* Notify the callback function */ - if ( SoundDeviceDetectedProc(DeviceType, DeviceName) ) - { - ++ Count; - } + SND_TRACE(L"Found device: %wS\n", DeviceName); + SoundDeviceDetectedProc(DeviceType, DeviceName); CloseHandle(DeviceHandle);

16 years, 5 months

[spetreolle] 34598: french translation for media/inf files

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jul 19 19:44:09 2008 New Revision: 34598 URL: http://svn.reactos.org/svn/reactos?rev=34598&view=rev Log: french translation for media/inf files Modified: 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 Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=34… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3459… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3459… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3459… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=345… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3459… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

16 years, 5 months

[ros-arm-bringup] 34597: - Fixup some more structure and prototype details to make more sense. - Start building the drive FDO extension by capturing most of the input data and our strings.

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

Author: ros-arm-bringup Date: Sat Jul 19 17:42:18 2008 New Revision: 34597 URL: http://svn.reactos.org/svn/reactos?rev=34597&view=rev Log: - Fixup some more structure and prototype details to make more sense. - Start building the drive FDO extension by capturing most of the input data and our strings. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 19 17:42:18 2008 @@ -60,7 +60,8 @@ PDEVICE_OBJECT PhysicalDeviceObject; \ PDEVICE_OBJECT AttachedDevice; \ IO_REMOVE_LOCK RemoveLock; \ - UNICODE_STRING SymbolicLinkName; \ + UNICODE_STRING DriveDeviceName; \ + UNICODE_STRING BusDeviceName; \ FAST_MUTEX DiskListLock; \ LIST_ENTRY DiskList; @@ -72,6 +73,13 @@ typedef struct _RAMDISK_DRIVE_EXTENSION { RAMDISK_EXTENSION; + GUID DiskGuid; + UNICODE_STRING GuidString; + UNICODE_STRING SymbolicLinkName; + ULONG DiskType; + RAMDISK_CREATE_OPTIONS DiskOptions; + LONGLONG DiskLength; + LONG DiskOffset; WCHAR DriveLetter; } RAMDISK_DRIVE_EXTENSION, *PRAMDISK_DRIVE_EXTENSION; @@ -250,11 +258,11 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension, IN PRAMDISK_CREATE_INPUT Input, IN BOOLEAN ValidateOnly, - OUT PDEVICE_OBJECT *DeviceObject) + OUT PRAMDISK_DRIVE_EXTENSION *NewDriveExtension) { ULONG BasePage, ViewCount, DiskType, Length; NTSTATUS Status; - PDEVICE_OBJECT DriveObject; + PDEVICE_OBJECT DeviceObject; PRAMDISK_DRIVE_EXTENSION DriveExtension; PVOID Buffer; WCHAR LocalBuffer[16]; @@ -360,16 +368,16 @@ Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, sizeof(RAMDISK_DRIVE_EXTENSION), &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, // FIXME: Could be DISK + FILE_DEVICE_DISK_FILE_SYSTEM, // FIXME: DISK FILE_READ_ONLY_DEVICE, // FIXME: Not always 0, - &DriveObject); + &DeviceObject); if (!NT_SUCCESS(Status)) goto FailCreate; // // Grab the drive extension // - DriveExtension = DriveObject->DeviceExtension; + DriveExtension = DeviceObject->DeviceExtension; // // Check if we need a DOS device @@ -396,7 +404,8 @@ wcsncat(Buffer, GuidString.Buffer, SymbolicLinkName.MaximumLength / sizeof(WCHAR)); - DPRINT1("Creating symbolic link: %wZ to %wZ \n", &SymbolicLinkName, &DeviceName); + DPRINT1("Creating symbolic link: %wZ to %wZ \n", + &SymbolicLinkName, &DeviceName); Status = IoCreateSymbolicLink(&SymbolicLinkName, &DeviceName); if (!NT_SUCCESS(Status)) { @@ -434,7 +443,8 @@ L"\\DosDevices\\%wc:", Input->DriveLetter); RtlInitUnicodeString(&DriveString, LocalBuffer); - DPRINT1("Creating symbolic link: %wZ to %wZ\n", &DriveString, &DeviceName); + DPRINT1("Creating symbolic link: %wZ to %wZ\n", + &DriveString, &DeviceName); IoDeleteSymbolicLink(&DriveString); IoCreateSymbolicLink(&DriveString, &DeviceName); @@ -448,8 +458,39 @@ } // - // FIXME-TODO: Implement the rest of the code - // + // Setup the device object flags + // + DeviceObject->Flags |= (DO_XIP | DO_POWER_PAGABLE | DO_DIRECT_IO); + DeviceObject->AlignmentRequirement = 1; + + // + // Build the drive FDO + // + *NewDriveExtension = DriveExtension; + DriveExtension->Type = RamdiskDrive; + ExInitializeFastMutex(&DriveExtension->DiskListLock); + IoInitializeRemoveLock(&DriveExtension->RemoveLock, + TAG('R', 'a', 'm', 'd'), + 0, + 1); + DriveExtension->DriveDeviceName = DeviceName; + DriveExtension->SymbolicLinkName = SymbolicLinkName; + DriveExtension->GuidString = GuidString; + DriveExtension->DiskGuid = Input->DiskGuid; + DriveExtension->PhysicalDeviceObject = DeviceObject; + DriveExtension->DeviceObject = RamdiskBusFdo; + DriveExtension->AttachedDevice = RamdiskBusFdo; + DriveExtension->DiskType = Input->DiskType; + DriveExtension->DiskOptions = Input->Options; + DriveExtension->DiskLength = Input->DiskLength; + DriveExtension->DiskOffset = Input->DiskOffset; + + // + // Make sure we don't free it later + // + DeviceName.Buffer = NULL; + SymbolicLinkName.Buffer = NULL; + GuidString.Buffer = NULL; } FailCreate: @@ -466,7 +507,8 @@ { PRAMDISK_CREATE_INPUT Input; ULONG Length; - PRAMDISK_BUS_EXTENSION DeviceExtension; + PRAMDISK_BUS_EXTENSION DeviceExtension; + PRAMDISK_DRIVE_EXTENSION DriveExtension; ULONG DiskType; PWCHAR FileNameStart, FileNameEnd; NTSTATUS Status; @@ -546,7 +588,7 @@ Status = RamdiskCreateDiskDevice(DeviceExtension, Input, ValidateOnly, - &DeviceObject); + &DriveExtension); if (NT_SUCCESS(Status)) { // @@ -1381,7 +1423,7 @@ Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &RamdiskBusInterface, NULL, - &DeviceExtension->SymbolicLinkName); + &DeviceExtension->BusDeviceName); if (!NT_SUCCESS(Status)) { // @@ -1402,8 +1444,8 @@ // // Fail // - IoSetDeviceInterfaceState(&DeviceExtension->SymbolicLinkName, 0); - RtlFreeUnicodeString(&DeviceExtension->SymbolicLinkName); + IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); + RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); IoDeleteDevice(DeviceObject); return STATUS_NO_SUCH_DEVICE; } Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jul 19 17:42:18 2008 @@ -2230,6 +2230,7 @@ #define DO_POWER_PAGABLE 0x00002000 #define DO_POWER_INRUSH 0x00004000 #define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 +#define DO_XIP 0x00020000 /* DEVICE_OBJECT.Characteristics */

16 years, 5 months

[ros-arm-bringup] 34596: - Create the RAM Disk Drive Device Object. - Create the name for it, based on the GUID sent by the kernel. - Create the DOS Device Symbolic Link if requested and if possible. - Create the DOS Drive Letter if requested. - (drivers/storage/class/ramdisk/ramdisk.c:440) Creating symbolic link: \DosDevices\C: to \Device\Ramdisk{d9b257fc-684e-4dcb-79ab-f6a2cf0350b7} - Need to continue implementing..

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

Author: ros-arm-bringup Date: Sat Jul 19 17:21:38 2008 New Revision: 34596 URL: http://svn.reactos.org/svn/reactos?rev=34596&view=rev Log: - Create the RAM Disk Drive Device Object. - Create the name for it, based on the GUID sent by the kernel. - Create the DOS Device Symbolic Link if requested and if possible. - Create the DOS Drive Letter if requested. - (drivers/storage/class/ramdisk/ramdisk.c:440) Creating symbolic link: \DosDevices\C: to \Device\Ramdisk{d9b257fc-684e-4dcb-79ab-f6a2cf0350b7} - Need to continue implementing.. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 19 17:21:38 2008 @@ -21,6 +21,7 @@ #include <rtlfuncs.h> #include <arc/arc.h> #include <reactos/drivers/ntddrdsk.h> +#include <stdio.h> #define NDEBUG #include <debug.h> @@ -71,6 +72,7 @@ typedef struct _RAMDISK_DRIVE_EXTENSION { RAMDISK_EXTENSION; + WCHAR DriveLetter; } RAMDISK_DRIVE_EXTENSION, *PRAMDISK_DRIVE_EXTENSION; ULONG MaximumViewLength; @@ -250,7 +252,13 @@ IN BOOLEAN ValidateOnly, OUT PDEVICE_OBJECT *DeviceObject) { - ULONG BasePage, ViewCount, DiskType; + ULONG BasePage, ViewCount, DiskType, Length; + NTSTATUS Status; + PDEVICE_OBJECT DriveObject; + PRAMDISK_DRIVE_EXTENSION DriveExtension; + PVOID Buffer; + WCHAR LocalBuffer[16]; + UNICODE_STRING SymbolicLinkName, DriveString, GuidString, DeviceName; // // Check if we're a CDROM-type RAM disk @@ -308,10 +316,143 @@ if (ValidateOnly) return STATUS_SUCCESS; // + // Build the GUID string + // + Status = RtlStringFromGUID(&Input->DiskGuid, &GuidString); + if (!(NT_SUCCESS(Status)) || !(GuidString.Buffer)) + { + // + // Fail + // + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FailCreate; + } + + // + // Allocate our device name + // + Length = GuidString.Length + 32; + Buffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG('R', 'a', 'm', 'd')); + if (!Buffer) + { + // + // Fail + // + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FailCreate; + } + + // + // Build the device name string + // + DeviceName.Buffer = Buffer; + DeviceName.Length = Length - 2; + DeviceName.MaximumLength = Length; + wcsncpy(Buffer, L"\\Device\\Ramdisk", Length / sizeof(WCHAR)); + wcsncat(Buffer, GuidString.Buffer, Length / sizeof(WCHAR)); + DPRINT1("Creating device: %wZ\n", &DeviceName); + + // + // Create the drive device + // + Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, + sizeof(RAMDISK_DRIVE_EXTENSION), + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, // FIXME: Could be DISK + FILE_READ_ONLY_DEVICE, // FIXME: Not always + 0, + &DriveObject); + if (!NT_SUCCESS(Status)) goto FailCreate; + + // + // Grab the drive extension + // + DriveExtension = DriveObject->DeviceExtension; + + // + // Check if we need a DOS device + // + if (!Input->Options.NoDosDevice) + { + // + // Build the symbolic link name + // + SymbolicLinkName.MaximumLength = GuidString.Length + 36; + SymbolicLinkName.Length = GuidString.Length + 34; + Buffer = ExAllocatePoolWithTag(NonPagedPool, + SymbolicLinkName.MaximumLength, + TAG('R', 'a', 'm', 'd')); + SymbolicLinkName.Buffer = Buffer; + if (Buffer) + { + // + // Create it + // + wcsncpy(Buffer, + L"\\GLOBAL??\\Ramdisk", + SymbolicLinkName.MaximumLength / sizeof(WCHAR)); + wcsncat(Buffer, + GuidString.Buffer, + SymbolicLinkName.MaximumLength / sizeof(WCHAR)); + DPRINT1("Creating symbolic link: %wZ to %wZ \n", &SymbolicLinkName, &DeviceName); + Status = IoCreateSymbolicLink(&SymbolicLinkName, &DeviceName); + if (!NT_SUCCESS(Status)) + { + // + // Nevermind... + // + Input->Options.NoDosDevice = TRUE; + ExFreePool(Buffer); + SymbolicLinkName.Buffer = NULL; + } + } + else + { + // + // No DOS device + // + Input->Options.NoDosDevice = TRUE; + } + + // + // It this an ISO boot ramdisk? + // + if (Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + { + // + // Does it need a drive letter? + // + if (!Input->Options.NoDriveLetter) + { + // + // Build it and take over the existing symbolic link + // + _snwprintf(LocalBuffer, + 30, + L"\\DosDevices\\%wc:", + Input->DriveLetter); + RtlInitUnicodeString(&DriveString, LocalBuffer); + DPRINT1("Creating symbolic link: %wZ to %wZ\n", &DriveString, &DeviceName); + IoDeleteSymbolicLink(&DriveString); + IoCreateSymbolicLink(&DriveString, &DeviceName); + + // + // Save the drive letter + // + DriveExtension->DriveLetter = Input->DriveLetter; + } + } + + } + + // // FIXME-TODO: Implement the rest of the code // } +FailCreate: UNIMPLEMENTED; while (TRUE); return STATUS_SUCCESS;

16 years, 5 months

[silverblade] 34595: Beginning of MME audio support rewrite. Made the message entrypoints thread-safe. Refactored parts of the code, in particular the device I/O handling. Uniformly implemented the GETNUMDEVS message for all device types (wave/midi/mixer/aux). Pops up message boxes for each device found. Tested on NT4. Removed lots of redundant debug code.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sat Jul 19 17:17:17 2008 New Revision: 34595 URL: http://svn.reactos.org/svn/reactos?rev=34595&view=rev Log: Beginning of MME audio support rewrite. Made the message entrypoints thread-safe. Refactored parts of the code, in particular the device I/O handling. Uniformly implemented the GETNUMDEVS message for all device types (wave/midi/mixer/aux). Pops up message boxes for each device found. Tested on NT4. Removed lots of redundant debug code. Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c (with props) Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/dll/win32/sndblst/sndblst.def branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild branches/silverblade-audio/dll/win32/win32.rbuild branches/silverblade-audio/include/ddk/ntddsnd.h branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -18,11 +18,99 @@ #include <mmebuddy.h> //#include <debug.h> -PWSTR SBWaveOutDeviceName = L"Sound Blaster Playback (silverblade)"; -PWSTR SBWaveInDeviceName = L"Sound Blaster Recording (silverblade)"; +PWSTR SBWaveOutDeviceName = L"ROS Sound Blaster Playback"; +PWSTR SBWaveInDeviceName = L"ROS Sound Blaster Recording"; /* TODO: Mixer etc */ - +BOOLEAN FoundDevice( + UCHAR DeviceType, + PWSTR DevicePath) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice = NULL; + + POPUP(DevicePath); + +/* + MMFUNCTION_TABLE FuncTable; + + ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); + + FuncTable.GetCapabilities = GetSoundBlasterDeviceCapabilities; +*/ + + Result = ListSoundDevice(DeviceType, DevicePath, &SoundDevice); + + if ( Result != MMSYSERR_NOERROR ) + { + return FALSE; + } + + /* TODO: Set up function table */ + + return TRUE; +} + +APIENTRY LONG +DriverProc( + DWORD DriverId, + HANDLE DriverHandle, + UINT Message, + LONG Parameter1, + LONG Parameter2) +{ + MMRESULT Result; + + switch ( Message ) + { + case DRV_LOAD : + { + POPUP(L"DRV_LOAD"); + + Result = InitEntrypointMutexes(); + + if ( Result != MMSYSERR_NOERROR ) + return 0L; + + Result = EnumerateNt4ServiceSoundDevices(L"sndblst", + 0, + FoundDevice); + + if ( Result != MMSYSERR_NOERROR ) + { + CleanupEntrypointMutexes(); + + Result = UnlistAllSoundDevices(); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + return 0L; + } + + return 1L; + } + + case DRV_FREE : + { + POPUP(L"DRV_FREE"); + + CleanupEntrypointMutexes(); + + POPUP(L"Unfreed memory blocks: %d", GetMemoryAllocationCount()); + + return 1L; + } + + case DRV_QUERYCONFIGURE : + return 0L; + case DRV_CONFIGURE : + return DRVCNF_OK; + + default : + return 1L; + } +} + +#if 0 MMRESULT GetSoundBlasterDeviceCapabilities( IN PSOUND_DEVICE Device, @@ -61,12 +149,12 @@ return MMSYSERR_NOERROR; } - BOOLEAN FoundDevice( UCHAR DeviceType, PWSTR DevicePath, HANDLE Handle) { + PSOUND_DEVICE SoundDevice; MMFUNCTION_TABLE FuncTable; ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); @@ -74,9 +162,9 @@ FuncTable.GetCapabilities = GetSoundBlasterDeviceCapabilities; /* Nothing particularly special required... */ - return ( AddSoundDevice(DeviceType, DevicePath, &FuncTable) == MMSYSERR_NOERROR ); -} - + return ( ListSoundDevice(DeviceType, DevicePath, &SoundDevice) + == MMSYSERR_NOERROR ); +} APIENTRY LONG DriverProc( @@ -266,6 +354,7 @@ return 0; } #endif +#endif BOOL WINAPI DllMain( HINSTANCE hinstDLL, Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.def [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -7,9 +7,9 @@ LIBRARY sndblst.dll EXPORTS DriverProc@20 -;widMessage@20 +widMessage@20 wodMessage@20 -;midMessage@20 -;modMessage@20 -;mxdMessage@20 -;auxMessage@20 +midMessage@20 +modMessage@20 +mxdMessage@20 +auxMessage@20 Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -4,7 +4,7 @@ <importlibrary definition="sndblst.def" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="sndblst">.</include> -  + <define name="DEBUG_NT4" /> <library>mmebuddy</library> <library>ntdll</library> <library>kernel32</library> Modified: branches/silverblade-audio/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/win… ============================================================================== --- branches/silverblade-audio/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/win32.rbuild [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -133,9 +133,9 @@ <directory name="mlang"> <xi:include href="mlang/mlang.rbuild" /> </directory> -<directory name="mmdrv"> + <directory name="mpr"> <xi:include href="mpr/mpr.rbuild" /> </directory> Modified: branches/silverblade-audio/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/ddk/n… ============================================================================== --- branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -47,7 +47,7 @@ #define MAX_SOUND_DEVICE_TYPE MIXER_DEVICE_TYPE #define SOUND_DEVICE_TYPES 6 -#define VALID_SOUND_DEVICE_TYPE(x) \ +#define IS_VALID_SOUND_DEVICE_TYPE(x) \ ( ( x >= MIN_SOUND_DEVICE_TYPE ) && ( x <= MAX_SOUND_DEVICE_TYPE ) ) #define IS_WAVE_DEVICE_TYPE(x) \ 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] Sat Jul 19 17:17:17 2008 @@ -22,90 +22,50 @@ Hacky debug macro */ -#define POPUP(msg) \ - MessageBoxA(0, msg, __FUNCTION__, MB_OK | MB_TASKMODAL) - - -//#define NDEBUG -#define NTRACE - -#ifdef ASSERT - #undef ASSERT +#define POPUP(...) \ + { \ + WCHAR dbg_popup_msg[1024], dbg_popup_title[256]; \ + wsprintf(dbg_popup_title, L"%hS(%d)", __FILE__, __LINE__); \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \ + } + +#ifdef DEBUG_NT4 + #define SND_ERR(...) \ + { \ + WCHAR dbg_popup_msg[1024]; \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + OutputDebugString(dbg_popup_msg); \ + } + #define SND_WARN(...) \ + { \ + WCHAR dbg_popup_msg[1024]; \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + OutputDebugString(dbg_popup_msg); \ + } + #define SND_TRACE(...) \ + { \ + WCHAR dbg_popup_msg[1024]; \ + wsprintf(dbg_popup_msg, __VA_ARGS__); \ + OutputDebugString(dbg_popup_msg); \ + } + + #define SND_ASSERT(condition) \ + { \ + if ( ! ( condition ) ) \ + { \ + SND_ERR(L"ASSERT FAILED: %wS\n", #condition); \ + } \ + } +#else + /* TODO */ #endif -#ifndef NDEBUG - -/* HACK for testing */ -#include <stdio.h> - -#define TRACE_(...) \ - { \ - printf(" %s: ", __FUNCTION__); \ - printf(__VA_ARGS__); \ - } - -#define WARN_(...) \ - { \ - printf("o %s: ", __FUNCTION__); \ - printf(__VA_ARGS__); \ - } - -#define ERR_(...) \ - { \ - printf("X %s: ", __FUNCTION__); \ - printf(__VA_ARGS__); \ - } - -#define ASSERT(x) \ - { \ - if ( ! (x) ) \ - { \ - ERR_("ASSERT failed! %s\n", #x); \ - exit(1); \ - } \ - } - -#ifndef NTRACE - -#define TRACE_ENTRY() \ - TRACE_("entered function\n") - -#define TRACE_EXIT(retval) \ - TRACE_("returning %d (0x%x)\n", (int)retval, (int)retval) - -#endif - -#else - -#define TRACE_(...) do { } while ( 0 ) -#define WARN_(...) do { } while ( 0 ) -#define ERR_(...) do { } while ( 0 ) -#define ASSERT(x) do { } while ( 0 ) - -#define NTRACE - -#endif - -#ifdef NTRACE - #define TRACE_ENTRY() do { } while ( 0 ) - #define TRACE_EXIT(retval) do { } while ( 0 ) -#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) \ +#define AllocateStruct(thing) \ (thing*) AllocateMemory(sizeof(thing)) #define StringLengthToBytes(chartype, string_length) \ @@ -133,19 +93,219 @@ /* + Convert a device type into a zero-based array index +*/ + +#define SOUND_DEVICE_TYPE_TO_INDEX(x) \ + ( x - MIN_SOUND_DEVICE_TYPE ) + +#define INDEX_TO_SOUND_DEVICE_TYPE(x) \ + ( x + MIN_SOUND_DEVICE_TYPE ) + + +/* Validation */ + +#define IsValidSoundDeviceType IS_VALID_SOUND_DEVICE_TYPE #define VALIDATE_MMSYS_PARAMETER(parameter_condition) \ { \ if ( ! (parameter_condition) ) \ { \ - ERR_("Parameter check: %s\n", #parameter_condition); \ - TRACE_EXIT(MMSYSERR_INVALPARAM); \ + SND_ERR(L"Parameter check: %s\n", #parameter_condition); \ return MMSYSERR_INVALPARAM; \ } \ } + +/* + Types and Structures +*/ + +typedef UCHAR MMDEVICE_TYPE, *PMMDEVICE_TYPE; + +typedef struct _SOUND_DEVICE +{ +} SOUND_DEVICE, *PSOUND_DEVICE; + +typedef struct _SOUND_DEVICE_INSTANCE +{ + HANDLE KernelDeviceHandle; +} SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; + + +/* + reentrancy.c +*/ + +MMRESULT +InitEntrypointMutexes(); + +VOID +CleanupEntrypointMutexes(); + +VOID +AcquireEntrypointMutex( + IN MMDEVICE_TYPE DeviceType); + +VOID +ReleaseEntrypointMutex( + IN MMDEVICE_TYPE DeviceType); + + +/* + devicelist.c +*/ + +ULONG +GetSoundDeviceCount( + IN MMDEVICE_TYPE DeviceType); + +BOOLEAN +IsValidSoundDevice( + IN PSOUND_DEVICE SoundDevice); + +MMRESULT +ListSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN LPWSTR DevicePath, + OUT PSOUND_DEVICE* SoundDevice OPTIONAL); + +MMRESULT +UnlistSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN PSOUND_DEVICE SoundDevice); + +MMRESULT +UnlistSoundDevices( + IN MMDEVICE_TYPE DeviceType); + +MMRESULT +UnlistAllSoundDevices(); + +MMRESULT +GetSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceIndex, + OUT PSOUND_DEVICE* Device); + + +/* + deviceinstance.c +*/ + +BOOLEAN +IsValidSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + + +/* + nt4.c +*/ + +typedef BOOLEAN (*SOUND_DEVICE_DETECTED_PROC)( + UCHAR DeviceType, + PWSTR DevicePath); + +MMRESULT +OpenSoundDriverParametersRegKey( + IN LPWSTR ServiceName, + OUT PHKEY KeyHandle); + +MMRESULT +OpenSoundDeviceRegKey( + IN LPWSTR ServiceName, + IN DWORD DeviceIndex, + OUT PHKEY KeyHandle); + +MMRESULT +EnumerateNt4ServiceSoundDevices( + IN LPWSTR ServiceName, + IN MMDEVICE_TYPE DeviceType, + IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); + +MMRESULT +DetectNt4SoundDevices( + IN MMDEVICE_TYPE DeviceType, + IN PWSTR BaseDeviceName, + IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); + + +/* + utility.c +*/ + +PVOID +AllocateMemory( + IN UINT Size); + +VOID +FreeMemory( + IN PVOID Pointer); + +UINT +GetMemoryAllocationCount(); + +UINT +GetDigitCount( + IN UINT Number); + +MMRESULT +Win32ErrorToMmResult( + IN UINT ErrorCode); + +MMRESULT +TranslateInternalMmResult( + IN MMRESULT Result); + + +/* + kernel.c +*/ + +#define QueryDevice(h, ctl, o, o_size, xfer, ovl) \ + Win32ErrorToMmResult( \ + DeviceIoControl(h, ctl, NULL, 0, o, o_size, xfer, ovl) != 0 \ + ? ERROR_SUCCESS : GetLastError() \ + ) + +#define ControlDevice(h, ctl, i, i_size, xfer, ovl) \ + Win32ErrorToMmResult( \ + DeviceIoControl(h, ctl, i, i_size, NULL, 0, xfer, ovl) != 0 \ + ? ERROR_SUCCESS : GetLastError() \ + ) + +#define QuerySoundDevice(sd, ctl, o, o_size, xfer) \ + SoundDeviceIoControl(sd, ctl, NULL, 0, o, o_size, xfer) + +#define ControlSoundDevice(sd, ctl, i, i_size, xfer) \ + SoundDeviceIoControl(sd, ctl, i, i_size, NULL, 0, xfer) + +MMRESULT +OpenKernelSoundDeviceByName( + IN PWSTR DeviceName, + IN BOOLEAN ReadOnly, + OUT PHANDLE Handle); + +MMRESULT +CloseKernelSoundDevice( + IN HANDLE Handle); + +MMRESULT +SoundDeviceIoControl( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesTransferred OPTIONAL); + + +#if 0 + +typedef UCHAR MMDEVICE_TYPE, *PMMDEVICE_TYPE; struct _SOUND_DEVICE; struct _SOUND_DEVICE_INSTANCE; @@ -553,16 +713,19 @@ TranslateInternalMmResult(MMRESULT Result); MMRESULT -InitEntrypointMutex(); - -VOID -CleanupEntrypointMutex(); - -VOID -AcquireEntrypointMutex(); - -VOID -ReleaseEntrypointMutex(); +InitEntrypointMutexes(); + +VOID +CleanupEntrypointMutexes(); + +VOID +AcquireEntrypointMutex( + IN MMDEVICE_TYPE DeviceType); + +VOID +ReleaseEntrypointMutex( + IN MMDEVICE_TYPE DeviceType); + BOOLEAN InitMmeBuddyLib(); @@ -750,6 +913,6 @@ PSOUND_DEVICE_INSTANCE SoundDeviceInstance, DWORD Message, DWORD Parameter); - - #endif + +#endif Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/auxiliary/auxMessage.c + * + * PURPOSE: Provides the auxMessage exported function, as required by + * the MME API, for auxiliary device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +auxMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(AUX_DEVICE_TYPE); + + switch ( Message ) + { + case AUXDM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(AUX_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(AUX_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/deviceinstance.c + * + * PURPOSE: Manages instances of sound devices. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmebuddy.h> + +BOOLEAN +IsValidSoundDeviceInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + /* TODO */ + return TRUE; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,76 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/devicelist.c + * + * PURPOSE: Manages lists of sound devices. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +ULONG SoundDeviceCounts[SOUND_DEVICE_TYPES]; +PSOUND_DEVICE SoundDeviceLists[SOUND_DEVICE_TYPES]; + +ULONG +GetSoundDeviceCount( + IN MMDEVICE_TYPE DeviceType) +{ + ULONG Index = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + if ( ! IsValidSoundDeviceType(DeviceType) ) + { + return 0; + } + + return SoundDeviceCounts[Index]; +} + +BOOLEAN +IsValidSoundDevice( + IN PSOUND_DEVICE SoundDevice) +{ + return TRUE; +} + +MMRESULT +ListSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN LPWSTR DevicePath, + OUT PSOUND_DEVICE* SoundDevice) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +UnlistSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN PSOUND_DEVICE SoundDevice) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +UnlistSoundDevices( + IN MMDEVICE_TYPE DeviceType) +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +UnlistAllSoundDevices() +{ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +GetSoundDevice( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceIndex, + OUT PSOUND_DEVICE* Device OPTIONAL) +{ + return MMSYSERR_NOTSUPPORTED; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,116 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/kernel.c + * + * PURPOSE: Routines assisting with device I/O between user-mode and + * kernel-mode. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +MMRESULT +OpenKernelSoundDeviceByName( + IN PWSTR DeviceName, + IN BOOLEAN ReadOnly, + OUT PHANDLE Handle) +{ + DWORD AccessRights; + + VALIDATE_MMSYS_PARAMETER( DeviceName ); + VALIDATE_MMSYS_PARAMETER( Handle ); + + AccessRights = ReadOnly ? GENERIC_READ : GENERIC_WRITE; + + *Handle = CreateFile(DeviceName, + AccessRights, + FILE_SHARE_WRITE, /* FIXME? Should be read also? */ + NULL, + OPEN_EXISTING, + ReadOnly ? 0 : FILE_FLAG_OVERLAPPED, + NULL); + + if ( *Handle == INVALID_HANDLE_VALUE ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +CloseKernelSoundDevice( + IN HANDLE Handle) +{ + VALIDATE_MMSYS_PARAMETER( Handle ); + + CloseHandle(Handle); + + return MMSYSERR_NOERROR; +} + +MMRESULT +SoundDeviceIoControl( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD IoControlCode, + IN LPVOID InBuffer, + IN DWORD InBufferSize, + OUT LPVOID OutBuffer, + IN DWORD OutBufferSize, + OUT LPDWORD BytesTransferred OPTIONAL) +{ + OVERLAPPED Overlapped; + BOOLEAN IoResult; + DWORD Transferred; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + /* Overlapped I/O is done here - this is used for waiting for completion */ + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! Overlapped.hEvent ) + return Win32ErrorToMmResult(GetLastError()); + + /* Talk to the device */ + IoResult = DeviceIoControl(SoundDeviceInstance->KernelDeviceHandle, + IoControlCode, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + NULL, + &Overlapped); + + /* If failure occurs, make sure it's not just due to the overlapped I/O */ + if ( ! IoResult ) + { + if ( GetLastError() != ERROR_IO_PENDING ) + { + CloseHandle(Overlapped.hEvent); + return Win32ErrorToMmResult(GetLastError()); + } + } + + /* Wait for the I/O to complete */ + IoResult = GetOverlappedResult(SoundDeviceInstance->KernelDeviceHandle, + &Overlapped, + &Transferred, + TRUE); + + /* Don't need this any more */ + CloseHandle(Overlapped.hEvent); + + if ( ! IoResult ) + return Win32ErrorToMmResult(GetLastError()); + + if ( BytesTransferred ) + *BytesTransferred = Transferred; + + return MMSYSERR_NOERROR; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/midi/midMessage.c + * + * PURPOSE: Provides the midMessage exported function, as required by + * the MME API, for MIDI input device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +midMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(MIDI_IN_DEVICE_TYPE); + + switch ( Message ) + { + case MIDM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(MIDI_IN_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(MIDI_IN_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/midi/modMessage.c + * + * PURPOSE: Provides the modMessage exported function, as required by + * the MME API, for MIDI output device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +modMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(MIDI_OUT_DEVICE_TYPE); + + switch ( Message ) + { + case MODM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(MIDI_OUT_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(MIDI_OUT_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/mixer/mxdMessage.c + * + * PURPOSE: Provides the mxdMessage exported function, as required by + * the MME API, for mixer device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +mxdMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(MIXER_DEVICE_TYPE); + + switch ( Message ) + { + case MXDM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(MIXER_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(MIXER_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> + <include base="ReactOS">include/reactos/libs/sound</include> + <define name="DEBUG_NT4">1</define> + <file>devicelist.c</file> + <file>deviceinstance.c</file> + <file>reentrancy.c</file> + <file>utility.c</file> + <file>nt4.c</file> + <file>kernel.c</file> + <directory name="wave"> + <file>widMessage.c</file> + <file>wodMessage.c</file> + </directory> + <directory name="midi"> + <file>midMessage.c</file> + <file>modMessage.c</file> + </directory> + <directory name="mixer"> + <file>mxdMessage.c</file> + </directory> + <directory name="auxiliary"> + <file>auxMessage.c</file> + </directory> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild~ [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,25 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> + <include base="ReactOS">include/reactos/libs/sound</include> + <define name="DEBUG_NT4">1</define> + <file>devicelist.c</file> + <file>reentrancy.c</file> + <file>utility.c</file> + <file>nt4.c</file> + <file>kernel.c</file> + <directory name="wave"> + <file>widMessage.c</file> + <file>wodMessage.c</file> + </directory> + <directory name="midi"> + <file>midMessage.c</file> + <file>modMessage.c</file> + </directory> + <directory name="mixer"> + <file>mxdMessage.c</file> + </directory> + <directory name="auxiliary"> + <file>auxMessage.c</file> + </directory> +</module> Added: 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 (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,311 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/nt4.c + * + * PURPOSE: Assists in locating Windows NT4 compatible sound devices, + * which mostly use the same device naming convention and/or + * store their created device names within their service key + * within the registry. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <ntddsnd.h> + +#include <mmebuddy.h> + +/* + Open the parameters key of a sound driver. + NT4 only. +*/ +MMRESULT +OpenSoundDriverParametersRegKey( + IN LPWSTR ServiceName, + OUT PHKEY KeyHandle) +{ + ULONG KeyLength; + PWCHAR ParametersKeyName; + + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); + + /* Work out how long the string will be */ + KeyLength = wcslen(REG_SERVICES_KEY_NAME_U) + 1 + + wcslen(ServiceName) + 1 + + wcslen(REG_PARAMETERS_KEY_NAME_U); + + /* Allocate memory for the string */ + ParametersKeyName = AllocateWideString(KeyLength); + + if ( ! ParametersKeyName ) + return MMSYSERR_NOMEM; + + /* Construct the registry path */ + wsprintf(ParametersKeyName, + L"%s\\%s\\%s", + REG_SERVICES_KEY_NAME_U, + ServiceName, + REG_PARAMETERS_KEY_NAME_U); + + /* Perform the open */ + if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + ParametersKeyName, + 0, + KEY_READ, + KeyHandle) != ERROR_SUCCESS ) + { + /* Couldn't open the key */ + FreeMemory(ParametersKeyName); + return MMSYSERR_ERROR; + } + + FreeMemory(ParametersKeyName); + + return MMSYSERR_NOERROR; +} + +/* + Open one of the Device sub-keys belonging to the sound driver. + NT4 only. +*/ +MMRESULT +OpenSoundDeviceRegKey( + IN LPWSTR ServiceName, + IN DWORD DeviceIndex, + OUT PHKEY KeyHandle) +{ + DWORD PathLength; + PWCHAR RegPath; + + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); + + /* + Work out the space required to hold the path: + + HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ + sndblst\ + Parameters\ + Device123\ + */ + PathLength = wcslen(REG_SERVICES_KEY_NAME_U) + 1 + + wcslen(ServiceName) + 1 + + wcslen(REG_PARAMETERS_KEY_NAME_U) + 1 + + wcslen(REG_DEVICE_KEY_NAME_U) + + GetDigitCount(DeviceIndex); + + /* Allocate storage for the string */ + RegPath = AllocateWideString(PathLength); + + if ( ! RegPath ) + { + return MMSYSERR_NOMEM; + } + + /* Write the path */ + wsprintf(RegPath, + L"%ls\\%ls\\%ls\\%ls%d", + REG_SERVICES_KEY_NAME_U, + ServiceName, + REG_PARAMETERS_KEY_NAME_U, + REG_DEVICE_KEY_NAME_U, + DeviceIndex); + + /* Perform the open */ + if ( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + RegPath, + 0, + KEY_READ, + KeyHandle) != ERROR_SUCCESS ) + { + /* Couldn't open the key */ + FreeMemory(RegPath); + return MMSYSERR_ERROR; + } + + FreeMemory(RegPath); + + return MMSYSERR_NOERROR; +} + +/* + This is the "nice" way to discover audio devices in NT4 - go into the + service registry key and enumerate the Parameters\Device*\Devices + values. The value names represent the device name, whereas the data + assigned to them identifies the type of device. +*/ +MMRESULT +EnumerateNt4ServiceSoundDevices( + IN LPWSTR ServiceName, + IN MMDEVICE_TYPE DeviceType, + IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc) +{ + HKEY Key; + DWORD KeyIndex = 0; + + VALIDATE_MMSYS_PARAMETER( ServiceName ); + + /* Device type zero means "all" */ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) || + DeviceType == 0 ); + + while ( OpenSoundDeviceRegKey(ServiceName, KeyIndex, &Key) == MMSYSERR_NOERROR ) + { + HKEY DevicesKey; + DWORD ValueType = REG_NONE, ValueIndex = 0; + DWORD MaxNameLength = 0, ValueNameLength = 0; + PWSTR DevicePath = NULL, ValueName = NULL; + DWORD ValueDataLength = sizeof(DWORD); + DWORD ValueData; + + if ( RegOpenKeyEx(Key, + REG_DEVICES_KEY_NAME_U, + 0, + KEY_READ, + &DevicesKey) == ERROR_SUCCESS ) + { + /* Find out how much memory is needed for the key name */ + if ( RegQueryInfoKey(DevicesKey, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &MaxNameLength, + NULL, NULL, NULL) != ERROR_SUCCESS ) + { + RegCloseKey(DevicesKey); + RegCloseKey(Key); + + return MMSYSERR_ERROR; + } + + DevicePath = AllocateWideString(MaxNameLength + + strlen("\\\\.\\")); + + /* Check that the memory allocation was successful */ + if ( ! DevicePath ) + { + /* There's no point in going further */ + RegCloseKey(DevicesKey); + RegCloseKey(Key); + + return MMSYSERR_NOMEM; + } + + /* Insert the device path prefix */ + wsprintf(DevicePath, L"\\\\.\\"); + + /* The offset of the string following this prefix */ + ValueName = DevicePath + strlen("\\\\.\\"); + + /* Copy this so that it may be overwritten - include NULL */ + ValueNameLength = MaxNameLength + sizeof(WCHAR); + + while ( RegEnumValue(DevicesKey, + ValueIndex, + ValueName, + &ValueNameLength, + NULL, + &ValueType, + (LPBYTE) &ValueData, + &ValueDataLength) == ERROR_SUCCESS ) + { + /* Device types are stored as DWORDs */ + if ( ( ValueType == REG_DWORD ) && + ( ValueDataLength == sizeof(DWORD) ) ) + { + if ( ( DeviceType == 0 ) || + ( DeviceType == ValueData ) ) + { + SoundDeviceDetectedProc(ValueData, DevicePath); + } + } + + /* Reset variables for the next iteration */ + ValueNameLength = MaxNameLength + sizeof(WCHAR); + ZeroMemory(ValueName, (MaxNameLength+1)*sizeof(WCHAR)); + /*ZeroWideString(ValueName);*/ + ValueDataLength = sizeof(DWORD); + ValueData = 0; + ValueType = REG_NONE; + + ++ ValueIndex; + } + + FreeMemory(DevicePath); + + RegCloseKey(DevicesKey); + } + + ++ KeyIndex; + + RegCloseKey(Key); + } + + return MMSYSERR_NOERROR; +} + +/* + Brute-force device detection, using a base device name (eg: \\.\WaveOut). + + This will add the device number as a suffix to the end of the string and + attempt to open the device based on that name. On success, it will + increment the device number and repeat this process. + + When it runs out of devices, it will give up. +*/ +MMRESULT +DetectNt4SoundDevices( + IN MMDEVICE_TYPE DeviceType, + IN PWSTR BaseDeviceName, + IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc) +{ + ULONG DeviceNameLength = 0; + PWSTR DeviceName = NULL; + ULONG Index = 0, Count = 0; + HANDLE DeviceHandle; + BOOLEAN DoSearch = TRUE; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) ); + + DeviceNameLength = wcslen(BaseDeviceName); + /* Consider the length of the number */ + DeviceNameLength += GetDigitCount(Index); + + DeviceName = AllocateWideString(DeviceNameLength); + + if ( ! DeviceName ) + { + return MMSYSERR_NOMEM; + } + + while ( DoSearch ) + { + /* Nothing like a nice clean device name */ + ZeroWideString(DeviceName); + wsprintf(DeviceName, L"%ls%d", BaseDeviceName, Index); + + if ( OpenKernelSoundDeviceByName(DeviceName, + TRUE, + &DeviceHandle) == MMSYSERR_NOERROR ) + { + /* Notify the callback function */ + if ( SoundDeviceDetectedProc(DeviceType, DeviceName) ) + { + ++ Count; + } + + CloseHandle(DeviceHandle); + + ++ Index; + } + else + { + DoSearch = FALSE; + } + } + + FreeMemory(DeviceName); + + return MMSYSERR_NOERROR; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,90 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/reentrancy.c + * + * PURPOSE: Provides entry-point mutex guards. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <ntddk.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +HANDLE EntrypointMutexes[SOUND_DEVICE_TYPES]; + +MMRESULT +InitEntrypointMutexes() +{ + UCHAR i; + MMRESULT Result = MMSYSERR_NOERROR; + + /* Blank all entries ni the table first */ + for ( i = 0; i < SOUND_DEVICE_TYPES; ++ i ) + { + EntrypointMutexes[i] = NULL; + } + + /* Now create the mutexes */ + for ( i = 0; i < SOUND_DEVICE_TYPES; ++ i ) + { + EntrypointMutexes[i] = CreateMutex(NULL, FALSE, NULL); + + if ( ! EntrypointMutexes[i] ) + { + Result = Win32ErrorToMmResult(GetLastError()); + + /* Clean up any mutexes we successfully created */ + CleanupEntrypointMutexes(); + break; + } + } + + return Result; +} + +VOID +CleanupEntrypointMutexes() +{ + UCHAR i; + + /* Only clean up a mutex if it actually exists */ + for ( i = 0; i < SOUND_DEVICE_TYPES; ++ i ) + { + if ( EntrypointMutexes[i] ) + { + CloseHandle(EntrypointMutexes[i]); + EntrypointMutexes[i] = NULL; + } + } +} + +VOID +AcquireEntrypointMutex( + IN MMDEVICE_TYPE DeviceType) +{ + UCHAR i; + + ASSERT( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); + i = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + ASSERT( EntrypointMutexes[i] ); + + WaitForSingleObject(EntrypointMutexes[i], INFINITE); +} + +VOID +ReleaseEntrypointMutex( + IN MMDEVICE_TYPE DeviceType) +{ + UCHAR i; + + ASSERT( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); + i = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + + ASSERT( EntrypointMutexes[i] ); + + ReleaseMutex(EntrypointMutexes[i]); +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,137 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/utility.c + * + * PURPOSE: Provides utility functions used by the library. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> + +#include <mmebuddy.h> + +static HANDLE ProcessHeapHandle = NULL; +static UINT CurrentAllocations = 0; + +/* + Memory allocation helper +*/ +PVOID +AllocateMemory( + IN UINT Size) +{ + PVOID Pointer = NULL; + + if ( ! ProcessHeapHandle ) + ProcessHeapHandle = GetProcessHeap(); + + Pointer = HeapAlloc(ProcessHeapHandle, HEAP_ZERO_MEMORY, Size); + + if ( ! Pointer ) + return NULL; + + ++ CurrentAllocations; + + return Pointer; +} + +VOID +FreeMemory( + IN PVOID Pointer) +{ + SND_ASSERT( ProcessHeapHandle ); + SND_ASSERT( Pointer ); + + HeapFree(ProcessHeapHandle, 0, Pointer); + + -- CurrentAllocations; +} + +UINT +GetMemoryAllocationCount() +{ + return CurrentAllocations; +} + + +/* + Count the number of digits in a UINT +*/ +UINT +GetDigitCount( + IN UINT Number) +{ + UINT Value = Number; + ULONG Digits = 1; + + while ( Value > 9 ) + { + Value /= 10; + ++ Digits; + } + + return Digits; +} + +/* + Translate a Win32 error code into an MMRESULT code. +*/ +MMRESULT +Win32ErrorToMmResult( + IN UINT ErrorCode) +{ + switch ( ErrorCode ) + { + case NO_ERROR : + case ERROR_IO_PENDING : + return MMSYSERR_NOERROR; + + case ERROR_BUSY : + return MMSYSERR_ALLOCATED; + + case ERROR_NOT_SUPPORTED : + case ERROR_INVALID_FUNCTION : + return MMSYSERR_NOTSUPPORTED; + + case ERROR_NOT_ENOUGH_MEMORY : + return MMSYSERR_NOMEM; + + case ERROR_ACCESS_DENIED : + return MMSYSERR_BADDEVICEID; + + case ERROR_INSUFFICIENT_BUFFER : + return MMSYSERR_INVALPARAM; + + default : + 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! + + This could potentially highlight internal logic problems. + + However, things like MMSYSERR_NOMEM make sense to return to the caller. +*/ +MMRESULT +TranslateInternalMmResult( + IN MMRESULT Result) +{ + switch ( Result ) + { + case MMSYSERR_INVALPARAM : + case MMSYSERR_INVALFLAG : + { + return MMSYSERR_ERROR; + } + } + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/wave/widMessage.c + * + * PURPOSE: Provides the widMessage exported function, as required by + * the MME API, for wave input device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +widMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(WAVE_IN_DEVICE_TYPE); + + switch ( Message ) + { + case WIDM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(WAVE_IN_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sat Jul 19 17:17:17 2008 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/wave/wodMessage.c + * + * PURPOSE: Provides the wodMessage exported function, as required by + * the MME API, for wave output device support. + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> + +#include <ntddsnd.h> + +#include <mmebuddy.h> + +APIENTRY DWORD +wodMessage( + DWORD DeviceId, + DWORD Message, + DWORD PrivateHandle, + DWORD Parameter1, + DWORD Parameter2) +{ + MMRESULT Result = MMSYSERR_NOERROR; + + AcquireEntrypointMutex(WAVE_OUT_DEVICE_TYPE); + + switch ( Message ) + { + case WODM_GETNUMDEVS : + { + Result = GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); + break; + } + } + + ReleaseEntrypointMutex(WAVE_OUT_DEVICE_TYPE); + + return Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 5 months

[ros-arm-bringup] 34594: - Implement the main RamdiskWorkerThread work loop. - Now we have to implement RamdiskCreateDiskDevice for real.

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

Author: ros-arm-bringup Date: Sat Jul 19 16:19:41 2008 New Revision: 34594 URL: http://svn.reactos.org/svn/reactos?rev=34594&view=rev Log: - Implement the main RamdiskWorkerThread work loop. - Now we have to implement RamdiskCreateDiskDevice for real. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 19 16:19:41 2008 @@ -243,73 +243,6 @@ } } -VOID -NTAPI -RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - UNIMPLEMENTED; - while (TRUE); -} - -NTSTATUS -NTAPI -SendIrpToThread(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_WORKITEM WorkItem; - - // - // Mark the IRP pending - // - IoMarkIrpPending(Irp); - - // - // Allocate a work item - // - WorkItem = IoAllocateWorkItem(DeviceObject); - if (WorkItem) - { - // - // Queue it up - // - Irp->Tail.Overlay.DriverContext[0] = WorkItem; - IoQueueWorkItem(WorkItem, RamdiskWorkerThread, DelayedWorkQueue, Irp); - return STATUS_PENDING; - } - else - { - // - // Fail - // - return STATUS_INSUFFICIENT_RESOURCES; - } -} - -NTSTATUS -NTAPI -RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - // - // Complete the IRP - // - Irp->IoStatus.Information = 1; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; -} - NTSTATUS NTAPI RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension, @@ -486,6 +419,210 @@ // We're done // return Status; +} + +VOID +NTAPI +RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PRAMDISK_BUS_EXTENSION DeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation; + PIRP Irp = Context; + + // + // Get the stack location + // + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + // + // Free the work item + // + IoFreeWorkItem(Irp->Tail.Overlay.DriverContext[0]); + + // + // Grab the device extension and lock it + // + DeviceExtension = DeviceObject->DeviceExtension; + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); + if (NT_SUCCESS(Status)) + { + // + // Discriminate by major code + // + switch (IoStackLocation->MajorFunction) + { + // + // Device control + // + case IRP_MJ_DEVICE_CONTROL: + + // + // Let's take a look at the IOCTL + // + switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) + { + // + // Ramdisk create request + // + case FSCTL_CREATE_RAM_DISK: + + // + // This time we'll do it for real + // + Status = RamdiskCreateRamdisk(DeviceObject, Irp, FALSE); + break; + + case IOCTL_DISK_SET_PARTITION_INFO: + + DPRINT1("Set partition info request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_GET_DRIVE_LAYOUT: + + DPRINT1("Get drive layout request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_GET_PARTITION_INFO: + + DPRINT1("Get partitinon info request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + default: + + DPRINT1("Invalid request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + } + + // + // We're here + // + break; + + // + // Read or write request + // + case IRP_MJ_READ: + case IRP_MJ_WRITE: + + DPRINT1("Read/Write request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + // + // Internal request (SCSI?) + // + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + + DPRINT1("SCSI request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + // + // Flush request + // + case IRP_MJ_FLUSH_BUFFERS: + + DPRINT1("Flush request\n"); + UNIMPLEMENTED; + while (TRUE); + break; + + // + // Anything else + // + default: + + DPRINT1("Invalid request: %lx\n", IoStackLocation->MajorFunction); + UNIMPLEMENTED; + while (TRUE); + break; + } + + // + // Complete the I/O + // + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + return IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + // + // Fail the I/O + // + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + return IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +NTSTATUS +NTAPI +SendIrpToThread(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_WORKITEM WorkItem; + + // + // Mark the IRP pending + // + IoMarkIrpPending(Irp); + + // + // Allocate a work item + // + WorkItem = IoAllocateWorkItem(DeviceObject); + if (WorkItem) + { + // + // Queue it up + // + Irp->Tail.Overlay.DriverContext[0] = WorkItem; + IoQueueWorkItem(WorkItem, RamdiskWorkerThread, DelayedWorkQueue, Irp); + return STATUS_PENDING; + } + else + { + // + // Fail + // + return STATUS_INSUFFICIENT_RESOURCES; + } +} + +NTSTATUS +NTAPI +RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + // + // Complete the IRP + // + Irp->IoStatus.Information = 1; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; } NTSTATUS

16 years, 5 months

[ros-arm-bringup] 34593: - We break your build, you break ours...

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

Author: ros-arm-bringup Date: Sat Jul 19 16:04:31 2008 New Revision: 34593 URL: http://svn.reactos.org/svn/reactos?rev=34593&view=rev Log: - We break your build, you break ours... Modified: trunk/reactos/include/psdk/intrin_arm.h Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] Sat Jul 19 16:04:31 2008 @@ -54,6 +54,12 @@ return a; } +static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +{ + return (void*)_InterlockedCompareExchange((volatile long* const)Destination, (const long)Exchange, (const long)Comperand); +} + + static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const dest, const long add) { long a, b, c;

16 years, 5 months

[ros-arm-bringup] 34592: - Usually a good idea to fill out the device relation count instead of leaving it uninitailized to 2 billion. - Fixes all the ramdisk problems -- need to implement RamdiskWorkerThread now.

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

Author: ros-arm-bringup Date: Sat Jul 19 15:57:31 2008 New Revision: 34592 URL: http://svn.reactos.org/svn/reactos?rev=34592&view=rev Log: - Usually a good idea to fill out the device relation count instead of leaving it uninitailized to 2 billion. - Fixes all the ramdisk problems -- need to implement RamdiskWorkerThread now. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 19 15:57:31 2008 @@ -695,6 +695,11 @@ DeviceRelations->Objects, Count * sizeof(PDEVICE_OBJECT)); } + + // + // Save the count + // + OurDeviceRelations->Count = FinalCount; // // Now loop our drives again

16 years, 5 months

[ros-arm-bringup] 34591: - No, it isn't "ramdisk" that's misbehaving, it's your code. PnP needs to handle BusRelations instead of ignoring them.

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

Author: ros-arm-bringup Date: Sat Jul 19 15:55:49 2008 New Revision: 34591 URL: http://svn.reactos.org/svn/reactos?rev=34591&view=rev Log: - No, it isn't "ramdisk" that's misbehaving, it's your code. PnP needs to handle BusRelations instead of ignoring them. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Jul 19 15:55:49 2008 @@ -689,10 +689,7 @@ if (IoGetAttachedDevice(DeviceObject) != DeviceObject) { /* We're not alone in the stack */ - PDEVICE_NODE DeviceNode; - DeviceNode = IopGetDeviceNode(IopGetDeviceNode(DeviceObject)->PhysicalDeviceObject); - DPRINT1("Device stack for '%wZ' (%wZ) is misbehaving ; shouldn't receive IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n", - &DeviceNode->InstancePath, &DeviceNode->ServiceName); + DPRINT1("PnP is misbehaving ; don't know how to handle IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); } break; }

16 years, 5 months

[ros-arm-bringup] 34590: - It doesn't make sense to dereference an I/O Work Item... did you perhaps mean to dereference the device object? - Fixes a crash when IoInvalidateRelations is called, as well as a reference leak.

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

Author: ros-arm-bringup Date: Sat Jul 19 15:52:52 2008 New Revision: 34590 URL: http://svn.reactos.org/svn/reactos?rev=34590&view=rev Log: - It doesn't make sense to dereference an I/O Work Item... did you perhaps mean to dereference the device object? - Fixes a crash when IoInvalidateRelations is called, as well as a reference leak. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Jul 19 15:52:52 2008 @@ -260,7 +260,7 @@ Data->DeviceObject, Data->Type); - ObDereferenceObject(Data->WorkItem); + ObDereferenceObject(Data->DeviceObject); IoFreeWorkItem(Data->WorkItem); ExFreePool(Data); }

16 years, 5 months

← Newer
1
...
37
38
39
40
41
42
43
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008