Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by ion＠svn.reactos.com

IoCreateDevice Changes: - IoAllocateVpb renamed to IopAllocateVpb and made cleaner - Let ObCreateObject do all the memory allocation since the extra data belongs to the object and it should be responsible for allocating it. No more extra pool allocations or deallocations. - Zero out everythign a single time. - Remove useless code duplication - Use proper I/O Manager types for the object headers. - Honour Exclusive Flag, and Has Name Flag. - Only initialize event if there is a volume. - Initialize a VPB for Virtual Disks also. - Set up Device Object Extension properly - Set DO_DEVICE_INITIALIZING flag. - Use proper sector sizes, don't hardcode 512 (should be 2048 for cds) - Actually insert the object into the object table with ObInsertObject. This might seem useless, but remember that's simply because ROS has a broken Ob Manager which does way too much in ObCreateObject. It will be easier to use the rewrite if this is done properly. - Set the right sizes in some places. Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/vpb.c _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-04-16 22:11:59 UTC (rev 14642) +++ trunk/reactos/include/ddk/iotypes.h 2005-04-17 04:20:16 UTC (rev 14643) @@ -892,8 +892,19 @@ } FAST_IO_DISPATCH_TABLE, * PFAST_IO_DISPATCH_TABLE; #endif -#define IO_TYPE_DRIVER 4L -#define IO_TYPE_FILE 0x0F5L +#define IO_TYPE_ADAPTER 0x1L +#define IO_TYPE_CONTROLLER 0x2L +#define IO_TYPE_DEVICE 0x3L +#define IO_TYPE_DRIVER 0x4L +#define IO_TYPE_FILE 0x0F5L /* Temp Hack */ +#define IO_TYPE_IRP 0x6L +#define IO_TYPE_MASTER_ADAPTER 0x7L +#define IO_TYPE_OPEN_PACKET 0x8L +#define IO_TYPE_TIMER 0x9L +#define IO_TYPE_VPB 0xaL +#define IO_TYPE_ERROR_LOG 0xbL +#define IO_TYPE_ERROR_MESSAGE 0xcL +#define IO_TYPE_DEVICE_OBJECT_EXTENSION 0xdL #define DRVO_UNLOAD_INVOKED 0x1L #define DRVO_LEGACY_DRIVER 0x2L @@ -959,7 +970,6 @@ /* * PURPOSE: Special timer associated with each device */ - #define IO_TYPE_TIMER 9 typedef struct _IO_TIMER { USHORT Type; /* Every IO Object has a Type */ USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-16 22:11:59 UTC (rev 14642) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-17 04:20:16 UTC (rev 14643) @@ -370,8 +370,11 @@ PVOID Parent, PWSTR RemainingPath, POBJECT_ATTRIBUTES ObjectAttributes); -NTSTATUS IoAttachVpb(PDEVICE_OBJECT DeviceObject); +NTSTATUS +STDCALL +IopAttachVpb(PDEVICE_OBJECT DeviceObject); + PIRP IoBuildSynchronousFsdRequestWithMdl(ULONG MajorFunction, PDEVICE_OBJECT DeviceObject, PMDL Mdl, _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-16 22:11:59 UTC (rev 14642) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-17 04:20:16 UTC (rev 14643) @@ -307,7 +307,6 @@ SourceDeviceExtension = SourceDevice->DeviceObjectExtension; /* Make sure that it's in a correct state */ - DPRINT1("flags %d\n", AttachedDevice->DeviceObjectExtension->ExtensionFlags); if (!(AttachedDevice->DeviceObjectExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | DOE_REMOVE_PROCESSED))) @@ -355,10 +354,6 @@ ExFreePool(DeviceObject->Timer); } - /* Free device extension */ - if (DeviceObject->DeviceObjectExtension) - ExFreePool(DeviceObject->DeviceObjectExtension); - /* Remove device from driver device list */ Previous = DeviceObject->DriverObject->DeviceObject; if (Previous == DeviceObject) @@ -652,157 +647,169 @@ * Status * @implemented */ -NTSTATUS STDCALL -IoCreateDevice( - PDRIVER_OBJECT DriverObject, - ULONG DeviceExtensionSize, - PUNICODE_STRING DeviceName, - DEVICE_TYPE DeviceType, - ULONG DeviceCharacteristics, - BOOLEAN Exclusive, - PDEVICE_OBJECT *DeviceObject) +NTSTATUS +STDCALL +IoCreateDevice(PDRIVER_OBJECT DriverObject, + ULONG DeviceExtensionSize, + PUNICODE_STRING DeviceName, + DEVICE_TYPE DeviceType, + ULONG DeviceCharacteristics, + BOOLEAN Exclusive, + PDEVICE_OBJECT *DeviceObject) { - WCHAR AutoNameBuffer[20]; - UNICODE_STRING AutoName; - PDEVICE_OBJECT CreatedDeviceObject; - PDEVOBJ_EXTENSION DeviceObjectExtension; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; + WCHAR AutoNameBuffer[20]; + UNICODE_STRING AutoName; + PDEVICE_OBJECT CreatedDeviceObject; + PDEVOBJ_EXTENSION DeviceObjectExtension; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + ULONG AlignedDeviceExtensionSize; + ULONG TotalSize; + HANDLE TempHandle; - ASSERT_IRQL(PASSIVE_LEVEL); + ASSERT_IRQL(PASSIVE_LEVEL); + DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); - if (DeviceName != NULL) - { - DPRINT("IoCreateDevice(DriverObject %x, DeviceName %S)\n", - DriverObject, DeviceName->Buffer); + /* Generate a name if we have to */ + if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) + { + swprintf(AutoNameBuffer, + L"\\Device\\%08lx", + InterlockedIncrementUL(&IopDeviceObjectNumber)); + RtlInitUnicodeString(&AutoName, AutoNameBuffer); + DeviceName = &AutoName; } - else - { - DPRINT("IoCreateDevice(DriverObject %x)\n",DriverObject); - } - if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) - { - swprintf(AutoNameBuffer, - L"\\Device\\%08lx", - InterlockedIncrementUL(&IopDeviceObjectNumber)); - RtlInitUnicodeString(&AutoName, - AutoNameBuffer); - DeviceName = &AutoName; - } - - if (DeviceName != NULL) - { - InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); - Status = ObCreateObject( - KernelMode, - IoDeviceObjectType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(DEVICE_OBJECT), - 0, - 0, - (PVOID*)&CreatedDeviceObject); - } - else - { - Status = ObCreateObject( - KernelMode, - IoDeviceObjectType, - NULL, - KernelMode, - NULL, - sizeof(DEVICE_OBJECT), - 0, - 0, - (PVOID*)&CreatedDeviceObject); - } - - *DeviceObject = NULL; - - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateDevice() ObCreateObject failed, status: 0x%08X\n", Status); - return Status; - } - - if (DriverObject->DeviceObject == NULL) - { - DriverObject->DeviceObject = CreatedDeviceObject; - CreatedDeviceObject->NextDevice = NULL; - } - else - { - CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; - DriverObject->DeviceObject = CreatedDeviceObject; - } - - CreatedDeviceObject->Type = DeviceType; - CreatedDeviceObject->DriverObject = DriverObject; - CreatedDeviceObject->CurrentIrp = NULL; - CreatedDeviceObject->Flags = 0; + /* Initialize the Object Attributes */ + InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); + + /* Honour exclusive flag */ + ObjectAttributes.Attributes |= OBJ_EXCLUSIVE; + + /* Align the Extension Size to 8-bytes */ + AlignedDeviceExtensionSize = (DeviceExtensionSize + 7) &~ 7; + DPRINT("AlignedDeviceExtensionSize %x\n", AlignedDeviceExtensionSize); + + /* Total Size */ + TotalSize = AlignedDeviceExtensionSize + + sizeof(DEVICE_OBJECT) + sizeof(DEVOBJ_EXTENSION); + DPRINT("TotalSize %x\n", TotalSize); - CreatedDeviceObject->DeviceExtension = - ExAllocatePoolWithTag( - NonPagedPool, - DeviceExtensionSize, - TAG_DEVICE_EXTENSION); - - if (DeviceExtensionSize > 0 && CreatedDeviceObject->DeviceExtension == NULL) - { - ExFreePool(CreatedDeviceObject); - DPRINT("IoCreateDevice() ExAllocatePoolWithTag failed, returning: 0x%08X\n", STATUS_INSUFFICIENT_RESOURCES); - return STATUS_INSUFFICIENT_RESOURCES; - } - - if (DeviceExtensionSize > 0) - { - RtlZeroMemory(CreatedDeviceObject->DeviceExtension, DeviceExtensionSize); - } - - CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; - CreatedDeviceObject->ReferenceCount = 1; - CreatedDeviceObject->AttachedDevice = NULL; - CreatedDeviceObject->DeviceType = DeviceType; - CreatedDeviceObject->StackSize = 1; - CreatedDeviceObject->AlignmentRequirement = 1; - CreatedDeviceObject->Characteristics = DeviceCharacteristics; - CreatedDeviceObject->Timer = NULL; - CreatedDeviceObject->Vpb = NULL; - KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + /* Create the Device Object */ + Status = ObCreateObject(KernelMode, + IoDeviceObjectType, + &ObjectAttributes, + KernelMode, + NULL, + TotalSize, + 0, + 0, + (PVOID*)&CreatedDeviceObject); - KeInitializeEvent( - &CreatedDeviceObject->DeviceLock, - SynchronizationEvent, - TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() ObCreateObject failed, status: 0x%08X\n", Status); + return Status; + } + + /* Clear the whole Object and extension so we don't null stuff manually */ + RtlZeroMemory(CreatedDeviceObject, TotalSize); + DPRINT("CreatedDeviceObject %x\n", CreatedDeviceObject); - /* FIXME: Do we need to add network drives too?! */ - if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK || - CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM || - CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE) - { - IoAttachVpb(CreatedDeviceObject); - } - CreatedDeviceObject->SectorSize = 512; /* FIXME */ + /* + * Setup the Type and Size. Note that we don't use the aligned size, + * because that's only padding for the DevObjExt and not part of the Object. + */ + CreatedDeviceObject->Type = IO_TYPE_DEVICE; + CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + DeviceExtensionSize; + + /* The kernel extension is after the driver internal extension */ + DeviceObjectExtension = (PDEVOBJ_EXTENSION) + ((ULONG_PTR)(CreatedDeviceObject + 1) + + AlignedDeviceExtensionSize); + + /* Set the Type and Size. Question: why is Size 0 on Windows? */ + DPRINT("DeviceObjectExtension %x\n", DeviceObjectExtension); + DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; + DeviceObjectExtension->Size = 0; + + /* Link the Object and Extension */ + DeviceObjectExtension->DeviceObject = CreatedDeviceObject; + CreatedDeviceObject->DeviceObjectExtension = DeviceObjectExtension; + + /* Set Device Object Data */ + CreatedDeviceObject->DeviceType = DeviceType; + CreatedDeviceObject->Characteristics = DeviceCharacteristics; + CreatedDeviceObject->DeviceExtension = CreatedDeviceObject + 1; + CreatedDeviceObject->StackSize = 1; + CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */ + + /* Set the Flags */ + /* FIXME: After the Driver is Loaded, the flag below should be removed */ + CreatedDeviceObject->Flags = DO_DEVICE_INITIALIZING; + if (Exclusive) CreatedDeviceObject->Flags |= DO_EXCLUSIVE; + if (DeviceName) CreatedDeviceObject->Flags |= DO_DEVICE_HAS_NAME; - DeviceObjectExtension = - ExAllocatePoolWithTag( - NonPagedPool, - sizeof(DEVOBJ_EXTENSION), - TAG_DEVICE_EXTENSION); + /* Attach a Vpb for Disks and Tapes, and create the Device Lock */ + if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK || + CreatedDeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK || + CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE) + { + /* Create Vpb */ + IopAttachVpb(CreatedDeviceObject); + + /* Initialize Lock Event */ + KeInitializeEvent(&CreatedDeviceObject->DeviceLock, + SynchronizationEvent, + TRUE); + } + + /* Set the right Sector Size */ + switch (DeviceType) + { + case FILE_DEVICE_DISK_FILE_SYSTEM: + case FILE_DEVICE_DISK: + case FILE_DEVICE_VIRTUAL_DISK: + CreatedDeviceObject->SectorSize = 512; + break; - RtlZeroMemory(DeviceObjectExtension, sizeof(DEVOBJ_EXTENSION)); - DeviceObjectExtension->Type = 0 /* ?? */; - DeviceObjectExtension->Size = sizeof(DEVOBJ_EXTENSION); - DeviceObjectExtension->DeviceObject = CreatedDeviceObject; - DeviceObjectExtension->DeviceNode = NULL; + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + CreatedDeviceObject->SectorSize = 2048; + break; + } + + /* Create the Device Queue */ + KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); - CreatedDeviceObject->DeviceObjectExtension = DeviceObjectExtension; - - *DeviceObject = CreatedDeviceObject; - - return STATUS_SUCCESS; + /* Insert the Object */ + Status = ObInsertObject(CreatedDeviceObject, + NULL, + FILE_READ_DATA | FILE_WRITE_DATA, + 0, + NULL, + &TempHandle); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot insert Device Object into Handle Table\n"); + *DeviceObject = NULL; + return Status; + } + + /* Now do the final linking */ + ObReferenceObject(DriverObject); + CreatedDeviceObject->DriverObject = DriverObject; + CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; + DriverObject->DeviceObject = CreatedDeviceObject; + + /* Close the temporary handle, but do an extra reference first so it doesn't die */ + ObReferenceObject(CreatedDeviceObject); + NtClose(TempHandle); + + /* Return to caller */ + *DeviceObject = CreatedDeviceObject; + return STATUS_SUCCESS; } /* _____ Modified: trunk/reactos/ntoskrnl/io/vpb.c --- trunk/reactos/ntoskrnl/io/vpb.c 2005-04-16 22:11:59 UTC (rev 14642) +++ trunk/reactos/ntoskrnl/io/vpb.c 2005-04-17 04:20:16 UTC (rev 14643) @@ -30,35 +30,30 @@ } NTSTATUS -IoAttachVpb(PDEVICE_OBJECT DeviceObject) +STDCALL +IopAttachVpb(PDEVICE_OBJECT DeviceObject) { - PVPB Vpb; + PVPB Vpb; - Vpb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(VPB), - TAG_VPB); - if (Vpb == NULL) - { - return(STATUS_UNSUCCESSFUL); - } + /* Allocate the Vpb */ + Vpb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VPB), + TAG_VPB); + if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); + + /* Clear it so we don't waste time manually */ + RtlZeroMemory(Vpb, sizeof(VPB)); - Vpb->Type = 0; - Vpb->Size = sizeof(VPB) / sizeof(DWORD); - Vpb->Flags = 0; - Vpb->VolumeLabelLength = 0; - Vpb->DeviceObject = NULL; - Vpb->RealDevice = DeviceObject; - Vpb->SerialNumber = 0; - Vpb->ReferenceCount = 0; - RtlZeroMemory(Vpb->VolumeLabel, - sizeof(WCHAR) * MAXIMUM_VOLUME_LABEL_LENGTH); - - DeviceObject->Vpb = Vpb; - - return(STATUS_SUCCESS); + /* Set the Header and Device Field */ + Vpb->Type = IO_TYPE_VPB; + Vpb->Size = sizeof(VPB); + Vpb->RealDevice = DeviceObject; + + /* link it to the Device Object */ + DeviceObject->Vpb = Vpb; + return(STATUS_SUCCESS); } - /* * FUNCTION: Queries the volume information * ARGUMENTS:

19 years, 8 months

[arty] 14642: Make the broadcast address all 1's.

by arty＠svn.reactos.com

Make the broadcast address all 1's. Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c _____ Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c --- trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-04-16 22:10:55 UTC (rev 14641) +++ trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-04-16 22:11:59 UTC (rev 14642) @@ -289,6 +289,8 @@ NCE->LinkAddress = (PVOID)&NCE[1]; if( LinkAddress ) RtlCopyMemory(NCE->LinkAddress, LinkAddress, LinkAddressLength); + else + memset(NCE->LinkAddress, 0xff, LinkAddressLength); NCE->State = State; NCE->EventTimer = 0; /* Not in use */ InitializeListHead( &NCE->PacketQueue );

19 years, 8 months

[arty] 14641: Fixed multiple bind of DHCP client port. Later, we need to implement

by arty＠svn.reactos.com

Fixed multiple bind of DHCP client port. Later, we need to implement per adapter binding. Modified: trunk/reactos/subsys/system/dhcp/adapter.c _____ Modified: trunk/reactos/subsys/system/dhcp/adapter.c --- trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-16 21:41:32 UTC (rev 14640) +++ trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-16 22:10:55 UTC (rev 14641) @@ -1,5 +1,6 @@ #include "rosdhcp.h" +static SOCKET DhcpSocket = INVALID_SOCKET; static LIST_ENTRY AdapterList; static WSADATA wsd; extern struct interface_info *ifi; @@ -34,6 +35,10 @@ } } +/* + * XXX Figure out the way to bind a specific adapter to a socket. + */ + void AdapterInit() { PMIB_IFTABLE Table = malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size, i; @@ -71,16 +76,22 @@ Adapter->DhclientInfo.rbuf_max = Table->table[i].dwMtu; Adapter->DhclientInfo.rbuf_len = Adapter->DhclientInfo.rbuf_offset = 0; - Adapter->DhclientInfo.rfdesc = - Adapter->DhclientInfo.wfdesc = - socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); - Adapter->ListenAddr.sin_family = AF_INET; - Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); - Adapter->BindStatus = - (bind( Adapter->DhclientInfo.rfdesc, - (struct sockaddr *)&Adapter->ListenAddr, - sizeof(Adapter->ListenAddr) ) == 0) ? - 0 : WSAGetLastError(); + if( DhcpSocket == INVALID_SOCKET ) { + DhcpSocket = + Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.wfdesc = + socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); + Adapter->ListenAddr.sin_family = AF_INET; + Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); + Adapter->BindStatus = + (bind( Adapter->DhclientInfo.rfdesc, + (struct sockaddr *)&Adapter->ListenAddr, + sizeof(Adapter->ListenAddr) ) == 0) ? + 0 : WSAGetLastError(); + } else { + Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.wfdesc = DhcpSocket; + } Adapter->DhclientState.config = &Adapter->DhclientConfig; Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL;

19 years, 8 months

[ion] 14640: More I/O Stuff that was leftover in the old branch. Yes I'm still on break, I'm just comitting

by ion＠svn.reactos.com

More I/O Stuff that was leftover in the old branch. Yes I'm still on break, I'm just comitting my local work to avoid duplication. - Implemented IoRegisterBootDriverReinitialization, but routines don't actually get called yet. - Created IopGetDeviceObjectPointer to deal with the case when the pointer is needed for an attach; when this happens, a special (documented) flag should be sent to the driver, so that it can do any internal routines to be ready for an attach. - Fixed IoAttachDevice to use the Safe Attach routine and sent the IO_ATTACH_DEVICE_API flag (See above) - Fixed IoAttachDeviceToDeviceStack to call the safe function. - Optimized IoAttachDeviceByPointer - Implemented IoAttachDeviceToDeviceStackSafe. Support Device Extension Attach semantics. - Added various checks for unload/delete flags (that we never supported). Checks are pretty useless for now since we don't use the flags, but I've added one during IoDeleteDevice. - Implemented IoEnumerateDeviceObjectList. Should work, but untested. - Implemented IoGetDeviceAttachmentBaseRef. - Optimized IoGetRelatedDeviceObject. - Made IoGetDeviceObjectPointer call the internal routine (see #2 above). - Implemented IoDetachDevice. - Removed IoOpenDeviceInstanceKey and IoQueryDeviceEnumInfo. Obsoleted, unimplemented, undocumented NT4 APIs. - Various Attach/Detach fixes. Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-04-16 19:38:14 UTC (rev 14639) +++ trunk/reactos/include/ddk/iotypes.h 2005-04-16 21:41:32 UTC (rev 14640) @@ -651,6 +651,8 @@ #define FO_FILE_OBJECT_HAS_EXTENSION 0x00800000 #define FO_REMOTE_ORIGIN 0x01000000 +#define IO_ATTACH_DEVICE_API 0x80000000 + typedef struct _FILE_OBJECT { CSHORT Type; _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-16 19:38:14 UTC (rev 14639) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-16 21:41:32 UTC (rev 14640) @@ -129,48 +129,209 @@ return STATUS_SUCCESS; } +NTSTATUS +STDCALL +IopGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, + IN ACCESS_MASK DesiredAccess, + OUT PFILE_OBJECT *FileObject, + OUT PDEVICE_OBJECT *DeviceObject, + IN ULONG AttachFlag) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK StatusBlock; + PFILE_OBJECT LocalFileObject; + HANDLE FileHandle; + NTSTATUS Status; + + DPRINT("IoGetDeviceObjectPointer(ObjectName %wZ, DesiredAccess %x," + "FileObject %p DeviceObject %p)\n", + ObjectName, DesiredAccess, FileObject, DeviceObject); + + /* Open the Device */ + InitializeObjectAttributes(&ObjectAttributes, + ObjectName, + 0, + NULL, + NULL); + Status = ZwOpenFile(&FileHandle, + DesiredAccess, + &ObjectAttributes, + &StatusBlock, + 0, + FILE_NON_DIRECTORY_FILE | AttachFlag); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile failed, Status: 0x%x\n", Status); + return Status; + } + + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + KernelMode, + (PVOID*)&LocalFileObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Return the requested data */ + *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); + *FileObject = LocalFileObject; + } + + /* Close the handle */ + ZwClose(FileHandle); + return Status; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* + * IoAttachDevice + * + * Layers a device over the highest device in a device stack. + * + * Parameters + * SourceDevice + * Device to be attached. + * + * TargetDevice + * Name of the target device. + * + * AttachedDevice + * Caller storage for the device attached to. + * + * Status + * @implemented + */ +NTSTATUS +STDCALL +IoAttachDevice(PDEVICE_OBJECT SourceDevice, + PUNICODE_STRING TargetDeviceName, + PDEVICE_OBJECT *AttachedDevice) +{ + NTSTATUS Status; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT TargetDevice; + + /* Call the helper routine for an attach operation */ + DPRINT("IoAttachDevice\n"); + Status = IopGetDeviceObjectPointer(TargetDeviceName, + FILE_READ_ATTRIBUTES, + &FileObject, + &TargetDevice, + IO_ATTACH_DEVICE_API); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Device Object\n"); + return Status; + } + + /* Attach the device */ + IoAttachDeviceToDeviceStackSafe(SourceDevice, TargetDevice, AttachedDevice); + + /* Derference it */ + ObDereferenceObject(FileObject); + return STATUS_SUCCESS; +} + +/* + * IoAttachDeviceToDeviceStack + * + * Status + * @implemented + */ +PDEVICE_OBJECT +STDCALL +IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice, + PDEVICE_OBJECT TargetDevice) +{ + NTSTATUS Status; + PDEVICE_OBJECT LocalAttach; + + /* Attach it safely */ + DPRINT("IoAttachDeviceToDeviceStack\n"); + Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, + TargetDevice, + &LocalAttach); + + /* Return it */ + DPRINT("IoAttachDeviceToDeviceStack DONE: %x\n", LocalAttach); + return LocalAttach; +} +/* * IoAttachDeviceByPointer * * Status * @implemented */ -NTSTATUS STDCALL -IoAttachDeviceByPointer( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice) +NTSTATUS +STDCALL +IoAttachDeviceByPointer(IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice) { - PDEVICE_OBJECT AttachedDevice; + PDEVICE_OBJECT AttachedDevice; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IoAttachDeviceByPointer(SourceDevice %x, TargetDevice %x)\n", - SourceDevice, TargetDevice); + DPRINT("IoAttachDeviceByPointer(SourceDevice %x, TargetDevice %x)\n", + SourceDevice, TargetDevice); - AttachedDevice = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); - if (AttachedDevice == NULL) - return STATUS_NO_SUCH_DEVICE; + /* Do the Attach */ + AttachedDevice = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); + if (AttachedDevice == NULL) Status = STATUS_NO_SUCH_DEVICE; - return STATUS_SUCCESS; + /* Return the status */ + return Status; } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject - ) +IoAttachDeviceToDeviceStackSafe(IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject) { - /* FIXME: IoAttachDeviceToDeviceStackSafe must not call - * IoAttachDeviceToDeviceStack, but the other way around! */ - DPRINT("IoAttachDeviceToDeviceStackSafe() badly implemented!\n"); - *AttachedToDeviceObject = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); - return STATUS_SUCCESS; + PDEVICE_OBJECT AttachedDevice; + PDEVOBJ_EXTENSION SourceDeviceExtension; + + DPRINT("IoAttachDeviceToDeviceStack(SourceDevice %x, TargetDevice %x)\n", + SourceDevice, TargetDevice); + + /* Get the Attached Device and source extension */ + AttachedDevice = IoGetAttachedDevice(TargetDevice); + SourceDeviceExtension = SourceDevice->DeviceObjectExtension; + + /* Make sure that it's in a correct state */ + DPRINT1("flags %d\n", AttachedDevice->DeviceObjectExtension->ExtensionFlags); + if (!(AttachedDevice->DeviceObjectExtension->ExtensionFlags & + (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | DOE_REMOVE_PROCESSED))) + { + /* Update fields */ + AttachedDevice->AttachedDevice = SourceDevice; + SourceDevice->AttachedDevice = NULL; + SourceDevice->StackSize = AttachedDevice->StackSize + 1; + SourceDevice->AlignmentRequirement = AttachedDevice->AlignmentRequirement; + SourceDevice->SectorSize = AttachedDevice->SectorSize; + SourceDevice->Vpb = AttachedDevice->Vpb; + + /* Set the attachment in the device extension */ + SourceDeviceExtension->AttachedTo = AttachedDevice; + } + else + { + /* Device was unloading or being removed */ + AttachedDevice = NULL; + } + + /* Return the attached device */ + *AttachedToDeviceObject = AttachedDevice; + return STATUS_SUCCESS; } /* @@ -179,7 +340,6 @@ * Status * @implemented */ - VOID STDCALL IoDeleteDevice(PDEVICE_OBJECT DeviceObject) { @@ -211,39 +371,78 @@ Previous = Previous->NextDevice; Previous->NextDevice = DeviceObject->NextDevice; } - + + /* I guess this should be removed later... but it shouldn't cause problems */ + DeviceObject->DeviceObjectExtension->ExtensionFlags |= DOE_DELETE_PENDING; ObDereferenceObject(DeviceObject); } - /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -IoEnumerateDeviceObjectList( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT *DeviceObjectList, - IN ULONG DeviceObjectListSize, - OUT PULONG ActualNumberDeviceObjects - ) +IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT *DeviceObjectList, + IN ULONG DeviceObjectListSize, + OUT PULONG ActualNumberDeviceObjects) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ULONG ActualDevices = 1; + PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; + + DPRINT1("IoEnumerateDeviceObjectList\n"); + + /* Find out how many devices we'll enumerate */ + while ((CurrentDevice = CurrentDevice->NextDevice)) + { + ActualDevices++; + } + + /* Go back to the first */ + CurrentDevice = DriverObject->DeviceObject; + + /* Start by at least returning this */ + *ActualNumberDeviceObjects = ActualDevices; + + /* Check if we can support so many */ + if ((ActualDevices * 4) > DeviceObjectListSize) + { + /* Fail because the buffer was too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check if the caller only wanted the size */ + if (DeviceObjectList) + { + /* Loop through all the devices */ + while (ActualDevices) + { + /* Reference each Device */ + ObReferenceObject(CurrentDevice); + + /* Add it to the list */ + *DeviceObjectList = CurrentDevice; + + /* Go to the next one */ + CurrentDevice = CurrentDevice->NextDevice; + ActualDevices--; + DeviceObjectList++; + } + } + + /* Return the status */ + return STATUS_SUCCESS; } - /* - * @unimplemented + * @implemented */ PDEVICE_OBJECT STDCALL -IoGetDeviceAttachmentBaseRef( - IN PDEVICE_OBJECT DeviceObject - ) +IoGetDeviceAttachmentBaseRef(IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return 0; + /* Return the attached Device */ + return (DeviceObject->DeviceObjectExtension->AttachedTo); } /* @@ -318,32 +517,30 @@ * Status * @implemented */ - -PDEVICE_OBJECT STDCALL -IoGetRelatedDeviceObject( - IN PFILE_OBJECT FileObject) +PDEVICE_OBJECT +STDCALL +IoGetRelatedDeviceObject(IN PFILE_OBJECT FileObject) { - /* - * Get logical volume mounted on a physical/virtual/logical device - */ + PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; + + /* Get logical volume mounted on a physical/virtual/logical device */ + if (FileObject->Vpb && FileObject->Vpb->DeviceObject) + { + DeviceObject = FileObject->Vpb->DeviceObject; + } - if (FileObject->Vpb && FileObject->Vpb->DeviceObject) - { - return IoGetAttachedDevice(FileObject->Vpb->DeviceObject); - } + /* + * Check if file object has an associated device object mounted by some + * other file system. + */ + if (FileObject->DeviceObject->Vpb && + FileObject->DeviceObject->Vpb->DeviceObject) + { + DeviceObject = FileObject->DeviceObject->Vpb->DeviceObject; + } - /* - * Check if file object has an associated device object mounted by some - * other file system. - */ - - if (FileObject->DeviceObject->Vpb && - FileObject->DeviceObject->Vpb->DeviceObject) - { - return IoGetAttachedDevice(FileObject->DeviceObject->Vpb->DeviceObject); - } - - return IoGetAttachedDevice(FileObject->DeviceObject); + /* Return the highest attached device */ + return IoGetAttachedDevice(DeviceObject); } /* @@ -352,74 +549,36 @@ * Status * @implemented */ - -NTSTATUS STDCALL -IoGetDeviceObjectPointer( - IN PUNICODE_STRING ObjectName, - IN ACCESS_MASK DesiredAccess, - OUT PFILE_OBJECT *FileObject, - OUT PDEVICE_OBJECT *DeviceObject) +NTSTATUS +STDCALL +IoGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, + IN ACCESS_MASK DesiredAccess, + OUT PFILE_OBJECT *FileObject, + OUT PDEVICE_OBJECT *DeviceObject) { - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK StatusBlock; - PFILE_OBJECT LocalFileObject; - HANDLE FileHandle; - NTSTATUS Status; - - DPRINT("IoGetDeviceObjectPointer(ObjectName %wZ, DesiredAccess %x, FileObject %p DeviceObject %p)\n", - ObjectName, DesiredAccess, FileObject, DeviceObject); - - InitializeObjectAttributes( - &ObjectAttributes, - ObjectName, - 0, - NULL, - NULL); - - Status = ZwOpenFile( - &FileHandle, - DesiredAccess, - &ObjectAttributes, - &StatusBlock, - 0, - FILE_NON_DIRECTORY_FILE); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile failed, Status: 0x%x\n", Status); - return Status; - } - - Status = ObReferenceObjectByHandle( - FileHandle, - 0, - IoFileObjectType, - KernelMode, - (PVOID*)&LocalFileObject, - NULL); - - if (NT_SUCCESS(Status)) - { - *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); - *FileObject = LocalFileObject; - } - - ZwClose(FileHandle); - - return Status; + /* Call the helper routine for a normal operation */ + return IopGetDeviceObjectPointer(ObjectName, + DesiredAccess, + FileObject, + DeviceObject, + 0); } /* * IoDetachDevice * * Status - * @unimplemented + * @implemented */ - -VOID STDCALL +VOID +STDCALL IoDetachDevice(PDEVICE_OBJECT TargetDevice) -{ - DPRINT("IoDetachDevice(TargetDevice %x) - UNIMPLEMENTED\n", TargetDevice); +{ + DPRINT("IoDetachDevice(TargetDevice %x)\n", TargetDevice); + + /* Remove the attachment */ + TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; + TargetDevice->AttachedDevice = NULL; } /* @@ -428,16 +587,20 @@ * Status * @implemented */ - -PDEVICE_OBJECT STDCALL +PDEVICE_OBJECT +STDCALL IoGetAttachedDevice(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = DeviceObject; + PDEVICE_OBJECT Current = DeviceObject; - while (Current->AttachedDevice != NULL) - Current = Current->AttachedDevice; - - return Current; + /* Get the last attached device */ + while (Current->AttachedDevice) + { + Current = Current->AttachedDevice; + } + + /* Return it */ + return Current; } /* @@ -446,92 +609,18 @@ * Status * @implemented */ - -PDEVICE_OBJECT STDCALL +PDEVICE_OBJECT +STDCALL IoGetAttachedDeviceReference(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); - ObReferenceObject(Current); - return Current; -} - -/* - * IoAttachDeviceToDeviceStack - * - * Status - * @implemented - */ - -PDEVICE_OBJECT STDCALL -IoAttachDeviceToDeviceStack( - PDEVICE_OBJECT SourceDevice, - PDEVICE_OBJECT TargetDevice) -{ - PDEVICE_OBJECT AttachedDevice; + PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); - DPRINT("IoAttachDeviceToDeviceStack(SourceDevice %x, TargetDevice %x)\n", - SourceDevice, TargetDevice); - - AttachedDevice = IoGetAttachedDevice(TargetDevice); - AttachedDevice->AttachedDevice = SourceDevice; - SourceDevice->AttachedDevice = NULL; - SourceDevice->StackSize = AttachedDevice->StackSize + 1; - SourceDevice->AlignmentRequirement = AttachedDevice->AlignmentRequirement; - SourceDevice->SectorSize = AttachedDevice->SectorSize; - SourceDevice->Vpb = AttachedDevice->Vpb; - return AttachedDevice; + /* Reference the ATtached Device */ + ObReferenceObject(Current); + return Current; } /* - * IoAttachDevice - * - * Layers a device over the highest device in a device stack. - * - * Parameters - * SourceDevice - * Device to be attached. - * - * TargetDevice - * Name of the target device. - * - * AttachedDevice - * Caller storage for the device attached to. - * - * Status - * @implemented - */ - -NTSTATUS STDCALL -IoAttachDevice( - PDEVICE_OBJECT SourceDevice, - PUNICODE_STRING TargetDeviceName, - PDEVICE_OBJECT *AttachedDevice) -{ - NTSTATUS Status; - PFILE_OBJECT FileObject; - PDEVICE_OBJECT TargetDevice; - - Status = IoGetDeviceObjectPointer( - TargetDeviceName, - FILE_READ_ATTRIBUTES, - &FileObject, - &TargetDevice); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - *AttachedDevice = IoAttachDeviceToDeviceStack( - SourceDevice, - TargetDevice); - - ObDereferenceObject(FileObject); - - return STATUS_SUCCESS; -} - -/* * IoCreateDevice * * Allocates memory for and intializes a device object for use for @@ -563,7 +652,6 @@ * Status * @implemented */ - NTSTATUS STDCALL IoCreateDevice( PDRIVER_OBJECT DriverObject, @@ -704,6 +792,7 @@ sizeof(DEVOBJ_EXTENSION), TAG_DEVICE_EXTENSION); + RtlZeroMemory(DeviceObjectExtension, sizeof(DEVOBJ_EXTENSION)); DeviceObjectExtension->Type = 0 /* ?? */; DeviceObjectExtension->Size = sizeof(DEVOBJ_EXTENSION); DeviceObjectExtension->DeviceObject = CreatedDeviceObject; @@ -717,42 +806,8 @@ } /* - * IoOpenDeviceInstanceKey - * - * Status - * @unimplemented - */ - -NTSTATUS STDCALL -IoOpenDeviceInstanceKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* * @unimplemented */ -VOID -STDCALL -IoRegisterBootDriverReinitialization( - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, - IN PVOID Context - ) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ NTSTATUS STDCALL IoRegisterLastChanceShutdownNotification( @@ -764,22 +819,6 @@ } /* - * IoQueryDeviceEnumInfo - * - * Status - * @unimplemented - */ - -DWORD STDCALL -IoQueryDeviceEnumInfo( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED; - return 0; -} - -/* * @unimplemented */ VOID _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-04-16 19:38:14 UTC (rev 14639) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-04-16 21:41:32 UTC (rev 14640) @@ -60,9 +60,13 @@ /* GLOBALS ********************************************************************/ static LIST_ENTRY DriverReinitListHead; +static KSPIN_LOCK DriverReinitListLock; static PLIST_ENTRY DriverReinitTailEntry; -static KSPIN_LOCK DriverReinitListLock; +static PLIST_ENTRY DriverBootReinitTailEntry; +static LIST_ENTRY DriverBootReinitListHead; +static KSPIN_LOCK DriverBootReinitListLock; + static LIST_ENTRY GroupListHead = {NULL, NULL}; static LIST_ENTRY ServiceListHead = {NULL, NULL}; @@ -117,6 +121,10 @@ InitializeListHead(&DriverReinitListHead); KeInitializeSpinLock(&DriverReinitListLock); DriverReinitTailEntry = NULL; + + InitializeListHead(&DriverBootReinitListHead); + KeInitializeSpinLock(&DriverBootReinitListLock); + DriverBootReinitTailEntry = NULL; } NTSTATUS STDCALL @@ -1963,6 +1971,8 @@ ReinitItem->DriverObject = DriverObject; ReinitItem->ReinitRoutine = ReinitRoutine; ReinitItem->Context = Context; + + DriverObject->Flags |= DRVO_REINIT_REGISTERED; ExInterlockedInsertTailList( &DriverReinitListHead, @@ -1971,6 +1981,35 @@ } /* + * @implemented + */ +VOID +STDCALL +IoRegisterBootDriverReinitialization( + IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, + IN PVOID Context + ) +{ + PDRIVER_REINIT_ITEM ReinitItem; + + ReinitItem = ExAllocatePool(NonPagedPool, sizeof(DRIVER_REINIT_ITEM)); + if (ReinitItem == NULL) + return; + + ReinitItem->DriverObject = DriverObject; + ReinitItem->ReinitRoutine = DriverReinitializationRoutine; + ReinitItem->Context = Context; + + DriverObject->Flags |= DRVO_BOOTREINIT_REGISTERED; + + ExInterlockedInsertTailList( + &DriverBootReinitListHead, + &ReinitItem->ItemEntry, + &DriverReinitListLock); +} + +/* * IoAllocateDriverObjectExtension * * Status _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-04-16 19:38:14 UTC (rev 14639) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-04-16 21:41:32 UTC (rev 14640) @@ -403,13 +403,11 @@ IoIsValidNameGraftingBuffer@8 IoIsOperationSynchronous@4 IoMakeAssociatedIrp@8 -IoOpenDeviceInstanceKey@20 IoOpenDeviceInterfaceRegistryKey@12 IoOpenDeviceRegistryKey@16 IoPageRead@20 IoPnPDeliverServicePowerNotification@16 IoQueryDeviceDescription@32 -IoQueryDeviceEnumInfo@8 IoQueryFileDosDeviceName@8 IoQueryFileInformation@20 IoQueryVolumeInformation@20

19 years, 8 months

[ion] 14639: Add file object flags, complete DEVOBJ_EXTENSION, and implement: IoIsFileOriginRemote, IoGetLowerDeviceObject, IoGetdiskDeviceObject, IoGetRequestorSessionId, IoGetRequestorProcessId

by ion＠svn.reactos.com

Add file object flags, complete DEVOBJ_EXTENSION, and implement: IoIsFileOriginRemote, IoGetLowerDeviceObject, IoGetdiskDeviceObject, IoGetRequestorSessionId, IoGetRequestorProcessId Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/process.c _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/include/ddk/iotypes.h 2005-04-16 19:38:14 UTC (rev 14639) @@ -645,6 +645,11 @@ #define FO_OPENED_CASE_SENSITIVE 0x00020000 #define FO_HANDLE_CREATED 0x00040000 #define FO_FILE_FAST_IO_READ 0x00080000 +#define FO_RANDOM_ACCESS 0x00100000 +#define FO_FILE_OPEN_CANCELLED 0x00200000 +#define FO_VOLUME_OPEN 0x00400000 +#define FO_FILE_OBJECT_HAS_EXTENSION 0x00800000 +#define FO_REMOTE_ORIGIN 0x01000000 typedef struct _FILE_OBJECT { @@ -896,6 +901,12 @@ #define DRVO_BOOTREINIT_REGISTERED 0x20L #define DRVO_LEGACY_RESOURCES 0x40L +#define DOE_UNLOAD_PENDING 0x1 +#define DOE_DELETE_PENDING 0x2 +#define DOE_REMOVE_PENDING 0x4 +#define DOE_REMOVE_PROCESSED 0x8 +#define DOE_START_PENDING 0x10 + typedef struct _DRIVER_OBJECT { CSHORT Type; _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-16 19:38:14 UTC (rev 14639) @@ -41,6 +41,7 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) +struct _DEVICE_OBJECT_POWER_EXTENSION; typedef struct _IO_COMPLETION_PACKET{ PVOID Key; @@ -53,10 +54,17 @@ CSHORT Type; USHORT Size; PDEVICE_OBJECT DeviceObject; - ULONG Unknown[3]; + ULONG PowerFlags; + struct DEVICE_OBJECT_POWER_EXTENSION *Dope; + ULONG ExtensionFlags; struct _DEVICE_NODE *DeviceNode; + PDEVICE_OBJECT AttachedTo; + LONG StartIoCount; + LONG StartIoKey; + ULONG StartIoFlags; + struct _VPB *Vpb; } DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; - + typedef struct _PRIVATE_DRIVER_EXTENSIONS { struct _PRIVATE_DRIVER_EXTENSIONS *Link; PVOID ClientIdentificationAddress; _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-16 19:38:14 UTC (rev 14639) @@ -247,30 +247,66 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -IoGetDiskDeviceObject( - IN PDEVICE_OBJECT FileSystemDeviceObject, - OUT PDEVICE_OBJECT *DiskDeviceObject - ) +IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, + OUT PDEVICE_OBJECT *DiskDeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PDEVOBJ_EXTENSION DeviceExtension; + PVPB Vpb; + KIRQL OldIrql; + + /* Make sure there's a VPB */ + if (!FileSystemDeviceObject->Vpb) return STATUS_INVALID_PARAMETER; + + /* Acquire it */ + IoAcquireVpbSpinLock(&OldIrql); + + /* Get the Device Extension */ + DeviceExtension = FileSystemDeviceObject->DeviceObjectExtension; + + /* Make sure this one has a VPB too */ + Vpb = DeviceExtension->Vpb; + if (!Vpb) return STATUS_INVALID_PARAMETER; + + /* Make sure someone it's mounted */ + if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) return STATUS_VOLUME_DISMOUNTED; + + /* Return the Disk Device Object */ + *DiskDeviceObject = Vpb->RealDevice; + + /* Release the lock */ + IoReleaseVpbSpinLock(OldIrql); + return STATUS_SUCCESS; } /* - * @unimplemented + * @implemented */ PDEVICE_OBJECT STDCALL -IoGetLowerDeviceObject( - IN PDEVICE_OBJECT DeviceObject - ) +IoGetLowerDeviceObject(IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return 0; + PDEVOBJ_EXTENSION DeviceExtension = DeviceObject->DeviceObjectExtension; + PDEVICE_OBJECT LowerDeviceObject = NULL; + + /* Make sure it's not getting deleted */ + if (DeviceExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)) + { + /* Get the Lower Device Object */ + LowerDeviceObject = DeviceExtension->AttachedTo; + + /* Reference it */ + ObReferenceObject(LowerDeviceObject); + } + + /* Return it */ + return LowerDeviceObject; } /* _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/ntoskrnl/io/file.c 2005-04-16 19:38:14 UTC (rev 14639) @@ -265,16 +265,14 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL -IoIsFileOriginRemote( - IN PFILE_OBJECT FileObject - ) +IoIsFileOriginRemote(IN PFILE_OBJECT FileObject) { - UNIMPLEMENTED; - return FALSE; + /* Return the flag status */ + return (FileObject->Flags & FO_REMOTE_ORIGIN); } /* _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-04-16 19:38:14 UTC (rev 14639) @@ -71,34 +71,6 @@ /* * @unimplemented */ -ULONG -STDCALL -IoGetRequestorProcessId( - IN PIRP Irp - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoGetRequestorSessionId( - IN PIRP Irp, - OUT PULONG pSessionId - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ BOOLEAN STDCALL IoIsValidNameGraftingBuffer( _____ Modified: trunk/reactos/ntoskrnl/io/process.c --- trunk/reactos/ntoskrnl/io/process.c 2005-04-16 17:48:46 UTC (rev 14638) +++ trunk/reactos/ntoskrnl/io/process.c 2005-04-16 19:38:14 UTC (rev 14639) @@ -18,44 +18,44 @@ /* * @implemented */ -PVOID STDCALL +PVOID +STDCALL IoGetInitialStack(VOID) { - return(PsGetCurrentThread()->Tcb.InitialStack); + return(PsGetCurrentThread()->Tcb.InitialStack); } - /* * @implemented */ -VOID STDCALL +VOID +STDCALL IoGetStackLimits(OUT PULONG LowLimit, - OUT PULONG HighLimit) + OUT PULONG HighLimit) { - *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; - *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; + *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; + *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; } /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL -IoIsSystemThread( - IN PETHREAD Thread - ) +IoIsSystemThread(IN PETHREAD Thread) { - UNIMPLEMENTED; - return FALSE; + /* Call the Ps Function */ + return PsIsSystemThread(Thread); } /* * @implemented */ -PEPROCESS STDCALL +PEPROCESS +STDCALL IoThreadToProcess(IN PETHREAD Thread) { - return(Thread->ThreadsProcess); + return(Thread->ThreadsProcess); } @@ -65,10 +65,32 @@ PEPROCESS STDCALL IoGetRequestorProcess(IN PIRP Irp) { - return(Irp->Tail.Overlay.Thread->ThreadsProcess); + return(Irp->Tail.Overlay.Thread->ThreadsProcess); } +/* + * @implemented + */ +ULONG +STDCALL +IoGetRequestorProcessId(IN PIRP Irp) +{ + return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); +} +/* + * @implemented + */ +NTSTATUS +STDCALL +IoGetRequestorSessionId(IN PIRP Irp, + OUT PULONG pSessionId) +{ + *pSessionId = IoGetRequestorProcess(Irp)->SessionId; + + return STATUS_SUCCESS; +} + /********************************************************************** * NAME EXPORTED * IoSetThreadHardErrorMode@4 @@ -84,14 +106,15 @@ * * @implemented */ -BOOLEAN STDCALL +BOOLEAN +STDCALL IoSetThreadHardErrorMode(IN BOOLEAN HardErrorEnabled) { - BOOLEAN PreviousHEM = (BOOLEAN)(NtCurrentTeb()->HardErrorDisabled); + BOOLEAN PreviousHEM = (BOOLEAN)(NtCurrentTeb()->HardErrorDisabled); - NtCurrentTeb()->HardErrorDisabled = ((TRUE == HardErrorEnabled) ? FALSE : TRUE); + NtCurrentTeb()->HardErrorDisabled = ((TRUE == HardErrorEnabled) ? FALSE : TRUE); - return((TRUE == PreviousHEM) ? FALSE : TRUE); + return((TRUE == PreviousHEM) ? FALSE : TRUE); } /* EOF */

19 years, 8 months

[arty] 14624: Use DriverDesc in the registry as the adapter name since the ndis name OID

by arty＠svn.reactos.com

Use DriverDesc in the registry as the adapter name since the ndis name OID seems generally unimplemented. What a pain. Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/include/info.h Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-04-14 22:41:48 UTC (rev 14623) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-04-15 00:48:25 UTC (rev 14624) @@ -18,6 +18,9 @@ UINT LanReceiveWorkerCalled = 0; BOOLEAN LanReceiveWorkerBusy = FALSE; +#define CCS_ROOT L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet" +#define TCPIP_GUID L"{4D36E972-E325-11CE-BFC1-08002BE10318}" + #define NGFP(_Packet) \ { \ PVOID _Header; \ @@ -331,21 +334,21 @@ IPPacket.Position = 0; TI_DbgPrint - (DEBUG_DATALINK, - ("Ether Type = %x ContigSize = %d Total = %d\n", - PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + (DEBUG_DATALINK, + ("Ether Type = %x ContigSize = %d Total = %d\n", + PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); switch (PacketType) { - case ETYPE_IPv4: - case ETYPE_IPv6: - TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); - IPReceive(Adapter->Context, &IPPacket); - break; - case ETYPE_ARP: - TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); - ARPReceive(Adapter->Context, &IPPacket); - default: - break; + case ETYPE_IPv4: + case ETYPE_IPv6: + TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); + IPReceive(Adapter->Context, &IPPacket); + break; + case ETYPE_ARP: + TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); + ARPReceive(Adapter->Context, &IPPacket); + default: + break; } FreeNdisPacket( Packet ); @@ -599,10 +602,10 @@ * SystemSpecific2: Unused & must not be touched */ { - /* XXX confirm that this is still true, or re-word the following comment */ - /* we get to ignore BindContext because we will never pend an operation with NDIS */ - TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName)); - *Status = LANRegisterAdapter(DeviceName, SystemSpecific1); + /* XXX confirm that this is still true, or re-word the following comment */ + /* we get to ignore BindContext because we will never pend an operation with NDIS */ + TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName)); + *Status = LANRegisterAdapter(DeviceName, SystemSpecific1); } @@ -664,25 +667,25 @@ RtlCopyMemory(EHeader->SrcAddr, Adapter->HWAddress, IEEE_802_ADDR_LENGTH); switch (Type) { - case LAN_PROTO_IPv4: - EHeader->EType = ETYPE_IPv4; - break; - case LAN_PROTO_ARP: - EHeader->EType = ETYPE_ARP; - break; - case LAN_PROTO_IPv6: - EHeader->EType = ETYPE_IPv6; - break; - default: + case LAN_PROTO_IPv4: + EHeader->EType = ETYPE_IPv4; + break; + case LAN_PROTO_ARP: + EHeader->EType = ETYPE_ARP; + break; + case LAN_PROTO_IPv6: + EHeader->EType = ETYPE_IPv6; + break; + default: #ifdef DBG - /* Should not happen */ - TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n")); + /* Should not happen */ + TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n")); - ProtocolSendComplete((NDIS_HANDLE)Context, - NdisPacket, - NDIS_STATUS_FAILURE); + ProtocolSendComplete((NDIS_HANDLE)Context, + NdisPacket, + NDIS_STATUS_FAILURE); #endif - return; + return; } break; @@ -729,7 +732,7 @@ NTSTATUS Status; InitializeObjectAttributes(&Attributes, RegistryPath, OBJ_CASE_INSENSITIVE, 0, 0); - Status = ZwOpenKey(RegHandle, GENERIC_READ, &Attributes); + Status = ZwOpenKey(RegHandle, KEY_ALL_ACCESS, &Attributes); return Status; } @@ -811,7 +814,7 @@ TI_DbgPrint(MIN_TRACE, ("Information DataLength: 0x%x\n", Information->DataLength)); UnicodeString.Buffer = (PWCHAR)&Information->Data; - UnicodeString.Length = Information->DataLength; + UnicodeString.Length = Information->DataLength - sizeof(WCHAR); UnicodeString.MaximumLength = Information->DataLength; String->Buffer = @@ -826,34 +829,163 @@ return STATUS_SUCCESS; } -static VOID GetSimpleAdapterNameFromRegistryPath -( PUNICODE_STRING TargetString, - PUNICODE_STRING RegistryPath ) { - PWCHAR i, LastSlash = NULL; - UINT NewStringLength = 0; +/* + * Utility to copy and append two unicode strings. + * + * IN OUT PUNICODE_STRING ResultFirst -> First string and result + * IN PUNICODE_STRING Second -> Second string to append + * IN BOOL Deallocate -> TRUE: Deallocate First string before + * overwriting. + * + * Returns NTSTATUS. + */ - for( i = RegistryPath->Buffer; - i < RegistryPath->Buffer + - (RegistryPath->Length / sizeof(WCHAR)); - i++ ) if( *i == '\\' ) LastSlash = i; +NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst, + PUNICODE_STRING Second, + BOOL Deallocate) { + NTSTATUS Status; + UNICODE_STRING Ustr = *ResultFirst; + PWSTR new_string = ExAllocatePoolWithTag + (PagedPool, + (ResultFirst->Length + Second->Length + sizeof(WCHAR)), TAG_STRING); + if( !new_string ) { + return STATUS_NO_MEMORY; + } + memcpy( new_string, ResultFirst->Buffer, ResultFirst->Length ); + memcpy( new_string + ResultFirst->Length / sizeof(WCHAR), + Second->Buffer, Second->Length ); + if( Deallocate ) RtlFreeUnicodeString(ResultFirst); + ResultFirst->Length = Ustr.Length + Second->Length; + ResultFirst->MaximumLength = ResultFirst->Length; + new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; + Status = RtlCreateUnicodeString(ResultFirst,new_string) ? + STATUS_SUCCESS : STATUS_NO_MEMORY; + ExFreePool(new_string); + return Status; +} - if( LastSlash ) LastSlash++; else LastSlash = RegistryPath->Buffer; +static NTSTATUS CheckForDeviceDesc( PUNICODE_STRING EnumKeyName, + PUNICODE_STRING TargetKeyName, + PUNICODE_STRING ShortName, + PUNICODE_STRING OutName ) { + UNICODE_STRING RootDevice = { 0 }, LinkageKeyName = { 0 }; + UNICODE_STRING DescKeyName = { 0 }, Linkage = { 0 }; + UNICODE_STRING BackSlash = { 0 }; + HANDLE DescKey = NULL, LinkageKey = NULL; + NTSTATUS Status; - NewStringLength = RegistryPath->MaximumLength - - ((LastSlash - RegistryPath->Buffer) * sizeof(WCHAR)); + TI_DbgPrint(DEBUG_DATALINK,("EnumKeyName %wZ\n", EnumKeyName)); - TargetString->Buffer = - (PWCHAR)exAllocatePool( NonPagedPool, NewStringLength ); + RtlInitUnicodeString(&BackSlash, L"\\"); + RtlInitUnicodeString(&Linkage, L"\\Linkage"); - if( !TargetString->Buffer ) { - TargetString->Length = TargetString->MaximumLength = 0; - return; + RtlInitUnicodeString(&DescKeyName, L""); + AppendUnicodeString( &DescKeyName, EnumKeyName, FALSE ); + AppendUnicodeString( &DescKeyName, &BackSlash, TRUE ); + AppendUnicodeString( &DescKeyName, TargetKeyName, TRUE ); + + RtlInitUnicodeString(&LinkageKeyName, L""); + AppendUnicodeString( &LinkageKeyName, &DescKeyName, FALSE ); + AppendUnicodeString( &LinkageKeyName, &Linkage, TRUE ); + + Status = OpenRegistryKey( &LinkageKeyName, &LinkageKey ); + if( !NT_SUCCESS(Status) ) goto cleanup; + + Status = ReadStringFromRegistry( LinkageKey, L"RootDevice", &RootDevice ); + if( !NT_SUCCESS(Status) ) goto cleanup; + + if( RtlCompareUnicodeString( &RootDevice, ShortName, TRUE ) == 0 ) { + Status = OpenRegistryKey( &DescKeyName, &DescKey ); + if( !NT_SUCCESS(Status) ) goto cleanup; + + Status = ReadStringFromRegistry( DescKey, L"DriverDesc", OutName ); + if( !NT_SUCCESS(Status) ) goto cleanup; + + TI_DbgPrint(DEBUG_DATALINK,("ADAPTER NAME: %wZ\n", OutName)); + } else Status = STATUS_UNSUCCESSFUL; + +cleanup: + RtlFreeUnicodeString( &RootDevice ); + RtlFreeUnicodeString( &LinkageKeyName ); + RtlFreeUnicodeString( &DescKeyName ); + if( LinkageKey ) NtClose( LinkageKey ); + if( DescKey ) NtClose( DescKey ); + + TI_DbgPrint(DEBUG_DATALINK,("Returning %x\n", Status)); + + return Status; +} + +static NTSTATUS FindDeviceNameForAdapter( PUNICODE_STRING ShortName, + PUNICODE_STRING OutName ) { + UNICODE_STRING EnumKeyName, TargetKeyName; + HANDLE EnumKey; + NTSTATUS Status; + ULONG i; + KEY_BASIC_INFORMATION *Kbio = + ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION)); + ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength; + + RtlInitUnicodeString + (&EnumKeyName, CCS_ROOT L"\\Control\\Class\\" TCPIP_GUID); + + Status = OpenRegistryKey( &EnumKeyName, &EnumKey ); + + if( !NT_SUCCESS(Status) ) + TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n", + &EnumKeyName, Status)); + + for( i = 0; NT_SUCCESS(Status); i++ ) { + Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, + Kbio, KbioLength, &ResultLength ); + + if( Status == STATUS_BUFFER_TOO_SMALL ) { + ExFreePool( Kbio ); + KbioLength = ResultLength; + Kbio = ExAllocatePool( NonPagedPool, KbioLength ); + + Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, + Kbio, KbioLength, &ResultLength ); + + TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); + return Status; + } + + if( NT_SUCCESS(Status) ) { + TargetKeyName.Length = TargetKeyName.MaximumLength = + Kbio->NameLength; + TargetKeyName.Buffer = Kbio->Name; + + Status = CheckForDeviceDesc + ( &EnumKeyName, &TargetKeyName, ShortName, OutName ); + if( NT_SUCCESS(Status) ) { + NtClose( EnumKey ); + return Status; + } else Status = STATUS_SUCCESS; + } } - TargetString->Length = TargetString->MaximumLength = NewStringLength; - RtlCopyMemory( TargetString->Buffer, LastSlash, NewStringLength ); + RtlInitUnicodeString( OutName, L"" ); + AppendUnicodeString( OutName, &TargetKeyName, FALSE ); + NtClose( EnumKey ); + return STATUS_UNSUCCESSFUL; } +VOID GetShortName( PUNICODE_STRING RegistryKey, + PUNICODE_STRING ShortNameOut ) { + PWCHAR Ptr; + ShortNameOut->Buffer = + RegistryKey->Buffer + wcslen(CCS_ROOT L"\\Services\\"); + Ptr = ShortNameOut->Buffer; + + while( *Ptr != L'\\' && + ((PCHAR)Ptr) < ((PCHAR)RegistryKey->Buffer) + RegistryKey->Length ) + Ptr++; + + ShortNameOut->Length = ShortNameOut->MaximumLength = + (Ptr - ShortNameOut->Buffer) * sizeof(WCHAR); +} + VOID BindAdapter( PLAN_ADAPTER Adapter, PNDIS_STRING RegistryPath) @@ -873,18 +1005,21 @@ ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; HANDLE RegHandle = 0; + UNICODE_STRING ShortName; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); Adapter->State = LAN_STATE_OPENING; + GetShortName( RegistryPath, &ShortName ); + NdisStatus = NDISCall(Adapter, NdisRequestSetInformation, OID_GEN_CURRENT_LOOKAHEAD, &Lookahead, sizeof(ULONG)); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TI_DbgPrint(MID_TRACE, ("Could not set lookahead buffer size (0x%X).\n", NdisStatus)); + TI_DbgPrint(DEBUG_DATALINK, ("Could not set lookahead buffer size (0x%X).\n", NdisStatus)); return; } @@ -915,6 +1050,11 @@ Status = OpenRegistryKey( RegistryPath, &RegHandle ); + if(NT_SUCCESS(Status)) { + Status = FindDeviceNameForAdapter( &ShortName, &IF->Name ); + TI_DbgPrint(DEBUG_DATALINK,("Adapter Name: %wZ\n", &IF->Name)); + } + if(NT_SUCCESS(Status)) Status = ReadIPAddressFromRegistry( RegHandle, L"DefaultGateway", &DefaultGateway ); @@ -935,58 +1075,35 @@ IF->Unicast.Address.IPv4Address | ~IF->Netmask.Address.IPv4Address; - TI_DbgPrint(MID_TRACE,("BCAST(IF) %s\n", A2S(&IF->Broadcast))); + TI_DbgPrint(DEBUG_DATALINK,("BCAST(IF) %s\n", A2S(&IF->Broadcast))); if(NT_SUCCESS(Status)) { - RtlZeroMemory( &IF->Name, sizeof(IF->Name) ); - Status = ReadStringFromRegistry( RegHandle, L"DeviceDesc", - &IF->Name ); - - /* I think that not getting a devicedesc is not a fatal error */ - if( !NT_SUCCESS(Status) ) { - if( IF->Name.Buffer ) exFreePool( IF->Name.Buffer ); - GetSimpleAdapterNameFromRegistryPath( &IF->Name, RegistryPath ); - } - Status = STATUS_SUCCESS; + /* It's ok to fail some of the above. We'll just use DHCP. */ + TI_DbgPrint + (DEBUG_DATALINK, + ("--> Our IP address on this interface: '%s'\n", + A2S(&IF->Unicast))); + + TI_DbgPrint + (DEBUG_DATALINK, + ("--> Our net mask on this interface: '%s'\n", + A2S(&IF->Netmask))); + + if( DefaultGateway.Address.IPv4Address ) { + TI_DbgPrint + (DEBUG_DATALINK, + ("--> Our gateway is: '%s'\n", + A2S(&DefaultGateway))); + + /* Create a default route */ + RouterCreateRoute( &DefaultMask, /* Zero */ + &DefaultMask, /* Zero */ + &DefaultGateway, + IF, + 1 ); + } } - TI_DbgPrint(MID_TRACE,("Adapter Name: %wZ\n", &IF->Name)); - - if(!NT_SUCCESS(Status)) - { - TI_DbgPrint(MIN_TRACE, ("Unable to open protocol-specific registry key: 0x%x\n", Status)); - - /* XXX how do we proceed? No ip address, no parameters... do we guess? */ - if(RegHandle) - ZwClose(RegHandle); - IPDestroyInterface(IF); - return; - } - - TI_DbgPrint - (MID_TRACE, - ("--> Our IP address on this interface: '%s'\n", - A2S(&IF->Unicast))); - - TI_DbgPrint - (MID_TRACE, - ("--> Our net mask on this interface: '%s'\n", - A2S(&IF->Netmask))); - - if( DefaultGateway.Address.IPv4Address ) { - TI_DbgPrint - (MID_TRACE, - ("--> Our gateway is: '%s'\n", - A2S(&DefaultGateway))); - - /* Create a default route */ - RouterCreateRoute( &DefaultMask, /* Zero */ - &DefaultMask, /* Zero */ - &DefaultGateway, - IF, - 1 ); - } - /* Get maximum link speed */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, @@ -1008,7 +1125,7 @@ sizeof(UINT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { - TI_DbgPrint(MID_TRACE, ("Could not set packet filter (0x%X).\n", NdisStatus)); + TI_DbgPrint(DEBUG_DATALINK, ("Could not set packet filter (0x%X).\n", NdisStatus)); IPDestroyInterface(IF); return; } @@ -1232,10 +1349,10 @@ NdisCloseAdapter(&NdisStatus, NdisHandle); if (NdisStatus == NDIS_STATUS_PENDING) { TcpipWaitForSingleObject(&Adapter->Event, - UserRequest, - KernelMode, - FALSE, - NULL); + UserRequest, + KernelMode, + FALSE, + NULL); NdisStatus = Adapter->NdisStatus; } } else @@ -1284,16 +1401,16 @@ ProtChars.StatusCompleteHandler = ProtocolStatusComplete; ProtChars.BindAdapterHandler = ProtocolBindAdapter; - /* Try to register protocol */ + /* Try to register protocol */ NdisRegisterProtocol(&NdisStatus, &NdisProtocolHandle, &ProtChars, sizeof(NDIS_PROTOCOL_CHARACTERISTICS)); if (NdisStatus != NDIS_STATUS_SUCCESS) - { - TI_DbgPrint(MID_TRACE, ("NdisRegisterProtocol failed, status 0x%x\n", NdisStatus)); + { + TI_DbgPrint(DEBUG_DATALINK, ("NdisRegisterProtocol failed, status 0x%x\n", NdisStatus)); return (NTSTATUS)NdisStatus; - } + } ProtocolRegistered = TRUE; @@ -1323,7 +1440,7 @@ CurrentEntry = AdapterListHead.Flink; while (CurrentEntry != &AdapterListHead) { NextEntry = CurrentEntry->Flink; - Current = CONTAINING_RECORD(CurrentEntry, LAN_ADAPTER, ListEntry); + Current = CONTAINING_RECORD(CurrentEntry, LAN_ADAPTER, ListEntry); /* Unregister it */ LANUnregisterAdapter(Current); CurrentEntry = NextEntry; _____ Modified: trunk/reactos/drivers/net/tcpip/include/info.h --- trunk/reactos/drivers/net/tcpip/include/info.h 2005-04-14 22:41:48 UTC (rev 14623) +++ trunk/reactos/drivers/net/tcpip/include/info.h 2005-04-15 00:48:25 UTC (rev 14624) @@ -74,11 +74,13 @@ ULONG LastChange; ULONG InOctets; ULONG InUcastPackets; + ULONG InNUcastPackets; ULONG InDiscards; ULONG InErrors; ULONG InUnknownProtos; ULONG OutOctets; ULONG OutUcastPackets; + ULONG OutNUcastPackets; ULONG OutDiscards; ULONG OutErrors; ULONG OutQLen; _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h --- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-04-14 22:41:48 UTC (rev 14623) +++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-04-15 00:48:25 UTC (rev 14624) @@ -30,6 +30,7 @@ #include <debug.h> +#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ /* Define _NTTEST_ to make test version. Device names are prefixed with 'NT' to allow the driver to run side by side with MS TCP/IP driver */

19 years, 8 months

[ion] 14638: Fix WaitAll bug. Previously, not all Wait Objects in a WaitAll were checked for signaling, which meant as soon as one was signaled, all were supposed to be satisfied. Worse however, only one object would get satisfied anyways, because of a second bug which hid the first during my testing. Now, all wait all objects must be signaled before satsifcation, and satisfaction is correctly done on all the objects. Reg tested with multithrdwin, which did not properly work before. Thanks to w3

by ion＠svn.reactos.com

Fix WaitAll bug. Previously, not all Wait Objects in a WaitAll were checked for signaling, which meant as soon as one was signaled, all were supposed to be satisfied. Worse however, only one object would get satisfied anyways, because of a second bug which hid the first during my testing. Now, all wait all objects must be signaled before satsifcation, and satisfaction is correctly done on all the objects. Reg tested with multithrdwin, which did not properly work before. Thanks to w3seek for notifying me of this bug. Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-16 17:09:12 UTC (rev 14637) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-16 17:48:46 UTC (rev 14638) @@ -192,10 +192,10 @@ /* Remove Waits */ WaitBlock = Thread->WaitBlockList; - while (WaitBlock) { + do { RemoveEntryList (&WaitBlock->WaitListEntry); WaitBlock = WaitBlock->NextWaitBlock; - } + } while (WaitBlock != Thread->WaitBlockList); Thread->WaitBlockList = NULL; /* Dispatch it and return status */ _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-04-16 17:09:12 UTC (rev 14637) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-04-16 17:48:46 UTC (rev 14638) @@ -239,7 +239,7 @@ WaitBlock->WaitKey = STATUS_SUCCESS; WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; - WaitBlock->NextWaitBlock = NULL; + WaitBlock->NextWaitBlock = WaitBlock; Thread->WaitStatus = STATUS_SUCCESS; @@ -270,7 +270,7 @@ TimerWaitBlock->Thread = Thread; TimerWaitBlock->WaitKey = STATUS_TIMEOUT; TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = NULL; + TimerWaitBlock->NextWaitBlock = TimerWaitBlock; /* Link the timer to this Wait Block */ InitializeListHead(&Timer->Header.WaitListHead); _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-04-16 17:09:12 UTC (rev 14637) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-04-16 17:48:46 UTC (rev 14638) @@ -117,7 +117,7 @@ TimerWaitBlock->Thread = CurrentThread; TimerWaitBlock->WaitKey = (USHORT)STATUS_TIMEOUT; TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = NULL; + TimerWaitBlock->NextWaitBlock = TimerWaitBlock; /* Link the timer to this Wait Block */ InitializeListHead(&ThreadTimer->Header.WaitListHead); @@ -269,7 +269,7 @@ WaitBlock->Thread = CurrentThread; WaitBlock->WaitKey = (USHORT)(STATUS_WAIT_0); WaitBlock->WaitType = WaitAny; - WaitBlock->NextWaitBlock = NULL; + WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); @@ -300,7 +300,7 @@ TimerWaitBlock->Thread = CurrentThread; TimerWaitBlock->WaitKey = STATUS_TIMEOUT; TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = NULL; + TimerWaitBlock->NextWaitBlock = WaitBlock; /* Link the timer to this Wait Block */ InitializeListHead(&ThreadTimer->Header.WaitListHead); @@ -400,7 +400,6 @@ /* Check in regards to the Thread Object Limit */ if (Count > THREAD_WAIT_OBJECTS) { - DPRINT1("(%s:%d) Too many objects!\n", __FILE__, __LINE__); KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); } @@ -412,7 +411,6 @@ /* Using our own Block Array. Check in regards to System Object Limit */ if (Count > MAXIMUM_WAIT_OBJECTS) { - DPRINT1("(%s:%d) Too many objects!\n", __FILE__, __LINE__); KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); } } @@ -496,7 +494,7 @@ /* Return to the Root Wait Block */ WaitBlock--; - WaitBlock->NextWaitBlock = NULL; + WaitBlock->NextWaitBlock = WaitBlockArray; /* Check if this is a Wait All and all the objects are signaled */ if ((WaitType == WaitAll) && (AllObjectsSignaled)) { @@ -539,7 +537,7 @@ TimerWaitBlock->Thread = CurrentThread; TimerWaitBlock->WaitKey = STATUS_TIMEOUT; TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = NULL; + TimerWaitBlock->NextWaitBlock = WaitBlockArray; /* Link the timer to this Wait Block */ InitializeListHead(&ThreadTimer->Header.WaitListHead); @@ -555,7 +553,7 @@ /* Insert into Object's Wait List*/ WaitBlock = CurrentThread->WaitBlockList; - while (WaitBlock) { + do { /* Get the Current Object */ CurrentObject = WaitBlock->Object; @@ -565,7 +563,7 @@ /* Move to the next Wait Block */ WaitBlock = WaitBlock->NextWaitBlock; - } + } while (WaitBlock != WaitBlockArray); /* Handle Kernel Queues */ if (CurrentThread->Queue) { @@ -656,6 +654,7 @@ PLIST_ENTRY WaitList; PKWAIT_BLOCK CurrentWaitBlock; PKWAIT_BLOCK NextWaitBlock; + PKTHREAD WaitThread; /* Loop the Wait Entries */ DPRINT("KiWaitTest for Object: %x\n", Object); @@ -665,6 +664,7 @@ /* Get the current wait block */ CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); + WaitThread = CurrentWaitBlock->Thread; /* Check the current Wait Mode */ if (CurrentWaitBlock->WaitType == WaitAny) { @@ -672,7 +672,7 @@ /* Easy case, satisfy only this wait */ DPRINT("Satisfiying a Wait any\n"); WaitEntry = WaitEntry->Blink; - KiSatisfyObjectWait(Object, CurrentWaitBlock->Thread); + KiSatisfyObjectWait(Object, WaitThread); } else { @@ -681,13 +681,14 @@ NextWaitBlock = CurrentWaitBlock->NextWaitBlock; /* Loop first to make sure they are valid */ - while (NextWaitBlock) { + while (NextWaitBlock != CurrentWaitBlock) { /* Check if the object is signaled */ - if (!KiIsObjectSignaled(Object, CurrentWaitBlock->Thread)) { + DPRINT("Checking: %x %d\n", NextWaitBlock->Object, Object->SignalState); + if (!KiIsObjectSignaled(NextWaitBlock->Object, WaitThread)) { /* It's not, move to the next one */ - DPRINT1("One of the object is non-signaled, sorry.\n"); + DPRINT("One of the object is non-signaled, sorry.\n"); goto SkipUnwait; } @@ -703,7 +704,7 @@ /* All waits satisfied, unwait the thread */ DPRINT("Unwaiting the Thread\n"); - KiAbortWaitThread(CurrentWaitBlock->Thread, CurrentWaitBlock->WaitKey, Increment); + KiAbortWaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment); SkipUnwait: /* Next entry */ @@ -729,7 +730,7 @@ /* Remove the Wait Blocks from the list */ DPRINT("Removing waits\n"); WaitBlock = Thread->WaitBlockList; - while (WaitBlock) { + do { /* Remove it */ DPRINT("Removing Waitblock: %x, %x\n", WaitBlock, WaitBlock->NextWaitBlock); @@ -737,7 +738,7 @@ /* Go to the next one */ WaitBlock = WaitBlock->NextWaitBlock; - }; + } while (WaitBlock != Thread->WaitBlockList); /* Check if there's a Thread Timer */ if (Thread->Timer.Header.Inserted) { @@ -821,15 +822,16 @@ FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock) { + PKWAIT_BLOCK FirstBlock = WaitBlock; PKTHREAD WaitThread = WaitBlock->Thread; /* Loop through all the Wait Blocks, and wake each Object */ - while (WaitBlock) { + do { /* Wake the Object */ KiSatisfyObjectWait(WaitBlock->Object, WaitThread); WaitBlock = WaitBlock->NextWaitBlock; - } + } while (WaitBlock != FirstBlock); } VOID

19 years, 8 months

[mbosma] 14637: PackageManager: Ported GUI to C

by mbosma＠svn.reactos.com

PackageManager: Ported GUI to C Added: trunk/rosapps/packmgr/gui/main.c Deleted: trunk/rosapps/packmgr/gui/main.cpp Modified: trunk/rosapps/packmgr/gui/main.h _____ Copied: trunk/rosapps/packmgr/gui/main.c (from rev 14635, trunk/rosapps/packmgr/gui/main.cpp) --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/rosapps/packmgr/gui/main.c 2005-04-16 17:09:12 UTC (rev 14637) @@ -0,0 +1,429 @@ +//////////////////////////////////////////////////////// +// +// main.cpp +// +// Implementation of the Package Manager GUI +// +// +// Maarten Bosma, 09.01.2004 +// maarten.paul(a)bosma.de +// +//////////////////////////////////////////////////////////////////// + +#include "main.h" + + +// Application's Entry Point +int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) +{ + HWND hwnd; + MSG msg; + WNDCLASSEX wc = {0}; + + // Window creation + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpszClassName = L"pgkmgr"; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = (WNDPROC)WndProc; + wc.hInstance = hinst; + wc.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_MAIN)); + wc.hbrBackground = (HBRUSH)(COLOR_SCROLLBAR); + + RegisterClassEx(&wc); + + hwnd = CreateWindow(L"pgkmgr", + L"ReactOS - Package Manager v0.3", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 500, 600, + NULL, NULL, + hinst, + NULL); + + + // Toolbar creation + InitCommonControls(); + + hTBar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, 0, 8, hinst, IDB_TOOLBAR, + Buttons, sizeof(Buttons)/sizeof(TBBUTTON), TBSIZE, TBSIZE, TBSIZE, TBSIZE, sizeof(TBBUTTON)); + + // Show the windows + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + // Load the tree + int error = PML_LoadTree(&tree, "tree.xml", AddItem); + + if(error) + { + MessageBox(0,PML_TransError(error),0,0); + return 0; + } + + // Read the help + Help(); + + // Start getting messages + while(GetMessage(&msg,NULL,0,0)) + { + if(!TranslateAccelerator(hwnd, hHotKeys, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + // Close our handle + PML_CloseTree (tree); + + return 0; +} + +// Add a item to our tree +int AddItem (int id, const char* name, int parent, int icon) +{ + TV_INSERTSTRUCT tvins; + + tvins.item.lParam = (UINT)id; + tvins.item.mask = TVIF_TEXT|TVIF_PARAM; + tvins.item.pszText = (WCHAR*)name; //that is ok + tvins.item.cchTextMax = strlen(name); + tvins.hInsertAfter = TVI_LAST; + + if(icon) + { + tvins.item.iImage = icon; + tvins.item.iSelectedImage = icon; + tvins.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE; + } + + if (parent==0) + tvins.hParent = TVI_ROOT; + else + tvins.hParent = nodes[parent]; + + nodes[id] = (HTREEITEM)SendMessage(hTree, TVM_INSERTITEMA, 0, (LPARAM)&tvins); + + return 0; +} + +// Load the Help from file and display it +void Help (void) +{ + int i; + char buffer [2000]; + FILE* file = fopen ("help.txt", "r"); + + if(!file) + return; + + for(i=0; i<2000; i++) + { + buffer[i] = getc(file); + if(!buffer[i]) break; + } + + SetText(buffer); +} + +// Create our Controls +void InitControls (HWND hwnd) +{ + + HINSTANCE hinst = GetModuleHandle(NULL); + + // Create the controls + hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, + 0, 0, 0, 0, hwnd, NULL, hinst, NULL); + + hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, + 0, 0, 100, 100, hwnd, NULL, hinst, NULL); + + hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); + + // Create Tree Icons + HIMAGELIST hIcon = ImageList_Create(16,16,ILC_COLOR32,1,1); + SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hIcon); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(1))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(11))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(12))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(13))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(14))); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(2))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(3))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(4))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(5))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(6))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(7))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(8))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(9))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); + + // Setup Hotkeys + hHotKeys = LoadAccelerators (hinst, MAKEINTRESOURCE(IDR_HOTKEYS)); +} + +// Set the Icons +int SetIcon (int id, int icon) +{ + TVITEMEX item; + + item.hItem = nodes[id]; + item.iImage = icon; + item.iSelectedImage = icon; + item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + + TreeView_SetItem(hTree, &item); + + return 1; +} + +// Set the Icons +int Ask (const WCHAR* message) +{ + int ans = MessageBox (0,message,0,MB_YESNO); + + if(ans == IDYES) + return 1; + + return 0; +} + +// En- or Disable a Button inside of the toolbar and the Context Menu +int SetButton (DWORD id, BOOL state) +{ + // Change the Toorbar Button + TBBUTTONINFO ti; + + ti.cbSize = sizeof (ti); + ti.dwMask = TBIF_STATE; +/* + if(state&&id==1) + MessageBox(0,L"on",0,0); + else if(!state&&id==1) + MessageBox(0,L"off",0,0); +*/ + if(state) + ti.fsState = TBSTATE_ENABLED; + else + ti.fsState = TBSTATE_INDETERMINATE; + + SendMessage (hTBar, TB_SETBUTTONINFO, id, (LPARAM)&ti); + + // Change the Context Menu item + MENUITEMINFO mi; + + mi.cbSize = sizeof (mi); + mi.fMask = MIIM_STATE; + + if(state) + mi.fState = MFS_ENABLED; + + else + mi.fState = MFS_GRAYED; + + SetMenuItemInfo(hPopup, id, FALSE, &mi); + + return 0; +} + +// Set the text of the text box +int SetText (const char* text) +{ + int i, j; + char buffer [2000]; + + if(!text) + return 1; + + // the windows does not need "\n" + // for new lines but "\r\n" + for(i=0,j=0; text[i]; i++,j++) + { + buffer[j] = text[i]; + if(buffer[j] == '\n') + buffer[++j] = '\r'; + } + buffer[i] = 0; + + SetWindowTextA(hEdit, buffer); + + return 0; +} + +// Windows Message Callback (this is where most things happen) +LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + // at the very beginning ... + case WM_CREATE: + { + InitControls(hwnd); + } + break; + + // calculate the size of the controls + case WM_SIZE: + { + RECT rcl; + SendMessage(hTBar, TB_AUTOSIZE, 0L, 0L); + GetWindowRect(hTBar, &rcl); + + int win_top = rcl.bottom - rcl.top; + int win_hight = HIWORD(lParam) - win_top; + + MoveWindow(hTree, 0, win_top, LOWORD(lParam), splitter_pos*win_hight/100, TRUE); + MoveWindow(hEdit, 0, (splitter_pos*win_hight/100)+win_top, LOWORD(lParam), win_hight, TRUE); + } + break; + + // for the treeview + case WM_NOTIFY: + { + if(((LPNMHDR)lParam)->code == TVN_SELCHANGED) + { + selected = ((LPNMTREEVIEW)lParam)->itemNew.lParam; + PML_LoadPackage (tree, selected, SetButton); + SetText(PML_GetDescription (tree, selected)); + } + + else if ((int)(((LPNMHDR)lParam)->code) == NM_RCLICK) // <= aarrggg LISP + { + // which item has been click on + HTREEITEM item = TreeView_GetDropHilight(hTree); + + if(item != NULL) + { + // mark the one as seleacted + SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); + TreeView_EnsureVisible (hTree, item); + } + + // create the context menu + if(selected != 0) + { + POINT pt; + GetCursorPos (&pt); + TrackPopupMenu (GetSubMenu(hPopup, 0), 0, (UINT)pt.x, (UINT)pt.y, 0, hwnd, NULL); + } + } + } + break; + + // for the toolbar + case WM_COMMAND: + { + // All Actions + if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) + { + if(selected) + if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) + break; + + MessageBeep(MB_ICONHAND); + } + + // DoIt + else if(LOWORD(wParam)==6) + { + if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); + else + MessageBeep(MB_ICONHAND); + } + + // Help + else if(LOWORD(wParam)==7) + Help(); + + // Options + else if(LOWORD(wParam)==8) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsProc); + } + break; + + // prozess hotkeys + case WM_HOTKEY: + { + if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) + MessageBeep(MB_ICONHAND); + } + break; + + // ... at the very end + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +// Warning: This function is called from another thread +int SetStatus (int status1, int status2, WCHAR* text) +{ + // Set the Rage to 1000 + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); + + // The prozessbars and the text filds + if(text) + SetDlgItemText(hStatus, IDC_TSTATUS, text); + + if(status1!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETPOS, status1, 0); + + if(status2!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETPOS, status2, 0); + + // If the Status is 1000 very thing is done + if(status1==1000) + { + EndDialog(hStatus, TRUE); + MessageBox(0,PML_TransError(status2),0,0); + } + + return 0; +} + +// Callback for the Status Dialog +INT_PTR CALLBACK StatusProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + hStatus = hwnd; + + } break; + + case WM_COMMAND: // can only be the about button + case WM_CLOSE: // the close-window-[x] + { + PML_Abort(); + EndDialog(hwnd, TRUE); + return 0; + } + } + + return 0; +} + +// Callback for the Options Dialog +INT_PTR CALLBACK OptionsProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CLOSE: + EndDialog(hwnd, TRUE); + return 0; + } + + return 0; +} _____ Deleted: trunk/rosapps/packmgr/gui/main.cpp --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 16:04:38 UTC (rev 14636) +++ trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 17:09:12 UTC (rev 14637) @@ -1,420 +0,0 @@ -//////////////////////////////////////////////////////// -// -// main.cpp -// -// Implementation of the Package Manager GUI -// -// -// Maarten Bosma, 09.01.2004 -// maarten.paul(a)bosma.de -// -//////////////////////////////////////////////////////////////////// - -#include "main.h" - - -// Application's Entry Point -int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) -{ - HWND hwnd; - MSG msg; - WNDCLASSEX wc = {0}; - - // Window creation - wc.cbSize = sizeof(WNDCLASSEX); - wc.lpszClassName = L"pgkmgr"; - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC)WndProc; - wc.hInstance = hinst; - wc.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_MAIN)); - wc.hbrBackground = (HBRUSH)(COLOR_SCROLLBAR); - - RegisterClassEx(&wc); - - hwnd = CreateWindow(L"pgkmgr", - L"ReactOS - Package Manager v0.3", - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, - CW_USEDEFAULT, - 500, 600, - NULL, NULL, - hinst, - NULL); - - - // Toolbar creation - InitCommonControls(); - - hTBar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, 0, 8, hinst, IDB_TOOLBAR, - Buttons, sizeof(Buttons)/sizeof(TBBUTTON), TBSIZE, TBSIZE, TBSIZE, TBSIZE, sizeof(TBBUTTON)); - - // Show the windows - ShowWindow(hwnd, SW_SHOW); - UpdateWindow(hwnd); - - // Load the tree - int error = PML_LoadTree(&tree, "tree.xml", AddItem); - - if(error) - { - MessageBox(0,PML_TransError(error),0,0); - return 0; - } - - // Read the help - Help(); - - // Start getting messages - while(GetMessage(&msg,NULL,0,0)) - { - if(!TranslateAccelerator(hwnd, hHotKeys, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - // Close our handle - PML_CloseTree (tree); - - return 0; -} - -// Add a item to our tree -int AddItem (int id, const char* name, int parent, int icon) -{ - TV_INSERTSTRUCT tvins; - - tvins.item.lParam = (UINT)id; - tvins.item.mask = TVIF_TEXT|TVIF_PARAM; - tvins.item.pszText = (WCHAR*)name; //that is ok - tvins.item.cchTextMax = strlen(name); - tvins.hInsertAfter = TVI_LAST; - - if(icon) - { - tvins.item.iImage = icon; - tvins.item.iSelectedImage = icon; - tvins.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE; - } - - if (parent==0) - tvins.hParent = TVI_ROOT; - else - tvins.hParent = nodes[parent]; - - nodes[id] = (HTREEITEM)SendMessage(hTree, TVM_INSERTITEMA, 0, (LPARAM)&tvins); - - return 0; -} - -// Load the Help from file and display it -void Help (void) -{ - string source; - - ifstream file("help.txt", ios_base::in); - getline(file, source, '\0'); - - SetText(source.c_str()); -} - -// Create our Controls -void InitControls (HWND hwnd) -{ - - HINSTANCE hinst = GetModuleHandle(NULL); - - // Create the controls - hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, - 0, 0, 0, 0, hwnd, NULL, hinst, NULL); - - hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, - 0, 0, 100, 100, hwnd, NULL, hinst, NULL); - - hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); - - // Create Tree Icons - HIMAGELIST hIcon = ImageList_Create(16,16,ILC_COLOR32,1,1); - SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hIcon); - - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(1))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(11))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(12))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(13))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(14))); - - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(2))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(3))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(4))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(5))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(6))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(7))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(8))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(9))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); - - // Setup Hotkeys - hHotKeys = LoadAccelerators (hinst, MAKEINTRESOURCE(IDR_HOTKEYS)); -} - -// Set the Icons -int SetIcon (int id, int icon) -{ - TVITEMEX item; - - item.hItem = nodes[id]; - item.iImage = icon; - item.iSelectedImage = icon; - item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; - - TreeView_SetItem(hTree, &item); - - return 1; -} - -// Set the Icons -int Ask (const WCHAR* message) -{ - int ans = MessageBox (0,message,0,MB_YESNO); - - if(ans == IDYES) - return 1; - - return 0; -} - -// En- or Disable a Button inside of the toolbar and the Context Menu -int SetButton (DWORD id, BOOL state) -{ - // Change the Toorbar Button - TBBUTTONINFO ti; - - ti.cbSize = sizeof (ti); - ti.dwMask = TBIF_STATE; -/* - if(state&&id==1) - MessageBox(0,L"on",0,0); - else if(!state&&id==1) - MessageBox(0,L"off",0,0); -*/ - if(state) - ti.fsState = TBSTATE_ENABLED; - else - ti.fsState = TBSTATE_INDETERMINATE; - - SendMessage (hTBar, TB_SETBUTTONINFO, id, (LPARAM)&ti); - - // Change the Context Menu item - MENUITEMINFO mi; - - mi.cbSize = sizeof (mi); - mi.fMask = MIIM_STATE; - - if(state) - mi.fState = MFS_ENABLED; - - else - mi.fState = MFS_GRAYED; - - SetMenuItemInfo(hPopup, id, FALSE, &mi); - - return 0; -} - -// Set the text of the text box -int SetText (const char* text) -{ - if(!text) - return 1; - - int i = 0; - string source = text; - - // the windows does not need "\n" - // for new lines but "\r\n" - for(i=0; source[i]; i++) - if(source[i]=='\n' && source[i]!='\r') - source.insert (i++, "\r"); - - SetWindowTextA(hEdit, source.c_str()); - - return 0; -} - -// Windows Message Callback (this is where most things happen) -LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - // at the very beginning ... - case WM_CREATE: - { - InitControls(hwnd); - } - break; - - // calculate the size of the controls - case WM_SIZE: - { - RECT rcl; - SendMessage(hTBar, TB_AUTOSIZE, 0L, 0L); - GetWindowRect(hTBar, &rcl); - - int win_top = rcl.bottom - rcl.top; - int win_hight = HIWORD(lParam) - win_top; - - MoveWindow(hTree, 0, win_top, LOWORD(lParam), splitter_pos*win_hight/100, TRUE); - MoveWindow(hEdit, 0, (splitter_pos*win_hight/100)+win_top, LOWORD(lParam), win_hight, TRUE); - } - break; - - // for the treeview - case WM_NOTIFY: - { - if(((LPNMHDR)lParam)->code == TVN_SELCHANGED) - { - selected = ((LPNMTREEVIEW)lParam)->itemNew.lParam; - PML_LoadPackage (tree, selected, SetButton); - SetText(PML_GetDescription (tree, selected)); - } - - else if ((int)(((LPNMHDR)lParam)->code) == NM_RCLICK) // <= ahhh LISP - { - // which item has been click on - HTREEITEM item = TreeView_GetDropHilight(hTree); - - if(item != NULL) - { - // mark the one as seleacted - SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); - TreeView_EnsureVisible (hTree, item); - } - - // create the context menu - if(selected != 0) - { - POINT pt; - GetCursorPos (&pt); - TrackPopupMenu (GetSubMenu(hPopup, 0), 0, (UINT)pt.x, (UINT)pt.y, 0, hwnd, NULL); - } - } - } - break; - - // for the toolbar - case WM_COMMAND: - { - // All Actions - if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) - { - if(selected) - if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) - break; - - MessageBeep(MB_ICONHAND); - } - - // DoIt - else if(LOWORD(wParam)==6) - { - if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) - DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); - else - MessageBeep(MB_ICONHAND); - } - - // Help - else if(LOWORD(wParam)==7) - Help(); - - // Options - else if(LOWORD(wParam)==8) - DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsProc); - - else - MessageBox(0,0,0,0); - } - break; - - // prozess hotkeys - case WM_HOTKEY: - { - if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) - MessageBeep(MB_ICONHAND); - } - break; - - // ... at the very end - case WM_DESTROY: - { - PostQuitMessage(0); - return 0; - } - } - - return DefWindowProc (hwnd, message, wParam, lParam); -} - -// Warning: This function is called from another thread -int SetStatus (int status1, int status2, WCHAR* text) -{ - // Set the Rage to 1000 - SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); - SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); - - // The prozessbars and the text filds - if(text) - SetDlgItemText(hStatus, IDC_TSTATUS, text); - - if(status1!=-1) - SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETPOS, status1, 0); - - if(status2!=-1) - SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETPOS, status2, 0); - - // If the Status is 1000 very thing is done - if(status1==1000) - { - EndDialog(hStatus, TRUE); - MessageBox(0,PML_TransError(status2),0,0); - } - - return 0; -} - -// Callback for the Status Dialog -INT_PTR CALLBACK StatusProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_INITDIALOG: - { - hStatus = hwnd; - - } break; - - case WM_COMMAND: // can only be the about button - case WM_CLOSE: // the close-window-[x] - { - PML_Abort(); - EndDialog(hwnd, TRUE); - return 0; - } - } - - return 0; -} - -// Callback for the Options Dialog -INT_PTR CALLBACK OptionsProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_CLOSE: - EndDialog(hwnd, TRUE); - return 0; - } - - return 0; -} _____ Modified: trunk/rosapps/packmgr/gui/main.h --- trunk/rosapps/packmgr/gui/main.h 2005-04-16 16:04:38 UTC (rev 14636) +++ trunk/rosapps/packmgr/gui/main.h 2005-04-16 17:09:12 UTC (rev 14637) @@ -5,12 +5,10 @@ /////////////////////////////////////////////////// #include <windows.h> -#include <ntos/keyboard.h> #include <commctrl.h> -#include <iostream> -#include <fstream> +#include <stdio.h> -#include <package.hpp> +#include <package.h> #include "resource.h" /* Some Variables */

19 years, 8 months

[hpoussin] 14636: Implement FSCTL_IS_VOLUME_DIRTY and FSCTL_MARK_VOLUME_DIRTY

by hpoussin＠svn.reactos.com

Implement FSCTL_IS_VOLUME_DIRTY and FSCTL_MARK_VOLUME_DIRTY Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-16 16:04:38 UTC (rev 14636) @@ -373,6 +373,7 @@ UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; + ULONG eocMark; FATINFO FatInfo; DPRINT("VfatMount(IrpContext %x)\n", IrpContext); @@ -460,6 +461,7 @@ DeviceExt->GetNextCluster = FAT12GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT12FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT12WriteCluster; + DeviceExt->CleanShutBitMask = 0; break; case FAT16: @@ -467,6 +469,7 @@ DeviceExt->GetNextCluster = FAT16GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT16FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT16WriteCluster; + DeviceExt->CleanShutBitMask = 0x8000; break; case FAT32: @@ -474,6 +477,7 @@ DeviceExt->GetNextCluster = FAT32GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT32FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT32WriteCluster; + DeviceExt->CleanShutBitMask = 0x80000000; break; } @@ -576,6 +580,20 @@ /* read volume label */ ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); + + /* read clean shutdown bit status */ + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + if (eocMark & DeviceExt->CleanShutBitMask) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + WriteCluster(DeviceExt, 1, eocMark); + VolumeFcb->Flags |= VCB_CLEAR_DIRTY; + } + } + VolumeFcb->Flags |= VCB_IS_DIRTY; Status = STATUS_SUCCESS; ByeBye: @@ -787,6 +805,56 @@ } #endif +static NTSTATUS +VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +{ + PULONG Flags; + + DPRINT("VfatIsVolumeDirty(IrpContext %x)\n", IrpContext); + + if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) + return STATUS_INVALID_BUFFER_SIZE; + else if (!IrpContext->Irp->AssociatedIrp.SystemBuffer) + return STATUS_INVALID_USER_BUFFER; + + Flags = (PULONG)IrpContext->Irp->AssociatedIrp.SystemBuffer; + *Flags = 0; + + if (IrpContext->DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY + && !(IrpContext->DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY)) + { + *Flags |= VOLUME_IS_DIRTY; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS +VfatMarkVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +{ + ULONG eocMark; + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("VfatMarkVolumeDirty(IrpContext %x)\n", IrpContext); + DeviceExt = IrpContext->DeviceExt; + + if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) + { + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + Status = WriteCluster(DeviceExt, 1, eocMark); + } + } + + DeviceExt->VolumeFcb->Flags &= ~VCB_CLEAR_DIRTY; + + return Status; +} + NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: File system control @@ -822,6 +890,12 @@ Status = VfatRosQueryLcnMapping(IrpContext); break; #endif + case FSCTL_IS_VOLUME_DIRTY: + Status = VfatIsVolumeDirty(IrpContext); + break; + case FSCTL_MARK_VOLUME_DIRTY: + Status = VfatMarkVolumeDirty(IrpContext); + break; default: Status = STATUS_INVALID_DEVICE_REQUEST; } _____ Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-04-16 16:04:38 UTC (rev 14636) @@ -48,6 +48,7 @@ NTSTATUS Status; PLIST_ENTRY ListEntry; PDEVICE_EXTENSION DeviceExt; + ULONG eocMark; DPRINT("VfatShutdown(DeviceObject %x, Irp %x)\n",DeviceObject, Irp); @@ -64,6 +65,17 @@ ListEntry = ListEntry->Flink; ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + if (DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY) + { + /* set clean shutdown bit */ + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + eocMark |= DeviceExt->CleanShutBitMask; + if (NT_SUCCESS(WriteCluster(DeviceExt, 1, eocMark))) + DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; + } + } Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); if (NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-16 16:04:38 UTC (rev 14636) @@ -13,6 +13,7 @@ NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); #undef DeleteFile /* FIXME */ +#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */ #endif #ifdef USE_ROS_CC_AND_FS @@ -193,6 +194,8 @@ #define VCB_VOLUME_LOCKED 0x0001 #define VCB_DISMOUNT_PENDING 0x0002 #define VCB_IS_FATX 0x0004 +#define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ +#define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */ typedef struct { @@ -257,6 +260,7 @@ PGET_NEXT_CLUSTER GetNextCluster; PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; PWRITE_CLUSTER WriteCluster; + ULONG CleanShutBitMask; /* Pointers to functions for manipulating directory entries. */ PGET_NEXT_DIR_ENTRY GetNextDirEntry;

19 years, 8 months

[ekohl] 14635: ADVAPI32.DLL:

by ekohl＠svn.reactos.com

ADVAPI32.DLL: - Implement LockServiceDatabase and UnlockServiceDatabase. SERVICES.EXE: - Add stubs: ScmrLockServiceDatabase, ScmrUnlockDerviceDatabase, SamrNotifyBootConfigStatus, and ScmrCreateServiceW. - Store and check access rights. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-16 12:50:33 UTC (rev 14635) @@ -8,8 +8,10 @@ #define DWORD unsigned long #define BOOL unsigned long #define SC_HANDLE unsigned int +#define SC_LOCK unsigned int #define LPCSTR char* #define LPCWSTR wchar_t* +#define LPDWORD unsigned long* [ uuid(367abb81-9844-35f1-ad32-98f038001003), @@ -32,41 +34,90 @@ } SERVICE_STATUS, *LPSERVICE_STATUS; cpp_quote("#endif"); - /* Service 0 */ + /* Function 0 */ DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle, [in] SC_HANDLE hSCObject); - /* Service 1 */ + /* Function 1 */ // BOOL ScmrControlService([in] handle_t BindingHandle, // [in] SC_HANDLE hService, // [in] DWORD dwControl, // [out] LPSERVICE_STATUS lpServiceStatus); - /* Service 2 */ + /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, [in] SC_HANDLE hService); - DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, - [in, string, unique] LPCSTR lpMachineName, - [in, string, unique] LPCSTR lpDatabaseName, + /* Function 3 */ + DWORD ScmrLockServiceDatabase([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [out] SC_LOCK *hLock); + + /* Function 4 */ +// DWORD ScmrQueryServiceObjectSecurity(); + + /* Function 5 */ +// DWORD ScmrSetServiceObjectSecurity(); + + /* Function 6 */ +// DWORD ScmrQueryServiceStatus(); + + /* Function 7 */ +// DWORD ScmrSetServiceStatus(); + + /* Function 8 */ + DWORD ScmrUnlockServiceDatabase([in] handle_t BindingHandle, + [in] SC_LOCK hLock); + + /* Function 9 */ + DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle, + [in] BOOL BootAcceptable); + + + /* Function 12 */ + DWORD ScmrCreateServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCWSTR lpServiceName, + [in, string, ref] LPCWSTR lpDisplayName, [in] DWORD dwDesiredAccess, - [out] SC_HANDLE *hScm); + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, ref] LPCWSTR lpBinaryPathName, + [in, string, unique] LPCWSTR lpLoadOrderGroup, + [out, unique] LPDWORD lpdwTagId, + [in, string, unique] LPCWSTR lpDependencies, + [in, string, unique] LPCWSTR lpServiceStartName, + [in, string, unique] LPCWSTR lpPassword); + + /* Function 15 */ DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle, [in, string, unique] LPCWSTR lpMachineName, [in, string, unique] LPCWSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); - SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, + /* Function 16 */ + SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [in, string] LPCSTR lpServiceName, + [in, string] LPCWSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); - SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, + + /* Function 27 */ + DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, + [in, string, unique] LPCSTR lpMachineName, + [in, string, unique] LPCSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + /* Function 28 */ + SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [in, string] LPCWSTR lpServiceName, + [in, string] LPCSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); + } _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-16 12:50:33 UTC (rev 14635) @@ -253,7 +253,7 @@ /********************************************************************** * DeleteService * - * @unimplemented + * @implemented */ BOOL STDCALL DeleteService(SC_HANDLE hService) @@ -516,15 +516,32 @@ /********************************************************************** * LockServiceDatabase * - * @unimplemented + * @implemented */ -SC_LOCK -STDCALL +SC_LOCK STDCALL LockServiceDatabase(SC_HANDLE hSCManager) { - DPRINT1("LockServiceDatabase is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SC_LOCK hLock; + DWORD dwError; + + DPRINT("LockServiceDatabase(%x)\n", hSCManager); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrLockServiceDatabase(BindingHandle, + (unsigned int)hSCManager, + (unsigned int *)&hLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); return NULL; + } + + DPRINT("hLock = %p\n", hLock); + + return hLock; } @@ -533,7 +550,7 @@ { HANDLE hEvent; - DPRINT1("WaitForSCManager() called\n"); + DPRINT("WaitForSCManager() called\n"); /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, @@ -564,7 +581,7 @@ WaitForSingleObject(hEvent, 180000); CloseHandle(hEvent); - DPRINT1("ScmWaitForSCManager() done\n"); + DPRINT("ScmWaitForSCManager() done\n"); } @@ -581,7 +598,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT1("OpenSCManagerA(%s, %s, %lx)\n", + DPRINT("OpenSCManagerA(%s, %s, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -594,13 +611,15 @@ (LPSTR)lpDatabaseName, dwDesiredAccess, (unsigned int*)&hScm); - DPRINT1("hScm = %p\n", hScm); if (dwError) { + DPRINT("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } + DPRINT("hScm = %p\n", hScm); + return hScm; } @@ -608,7 +627,7 @@ /********************************************************************** * OpenSCManagerW * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR lpMachineName, @@ -618,7 +637,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT1("OpenSCManagerW(%S, %S, %lx)\n", + DPRINT("OpenSCManagerW(%S, %S, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -638,7 +657,7 @@ return NULL; } - DPRINT1("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); return hScm; } @@ -651,14 +670,14 @@ */ SC_HANDLE STDCALL OpenServiceA(SC_HANDLE hSCManager, - LPCSTR lpServiceName, - DWORD dwDesiredAccess) + LPCSTR lpServiceName, + DWORD dwDesiredAccess) { SC_HANDLE hService = NULL; DWORD dwError; - DPRINT1("OpenServiceA(%p, %s, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -675,7 +694,7 @@ return NULL; } - DPRINT1("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); return hService; } @@ -694,8 +713,8 @@ SC_HANDLE hService = NULL; DWORD dwError; - DPRINT1("OpenServiceW(%p, %S, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -712,7 +731,7 @@ return NULL; } - DPRINT1("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); return hService; } @@ -891,15 +910,28 @@ /********************************************************************** * UnlockServiceDatabase * - * @unimplemented + * @implemented */ -BOOL -STDCALL -UnlockServiceDatabase(SC_LOCK ScLock) +BOOL STDCALL +UnlockServiceDatabase(SC_LOCK ScLock) { - DPRINT1("UnlockServiceDatabase is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD dwError; + + DPRINT("UnlockServiceDatabase(%x)\n", hSCManager); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrUnlockServiceDatabase(BindingHandle, + (unsigned int)ScLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); return FALSE; + } + + return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-16 12:50:33 UTC (rev 14635) @@ -51,6 +51,58 @@ } SERVICE_HANDLE, *PSERVICE_HANDLE; +#define SC_MANAGER_READ \ + (STANDARD_RIGHTS_READ | \ + SC_MANAGER_QUERY_LOCK_STATUS | \ + SC_MANAGER_ENUMERATE_SERVICE) + +#define SC_MANAGER_WRITE \ + (STANDARD_RIGHTS_WRITE | \ + SC_MANAGER_MODIFY_BOOT_CONFIG | \ + SC_MANAGER_CREATE_SERVICE) + +#define SC_MANAGER_EXECUTE \ + (STANDARD_RIGHTS_EXECUTE | \ + SC_MANAGER_LOCK | \ + SC_MANAGER_ENUMERATE_SERVICE | \ + SC_MANAGER_CONNECT | \ + SC_MANAGER_CREATE_SERVICE) + + +#define SERVICE_READ \ + (STANDARD_RIGHTS_READ | \ + SERVICE_INTERROGATE | \ + SERVICE_ENUMERATE_DEPENDENTS | \ + SERVICE_QUERY_STATUS | \ + SERVICE_QUERY_CONFIG) + +#define SERVICE_WRITE \ + (STANDARD_RIGHTS_WRITE | \ + SERVICE_CHANGE_CONFIG) + +#define SERVICE_EXECUTE \ + (STANDARD_RIGHTS_EXECUTE | \ + SERVICE_USER_DEFINED_CONTROL | \ + SERVICE_PAUSE_CONTINUE | \ + SERVICE_STOP | \ + SERVICE_START) + + +/* VARIABLES ***************************************************************/ + +static GENERIC_MAPPING +ScmManagerMapping = {SC_MANAGER_READ, + SC_MANAGER_WRITE, + SC_MANAGER_EXECUTE, + SC_MANAGER_ALL_ACCESS}; + +static GENERIC_MAPPING +ScmServiceMapping = {SERVICE_READ, + SERVICE_WRITE, + SERVICE_EXECUTE, + SC_MANAGER_ALL_ACCESS}; + + /* FUNCTIONS ***************************************************************/ VOID @@ -92,8 +144,7 @@ static DWORD ScmCreateManagerHandle(LPWSTR lpDatabaseName, - SC_HANDLE *Handle, - DWORD dwDesiredAccess) + SC_HANDLE *Handle) { PMANAGER_HANDLE Ptr; @@ -104,7 +155,6 @@ Ptr->Handle.Tag = MANAGER_TAG; Ptr->Handle.RefCount = 1; - Ptr->Handle.DesiredAccess = dwDesiredAccess; /* FIXME: initialize more data here */ @@ -118,8 +168,7 @@ static DWORD ScmCreateServiceHandle(LPVOID lpDatabaseEntry, - SC_HANDLE *Handle, - DWORD dwDesiredAccess) + SC_HANDLE *Handle) { PMANAGER_HANDLE Ptr; @@ -130,7 +179,6 @@ Ptr->Handle.Tag = SERVICE_TAG; Ptr->Handle.RefCount = 1; - Ptr->Handle.DesiredAccess = dwDesiredAccess; /* FIXME: initialize more data here */ // Ptr->DatabaseEntry = lpDatabaseEntry; @@ -141,7 +189,37 @@ } -/* Service 0 */ +static DWORD +ScmCheckAccess(SC_HANDLE Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE hMgr; + + hMgr = (PMANAGER_HANDLE)Handle; + if (hMgr->Handle.Tag == MANAGER_TAG) + { + RtlMapGenericMask(&dwDesiredAccess, + &ScmManagerMapping); + + hMgr->Handle.DesiredAccess = dwDesiredAccess; + + return ERROR_SUCCESS; + } + else if (hMgr->Handle.Tag == SERVICE_TAG) + { + RtlMapGenericMask(&dwDesiredAccess, + &ScmServiceMapping); + + hMgr->Handle.DesiredAccess = dwDesiredAccess; + + return ERROR_SUCCESS; + } + + return ERROR_INVALID_HANDLE; +} + + +/* Function 0 */ unsigned long ScmrCloseServiceHandle(handle_t BindingHandle, unsigned int hScObject) @@ -193,7 +271,7 @@ } -/* Service 1 */ +/* Function 1 */ #if 0 unsigned long ScmrControlService(handle_t BindingHandle, @@ -201,7 +279,7 @@ unsigned long dwControl, LPSERVICE_STATUS lpServiceStatus) { - DPRINT("ScmrControlService() called\n"); + DPRINT1("ScmrControlService() called\n"); #if 0 lpServiceStatus->dwServiceType = 0x12345678; @@ -218,28 +296,104 @@ #endif -/* Service 2 */ +/* Function 2 */ unsigned long ScmrDeleteService(handle_t BindingHandle, unsigned int hService) { - DPRINT("ScmrDeleteService() called\n"); + PSERVICE_HANDLE hSvc; + + DPRINT1("ScmrDeleteService() called\n"); + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + return ERROR_INVALID_HANDLE; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + STANDARD_RIGHTS_REQUIRED)) + return ERROR_ACCESS_DENIED; + + /* FIXME: Delete the service */ + return ERROR_SUCCESS; } +/* Function 3 */ unsigned long -ScmrOpenSCManagerA(handle_t BindingHandle, - char *lpMachineName, - char *lpDatabaseName, +ScmrLockServiceDatabase(handle_t BindingHandle, + unsigned int hSCManager, + unsigned int *hLock) +{ + PMANAGER_HANDLE hMgr; + + DPRINT("ScmrLockServiceDatabase() called\n"); + + *hLock = 0; + + hMgr = (PMANAGER_HANDLE)hSCManager; + if (hMgr->Handle.Tag != MANAGER_TAG) + return ERROR_INVALID_HANDLE; + + if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess, + SC_MANAGER_LOCK)) + return ERROR_ACCESS_DENIED; + + /* FIXME: Lock the database */ + *hLock = 0x12345678; /* Dummy! */ + + return ERROR_SUCCESS; +} + + + +/* Function 8 */ +unsigned long +ScmrUnlockServiceDatabase(handle_t BindingHandle, + unsigned int hLock) +{ + DPRINT1("ScmrUnlockServiceDatabase() called\n"); + return ERROR_SUCCESS; +} + + +/* Function 9 */ +unsigned long +ScmrNotifyBootConfigStatus(handle_t BindingHandle, + unsigned long BootAcceptable) +{ + DPRINT1("ScmrNotifyBootConfigStatus() called\n"); + return ERROR_SUCCESS; +} + + + +/* Function 12 */ +unsigned long +ScmrCreateServiceW(handle_t BindingHandle, + unsigned int hSCManager, + wchar_t *lpServiceName, + wchar_t *lpDisplayName, unsigned long dwDesiredAccess, - unsigned int *hScm) + unsigned long dwServiceType, + unsigned long dwStartType, + unsigned long dwErrorControl, + wchar_t *lpBinaryPathName, + wchar_t *lpLoadOrderGroup, + unsigned long *lpdwTagId, + wchar_t *lpDependencies, + wchar_t *lpServiceStartName, + wchar_t *lpPassword) { - DPRINT("ScmrOpenSCManagerA() called\n"); + DPRINT1("ScmrCreateServiceW() called\n"); + if (lpdwTagId != NULL) + *lpdwTagId = 0; return ERROR_SUCCESS; } + +/* Function 15 */ unsigned long ScmrOpenSCManagerW(handle_t BindingHandle, wchar_t *lpMachineName, @@ -258,14 +412,23 @@ DPRINT("dwDesiredAccess = %x\n", dwDesiredAccess); dwError = ScmCreateManagerHandle(lpDatabaseName, - &hHandle, - dwDesiredAccess); + &hHandle); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmCreateManagerHandle() failed (Error %lu)\n", dwError); return dwError; } + /* Check the desired access */ + dwError = ScmCheckAccess(hHandle, + dwDesiredAccess | SC_MANAGER_CONNECT); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + GlobalFree(hHandle); + return dwError; + } + *hScm = (unsigned int)hHandle; DPRINT("*hScm = %x\n", *hScm); @@ -275,19 +438,8 @@ } +/* Function 16 */ unsigned int -ScmrOpenServiceA(handle_t BindingHandle, - unsigned int hSCManager, - char *lpServiceName, - unsigned long dwDesiredAccess, - unsigned int *hService) -{ - DPRINT("ScmrOpenServiceA() called\n"); - return 0; -} - - -unsigned int ScmrOpenServiceW(handle_t BindingHandle, unsigned int hSCManager, wchar_t *lpServiceName, @@ -317,14 +469,23 @@ /* Create a service handle */ dwError = ScmCreateServiceHandle(NULL, - &hHandle, - dwDesiredAccess); + &hHandle); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmCreateServiceHandle() failed (Error %lu)\n", dwError); return dwError; } + /* Check the desired access */ + dwError = ScmCheckAccess(hHandle, + dwDesiredAccess); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + GlobalFree(hHandle); + return dwError; + } + *hService = (unsigned int)hHandle; DPRINT("*hService = %x\n", *hService); @@ -335,6 +496,33 @@ +/* Function 27 */ +unsigned long +ScmrOpenSCManagerA(handle_t BindingHandle, + char *lpMachineName, + char *lpDatabaseName, + unsigned long dwDesiredAccess, + unsigned int *hScm) +{ + DPRINT("ScmrOpenSCManagerA() called\n"); + return ERROR_SUCCESS; +} + + +/* Function 28 */ +unsigned int +ScmrOpenServiceA(handle_t BindingHandle, + unsigned int hSCManager, + char *lpServiceName, + unsigned long dwDesiredAccess, + unsigned int *hService) +{ + DPRINT("ScmrOpenServiceA() called\n"); + return 0; +} + + + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return GlobalAlloc(GPTR, len);

19 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005