Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 40597: - Handle IRP_MN_QUERY_RESOURCE_REQUIREMENTS
by janderwald＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: janderwald Date: Mon Apr 20 02:12:56 2009 New Revision: 40597 URL: http://svn.reactos.org/svn/reactos?rev=40597&view=rev Log: - Handle IRP_MN_QUERY_RESOURCE_REQUIREMENTS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Mon Apr 20 02:12:56 2009 @@ -122,6 +122,9 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + return PcForwardIrpSynchronous(DeviceObject, Irp); } DPRINT1("unhandled function %u\n", IoStack->MinorFunction);

1 0

[janderwald] 40596: - Silence a few debug prints - Fix memory leaks on failure
by janderwald＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: janderwald Date: Mon Apr 20 02:01:57 2009 New Revision: 40596 URL: http://svn.reactos.org/svn/reactos?rev=40596&view=rev Log: - Silence a few debug prints - Fix memory leaks on failure Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -122,7 +122,7 @@ /* set the input format */ PinRequest.PinId = 0; - //DPRINT1("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + DPRINT("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), @@ -134,7 +134,7 @@ /* set the the output format */ PinRequest.PinId = 1; - //DPRINT1("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + DPRINT("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -41,12 +41,18 @@ Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); if (!NT_SUCCESS(Status)) { + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } if (!Count) { + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } @@ -56,6 +62,9 @@ if (!DeviceEntry->Pins) { /* no memory */ + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } @@ -101,7 +110,7 @@ } - DPRINT1("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); + DPRINT("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -139,7 +148,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("ZwCreateFile failed with %x\n", Status); + DPRINT("ZwCreateFile failed with %x\n", Status); return Status; } @@ -147,7 +156,7 @@ if (!NT_SUCCESS(Status)) { ZwClose(NodeHandle); - DPRINT1("ObReferenceObjectByHandle failed with %x\n", Status); + DPRINT("ObReferenceObjectByHandle failed with %x\n", Status); return Status; } @@ -210,12 +219,13 @@ Status = OpenDevice(&DeviceEntry->DeviceName, &DeviceEntry->Handle, &DeviceEntry->FileObject); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwCreateFile failed with %x\n", Status); + DPRINT("ZwCreateFile failed with %x\n", Status); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return Status; } - DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); + DPRINT("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); //FIXME // mutal exclusion @@ -224,7 +234,7 @@ } else { - DPRINT1("Remove interface to audio device!\n"); + DPRINT("Remove interface to audio device!\n"); UNIMPLEMENTED return STATUS_SUCCESS; } @@ -250,7 +260,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + DPRINT("IoRegisterPlugPlayNotification failed with %x\n", Status); } Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, @@ -264,7 +274,7 @@ if (!NT_SUCCESS(Status)) { /* ignore failure for now */ - DPRINT1("IoRegisterPlugPlayNotification failed for DMOCATEGORY_ACOUSTIC_ECHO_CANCEL\n", Status); + DPRINT("IoRegisterPlugPlayNotification failed for DMOCATEGORY_ACOUSTIC_ECHO_CANCEL\n", Status); } return STATUS_SUCCESS; @@ -287,7 +297,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); return Status; } @@ -299,7 +309,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); return Status; } @@ -311,7 +321,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); } Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_SYSAUDIO, NULL, &SymbolicLink); @@ -322,7 +332,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_SYSAUDIO interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_SYSAUDIO interface Status %x\n", Status); } return Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -128,7 +128,7 @@ ExFreePool(DispatchContext); - //DPRINT1("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); + DPRINT("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); if (!Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References) { DPRINT("Closing pin %p\n", Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].PinHandle); @@ -159,7 +159,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -174,7 +174,7 @@ PIRP Irp) { - DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -195,7 +195,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -214,7 +214,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -232,7 +232,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; } @@ -353,7 +353,7 @@ /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); - DPRINT1("KsAllocateObjectHeader result %x\n", Status); + DPRINT("KsAllocateObjectHeader result %x\n", Status); /* complete the irp */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -24,7 +24,7 @@ NTAPI SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) { - DPRINT1("SysAudio_Unload called\n"); + DPRINT("SysAudio_Unload called\n"); } NTSTATUS @@ -79,7 +79,7 @@ SYSAUDIODEVEXT *DeviceExtension; - DPRINT1("SysAudio_InstallDevice called\n"); + DPRINT("SysAudio_InstallDevice called\n"); /* Create the device */ Status = IoCreateDevice(DriverObject, @@ -191,7 +191,7 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT1("System audio graph builder (sysaudio) started\n"); + DPRINT("System audio graph builder (sysaudio) started\n"); /* Let ks handle these */ KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -206,7 +206,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -220,7 +220,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -235,7 +235,7 @@ PIRP Irp) { - DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -256,7 +256,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -275,7 +275,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -296,7 +296,7 @@ PDISPATCH_CONTEXT Context; NTSTATUS Status; - //DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); Context = (PDISPATCH_CONTEXT)FileObject->FsContext2;

1 0

[cfinck] 40595: Merge 40594
by cfinck＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: cfinck Date: Mon Apr 20 01:42:26 2009 New Revision: 40595 URL: http://svn.reactos.org/svn/reactos?rev=40595&view=rev Log: Merge 40594 Modified: branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c Modified: branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 20 01:42:26 2009 @@ -1097,10 +1097,10 @@ LPWSTR pszDeviceInstance2) { CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulMinorAction); - UNREFERENCED_PARAMETER(pszDeviceInstance1); UNREFERENCED_PARAMETER(pszDeviceInstance2); DPRINT("PNP_DeviceInstanceAction() called\n"); @@ -1114,10 +1114,15 @@ break; case PNP_DEVINST_ENABLE: + { + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; DPRINT("Enable device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; - break; + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance1); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + break; + } case PNP_DEVINST_REENUMERATE: DPRINT("Reenumerate device instance\n"); Modified: branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Mon Apr 20 01:42:26 2009 @@ -4642,21 +4642,18 @@ IN PSP_DEVINFO_DATA DeviceInfoData) { #ifndef __WINESRC__ - PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - NTSTATUS Status; - - if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) - { - /* At the moment, I only know how to start local devices */ - SetLastError(ERROR_INVALID_COMPUTERNAME); - return FALSE; - } - - RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, deviceInfo->instanceId); - Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); - SetLastError(RtlNtStatusToDosError(Status)); - return NT_SUCCESS(Status); + CONFIGRET cr; + + cr = CM_Enable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; #else FIXME("Stub: ResetDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE;

1 0

[hpoussin] 40594: Don't directly call NtPlugPlayControl from setupapi, and replace it by RPC As a bonus, setupapi is now (theorically) able to restart devices on remote machines See issue #4400 for more details.
by hpoussin＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: hpoussin Date: Mon Apr 20 01:36:59 2009 New Revision: 40594 URL: http://svn.reactos.org/svn/reactos?rev=40594&view=rev Log: Don't directly call NtPlugPlayControl from setupapi, and replace it by RPC As a bonus, setupapi is now (theorically) able to restart devices on remote machines See issue #4400 for more details. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 20 01:36:59 2009 @@ -1097,10 +1097,10 @@ LPWSTR pszDeviceInstance2) { CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulMinorAction); - UNREFERENCED_PARAMETER(pszDeviceInstance1); UNREFERENCED_PARAMETER(pszDeviceInstance2); DPRINT("PNP_DeviceInstanceAction() called\n"); @@ -1114,10 +1114,15 @@ break; case PNP_DEVINST_ENABLE: + { + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; DPRINT("Enable device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; - break; + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance1); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + break; + } case PNP_DEVINST_REENUMERATE: DPRINT("Reenumerate device instance\n"); Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Mon Apr 20 01:36:59 2009 @@ -4642,21 +4642,18 @@ IN PSP_DEVINFO_DATA DeviceInfoData) { #ifndef __WINESRC__ - PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - NTSTATUS Status; - - if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) - { - /* At the moment, I only know how to start local devices */ - SetLastError(ERROR_INVALID_COMPUTERNAME); - return FALSE; - } - - RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, deviceInfo->instanceId); - Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); - SetLastError(RtlNtStatusToDosError(Status)); - return NT_SUCCESS(Status); + CONFIGRET cr; + + cr = CM_Enable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; #else FIXME("Stub: ResetDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE;

1 0

[janderwald] 40593: - Drivers might use this unused area http://msdn.microsoft.com/en-us/library/ms793661.aspx
by janderwald＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: janderwald Date: Mon Apr 20 00:13:37 2009 New Revision: 40593 URL: http://svn.reactos.org/svn/reactos?rev=40593&view=rev Log: - Drivers might use this unused area http://msdn.microsoft.com/en-us/library/ms793661.aspx Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Apr 20 00:13:37 2009 @@ -164,6 +164,7 @@ PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT PrevDeviceObject; PCPFNSTARTDEVICE StartDevice; + ULONG_PTR Unused[4]; IAdapterPowerManagement * AdapterPowerManagement; ULONG MaxSubDevices; KSOBJECT_CREATE_ITEM * CreateItems;

1 0

[janderwald] 40592: - Activate IPortFilterWavePci
by janderwald＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: janderwald Date: Sun Apr 19 23:15:58 2009 New Revision: 40592 URL: http://svn.reactos.org/svn/reactos?rev=40592&view=rev Log: - Activate IPortFilterWavePci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Apr 19 23:15:58 2009 @@ -30,6 +30,7 @@ PPOWERNOTIFY pPowerNotify; PPCFILTER_DESCRIPTOR pDescriptor; PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; + IPortFilterWavePci * Filter; }IPortWavePciImpl; static GUID InterfaceGuids[3] = @@ -628,10 +629,33 @@ IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { - //IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + NTSTATUS Status; + IPortFilterWavePci * Filter; + IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_NewIrpTarget this %p\n", This); + + if (This->Filter) + { + *OutTarget = (IIrpTarget*)This->Filter; + return STATUS_SUCCESS; + } + + Status = NewPortFilterWavePci(&Filter); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = Filter->lpVtbl->Init(Filter, (IPortWavePci*)This); + if (!NT_SUCCESS(Status)) + { + Filter->lpVtbl->Release(Filter); + return Status; + } + + *OutTarget = (IIrpTarget*)Filter; + return Status; } static

1 0

[fireball] 40591: Merge 40590: - Don't display unformatted partitions twice.
by fireball＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: fireball Date: Sun Apr 19 22:43:56 2009 New Revision: 40591 URL: http://svn.reactos.org/svn/reactos?rev=40591&view=rev Log: Merge 40590: - Don't display unformatted partitions twice. Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/ (props changed) branches/ros-branch-0_3_9/reactos/base/setup/usetup/partlist.c Propchange: branches/ros-branch-0_3_9/reactos/base/setup/usetup/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/reactos/base/setup/usetup:40590 Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Apr 19 22:43:56 2009 @@ -1373,7 +1373,7 @@ } /* Print unpartitioned entry */ - if (PartEntry->Unpartitioned || PartEntry->New) + if (PartEntry->Unpartitioned) { PrintPartitionData (List, DiskEntry,

1 0

[fireball] 40590: - Don't display unformatted partitions twice. See issue #4399 for more details.
by fireball＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: fireball Date: Sun Apr 19 22:42:07 2009 New Revision: 40590 URL: http://svn.reactos.org/svn/reactos?rev=40590&view=rev Log: - Don't display unformatted partitions twice. See issue #4399 for more details. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Apr 19 22:42:07 2009 @@ -1373,7 +1373,7 @@ } /* Print unpartitioned entry */ - if (PartEntry->Unpartitioned || PartEntry->New) + if (PartEntry->Unpartitioned) { PrintPartitionData (List, DiskEntry,

1 0

[janderwald] 40589: - Implement IPortFilterWavePci (based on IPortFilterWaveCyclic)
by janderwald＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: janderwald Date: Sun Apr 19 22:32:53 2009 New Revision: 40589 URL: http://svn.reactos.org/svn/reactos?rev=40589&view=rev Log: - Implement IPortFilterWavePci (based on IPortFilterWaveCyclic) Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -1,0 +1,429 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/filter_wavepci.c + * PURPOSE: portcls wave pci filter + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +typedef struct +{ + IPortFilterWavePciVtbl *lpVtbl; + + LONG ref; + + IPortWavePci* Port; + IPortPinWavePci ** Pins; + SUBDEVICE_DESCRIPTOR * Descriptor; + +}IPortFilterWavePciImpl; + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnQueryInterface( + IPortFilterWavePci* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + else if (IsEqualGUIDAligned(refiid, &IID_IPort)) + { + *Output = This->Port; + This->Port->lpVtbl->AddRef(This->Port); + return STATUS_SUCCESS; + } + + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortFilterWavePci_fnAddRef( + IPortFilterWavePci* iface) +{ + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortFilterWavePci_fnRelease( + IPortFilterWavePci* iface) +{ + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnNewIrpTarget( + IN IPortFilterWavePci* iface, + OUT struct IIrpTarget **OutTarget, + IN WCHAR * Name, + IN PUNKNOWN Unknown, + IN POOL_TYPE PoolType, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN KSOBJECT_CREATE *CreateObject) +{ + NTSTATUS Status; + IPortPinWavePci * Pin; + PKSPIN_CONNECT ConnectDetails; + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl *)iface; + + ASSERT(This->Port); + ASSERT(This->Descriptor); + ASSERT(This->Pins); + + DPRINT("IPortFilterWavePci_fnNewIrpTarget entered\n"); + + /* let's verify the connection request */ + Status = PcValidateConnectRequest(Irp, &This->Descriptor->Factory, &ConnectDetails); + if (!NT_SUCCESS(Status)) + { + return STATUS_UNSUCCESSFUL; + } + + if (This->Pins[ConnectDetails->PinId] && This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount) + { + /* release existing instance */ + ASSERT(0); + This->Pins[ConnectDetails->PinId]->lpVtbl->Close(This->Pins[ConnectDetails->PinId], DeviceObject, NULL); + } + + /* now create the pin */ + Status = NewPortPinWavePci(&Pin); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* initialize the pin */ + Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &This->Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId], GetDeviceObjectFromWaveCyclic(This->Port)); + if (!NT_SUCCESS(Status)) + { + Pin->lpVtbl->Release(Pin); + return Status; + } + + /* release existing pin */ + if (This->Pins[ConnectDetails->PinId]) + { + This->Pins[ConnectDetails->PinId]->lpVtbl->Release(This->Pins[ConnectDetails->PinId]); + } + /* store pin */ + This->Pins[ConnectDetails->PinId] = Pin; + + /* store result */ + *OutTarget = (IIrpTarget*)Pin; + + /* increment current instance count */ + This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; + + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnDeviceIoControl( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + ISubdevice *SubDevice = NULL; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl *)iface; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); + ASSERT(Status == STATUS_SUCCESS); + ASSERT(SubDevice != NULL); + + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + ASSERT(Status == STATUS_SUCCESS); + ASSERT(Descriptor != NULL); + + SubDevice->lpVtbl->Release(SubDevice); + + return PcPropertyHandler(Irp, Descriptor); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnRead( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnWrite( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnFlush( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnClose( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG Index; + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl *)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index]) + { + This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); + } + + } + + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnQuerySecurity( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnSetSecurity( + IN IPortFilterWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnFastDeviceIoControl( + IN IPortFilterWavePci* iface, + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnFastRead( + IN IPortFilterWavePci* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterWavePci_fnFastWrite( + IN IPortFilterWavePci* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +static +NTSTATUS +NTAPI +IPortFilterWavePci_fnInit( + IN IPortFilterWavePci* iface, + IN IPortWavePci* Port) +{ + ISubdevice * ISubDevice; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl*)iface; + + This->Port = Port; + + /* get our private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* get the subdevice descriptor */ + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + + /* release subdevice interface */ + ISubDevice->lpVtbl->Release(ISubDevice); + + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* save descriptor */ + This->Descriptor = Descriptor; + + /* allocate pin array */ + This->Pins = AllocateItem(NonPagedPool, Descriptor->Factory.PinDescriptorCount * sizeof(IPortPinWavePci*), TAG_PORTCLASS); + + if (!This->Pins) + return STATUS_UNSUCCESSFUL; + + /* increment reference count */ + Port->lpVtbl->AddRef(Port); + + return STATUS_SUCCESS; +} + +static IPortFilterWavePciVtbl vt_IPortFilterWavePci = +{ + IPortFilterWavePci_fnQueryInterface, + IPortFilterWavePci_fnAddRef, + IPortFilterWavePci_fnRelease, + IPortFilterWavePci_fnNewIrpTarget, + IPortFilterWavePci_fnDeviceIoControl, + IPortFilterWavePci_fnRead, + IPortFilterWavePci_fnWrite, + IPortFilterWavePci_fnFlush, + IPortFilterWavePci_fnClose, + IPortFilterWavePci_fnQuerySecurity, + IPortFilterWavePci_fnSetSecurity, + IPortFilterWavePci_fnFastDeviceIoControl, + IPortFilterWavePci_fnFastRead, + IPortFilterWavePci_fnFastWrite, + IPortFilterWavePci_fnInit +}; + +NTSTATUS +NewPortFilterWavePci( + OUT IPortFilterWavePci ** OutFilter) +{ + IPortFilterWavePciImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortFilterWavePciImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize IPortFilterWavePci */ + This->ref = 1; + This->lpVtbl = &vt_IPortFilterWavePci; + + /* return result */ + *OutFilter = (IPortFilterWavePci*)&This->lpVtbl; + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -425,6 +425,53 @@ STDMETHOD_(ULONG, GetIrpStreamPositionLock)(THIS); }; +/***************************************************************************** + * IPortFilterWavePci + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IPortFilterWavePci + +DECLARE_INTERFACE_(IPortFilterWavePci, IIrpTarget) +{ + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IRPTARGET() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PPORTWAVEPCI Port)PURE; +}; + +typedef IPortFilterWavePci *PPORTFILTERWAVEPCI; + + +/***************************************************************************** + * IPortPinWavePci + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IPortPinWavePci + +DECLARE_INTERFACE_(IPortPinWavePci, IIrpTarget) +{ + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IRPTARGET() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PPORTWAVEPCI Port, + IN PPORTFILTERWAVEPCI Filter, + IN KSPIN_CONNECT * ConnectDetails, + IN KSPIN_DESCRIPTOR * PinDescriptor, + IN PDEVICE_OBJECT DeviceObject) PURE; + + STDMETHOD_(PVOID, GetIrpStream)(THIS); + STDMETHOD_(PMINIPORT, GetMiniport)(THIS); +}; + +typedef IPortPinWavePci *PPORTPINWAVEPCI; /***************************************************************************** * IPortFilterWaveCyclic Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -1,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c + * PURPOSE: WaveCyclic IRP Audio Pin + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +NTSTATUS +NewPortPinWavePci( + OUT IPortPinWavePci ** OutPin) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -760,3 +760,12 @@ DPRINT("NewPortWavePci %p\n", *OutPort); return STATUS_SUCCESS; } + +PDEVICE_OBJECT +GetDeviceObjectFromWaveCyclic( + IPortWavePci* iface) +{ + IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + return This->pDeviceObject; +} + Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -18,6 +18,7 @@ <file>drm_port.c</file> <file>adapter.c</file> <file>filter_wavecyclic.c</file> + <file>filter_wavepci.c</file> <file>guids.c</file> <file>irp.c</file> <file>irpstream.c</file> @@ -28,6 +29,7 @@ <file>registry.c</file> <file>service_group.c</file> <file>pin_wavecyclic.c</file> + <file>pin_wavepci.c</file> <file>pool.c</file> <file>port.c</file> <file>power.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sun Apr 19 22:32:53 2009 @@ -87,6 +87,18 @@ NTSTATUS NewPortPinWaveCyclic( OUT IPortPinWaveCyclic ** OutPin); + +NTSTATUS +NewPortFilterWavePci( + OUT IPortFilterWavePci ** OutFilter); + +NTSTATUS NewPortPinWavePci( + OUT IPortPinWavePci ** OutPin); + +PDEVICE_OBJECT +GetDeviceObjectFromWaveCyclic( + IPortWavePci* iface); + NTSTATUS NTAPI

1 0

[dgoette] 384: dont show link to registration if already logged in
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 20:02:30 2009 New Revision: 384 URL: http://svn.reactos.org/svn/reactos?rev=384&view=rev Log: dont show link to registration if already logged in Modified: branches/danny-web/www/www.reactos.org/bugzilla/template/en/default/global/… Modified: branches/danny-web/www/www.reactos.org/bugzilla/template/en/default/global/… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/template/en/default/global/… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/template/en/default/global/… [iso-8859-1] Sun Apr 19 20:02:30 2009 @@ -301,8 +301,8 @@ <li><a href="/roscms/?page=logout">Logout [% user.name %]</a></li> [% ELSE %] <li><a href="/roscms/?page=login&target=%2Fbugzilla">Login</a></li> -[% END %] <li><a href="/roscms/?page=register&target=%2Fbugzilla">Register</a></li> +[% END %] </ol> <p></p> </div>

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