Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 34606: - again, one more fix of damaged inf files - please take care when committing this utf-16 files
by mkupfer＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: mkupfer Date: Sun Jul 20 09:52:15 2008 New Revision: 34606 URL: http://svn.reactos.org/svn/reactos?rev=34606&view=rev Log: - again, one more fix of damaged inf files - please take care when committing this utf-16 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=3460… ============================================================================== 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=3460… ============================================================================== 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=3460… ============================================================================== 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=346… ============================================================================== 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=3460… ============================================================================== 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.

1 0

Re: [ros-diffs] [ros-arm-bringup] 34603: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exis
by Steven Edwards 20 Jul '08

20 Jul '08

On Sun, Jul 20, 2008 at 12:40 AM, <ros-arm-bringup(a)svn.reactos.org> wrote: > - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. Ninjas! I don't know if this is related but would it be possible to switch to doing development on NoCC in case you guys run in to more problems like these? I don't know if it would help but I assume your going to run in to more problems with the current Cc and you might be able to save a lot of trouble later on. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

[ros-arm-bringup] 34605: - Unlike NT, it seems React has a bug and does not automatically load the boot FS driver regardless of start type.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 01:36:27 2008 New Revision: 34605 URL: http://svn.reactos.org/svn/reactos?rev=34605&view=rev Log: - Unlike NT, it seems React has a bug and does not automatically load the boot FS driver regardless of start type. Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sun Jul 20 01:36:27 2008 @@ -766,7 +766,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 ; RAM Disk class driver

1 0

[ros-arm-bringup] 34604: - Fix the parameters we were sending to IoCreateDevice for our drive FDO. - Now the kernel attempts to mount us through CDFS! - Start stubbing the work we'll need to do in RamdiskDeviceControl -- this is where the emulation magic will happen.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 01:32:23 2008 New Revision: 34604 URL: http://svn.reactos.org/svn/reactos?rev=34604&view=rev Log: - Fix the parameters we were sending to IoCreateDevice for our drive FDO. - Now the kernel attempts to mount us through CDFS! - Start stubbing the work we'll need to do in RamdiskDeviceControl -- this is where the emulation magic will happen. 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] Sun Jul 20 01:32:23 2008 @@ -11,6 +11,7 @@ #include <initguid.h> #include <ntddk.h> #include <ntdddisk.h> +#include <ntddcdrm.h> #include <scsi.h> #include <ntddscsi.h> #include <mountdev.h> @@ -371,8 +372,8 @@ Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, sizeof(RAMDISK_DRIVE_EXTENSION), &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, // FIXME: DISK - FILE_READ_ONLY_DEVICE, // FIXME: Not always + FILE_DEVICE_CD_ROM, + 0, 0, &DeviceObject); if (!NT_SUCCESS(Status)) goto FailCreate; @@ -906,9 +907,44 @@ else { // - // Drive code not yet done - // - ASSERT(FALSE); + // Check what the request is + // + switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_CDROM_CHECK_VERIFY: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_CDROM_GET_DRIVE_GEOMETRY: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_CDROM_READ_TOC: + + UNIMPLEMENTED; + while (TRUE); + break; + + default: + + // + // Drive code not yet done + // + DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + UNIMPLEMENTED; + while (TRUE); + break; + } + + // + // Cleanup/complete + // + UNIMPLEMENTED; + while (TRUE); } //

1 0

[ros-arm-bringup] 34603: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. - We need to verify if this is truly the case -- in either case, add an ASSERT, since all assumptions should be ASSERTed!
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:40:27 2008 New Revision: 34603 URL: http://svn.reactos.org/svn/reactos?rev=34603&view=rev Log: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. - We need to verify if this is truly the case -- in either case, add an ASSERT, since all assumptions should be ASSERTed! Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=346… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Jul 19 23:40:27 2008 @@ -1213,6 +1213,7 @@ KeAcquireGuardedMutex(&ViewLock); + ASSERT(FileObject->SectionObjectPointer); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; if (Bcb == NULL) {

1 0

[ros-arm-bringup] 34602: - Finish implementing RamdiskCreateDiskDevice -- we should now have a working ramdisk drive that should receive read/write requests.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:39:01 2008 New Revision: 34602 URL: http://svn.reactos.org/svn/reactos?rev=34602&view=rev Log: - Finish implementing RamdiskCreateDiskDevice -- we should now have a working ramdisk drive that should receive read/write requests. 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 23:39:01 2008 @@ -81,6 +81,9 @@ LONGLONG DiskLength; LONG DiskOffset; WCHAR DriveLetter; + ULONG BytesPerSector; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; } RAMDISK_DRIVE_EXTENSION, *PRAMDISK_DRIVE_EXTENSION; ULONG MaximumViewLength; @@ -491,7 +494,43 @@ DeviceName.Buffer = NULL; SymbolicLinkName.Buffer = NULL; GuidString.Buffer = NULL; - } + + // + // Only support ISO stuff for now + // + ASSERT(Input->Options.ExportAsCd == TRUE); + ASSERT(Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM); + + // + // Setup partition parameters + // + DriveExtension->BytesPerSector = 2048; // 512 for Disk + DriveExtension->SectorsPerTrack = 32; // 128 for disk + DriveExtension->NumberOfHeads = 64; // 16 for disk + + // + // Acquire the disk lock + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + + // + // Insert us + // + InsertTailList(&DeviceExtension->DiskList, &DriveExtension->DiskList); + + // + // Release the lock + // + ExReleaseFastMutex(&DeviceExtension->DiskListLock); + KeLeaveCriticalRegion(); + + // + // Clear init flag + // + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + return STATUS_SUCCESS; + } FailCreate: UNIMPLEMENTED;

1 0

[ros-arm-bringup] 34601: - Looks like this FIXME was fixed.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:38:26 2008 New Revision: 34601 URL: http://svn.reactos.org/svn/reactos?rev=34601&view=rev Log: - Looks like this FIXME was fixed. Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Jul 19 23:38:26 2008 @@ -278,7 +278,7 @@ KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 2, 0, 0); } - /* FIXME: Check if the image is valid */ + /* Check if the image is valid */ Status = MmCheckSystemImage(FileHandle, TRUE); if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) {

1 0

[arty] 34600: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Fixes some issues with releasing locks - Verify that we have an MDL before trying to unlock it
by arty＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: arty Date: Sat Jul 19 23:33:53 2008 New Revision: 34600 URL: http://svn.reactos.org/svn/reactos?rev=34600&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Fixes some issues with releasing locks - Verify that we have an MDL before trying to unlock it Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -140,7 +140,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !(ConnectReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, TRUE ); + 0, NULL, FALSE ); AFD_DbgPrint(MID_TRACE,("Connect request:\n")); #if 0 Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -20,7 +20,7 @@ PAFD_FCB FCB = FileObject->FsContext; UINT ContextSize = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( FCB->ContextSize < ContextSize ) ContextSize = FCB->ContextSize; @@ -43,7 +43,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -26,7 +26,7 @@ _SEH_TRY { if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp, TRUE ); + Status = LostSocket( Irp, FALSE ); _SEH_YIELD(return Status); } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -157,7 +157,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !(ListenReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, @@ -209,7 +209,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !IsListEmpty( &FCB->PendingConnections ) ) { PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; @@ -246,7 +246,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); FCB->EventsFired &= ~AFD_EVENT_ACCEPT; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -154,7 +154,7 @@ FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; - UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); FCB->Overread = TRUE; //FCB->PollState |= AFD_EVENT_DISCONNECT; @@ -198,7 +198,7 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; if( NextIrp == Irp ) RetStatus = Status; - UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -274,13 +274,17 @@ (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp ); PAFD_FCB FCB = FileObject->FsContext; + if ( !EventSelectInfo ) { + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, + 0, NULL, FALSE ); + } AFD_DbgPrint(MID_TRACE,("Called (Event %x Triggers %x)\n", EventSelectInfo->EventObject, EventSelectInfo->Events)); if( !SocketAcquireStateLock( FCB ) ) { UnlockRequest( Irp, IrpSp ); - return LostSocket( Irp, FALSE ); + return LostSocket( Irp, TRUE ); } FCB->EventSelectTriggers = FCB->EventsFired = 0; @@ -319,9 +323,14 @@ AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); + if ( !EnumReq ) { + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, + 0, NULL, FALSE ); + } + if( !SocketAcquireStateLock( FCB ) ) { UnlockRequest( Irp, IrpSp ); - return LostSocket( Irp, FALSE ); + return LostSocket( Irp, TRUE ); } EnumReq->PollEvents = FCB->PollState;

1 0

[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 20 Jul '08

20 Jul '08

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);

1 0

[spetreolle] 34598: french translation for media/inf files
by spetreolle＠svn.reactos.org 20 Jul '08

20 Jul '08

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.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs