Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39759: - Sync atl and cabinet with Wine head
by dchapyshev＠svn.reactos.org 26 Feb '09

26 Feb '09

Author: dchapyshev Date: Thu Feb 26 13:20:22 2009 New Revision: 39759 URL: http://svn.reactos.org/svn/reactos?rev=39759&view=rev Log: - Sync atl and cabinet with Wine head Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Thu Feb 26 13:20:22 2009 @@ -126,11 +126,11 @@ return ref; } -#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&This->lpOleClientSiteVtbl) -#define THIS2IOLECONTAINER(This) ((IOleContainer*)&This->lpOleContainerVtbl) -#define THIS2IOLEINPLACESITEWINDOWLESS(This) ((IOleInPlaceSiteWindowless*)&This->lpOleInPlaceSiteWindowlessVtbl) -#define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl) -#define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl) +#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&(This)->lpOleClientSiteVtbl) +#define THIS2IOLECONTAINER(This) (&(This)->lpOleContainerVtbl) +#define THIS2IOLEINPLACESITEWINDOWLESS(This) (&(This)->lpOleInPlaceSiteWindowlessVtbl) +#define THIS2IOLEINPLACEFRAME(This) (&(This)->lpOleInPlaceFrameVtbl) +#define THIS2IOLECONTROLSITE(This) (&(This)->lpOleControlSiteVtbl) static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) { Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h [iso-8859-1] Thu Feb 26 13:20:22 2009 @@ -653,8 +653,4 @@ struct FILELIST *FilterList; } SESSION; -/* from fdi.c */ -void QTMupdatemodel(struct QTMmodel *model, int sym); -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); - #endif /* __WINE_CABINET_H */ Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Thu Feb 26 13:20:22 2009 @@ -151,7 +151,7 @@ /**************************************************************** * QTMupdatemodel (internal) */ -void QTMupdatemodel(struct QTMmodel *model, int sym) { +static void QTMupdatemodel(struct QTMmodel *model, int sym) { struct QTMmodelsym temp; int i, j; @@ -220,7 +220,8 @@ * OK: 0 * error: 1 */ -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) { +static int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, + const cab_UBYTE *length, cab_UWORD *table) { register cab_UWORD sym; register cab_ULONG leaf; register cab_UBYTE bit_num = 1;

1 0

[janderwald] 39758: - Fix wdmaud / sysaudio service installation when a driver is installed
by janderwald＠svn.reactos.org 26 Feb '09

26 Feb '09

Author: janderwald Date: Thu Feb 26 03:04:26 2009 New Revision: 39758 URL: http://svn.reactos.org/svn/reactos?rev=39758&view=rev Log: - Fix wdmaud / sysaudio service installation when a driver is installed Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Thu Feb 26 03:04:26 2009 @@ -166,7 +166,8 @@ PVOID Context; BOOL Result; - if (!IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_SOUND)) + if (!IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_SOUND) && + !IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_MEDIA)) return ERROR_DI_DO_DEFAULT; Length = GetWindowsDirectoryW(szBuffer, MAX_PATH);

1 0

[janderwald] 39757: - Refactor irp handling to support playing new stream irps properly - Complete several irps to allow audio devices to be shutdown properly and re-used
by janderwald＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: janderwald Date: Thu Feb 26 01:30:20 2009 New Revision: 39757 URL: http://svn.reactos.org/svn/reactos?rev=39757&view=rev Log: - Refactor irp handling to support playing new stream irps properly - Complete several irps to allow audio devices to be shutdown properly and re-used Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Thu Feb 26 01:30:20 2009 @@ -169,7 +169,7 @@ BOOL Success; IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; - DPRINT1("IInterruptServiceRoutine\n"); + DPRINT("IInterruptServiceRoutine\n"); if (This->Mode == InterruptSyncModeNormal) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Thu Feb 26 01:30:20 2009 @@ -111,11 +111,6 @@ This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); if (KeGetCurrentIrql() > DISPATCH_LEVEL) { - if (This->DelayedRequestInProgress) - return; - - This->ActiveIrp->IoStatus.Information = This->ActiveIrpBufferSize; - This->ActiveIrp->IoStatus.Status = STATUS_SUCCESS; This->DelayedRequestInProgress = TRUE; This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); return; @@ -127,19 +122,14 @@ This->ActiveIrp->IoStatus.Status = STATUS_SUCCESS; This->ActiveIrp->IoStatus.Information = This->ActiveIrpBufferSize; IoCompleteRequest(This->ActiveIrp, IO_SOUND_INCREMENT); + This->ActiveIrp = NULL; } - This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); - if (!This->ActiveIrp) - { + Status = IPortWaveCyclic_fnProcessNewIrp(This); + if (Status == STATUS_SUCCESS) + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); + else This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return; - } - - DPRINT1("processing next irp\n"); - - IPortWaveCyclic_fnProcessNewIrp(This); - This->DelayedRequestInProgress = FALSE; return; } } @@ -148,25 +138,17 @@ { if (KeGetCurrentIrql() > DISPATCH_LEVEL) { - if (This->DelayedRequestInProgress) - return; - - This->DelayedRequestInProgress = TRUE; This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); return; } - This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); - if (!This->ActiveIrp) - { - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return; - } - - IPortWaveCyclic_fnProcessNewIrp(This); - This->DelayedRequestInProgress = FALSE; - return; - } - + + Status = IPortWaveCyclic_fnProcessNewIrp(This); + if (Status == STATUS_SUCCESS) + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); + else + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); DPRINT("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, This->ActiveIrpOffset); @@ -215,7 +197,7 @@ if (!BytesToCopy) { - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); return; } @@ -323,18 +305,27 @@ PIO_STACK_LOCATION IoStack; PKSSTREAM_HEADER Header; - DPRINT1("ActiveIrp %p\n", This->ActiveIrp); + This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); + if (!This->ActiveIrp) + { + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return STATUS_PENDING; + } + + DPRINT("ActiveIrp %p\n", This->ActiveIrp); IoStack = IoGetCurrentIrpStackLocation(This->ActiveIrp); if (IoStack->Parameters.DeviceIoControl.InputBufferLength != sizeof(KSSTREAM_HEADER)) { DPRINT1("Irp has unexpected header\n"); + IoCompleteRequest(This->ActiveIrp, IO_NO_INCREMENT); + This->ActiveIrp = NULL; return STATUS_INVALID_PARAMETER; } Header = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - DPRINT1("Header %p Size %u\n", Header, Header->Size); + DPRINT("Header %p Size %u\n", Header, Header->Size); This->ActiveIrpOffset = 0; @@ -364,6 +355,7 @@ { Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_PARAMETER; } @@ -379,6 +371,7 @@ { Irp->IoStatus.Information = sizeof(KSSTATE); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } @@ -427,6 +420,7 @@ *State = This->State; Irp->IoStatus.Information = sizeof(KSSTATE); Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } } @@ -440,6 +434,7 @@ { Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; } RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); @@ -454,33 +449,37 @@ This->Format = NewDataFormat; Irp->IoStatus.Information = DataFormat->FormatSize; Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } } Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } else if (Property->Flags & KSPROPERTY_TYPE_GET) { - PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; if (!This->Format) { DPRINT1("No format\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } if (This->Format->FormatSize > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { Irp->IoStatus.Information = This->Format->FormatSize; Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } RtlMoveMemory(DataFormat, This->Format, This->Format->FormatSize); Irp->IoStatus.Information = DataFormat->FormatSize; Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } } @@ -493,6 +492,7 @@ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -511,10 +511,10 @@ if (!This->Stream) { - IoCancelIrp(Irp); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; - return Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } KsAddIrpToCancelableQueue(&This->QueueHead, &This->QueueLock, Irp, KsListEntryTail, NULL); @@ -774,7 +774,7 @@ if (!NT_SUCCESS(Status)) return Status; - Status = This->ServiceGroup->lpVtbl->AddMember(This->ServiceGroup, + Status = This->ServiceGroup->lpVtbl->AddMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); if (!NT_SUCCESS(Status)) { 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] Thu Feb 26 01:30:20 2009 @@ -616,8 +616,6 @@ if (PinInstances.CurrentCount == PinInstances.PossibleCount) { /* pin already exists */ - DPRINT1("Pins %p\n", Entry->Pins); - DbgBreakPoint(); ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); if (Entry->Pins[PinConnect->PinId].References > 1) 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] Thu Feb 26 01:30:20 2009 @@ -269,7 +269,7 @@ { Status = CreateDispatcher(Irp); DPRINT1("Virtual pin Status %x FileObject %p\n", Status, IoStatus->FileObject); -DbgBreakPoint(); + Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[pschweitzer] 39756: Mini optimalisation of RtlGenerate8dot3Name. Patch by Peter Veenstra See issue #4152 for more details.
by pschweitzer＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: pschweitzer Date: Thu Feb 26 01:30:17 2009 New Revision: 39756 URL: http://svn.reactos.org/svn/reactos?rev=39756&view=rev Log: Mini optimalisation of RtlGenerate8dot3Name. Patch by Peter Veenstra See issue #4152 for more details. Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=397… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Thu Feb 26 01:30:17 2009 @@ -83,7 +83,7 @@ DPRINT("StrLength: %lu\n", StrLength); /* Find last dot in Name */ - DotPos = 0; + DotPos = StrLength; for (i = 0; i < StrLength; i++) { if (Name->Buffer[i] == L'.') @@ -92,10 +92,6 @@ } } - if (DotPos == 0) - { - DotPos = i; - } DPRINT("DotPos: %lu\n", DotPos); /* Copy name (6 valid characters max) */

1 0

[fireball] 39755: - Scan three PCI buses in the legacy USB driver instead of 2. Fixes UHCI/EHCI detection issues in VMWare Workstation 6.5 and higher (Emulated UHCI is located on bus 2).
by fireball＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: fireball Date: Wed Feb 25 23:37:50 2009 New Revision: 39755 URL: http://svn.reactos.org/svn/reactos?rev=39755&view=rev Log: - Scan three PCI buses in the legacy USB driver instead of 2. Fixes UHCI/EHCI detection issues in VMWare Workstation 6.5 and higher (Emulated UHCI is located on bus 2). Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed Feb 25 23:37:50 2009 @@ -3439,7 +3439,7 @@ pdev = NULL; //scan the bus to find ehci controller - for(bus = 0; bus < 2; bus++) /*enum only bus0 and bus1 */ + for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ { for(i = 0; i < PCI_MAX_DEVICES; i++) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed Feb 25 23:37:50 2009 @@ -627,7 +627,7 @@ pdev = NULL; //scan the bus to find uhci controller - for(bus = 0; bus < 2; bus++) /*enum only bus0 and bus1 */ + for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ { for(i = 0; i < PCI_MAX_DEVICES; i++) {

1 0

[fireball] 39754: - Fix a horrible bug, when DriverEntry was not having __stdcall calling convention.
by fireball＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: fireball Date: Wed Feb 25 19:00:38 2009 New Revision: 39754 URL: http://svn.reactos.org/svn/reactos?rev=39754&view=rev Log: - Fix a horrible bug, when DriverEntry was not having __stdcall calling convention. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed Feb 25 19:00:38 2009 @@ -6221,6 +6221,7 @@ } NTSTATUS +NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { NTSTATUS ntStatus = STATUS_SUCCESS; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed Feb 25 19:00:38 2009 @@ -3804,6 +3804,7 @@ } NTSTATUS +NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { #if DBG

1 0

[janderwald] 39753: - Fix a bug in the audio_test programm which initialized the deviceinfo before another syscall - Complete also an unhandeled irp - Implement IOCTL_CLOSE_WDMAUD - Account the number of times pin can be instantiated in sysaudio and apply changes to SYSAUDIO_CLIENT structure - There is still a bug which prevents closing the audio adapter at the 2nd time
by janderwald＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: janderwald Date: Wed Feb 25 18:55:21 2009 New Revision: 39753 URL: http://svn.reactos.org/svn/reactos?rev=39753&view=rev Log: - Fix a bug in the audio_test programm which initialized the deviceinfo before another syscall - Complete also an unhandeled irp - Implement IOCTL_CLOSE_WDMAUD - Account the number of times pin can be instantiated in sysaudio and apply changes to SYSAUDIO_CLIENT structure - There is still a bug which prevents closing the audio adapter at the 2nd time Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -39,6 +39,7 @@ } printf("WDMAUD: opened\n"); + /* clear device info */ RtlZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); @@ -61,19 +62,12 @@ } printf("WDMAUD: Num Devices %lu\n", DeviceInfo.DeviceCount); + if (!DeviceInfo.DeviceCount) { CloseHandle(hWdmAud); return 0; } - - DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); - DeviceInfo.u.WaveFormatEx.wFormatTag = 0x1; //WAVE_FORMAT_PCM; - DeviceInfo.u.WaveFormatEx.nChannels = 2; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 48000; - DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 48000 * 4; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; Status = DeviceIoControl(hWdmAud, IOCTL_GETCAPABILITIES, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); @@ -84,6 +78,16 @@ printf("Failed to get iocaps %lx\n", GetLastError()); } } + printf("WDMAUD: Capabilites NumChannels %x dwFormats %lx\n", DeviceInfo.u.WaveOutCaps.wChannels, DeviceInfo.u.WaveOutCaps.dwFormats); + + DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); + DeviceInfo.u.WaveFormatEx.wFormatTag = WAVE_FORMAT_PCM; + DeviceInfo.u.WaveFormatEx.nChannels = 2; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 48000; + DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 48000 * 4; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; + Status = DeviceIoControl(hWdmAud, IOCTL_OPEN_WDMAUD, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); @@ -97,8 +101,7 @@ } } - - + printf("WDMAUD: opened device\n"); // // Allocate a buffer for 1 second @@ -163,8 +166,8 @@ } } printf("WDMAUD: STOPPED\n"); + CloseHandle(&Overlapped.hEvent); CloseHandle(hWdmAud); - CloseHandle(&Overlapped.hEvent); printf("WDMAUD: COMPLETE\n"); return 0; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -225,6 +225,7 @@ RtlFreeUnicodeString(&GuidString); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -371,13 +371,14 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { + NTSTATUS Status = STATUS_UNSUCCESSFUL; KSP_PIN PinProperty; KSCOMPONENTID ComponentId; KSMULTIPLE_ITEM * MultipleItem; ULONG BytesReturned; PKSDATARANGE_AUDIO DataRangeAudio; PKSDATARANGE DataRange; - NTSTATUS Status; + ULONG Index; ULONG wChannels = 0; ULONG dwFormats = 0; @@ -419,8 +420,6 @@ { return SetIrpIoStatus(Irp, Status, 0); } - - MultipleItem = ExAllocatePool(NonPagedPool, BytesReturned); if (!MultipleItem) @@ -479,6 +478,31 @@ NTSTATUS NTAPI +WdmAudClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + ULONG Index; + + for(Index = 0; Index < ClientInfo->NumPins; Index++) + { + if (ClientInfo->hPins[Index] == DeviceInfo->hDevice) + { + DPRINT1("Closing device %p\n", DeviceInfo->hDevice); + ZwClose(DeviceInfo->hDevice); + ClientInfo->hPins[Index] = NULL; + SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + return STATUS_SUCCESS; + } + } + SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, sizeof(WDMAUD_DEVICE_INFO)); + return STATUS_INVALID_PARAMETER; +} + +NTSTATUS +NTAPI WdmAudDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -530,6 +554,7 @@ case IOCTL_GETCAPABILITIES: return WdmAudCapabilities(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_CLOSE_WDMAUD: + return WdmAudClose(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_GETDEVID: case IOCTL_GETVOLUME: case IOCTL_SETVOLUME: Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -203,7 +203,12 @@ if (pClient) { for (Index = 0; Index < pClient->NumPins; Index++) - ZwClose(pClient->hPins[Index]); + { + if (pClient->hPins[Index]) + { + ZwClose(pClient->hPins[Index]); + } + } if (pClient->hPins) { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -8,7 +8,7 @@ #define YDEBUG #include <debug.h> #include <ksmedia.h> -#include <mmsystem.h> +#include <mmsystem.h> #include "interface.h" 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] Wed Feb 25 18:55:21 2009 @@ -58,8 +58,7 @@ IN ULONG DeviceNumber, PSYSAUDIODEVEXT DeviceExtension) { - PULONG Index; - PHANDLE Handle; + PSYSAUDIO_CLIENT_HANDELS Index; ULONG Count; PSYSAUDIO_CLIENT ClientInfo; PKSAUDIO_DEVICE_ENTRY Entry; @@ -85,23 +84,17 @@ if (!ClientInfo->NumDevices) { /* first device to be openend */ - ClientInfo->Devices = ExAllocatePool(NonPagedPool, sizeof(ULONG)); - if (!ClientInfo->Devices) + ClientInfo->Devs = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_CLIENT_HANDELS)); + if (!ClientInfo->Devs) { /* no memory */ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - ClientInfo->Handels = ExAllocatePool(NonPagedPool, sizeof(HANDLE)); - if (!ClientInfo->Devices) - { - /* no memory */ - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - ClientInfo->NumDevices = 1; - ClientInfo->Devices[0] = DeviceNumber; - ClientInfo->Handels[0] = NULL; + ClientInfo->Devs[0].DeviceId = DeviceNumber; + ClientInfo->Devs[0].ClientHandles = NULL; + ClientInfo->Devs[0].ClientHandlesCount = 0; /* increase usage count */ Entry->NumberOfClients++; return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); @@ -110,46 +103,37 @@ /* check if device has already been openend */ for(Count = 0; Count < ClientInfo->NumDevices; Count++) { - if (ClientInfo->Devices[Count] == DeviceNumber) + if (ClientInfo->Devs[Count].DeviceId == DeviceNumber) { /* device has already been opened */ return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); } } /* new device to be openend */ - Index = ExAllocatePool(NonPagedPool, sizeof(ULONG) * (ClientInfo->NumDevices + 1)); + Index = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_CLIENT_HANDELS) * (ClientInfo->NumDevices + 1)); if (!Index) { /* no memory */ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - Handle = ExAllocatePool(NonPagedPool, sizeof(HANDLE) * (ClientInfo->NumDevices + 1)); - if (!Handle) - { - /* no memory */ - ExFreePool(Index); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } + if (ClientInfo->NumDevices) + { + /* copy device count array */ + RtlMoveMemory(Index, ClientInfo->Devs, ClientInfo->NumDevices * sizeof(SYSAUDIO_CLIENT_HANDELS)); + } + + Index[ClientInfo->NumDevices].DeviceId = DeviceNumber; + Index[ClientInfo->NumDevices].ClientHandlesCount = 0; + Index[ClientInfo->NumDevices].ClientHandles = NULL; /* increase usage count */ Entry->NumberOfClients++; - /* copy device count array */ - if (ClientInfo->NumDevices) - { - RtlMoveMemory(Index, ClientInfo->Devices, ClientInfo->NumDevices * sizeof(ULONG)); - RtlMoveMemory(Handle, ClientInfo->Handels, ClientInfo->NumDevices * sizeof(HANDLE)); - } - - Index[ClientInfo->NumDevices] = DeviceNumber; - Handle[ClientInfo->NumDevices] = NULL; - ExFreePool(ClientInfo->Handels); - ExFreePool(ClientInfo->Devices); + ExFreePool(ClientInfo->Devs); + + ClientInfo->Devs = Index; ClientInfo->NumDevices++; - ClientInfo->Devices = Index; - ClientInfo->Handels = Handle; - return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); } @@ -160,9 +144,12 @@ IN PVOID Context) { NTSTATUS Status; - HANDLE PinHandle; + PSYSAUDIO_CLIENT AudioClient; + HANDLE RealPinHandle, VirtualPinHandle; HANDLE Filter; + ULONG NumHandels; PFILE_OBJECT FileObject; + PSYSAUDIO_PIN_HANDLE ClientPinHandle; PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; Filter = WorkerContext->PinConnect->PinToHandle; @@ -172,7 +159,7 @@ if (WorkerContext->CreateRealPin) { /* create the real pin */ - Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); + Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Pin with %x\n", Status); @@ -182,13 +169,18 @@ } /* get pin file object */ - Status = ObReferenceObjectByHandle(PinHandle, + Status = ObReferenceObjectByHandle(RealPinHandle, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = PinHandle; + if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount == 1) + { + /* store the pin handle there is the pin can only be instantiated once*/ + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = RealPinHandle; + } + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 1; - WorkerContext->DispatchContext->Handle = PinHandle; + WorkerContext->DispatchContext->Handle = RealPinHandle; WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; @@ -204,7 +196,7 @@ WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; /* get pin file object */ - Status = ObReferenceObjectByHandle(PinHandle, + Status = ObReferenceObjectByHandle(WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); @@ -220,7 +212,7 @@ DPRINT1("creating virtual pin\n"); /* now create the virtual audio pin which is exposed to wdmaud */ - Status = KsCreatePin(Filter, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); + Status = KsCreatePin(Filter, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &VirtualPinHandle); if (!NT_SUCCESS(Status)) { @@ -237,7 +229,7 @@ } /* get pin file object */ - Status = ObReferenceObjectByHandle(PinHandle, + Status = ObReferenceObjectByHandle(VirtualPinHandle, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); @@ -250,7 +242,7 @@ WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; } - ZwClose(PinHandle); + ZwClose(VirtualPinHandle); SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); ExFreePool(WorkerContext); return; @@ -261,19 +253,59 @@ ASSERT(WorkerContext->DispatchContext->FileObject != NULL); ASSERT(WorkerContext->DispatchContext->Handle != NULL); ASSERT(WorkerContext->AudioClient); - ASSERT(WorkerContext->AudioClient->Handels); - ASSERT(WorkerContext->AudioClient->Handels[WorkerContext->AudioClient->NumDevices -1] == NULL); + ASSERT(WorkerContext->AudioClient->NumDevices > 0); + ASSERT(WorkerContext->AudioClient->Devs != NULL); + ASSERT(WorkerContext->Entry->Pins != NULL); + ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); + + + AudioClient = WorkerContext->AudioClient; + NumHandels = AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount; + + ClientPinHandle = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_PIN_HANDLE) * (NumHandels+1)); + if (ClientPinHandle) + { + if (NumHandels) + { + ASSERT(AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles != NULL); + RtlMoveMemory(ClientPinHandle, + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles, + sizeof(SYSAUDIO_PIN_HANDLE) * NumHandels); + ExFreePool(AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles); + } + + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles = ClientPinHandle; + + /// if the pin can be instantiated more than once + /// then store the real pin handle in the client context + /// otherwise just the pin id of the available pin + if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount > 1) + { + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].bHandle = TRUE; + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hPin = RealPinHandle; + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].PinId = WorkerContext->PinConnect->PinId; + } + else + { + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].bHandle = FALSE; + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hPin = NULL; + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].PinId = WorkerContext->PinConnect->PinId; + } + + /// increase reference count + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References++; + AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount++; + } + /* store pin context */ FileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; - /* store pin handle in client specific struct */ - WorkerContext->AudioClient->Handels[WorkerContext->AudioClient->NumDevices-1] = PinHandle; - - DPRINT1("Successfully created Pin %p\n", WorkerContext->Irp); - *((PHANDLE)WorkerContext->Irp->UserBuffer) = PinHandle; + DPRINT1("Successfully created virtual pin %p\n", VirtualPinHandle); + *((PHANDLE)WorkerContext->Irp->UserBuffer) = VirtualPinHandle; SetIrpIoStatus(WorkerContext->Irp, STATUS_SUCCESS, sizeof(HANDLE)); + ExFreePool(WorkerContext); } @@ -425,7 +457,7 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } /* store last opened device number */ - *Index = ClientInfo->Devices[ClientInfo->NumDevices-1]; + *Index = ClientInfo->Devs[ClientInfo->NumDevices-1].DeviceId; /* found no device with that device index open */ return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(ULONG)); } @@ -458,7 +490,7 @@ } for(Count = 0; Count < ClientInfo->NumDevices; Count++) { - if (ClientInfo->Devices[Count] == InstanceInfo->DeviceNumber) + if (ClientInfo->Devs[Count].DeviceId == InstanceInfo->DeviceNumber) { /* specified device is open */ return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); @@ -493,8 +525,8 @@ ClientInfo = (PSYSAUDIO_CLIENT)CreateItem->Context; ASSERT(ClientInfo); ASSERT(ClientInfo->NumDevices >= 1); - ASSERT(ClientInfo->Devices != NULL); - ASSERT(ClientInfo->Devices[ClientInfo->NumDevices-1] == InstanceInfo->DeviceNumber); + ASSERT(ClientInfo->Devs != NULL); + ASSERT(ClientInfo->Devs[ClientInfo->NumDevices-1].DeviceId == InstanceInfo->DeviceNumber); /* get sysaudio entry */ Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, InstanceInfo->DeviceNumber); @@ -541,14 +573,14 @@ PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; - //RtlZeroMemory(&PinInstances, sizeof(KSPIN_CINSTANCES)); Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); if (!NT_SUCCESS(Status)) { DPRINT("Property Request KSPROPERTY_PIN_GLOBALCINSTANCES failed with %x\n", Status); return SetIrpIoStatus(Irp, Status, 0); } - DPRINT1("PinInstances Current %u Max %u\n", PinInstances.CurrentCount, PinInstances.PossibleCount); + DPRINT("PinInstances Current %u Max %u\n", PinInstances.CurrentCount, PinInstances.PossibleCount); + Entry->Pins[PinConnect->PinId].MaxPinInstanceCount = PinInstances.PossibleCount; WorkItem = IoAllocateWorkItem(DeviceObject); if (!WorkItem) @@ -588,10 +620,10 @@ DbgBreakPoint(); ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); - if (Entry->Pins[PinConnect->PinId].References != 0) + if (Entry->Pins[PinConnect->PinId].References > 1) { /* FIXME need ksmixer */ - DPRINT1("Device %u Pin %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId); + DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); IoFreeWorkItem(WorkItem); ExFreePool(WorkerContext); ExFreePool(DispatchContext); 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] Wed Feb 25 18:55:21 2009 @@ -91,30 +91,48 @@ PIRP Irp) { PSYSAUDIO_CLIENT Client; + PKSAUDIO_DEVICE_ENTRY Entry; PIO_STACK_LOCATION IoStatus; - ULONG Index; - - - DPRINT1("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + ULONG Index, SubIndex; + PSYSAUDIODEVEXT DeviceExtension; IoStatus = IoGetCurrentIrpStackLocation(Irp); Client = (PSYSAUDIO_CLIENT)IoStatus->FileObject->FsContext2; + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; + DPRINT1("Client %p NumDevices %u\n", Client, Client->NumDevices); for(Index = 0; Index < Client->NumDevices; Index++) { - if (Client->Handels[Index]) + if (Client->Devs[Index].ClientHandlesCount) { - ZwClose(Client->Handels[Index]); + Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, Client->Devs[Index].DeviceId); + ASSERT(Entry != NULL); + + for(SubIndex = 0; SubIndex < Client->Devs[Index].ClientHandlesCount; SubIndex++) + { + ASSERT(Entry->NumberOfPins > Client->Devs[Index].ClientHandles[SubIndex].PinId); + if (Client->Devs[Index].ClientHandles[SubIndex].bHandle) + { + DPRINT1("Closing handle %p\n", Client->Devs[Index].ClientHandles[SubIndex].hPin); + + ZwClose(Client->Devs[Index].ClientHandles[SubIndex].hPin); + Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References--; + } + else + { + /* this is pin which can only be instantiated once + * so we just need to release the reference count on that pin */ + Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References--; + } + } + ExFreePool(Client->Devs[Index].ClientHandles); } } - if (Client->Handels) - ExFreePool(Client->Handels); - - if (Client->Devices) - ExFreePool(Client->Devices); + if (Client->Devs) + ExFreePool(Client->Devs); ExFreePool(Client); @@ -250,7 +268,8 @@ if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) { Status = CreateDispatcher(Irp); - DPRINT1("Virtual pin Status %x\n", Status); + DPRINT1("Virtual pin Status %x FileObject %p\n", Status, IoStatus->FileObject); +DbgBreakPoint(); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Wed Feb 25 18:55:21 2009 @@ -3,14 +3,30 @@ typedef struct { + BOOL bHandle; + ULONG PinId; + HANDLE hPin; +}SYSAUDIO_PIN_HANDLE, *PSYSAUDIO_PIN_HANDLE; + + +typedef struct +{ + ULONG DeviceId; + ULONG ClientHandlesCount; + PSYSAUDIO_PIN_HANDLE ClientHandles; + +}SYSAUDIO_CLIENT_HANDELS, *PSYSAUDIO_CLIENT_HANDELS; + +typedef struct +{ ULONG NumDevices; - PULONG Devices; - PHANDLE Handels; + PSYSAUDIO_CLIENT_HANDELS Devs; }SYSAUDIO_CLIENT, *PSYSAUDIO_CLIENT; typedef struct { + ULONG MaxPinInstanceCount; HANDLE PinHandle; ULONG References; }PIN_INFO;

1 0

[dchapyshev] 39752: - Fix build. Sorry
by dchapyshev＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: dchapyshev Date: Wed Feb 25 18:54:37 2009 New Revision: 39752 URL: http://svn.reactos.org/svn/reactos?rev=39752&view=rev Log: - Fix build. Sorry Added: trunk/reactos/include/ddk/winddiui.h (with props) Added: trunk/reactos/include/ddk/winddiui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddiui.h?rev… ============================================================================== --- trunk/reactos/include/ddk/winddiui.h (added) +++ trunk/reactos/include/ddk/winddiui.h [iso-8859-1] Wed Feb 25 18:54:37 2009 @@ -1,0 +1,50 @@ +/* + * Header for the Device Driver Interface - User Interface library + * + * Copyright 2007 Marcel Partap + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDDIUI_H +#define __WINE_WINDDIUI_H + +#include <ddk/compstui.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define DRIVER_EVENT_INITIALIZE 1 +#define DRIVER_EVENT_DELETE 2 + +#define PRINTER_EVENT_ADD_CONNECTION 1 +#define PRINTER_EVENT_DELETE_CONNECTION 2 +#define PRINTER_EVENT_INITIALIZE 3 +#define PRINTER_EVENT_DELETE 4 +#define PRINTER_EVENT_CACHE_REFRESH 5 +#define PRINTER_EVENT_CACHE_DELETE 6 +#define PRINTER_EVENT_ATTRIBUTES_CHANGED 7 + +#define PRINTER_EVENT_FLAG_NO_UI 1 + +BOOL WINAPI DrvDriverEvent(DWORD, DWORD, LPBYTE, LPARAM); +BOOL WINAPI DrvPrinterEvent(LPWSTR, INT, DWORD, LPARAM); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WINE_WINDDIUI_H */ Propchange: trunk/reactos/include/ddk/winddiui.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 39751: - Add inseng, localspl, wuapi from Wine
by dchapyshev＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: dchapyshev Date: Wed Feb 25 18:26:49 2009 New Revision: 39751 URL: http://svn.reactos.org/svn/reactos?rev=39751&view=rev Log: - Add inseng, localspl, wuapi from Wine Added: trunk/reactos/dll/win32/inseng/ (with props) trunk/reactos/dll/win32/inseng/inseng.rbuild (with props) trunk/reactos/dll/win32/inseng/inseng.spec (with props) trunk/reactos/dll/win32/inseng/inseng_main.c (with props) trunk/reactos/dll/win32/inseng/regsvr.c (with props) trunk/reactos/dll/win32/localspl/ (with props) trunk/reactos/dll/win32/localspl/localmon.c (with props) trunk/reactos/dll/win32/localspl/localspl.rbuild (with props) trunk/reactos/dll/win32/localspl/localspl.rc (with props) trunk/reactos/dll/win32/localspl/localspl.spec (with props) trunk/reactos/dll/win32/localspl/localspl_main.c (with props) trunk/reactos/dll/win32/localspl/localspl_private.h (with props) trunk/reactos/dll/win32/localspl/provider.c (with props) trunk/reactos/dll/win32/localspl/spl_Da.rc (with props) trunk/reactos/dll/win32/localspl/spl_De.rc (with props) trunk/reactos/dll/win32/localspl/spl_En.rc (with props) trunk/reactos/dll/win32/localspl/spl_Fr.rc (with props) trunk/reactos/dll/win32/localspl/spl_Ko.rc (with props) trunk/reactos/dll/win32/localspl/spl_Nl.rc (with props) trunk/reactos/dll/win32/localspl/spl_No.rc (with props) trunk/reactos/dll/win32/localspl/spl_Pl.rc (with props) trunk/reactos/dll/win32/localspl/spl_Pt.rc (with props) trunk/reactos/dll/win32/localspl/spl_Ro.rc (with props) trunk/reactos/dll/win32/localspl/spl_Ru.rc (with props) trunk/reactos/dll/win32/localspl/spl_Si.rc (with props) trunk/reactos/dll/win32/localspl/spl_Sv.rc (with props) trunk/reactos/dll/win32/localspl/spl_Zh.rc (with props) trunk/reactos/dll/win32/wuapi/ (with props) trunk/reactos/dll/win32/wuapi/downloader.c (with props) trunk/reactos/dll/win32/wuapi/installer.c (with props) trunk/reactos/dll/win32/wuapi/main.c (with props) trunk/reactos/dll/win32/wuapi/regsvr.c (with props) trunk/reactos/dll/win32/wuapi/searcher.c (with props) trunk/reactos/dll/win32/wuapi/session.c (with props) trunk/reactos/dll/win32/wuapi/updates.c (with props) trunk/reactos/dll/win32/wuapi/wuapi.rbuild (with props) trunk/reactos/dll/win32/wuapi/wuapi.spec (with props) trunk/reactos/dll/win32/wuapi/wuapi_private.h (with props) trunk/reactos/include/psdk/wuapi.idl (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=397… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/inseng/inseng.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rb… Added: trunk/reactos/dll/win32/inseng/inseng.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.sp… Added: trunk/reactos/dll/win32/inseng/inseng_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_ma… Added: trunk/reactos/dll/win32/inseng/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/regsvr.c?… Added: trunk/reactos/dll/win32/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localmo… Added: trunk/reactos/dll/win32/localspl/localspl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/localspl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/localspl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Added: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… Added: trunk/reactos/dll/win32/localspl/spl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Da.… Added: trunk/reactos/dll/win32/localspl/spl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_De.… Added: trunk/reactos/dll/win32/localspl/spl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_En.… Added: trunk/reactos/dll/win32/localspl/spl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Fr.… Added: trunk/reactos/dll/win32/localspl/spl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ko.… Added: trunk/reactos/dll/win32/localspl/spl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Nl.… Added: trunk/reactos/dll/win32/localspl/spl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_No.… Added: trunk/reactos/dll/win32/localspl/spl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Pl.… Added: trunk/reactos/dll/win32/localspl/spl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Pt.… Added: trunk/reactos/dll/win32/localspl/spl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ro.… Added: trunk/reactos/dll/win32/localspl/spl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ru.… Added: trunk/reactos/dll/win32/localspl/spl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Si.… Added: trunk/reactos/dll/win32/localspl/spl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Sv.… Added: trunk/reactos/dll/win32/localspl/spl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Zh.… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Added: trunk/reactos/dll/win32/wuapi/downloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/downloader… Added: trunk/reactos/dll/win32/wuapi/installer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/installer.… Added: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… Added: trunk/reactos/dll/win32/wuapi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/regsvr.c?r… Added: trunk/reactos/dll/win32/wuapi/searcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/searcher.c… Added: trunk/reactos/dll/win32/wuapi/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/session.c?… Added: trunk/reactos/dll/win32/wuapi/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/updates.c?… Added: trunk/reactos/dll/win32/wuapi/wuapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi.rbui… Added: trunk/reactos/dll/win32/wuapi/wuapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi.spec… Added: trunk/reactos/dll/win32/wuapi/wuapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_priv… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Added: trunk/reactos/include/psdk/wuapi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wuapi.idl?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[dchapyshev] 39750: - Sync spoolss with Wine head
by dchapyshev＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: dchapyshev Date: Wed Feb 25 17:10:21 2009 New Revision: 39750 URL: http://svn.reactos.org/svn/reactos?rev=39750&view=rev Log: - Sync spoolss with Wine head Added: trunk/reactos/dll/win32/spoolss/router.c (with props) trunk/reactos/dll/win32/spoolss/spoolss.h (with props) Modified: trunk/reactos/dll/win32/spoolss/spoolss.rbuild trunk/reactos/dll/win32/spoolss/spoolss.spec trunk/reactos/dll/win32/spoolss/spoolss_main.c Added: trunk/reactos/dll/win32/spoolss/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/router.c… ============================================================================== --- trunk/reactos/dll/win32/spoolss/router.c (added) +++ trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] Wed Feb 25 17:10:21 2009 @@ -1,0 +1,401 @@ +/* + * Routing for Spooler-Service helper DLL + * + * Copyright 2006-2009 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" +#include "spoolss.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(spoolss); + +/* ################################ */ + +#define MAX_BACKEND 3 + +typedef struct { + /* PRINTPROVIDOR functions */ + DWORD (WINAPI *fpOpenPrinter)(LPWSTR, HANDLE *, LPPRINTER_DEFAULTSW); + DWORD (WINAPI *fpSetJob)(HANDLE, DWORD, DWORD, LPBYTE, DWORD); + DWORD (WINAPI *fpGetJob)(HANDLE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpEnumJobs)(HANDLE, DWORD, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + HANDLE (WINAPI *fpAddPrinter)(LPWSTR, DWORD, LPBYTE); + DWORD (WINAPI *fpDeletePrinter)(HANDLE); + DWORD (WINAPI *fpSetPrinter)(HANDLE, DWORD, LPBYTE, DWORD); + DWORD (WINAPI *fpGetPrinter)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpEnumPrinters)(DWORD, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpAddPrinterDriver)(LPWSTR, DWORD, LPBYTE); + DWORD (WINAPI *fpEnumPrinterDrivers)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpGetPrinterDriver)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpGetPrinterDriverDirectory)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpDeletePrinterDriver)(LPWSTR, LPWSTR, LPWSTR); + DWORD (WINAPI *fpAddPrintProcessor)(LPWSTR, LPWSTR, LPWSTR, LPWSTR); + DWORD (WINAPI *fpEnumPrintProcessors)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpGetPrintProcessorDirectory)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpDeletePrintProcessor)(LPWSTR, LPWSTR, LPWSTR); + DWORD (WINAPI *fpEnumPrintProcessorDatatypes)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpStartDocPrinter)(HANDLE, DWORD, LPBYTE); + DWORD (WINAPI *fpStartPagePrinter)(HANDLE); + DWORD (WINAPI *fpWritePrinter)(HANDLE, LPVOID, DWORD, LPDWORD); + DWORD (WINAPI *fpEndPagePrinter)(HANDLE); + DWORD (WINAPI *fpAbortPrinter)(HANDLE); + DWORD (WINAPI *fpReadPrinter)(HANDLE, LPVOID, DWORD, LPDWORD); + DWORD (WINAPI *fpEndDocPrinter)(HANDLE); + DWORD (WINAPI *fpAddJob)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpScheduleJob)(HANDLE, DWORD); + DWORD (WINAPI *fpGetPrinterData)(HANDLE, LPWSTR, LPDWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpSetPrinterData)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD); + DWORD (WINAPI *fpWaitForPrinterChange)(HANDLE, DWORD); + DWORD (WINAPI *fpClosePrinter)(HANDLE); + DWORD (WINAPI *fpAddForm)(HANDLE, DWORD, LPBYTE); + DWORD (WINAPI *fpDeleteForm)(HANDLE, LPWSTR); + DWORD (WINAPI *fpGetForm)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpSetForm)(HANDLE, LPWSTR, DWORD, LPBYTE); + DWORD (WINAPI *fpEnumForms)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpEnumMonitors)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpEnumPorts)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpAddPort)(LPWSTR, HWND, LPWSTR); + DWORD (WINAPI *fpConfigurePort)(LPWSTR, HWND, LPWSTR); + DWORD (WINAPI *fpDeletePort)(LPWSTR, HWND, LPWSTR); + HANDLE (WINAPI *fpCreatePrinterIC)(HANDLE, LPDEVMODEW); + DWORD (WINAPI *fpPlayGdiScriptOnPrinterIC)(HANDLE, LPBYTE, DWORD, LPBYTE, DWORD, DWORD); + DWORD (WINAPI *fpDeletePrinterIC)(HANDLE); + DWORD (WINAPI *fpAddPrinterConnection)(LPWSTR); + DWORD (WINAPI *fpDeletePrinterConnection)(LPWSTR); + DWORD (WINAPI *fpPrinterMessageBox)(HANDLE, DWORD, HWND, LPWSTR, LPWSTR, DWORD); + DWORD (WINAPI *fpAddMonitor)(LPWSTR, DWORD, LPBYTE); + DWORD (WINAPI *fpDeleteMonitor)(LPWSTR, LPWSTR, LPWSTR); + DWORD (WINAPI *fpResetPrinter)(HANDLE, LPPRINTER_DEFAULTSW); + DWORD (WINAPI *fpGetPrinterDriverEx)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, DWORD, DWORD, PDWORD, PDWORD); + HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE, DWORD, DWORD, LPVOID); + DWORD (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE); + DWORD (WINAPI *fpAddPortEx)(HANDLE, LPWSTR, DWORD, LPBYTE, LPWSTR); + DWORD (WINAPI *fpShutDown)(LPVOID); + DWORD (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE, DWORD, PVOID, PVOID); + DWORD (WINAPI *fpOpenPrinterEx)(LPWSTR, LPHANDLE, LPPRINTER_DEFAULTSW, LPBYTE, DWORD); + HANDLE (WINAPI *fpAddPrinterEx)(LPWSTR, DWORD, LPBYTE, LPBYTE, DWORD); + DWORD (WINAPI *fpSetPort)(LPWSTR, LPWSTR, DWORD, LPBYTE); + DWORD (WINAPI *fpEnumPrinterData)(HANDLE, DWORD, LPWSTR, DWORD, LPDWORD, LPDWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpDeletePrinterData)(HANDLE, LPWSTR); + DWORD (WINAPI *fpClusterSplOpen)(LPCWSTR, LPCWSTR, PHANDLE, LPCWSTR, LPCWSTR); + DWORD (WINAPI *fpClusterSplClose)(HANDLE); + DWORD (WINAPI *fpClusterSplIsAlive)(HANDLE); + DWORD (WINAPI *fpSetPrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR, DWORD, LPBYTE, DWORD); + DWORD (WINAPI *fpGetPrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR, LPDWORD, LPBYTE, DWORD, LPDWORD); + DWORD (WINAPI *fpEnumPrinterDataEx)(HANDLE, LPCWSTR, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpEnumPrinterKey)(HANDLE, LPCWSTR, LPWSTR, DWORD, LPDWORD); + DWORD (WINAPI *fpDeletePrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR); + DWORD (WINAPI *fpDeletePrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName); + DWORD (WINAPI *fpSeekPrinter)(HANDLE, LARGE_INTEGER, PLARGE_INTEGER, DWORD, BOOL); + DWORD (WINAPI *fpDeletePrinterDriverEx)(LPWSTR, LPWSTR, LPWSTR, DWORD, DWORD); + DWORD (WINAPI *fpAddPerMachineConnection)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); + DWORD (WINAPI *fpDeletePerMachineConnection)(LPCWSTR, LPCWSTR); + DWORD (WINAPI *fpEnumPerMachineConnections)(LPCWSTR, LPBYTE, DWORD, LPDWORD, LPDWORD); + DWORD (WINAPI *fpXcvData)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); + DWORD (WINAPI *fpAddPrinterDriverEx)(LPWSTR, DWORD, LPBYTE, DWORD); + DWORD (WINAPI *fpSplReadPrinter)(HANDLE, LPBYTE *, DWORD); + DWORD (WINAPI *fpDriverUnloadComplete)(LPWSTR); + DWORD (WINAPI *fpGetSpoolFileInfo)(HANDLE, LPWSTR *, LPHANDLE, HANDLE, HANDLE); + DWORD (WINAPI *fpCommitSpoolData)(HANDLE, DWORD); + DWORD (WINAPI *fpCloseSpoolFileHandle)(HANDLE); + DWORD (WINAPI *fpFlushPrinter)(HANDLE, LPBYTE, DWORD, LPDWORD, DWORD); + DWORD (WINAPI *fpSendRecvBidiData)(HANDLE, LPCWSTR, LPBIDI_REQUEST_CONTAINER, LPBIDI_RESPONSE_CONTAINER *); + DWORD (WINAPI *fpAddDriverCatalog)(HANDLE, DWORD, VOID *, DWORD); + /* Private Data */ + HMODULE dll; + LPWSTR dllname; + LPWSTR name; + LPWSTR regroot; + DWORD index; +} backend_t; + +/* ################################ */ + +static backend_t *backend[MAX_BACKEND]; +static DWORD used_backends = 0; + +static CRITICAL_SECTION backend_cs; +static CRITICAL_SECTION_DEBUG backend_cs_debug = +{ + 0, 0, &backend_cs, + { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } +}; +static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; + +/* ################################ */ + +static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; + +/****************************************************************** + * strdupW [internal] + * + * create a copy of a unicode-string + * + */ + +static LPWSTR strdupW(LPCWSTR p) +{ + LPWSTR ret; + DWORD len; + + if(!p) return NULL; + len = (lstrlenW(p) + 1) * sizeof(WCHAR); + ret = heap_alloc(len); + memcpy(ret, p, len); + return ret; +} + +/****************************************************************** + * backend_unload_all [internal] + * + * unload all backends + */ +void backend_unload_all(void) +{ + EnterCriticalSection(&backend_cs); + while (used_backends > 0) { + used_backends--; + FreeLibrary(backend[used_backends]->dll); + heap_free(backend[used_backends]->dllname); + heap_free(backend[used_backends]->name); + heap_free(backend[used_backends]->regroot); + heap_free(backend[used_backends]); + backend[used_backends] = NULL; + } + LeaveCriticalSection(&backend_cs); +} + +/****************************************************************************** + * backend_load [internal] + * + * load and init a backend + * + * PARAMS + * name [I] Printprovider to use for the backend. NULL for the local print provider + * + * RETURNS + * Success: PTR to the backend + * Failure: NULL + * + */ +static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) +{ + + BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + DWORD id; + DWORD res; + + TRACE("(%s, %s, %s)\n", debugstr_w(dllname), debugstr_w(name), debugstr_w(regroot)); + + EnterCriticalSection(&backend_cs); + id = used_backends; + + backend[id] = heap_alloc_zero(sizeof(backend_t)); + if (!backend[id]) { + LeaveCriticalSection(&backend_cs); + return NULL; + } + + backend[id]->dllname = strdupW(dllname); + backend[id]->name = strdupW(name); + backend[id]->regroot = strdupW(regroot); + + backend[id]->dll = LoadLibraryW(dllname); + if (backend[id]->dll) { + pInitializePrintProvidor = (void *) GetProcAddress(backend[id]->dll, "InitializePrintProvidor"); + if (pInitializePrintProvidor) { + + /* native localspl does not clear unused entries */ + res = pInitializePrintProvidor((PRINTPROVIDOR *) backend[id], sizeof(PRINTPROVIDOR), regroot); + if (res) { + used_backends++; + backend[id]->index = used_backends; + LeaveCriticalSection(&backend_cs); + TRACE("--> backend #%d: %p (%s)\n", id, backend[id], debugstr_w(dllname)); + return backend[id]; + } + } + FreeLibrary(backend[id]->dll); + } + heap_free(backend[id]->dllname); + heap_free(backend[id]->name); + heap_free(backend[id]->regroot); + heap_free(backend[id]); + backend[id] = NULL; + LeaveCriticalSection(&backend_cs); + WARN("failed to init %s: %u\n", debugstr_w(dllname), GetLastError()); + return NULL; +} + +/****************************************************************************** + * backend_load_all [internal] + * + * load and init all backends + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL backend_load_all(void) +{ + static BOOL failed = FALSE; + backend_t * pb; + + EnterCriticalSection(&backend_cs); + + /* if we failed before, dont try again */ + if (!failed && (used_backends == 0)) { + pb = backend_load(localsplW, NULL, NULL); + + /* ToDo: parse the registry and load all other backends */ + + failed = (used_backends == 0); + } + LeaveCriticalSection(&backend_cs); + TRACE("-> %d\n", !failed); + return (!failed); +} + +/****************************************************************************** + * backend_first [internal] + * + * find the first usable backend + * + * RETURNS + * Success: PTR to the backend + * Failure: NULL + * + */ +static backend_t * backend_first(LPWSTR name) +{ + + EnterCriticalSection(&backend_cs); + /* Load all backends, when not done yet */ + if (used_backends || backend_load_all()) { + + /* test for the local system first */ + if (!name || !name[0]) { + LeaveCriticalSection(&backend_cs); + return backend[0]; + } + } + + FIXME("server %s not supported in %d backends\n", debugstr_w(name), used_backends); + LeaveCriticalSection(&backend_cs); + return NULL; +} + +/****************************************************************** + * EnumMonitorsW (spoolss.@) + * + * Enumerate available Port-Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pMonitors, if cbBuf is too small + * + */ +BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + cbBuf, pcbNeeded, pcReturned); + + if (pcbNeeded) *pcbNeeded = 0; + if (pcReturned) *pcReturned = 0; + + pb = backend_first(pName); + if (pb && pb->fpEnumMonitors) + res = pb->fpEnumMonitors(pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); + + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** + * EnumPortsW (spoolss.@) + * + * Enumerate available Ports + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1 or 2) + * pPorts [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pPorts + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPorts + * pcReturned [O] PTR to DWORD that receives the number of Ports in pPorts + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pPorts, if cbBuf is too small + * + */ +BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, + pcbNeeded, pcReturned); + + if (pcbNeeded) *pcbNeeded = 0; + if (pcReturned) *pcReturned = 0; + + pb = backend_first(pName); + if (pb && pb->fpEnumPorts) + res = pb->fpEnumPorts(pName, Level, pPorts, cbBuf, pcbNeeded, pcReturned); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u (%u byte for %u entries)\n", res, GetLastError(), + pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); + + return (res == ROUTER_SUCCESS); +} Propchange: trunk/reactos/dll/win32/spoolss/router.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/spoolss/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.h (added) +++ trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] Wed Feb 25 17:10:21 2009 @@ -1,0 +1,42 @@ +/* + * Copyright 2006-2009 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" + +/* ################################ */ + +BOOL backend_load_all(void); +void backend_unload_all(void); + +/* ## Memory allocation functions ## */ + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} Propchange: trunk/reactos/dll/win32/spoolss/spoolss.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/spoolss/spoolss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.rbuild [iso-8859-1] Wed Feb 25 17:10:21 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <file>spoolss_main.c</file> + <file>router.c</file> <library>wine</library> <library>winspool</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.spec [iso-8859-1] Wed Feb 25 17:10:21 2009 @@ -45,15 +45,9 @@ @ stub EndPagePrinter @ stub EnumFormsW @ stub EnumJobsW -@ stub EnumMonitorsW +@ stdcall EnumMonitorsW(wstr long ptr long ptr ptr) @ stub EnumPerMachineConnectionsW - -;FIXME: something is seriously broken here -; the forwarder will break the export table - -;@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW -@ stub EnumPortsW - +@ stdcall EnumPortsW(wstr long ptr long ptr ptr) @ stub EnumPrintProcessorDatatypesW @ stub EnumPrintProcessorsW @ stub EnumPrinterDataExW Modified: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Wed Feb 25 17:10:21 2009 @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winspool.h" #include "ddk/winsplp.h" +#include "spoolss.h" #include "wine/debug.h" @@ -35,90 +36,9 @@ /* ################################ */ -static CRITICAL_SECTION backend_cs; -static CRITICAL_SECTION_DEBUG backend_cs_debug = -{ - 0, 0, &backend_cs, - { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } -}; -static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; - -/* ################################ */ - static HMODULE hwinspool; -static HMODULE hlocalspl; -static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); - -static PRINTPROVIDOR * backend; - -/* ################################ */ - -static const WCHAR localspldllW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; + static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - -/****************************************************************************** - * backend_load [internal] - * - * load and init our backend (the local printprovider: "localspl.dll") - * - * PARAMS - * - * RETURNS - * Success: TRUE - * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE - * - * NOTES - * In windows, the spooler router (spoolss.dll) support multiple - * printprovider (localspl.dll for the local system) - * - */ -static BOOL backend_load(void) -{ - static PRINTPROVIDOR mybackend; - DWORD res; - - if (backend) return TRUE; - - EnterCriticalSection(&backend_cs); - hlocalspl = LoadLibraryW(localspldllW); - if (hlocalspl) { - pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor"); - if (pInitializePrintProvidor) { - - /* native localspl does not clear unused entries */ - memset(&mybackend, 0, sizeof(mybackend)); - res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL); - if (res) { - backend = &mybackend; - LeaveCriticalSection(&backend_cs); - TRACE("backend: %p (%p)\n", backend, hlocalspl); - return TRUE; - } - } - FreeLibrary(hlocalspl); - } - - LeaveCriticalSection(&backend_cs); - - WARN("failed to load the backend: %u\n", GetLastError()); - SetLastError(RPC_S_SERVER_UNAVAILABLE); - return FALSE; -} - -/****************************************************************** - * unload_backend [internal] - * - */ -static void backend_unload(void) -{ - EnterCriticalSection(&backend_cs); - if (backend) { - backend = NULL; - FreeLibrary(hlocalspl); - } - LeaveCriticalSection(&backend_cs); -} /****************************************************************************** * @@ -135,7 +55,7 @@ break; case DLL_PROCESS_DETACH: - backend_unload(); + backend_unload_all(); break; } } @@ -267,7 +187,7 @@ BOOL WINAPI InitializeRouter(void) { TRACE("()\n"); - return backend_load(); + return backend_load_all(); } /******************************************************************

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