Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 39643: hardcode c:\reactos\system32\cmd.exe for now

by sedwards＠svn.reactos.org

Author: sedwards Date: Tue Feb 17 01:06:45 2009 New Revision: 39643 URL: http://svn.reactos.org/svn/reactos?rev=39643&view=rev Log: hardcode c:\reactos\system32\cmd.exe for now Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Tue Feb 17 01:06:45 2009 @@ -364,7 +364,7 @@ PROCESS_INFORMATION piProcInfo; SECURITY_ATTRIBUTES saAttr; - const char *name = "c:\\windows\\system32\\cmd.exe"; + const char *name = "c:\\reactos\\system32\\cmd.exe"; const char *cmd = NULL; //const char *name = "d:\\cygwin\\bin\\bash.exe"; //const char *cmd = "d:\\cygwin\\bin\\bash.exe --login -i";

16 years, 5 months

[janderwald] 39642: - Fix KSP_NODE struct and build

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 16 23:28:28 2009 New Revision: 39642 URL: http://svn.reactos.org/svn/reactos?rev=39642&view=rev Log: - Fix KSP_NODE struct and build Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3964… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Feb 16 23:28:28 2009 @@ -1479,6 +1479,9 @@ typedef struct { + KSPROPERTY Property; + ULONG NodeId; + ULONG Reserved; } KSP_NODE, *PKSP_NODE; typedef struct Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Mon Feb 16 23:28:28 2009 @@ -197,7 +197,11 @@ #define WAVE_FORMAT_96S08 131072 #define WAVE_FORMAT_96M16 262144 #define WAVE_FORMAT_96S16 524288 + +#ifndef WAVE_FORMAT_PCM #define WAVE_FORMAT_PCM 1 +#endif + #define MIDIERR_UNPREPARED MIDIERR_BASE #define MIDIERR_STILLPLAYING (MIDIERR_BASE+1) #define MIDIERR_NOMAP (MIDIERR_BASE+2)

16 years, 5 months

[arty] 39641: Merge cdfs from the WIP branch (and from previous merge traffic). Bring in my partly backported WIP from git.

by arty＠svn.reactos.org

Author: arty Date: Mon Feb 16 23:16:59 2009 New Revision: 39641 URL: http://svn.reactos.org/svn/reactos?rev=39641&view=rev Log: Merge cdfs from the WIP branch (and from previous merge traffic). Bring in my partly backported WIP from git. Added: branches/arty-newcc/ntoskrnl/cache/io.c (with props) Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.c branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h branches/arty-newcc/drivers/filesystems/cdfs/cleanup.c branches/arty-newcc/drivers/filesystems/cdfs/close.c branches/arty-newcc/drivers/filesystems/cdfs/common.c branches/arty-newcc/drivers/filesystems/cdfs/create.c branches/arty-newcc/drivers/filesystems/cdfs/dirctl.c branches/arty-newcc/drivers/filesystems/cdfs/fcb.c branches/arty-newcc/drivers/filesystems/cdfs/finfo.c branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c branches/arty-newcc/drivers/filesystems/cdfs/misc.c branches/arty-newcc/drivers/filesystems/cdfs/rw.c branches/arty-newcc/drivers/filesystems/cdfs/volinfo.c branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/mm/section.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… Added: branches/arty-newcc/ntoskrnl/cache/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/io.c?… Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge…

16 years, 5 months

[janderwald] 39640: - Implement KsTopologyPropertyHandler

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 16 22:52:11 2009 New Revision: 39640 URL: http://svn.reactos.org/svn/reactos?rev=39640&view=rev Log: - Implement KsTopologyPropertyHandler Modified: trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Mon Feb 16 22:52:11 2009 @@ -90,15 +90,172 @@ } /* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI KsTopologyPropertyHandler( IN PIRP Irp, IN PKSPROPERTY Property, IN OUT PVOID Data, IN const KSTOPOLOGY* Topology) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\MediaCategories\\"); + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"Name"); + UNICODE_STRING GuidString; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + KSMULTIPLE_ITEM * Item; + KSP_NODE * Node; + PIO_STACK_LOCATION IoStack; + ULONG Size; + NTSTATUS Status; + HANDLE hKey; + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + return STATUS_NOT_IMPLEMENTED; + } + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(Property->Id) + { + case KSPROPERTY_TOPOLOGY_CATEGORIES: + Size = sizeof(KSMULTIPLE_ITEM) + Topology->CategoriesCount * sizeof(GUID); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Irp->UserBuffer; + Item->Size = Size; + Item->Count = Topology->CategoriesCount; + + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->Categories, Topology->CategoriesCount * sizeof(GUID)); + Irp->IoStatus.Information = Size; + Status = STATUS_SUCCESS; + break; + + case KSPROPERTY_TOPOLOGY_NODES: + Size = sizeof(KSMULTIPLE_ITEM) + Topology->TopologyNodesCount * sizeof(GUID); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Irp->UserBuffer; + Item->Size = Size; + Item->Count = Topology->TopologyNodesCount; + + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyNodes, Topology->TopologyNodesCount * sizeof(GUID)); + Irp->IoStatus.Information = Size; + Status = STATUS_SUCCESS; + break; + + case KSPROPERTY_TOPOLOGY_CONNECTIONS: + Size = sizeof(KSMULTIPLE_ITEM) + Topology->TopologyConnectionsCount * sizeof(GUID); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Irp->UserBuffer; + Item->Size = Size; + Item->Count = Topology->TopologyConnectionsCount; + + RtlMoveMemory((PVOID)(Item + 1), (PVOID)Topology->TopologyConnections, Topology->TopologyConnectionsCount * sizeof(GUID)); + Irp->IoStatus.Information = Size; + Status = STATUS_SUCCESS; + break; + + case KSPROPERTY_TOPOLOGY_NAME: + Node = (KSP_NODE*)Property; + + Status = RtlStringFromGUID(&Topology->TopologyNodesNames[Node->NodeId], &GuidString); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + break; + } + + KeyName.Length = 0; + KeyName.MaximumLength = LocalMachine.Length + GuidString.Length + sizeof(WCHAR); + KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); + if (!KeyName.Buffer) + { + Irp->IoStatus.Information = 0; + break; + } + + RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); + RtlAppendUnicodeStringToString(&KeyName, &GuidString); + + + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); + ExFreePool(KeyName.Buffer); + Irp->IoStatus.Information = 0; + break; + } + ExFreePool(KeyName.Buffer); + Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, NULL, 0, &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + ZwClose(hKey); + Irp->IoStatus.Information = 0; + break; + } + + KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ExAllocatePool(NonPagedPool, Size); + if (!KeyInfo) + { + Status = STATUS_NO_MEMORY; + break; + } + + Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, (PVOID)KeyInfo, Size, &Size); + if (!NT_SUCCESS(Status)) + { + ExFreePool(KeyInfo); + ZwClose(hKey); + Irp->IoStatus.Information = 0; + break; + } + + ZwClose(hKey); + if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); + Status = STATUS_BUFFER_TOO_SMALL; + ExFreePool(KeyInfo); + break; + } + + RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); + ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); + ExFreePool(KeyInfo); + break; + default: + Irp->IoStatus.Information = 0; + Status = STATUS_NOT_IMPLEMENTED; + } + + + return Status; +}

16 years, 5 months

[tkreuzer] 39639: Fix 2 small typos

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 16 22:11:41 2009 New Revision: 39639 URL: http://svn.reactos.org/svn/reactos?rev=39639&view=rev Log: Fix 2 small typos Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Mon Feb 16 22:11:41 2009 @@ -454,7 +454,7 @@ UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); DPRINTM(DPRINT_WINDOWS, "WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length)); + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); if ((Length * sizeof(WCHAR)) > UnicodeName->Length) return FALSE; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Mon Feb 16 22:11:41 2009 @@ -715,7 +715,7 @@ else { // we have to construct ImagePath ourselves - PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys");; + PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys"); BootDriverEntry->FilePath.Length = 0; BootDriverEntry->FilePath.MaximumLength = PathLength+sizeof(WCHAR); BootDriverEntry->FilePath.Buffer = MmHeapAlloc(PathLength);

16 years, 5 months

[tkreuzer] 39638: Merge freeldr from amd64 branch: 34725, 34726, 34727, 34728, 34733, 34735, 34747, 34748, 34888, 34937, 34968, 35021, 35351, 35360, 35445, 35493, 35495, 35505, 35547, 35696, 35704, 36343, 36355, 36865, 37306, 37896, 38332, 38942, 38950, 38951, 38959, 39073, 39278

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 16 22:05:26 2009 New Revision: 39638 URL: http://svn.reactos.org/svn/reactos?rev=39638&view=rev Log: Merge freeldr from amd64 branch: 34725, 34726, 34727, 34728, 34733, 34735, 34747, 34748, 34888, 34937, 34968, 35021, 35351, 35360, 35445, 35493, 35495, 35505, 35547, 35696, 35704, 36343, 36355, 36865, 37306, 37896, 38332, 38942, 38950, 38951, 38959, 39073, 39278 Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/ - copied from r34725, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S - copied, changed from r34727, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/boot.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S - copied unchanged from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S - copied unchanged from r34727, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c - copied, changed from r34728, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S - copied, changed from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/ - copied from r34725, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/conversion.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/image.c trunk/reactos/lib/rtl/rtlp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=39… Copied: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S (from r34727, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Copied: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c (from r34728, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Copied: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S (from r34726, branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=39638&… Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=39638&r…

16 years, 5 months

[tkreuzer] 39636: Implement RtlInterlockedPopEntrySList, RtlInterlockedPushEntrySList and RtlInterlockedFlushSList in assembly. Based on the ExInterlocked functions in ntoskrnl.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 16 21:45:27 2009 New Revision: 39636 URL: http://svn.reactos.org/svn/reactos?rev=39636&view=rev Log: Implement RtlInterlockedPopEntrySList, RtlInterlockedPushEntrySList and RtlInterlockedFlushSList in assembly. Based on the ExInterlocked functions in ntoskrnl. Added: trunk/reactos/lib/rtl/i386/interlck.S (with props) Modified: trunk/reactos/lib/rtl/interlck.c trunk/reactos/lib/rtl/rtl.rbuild Added: trunk/reactos/lib/rtl/i386/interlck.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/interlck.S?re… ============================================================================== --- trunk/reactos/lib/rtl/i386/interlck.S (added) +++ trunk/reactos/lib/rtl/i386/interlck.S [iso-8859-1] Mon Feb 16 21:45:27 2009 @@ -1,0 +1,148 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/i386/interlck.S + * PURPOSE: Rtl Interlocked Functions for x86 + * PROGRAMMERS: Timo Kreuzer + */ + +.intel_syntax noprefix + +/* FUNCTIONS ****************************************************************/ + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedPopEntrySList( + * IN PSLIST_HEADER ListHead); + */ +.global _RtlInterlockedPopEntrySList@4 +_RtlInterlockedPopEntrySList@4: + + /* Save registers */ + push ebx + push ebp + + /* Load ListHead into ebp */ + mov ebp, [esp + 8] + + /* Load ListHead->Next into eax */ + mov eax, [ebp] + + /* Load ListHead->Depth and ListHead->Sequence into edx */ + mov edx, [ebp+4] + +1: + /* Check if ListHead->Next is NULL */ + or eax, eax + jz 2f + + /* Copy Depth and Sequence number and adjust Depth */ + lea ecx, [edx - 1] + + /* Get next pointer */ + mov ebx, [eax] + + /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ + lock cmpxchg8b [ebp] + + /* If not equal, retry with edx:eax, being the content of [ebp] now */ + jnz 1b + + /* Restore registers and return */ +2: + pop ebp + pop ebx + ret 4 + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedPushEntrySList( + * IN PSLIST_HEADER ListHead, + * IN PSLIST_ENTRY ListEntry); + */ +.global _RtlInterlockedPushEntrySList@8 +_RtlInterlockedPushEntrySList@8: + + /* Save registers */ + push ebx + push ebp + + /* Load ListHead into ebp */ + mov ebp, [esp + 4] + + /* Load ListEntry into ebx */ + mov ebx, [esp + 12] + + /* Load ListHead->Next into eax */ + mov eax, [ebp] + + /* Load ListHead->Depth and ListHead->Sequence into edx */ + mov edx, [ebp + 4] + +1: + /* Set ListEntry->Next to ListHead->Next */ + mov [ebx], eax + + /* Copy ListHead->Depth and ListHead->Sequence and adjust them */ + lea ecx, [edx + 0x10001] + + /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ + lock cmpxchg8b [ebp] + + /* If not equal, retry with edx:eax, being the content of [ebp] now */ + jnz 1b + + /* Restore registers and return */ + pop ebp + pop ebx + ret 8 + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedFlushSList( + * IN PSINGLE_LIST_ENTRY ListHead); + */ +.global _RtlInterlockedFlushSList@4 +_RtlInterlockedFlushSList@4: + + /* Save registers */ + push ebx + push ebp + + /* Clear ebx */ + xor ebx, ebx + + /* Load ListHead into ebp */ + mov ebp, [esp + 4] + + /* Load ListHead->Next into eax */ + mov eax, [ebp] + + /* Load ListHead->Depth and ListHead->Sequence into edx */ + mov edx, [ebp + 4] + +1: + /* Check if ListHead->Next is NULL */ + or eax, eax + jz 2f + + /* Copy Depth and Sequence number to ecx */ + mov ecx, edx + + /* Clear Depth in cx */ + xor cx, cx + + /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ + lock cmpxchg8b [ebp] + + /* If not equal, retry with edx:eax, being the content of [ebp] now */ + jnz 1b + + /* Restore registers and return */ +2: + pop ebp + pop ebx + ret 4 Propchange: trunk/reactos/lib/rtl/i386/interlck.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/interlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/interlck.c?rev=396… ============================================================================== --- trunk/reactos/lib/rtl/interlck.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/interlck.c [iso-8859-1] Mon Feb 16 21:45:27 2009 @@ -14,31 +14,6 @@ #include <debug.h> /* FUNCTIONS ***************************************************************/ - -PSLIST_ENTRY -NTAPI -RtlInterlockedPopEntrySList(IN PSLIST_HEADER ListHead) -{ - UNIMPLEMENTED; - return NULL; -} - -PSLIST_ENTRY -NTAPI -RtlInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) -{ - UNIMPLEMENTED; - return NULL; -} - -PSLIST_ENTRY -NTAPI -RtlInterlockedFlushSList(IN PSLIST_HEADER ListHead) -{ - UNIMPLEMENTED; - return NULL; -} PSLIST_ENTRY NTAPI Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=396… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Mon Feb 16 21:45:27 2009 @@ -12,6 +12,7 @@ <file>debug_asm.S</file> <file>except_asm.s</file> <file>except.c</file> + <file>interlck.S</file> <file>random_asm.S</file> <file>rtlswap.S</file> <file>rtlmem.s</file>

16 years, 5 months

[janderwald] 39635: - Implement KsPinDataIntersection

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 16 21:43:25 2009 New Revision: 39635 URL: http://svn.reactos.org/svn/reactos?rev=39635&view=rev Log: - Implement KsPinDataIntersection Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Mon Feb 16 21:43:25 2009 @@ -241,16 +241,66 @@ return Irp->IoStatus.Status; } -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsPinDataIntersection( IN PIRP Irp, - IN PKSPIN Pin, + IN PKSP_PIN Pin, OUT PVOID Data, IN ULONG DescriptorsCount, IN const KSPIN_DESCRIPTOR* Descriptor, IN PFNKSINTERSECTHANDLER IntersectHandler) { - return STATUS_SUCCESS; + KSMULTIPLE_ITEM * Item; + KSDATARANGE * DataRange; + PIO_STACK_LOCATION IoStack; + ULONG Size; + ULONG Index; + NTSTATUS Status; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Size = sizeof(KSP_PIN) + sizeof(KSMULTIPLE_ITEM) + sizeof(KSDATARANGE); + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Size) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + return STATUS_BUFFER_TOO_SMALL; + } + + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + + Item = (KSMULTIPLE_ITEM*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + DataRange = (KSDATARANGE*)(Item + 1); + + for(Index = 0; Index < Item->Count; Index++, DataRange++) + { + Status = IntersectHandler(Irp, Pin, DataRange, Data); + if (NT_SUCCESS(Status)) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSDATARANGE)) + { + Irp->IoStatus.Information = sizeof(KSDATARANGE); + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + return STATUS_BUFFER_TOO_SMALL; + } + RtlMoveMemory(Irp->UserBuffer, DataRange, sizeof(KSDATARANGE)); + Irp->IoStatus.Information = sizeof(KSDATARANGE); + Irp->IoStatus.Status = STATUS_SUCCESS; + return STATUS_SUCCESS; + } + + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_NO_MATCH; + return STATUS_NO_MATCH; } /* Does this belong here? */

16 years, 5 months

[janderwald] 39634: - Fix intersect handlers

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 16 21:42:33 2009 New Revision: 39634 URL: http://svn.reactos.org/svn/reactos?rev=39634&view=rev Log: - Fix intersect handlers Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3963… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Feb 16 21:42:33 2009 @@ -1437,7 +1437,8 @@ #endif -typedef struct { +typedef struct +{ ULONG Size; ULONG Count; } KSMULTIPLE_ITEM, *PKSMULTIPLE_ITEM; @@ -1574,10 +1575,27 @@ }; } KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR; -/* TODO */ -/* This is just to shut the compiler up so DON'T USE IT! */ -typedef void (*PFNKSINTERSECTHANDLER)(void); -typedef void (*PFNKSINTERSECTHANDLEREX)(void); +typedef +NTSTATUS +(*PFNKSINTERSECTHANDLER)( + IN PIRP Irp, + IN PKSP_PIN Pin, + IN PKSDATARANGE DataRange, + OUT PVOID Data OPTIONAL + ); + +typedef +NTSTATUS +(*PFNKSINTERSECTHANDLEREX)( + IN PVOID Context, + IN PIRP Irp, + IN PKSP_PIN Pin, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG DataBufferSize, + OUT PVOID Data OPTIONAL, + OUT PULONG DataSize + ); typedef struct { @@ -2445,7 +2463,7 @@ KSDDKAPI NTSTATUS NTAPI KsPinDataIntersection( IN PIRP Irp, - IN PKSPIN Pin, + IN PKSP_PIN Pin, OUT PVOID Data, IN ULONG DescriptorsCount, IN const KSPIN_DESCRIPTOR* Descriptor,

16 years, 5 months

[janderwald] 39633: - Implement KsPinPropertyHandler

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 16 21:07:30 2009 New Revision: 39633 URL: http://svn.reactos.org/svn/reactos?rev=39633&view=rev Log: - Implement KsPinPropertyHandler Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Mon Feb 16 21:07:30 2009 @@ -34,7 +34,9 @@ return STATUS_SUCCESS; } -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsPinPropertyHandler( IN PIRP Irp, IN PKSPROPERTY Property, @@ -42,7 +44,201 @@ IN ULONG DescriptorsCount, IN const KSPIN_DESCRIPTOR* Descriptor) { - return STATUS_SUCCESS; + KSP_PIN * Pin; + KSMULTIPLE_ITEM * Item; + PIO_STACK_LOCATION IoStack; + ULONG Size; + PVOID Buffer; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + Buffer = Irp->UserBuffer; + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + return STATUS_NOT_IMPLEMENTED; + } + + switch(Property->Id) + { + case KSPROPERTY_PIN_CTYPES: + (*(PULONG)Buffer) = DescriptorsCount; + Irp->IoStatus.Information = sizeof(ULONG); + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + case KSPROPERTY_PIN_DATAFLOW: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + Size = sizeof(KSPIN_DATAFLOW); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + *((KSPIN_DATAFLOW*)Buffer) = Descriptor[Pin->PinId].DataFlow; + Irp->IoStatus.Information = sizeof(KSPIN_DATAFLOW); + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case KSPROPERTY_PIN_DATARANGES: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSDATARANGE) * Descriptor[Pin->PinId].DataRangesCount; + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Buffer; + Item->Size = Size; + Item->Count = Descriptor[Pin->PinId].DataRangesCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].DataRanges, Descriptor[Pin->PinId].DataRangesCount * sizeof(KSDATARANGE)); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + case KSPROPERTY_PIN_INTERFACES: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_INTERFACE) * Descriptor[Pin->PinId].InterfacesCount; + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Buffer; + Item->Size = Size; + Item->Count = Descriptor[Pin->PinId].InterfacesCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSDATARANGE)); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + case KSPROPERTY_PIN_MEDIUMS: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSPIN_MEDIUM) * Descriptor[Pin->PinId].MediumsCount; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + Item = (KSMULTIPLE_ITEM*)Buffer; + Item->Size = Size; + Item->Count = Descriptor[Pin->PinId].MediumsCount; + RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Mediums, Descriptor[Pin->PinId].MediumsCount * sizeof(KSDATARANGE)); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + + case KSPROPERTY_PIN_COMMUNICATION: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(KSPIN_COMMUNICATION); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + *((KSPIN_COMMUNICATION*)Buffer) = Descriptor[Pin->PinId].Communication; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + + case KSPROPERTY_PIN_CATEGORY: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(GUID); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Category, sizeof(GUID)); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + + case KSPROPERTY_PIN_NAME: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= DescriptorsCount) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + Size = sizeof(GUID); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) + { + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + + RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + break; + default: + DPRINT1("Unhandled property request %x\n", Property->Id); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + } + + return Irp->IoStatus.Status; } KSDDKAPI NTSTATUS NTAPI

16 years, 5 months

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