Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cgutman] 38730: - Discard unrecognized packets instead of passing them to protocol 0
by cgutman＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: cgutman Date: Mon Jan 12 12:07:37 2009 New Revision: 38730 URL: http://svn.reactos.org/svn/reactos?rev=38730&view=rev Log: - Discard unrecognized packets instead of passing them to protocol 0 Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Jan 12 12:07:37 2009 @@ -147,7 +147,8 @@ TI_DbgPrint(MIN_TRACE, ("IPv6 datagram discarded.\n")); return; default: - Protocol = 0; + TI_DbgPrint(MIN_TRACE, ("Unrecognized datagram discarded.\n")); + return; } if (Protocol < IP_PROTOCOL_TABLE_SIZE &&

1 0

[cgutman] 38729: - Don't crash if IPRemoveInterfaceRoute is called twice - Found by memtrack :)
by cgutman＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: cgutman Date: Mon Jan 12 12:04:14 2009 New Revision: 38729 URL: http://svn.reactos.org/svn/reactos?rev=38729&view=rev Log: - Don't crash if IPRemoveInterfaceRoute is called twice - Found by memtrack :) Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Jan 12 12:04:14 2009 @@ -309,22 +309,20 @@ PNEIGHBOR_CACHE_ENTRY NCE; IP_ADDRESS GeneralRoute; - TCPDisposeInterfaceData( IF->TCPContext ); - IF->TCPContext = NULL; - - TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); - TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); - - AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); - - RouterRemoveRoute(&GeneralRoute, &IF->Unicast); - - /* Remove permanent NCE, but first we have to find it */ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) - NBRemoveNeighbor(NCE); - else - TI_DbgPrint(DEBUG_IP, ("Could not delete IF route (0x%X)\n", IF)); + { + TCPDisposeInterfaceData( IF->TCPContext ); + + TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); + TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); + + AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); + + RouterRemoveRoute(&GeneralRoute, &IF->Unicast); + + NBRemoveNeighbor(NCE); + } } VOID IPUnregisterInterface(

1 0

[sginsberg] 38728: - Revert to pre-38722 to unbreak build
by sginsberg＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: sginsberg Date: Mon Jan 12 11:52:03 2009 New Revision: 38728 URL: http://svn.reactos.org/svn/reactos?rev=38728&view=rev Log: - Revert to pre-38722 to unbreak build Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c 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/power.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c 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] Mon Jan 12 11:52:03 2009 @@ -168,8 +168,7 @@ RtlZeroMemory(portcls_ext, sizeof(PCExtension)); portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; portcls_ext->StartDevice = StartDevice; - InitializeListHead(&portcls_ext->SubDeviceList); - InitializeListHead(&portcls_ext->PhysicalConnectionList); + InitializeListHead(&portcls_ext->SubDeviceList); status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL); if (!NT_SUCCESS(status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon Jan 12 11:52:03 2009 @@ -187,15 +187,7 @@ DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return PcNewRegistryKey(OutRegistryKey, - OuterUnknown, - RegistryKeyType, - DesiredAccess, - This->pDeviceObject, - NULL,//FIXME - ObjectAttributes, - CreateOptions, - Disposition); + return STATUS_UNSUCCESSFUL; } static IPortTopologyVtbl vt_IPortTopology = 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] Mon Jan 12 11:52:03 2009 @@ -247,23 +247,7 @@ IN ULONG CreateOptions OPTIONAL, OUT PULONG Disposition OPTIONAL) { - IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - - if (!This->bInitialized) - { - DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n"); - return STATUS_UNSUCCESSFUL; - } - - return PcNewRegistryKey(OutRegistryKey, - OuterUnknown, - RegistryKeyType, - DesiredAccess, - This->pDeviceObject, - NULL,//FIXME - ObjectAttributes, - CreateOptions, - Disposition); + return STATUS_UNSUCCESSFUL; } NTSTATUS 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] Mon Jan 12 11:52:03 2009 @@ -11,7 +11,6 @@ <library>rtl</library> <library>hal</library> <file>api.c</file> - <file>connection.c</file> <file>dll.c</file> <file>dma_slave.c</file> <file>drm_port.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] Mon Jan 12 11:52:03 2009 @@ -36,50 +36,3 @@ DeviceExt->AdapterPowerManagement = pPower; return STATUS_SUCCESS; } - - -static -VOID -NTAPI -PwrCompletionCallback( - IN PDEVICE_OBJECT DeviceObject, - IN UCHAR MinorFunction, - IN POWER_STATE PowerState, - IN PVOID Context, - IN PIO_STATUS_BLOCK IoStatus) -{ - KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); -} - -/* - * @implemented - */ -NTSTATUS NTAPI -PcRequestNewPowerState( - IN PDEVICE_OBJECT DeviceObject, - IN DEVICE_POWER_STATE RequestedNewState) -{ - KEVENT Event; - NTSTATUS Status; - POWER_STATE PowerState; - PCExtension* DeviceExt; - - if (!DeviceObject || !RequestedNewState) - return STATUS_INVALID_PARAMETER; - - DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - - PowerState.DeviceState = RequestedNewState; - PowerState.SystemState = PowerSystemUnspecified; - - Status = PoRequestPowerIrp(DeviceExt->PhysicalDeviceObject, IRP_MN_SET_POWER, PowerState, PwrCompletionCallback, (PVOID)&Event, NULL); - if (NT_SUCCESS(Status)) - { - KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); - } - - - return Status; -} - 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 Jan 12 11:52:03 2009 @@ -15,7 +15,6 @@ #include <dmusicks.h> #include "interfaces.h" -#include <ks.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') @@ -87,17 +86,6 @@ KSOBJECT_HEADER ObjectHeader; }SUBDEVICE_ENTRY; -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice * FromSubDevice; - LPWSTR FromUnicodeString; - ULONG FromPin; - ISubdevice * ToSubDevice; - LPWSTR ToUnicodeString; - ULONG ToPin; -}PHYSICAL_CONNECTION; - typedef struct { @@ -108,7 +96,6 @@ IResourceList* resources; LIST_ENTRY SubDeviceList; - LIST_ENTRY PhysicalConnectionList; } PCExtension; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Jan 12 11:52:03 2009 @@ -11,6 +11,29 @@ #include "private.h" #include <portcls.h> + +/* + Factory Stubs +*/ + + + +/* =============================================================== + Power Management +*/ + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT pDeviceObject, + IN DEVICE_POWER_STATE RequestedNewState) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + /* =============================================================== Properties @@ -28,3 +51,60 @@ return STATUS_UNSUCCESSFUL; } +/* =============================================================== + Physical Connections +*/ + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnection( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnectionFromExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcRegisterPhysicalConnectionToExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Misc +*/ + +/* + * @unimplemented + */

1 0

[cgutman] 38727: - Set the address type for the broadcast address - Zero the broadcast address in DispTdiDeleteIPAddress
by cgutman＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: cgutman Date: Mon Jan 12 11:46:05 2009 New Revision: 38727 URL: http://svn.reactos.org/svn/reactos?rev=38727&view=rev Log: - Set the address type for the broadcast address - Zero the broadcast address in DispTdiDeleteIPAddress Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Jan 12 11:46:05 2009 @@ -1553,6 +1553,7 @@ IF->Unicast.Address.IPv4Address = IpAddrChange->Address; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; + IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = IF->Unicast.Address.IPv4Address | ~IF->Netmask.Address.IPv4Address; @@ -1587,6 +1588,8 @@ IF->Unicast.Address.IPv4Address = 0; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = 0; + IF->Broadcast.Type = IP_ADDRESS_V4; + IF->Broadcast.Address.IPv4Address = 0; Status = STATUS_SUCCESS; } } EndFor(IF);

1 0

[fireball] 38726: - Stubplement handlers for all needed IRP_MJ except EA and PNP one. - Cleanup remains of unneeded functions.
by fireball＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: fireball Date: Mon Jan 12 11:04:13 2009 New Revision: 38726 URL: http://svn.reactos.org/svn/reactos?rev=38726&view=rev Log: - Stubplement handlers for all needed IRP_MJ except EA and PNP one. - Cleanup remains of unneeded functions. Added: trunk/reactos/drivers/filesystems/fastfat_new/device.c (with props) trunk/reactos/drivers/filesystems/fastfat_new/lock.c (with props) Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/flush.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,9 +14,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatCleanup(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT("FatCleanup(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,9 +14,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatClose(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("VfatClose(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); + DPRINT("FatClose(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,7 +14,8 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatCreate(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } Added: trunk/reactos/drivers/filesystems/fastfat_new/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/device.c (added) +++ trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS FAT file system driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filesystems/fastfat/device.c + * PURPOSE: Device control + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#define NDEBUG +#include "fastfat.h" + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +FatDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/filesystems/fastfat_new/device.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,7 +14,8 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatDirectoryControl(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -42,25 +42,25 @@ FatGlobalData.DriverObject = DriverObject; FatGlobalData.DiskDeviceObject = DeviceObject; - // TODO: Fill major function handlers -#if 0 - DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_READ] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_WRITE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = - VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = VfatShutdown; - DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest; -#endif + /* Fill major function handlers */ + DriverObject->MajorFunction[IRP_MJ_CLOSE] = FatClose; + DriverObject->MajorFunction[IRP_MJ_CREATE] = FatCreate; + DriverObject->MajorFunction[IRP_MJ_READ] = FatRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = FatWrite; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FatFileSystemControl; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = FatQueryInformation; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = FatSetInformation; + DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = FatDirectoryControl; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = FatQueryVolumeInfo; + DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = FatSetVolumeInfo; + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = FatShutdown; + DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = FatLockControl; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = FatDeviceControl; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = FatCleanup; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = FatFlushBuffers; + //DriverObject->MajorFunction[IRP_MJ_QUERY_EA] + //DriverObject->MajorFunction[IRP_MJ_SET_EA] + //DriverObject->MajorFunction[IRP_MJ_PNP] DriverObject->DriverUnload = NULL; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -457,27 +457,33 @@ /* -------------------------------------------------------- volume.c */ -NTSTATUS VfatQueryVolumeInformation (PFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetVolumeInformation (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatQueryVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +NTSTATUS NTAPI +FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* ------------------------------------------------------ blockdev.c */ /* ----------------------------------------------------------- dir.c */ -NTSTATUS VfatDirectoryControl (PFAT_IRP_CONTEXT); +NTSTATUS NTAPI +FatDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* -------------------------------------------------------- create.c */ -NTSTATUS VfatCreate (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* --------------------------------------------------------- close.c */ -NTSTATUS VfatClose (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* ------------------------------------------------------- cleanup.c */ -NTSTATUS VfatCleanup (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* --------------------------------------------------------- fastio.c */ @@ -505,16 +511,20 @@ VOID NTAPI FatNoopRelease(IN PVOID Context); +/* --------------------------------------------------------- lock.c */ + +NTSTATUS NTAPI +FatLockControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* --------------------------------------------------------- fsctl.c */ -NTSTATUS VfatFileSystemControl (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* --------------------------------------------------------- finfo.c */ -NTSTATUS VfatQueryInformation (PFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetInformation (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* --------------------------------------------------------- iface.c */ @@ -524,19 +534,27 @@ /* ----------------------------------------------------------- fat.c */ +/* ------------------------------------------------------ device.c */ + +NTSTATUS NTAPI +FatDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); + /* ------------------------------------------------------ direntry.c */ /* ----------------------------------------------------------- fcb.c */ /* ------------------------------------------------------------ rw.c */ -NTSTATUS VfatRead (PFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatWrite (PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +NTSTATUS NTAPI +FatWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* ------------------------------------------------------------- flush.c */ -NTSTATUS VfatFlush(PFAT_IRP_CONTEXT IrpContext); +NTSTATUS NTAPI +FatFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -9,6 +9,7 @@ <file>cleanup.c</file> <file>close.c</file> <file>create.c</file> + <file>device.c</file> <file>dir.c</file> <file>direntry.c</file> <file>ea.c</file> @@ -19,6 +20,7 @@ <file>finfo.c</file> <file>flush.c</file> <file>fsctl.c</file> + <file>lock.c</file> <file>rw.c</file> <file>shutdown.c</file> <file>volume.c</file> Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -13,12 +13,16 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS VfatQueryInformation(PFAT_IRP_CONTEXT IrpContext) +NTSTATUS +NTAPI +FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } -NTSTATUS VfatSetInformation(PFAT_IRP_CONTEXT IrpContext) +NTSTATUS +NTAPI +FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,14 +14,9 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb) -{ - DPRINT("VfatFlushVolume(DeviceExt %p, FatFcb %p)\n", DeviceExt, VolumeFcb); - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS VfatFlush(PFAT_IRP_CONTEXT IrpContext) +NTSTATUS +NTAPI +FatFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,9 +14,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatFileSystemControl(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); + DPRINT("VfatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Added: trunk/reactos/drivers/filesystems/fastfat_new/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/lock.c (added) +++ trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS FAT file system driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filesystems/fastfat/lock.c + * PURPOSE: Lock support routines + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#define NDEBUG +#include "fastfat.h" + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +FatLockControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/filesystems/fastfat_new/lock.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,13 +14,15 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatRead(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } NTSTATUS -VfatWrite(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -17,7 +17,7 @@ NTAPI FatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT("FatShutdown(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Mon Jan 12 11:04:13 2009 @@ -14,13 +14,15 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatQueryVolumeInformation(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatQueryVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; } NTSTATUS -VfatSetVolumeInformation(PFAT_IRP_CONTEXT IrpContext) +NTAPI +FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_NOT_IMPLEMENTED; }

1 0

[fireball] 38725: - Cleanup header file. - Add sync resource to the global data and initialize it. - Remove unneeded block device access functions.
by fireball＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: fireball Date: Mon Jan 12 10:31:22 2009 New Revision: 38725 URL: http://svn.reactos.org/svn/reactos?rev=38725&view=rev Log: - Cleanup header file. - Add sync resource to the global data and initialize it. - Remove unneeded block device access functions. Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] Mon Jan 12 10:31:22 2009 @@ -13,45 +13,4 @@ /* FUNCTIONS ***************************************************************/ -NTSTATUS -VfatReadDisk (IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN OUT PUCHAR Buffer, - IN BOOLEAN Override) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VfatReadDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - ULONG BufferOffset, - IN BOOLEAN Wait) -{ - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS -VfatWriteDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG OutputBufferSize, - IN BOOLEAN Override) -{ - return STATUS_NOT_IMPLEMENTED; -} +/* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Mon Jan 12 10:31:22 2009 @@ -104,6 +104,9 @@ TAG_IRP, 0); + /* Initialize synchronization resource for the global data */ + ExInitializeResourceLite(&FatGlobalData.Resource); + /* Register and reference our filesystem */ IoRegisterFileSystem(DeviceObject); ObReferenceObject(DeviceObject); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Jan 12 10:31:22 2009 @@ -2,17 +2,6 @@ #include <ntdddisk.h> #include <reactos/helper.h> #include <debug.h> - -#ifdef __GNUC__ -#include <ccros.h> - -#define USE_ROS_CC_AND_FS -#else -#define KEBUGCHECK KeBugCheck -#define KEBUGCHECKEX KeBugCheckEx -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) -#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) -#endif #include <pshpack1.h> struct _BootSector @@ -261,7 +250,7 @@ typedef NTSTATUS (*PGET_NEXT_DIR_ENTRY)(PVOID*,PVOID*,struct _VFATFCB*,struct _VFAT_DIRENTRY_CONTEXT*,BOOLEAN); -typedef struct DEVICE_EXTENSION +typedef struct _DEVICE_EXTENSION { ERESOURCE DirResource; ERESOURCE FatResource; @@ -294,8 +283,9 @@ LIST_ENTRY VolumeListEntry; } DEVICE_EXTENSION, VCB, *PVCB; -typedef struct -{ +typedef struct _FAT_GLOBAL_DATA +{ + ERESOURCE Resource; PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DiskDeviceObject; NPAGED_LOOKASIDE_LIST NonPagedFcbList; @@ -434,7 +424,7 @@ #define IRPCONTEXT_CANWAIT 0x0001 #define IRPCONTEXT_PENDINGRETURNED 0x0002 -typedef struct +typedef struct _FAT_IRP_CONTEXT { PIRP Irp; PDEVICE_OBJECT DeviceObject; @@ -461,9 +451,9 @@ /* ------------------------------------------------------ shutdown.c */ -DRIVER_DISPATCH VfatShutdown; -NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, - PIRP Irp); +DRIVER_DISPATCH FatShutdown; +NTSTATUS NTAPI +FatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* -------------------------------------------------------- volume.c */ @@ -473,68 +463,17 @@ /* ------------------------------------------------------ blockdev.c */ -NTSTATUS VfatReadDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN PUCHAR Buffer, - IN BOOLEAN Override); - -NTSTATUS VfatReadDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatWriteDiskPartial(IN PFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize, - IN BOOLEAN Override); - /* ----------------------------------------------------------- dir.c */ NTSTATUS VfatDirectoryControl (PFAT_IRP_CONTEXT); -BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, - USHORT DosDate, - USHORT DosTime, - PLARGE_INTEGER SystemTime); - -BOOLEAN FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER SystemTime, - USHORT *pDosDate, - USHORT *pDosTime); - /* -------------------------------------------------------- create.c */ NTSTATUS VfatCreate (PFAT_IRP_CONTEXT IrpContext); -NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, - PVFATFCB Parent, - PUNICODE_STRING FileToFindU, - PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -VOID vfat8Dot3ToString (PFAT_DIR_ENTRY pEntry, - PUNICODE_STRING NameU); - -NTSTATUS ReadVolumeLabel(PDEVICE_EXTENSION DeviceExt, - PVPB Vpb); - /* --------------------------------------------------------- close.c */ NTSTATUS VfatClose (PFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatCloseFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject); /* ------------------------------------------------------- cleanup.c */ @@ -577,216 +516,27 @@ NTSTATUS VfatSetInformation (PFAT_IRP_CONTEXT IrpContext); +/* --------------------------------------------------------- iface.c */ + NTSTATUS -VfatSetAllocationSizeInformation(PFILE_OBJECT FileObject, - PVFATFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER AllocationSize); - -/* --------------------------------------------------------- iface.c */ - -NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -/* --------------------------------------------------------- dirwr.c */ - -NTSTATUS VfatAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PVFATFCB* Fcb, - PVFATFCB ParentFcb, - ULONG RequestedOptions, - UCHAR ReqAttr); - -NTSTATUS VfatUpdateEntry (PVFATFCB pFcb); - -NTSTATUS VfatDelEntry(PDEVICE_EXTENSION, PVFATFCB); - -BOOLEAN -vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, - PVFATFCB pDirFcb, - ULONG nbSlots, - PULONG start); - -/* -------------------------------------------------------- string.c */ - -VOID -vfatSplitPathName(PUNICODE_STRING PathNameU, - PUNICODE_STRING DirNameU, - PUNICODE_STRING FileNameU); - -BOOLEAN vfatIsLongIllegal(WCHAR c); - -BOOLEAN wstrcmpjoki (PWSTR s1, - PWSTR s2); +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); /* ----------------------------------------------------------- fat.c */ -NTSTATUS FAT12GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT12FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT12WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT16GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT16FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT16WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT32GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT32FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT32WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS OffsetToCluster (PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - ULONG FileOffset, - PULONG Cluster, - BOOLEAN Extend); - -ULONGLONG ClusterToSector (PDEVICE_EXTENSION DeviceExt, - ULONG Cluster); - -NTSTATUS GetNextCluster (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS GetNextClusterExtend (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS CountAvailableClusters (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER Clusters); - -NTSTATUS -WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue); - /* ------------------------------------------------------ direntry.c */ -ULONG vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, - PDIR_ENTRY pDirEntry); - -BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb); - -NTSTATUS FATGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -NTSTATUS FATXGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - /* ----------------------------------------------------------- fcb.c */ -PVFATFCB vfatNewFCB (PDEVICE_EXTENSION pVCB, - PUNICODE_STRING pFileNameU); - -VOID vfatDestroyFCB (PVFATFCB pFCB); - -VOID vfatDestroyCCB(PVFATCCB pCcb); - -VOID vfatGrabFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatReleaseFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatAddFCBToTable (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -PVFATFCB vfatGrabFCBFromTable (PDEVICE_EXTENSION pDeviceExt, - PUNICODE_STRING pFileNameU); - -PVFATFCB vfatMakeRootFCB (PDEVICE_EXTENSION pVCB); - -PVFATFCB vfatOpenRootFCB (PDEVICE_EXTENSION pVCB); - -BOOLEAN vfatFCBIsDirectory (PVFATFCB FCB); - -BOOLEAN vfatFCBIsRoot(PVFATFCB FCB); - -NTSTATUS vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb, - PVFATFCB fcb, - PFILE_OBJECT fileObject); - -NTSTATUS vfatDirFindFile (PDEVICE_EXTENSION pVCB, - PVFATFCB parentFCB, - PUNICODE_STRING FileToFindU, - PVFATFCB * fileFCB); - -NTSTATUS vfatGetFCBForFile (PDEVICE_EXTENSION pVCB, - PVFATFCB *pParentFCB, - PVFATFCB *pFCB, - PUNICODE_STRING pFileNameU); - -NTSTATUS vfatMakeFCBFromDirEntry (PVCB vcb, - PVFATFCB directoryFCB, - PVFAT_DIRENTRY_CONTEXT DirContext, - PVFATFCB * fileFCB); - /* ------------------------------------------------------------ rw.c */ NTSTATUS VfatRead (PFAT_IRP_CONTEXT IrpContext); NTSTATUS VfatWrite (PFAT_IRP_CONTEXT IrpContext); -NTSTATUS NextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - PULONG CurrentCluster, - BOOLEAN Extend); - -/* ----------------------------------------------------------- misc.c */ - -NTSTATUS VfatQueueRequest(PFAT_IRP_CONTEXT IrpContext); - -PFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -VOID VfatFreeIrpContext(PFAT_IRP_CONTEXT IrpContext); - -DRIVER_DISPATCH VfatBuildRequest; -NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -PVOID VfatGetUserBuffer(IN PIRP); - -NTSTATUS VfatLockUserBuffer(IN PIRP, IN ULONG, - IN LOCK_OPERATION); - -NTSTATUS -VfatSetExtendedAttributes(PFILE_OBJECT FileObject, - PVOID Ea, - ULONG EaLength); /* ------------------------------------------------------------- flush.c */ NTSTATUS VfatFlush(PFAT_IRP_CONTEXT IrpContext); -NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb); - /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] Mon Jan 12 10:31:22 2009 @@ -15,7 +15,7 @@ NTSTATUS NTAPI -VfatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) +FatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n", DeviceObject, Irp);

1 0

[dgorbachev] 38724: BATCH_BUFFSIZE -> 8192.
by dgorbachev＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: dgorbachev Date: Mon Jan 12 10:13:06 2009 New Revision: 38724 URL: http://svn.reactos.org/svn/reactos?rev=38724&view=rev Log: BATCH_BUFFSIZE -> 8192. Modified: trunk/reactos/base/shell/cmd/batch.h Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Mon Jan 12 10:13:06 2009 @@ -15,7 +15,7 @@ TCHAR BatchFilePath[MAX_PATH]; LPTSTR forproto; LPTSTR params; - LPTSTR raw_params; /* Holds the raw params given by the input */ + LPTSTR raw_params; /* Holds the raw params given by the input */ INT shiftlevel; BOOL bEcho; /* Preserve echo flag across batch calls */ HANDLE hFind; /* Preserve find handle when doing a for */ @@ -31,7 +31,7 @@ extern BOOL bEcho; /* The echo flag */ -#define BATCH_BUFFSIZE 2048 +#define BATCH_BUFFSIZE 8192 extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */

1 0

[janderwald] 38723: - Implement PcRequestNewPowerState
by janderwald＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: janderwald Date: Mon Jan 12 09:57:49 2009 New Revision: 38723 URL: http://svn.reactos.org/svn/reactos?rev=38723&view=rev Log: - Implement PcRequestNewPowerState Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] Mon Jan 12 09:57:49 2009 @@ -36,3 +36,50 @@ DeviceExt->AdapterPowerManagement = pPower; return STATUS_SUCCESS; } + + +static +VOID +NTAPI +PwrCompletionCallback( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR MinorFunction, + IN POWER_STATE PowerState, + IN PVOID Context, + IN PIO_STATUS_BLOCK IoStatus) +{ + KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); +} + +/* + * @implemented + */ +NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_POWER_STATE RequestedNewState) +{ + KEVENT Event; + NTSTATUS Status; + POWER_STATE PowerState; + PCExtension* DeviceExt; + + if (!DeviceObject || !RequestedNewState) + return STATUS_INVALID_PARAMETER; + + DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + PowerState.DeviceState = RequestedNewState; + PowerState.SystemState = PowerSystemUnspecified; + + Status = PoRequestPowerIrp(DeviceExt->PhysicalDeviceObject, IRP_MN_SET_POWER, PowerState, PwrCompletionCallback, (PVOID)&Event, NULL); + if (NT_SUCCESS(Status)) + { + KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); + } + + + return Status; +} + Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Jan 12 09:57:49 2009 @@ -11,29 +11,6 @@ #include "private.h" #include <portcls.h> - -/* - Factory Stubs -*/ - - - -/* =============================================================== - Power Management -*/ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRequestNewPowerState( - IN PDEVICE_OBJECT pDeviceObject, - IN DEVICE_POWER_STATE RequestedNewState) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - /* =============================================================== Properties

1 0

[janderwald] 38722: - Implement IPortTopology::NewRegistryKey, IPortWavePci::NewRegistryKey - Implement PcRegisterPhysicalConnection, PcRegisterPhysicalConnectionFromExternal, PcRegisterPhysicalConnectionToExternal
by janderwald＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: janderwald Date: Mon Jan 12 09:20:45 2009 New Revision: 38722 URL: http://svn.reactos.org/svn/reactos?rev=38722&view=rev Log: - Implement IPortTopology::NewRegistryKey, IPortWavePci::NewRegistryKey - Implement PcRegisterPhysicalConnection, PcRegisterPhysicalConnectionFromExternal, PcRegisterPhysicalConnectionToExternal Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c 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 trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c 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] Mon Jan 12 09:20:45 2009 @@ -168,7 +168,8 @@ RtlZeroMemory(portcls_ext, sizeof(PCExtension)); portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; portcls_ext->StartDevice = StartDevice; - InitializeListHead(&portcls_ext->SubDeviceList); + InitializeListHead(&portcls_ext->SubDeviceList); + InitializeListHead(&portcls_ext->PhysicalConnectionList); status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL); if (!NT_SUCCESS(status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon Jan 12 09:20:45 2009 @@ -187,7 +187,15 @@ DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return STATUS_UNSUCCESSFUL; + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } static IPortTopologyVtbl vt_IPortTopology = 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] Mon Jan 12 09:20:45 2009 @@ -247,7 +247,23 @@ IN ULONG CreateOptions OPTIONAL, OUT PULONG Disposition OPTIONAL) { - return STATUS_UNSUCCESSFUL; + IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n"); + return STATUS_UNSUCCESSFUL; + } + + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } NTSTATUS 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] Mon Jan 12 09:20:45 2009 @@ -11,6 +11,7 @@ <library>rtl</library> <library>hal</library> <file>api.c</file> + <file>connection.c</file> <file>dll.c</file> <file>dma_slave.c</file> <file>drm_port.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] Mon Jan 12 09:20:45 2009 @@ -15,6 +15,7 @@ #include <dmusicks.h> #include "interfaces.h" +#include <ks.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') @@ -86,6 +87,17 @@ KSOBJECT_HEADER ObjectHeader; }SUBDEVICE_ENTRY; +typedef struct +{ + LIST_ENTRY Entry; + ISubdevice * FromSubDevice; + LPWSTR FromUnicodeString; + ULONG FromPin; + ISubdevice * ToSubDevice; + LPWSTR ToUnicodeString; + ULONG ToPin; +}PHYSICAL_CONNECTION; + typedef struct { @@ -96,6 +108,7 @@ IResourceList* resources; LIST_ENTRY SubDeviceList; + LIST_ENTRY PhysicalConnectionList; } PCExtension; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Jan 12 09:20:45 2009 @@ -51,60 +51,3 @@ return STATUS_UNSUCCESSFUL; } -/* =============================================================== - Physical Connections -*/ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnection( - IN PDEVICE_OBJECT DeviceObject, - IN PUNKNOWN FromUnknown, - IN ULONG FromPin, - IN PUNKNOWN ToUnknown, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnectionFromExternal( - IN PDEVICE_OBJECT DeviceObject, - IN PUNICODE_STRING FromString, - IN ULONG FromPin, - IN PUNKNOWN ToUnknown, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterPhysicalConnectionToExternal( - IN PDEVICE_OBJECT DeviceObject, - IN PUNKNOWN FromUnknown, - IN ULONG FromPin, - IN PUNICODE_STRING ToString, - IN ULONG ToPin) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - -/* =============================================================== - Misc -*/ - -/* - * @unimplemented - */

1 0

[fireball] 38721: - Remove leftover from 38352 and 38353, sorry.
by fireball＠svn.reactos.org 12 Jan '09

12 Jan '09

Author: fireball Date: Mon Jan 12 09:13:44 2009 New Revision: 38721 URL: http://svn.reactos.org/svn/reactos?rev=38721&view=rev Log: - Remove leftover from 38352 and 38353, sorry. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon Jan 12 09:13:44 2009 @@ -23,8 +23,6 @@ using std::string; using std::vector; - -static const Path defaultPath; string Right ( const string& s, size_t n )

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
76
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 January 2009