Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

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

19 Apr '09

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

1 0

[dgoette] 383: update bugzilla subsystem with new db layout
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 19:50:52 2009 New Revision: 383 URL: http://svn.reactos.org/svn/reactos?rev=383&view=rev Log: update bugzilla subsystem with new db layout Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] Sun Apr 19 19:50:52 2009 @@ -80,29 +80,28 @@ } my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; trick_taint($browser_agent_clean); - my $query = "SELECT m.map_subsys_userid, m.map_roscms_userid " . - " FROM $roscms_db_name.user_sessions s, " . - " $roscms_db_name.users u, " . - " $roscms_db_name.subsys_mappings m " . - " WHERE s.usersession_id = ? " . - " AND (s.usersession_expires IS NULL OR " . - " NOW() <= s.usersession_expires) " . - " AND u.user_id = s.usersession_user_id " . - " AND (u.user_setting_ipaddress = 'false' OR " . - " s.usersession_ipaddress = ?) " . - " AND (u.user_setting_browseragent = 'false' OR " . - " s.usersession_browseragent = ?) " . - " AND m.map_roscms_userid = s.usersession_user_id " . - " AND m.map_subsys_name = 'bugzilla'"; + my $query = "SELECT m.subsys_user_id, m.user_id " . + " FROM $roscms_db_name.roscms_accounts_sessions s " . + " JOIN $roscms_db_name.roscms_accounts u ON s.user_id = u.id " . + " JOIN $roscms_db_name.roscms_rel_accounts_subsys m ON m.user_id=u.id " . + " WHERE s.id = ? " . + " AND (s.expires IS NULL OR " . + " NOW() <= s.expires) " . + " AND (s.ip = 'false' OR " . + " s.ip = ?) " . + " AND (s.browseragent = 'false' OR " . + " s.browseragent = ?) " . + " AND m.subsys = 'bugzilla'"; + my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); ($user_id, $roscms_user_id) = $dbh->selectrow_array($query, undef, @params); if ($user_id) { # Update time of last session use - $query = "UPDATE $roscms_db_name.user_sessions " . - " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . - " WHERE usersession_id = ? " . - " AND usersession_expires IS NOT NULL"; + $query = "UPDATE $roscms_db_name.roscms_accounts_sessions " . + " SET expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + " WHERE id = ? " . + " AND expires IS NOT NULL"; @params = ($session_id_clean); $dbh->do($query, undef, @params); @@ -110,7 +109,7 @@ # We don't check the password explicitly here as we only deal with the session cookie. # To show the Verify module that it should trust us, we pass the MD5 password hash to it. This should be secure as long as we're the only one who knows this MD5 hash. my $username = user_id_to_login($user_id); - (my $md5_password) = $dbh->selectrow_array("SELECT user_roscms_password FROM $roscms_db_name.users WHERE user_id = ?", undef, $roscms_user_id); + (my $md5_password) = $dbh->selectrow_array("SELECT password FROM $roscms_db_name.roscms_accounts WHERE id = ?", undef, $roscms_user_id); # We need to set a parameter for the Auth::Persist::ROSCMS module $cgi->param('ROSCMS_login', 1); Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Verify/ROSCMS… [iso-8859-1] Sun Apr 19 19:50:52 2009 @@ -62,12 +62,11 @@ $md5_password = md5_hex($password); } - my $query = "SELECT u.user_roscms_password " . - "FROM $roscms_db_name.users u, " . - " $roscms_db_name.subsys_mappings m " . - "WHERE u.user_id = m.map_roscms_userid " . - " AND m.map_subsys_name = 'bugzilla' " . - " AND m.map_subsys_userid = ?"; + my $query = "SELECT u.password " . + "FROM $roscms_db_name.roscms_accounts u " . + "JOIN $roscms_db_name.roscms_rel_accounts_subsys m ON u.id=m.user_id " . + "WHERE m.subsys = 'bugzilla' " . + " AND m.subsys_user_id = ?"; (my $valid_md5_password) = $dbh->selectrow_array($query, undef, $user_id); return { failure => AUTH_LOGINFAILED }

1 0

[cfinck] 40588: - Revert r40581, this hack doesn't work anymore - Add a similar hack to CreateEnvironmentBlock, APPDATA is set properly now
by cfinck＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: cfinck Date: Sun Apr 19 18:41:41 2009 New Revision: 40588 URL: http://svn.reactos.org/svn/reactos?rev=40588&view=rev Log: - Revert r40581, this hack doesn't work anymore - Add a similar hack to CreateEnvironmentBlock, APPDATA is set properly now Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -175,9 +175,6 @@ SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; - UNICODE_STRING VariableName; - UNICODE_STRING VariableValue; - WCHAR AppDataPath[MAX_PATH]; /* Loading personal settings */ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); @@ -221,18 +218,6 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - - /* Use SHGetFolderPathW for getting the AppData path */ - if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL) - { - WARN("WL: SHGetFolderPathW() failed\n"); - goto cleanup; - } - - /* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */ - RtlInitUnicodeString(&VariableName, L"APPDATA"); - RtlInitUnicodeString(&VariableValue, AppDataPath); - RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue); if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) { @@ -278,8 +263,6 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); - - /* FIXME: Set the "Volatile Environment" key for the new user */ /* Set default language */ if (!SetDefaultLanguage(TRUE)) Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -39,7 +39,6 @@ #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> -#include <shlobj.h> #include <reactos/winlogon.h> Modified: branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -9,7 +9,6 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> - <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file> Modified: branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sun Apr 19 18:41:41 2009 @@ -379,6 +379,9 @@ L"USERPROFILE", Buffer, FALSE); + + wcscat(Buffer, L"\\Application Data"); + SetUserEnvironmentVariable(lpEnvironment, L"APPDATA", Buffer, FALSE); } /* FIXME: Set 'USERDOMAIN' variable */

1 0

[dgoette] 382: move install folder to resources, leave a comment how to re-enable it
by dgoette＠svn.reactos.org 19 Apr '09

19 Apr '09

Author: dgoette Date: Sun Apr 19 13:01:53 2009 New Revision: 382 URL: http://svn.reactos.org/svn/reactos?rev=382&view=rev Log: move install folder to resources, leave a comment how to re-enable it Added: branches/danny-web/resources/forum/ branches/danny-web/resources/forum/install/ (props changed) - copied from r381, branches/danny-web/www/www.reactos.org/forum/install/ branches/danny-web/www/www.reactos.org/forum/INSTALL.txt (with props) Removed: branches/danny-web/www/www.reactos.org/forum/install/ Propchange: branches/danny-web/resources/forum/install/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/htdocs/forum/install:288-336,343-346 Added: branches/danny-web/www/www.reactos.org/forum/INSTALL.txt URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/f… ============================================================================== --- branches/danny-web/www/www.reactos.org/forum/INSTALL.txt (added) +++ branches/danny-web/www/www.reactos.org/forum/INSTALL.txt [iso-8859-1] Sun Apr 19 13:01:53 2009 @@ -1,0 +1,1 @@ +If you want to install, you need to copy the install folder from ressources/forum to this folder and call this folder in your web-browser. Propchange: branches/danny-web/www/www.reactos.org/forum/INSTALL.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009