Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 40836: Revert part of r40686 See issue #4471 for more details.
by hpoussin＠svn.reactos.org 08 May '09

08 May '09

Author: hpoussin Date: Fri May 8 14:29:31 2009 New Revision: 40836 URL: http://svn.reactos.org/svn/reactos?rev=40836&view=rev Log: Revert part of r40686 See issue #4471 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Fri May 8 14:29:31 2009 @@ -23,7 +23,6 @@ UiMenuKeyPressFilterCallback KeyPressFilter) { UI_MENU_INFO MenuInformation; - ULONG InitialClockSecond; ULONG LastClockSecond; ULONG CurrentClockSecond; ULONG KeyPress; @@ -60,7 +59,7 @@ // // Get the current second of time // - InitialClockSecond = LastClockSecond = ArcGetRelativeTime(); + LastClockSecond = ArcGetTime()->Second; // // Process keys @@ -88,12 +87,12 @@ // // Check if there is a countdown // - if (MenuInformation.MenuTimeRemaining != -1) - { - // - // Get the updated time - // - CurrentClockSecond = ArcGetRelativeTime(); + if (MenuInformation.MenuTimeRemaining) + { + // + // Get the updated time, seconds only + // + CurrentClockSecond = ArcGetTime()->Second; // // Check if more then a second has now elapsed @@ -104,10 +103,7 @@ // Update the time information // LastClockSecond = CurrentClockSecond; - MenuInformation.MenuTimeRemaining = - InitialClockSecond + MenuTimeOut - LastClockSecond; - if (MenuInformation.MenuTimeRemaining < 0) - MenuInformation.MenuTimeRemaining = 0; + MenuInformation.MenuTimeRemaining--; // // Update the menu @@ -116,7 +112,7 @@ VideoCopyOffScreenBufferToVRAM(); } } - else if (MenuInformation.MenuTimeRemaining == 0) + else { // // A time out occurred, exit this loop and return default OS

1 0

[janderwald] 40835: - Implement IPortMidi, IPortFilterDMus, IPortPinDMus - Implement reading / writing midi stream data using IMiniportMidiStream interface - Delete old IPortMidi implementation
by janderwald＠svn.reactos.org 08 May '09

08 May '09

Author: janderwald Date: Fri May 8 13:36:02 2009 New Revision: 40835 URL: http://svn.reactos.org/svn/reactos?rev=40835&view=rev Log: - Implement IPortMidi, IPortFilterDMus, IPortPinDMus - Implement reading / writing midi stream data using IMiniportMidiStream interface - Delete old IPortMidi implementation Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c (with props) Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.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_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c [iso-8859-1] Fri May 8 13:36:02 2009 @@ -1,0 +1,503 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/filter_dmus.c + * PURPOSE: portcls wave pci filter + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +typedef struct +{ + IPortFilterDMusVtbl *lpVtbl; + + LONG ref; + + IPortDMus* Port; + IPortPinDMus ** Pins; + SUBDEVICE_DESCRIPTOR * Descriptor; + +}IPortFilterDMusImpl; + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnQueryInterface( + IPortFilterDMus* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)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 +IPortFilterDMus_fnAddRef( + IPortFilterDMus* iface) +{ + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortFilterDMus_fnRelease( + IPortFilterDMus* iface) +{ + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnNewIrpTarget( + IN IPortFilterDMus* 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; + IPortPinDMus * Pin; + PKSPIN_CONNECT ConnectDetails; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl *)iface; + + ASSERT(This->Port); + ASSERT(This->Descriptor); + ASSERT(This->Pins); + + DPRINT("IPortFilterDMus_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); + } + + /* now create the pin */ + Status = NewPortPinDMus(&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], DeviceObject); + 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 +IPortFilterDMus_fnDeviceIoControl( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + ISubdevice *SubDevice = NULL; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl *)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 +IPortFilterDMus_fnRead( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnWrite( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnFlush( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnClose( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG Index; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl *)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 +IPortFilterDMus_fnQuerySecurity( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortFilterDMus_fnSetSecurity( + IN IPortFilterDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortFilterDMus_fnFastDeviceIoControl( + IN IPortFilterDMus* 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) +{ + ULONG Index; + PKSPROPERTY Property; + NTSTATUS Status; + ISubdevice * SubDevice = NULL; + PSUBDEVICE_DESCRIPTOR Descriptor = NULL; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl *)iface; + + Property = (PKSPROPERTY)InputBuffer; + + if (InputBufferLength < sizeof(KSPROPERTY)) + return FALSE; + + + /* get private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* get descriptor */ + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + if (!NT_SUCCESS(Status)) + { + SubDevice->lpVtbl->Release(SubDevice); + return FALSE; + } + + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + { + FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, + 1, + &Descriptor->FilterPropertySet.Properties[Index], + Descriptor, SubDevice); + } + } + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortFilterDMus_fnFastRead( + IN IPortFilterDMus* 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 FALSE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortFilterDMus_fnFastWrite( + IN IPortFilterDMus* 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 FALSE; +} + +/* + * @implemented + */ +static +NTSTATUS +NTAPI +IPortFilterDMus_fnInit( + IN IPortFilterDMus* iface, + IN IPortDMus* Port) +{ + ISubdevice * ISubDevice; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)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(IPortPinDMus*), TAG_PORTCLASS); + + if (!This->Pins) + return STATUS_UNSUCCESSFUL; + + /* increment reference count */ + Port->lpVtbl->AddRef(Port); + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +IPortFilterDMus_fnFreePin( + IN IPortFilterDMus* iface, + IN struct IPortPinDMus* Pin) +{ + ULONG Index; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index] == Pin) + { + This->Pins[Index]->lpVtbl->Release(This->Pins[Index]); + This->Pins[Index] = NULL; + return STATUS_SUCCESS; + } + } + return STATUS_UNSUCCESSFUL; +} + +static +VOID +NTAPI +IPortFilterDMus_fnNotifyPins( + IN IPortFilterDMus* iface) +{ + ULONG Index; + IPortFilterDMusImpl * This = (IPortFilterDMusImpl*)iface; + + DPRINT("Notifying %u pins\n", This->Descriptor->Factory.PinDescriptorCount); + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + This->Pins[Index]->lpVtbl->Notify(This->Pins[Index]); + } +} + +static IPortFilterDMusVtbl vt_IPortFilterDMus = +{ + IPortFilterDMus_fnQueryInterface, + IPortFilterDMus_fnAddRef, + IPortFilterDMus_fnRelease, + IPortFilterDMus_fnNewIrpTarget, + IPortFilterDMus_fnDeviceIoControl, + IPortFilterDMus_fnRead, + IPortFilterDMus_fnWrite, + IPortFilterDMus_fnFlush, + IPortFilterDMus_fnClose, + IPortFilterDMus_fnQuerySecurity, + IPortFilterDMus_fnSetSecurity, + IPortFilterDMus_fnFastDeviceIoControl, + IPortFilterDMus_fnFastRead, + IPortFilterDMus_fnFastWrite, + IPortFilterDMus_fnInit, + IPortFilterDMus_fnFreePin, + IPortFilterDMus_fnNotifyPins +}; + +NTSTATUS +NewPortFilterDMus( + OUT PPORTFILTERDMUS * OutFilter) +{ + IPortFilterDMusImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortFilterDMusImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize IPortFilterDMus */ + This->ref = 1; + This->lpVtbl = &vt_IPortFilterDMus; + + /* return result */ + *OutFilter = (IPortFilterDMus*)&This->lpVtbl; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Fri May 8 13:36:02 2009 @@ -13,10 +13,14 @@ const GUID CLSID_PortMidi = {0xb4c90a43L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortWaveCyclic = {0xb4c90a2aL, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortWavePci = {0xb4c90a54L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; -const GUID CLSID_PortDMus; -const GUID IID_IMiniportDMus; +const GUID CLSID_PortDMus = {0xb7902fe9L, 0xfb0a, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; +const GUID IID_IMiniportDMus = {0xc096df9dL, 0xfb09, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; const GUID IID_IMiniportTopology = {0xb4c90a31L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; + + const GUID IID_IPortTopology = {0xb4c90a30L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_MiniportDriverDMusUART; @@ -32,8 +36,7 @@ const GUID IID_IPortWavePci = {0xb4c90a50L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IPortWavePciStream = {0xb4c90a51L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IPortMidi = {0xb4c90a40L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; -const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; -const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IPortDMus = {0xc096df9cL, 0xfb09, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; const GUID IID_IAdapterPowerManagement = {0x793417D0L, 0x35FE, 0x11D1, {0xAD, 0x08, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0xB0}}; const GUID IID_IMiniportWaveCyclic = {0xb4c90a27L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; 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] Fri May 8 13:36:02 2009 @@ -497,7 +497,7 @@ typedef IPortFilterWaveRT *PPORTFILTERWAVERT; /***************************************************************************** - * IPortPinWavePci + * IPortPinWaveRT ***************************************************************************** */ @@ -570,6 +570,59 @@ }; /***************************************************************************** + * IPortFilterDMus + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IPortFilterDMus + +struct IPortPinDMus; + +DECLARE_INTERFACE_(IPortFilterDMus, IIrpTarget) +{ + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IRPTARGET() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PPORTDMUS Port)PURE; + + STDMETHOD_(NTSTATUS, FreePin)(THIS_ + IN struct IPortPinDMus* Pin)PURE; + + STDMETHOD_(VOID, NotifyPins)(THIS); +}; + +typedef IPortFilterDMus *PPORTFILTERDMUS; + +/***************************************************************************** + * IPortPinDMus + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IPortPinDMus + +DECLARE_INTERFACE_(IPortPinDMus, IIrpTarget) +{ + DEFINE_ABSTRACT_UNKNOWN() + + DEFINE_ABSTRACT_IRPTARGET() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PPORTDMUS Port, + IN PPORTFILTERDMUS Filter, + IN KSPIN_CONNECT * ConnectDetails, + IN KSPIN_DESCRIPTOR * PinDescriptor, + IN PDEVICE_OBJECT DeviceObject) PURE; + + STDMETHOD_(VOID, Notify)(THIS); +}; + +typedef IPortPinDMus *PPORTPINDMUS; + +/***************************************************************************** * IDmaChannelInit ***************************************************************************** */ Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Fri May 8 13:36:02 2009 @@ -1,0 +1,844 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/pin_dmus.c + * PURPOSE: DMus IRP Audio Pin + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +#include "private.h" + +typedef struct +{ + IPortPinDMusVtbl *lpVtbl; + IServiceSinkVtbl *lpVtblServiceSink; + + LONG ref; + IPortDMus * Port; + IPortFilterDMus * Filter; + KSPIN_DESCRIPTOR * KsPinDescriptor; + PMINIPORTDMUS Miniport; + + PSERVICEGROUP ServiceGroup; + + PMINIPORTMIDI MidiMiniport; + PMINIPORTMIDISTREAM MidiStream; + + + KSSTATE State; + PKSDATAFORMAT Format; + KSPIN_CONNECT * ConnectDetails; + + BOOL Capture; + PDEVICE_OBJECT DeviceObject; + IIrpQueue * IrpQueue; + + ULONG TotalPackets; + ULONG PreCompleted; + ULONG PostCompleted; + +}IPortPinDMusImpl; + + +typedef struct +{ + IPortPinDMusImpl *Pin; + PIO_WORKITEM WorkItem; + KSSTATE State; +}SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; + +NTSTATUS +NTAPI +IPortDMus_fnProcessNewIrp( + IPortPinDMusImpl * This); + +//================================================================================================================================== + +static +NTSTATUS +NTAPI +IServiceSink_fnQueryInterface( + IServiceSink* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)CONTAINING_RECORD(iface, IPortPinDMusImpl, lpVtblServiceSink); + + DPRINT("IServiceSink_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IServiceSink) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblServiceSink; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IServiceSink_fnAddRef( + IServiceSink* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)CONTAINING_RECORD(iface, IPortPinDMusImpl, lpVtblServiceSink); + DPRINT("IServiceSink_fnAddRef entered\n"); + + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IServiceSink_fnRelease( + IServiceSink* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)CONTAINING_RECORD(iface, IPortPinDMusImpl, lpVtblServiceSink); + + InterlockedDecrement(&This->ref); + + DPRINT("IServiceSink_fnRelease entered %u\n", This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} +static +VOID +NTAPI +SetStreamWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + IPortPinDMusImpl * This; + PSETSTREAM_CONTEXT Ctx = (PSETSTREAM_CONTEXT)Context; + KSSTATE State; + + This = Ctx->Pin; + State = Ctx->State; + + IoFreeWorkItem(Ctx->WorkItem); + FreeItem(Ctx, TAG_PORTCLASS); + + /* Has the audio stream resumed? */ + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) && State == KSSTATE_STOP) + return; + + /* Set the state */ + if (NT_SUCCESS(This->MidiStream->lpVtbl->SetState(This->MidiStream, State))) + { + /* Set internal state to stop */ + This->State = State; + + if (This->State == KSSTATE_STOP) + { + /* reset start stream */ + This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); //FIX function name + DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->PreCompleted, This->PostCompleted); + } + } +} +static +VOID +NTAPI +SetStreamState( + IN IPortPinDMusImpl * This, + IN KSSTATE State) +{ + PIO_WORKITEM WorkItem; + PSETSTREAM_CONTEXT Context; + + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + + /* Has the audio stream resumed? */ + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) && State == KSSTATE_STOP) + return; + + /* Has the audio state already been set? */ + if (This->State == State) + return; + + /* allocate set state context */ + Context = AllocateItem(NonPagedPool, sizeof(SETSTREAM_CONTEXT), TAG_PORTCLASS); + + if (!Context) + return; + + /* allocate work item */ + WorkItem = IoAllocateWorkItem(This->DeviceObject); + + if (!WorkItem) + { + ExFreePool(Context); + return; + } + + Context->Pin = (PVOID)This; + Context->WorkItem = WorkItem; + Context->State = State; + + /* queue the work item */ + IoQueueWorkItem(WorkItem, SetStreamWorkerRoutine, DelayedWorkQueue, (PVOID)Context); +} + +VOID +TransferMidiData( + IPortPinDMusImpl * This) +{ + NTSTATUS Status; + PUCHAR Buffer; + ULONG BufferSize; + ULONG BytesWritten; + + do + { + Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); + if (!NT_SUCCESS(Status)) + { + SetStreamState(This, KSSTATE_STOP); + return; + } + + if (This->Capture) + { + Status = This->MidiStream->lpVtbl->Read(This->MidiStream, Buffer, BufferSize, &BytesWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT("Read failed with %x\n", Status); + return; + } + } + else + { + Status = This->MidiStream->lpVtbl->Write(This->MidiStream, Buffer, BufferSize, &BytesWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT("Write failed with %x\n", Status); + return; + } + } + + if (!BytesWritten) + { + DPRINT("Device is busy retry later\n"); + return; + } + + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesWritten); + + }while(TRUE); + +} + +static +VOID +NTAPI +IServiceSink_fnRequestService( + IServiceSink* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)CONTAINING_RECORD(iface, IPortPinDMusImpl, lpVtblServiceSink); + + ASSERT_IRQL(DISPATCH_LEVEL); + + if (This->MidiStream) + { + TransferMidiData(This); + } + + +} + +static IServiceSinkVtbl vt_IServiceSink = +{ + IServiceSink_fnQueryInterface, + IServiceSink_fnAddRef, + IServiceSink_fnRelease, + IServiceSink_fnRequestService +}; + +//================================================================================================================================== +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnQueryInterface( + IPortPinDMus* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinDMus_fnAddRef( + IPortPinDMus* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinDMus_fnRelease( + IPortPinDMus* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnNewIrpTarget( + IN IPortPinDMus* 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) +{ + UNIMPLEMENTED + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnDeviceIoControl( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnRead( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnWrite( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnFlush( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +static +VOID +NTAPI +CloseStreamRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PMINIPORTMIDISTREAM Stream = NULL; + NTSTATUS Status; + ISubdevice *ISubDevice; + PSUBDEVICE_DESCRIPTOR Descriptor; + IPortPinDMusImpl * This; + PCLOSESTREAM_CONTEXT Ctx = (PCLOSESTREAM_CONTEXT)Context; + + This = (IPortPinDMusImpl*)Ctx->Pin; + + if (This->MidiStream) + { + if (This->State != KSSTATE_STOP) + { + This->MidiStream->lpVtbl->SetState(This->MidiStream, KSSTATE_STOP); + KeStallExecutionProcessor(10); + } + Stream = This->MidiStream; + This->MidiStream = NULL; + } + + if (This->ServiceGroup) + { + This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); + This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); + } + + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (NT_SUCCESS(Status)) + { + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + if (NT_SUCCESS(Status)) + { + ISubDevice->lpVtbl->Release(ISubDevice); + Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; + } + } + + if (This->Format) + { + ExFreePool(This->Format); + This->Format = NULL; + } + + /* complete the irp */ + Ctx->Irp->IoStatus.Information = 0; + Ctx->Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Ctx->Irp, IO_NO_INCREMENT); + + /* free the work item */ + IoFreeWorkItem(Ctx->WorkItem); + + /* free work item ctx */ + FreeItem(Ctx, TAG_PORTCLASS); + + /* destroy DMus pin */ + This->Filter->lpVtbl->FreePin(This->Filter, (PPORTPINDMUS)This); + + if (Stream) + { + DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); + Stream->lpVtbl->Release(Stream); + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnClose( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCLOSESTREAM_CONTEXT Ctx; + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + if (This->MidiStream) + { + Ctx = AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); + if (!Ctx) + { + DPRINT1("Failed to allocate stream context\n"); + goto cleanup; + } + + Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!Ctx->WorkItem) + { + DPRINT1("Failed to allocate work item\n"); + goto cleanup; + } + + Ctx->Irp = Irp; + Ctx->Pin = (PVOID)This; + + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + + /* defer work item */ + IoQueueWorkItem(Ctx->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)Ctx); + /* Return result */ + return STATUS_PENDING; + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + +cleanup: + + if (Ctx) + FreeItem(Ctx, TAG_PORTCLASS); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnQuerySecurity( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnSetSecurity( + IN IPortPinDMus* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinDMus_fnFastDeviceIoControl( + IN IPortPinDMus* 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 FALSE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinDMus_fnFastRead( + IN IPortPinDMus* 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) +{ + NTSTATUS Status; + PCONTEXT_WRITE Packet; + PIRP Irp; + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + DPRINT("IPortPinDMus_fnFastRead entered\n"); + + Packet = (PCONTEXT_WRITE)Buffer; + + Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) + { + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); + SetStreamState(This, KSSTATE_RUN); + } + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinDMus_fnFastWrite( + IN IPortPinDMus* 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) +{ + NTSTATUS Status; + PCONTEXT_WRITE Packet; + PIRP Irp; + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + InterlockedIncrement((PLONG)&This->TotalPackets); + + DPRINT("IPortPinDMus_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); + + Packet = (PCONTEXT_WRITE)Buffer; + + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) + { + Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + InterlockedIncrement((PLONG)&This->PostCompleted); + } + else + { + Irp = NULL; + Packet->Irp->IoStatus.Status = STATUS_SUCCESS; + Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; + IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); + StatusBlock->Status = STATUS_SUCCESS; + InterlockedIncrement((PLONG)&This->PreCompleted); + } + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) + { + SetStreamState(This, KSSTATE_RUN); + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); + } + + return TRUE; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinDMus_fnInit( + IN IPortPinDMus* iface, + IN PPORTDMUS Port, + IN PPORTFILTERDMUS Filter, + IN KSPIN_CONNECT * ConnectDetails, + IN KSPIN_DESCRIPTOR * KsPinDescriptor, + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PKSDATAFORMAT DataFormat; + BOOL Capture; + + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + Port->lpVtbl->AddRef(Port); + Filter->lpVtbl->AddRef(Filter); + + This->Port = Port; + This->Filter = Filter; + This->KsPinDescriptor = KsPinDescriptor; + This->ConnectDetails = ConnectDetails; + This->DeviceObject = DeviceObject; + GetDMusMiniport(Port, &This->Miniport, &This->MidiMiniport); + + DataFormat = (PKSDATAFORMAT)(ConnectDetails + 1); + + DPRINT("IPortPinDMus_fnInit entered\n"); + + This->Format = ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + if (!This->Format) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlMoveMemory(This->Format, DataFormat, DataFormat->FormatSize); + + if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + Capture = FALSE; + } + else if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_OUT) + { + Capture = TRUE; + } + else + { + DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + KeBugCheck(0); + } + + Status = NewIrpQueue(&This->IrpQueue); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate IrpQueue with %x\n", Status); + return Status; + } + + if (This->MidiMiniport) + { + Status = This->MidiMiniport->lpVtbl->NewStream(This->MidiMiniport, + &This->MidiStream, + NULL, + NonPagedPool, + ConnectDetails->PinId, + Capture, + This->Format, + &This->ServiceGroup); + + DPRINT("IPortPinDMus_fnInit Status %x\n", Status); + + if (!NT_SUCCESS(Status)) + return Status; + } + + if (This->ServiceGroup) + { + Status = This->ServiceGroup->lpVtbl->AddMember(This->ServiceGroup, + (PSERVICESINK)&This->lpVtblServiceSink); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to add pin to service group\n"); + return Status; + } + This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); + } + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IrpQueue_Init failed with %x\n", Status); + return Status; + } + + This->State = KSSTATE_STOP; + This->Capture = Capture; + + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +NTAPI +IPortPinDMus_fnNotify( + IN IPortPinDMus* iface) +{ + IPortPinDMusImpl * This = (IPortPinDMusImpl*)iface; + + This->ServiceGroup->lpVtbl->RequestService(This->ServiceGroup); +} + +static IPortPinDMusVtbl vt_IPortPinDMus = +{ + IPortPinDMus_fnQueryInterface, + IPortPinDMus_fnAddRef, + IPortPinDMus_fnRelease, + IPortPinDMus_fnNewIrpTarget, + IPortPinDMus_fnDeviceIoControl, + IPortPinDMus_fnRead, + IPortPinDMus_fnWrite, + IPortPinDMus_fnFlush, + IPortPinDMus_fnClose, + IPortPinDMus_fnQuerySecurity, + IPortPinDMus_fnSetSecurity, + IPortPinDMus_fnFastDeviceIoControl, + IPortPinDMus_fnFastRead, + IPortPinDMus_fnFastWrite, + IPortPinDMus_fnInit, + IPortPinDMus_fnNotify +}; + + + + +NTSTATUS NewPortPinDMus( + OUT IPortPinDMus ** OutPin) +{ + IPortPinDMusImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortPinDMusImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize IPortPinDMus */ + This->ref = 1; + This->lpVtbl = &vt_IPortPinDMus; + This->lpVtblServiceSink = &vt_IServiceSink; + + + /* store result */ + *OutPin = (IPortPinDMus*)&This->lpVtbl; + + return STATUS_SUCCESS; +} + + + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c [iso-8859-1] Fri May 8 13:36:02 2009 @@ -31,7 +31,7 @@ } if (IsEqualGUIDAligned(ClassId, &CLSID_PortMidi)) - Status = NewPortMidi(OutPort); + Status = NewPortDMus(OutPort); else if (IsEqualGUIDAligned(ClassId, &CLSID_PortDMus)) Status = NewPortDMus(OutPort); else if (IsEqualGUIDAligned(ClassId, &CLSID_PortTopology)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Fri May 8 13:36:02 2009 @@ -11,16 +11,39 @@ typedef struct { IPortDMusVtbl *lpVtbl; + IServiceSinkVtbl *lpVtblServiceSink; + ISubdeviceVtbl *lpVtblSubDevice; LONG ref; BOOL bInitialized; IMiniportDMus *pMiniport; + IMiniportMidi *pMiniportMidi; DEVICE_OBJECT *pDeviceObject; PSERVICEGROUP ServiceGroup; + PPINCOUNT pPinCount; + PPOWERNOTIFY pPowerNotify; + PPORTFILTERDMUS Filter; + + PPCFILTER_DESCRIPTOR pDescriptor; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; }IPortDMusImpl; -const GUID IID_IPortDMus; +static GUID InterfaceGuids[3] = +{ + { + /// KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { + /// KS_CATEGORY_RENDER + 0x65E8773E, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { + /// KS_CATEGORY_CAPTURE + 0x65E8773D, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + } +}; //--------------------------------------------------------------- // IUnknown interface functions @@ -33,19 +56,39 @@ IN REFIID refiid, OUT PVOID* Output) { - IPortDMusImpl * This = (IPortDMusImpl*)iface; + UNICODE_STRING GuidString; + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IPortDMus) || + IsEqualGUIDAligned(refiid, &IID_IPortMidi) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = &This->lpVtbl; - _InterlockedIncrement(&This->ref); + InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, &IID_ISubdevice)) + { + *Output = &This->lpVtblSubDevice; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + else if (IsEqualGUIDAligned(refiid, &IID_IDrmPort) || + IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) + { + return NewIDrmPort((PDRMPORT2*)Output); + } else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); } + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("IPortMidi_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } return STATUS_UNSUCCESSFUL; } @@ -118,8 +161,12 @@ IN PUNKNOWN UnknownAdapter OPTIONAL, IN PRESOURCELIST ResourceList) { - IMiniportDMus * Miniport; + IMiniportDMus * Miniport = NULL; + IMiniportMidi * MidiMiniport = NULL; NTSTATUS Status; + PSERVICEGROUP ServiceGroup; + PPINCOUNT PinCount; + PPOWERNOTIFY PowerNotify; IPortDMusImpl * This = (IPortDMusImpl*)iface; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -133,24 +180,110 @@ Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportDMus, (PVOID*)&Miniport); if (!NT_SUCCESS(Status)) { - DPRINT("IPortDMus_Init called with invalid IMiniport adapter\n"); - return STATUS_INVALID_PARAMETER; - } - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &This->ServiceGroup); + /* check for legacy interface */ + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportMidi, (PVOID*)&MidiMiniport); + if (!NT_SUCCESS(Status)) + { + DPRINT("IPortDMus_Init called with invalid IMiniport adapter\n"); + return STATUS_INVALID_PARAMETER; + } + } + + if (Miniport) + { + /* initialize IMiniportDMus */ + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT("IMiniportDMus_Init failed with %x\n", Status); + return Status; + } + + /* get the miniport device descriptor */ + Status = Miniport->lpVtbl->GetDescription(Miniport, &This->pDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("failed to get description\n"); + Miniport->lpVtbl->Release(Miniport); + return Status; + } + } + else + { + /* initialize IMiniportMidi */ + Status = MidiMiniport->lpVtbl->Init(MidiMiniport, UnknownAdapter, ResourceList, (IPortMidi*)iface, &ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT("IMiniportMidi_Init failed with %x\n", Status); + return Status; + } + + /* get the miniport device descriptor */ + Status = MidiMiniport->lpVtbl->GetDescription(MidiMiniport, &This->pDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("failed to get description\n"); + MidiMiniport->lpVtbl->Release(MidiMiniport); + return Status; + } + } + + /* create the subdevice descriptor */ + Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, + 3, + InterfaceGuids, + 0, + NULL, + 0, + NULL, + 0, + 0, + 0, + NULL, + 0, + NULL, + This->pDescriptor); + if (!NT_SUCCESS(Status)) { - DPRINT("IMinIPortDMus_Init failed with %x\n", Status); + DPRINT1("Failed to create descriptior\n"); + + if (Miniport) + Miniport->lpVtbl->Release(Miniport); + else + MidiMiniport->lpVtbl->Release(MidiMiniport); + return Status; } + + ASSERT(This->ServiceGroup); + ASSERT(ServiceGroup == This->ServiceGroup); /* Initialize port object */ This->pMiniport = Miniport; + This->pMiniportMidi = MidiMiniport; This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; /* increment reference on miniport adapter */ Miniport->lpVtbl->AddRef(Miniport); + + + /* check if it supports IPinCount interface */ + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); + if (NT_SUCCESS(Status)) + { + /* store IPinCount interface */ + This->pPinCount = PinCount; + } + + /* does the Miniport adapter support IPowerNotify interface*/ + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPowerNotify, (PVOID*)&PowerNotify); + if (NT_SUCCESS(Status)) + { + /* store reference */ + This->pPowerNotify = PowerNotify; + } return STATUS_SUCCESS; } @@ -180,11 +313,339 @@ return STATUS_UNSUCCESSFUL; } +VOID +NTAPI +IPortDMus_fnNotify( + IN IPortDMus * iface, + IN PSERVICEGROUP ServiceGroup OPTIONAL) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + if (ServiceGroup) + { + ServiceGroup->lpVtbl->RequestService (ServiceGroup); + return; + } + + ASSERT(This->ServiceGroup); + + /* notify miniport service group */ + This->ServiceGroup->lpVtbl->RequestService(This->ServiceGroup); + + /* notify stream miniport service group */ + if (This->Filter) + { + This->Filter->lpVtbl->NotifyPins(This->Filter); + } +} + +VOID +NTAPI +IPortDMus_fnRegisterServiceGroup( + IN IPortDMus * iface, + IN PSERVICEGROUP ServiceGroup) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + This->ServiceGroup = ServiceGroup; + + ServiceGroup->lpVtbl->AddRef(ServiceGroup); + ServiceGroup->lpVtbl->AddMember(ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); +} + +static IPortDMusVtbl vt_IPortDMus = +{ + /* IUnknown methods */ + IPortDMus_fnQueryInterface, + IPortDMus_fnAddRef, + IPortDMus_fnRelease, + /* IPort methods */ + IPortDMus_fnInit, + IPortDMus_fnGetDeviceProperty, + IPortDMus_fnNewRegistryKey, + IPortDMus_fnNotify, + IPortDMus_fnRegisterServiceGroup +}; + +//--------------------------------------------------------------- +// ISubdevice interface +// + +static +NTSTATUS +NTAPI +ISubDevice_fnQueryInterface( + IN ISubdevice *iface, + IN REFIID InterfaceId, + IN PVOID* Interface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + return IPortDMus_fnQueryInterface((IPortDMus*)This, InterfaceId, Interface); +} + +static +ULONG +NTAPI +ISubDevice_fnAddRef( + IN ISubdevice *iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + return IPortDMus_fnAddRef((IPortDMus*)This); +} + +static +ULONG +NTAPI +ISubDevice_fnRelease( + IN ISubdevice *iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + return IPortDMus_fnRelease((IPortDMus*)This); +} + +static +NTSTATUS +NTAPI +ISubDevice_fnNewIrpTarget( + IN ISubdevice *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; + PPORTFILTERDMUS Filter; + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_NewIrpTarget this %p\n", This); + + if (This->Filter) + { + *OutTarget = (IIrpTarget*)This->Filter; + return STATUS_SUCCESS; + } + + + Status = NewPortFilterDMus(&Filter); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = Filter->lpVtbl->Init(Filter, (PPORTDMUS)This); + if (!NT_SUCCESS(Status)) + { + Filter->lpVtbl->Release(Filter); + return Status; + } + + *OutTarget = (IIrpTarget*)Filter; + return Status; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnReleaseChildren( + IN ISubdevice *iface) +{ + //IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + UNIMPLEMENTED + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnGetDescriptor( + IN ISubdevice *iface, + IN SUBDEVICE_DESCRIPTOR ** Descriptor) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_GetDescriptor this %p\n", This); + *Descriptor = This->SubDeviceDescriptor; + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnDataRangeIntersection( + IN ISubdevice *iface, + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + DPRINT("ISubDevice_DataRangeIntersection this %p\n", This); + + if (This->pMiniport) + { + return This->pMiniport->lpVtbl->DataRangeIntersection (This->pMiniport, PinId, DataRange, MatchingDataRange, OutputBufferLength, ResultantFormat, ResultantFormatLength); + } + + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnPowerChangeNotify( + IN ISubdevice *iface, + IN POWER_STATE PowerState) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + if (This->pPowerNotify) + { + This->pPowerNotify->lpVtbl->PowerChangeNotify(This->pPowerNotify, PowerState); + } + + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +ISubDevice_fnPinCount( + IN ISubdevice *iface, + IN ULONG PinId, + IN OUT PULONG FilterNecessary, + IN OUT PULONG FilterCurrent, + IN OUT PULONG FilterPossible, + IN OUT PULONG GlobalCurrent, + IN OUT PULONG GlobalPossible) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblSubDevice); + + if (This->pPinCount) + { + This->pPinCount->lpVtbl->PinCount(This->pPinCount, PinId, FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible); + return STATUS_SUCCESS; + } + + /* FIXME + * scan filter descriptor + */ + return STATUS_UNSUCCESSFUL; +} + +static ISubdeviceVtbl vt_ISubdevice = +{ + ISubDevice_fnQueryInterface, + ISubDevice_fnAddRef, + ISubDevice_fnRelease, + ISubDevice_fnNewIrpTarget, + ISubDevice_fnReleaseChildren, + ISubDevice_fnGetDescriptor, + ISubDevice_fnDataRangeIntersection, + ISubDevice_fnPowerChangeNotify, + ISubDevice_fnPinCount +}; + + +static +NTSTATUS +NTAPI +IServiceSink_fnQueryInterface( + IServiceSink* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblServiceSink); + + if (IsEqualGUIDAligned(refiid, &IID_IServiceSink) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblServiceSink; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + DPRINT("Unknown interface requested\n"); + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IServiceSink_fnAddRef( + IServiceSink* iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblServiceSink); + return IPortDMus_fnAddRef((IPortDMus*)This); +} + +static +ULONG +NTAPI +IServiceSink_fnRelease( + IServiceSink* iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)CONTAINING_RECORD(iface, IPortDMusImpl, lpVtblServiceSink); + return IPortDMus_fnRelease((IPortDMus*)This); +} + +static +VOID +NTAPI +IServiceSink_fnRequestService( + IServiceSink* iface) +{ + UNIMPLEMENTED +} + +static IServiceSinkVtbl vt_IServiceSink = +{ + IServiceSink_fnQueryInterface, + IServiceSink_fnAddRef, + IServiceSink_fnRelease, + IServiceSink_fnRequestService +}; + NTSTATUS NewPortDMus( OUT PPORT* OutPort) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - + IPortDMusImpl * This = AllocateItem(NonPagedPool, sizeof(IPortDMusImpl), TAG_PORTCLASS); + + if (!This) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + This->ref = 1; + This->lpVtbl = &vt_IPortDMus; + This->lpVtblServiceSink = &vt_IServiceSink; + This->lpVtblSubDevice = &vt_ISubdevice; + + *OutPort = (PPORT)&This->lpVtbl; + + return STATUS_SUCCESS; +} + +VOID +GetDMusMiniport( + IN IPortDMus * iface, + IN PMINIPORTDMUS * Miniport, + IN PMINIPORTMIDI * MidiMiniport) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + *Miniport = This->pMiniport; + *MidiMiniport = This->pMiniportMidi; +} Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c (removed) @@ -1,481 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel Streaming - * FILE: drivers/wdm/audio/backpln/portcls/port_midi.c - * PURPOSE: Midi Port driver - * PROGRAMMER: Johannes Anderwald - */ - -#include "private.h" - -typedef struct -{ - IPortMidiVtbl *lpVtbl; - ISubdeviceVtbl *lpVtblSubDevice; - - LONG ref; - BOOL bInitialized; - - PMINIPORTMIDI pMiniport; - PDEVICE_OBJECT pDeviceObject; - PPINCOUNT pPinCount; - PPOWERNOTIFY pPowerNotify; - PSERVICEGROUP pServiceGroup; - - PPCFILTER_DESCRIPTOR pDescriptor; - PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; -}IPortMidiImpl; - -static GUID InterfaceGuids[3] = -{ - { - /// KS_CATEGORY_AUDIO - 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - }, - { - /// KS_CATEGORY_RENDER - 0x65E8773E, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - }, - { - /// KS_CATEGORY_CAPTURE - 0x65E8773D, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - } -}; - -//--------------------------------------------------------------- -// IUnknown interface functions -// - -NTSTATUS -NTAPI -IPortMidi_fnQueryInterface( - IPortMidi* iface, - IN REFIID refiid, - OUT PVOID* Output) -{ - UNICODE_STRING GuidString; - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - DPRINT("IPortMidi_fnQueryInterface\n"); - - if (IsEqualGUIDAligned(refiid, &IID_IPortMidi) || - IsEqualGUIDAligned(refiid, &IID_IPort) || - IsEqualGUIDAligned(refiid, &IID_IUnknown)) - { - *Output = &This->lpVtbl; - InterlockedIncrement(&This->ref); - return STATUS_SUCCESS; - } - else if (IsEqualGUIDAligned(refiid, &IID_ISubdevice)) - { - *Output = &This->lpVtblSubDevice; - InterlockedIncrement(&This->ref); - return STATUS_SUCCESS; - } - else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) - { - return NewPortClsVersion((PPORTCLSVERSION*)Output); - } - else if (IsEqualGUIDAligned(refiid, &IID_IDrmPort) || - IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) - { - return NewIDrmPort((PDRMPORT2*)Output); - } - - if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) - { - DPRINT1("IPortMidi_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); - RtlFreeUnicodeString(&GuidString); - } - return STATUS_UNSUCCESSFUL; -} - -ULONG -NTAPI -IPortMidi_fnAddRef( - IPortMidi* iface) -{ - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - return InterlockedIncrement(&This->ref); -} - -ULONG -NTAPI -IPortMidi_fnRelease( - IPortMidi* iface) -{ - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - InterlockedDecrement(&This->ref); - - if (This->ref == 0) - { - FreeItem(This, TAG_PORTCLASS); - return 0; - } - /* Return new reference count */ - return This->ref; -} - - -//--------------------------------------------------------------- -// IPort interface functions -// - -NTSTATUS -NTAPI -IPortMidi_fnGetDeviceProperty( - IN IPortMidi * iface, - IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ReturnLength) -{ - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - if (!This->bInitialized) - { - DPRINT("IPortMidi_fnNewRegistryKey called w/o initiazed\n"); - return STATUS_UNSUCCESSFUL; - } - - return IoGetDeviceProperty(This->pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength); -} - -NTSTATUS -NTAPI -IPortMidi_fnInit( - IN IPortMidi * iface, - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PUNKNOWN UnknownMiniport, - IN PUNKNOWN UnknownAdapter OPTIONAL, - IN PRESOURCELIST ResourceList) -{ - IMiniportMidi * Miniport; - IServiceGroup * ServiceGroup = NULL; - NTSTATUS Status; - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - DPRINT("IPortMidi_fnInit entered This %p DeviceObject %p Irp %p UnknownMiniport %p UnknownAdapter %p ResourceList %p\n", - This, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - if (This->bInitialized) - { - DPRINT1("IPortMidi_Init called again\n"); - return STATUS_SUCCESS; - } - - Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportMidi, (PVOID*)&Miniport); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IPortMidi_Init called with invalid IMiniport adapter\n"); - return STATUS_INVALID_PARAMETER; - } - - /* Initialize port object */ - This->pMiniport = Miniport; - This->pDeviceObject = DeviceObject; - This->bInitialized = TRUE; - - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IPortMidi_Init failed with %x\n", Status); - This->bInitialized = FALSE; - Miniport->lpVtbl->Release(Miniport); - return Status; - } - - /* get the miniport device descriptor */ - Status = Miniport->lpVtbl->GetDescription(Miniport, &This->pDescriptor); - if (!NT_SUCCESS(Status)) - { - DPRINT1("failed to get description\n"); - Miniport->lpVtbl->Release(Miniport); - This->bInitialized = FALSE; - return Status; - } - - This->pServiceGroup = ServiceGroup; - - /* create the subdevice descriptor */ - Status = PcCreateSubdeviceDescriptor(&This->SubDeviceDescriptor, - 3, - InterfaceGuids, - 0, - NULL, - 0, - NULL, - 0, - 0, - 0, - NULL, - 0, - NULL, - This->pDescriptor); - - - DPRINT("IPortMidi_fnInit success\n"); - return STATUS_SUCCESS; -} - - -NTSTATUS -NTAPI -IPortMidi_fnNewRegistryKey( - IN IPortMidi * iface, - OUT PREGISTRYKEY *OutRegistryKey, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL) -{ - IPortMidiImpl * This = (IPortMidiImpl*)iface; - - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - if (!This->bInitialized) - { - DPRINT("IPortMidi_fnNewRegistryKey called w/o initialized\n"); - return STATUS_UNSUCCESSFUL; - } - return PcNewRegistryKey(OutRegistryKey, - OuterUnknown, - RegistryKeyType, - DesiredAccess, - This->pDeviceObject, - NULL,//FIXME - ObjectAttributes, - CreateOptions, - Disposition); -} - - -VOID -NTAPI -IPortMidi_fnNotify( - IN IPortMidi * iface, - IN PSERVICEGROUP ServiceGroup OPTIONAL) -{ - UNIMPLEMENTED -} - -NTSTATUS -NTAPI -IPortMidi_fnRegisterServiceGroup( - IN IPortMidi * iface, - IN PSERVICEGROUP ServiceGroup) -{ - UNIMPLEMENTED - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return STATUS_SUCCESS; -} - -static IPortMidiVtbl vt_IPortMidi = -{ - /* IUnknown methods */ - IPortMidi_fnQueryInterface, - IPortMidi_fnAddRef, - IPortMidi_fnRelease, - /* IPort methods */ - IPortMidi_fnInit, - IPortMidi_fnGetDeviceProperty, - IPortMidi_fnNewRegistryKey, - IPortMidi_fnNotify, - IPortMidi_fnRegisterServiceGroup -}; - -//--------------------------------------------------------------- -// ISubdevice interface -// - -static -NTSTATUS -NTAPI -ISubDevice_fnQueryInterface( - IN ISubdevice *iface, - IN REFIID InterfaceId, - IN PVOID* Interface) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - return IPortMidi_fnQueryInterface((IPortMidi*)This, InterfaceId, Interface); -} - -static -ULONG -NTAPI -ISubDevice_fnAddRef( - IN ISubdevice *iface) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - return IPortMidi_fnAddRef((IPortMidi*)This); -} - -static -ULONG -NTAPI -ISubDevice_fnRelease( - IN ISubdevice *iface) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - return IPortMidi_fnRelease((IPortMidi*)This); -} - -static -NTSTATUS -NTAPI -ISubDevice_fnNewIrpTarget( - IN ISubdevice *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) -{ - //IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; -} - -static -NTSTATUS -NTAPI -ISubDevice_fnReleaseChildren( - IN ISubdevice *iface) -{ - //IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; -} - -static -NTSTATUS -NTAPI -ISubDevice_fnGetDescriptor( - IN ISubdevice *iface, - IN SUBDEVICE_DESCRIPTOR ** Descriptor) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - DPRINT("ISubDevice_GetDescriptor this %p\n", This); - *Descriptor = This->SubDeviceDescriptor; - return STATUS_SUCCESS; -} - -static -NTSTATUS -NTAPI -ISubDevice_fnDataRangeIntersection( - IN ISubdevice *iface, - IN ULONG PinId, - IN PKSDATARANGE DataRange, - IN PKSDATARANGE MatchingDataRange, - IN ULONG OutputBufferLength, - OUT PVOID ResultantFormat OPTIONAL, - OUT PULONG ResultantFormatLength) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - DPRINT("ISubDevice_DataRangeIntersection this %p\n", This); - - if (This->pMiniport) - { - return This->pMiniport->lpVtbl->DataRangeIntersection (This->pMiniport, PinId, DataRange, MatchingDataRange, OutputBufferLength, ResultantFormat, ResultantFormatLength); - } - - return STATUS_UNSUCCESSFUL; -} - -static -NTSTATUS -NTAPI -ISubDevice_fnPowerChangeNotify( - IN ISubdevice *iface, - IN POWER_STATE PowerState) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - if (This->pPowerNotify) - { - This->pPowerNotify->lpVtbl->PowerChangeNotify(This->pPowerNotify, PowerState); - } - - return STATUS_SUCCESS; -} - -static -NTSTATUS -NTAPI -ISubDevice_fnPinCount( - IN ISubdevice *iface, - IN ULONG PinId, - IN OUT PULONG FilterNecessary, - IN OUT PULONG FilterCurrent, - IN OUT PULONG FilterPossible, - IN OUT PULONG GlobalCurrent, - IN OUT PULONG GlobalPossible) -{ - IPortMidiImpl * This = (IPortMidiImpl*)CONTAINING_RECORD(iface, IPortMidiImpl, lpVtblSubDevice); - - if (This->pPinCount) - { - This->pPinCount->lpVtbl->PinCount(This->pPinCount, PinId, FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible); - return STATUS_SUCCESS; - } - - /* FIXME - * scan filter descriptor - */ - return STATUS_UNSUCCESSFUL; -} - -static ISubdeviceVtbl vt_ISubdeviceVtbl = -{ - ISubDevice_fnQueryInterface, - ISubDevice_fnAddRef, - ISubDevice_fnRelease, - ISubDevice_fnNewIrpTarget, - ISubDevice_fnReleaseChildren, - ISubDevice_fnGetDescriptor, - ISubDevice_fnDataRangeIntersection, - ISubDevice_fnPowerChangeNotify, - ISubDevice_fnPinCount -}; - - -NTSTATUS -NewPortMidi( - OUT PPORT* OutPort) -{ - IPortMidiImpl * This; - - This = AllocateItem(NonPagedPool, sizeof(IPortMidiImpl), TAG_PORTCLASS); - if (!This) - return STATUS_INSUFFICIENT_RESOURCES; - - This->lpVtbl = &vt_IPortMidi; - This->lpVtblSubDevice = &vt_ISubdeviceVtbl; - This->ref = 1; - *OutPort = (PPORT)(&This->lpVtbl); - - DPRINT("NewPortMidi result %p\n", *OutPort); - - return STATUS_SUCCESS; -} 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] Fri May 8 13:36:02 2009 @@ -19,6 +19,7 @@ <file>dma_slave.c</file> <file>drm.c</file> <file>drm_port.c</file> + <file>filter_dmus.c</file> <file>filter_wavecyclic.c</file> <file>filter_wavepci.c</file> <file>filter_wavert.c</file> @@ -29,13 +30,13 @@ <file>miniport.c</file> <file>miniport_dmus.c</file> <file>miniport_fmsynth.c</file> + <file>pin_dmus.c</file> <file>pin_wavecyclic.c</file> <file>pin_wavepci.c</file> <file>pin_wavert.c</file> <file>pool.c</file> <file>port.c</file> <file>port_dmus.c</file> - <file>port_midi.c</file> <file>port_topology.c</file> <file>port_wavecyclic.c</file> <file>port_wavepci.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] Fri May 8 13:36:02 2009 @@ -63,9 +63,6 @@ OUT PMINIPORT* OutMiniport, IN REFCLSID ClassId); -NTSTATUS NewPortMidi( - OUT PPORT* OutPort); - NTSTATUS NewPortDMus( OUT PPORT* OutPort); @@ -108,6 +105,19 @@ PMINIPORTWAVEPCI GetWavePciMiniport( PPORTWAVEPCI Port); + +NTSTATUS +NewPortFilterDMus( + OUT PPORTFILTERDMUS * OutFilter); + +NTSTATUS NewPortPinDMus( + OUT PPORTPINDMUS * OutPin); + +VOID +GetDMusMiniport( + IN IPortDMus * iface, + IN PMINIPORTDMUS * Miniport, + IN PMINIPORTMIDI * MidiMiniport); #if (NTDDI_VERSION >= NTDDI_VISTA)

1 0

[janderwald] 40834: - Fix interface definition for IMiniportMidi - Add macros to avoid warnings
by janderwald＠svn.reactos.org 08 May '09

08 May '09

Author: janderwald Date: Fri May 8 13:28:20 2009 New Revision: 40834 URL: http://svn.reactos.org/svn/reactos?rev=40834&view=rev Log: - Fix interface definition for IMiniportMidi - Add macros to avoid warnings Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Fri May 8 13:28:20 2009 @@ -1305,7 +1305,7 @@ STDMETHOD_(void, Service)(THIS) PURE; STDMETHOD_(NTSTATUS, NewStream)(THIS_ - OUT PMINIPORTMIDISTREAM Stream, + OUT PMINIPORTMIDISTREAM *Stream, IN PUNKNOWN OuterUnknown OPTIONAL, IN POOL_TYPE PoolType, IN ULONG Pin, @@ -1343,6 +1343,9 @@ DEFINE_GUID(IID_IPortTopology, 0xb4c90a30L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DEFINE_GUID(CLSID_PortTopology, 0xb4c90a32L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +#undef INTERFACE +#define INTERFACE IPortTopology + DECLARE_INTERFACE_(IPortTopology, IPort) { DEFINE_ABSTRACT_UNKNOWN() @@ -1362,6 +1365,9 @@ #define INTERFACE IMiniportTopology DEFINE_GUID(IID_IMiniportTopology, 0xb4c90a31L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +#undef INTERFACE +#define INTERFACE IMiniportTopology DECLARE_INTERFACE_(IMiniportTopology,IMiniport) {

1 0

[mjmartin] 40833: - NtFreeVirtualMemory: Pass RegionListHead from SectionData vice VirtualMemoryData to MmAlterRegion for MemoryArea->Type of Section view. Fixes MapViewOfFile tests for kernel32_winetests. More investigation is needed on whether this function should even succeed on FileMapping Objects.
by mjmartin＠svn.reactos.org 08 May '09

08 May '09

Author: mjmartin Date: Fri May 8 11:13:41 2009 New Revision: 40833 URL: http://svn.reactos.org/svn/reactos?rev=40833&view=rev Log: - NtFreeVirtualMemory: Pass RegionListHead from SectionData vice VirtualMemoryData to MmAlterRegion for MemoryArea->Type of Section view. Fixes MapViewOfFile tests for kernel32_winetests. More investigation is needed on whether this function should even succeed on FileMapping Objects. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Fri May 8 11:13:41 2009 @@ -1003,7 +1003,9 @@ Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? + &MemoryArea->Data.SectionData.RegionListHead : + &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, RegionSize, MEM_RESERVE,

1 0

[janderwald] 40832: - When acquiring a mapping check if the mapping hasn't already been used - Set tag value to zero when releasing a mapping
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Fri May 8 03:33:27 2009 New Revision: 40832 URL: http://svn.reactos.org/svn/reactos?rev=40832&view=rev Log: - When acquiring a mapping check if the mapping hasn't already been used - Set tag value to zero when releasing a mapping Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Fri May 8 03:33:27 2009 @@ -142,7 +142,6 @@ IN PIRP Irp) { PIRP_MAPPING Mapping; - ULONG Index; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); @@ -183,8 +182,7 @@ return STATUS_UNSUCCESSFUL; } ASSERT(Mapping->NumTags < 32); - for(Index = 0; Index < Mapping->NumTags; Index++); - Mapping->References |= (1 << Index); + Mapping->References = (1 << Mapping->NumTags) - 1; This->NumDataAvailable += Mapping->Header->DataUsed; @@ -392,6 +390,7 @@ PIRP_MAPPING CurMapping; PLIST_ENTRY CurEntry; ULONG Index; + ULONG Value; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; @@ -413,7 +412,8 @@ CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); for(Index = 0; Index < CurMapping->NumTags; Index++) { - if (CurMapping->Tag[Index] == NULL) + Value = CurMapping->References & ( 1 << Index); + if (CurMapping->Tag[Index] == NULL && Value) { /* found a free mapping within audio irp */ GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); @@ -460,6 +460,7 @@ if (CurMapping->Tag[Index] == Tag) { Found = TRUE; + CurMapping->Tag[Index] = NULL; break; } }

1 0

[dreimer] 40831: Cosmetic fixes for MinGW Default Environment. Readme got new pics. Except the GCC from Colin I am ready for 1.4.2 now, I think.
by dreimer＠svn.reactos.org 07 May '09

07 May '09

Author: dreimer Date: Fri May 8 02:10:52 2009 New Revision: 40831 URL: http://svn.reactos.org/svn/reactos?rev=40831&view=rev Log: Cosmetic fixes for MinGW Default Environment. Readme got new pics. Except the GCC from Colin I am ready for 1.4.2 now, I think. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Fri May 8 02:10:52 2009 @@ -24,11 +24,8 @@ $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" -"" -"" & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -"" -"" +& "$_ROSBE_BASEDIR\version.ps1" # # Get the number of CPUs in the system so we know how many jobs to execute. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Fri May 8 02:10:52 2009 @@ -8,7 +8,8 @@ (get-WmiObject Win32_OperatingSystem).caption -(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' +(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' | % { $str = $_ -replace '^.*14:',''} +$str "gcc target - $_ROSBE_GCCTARGET" remove-item gcctvers.tmp Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Fri May 8 02:10:52 2009 @@ -28,11 +28,8 @@ set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\i386 -echo. -echo. call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" -echo. -echo. +call "%_ROSBE_BASEDIR%\version.cmd" :: :: Get the number of CPUs in the system so we know how many jobs to execute. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[dgoette] 410: unload the rich text editor, when viewing the entry table, fixes an exception
by dgoette＠svn.reactos.org 07 May '09

07 May '09

Author: dgoette Date: Fri May 8 01:31:01 2009 New Revision: 410 URL: http://svn.reactos.org/svn/reactos?rev=410&view=rev Log: unload the rich text editor, when viewing the entry table, fixes an exception Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Fri May 8 01:31:01 2009 @@ -1811,6 +1811,9 @@ window.clearTimeout(autosave_timer); autosave_cache = ''; + + // stop richt text editors + rtestop(); if (document.getElementById('smenutab'+objid.substring(8)).className !== 'lmItemTopSelected') { highlightTab(objid);

1 0

[dgoette] 409: set default collation, fixes mixed collations after convert
by dgoette＠svn.reactos.org 07 May '09

07 May '09

Author: dgoette Date: Fri May 8 00:50:40 2009 New Revision: 409 URL: http://svn.reactos.org/svn/reactos?rev=409&view=rev Log: set default collation, fixes mixed collations after convert Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] Fri May 8 00:50:40 2009 @@ -156,13 +156,13 @@ -- -------------------------------------------------------- CREATE TABLE roscms_entries_areas ( id bigint(20) unsigned NOT NULL auto_increment, - name varchar(30) NOT NULL, - name_short varchar(15) NOT NULL, - description varchar(255) NOT NULL, + name varchar(30) collate utf8_unicode_ci NOT NULL, + name_short varchar(15) collate utf8_unicode_ci NOT NULL, + description varchar(255) collate utf8_unicode_ci NOT NULL, PRIMARY KEY (id), UNIQUE KEY name_short (name_short), UNIQUE KEY `name` (name) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; INSERT INTO roscms_entries_areas VALUES (1, 'Translate', 'translate', 'user can translate this entry to the lang he has set in his profile'), @@ -187,7 +187,7 @@ group_id bigint(20) unsigned NOT NULL COMMENT '->groups(id)', PRIMARY KEY (id), UNIQUE KEY right_id (right_id,access_id,group_id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- convert table INSERT INTO roscms_rel_acl @@ -232,13 +232,13 @@ -- -------------------------------------------------------- CREATE TABLE roscms_area ( id bigint(20) NOT NULL auto_increment, - `name` varchar(30) NOT NULL, - name_short varchar(18) NOT NULL, - description varchar(255) NOT NULL, - PRIMARY KEY (id), - UNIQUE KEY `name` (`name`), + name varchar(30) collate utf8_unicode_ci NOT NULL, + name_short varchar(18) collate utf8_unicode_ci NOT NULL, + description varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY name (name), UNIQUE KEY name_short (name_short) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; INSERT INTO roscms_area VALUES (1, 'System Tags', 'system_tags', 'Can the user modify/see system tags'), @@ -288,7 +288,7 @@ group_id bigint(20) NOT NULL, area_id bigint(20) NOT NULL, PRIMARY KEY (group_id,area_id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; INSERT INTO roscms_rel_groups_area SELECT DISTINCT g.id, a.id

1 0

[dreimer] 40830: Fixed some typos in cmd and PS1 Version. Updated not yet updated version number in readme. New stuff and fixed for the installer: Fully integrated PS Version of MingW Default Env. fixed some typos Made the PS1 Version default in Windows 7.
by dreimer＠svn.reactos.org 07 May '09

07 May '09

Author: dreimer Date: Fri May 8 00:45:39 2009 New Revision: 40830 URL: http://svn.reactos.org/svn/reactos?rev=40830&view=rev Log: Fixed some typos in cmd and PS1 Version. Updated not yet updated version number in readme. New stuff and fixed for the installer: Fully integrated PS Version of MingW Default Env. fixed some typos Made the PS1 Version default in Windows 7. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Fri May 8 00:45:39 2009 @@ -18,7 +18,7 @@ if ($ENV:APPDATA.Length -lt 1) { $ENV:APPDATA = $ENV:USERPROFILE } -$global:_ROSBE_VERSION = 1.4.2 +$global:_ROSBE_VERSION = "1.4.2" $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" @@ -53,7 +53,7 @@ function RosBE { "*******************************************************************************" "* *" - "* ReactOS Build Environment $_ROSBE_VERSION *" + "* ReactOS Build Environment $_ROSBE_VERSION *" "* *" "*******************************************************************************" "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri May 8 00:45:39 2009 @@ -111,4 +111,4 @@ $ENV:ROSBE_TARGET_CXXFLAGS = $null } -ENV:LIBRARY_PATH = "$_ROSBE_HOST_MINGWPATH\lib;$_ROSBE_HOST_MINGWPATH\lib\gcc\mingw32\$_ROSBE_GCCVERSION" +$ENV:LIBRARY_PATH = "$_ROSBE_HOST_MINGWPATH\lib;$_ROSBE_HOST_MINGWPATH\lib\gcc\mingw32\$_ROSBE_GCCVERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Fri May 8 00:45:39 2009 @@ -123,7 +123,7 @@ echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Fri May 8 00:45:39 2009 @@ -28,6 +28,8 @@ VIProductVersion "1.4.2.0" CRCCheck force +SetDatablockOptimize on +XPStyle on SetCompressor /FINAL /SOLID lzma !include "MUI2.nsh" @@ -41,6 +43,9 @@ ;; one instance of the installer is running. ;; Function .onInit + ReadRegStr $R3 HKLM \ + "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion + StrCpy $R4 $R3 3 System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 @@ -112,28 +117,42 @@ File /r Icons\mingw.ico File /r Icons\rosbe.ico File /r Root\README.pdf - File /r Root\RosBE.mac File /r Root\changelog.txt File /r Root\LICENSE.txt - File /r Root\MinGW.cmd - File /r Root\MinGW.mac - File /r Root\Build.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - File /r Root\version.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\MinGW.ps1 + File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\chdefgcc.ps1 + File /r Components\Powershell\Clean.ps1 + File /r Components\Powershell\Help.ps1 + File /r Components\Powershell\RosBE.ps1 + File /r Components\Powershell\rosbe-gcc-env.ps1 + File /r Components\Powershell\version.ps1 + WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" + ${else} + File /r Root\MinGW.cmd + File /r Root\MinGW.mac + File /r Root\Build.cmd + File /r Root\chdefgcc.cmd + File /r Root\Clean.cmd + File /r Root\Help.cmd + File /r Root\RosBE.cmd + File /r Root\RosBE.mac + File /r Root\rosbe-gcc-env.cmd + File /r Root\TimeDate.cmd + File /r Root\version.cmd + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\buildtime.exe + File /r Components\Tools\chknewer.exe + File /r Components\Tools\cpucount.exe + File /r Components\Tools\getdate.exe + File /r Components\Tools\rquote.exe + File /r Components\Tools\tee.exe + ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Components\Tools\buildtime.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe File /r Components\Tools\flash.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe SectionEnd Section -MinGWGCCNASM SEC02 @@ -146,7 +165,11 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\options.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\options.ps1 + ${else} + File /r Root\options.cmd + ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\options.exe @@ -162,7 +185,11 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\sSVN.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\sSVN.ps1 + ${else} + File /r Root\sSVN.cmd + ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\svn.exe @@ -191,7 +218,11 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\scut.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\scut.ps1 + ${else} + File /r Root\scut.cmd + ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\scut.exe @@ -217,7 +248,11 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\reladdr2line.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\reladdr2line.ps1 + ${else} + File /r Root\reladdr2line.cmd + ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\echoh.exe @@ -229,35 +264,16 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\chdefdir.cmd - File /r Root\Config.cmd -SectionEnd - -Section "PowerShell RosBE Version" SEC10 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\charch.ps1 - File /r Components\Powershell\chdefdir.ps1 - File /r Components\Powershell\chdefgcc.ps1 - File /r Components\Powershell\Clean.ps1 - File /r Components\Powershell\Config.ps1 - File /r Components\Powershell\Help.ps1 - File /r Components\Powershell\MinGW.ps1 - File /r Components\Powershell\options.ps1 - File /r Components\Powershell\reladdr2line.ps1 - File /r Components\Powershell\RosBE.ps1 - File /r Components\Powershell\rosbe-gcc-env.ps1 - File /r Components\Powershell\scut.ps1 - File /r Components\Powershell\sSVN.ps1 - File /r Components\Powershell\update.ps1 - File /r Components\Powershell\version.ps1 - WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" -SectionEnd - -Section "Update Script" SEC11 + ${If} $R4 = '6.1' + File /r Components\Powershell\chdefdir.ps1 + File /r Components\Powershell\Config.ps1 + ${else} + File /r Root\chdefdir.cmd + File /r Root\Config.cmd + ${Endif} +SectionEnd + +Section "Update Script" SEC10 SetShellVarContext current SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -268,7 +284,66 @@ File /r Components\Tools\libiconv2.dll SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\update.cmd + ${If} $R4 = '6.1' + File /r Components\Powershell\update.ps1 + ${else} + File /r Root\update.cmd + ${Endif} +SectionEnd + +Section "PowerShell/CMD RosBE Version" SEC11 +SetShellVarContext current + ${If} $R4 = '6.1' + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\MinGW.cmd + File /r Root\MinGW.mac + File /r Root\Build.cmd + File /r Root\chdefgcc.cmd + File /r Root\Clean.cmd + File /r Root\Help.cmd + File /r Root\RosBE.cmd + File /r Root\RosBE.mac + File /r Root\rosbe-gcc-env.cmd + File /r Root\TimeDate.cmd + File /r Root\version.cmd + File /r Root\charch.cmd + File /r Root\chdefdir.cmd + File /r Root\Config.cmd + File /r Root\options.cmd + File /r Root\reladdr2line.cmd + File /r Root\scut.cmd + File /r Root\sSVN.cmd + File /r Root\update.cmd + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\buildtime.exe + File /r Components\Tools\chknewer.exe + File /r Components\Tools\cpucount.exe + File /r Components\Tools\getdate.exe + File /r Components\Tools\rquote.exe + File /r Components\Tools\tee.exe + ${else} + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\MinGW.ps1 + File /r Components\Powershell\RosBE.ps1 + File /r Components\Powershell\rosbe-gcc-env.ps1 + File /r Components\Powershell\Help.ps1 + File /r Components\Powershell\chdefgcc.ps1 + File /r Components\Powershell\Clean.ps1 + File /r Components\Powershell\version.ps1 + File /r Components\Powershell\charch.ps1 + File /r Components\Powershell\chdefdir.ps1 + File /r Components\Powershell\Config.ps1 + File /r Components\Powershell\options.ps1 + File /r Components\Powershell\reladdr2line.ps1 + File /r Components\Powershell\scut.ps1 + File /r Components\Powershell\sSVN.ps1 + File /r Components\Powershell\update.ps1 + WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" + ${Endif} SectionEnd Section -StartMenuShortcuts SEC12 @@ -278,14 +353,19 @@ ;; Add our start menu shortcuts. ;; IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +13 0 - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + SetOutPath $PROFILE + IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" + SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" @@ -300,13 +380,18 @@ ;; ;; Add our desktop shortcuts. ;; - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +7 0 - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +6 0 + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + SetOutPath $PROFILE - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 + CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 + CreateShortCut "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC14 @@ -315,18 +400,27 @@ ;; ;; Add our quick launch shortcuts. ;; - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +7 0 - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +6 0 + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + SetOutPath $PROFILE - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 + CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" + IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 + CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section -Post SEC15 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" + ${If} $R4 = '6.1' + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.ps1" + ${else} + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" + ${Endif} WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" @@ -343,25 +437,27 @@ "Are you sure you want to remove ReactOS Build Environment and all of its components?" \ IDYES +2 Abort - IfFileExists "$PROFILE\RosBE\." 0 +3 + IfFileExists "$PROFILE\RosBE\." 0 +5 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ IDNO +1 RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE\." 0 +3 + IfFileExists "$APPDATA\RosBE\." 0 +5 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ IDNO +1 RMDir /r /REBOOTOK "$APPDATA\RosBE" MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ - IDNO +7 + IDNO +9 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" FunctionEnd Section Uninstall @@ -377,11 +473,13 @@ Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" + Delete /REBOOTOK "$INSTDIR\chdefdir.ps1" Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" + Delete /REBOOTOK "$INSTDIR\chdefgcc.ps1" Delete /REBOOTOK "$INSTDIR\Clean.cmd" Delete /REBOOTOK "$INSTDIR\Clean.ps1" Delete /REBOOTOK "$INSTDIR\Config.cmd" - Delete /REBOOTOK "$INSTDIR\Config.sp1" + Delete /REBOOTOK "$INSTDIR\Config.ps1" Delete /REBOOTOK "$INSTDIR\Help.cmd" Delete /REBOOTOK "$INSTDIR\Help.ps1" Delete /REBOOTOK "$INSTDIR\MinGW.cmd" @@ -466,6 +564,7 @@ Push $R1 Push $R2 Push $R3 + Push $R4 StrCpy $R1 0 StrLen $R2 $R0 Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Fri May 8 00:45:39 2009 @@ -28,6 +28,8 @@ VIProductVersion "1.1.0.0" CRCCheck force +SetDatablockOptimize on +XPStyle on SetCompressor /FINAL /SOLID lzma !include "MUI2.nsh" @@ -109,9 +111,9 @@ SetOverwrite try File /r Root\charch.cmd File /r Root\options.cmd - IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - File /r Root\charch.ps1 - File /r Root\options.ps1 + IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 + File /r Root\charch.ps1 + File /r Root\options.ps1 SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\options64.exe @@ -138,7 +140,10 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0B /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" @@ -152,7 +157,10 @@ ;; Add our desktop shortcuts. ;; SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC05 @@ -162,7 +170,10 @@ ;; Add our quick launch shortcuts. ;; SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd Section -Post SEC06 @@ -201,6 +212,8 @@ RMDir /REBOOTOK "$INSTDIR" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" ;; ;; Clean up the registry.

1 0

[dgoette] 408: * fix usage of UTF8 * show language selection also for unregistered users
by dgoette＠svn.reactos.org 07 May '09

07 May '09

Author: dgoette Date: Fri May 8 00:12:07 2009 New Revision: 408 URL: http://svn.reactos.org/svn/reactos?rev=408&view=rev Log: * fix usage of UTF8 * show language selection also for unregistered users Modified: branches/danny-web/www/www.reactos.org/roscms/connect.db.php branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… Modified: branches/danny-web/www/www.reactos.org/roscms/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/connect.db.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/connect.db.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -24,7 +24,7 @@ $db_user = 'username'; $db_pass = 'password'; $db_name = 'roscms'; -$db_port = 3301; +$db_port = 3306; // vars are unset in DBConnection class // !!! so be sure to use DBConnection or unset(..) yourself Modified: branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -53,6 +53,7 @@ // show errors as warning, and use our own statement class $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); $this->setAttribute(PDO::ATTR_STATEMENT_CLASS,array('DBStatement', array($this))); + $this->exec("SET names 'utf8'"); } catch (PDOException $e) { Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -89,7 +89,7 @@ echo_strip(' <h2>Account</h2> <ul> - <li title="'.htmlentities($thisuser->name()).'"> Nick: '.htmlentities($thisuser->name()).'</li> + <li title="'.htmlspecialchars($thisuser->name()).'"> Nick: '.htmlspecialchars($thisuser->name()).'</li> <li><a href="'.$config->pathInstance().'?page=my">My Profile</a></li> <li><a href="'.$config->pathInstance().'?page=search">User Search</a></li> <li><a href="'.$config->pathGenerated().'peoplemap/">User Map</a></li>'); @@ -128,38 +128,50 @@ <ul> <li> <div style="text-align:center;"> - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathInstance().'?'.htmlentities($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'"> - <optgroup label="current language">'); - - // print current language - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang_id"); - $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); - $stmt->execute(); - $current_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - echo_strip(' - <option value="#">'.$current_lang['name'].'</option> - </optgroup> - <optgroup label="all languages">'); + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathInstance().'?'.htmlspecialchars($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'">'); + + // show current profile language of registered users + if ($thisuser->language() > 0) { + // print current language + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang_id"); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); + $stmt->execute(); + $current_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <optgroup label="current language"> + <option value="#">'.$current_lang['name'].'</option> + </optgroup> + <optgroup label="all languages">'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." WHERE id != :lang ORDER BY name ASC"); + $stmt->bindParam('lang',$current_lang['id'],PDO::PARAM_INT); + } + + // for guests show all + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); + } // print available languages - $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." WHERE id != :lang ORDER BY name ASC"); - $stmt->bindParam('lang',$current_lang['id'],PDO::PARAM_INT); $stmt->execute(); while ($language = $stmt->fetch(PDO::FETCH_ASSOC)) { // display original name in brackets, if a localized version is available if ($language['name_original'] != '') { - echo '<option value="'.$language['id'].'">'.$language['name'].' ('.htmlentities($language['name_original']).')</option>'; + echo '<option value="'.$language['id'].'">'.$language['name'].' ('.htmlspecialchars($language['name_original']).')</option>'; } else { echo '<option value="'.$language['id'].'">'.$language['name'].'</option>'; } } + + if ($thisuser->language() > 0) { + echo '</optgroup>'; + } // close navigation and open content area echo_strip(' - </optgroup> </select> </div> </li> Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -172,7 +172,7 @@ <tr id="tra'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editAccess(".$access['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$access['standard'].'</td> <td>'.$access['name'].'</td> - <td>'.htmlentities($access['description']).'</td> + <td>'.htmlspecialchars($access['description']).'</td> </tr>'); } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -225,7 +225,7 @@ <tr id="trg'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editGroup(".$group['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$group['security_level'].'</td> <td>'.$group['name'].'</td> - <td>'.htmlentities($group['description']).'</td> + <td>'.htmlspecialchars($group['description']).'</td> </tr>'); } } // end of member function showSearch Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -117,7 +117,7 @@ <tr id="trl'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editLanguage(".$lang['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$lang['name_short'].'</td> <td>'.$lang['name'].'</td> - <td>'.htmlentities($lang['name_original']).'</td> + <td>'.htmlspecialchars($lang['name_original']).'</td> </tr>'); } } // end of member function showSearch Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -55,7 +55,7 @@ } // email addresses - $receiver = htmlentities($receiver, ENT_NOQUOTES, 'UTF-8'); + $receiver = htmlspecialchars($receiver, ENT_NOQUOTES, 'UTF-8'); // header $headers = ""; Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -233,7 +233,7 @@ $target_clean = ''; if (isset($_REQUEST['target']) && preg_match('/^(\/[a-zA-Z0-9!$%&,\'()*+\-.\/:;=?@_~]+)$/', $_REQUEST['target'], $matches)) { - $target_clean = htmlentities($matches[1]); + $target_clean = htmlspecialchars($matches[1]); } echo_strip(' Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -86,7 +86,7 @@ <h2>Profile Search</h2> <div class="field"> <label for="search">Username</label> - <input name="search" type="text" id="search" value="'.@htmlentities($_GET['search']).'" /> + <input name="search" type="text" id="search" value="'.@htmlspecialchars($_GET['search']).'" /> </div> <div class="field"> <input type="hidden" name="page" id="page" value="search" />

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