Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[gschneider] 42826: Remove glyph guard (bug #933): there is no way to such an exclusion properly without working GetCharPlacement, every font engine handles glyphed output slightly different. Fixes Abiword text regression
by gschneider＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: gschneider Date: Fri Aug 21 16:35:48 2009 New Revision: 42826 URL: http://svn.reactos.org/svn/reactos?rev=42826&view=rev Log: Remove glyph guard (bug #933): there is no way to such an exclusion properly without working GetCharPlacement, every font engine handles glyphed output slightly different. Fixes Abiword text regression Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Fri Aug 21 16:35:48 2009 @@ -3732,12 +3732,6 @@ } } - /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ - if ((fuOptions & ETO_GLYPH_INDEX) && (fuOptions != (ETO_GLYPH_INDEX | ETO_PDY))) - { - fuOptions &= ~ETO_GLYPH_INDEX; - } - /* Finally call the internal routine */ Result = GreExtTextOutW(hDC, XStart,

1 0

[janderwald] 42825: - Remove test code
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 15:15:38 2009 New Revision: 42825 URL: http://svn.reactos.org/svn/reactos?rev=42825&view=rev Log: - Remove test code Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Fri Aug 21 15:15:38 2009 @@ -203,8 +203,6 @@ PIO_WORKITEM WorkItem = NULL; PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = NULL; - PDEVICE_OBJECT AudioDeviceObject; - UNICODE_STRING ReferenceString, SymbolicLinkName; /* a new device has arrived */ DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); @@ -259,24 +257,6 @@ Ctx->DeviceEntry = DeviceEntry; Ctx->WorkItem = WorkItem; - - /* HACK - * sysaudio should register the device object for itself - */ - AudioDeviceObject = IoGetRelatedDeviceObject(DeviceEntry->FileObject); - RtlInitUnicodeString(&ReferenceString, L"sad0"); - Status = IoRegisterDeviceInterface(AudioDeviceObject, &KSCATEGORY_AUDIO_DEVICE, &ReferenceString, &SymbolicLinkName); - if (NT_SUCCESS(Status)) - { - IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - RtlFreeUnicodeString(&SymbolicLinkName); - } - else - { - DPRINT1("Failed to open %wZ with Status %x\n", &DeviceEntry->DeviceName, Status); - DbgBreakPoint(); - - } /* fetch device extension */ DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension;

1 0

[fireball] 42824: - Convert a wrong macro to an inlined function.
by fireball＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: fireball Date: Fri Aug 21 15:01:27 2009 New Revision: 42824 URL: http://svn.reactos.org/svn/reactos?rev=42824&view=rev Log: - Convert a wrong macro to an inlined function. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Fri Aug 21 15:01:27 2009 @@ -72,24 +72,28 @@ * The erratum (#4) description is incorrect. AMD's workaround waits * till some bits (mostly reserved) are clear; ok for all revs. */ -#define read_roothub(hc, register, mask) ({ \ - ULONG temp = OHCI_READ_PORT_ULONG(&((hc)->regs->roothub.register)); \ - if (temp == -1) \ - /*disable (hc)*/; \ - /*else if (hc->flags & OHCI_QUIRK_AMD756) \ - while (temp & mask) \ - temp = ohci_readl (hc, &hc->regs->roothub.register); */ \ - temp; }) +ULONG +FORCEINLINE +read_roothub(POHCI_DEV hc, PULONG reg, ULONG mask) +{ + ULONG temp = OHCI_READ_PORT_ULONG(reg); + if (temp == -1) + /*disable (hc)*/; + /*else if (hc->flags & OHCI_QUIRK_AMD756) + while (temp & mask) + temp = ohci_readl (hc, &hc->regs->roothub.register); */ + return temp; +} static ULONG roothub_a (POHCI_DEV hc) - { return read_roothub (hc, a, 0xfc0fe000); } + { return read_roothub (hc, &hc->regs->roothub.a, 0xfc0fe000); } /* static inline u32 roothub_b (struct ohci_hcd *hc) { return ohci_readl (hc, &hc->regs->roothub.b); } static inline u32 roothub_status (struct ohci_hcd *hc) { return ohci_readl (hc, &hc->regs->roothub.status); } static u32 roothub_portstatus (struct ohci_hcd *hc, int i) - { return read_roothub (hc, portstatus [i], 0xffe0fce0); } + { return read_roothub (hc, &hc->regs->roothub.portstatus [i], 0xffe0fce0); } */

1 0

[janderwald] 42823: - Partly implement KsCreateBusEnumObject
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 14:58:20 2009 New Revision: 42823 URL: http://svn.reactos.org/svn/reactos?rev=42823&view=rev Log: - Partly implement KsCreateBusEnumObject Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/kstypes.h Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Fri Aug 21 14:58:20 2009 @@ -1709,7 +1709,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1722,8 +1722,118 @@ IN REFGUID InterfaceGuid OPTIONAL, IN PWCHAR ServiceRelativePath OPTIONAL) { - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + ULONG Length; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PDEVICE_EXTENSION DeviceExtension; + + /* calculate sizeof bus enum device extension */ + Length = wcslen(BusIdentifier) * sizeof(WCHAR); + Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); + + BusDeviceExtension = ExAllocatePool(NonPagedPool, Length); + if (!BusDeviceExtension) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* zero device extension */ + RtlZeroMemory(BusDeviceExtension, sizeof(BUS_ENUM_DEVICE_EXTENSION)); + + /* initialize bus device extension */ + wcscpy(BusDeviceExtension->BusIdentifier, BusIdentifier); + + /* allocate service path string */ + Length = ServiceKeyPath.MaximumLength; + Length += BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName.MaximumLength; + + if (ServiceRelativePath) + { + /* relative path for devices */ + Length += wcslen(ServiceRelativePath) + 2 * sizeof(WCHAR); + } + + BusDeviceExtension->ServicePath.Length = 0; + BusDeviceExtension->ServicePath.MaximumLength = Length; + BusDeviceExtension->ServicePath.Buffer = ExAllocatePool(NonPagedPool, Length); + + if (!BusDeviceExtension->ServicePath.Buffer) + { + /* not enough memory */ + ExFreePool(BusDeviceExtension); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &ServiceKeyPath); + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName); + + if (ServiceRelativePath) + { + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, L"\\"); + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, ServiceRelativePath); + } + + if (InterfaceGuid) + { + /* register an device interface */ + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, InterfaceGuid, NULL, &BusDeviceExtension->SymbolicLinkName); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + return Status; + } + + /* now enable device interface */ + Status = IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, TRUE); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + return Status; + } + + /* set state enabled */ + BusDeviceExtension->Enabled = TRUE; + } + + /* store device objects */ + BusDeviceExtension->BusDeviceObject = BusDeviceObject; + BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; + BusDeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + + if (!PnpDeviceObject) + { + BusDeviceExtension->PnpDeviceObject = IoAttachDeviceToDeviceStack(BusDeviceObject, PhysicalDeviceObject); + + if (!BusDeviceExtension->PnpDeviceObject) + { + /* failed to attach device */ + if (BusDeviceExtension->Enabled) + { + IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, FALSE); + RtlFreeUnicodeString(&BusDeviceExtension->SymbolicLinkName); + } + + /* free device extension */ + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + + return STATUS_DEVICE_REMOVED; + } + } + + /* attach device extension */ + DeviceExtension = (PDEVICE_EXTENSION)BusDeviceObject->DeviceExtension; + DeviceExtension->DeviceHeader = (PKSIDEVICE_HEADER)BusDeviceExtension; + + /* FIXME scan bus and invalidate device relations */ + return Status; } NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Fri Aug 21 14:58:20 2009 @@ -145,4 +145,19 @@ typedef BOOLEAN (NTAPI *PKSEVENT_SYNCHRONIZED_ROUTINE)(PKSEVENT_CTX Context); +typedef struct +{ + BOOLEAN Enabled; + + PDEVICE_OBJECT PnpDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT BusDeviceObject; + + UNICODE_STRING ServicePath; + UNICODE_STRING SymbolicLinkName; + + WCHAR BusIdentifier[1]; +}BUS_ENUM_DEVICE_EXTENSION, *PBUS_ENUM_DEVICE_EXTENSION; + + #endif

1 0

[gschneider] 42822: - co_IntLoadSysMenuTemplate: only copy buffer if prior operation succeeded, bug #4803 - co_IntLoadDefaultCursors: result is not used, no need to copy it
by gschneider＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: gschneider Date: Fri Aug 21 13:27:24 2009 New Revision: 42822 URL: http://svn.reactos.org/svn/reactos?rev=42822&view=rev Log: - co_IntLoadSysMenuTemplate: only copy buffer if prior operation succeeded, bug #4803 - co_IntLoadDefaultCursors: result is not used, no need to copy it Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Aug 21 13:27:24 2009 @@ -249,7 +249,7 @@ HMENU APIENTRY co_IntLoadSysMenuTemplate() { - LRESULT Result; + LRESULT Result = 0; NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; @@ -264,23 +264,20 @@ 0, &ResultPointer, &ResultLength); - - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; + if (NT_SUCCESS(Status)) + { + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + } UserEnterCo(); - if (!NT_SUCCESS(Status)) - { - return(0); - } return (HMENU)Result; } BOOL APIENTRY co_IntLoadDefaultCursors(VOID) { - LRESULT Result; NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; @@ -296,9 +293,6 @@ sizeof(BOOL), &ResultPointer, &ResultLength); - - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; UserEnterCo();

1 0

[janderwald] 42821: - Don't touch the freed buffer in case of an error - Found by Amine Khaldi
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 12:30:05 2009 New Revision: 42821 URL: http://svn.reactos.org/svn/reactos?rev=42821&view=rev Log: - Don't touch the freed buffer in case of an error - Found by Amine Khaldi Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Fri Aug 21 12:30:05 2009 @@ -920,7 +920,10 @@ DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); ExFreePool(SymbolicLinkName->Buffer); } - SymbolicLinkName->Buffer[1] = '?'; + else + { + SymbolicLinkName->Buffer[1] = '?'; + } ZwClose(SubKey); ZwClose(InterfaceKey);

1 0

[janderwald] 42820: - Remove hacks for bug 4566
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 12:06:29 2009 New Revision: 42820 URL: http://svn.reactos.org/svn/reactos?rev=42820&view=rev Log: - Remove hacks for bug 4566 Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] Fri Aug 21 12:06:29 2009 @@ -74,7 +74,7 @@ /* now register device interface */ Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &Categories[Index], - ReferenceString, /* see damn bug 4566 */ + ReferenceString, &SymEntry->SymbolicLink); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Aug 21 12:06:29 2009 @@ -635,7 +635,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1781,9 +1781,10 @@ /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; - /* hack for bug 4566 */ + if (IoStack->FileObject->FileName.Buffer == NULL) { + /* FIXME Pnp-Issue */ DPRINT("Using reference string hack\n"); Irp->IoStatus.Information = 0; /* set return status */ @@ -1834,116 +1835,6 @@ } NTSTATUS -RosDeviceInterfaceReferenceStringHack( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIDEVICE_HEADER DeviceHeader; - PDEVICE_EXTENSION DeviceExtension; - PCREATE_ITEM_ENTRY CreateItemEntry; - PLIST_ENTRY Entry; - LPWSTR Buffer; - ULONG Length; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; - /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; - - /* retrieve all available reference strings registered */ - Length = 0; - Entry = DeviceHeader->ItemList.Flink; - while(Entry != &DeviceHeader->ItemList) - { - CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); - - ASSERT(CreateItemEntry->CreateItem); - if (CreateItemEntry->CreateItem->Create && CreateItemEntry->CreateItem->ObjectClass.Buffer) - Length += wcslen(CreateItemEntry->CreateItem->ObjectClass.Buffer) + 1; - - Entry = Entry->Flink; - } - - /* add extra zero */ - Length += 1; - - /* allocate the buffer */ - Buffer = ExAllocatePool(NonPagedPool, Length * sizeof(WCHAR)); - if (!Buffer) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - - *((LPWSTR*)Irp->UserBuffer) = Buffer; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(LPWSTR); - - Entry = DeviceHeader->ItemList.Flink; - while(Entry != &DeviceHeader->ItemList) - { - CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); - - ASSERT(CreateItemEntry->CreateItem); - if (CreateItemEntry->CreateItem->Create && CreateItemEntry->CreateItem->ObjectClass.Buffer) - { - wcscpy(Buffer, CreateItemEntry->CreateItem->ObjectClass.Buffer); - Buffer += wcslen(Buffer) + 1; - } - Entry = Entry->Flink; - } - - - - *Buffer = L'\0'; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - -} - -NTSTATUS -NTAPI -KspDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - PKSIDEVICE_HEADER DeviceHeader; - PDEVICE_EXTENSION DeviceExtension; - - - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; - /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; - - if (IoStack->MajorFunction == IRP_MJ_DEVICE_CONTROL && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_OBJECT_CLASS) - { - /* hack for bug 4566 */ - return RosDeviceInterfaceReferenceStringHack(DeviceObject, Irp); - } - - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - ASSERT(ObjectHeader); - //KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - - return ObjectHeader->DispatchTable.DeviceIoControl(DeviceObject, Irp); -} - -NTSTATUS NTAPI KspDispatchIrp( IN PDEVICE_OBJECT DeviceObject, @@ -1969,7 +1860,7 @@ if (!ObjectHeader) { - /* hack for bug 4566 */ + /* FIXME Pnp-Issue*/ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; /* complete and forget */ @@ -2045,8 +1936,6 @@ break; break; case IRP_MJ_DEVICE_CONTROL: - DriverObject->MajorFunction[MajorFunction] = KspDeviceControl; - break; case IRP_MJ_CLOSE: case IRP_MJ_READ: case IRP_MJ_WRITE: @@ -2102,12 +1991,6 @@ } } - if (IoStack->MajorFunction == IRP_MJ_DEVICE_CONTROL) - { - /* handle device requests */ - return KspDeviceControl(DeviceObject, Irp); - } - switch (IoStack->MajorFunction) { case IRP_MJ_CLOSE: @@ -2117,6 +2000,7 @@ case IRP_MJ_QUERY_SECURITY: case IRP_MJ_SET_SECURITY: case IRP_MJ_PNP: + case IRP_MJ_DEVICE_CONTROL: return KspDispatchIrp(DeviceObject, Irp); default: return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Fri Aug 21 12:06:29 2009 @@ -20,9 +20,6 @@ #define TAG_DEVICE_HEADER TAG('H','D','S','K') -#define IOCTL_KS_OBJECT_CLASS CTL_CODE(FILE_DEVICE_KS, 0x7, METHOD_NEITHER, FILE_ANY_ACCESS) - - #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ DEFINE_KSPROPERTY_TABLE(PinSet) {\ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri Aug 21 12:06:29 2009 @@ -312,8 +312,9 @@ */ Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], - NULL, //&RefName, + &RefName, &SymbolicLinkName); + if (NT_SUCCESS(Status)) { /* activate device interface */ Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Fri Aug 21 12:06:29 2009 @@ -13,8 +13,6 @@ const GUID KS_CATEGORY_AUDIO = {0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KS_CATEGORY_TOPOLOGY = {0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}}; const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL = {0xBF963D80L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; - -#define IOCTL_KS_OBJECT_CLASS CTL_CODE(FILE_DEVICE_KS, 0x7, METHOD_NEITHER, FILE_ANY_ACCESS) NTSTATUS BuildPinDescriptor( @@ -198,14 +196,15 @@ NTSTATUS InsertAudioDevice( IN PDEVICE_OBJECT DeviceObject, - IN PUNICODE_STRING DeviceName, - IN LPWSTR ReferenceString) + IN PUNICODE_STRING DeviceName) { NTSTATUS Status = STATUS_SUCCESS; PFILTER_WORKER_CONTEXT Ctx = NULL; PIO_WORKITEM WorkItem = NULL; PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = NULL; + PDEVICE_OBJECT AudioDeviceObject; + UNICODE_STRING ReferenceString, SymbolicLinkName; /* a new device has arrived */ DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); @@ -240,12 +239,6 @@ DeviceEntry->DeviceName.Length = 0; DeviceEntry->DeviceName.MaximumLength = DeviceName->MaximumLength + 10 * sizeof(WCHAR); - /* hack for bug 4566 */ - if (ReferenceString) - { - DeviceEntry->DeviceName.MaximumLength += (wcslen(ReferenceString) + 2) * sizeof(WCHAR); - } - DeviceEntry->DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceEntry->DeviceName.MaximumLength); if (!DeviceEntry->DeviceName.Buffer) @@ -256,12 +249,6 @@ RtlAppendUnicodeToString(&DeviceEntry->DeviceName, L"\\??\\"); RtlAppendUnicodeStringToString(&DeviceEntry->DeviceName, DeviceName); - - if (ReferenceString) - { - RtlAppendUnicodeToString(&DeviceEntry->DeviceName, L"\\"); - RtlAppendUnicodeToString(&DeviceEntry->DeviceName, ReferenceString); - } Status = OpenDevice(&DeviceEntry->DeviceName, &DeviceEntry->Handle, &DeviceEntry->FileObject); @@ -272,6 +259,24 @@ Ctx->DeviceEntry = DeviceEntry; Ctx->WorkItem = WorkItem; + + /* HACK + * sysaudio should register the device object for itself + */ + AudioDeviceObject = IoGetRelatedDeviceObject(DeviceEntry->FileObject); + RtlInitUnicodeString(&ReferenceString, L"sad0"); + Status = IoRegisterDeviceInterface(AudioDeviceObject, &KSCATEGORY_AUDIO_DEVICE, &ReferenceString, &SymbolicLinkName); + if (NT_SUCCESS(Status)) + { + IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + RtlFreeUnicodeString(&SymbolicLinkName); + } + else + { + DPRINT1("Failed to open %wZ with Status %x\n", &DeviceEntry->DeviceName, Status); + DbgBreakPoint(); + + } /* fetch device extension */ DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -312,13 +317,6 @@ DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event; NTSTATUS Status = STATUS_SUCCESS; PSYSAUDIODEVEXT DeviceExtension; - UNICODE_STRING DeviceName; - HANDLE Handle; - PFILE_OBJECT FileObject; - LPWSTR ReferenceString; - ULONG BytesReturned; - - PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -328,54 +326,7 @@ if (IsEqualGUIDAligned(&Event->Event, &GUID_DEVICE_INTERFACE_ARRIVAL)) { - /*<HACK> - * 1) Open the filter w/o reference string - * 2) Retrieve reference strings with our private IOCTL_KS_OBJECT_CLASS - * 3) Append these reference strings to symbolic link we got - * * see bug 4566 - */ - - DeviceName.Length = 0; - DeviceName.MaximumLength = Event->SymbolicLinkName->Length + 10 * sizeof(WCHAR); - - DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceName.MaximumLength); - - if (!DeviceName.Buffer) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlAppendUnicodeToString(&DeviceName, L"\\??\\"); - RtlAppendUnicodeStringToString(&DeviceName, Event->SymbolicLinkName); - - - Status = OpenDevice(&DeviceName, &Handle, &FileObject); - if (!NT_SUCCESS(Status)) - { - ExFreePool(DeviceName.Buffer); - return Status; - } - - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_OBJECT_CLASS, NULL, 0, &ReferenceString, sizeof(LPWSTR), &BytesReturned); - if (!NT_SUCCESS(Status)) - { - DPRINT1("failed Status %x\n", Status); - - ExFreePool(DeviceName.Buffer); - ObDereferenceObject(FileObject); - ZwClose(Handle); - return Status; - } - - while(*ReferenceString) - { - Status = InsertAudioDevice(DeviceObject, Event->SymbolicLinkName, ReferenceString); - ReferenceString += wcslen(ReferenceString) + 1; - } - //ExFreePool(ReferenceString); - ObDereferenceObject(FileObject); - ZwClose(Handle); - ExFreePool(DeviceName.Buffer); + Status = InsertAudioDevice(DeviceObject, Event->SymbolicLinkName); return Status; } else

1 0

[janderwald] 42819: - Reference strings are not part of the symbolic link. Therefore don't include them when creating the symbolic link (IoCreateSymbolicLink) - Reference strings are used by the kernel streaming system to distinguish kernel streaming filters. As it is perfectly possible, to provide more than one filter with same guid but different reference string, ignore the failure for now if IoCreateSymbolicLink fails See issue #4566 for more details.
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 12:02:25 2009 New Revision: 42819 URL: http://svn.reactos.org/svn/reactos?rev=42819&view=rev Log: - Reference strings are not part of the symbolic link. Therefore don't include them when creating the symbolic link (IoCreateSymbolicLink) - Reference strings are used by the kernel streaming system to distinguish kernel streaming filters. As it is perfectly possible, to provide more than one filter with same guid but different reference string, ignore the failure for now if IoCreateSymbolicLink fails See issue #4566 for more details. Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Fri Aug 21 12:02:25 2009 @@ -881,17 +881,12 @@ } RtlAppendUnicodeToString(SymbolicLinkName, L"#"); RtlAppendUnicodeStringToString(SymbolicLinkName, &GuidString); - if (ReferenceString && ReferenceString->Length) - { - RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); - RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); - } SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; /* Create symbolic link */ DPRINT1("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && ReferenceString == NULL) { DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); ZwClose(SubKey); @@ -904,6 +899,13 @@ return Status; } + if (ReferenceString && ReferenceString->Length) + { + RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); + RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); + } + SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; + /* Write symbolic link name in registry */ SymbolicLinkName->Buffer[1] = '\\'; Status = ZwSetValueKey( @@ -958,10 +960,12 @@ PDEVICE_OBJECT PhysicalDeviceObject; PFILE_OBJECT FileObject; UNICODE_STRING GuidString; + UNICODE_STRING SymLink; PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; LPCGUID EventGuid; + if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -980,9 +984,13 @@ GuidString.Buffer = StartPosition; GuidString.MaximumLength = GuidString.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition); + SymLink.Buffer = SymbolicLinkName->Buffer; + SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer); + + /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( - SymbolicLinkName, + &SymLink, 0, /* DesiredAccess */ &FileObject, &PhysicalDeviceObject);

1 0

[mkupfer] 42818: Alexander Yastrebov <menone7 AT gmail DOT com> - Russian translation and update of utorrent added. - see issue #4762 for details. - stupid BOM for compatibility added.
by mkupfer＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: mkupfer Date: Fri Aug 21 11:00:54 2009 New Revision: 42818 URL: http://svn.reactos.org/svn/reactos?rev=42818&view=rev Log: Alexander Yastrebov <menone7 AT gmail DOT com> - Russian translation and update of utorrent added. - see issue #4762 for details. - stupid BOM for compatibility added. Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Fri Aug 21 11:00:54 2009 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Opera @@ -14,6 +14,5 @@ [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ Ð¸ BitTorrent ÐºÐ»Ð¸ÐµÐ½Ñ. - [Section.0407] Description = Der populÃ¤re Opera Browser mit vielen fortschrittlichen Eigenschaften, enthÃ¤lt einen Mail und BitTorrent Client. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Fri Aug 21 11:00:54 2009 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Mozilla SeaMonkey @@ -21,4 +21,4 @@ Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 8.9M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Fri Aug 21 11:00:54 2009 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Mozilla Thunderbird 2.0 @@ -21,4 +21,4 @@ Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 6.2M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Fri Aug 21 11:00:54 2009 @@ -1,18 +1,20 @@ -; UTF-8 +ï»¿; UTF-8 [Section] -Name = uTorrent -Version = 1.8 -Licence = Unknown +Name = ÂµTorrent +Version = 1.8.3 +Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = Unknown +Size = 281K Category = 5 -URLSite = Unknown -URLDownload = http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe +URLSite = http://www.utorrent.com/ +URLDownload = http://download.utorrent.com/1.8.3/utorrent.exe CDPath = none +[Section.0419] +Licence = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½Ðµ ÐºÐ¾Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ +Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ BitTorrent ÐºÐ»Ð¸ÐµÐ½Ñ. + [Section.0407] -Licence = Unbekannt +Licence = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Kleiner und schneller BitTorrent Client. -Size = Unbekannt -URLSite = Unbekannt

1 0

[sginsberg] 42817: - Include windef.h so CDECL gets declared for msvc's version of DEFINE_GUIDEX in ks.h
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 22:02:19 2009 New Revision: 42817 URL: http://svn.reactos.org/svn/reactos?rev=42817&view=rev Log: - Include windef.h so CDECL gets declared for msvc's version of DEFINE_GUIDEX in ks.h Modified: trunk/reactos/drivers/ksfilter/swenum/precomp.h Modified: trunk/reactos/drivers/ksfilter/swenum/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/pr… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/precomp.h [iso-8859-1] Thu Aug 20 22:02:19 2009 @@ -2,6 +2,7 @@ #define PRECOMP_H__ #include <ntddk.h> +#include <windef.h> #include <ks.h> #include <swenum.h> #include <debug.h>

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
66
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 August 2009