Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 54812: [SHELL32_WINETEST] Fix build *grmbl*
by pschweitzer＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: pschweitzer Date: Mon Jan 2 23:56:55 2012 New Revision: 54812 URL: http://svn.reactos.org/svn/reactos?rev=54812&view=rev Log: [SHELL32_WINETEST] Fix build *grmbl* Modified: trunk/rostests/winetests/shell32/shlfileop.c Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Mon Jan 2 23:56:55 2012 @@ -116,6 +116,7 @@ return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; } +#if 0 static BOOL file_has_content(const CHAR *name, const CHAR *content) { CHAR buf[MAX_PATH]; @@ -130,6 +131,7 @@ CloseHandle(file); return strcmp(buf, content)==0; } +#endif /* initializes the tests */ static void init_shfo_tests(void) @@ -811,6 +813,7 @@ } /* tests the FO_COPY action */ +#if 0 static void test_copy(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -1757,8 +1760,10 @@ ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } +#endif /* tests the FO_MOVE action */ +#if 0 static void test_move(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -2036,6 +2041,7 @@ ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } } +#endif static void test_sh_create_dir(void) {

1 0

[pschweitzer] 54811: [SHELL32_WINETEST] Comment out two series of tests untill a proper fix is available. Those lead to memory misuse in shell32. This has been revealed by r54804. Should fix both t...
by pschweitzer＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: pschweitzer Date: Mon Jan 2 23:47:32 2012 New Revision: 54811 URL: http://svn.reactos.org/svn/reactos?rev=54811&view=rev Log: [SHELL32_WINETEST] Comment out two series of tests untill a proper fix is available. Those lead to memory misuse in shell32. This has been revealed by r54804. Should fix both test bots. Modified: trunk/rostests/winetests/shell32/shlfileop.c Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Mon Jan 2 23:47:32 2012 @@ -2396,6 +2396,7 @@ test_rename(); clean_after_shfo_tests(); +#if 0 init_shfo_tests(); test_copy(); clean_after_shfo_tests(); @@ -2403,6 +2404,7 @@ init_shfo_tests(); test_move(); clean_after_shfo_tests(); +#endif test_sh_create_dir(); clean_after_shfo_tests();

1 0

[cgutman] 54810: [NDISUIO] - Add the NDISUIO driver to allow communication between user-mode and kernel-mode NIC drivers - Only the IOCTLs required for WLAN are implemented right now - Initial sour...
by cgutman＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: cgutman Date: Mon Jan 2 21:38:57 2012 New Revision: 54810 URL: http://svn.reactos.org/svn/reactos?rev=54810&view=rev Log: [NDISUIO] - Add the NDISUIO driver to allow communication between user-mode and kernel-mode NIC drivers - Only the IOCTLs required for WLAN are implemented right now - Initial source drop without build testing Added: branches/wlan-bringup/drivers/network/ndisuio/ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt (with props) branches/wlan-bringup/drivers/network/ndisuio/createclose.c (with props) branches/wlan-bringup/drivers/network/ndisuio/ioctl.c (with props) branches/wlan-bringup/drivers/network/ndisuio/main.c (with props) branches/wlan-bringup/drivers/network/ndisuio/misc.c (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc (with props) branches/wlan-bringup/drivers/network/ndisuio/protocol.c (with props) branches/wlan-bringup/drivers/network/ndisuio/readwrite.c (with props) Added: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt (added) +++ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,22 @@ +add_definitions( + -DNDIS50 + -D_NTDRIVER_) + +spec2def(ndisuio.sys ndisuio.spec) + +list(APPEND SOURCE + main.c + ndisuio.rc + ${CMAKE_CURRENT_BINARY_DIR}/ndisuio.def) + +add_library(ndisuio SHARED ${SOURCE}) + +target_link_libraries(ndisuio + ${PSEH_LIB}) + +set_module_type(ndisuio kernelmodedriver) +add_importlibs(ndisuio ndis ntoskrnl hal) + +add_pch(ndisuio ndisuio.h) + +add_cd_file(TARGET ndisuio DESTINATION reactos/system32/drivers FOR all) Propchange: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/createclose.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/createclose.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,64 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: createclose.c + * PURPOSE: IRP_MJ_CREATE and IRP_MJ_CLOSE handling + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +NduDispatchCreate(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* This is associated with an adapter during IOCTL_NDISUIO_OPEN_(WRITE_)DEVICE */ + IrpSp->FileObject->FsContext = NULL; + IrpSp->FileObject->FsContext2 = NULL; + + /* Completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NduDispatchClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; + KIRQL OldIrql; + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* Check if this handle was ever associated with an adapter */ + if (AdapterContext != NULL) + { + ASSERT(OpenEntry != NULL); + + /* Call the our helper */ + DereferenceAdapterContextWithOpenEntry(AdapterContext, OpenEntry); + } + + /* Completed */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Return success */ + return STATUS_SUCCESS; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/createclose.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,247 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: ioctl.c + * PURPOSE: IOCTL handling + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS +SetAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_SET_OID SetOidRequest; + NDIS_REQUEST NdisRequest; + ULONG RequestLength; + NDIS_STATUS Status; + + Irp->IoStatus.Information = 0; + + SetOidRequest = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) + { + /* Setup the NDIS request */ + NdisRequest.RequestType = NdisRequestSetInformation; + NdisRequest.Oid = SetOidRequest->Oid; + NdisRequest.InformationBuffer = SetOidRequest->Data; + NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + /* Dispatch the request */ + NdisRequest(&Status, + AdapterContext->BindingHandle, + &NdisRequest); + + /* Wait for the request */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Return the bytes read */ + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesRead; + } + else + { + /* Bad parameters */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +QueryAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_QUERY_OID QueryOidRequest; + NDIS_REQUEST NdisRequest; + ULONG RequestLength; + NDIS_STATUS Status; + + Irp->IoStatus.Information = 0; + + QueryOidRequest = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) + { + /* Setup the NDIS request */ + NdisRequest.RequestType = NdisRequestQueryInformation; + NdisRequest.Oid = QueryOidRequest->Oid; + NdisRequest.InformationBuffer = QueryOidRequest->Data; + NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + /* Dispatch the request */ + NdisRequest(&Status, + AdapterContext->BindingHandle, + &NdisRequest); + + /* Wait for the request */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Return the bytes written */ + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesWritten; + } + else + { + /* Bad parameters */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +OpenDeviceReadWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + UNICODE_STRING DeviceName; + ULONG NameLength; + NTSTATUS Status; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + PNDISUIO_OPEN_ENTRY OpenEntry; + + NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (NameLength != 0) + { + DeviceName.MaximumLength = DeviceName.Length = NameLength; + DeviceName.Buffer = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + /* Check if this already has a context */ + AdapterContext = FindAdapterContextByName(&DeviceName); + if (AdapterContext == NULL) + { + /* Create a new context */ + Status = BindAdapterByName(&DeviceName, &AdapterContext); + } + else + { + /* Reference the existing context */ + ReferenceAdapterContext(AdapterContext, FALSE); + Status = STATUS_SUCCESS; + } + + /* Check that the bind succeeded */ + if (NT_SUCCESS(Status)) + { + OpenEntry = ExAllocatePool(NonPagedPool, sizeof(*OpenEntry)); + if (OpenEntry) + { + /* Set the file object pointer */ + OpenEntry->FileObject = FileObject; + + /* Associate this FO with the adapter */ + FileObject->FsContext = AdapterContext; + FileObject->FsContext2 = OpenEntry; + + /* Add it to the adapter's list */ + ExInterlockedInsertTailList(&AdapterContext->OpenEntryList, + &OpenEntry->ListEntry, + &AdapterContext->Spinlock); + + /* Success */ + Status = STATUS_SUCCESS; + } + else + { + /* Remove the reference we added */ + DereferenceAdapterContext(AdapterContext, NULL); + + Status = STATUS_NO_MEMORY; + } + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + /* FIXME: Handle this correctly */ + return OpenDeviceReadWrite(Irp, IrpSp); +} + +NTSTATUS +NTAPI +NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* Handle open IOCTLs first */ + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_NDISUIO_OPEN_DEVICE: + return OpenDeviceReadWrite(Irp, IrpSp); + + case IOCTL_NDISUIO_OPEN_WRITE_DEVICE: + return OpenDeviceWrite(Irp, IrpSp); + + default: + /* Fail if this file object has no adapter associated */ + if (IrpSp->FileObject->FsContext == NULL) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_PARAMETER; + } + + /* Now handle other IOCTLs */ + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_NDISUIO_QUERY_OID_VALUE: + return QueryAdapterOid(Irp, IrpSp); + + case IOCTL_NDISUIO_SET_OID_VALUE: + return SetAdapterOid(Irp, IrpSp); + + default: + DPRINT1("Unimplemented\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + break; + } +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/main.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,88 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: main.c + * PURPOSE: Driver entry point and protocol initialization + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PDEVICE_OBJECT GlobalDeviceObject; +NDIS_HANDLE GlobalProtocolHandle; + +VOID NTAPI NduUnload(PDRIVER_OBJECT DriverObject) +{ + IoDeleteDevice(GlobalDeviceObject); + + DPRINT("NDISUIO: Unloaded\n"); +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + NDIS_PROTOCOL_CHARACTERISTICS Chars; + + /* Setup dispatch functions */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = NduDispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NduDispatchClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NduDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_READ] = NduDispatchRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = NduDispatchWrite; + DriverObject->DriverUnload = NduUnload; + + /* Create the NDISUIO device object */ + Status = IoCreateDevice(DriverObject, + 0, + NULL, // FIXME + NDISUIO_DEVICE_NAME, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &GlobalDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create device object with status 0x%x\n", Status); + return Status; + } + + /* Register the protocol with NDIS */ + RtlZeroMemory(&Chars, sizeof(Chars)); + Chars.MajorNdisVersion = NDIS_MAJOR_VERSION; + Chars.MinorNdisVersion = NDIS_MINOR_VERSION; + Chars.OpenAdapterCompleteHandler = NduOpenAdapterComplete; + Chars.CloseAdapterCompleteHandler = NduCloseAdapterComplete; + Chars.SendCompleteHandler = NduSendComplete; + Chars.TransferDataCompleteHandler = NduTransferDataComplete; + Chars.ResetCompleteHandler = NduResetComplete; + Chars.RequestCompleteHandler = NduRequestComplete; + Chars.ReceiveHandler = NduReceive; + Chars.ReceiveComplete = NduReceiveComplete; + Chars.StatusHandler = NduStatus; + Chars.StatusCompleteHandler = NduStatusComplete; + Chars.Name = NULL; //FIXME + Chars.ReceivePacketHandler = NULL; //NduReceivePacket + Chars.BindAdapterHandler = NduBindAdapter; + Chars.UnbindAdapterHandler = NduUnbindAdapter; + Chars.PnPEventHandler = NduPnPEvent; + + NdisRegisterProtocol(&Status, + &GlobalProtocolHandle, + &Chars, + sizeof(Chars)); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to register protocol with status 0x%x\n", Status); + IoDeleteDevice(GlobalDeviceObject); + return Status; + } + + DPRINT("NDISUIO: Loaded\n"); + + return STATUS_SUCCESS; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,113 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: misc.c + * PURPOSE: Helper functions + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PNDISUIO_ADAPTER_CONTEXT +FindAdapterContextByName(PNDIS_STRING DeviceName) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + CurrentEntry = GlobalAdapterList.Flink; + while (CurrentEntry != &GlobalAdapterList) + { + AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); + + /* Check if the device name matches */ + if (RtlEqualUnicodeString(&AdapterContext->DeviceName, DeviceName, TRUE)) + { + KeAcquireSpinLockAtDpcLevel(&AdapterContext->Spinlock); + + /* Check that it's not being destroyed */ + if (AdapterContext->OpenCount > 0) + { + KeReleaseSpinLockFromDpcLevel(&AdapterContext->Spinlock); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + return AdapterContext; + } + else + { + KeReleaseSpinLockFromDpcLevel(&Adaptercontext->Spinlock); + } + } + + CurrentEntry = CurrentEntry->Flink; + } + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + return NULL; +} + +VOID +ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext, BOOLEAN Locked) +{ + KIRQL OldIrql; + + /* Lock if needed */ + if (!Locked) + { + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + } + + /* Increment the open count */ + AdapterContext->OpenCount++; + + /* Unlock if needed */ + if (!Locked) + { + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + } +} + +VOID +DereferenceAdapterContextWithOpenEntry(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PNDISUIO_OPEN_ENTRY OpenEntry) +{ + KIRQL OldIrql; + + /* Lock the adapter context */ + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + + /* Decrement the open count */ + AdapterContext->OpenCount--; + + /* Cleanup the open entry if we were given one */ + if (OpenEntry != NULL) + { + /* Remove the open entry */ + RemoveEntryList(&OpenEntry->ListEntry); + + /* Invalidate the FO */ + OpenEntry->FileObject->FsContext = NULL; + OpenEntry->FileObject->FsContext2 = NULL; + + /* Free the open entry */ + ExFreePool(OpenEntry); + } + + /* See if this binding can be destroyed */ + if (AdapterContext->OpenCount == 0) + { + /* Unlock the context */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + + /* Destroy the adapter context */ + UnbindAdapterByContext(AdapterContext); + } + else + { + /* Still more references on it */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + } +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,55 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: ndisuio.h + * PURPOSE: NDISUIO definitions + */ +#ifndef __NDISUIO_H +#define __NDISUIO_H + +#include <wdm.h> +#include <ndis.h> +//#include <nuiouser.h> +#include <ndistapi.h> +#include <ndisguid.h> + +struct _NDISUIO_ADAPTER_CONTEXT +{ + /* Asynchronous completion */ + NDIS_STATUS AsyncStatus; + KEVENT AsyncEvent; + + /* NDIS binding information */ + NDIS_HANDLE BindingHandle; + + /* Reference count information */ + ULONG OpenCount; + LIST_ENTRY OpenEntryList; + + /* Receive packet list */ + LIST_ENTRY PacketList; + + /* Cancel read */ + BOOLEAN CancelRead; + + /* Global list entry */ + LIST_ENTRY ListEntry; + + /* Spin lock */ + KSPIN_LOCK Spinlock; +} NDISUIO_ADAPTER_CONTEXT, *PNDISUIO_ADAPTER_CONTEXT; + +struct _NDISUIO_OPEN_ENTRY +{ + /* File object */ + PFILE_OBJECT FileObject; + + /* List entry */ + LIST_ENTRY ListEntry; +} NDISUIO_OPEN_ENTRY, *PNDISUIO_OPEN_ENTRY; + +/* NDIS version info */ +#define NDIS_MAJOR_VERISON 5 +#define NDIS_MINOR_VERSION 0 + +#endif /* __NDISUIO_H */ Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ndisuio" type="kernelmodedriver" installbase="system32/drivers" installname="ndisuio.sys"> + <include base="ndisuio">.</include> + <define name="NDIS50" /> + <define name="_NTDRIVER_" /> + <library>ndis</library> + <library>pseh</library> + <library>ntoskrnl</library> + <library>hal</library> + <pch>ndisuio.h</pch> + <file>main.c</file> + <file>ndisuio.rc</file> +</module> Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "NDIS User-Mode I/O Protocol Driver\0" +#define REACTOS_STR_INTERNAL_NAME "ndisuio\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ndisuio.sys\0" +#include <reactos/version.rc> Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,278 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: protocol.c + * PURPOSE: Protocol stuff + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PNDIS_MEDIUM SupportedMedia = {NdisMedium802_3}; + +VOID +NTAPI +NduOpenAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status, + NDIS_STATUS OpenStatus) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter open completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduCloseAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter close completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduSendComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status) +{ + /* FIXME: Implement send/receive */ +} + +VOID +NTAPI +NduTransferDataComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status, + UINT BytesTransferred) +{ + /* FIXME: Implement send/receive */ +} + +VOID +NTAPI +NduResetComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter reset completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduRequestComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_REQUEST NdisRequest, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter request completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +NDIS_STATUS +NTAPI +NduReceive(NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE MacReceiveContext, + PVOID HeaderBuffer, + UINT HeaderBufferSize, + PVOID LookAheadBuffer, + UINT LookaheadBufferSize, + UINT PacketSize) +{ + /* FIXME: Implement send/receive */ + return NDIS_STATUS_NOT_ACCEPTED; +} + +VOID +NTAPI +NduReceiveComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* No op */ +} + +VOID +NTAPI +NduStatus(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS GeneralStatus, + PVOID StatusBuffer, + UINT StatusBufferSize) +{ + /* FIXME: Implement status tracking */ +} + +VOID +NTAPI +NduStatusComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* FIXME: Implement status tracking */ +} + +NDIS_STATUS +UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentOpenEntry; + PNDISUIO_OPEN_ENTRY OpenEntry; + + /* Invalidate all handles to this adapter */ + CurrentOpenEntry = AdapterContext->OpenEntryList.Flink; + while (CurrentOpenEntry != &AdapterContext->OpenEntryList) + { + OpenEntry = CONTAINING_RECORD(CurrentOpenEntry, NDISUIO_OPEN_ENTRY, ListEntry); + + /* Make sure the entry is sane */ + ASSERT(OpenEntry->FileObject); + + /* Remove the adapter context pointer */ + ASSERT(AdapterContext == OpenEntry->FileObject->FsContext); + OpenEntry->FileObject->FsContext = NULL; + AdapterContext->OpenCount--; + + /* Remove the open entry pointer */ + ASSERT(OpenEntry == OpenEntry->FileObject->FsContext2); + OpenEntry->FileObject->FsContext2 = NULL; + + /* Move to the next entry */ + CurrentOpenEntry = CurrentOpenEntry->Flink; + + /* Free the open entry */ + ExFreePool(OpenEntry); + } + + /* If this fails, we have a refcount mismatch somewhere */ + ASSERT(AdapterContext->OpenCount == 0); + + /* Remove the adapter context from the global list */ + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + RemoveEntryList(&AdapterContext->ListEntry); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + /* Send the close request */ + NdisCloseAdapter(Status, + AdapterContext->BindingHandle); + + /* Wait for a pending close */ + if (*Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + *Status = AdapterContext->AsyncStatus; + } + + /* Free the context */ + ExFreePool(AdapterContext); +} + + +NDIS_STATUS +BindAdapterByName(PNDIS_STRING DeviceName, PNDISUIO_ADAPTER_CONTEXT *Context) +{ + NDIS_STATUS OpenErrorStatus; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + UINT SelectedMedium; + NDIS_STATUS Status; + + /* Allocate the adapter context */ + AdapterContext = ExAllocatePool(NonPagedPool, sizeof(*AdapterContext)); + if (!AdapterContext) + { + return NDIS_STATUS_RESOURCES; + } + + /* Set up the adapter context */ + RtlZeroMemory(AdapterContext, sizeof(*AdapterContext)); + KeInitializeEvent(&AdapterContext->AsyncEvent, SynchronizationEvent, FALSE); + KeInitializeSpinLock(&AdapterContext->Spinlock); + InitializeListHead(&AdapterContext->PacketList); + InitializeListHead(&AdapterContext->OpenEntryList); + AdapterContext->OpenCount = 1; + + /* Send the open request */ + NdisOpenAdapter(&Status, + &OpenErrorStatus, + &AdapterContext->BindingHandle, + &SelectedMedium, + SupportedMedia, + sizeof(SupportedMedia), + GlobalProtocolHandle, + AdapterContext, + DeviceName, + 0, + NULL); + + /* Wait for a pending open */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Check the final status */ + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to open adapter for bind with status 0x%x\n", *Status); + ExFreePool(AdapterContext); + return; + } + + /* Add the adapter context to the global list */ + ExInterlockedInsertTailList(&GlobalAdapterList, + &AdapterContext->ListEntry, + &GlobalAdapterListLock); + + /* Return the context */ + *Context = AdapterContext; + return STATUS_SUCCESS; +} + +VOID +NTAPI +NduBindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE BindContext, + PNDIS_STRING DeviceName, + PVOID SystemSpecific1, + PVOID SystemSpecific2) +{ + /* We don't bind like this */ + *Status = NDIS_STATUS_SUCCESS; +} + +VOID +NTAPI +NduUnbindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE UnbindContext) +{ + /* This is forced unbind. UnbindAdapterByContext() will take care of + * invalidating file handles pointer to this adapter for us */ + *Status = UnbindAdapterByContext(ProtocolBindingContext); +} + Propchange: branches/wlan-bringup/drivers/network/ndisuio/protocol.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: readwrite.c + * PURPOSE: Handles IRP_MJ_READ and IRP_MJ_WRITE + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +VOID +NTAPI +NduDispatchRead(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + ASSERT(DeviceObject == GlobalDeviceObject); + + /* FIXME: Not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +NduDispatchWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + ASSERT(DeviceObject == GlobalDeviceObject); + + /* FIXME: Not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 54809: [WLAN-BRINGUP] - Create a branch to drop my ndisuio work
by cgutman＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: cgutman Date: Mon Jan 2 20:53:24 2012 New Revision: 54809 URL: http://svn.reactos.org/svn/reactos?rev=54809&view=rev Log: [WLAN-BRINGUP] - Create a branch to drop my ndisuio work Added: branches/wlan-bringup/ (props changed) - copied from r54807, trunk/reactos/ Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 2 20:53:24 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 2 20:53:24 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 2 20:53:24 2012 @@ -1,0 +1,12 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 54808: [USB-BRINGUP] - Create PDO for each top level collection found - Use the specified collection index instead of the first - add collection id to hardware id when the device has m...
by janderwald＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: janderwald Date: Mon Jan 2 12:00:51 2012 New Revision: 54808 URL: http://svn.reactos.org/svn/reactos?rev=54808&view=rev Log: [USB-BRINGUP] - Create PDO for each top level collection found - Use the specified collection index instead of the first - add collection id to hardware id when the device has more than one top level collection, see http://msdn.microsoft.com/en-us/windows/hardware/gg487473 for details Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -180,8 +180,6 @@ // IoStack->DeviceObject = DeviceObject; - - // // call driver // @@ -409,7 +407,7 @@ // // allocate result // - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations.Count-1) * sizeof(PDEVICE_OBJECT)); + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT)); if (!DeviceRelations) { // @@ -422,24 +420,23 @@ // // copy device objects // - for(Index = 0; Index < FDODeviceExtension->DeviceRelations.Count; Index++) + for(Index = 0; Index < FDODeviceExtension->DeviceRelations->Count; Index++) { // // reference pdo // - ObReferenceObject(FDODeviceExtension->DeviceRelations.Objects[Index]); + ObReferenceObject(FDODeviceExtension->DeviceRelations->Objects[Index]); // // store object // - DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations.Objects[Index]; + DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations->Objects[Index]; } // // set object count // - DeviceRelations->Count = FDODeviceExtension->DeviceRelations.Count; - + DeviceRelations->Count = FDODeviceExtension->DeviceRelations->Count; // // store result @@ -481,12 +478,12 @@ return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); } - if (FDODeviceExtension->DeviceRelations.Count == 0) + if (FDODeviceExtension->DeviceRelations == NULL) { // // time to create the pdos // - Status = HidClassPDO_CreatePDO(DeviceObject); + Status = HidClassPDO_CreatePDO(DeviceObject, &FDODeviceExtension->DeviceRelations); if (!NT_SUCCESS(Status)) { // @@ -500,7 +497,7 @@ // // sanity check // - ASSERT(FDODeviceExtension->DeviceRelations.Count > 0); + ASSERT(FDODeviceExtension->DeviceRelations->Count > 0); } // Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -304,8 +304,8 @@ KIRQL OldLevel; PUCHAR Address; ULONG Offset; - PHIDP_DEVICE_DESC DeviceDescription; - ULONG CollectionIndex; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDP_REPORT_IDS ReportDescription; // // get irp context @@ -328,20 +328,34 @@ // // get address // - Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + Address = (PUCHAR)HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); if (Address) { // // reports may have a report id prepended // - CollectionIndex = IrpContext->FileOp->DeviceExtension->CollectionIndex; - DeviceDescription = &IrpContext->FileOp->DeviceExtension->Common.DeviceDescription; - - // - // calculate offset - // - ASSERT(DeviceDescription->CollectionDesc[CollectionIndex].InputLength >= DeviceDescription->ReportIDs[CollectionIndex].InputLength); - Offset = DeviceDescription->CollectionDesc[CollectionIndex].InputLength - DeviceDescription->ReportIDs[CollectionIndex].InputLength; + Offset = 0; + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // + // get report description + // + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(ReportDescription); + + if (CollectionDescription && ReportDescription) + { + // + // calculate offset + // + ASSERT(CollectionDescription->InputLength >= ReportDescription->InputLength); + Offset = CollectionDescription->InputLength - ReportDescription->InputLength; + } // // copy result @@ -451,6 +465,8 @@ PIO_STACK_LOCATION IoStack; PHIDCLASS_IRP_CONTEXT IrpContext; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDP_REPORT_IDS ReportDescription; // // get an irp from fresh list @@ -498,20 +514,33 @@ ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // - // sanity checks - // - ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.CollectionDescLength); - ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.ReportIDsLength); - ASSERT(PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength > 0); - ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].InputLength == BufferLength); - - // // init irp context // RtlZeroMemory(IrpContext, sizeof(HIDCLASS_IRP_CONTEXT)); - IrpContext->InputReportBufferLength = PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength; IrpContext->OriginalIrp = RequestIrp; IrpContext->FileOp = Context; + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // + // get report description + // + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(ReportDescription); + + // + // sanity check + // + ASSERT(CollectionDescription->InputLength >= ReportDescription->InputLength); + + // + // store report length + // + IrpContext->InputReportBufferLength = ReportDescription->InputLength; // // allocate buffer @@ -677,11 +706,19 @@ PIO_STACK_LOCATION IoStack; PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; PHID_COLLECTION_INFORMATION CollectionInformation; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; // // get device extension // CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(CommonDeviceExtension->IsFDO == FALSE); + + // + // get pdo device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // // get stack location @@ -712,9 +749,15 @@ ASSERT(CollectionInformation); // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // // init result buffer // - CollectionInformation->DescriptorSize = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? + CollectionInformation->DescriptorSize = CollectionDescription->PreparsedDataLength; CollectionInformation->Polled = CommonDeviceExtension->DriverExtension->DevicesArePolled; CollectionInformation->VendorID = CommonDeviceExtension->Attributes.VendorID; CollectionInformation->ProductID = CommonDeviceExtension->Attributes.ProductID; @@ -731,13 +774,15 @@ case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: { // - // FIXME: which collection to use for composite / multi collection devices... - // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); // // check if output buffer is big enough // - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < CollectionDescription->PreparsedDataLength) { // // invalid buffer size @@ -751,12 +796,12 @@ // copy result // ASSERT(Irp->UserBuffer); - RtlCopyMemory(Irp->UserBuffer, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); + RtlCopyMemory(Irp->UserBuffer, CollectionDescription->PreparsedData, CollectionDescription->PreparsedDataLength); // // complete request // - Irp->IoStatus.Information = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; + Irp->IoStatus.Information = CollectionDescription->PreparsedDataLength; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -9,6 +9,58 @@ */ #include "precomp.h" +PHIDP_COLLECTION_DESC +HidClassPDO_GetCollectionDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber) +{ + ULONG Index; + + for(Index = 0; Index < DeviceDescription->CollectionDescLength; Index++) + { + if (DeviceDescription->CollectionDesc[Index].CollectionNumber == CollectionNumber) + { + // + // found collection + // + return &DeviceDescription->CollectionDesc[Index]; + } + } + + // + // failed to find collection + // + DPRINT1("[HIDCLASS] GetCollectionDescription CollectionNumber %x not found\n", CollectionNumber); + ASSERT(FALSE); + return NULL; +} + +PHIDP_REPORT_IDS +HidClassPDO_GetReportDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber) +{ + ULONG Index; + + for(Index = 0; Index < DeviceDescription->ReportIDsLength; Index++) + { + if (DeviceDescription->ReportIDs[Index].CollectionNumber == CollectionNumber) + { + // + // found collection + // + return &DeviceDescription->ReportIDs[Index]; + } + } + + // + // failed to find collection + // + DPRINT1("[HIDCLASS] GetReportDescription CollectionNumber %x not found\n", CollectionNumber); + ASSERT(FALSE); + return NULL; +} + NTSTATUS HidClassPDO_HandleQueryDeviceId( IN PDEVICE_OBJECT DeviceObject, @@ -93,6 +145,7 @@ WCHAR Buffer[100]; ULONG Offset = 0; LPWSTR Ptr; + PHIDP_COLLECTION_DESC CollectionDescription; // // get device extension @@ -117,15 +170,32 @@ return Status; } - // - // store hardware ids - // - Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; - - if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) - { - switch(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) + if (PDODeviceExtension->Common.DeviceDescription.CollectionDescLength > 1) + { + // + // multi-tlc device + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x&Col%02x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber, PDODeviceExtension->CollectionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Col%02x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->CollectionNumber) + 1; + } + else + { + // + // single tlc device + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + } + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&PDODeviceExtension->Common.DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + if (CollectionDescription->UsagePage == HID_USAGE_PAGE_GENERIC) + { + switch(CollectionDescription->Usage) { case HID_USAGE_GENERIC_POINTER: case HID_USAGE_GENERIC_MOUSE: @@ -156,7 +226,7 @@ break; } } - else if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) + else if (CollectionDescription->UsagePage == HID_USAGE_PAGE_CONSUMER && CollectionDescription->Usage == HID_USAGE_CONSUMERCTRL) { // // Consumer Audio Control @@ -501,12 +571,16 @@ NTSTATUS HidClassPDO_CreatePDO( - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutDeviceRelations) { PHIDCLASS_FDO_EXTENSION FDODeviceExtension; NTSTATUS Status; PDEVICE_OBJECT PDODeviceObject; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + ULONG Index; + PDEVICE_RELATIONS DeviceRelations; + ULONG Length; // // get device extension @@ -515,64 +589,121 @@ ASSERT(FDODeviceExtension->Common.IsFDO); // - // lets create the device object - // - Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + // first allocate device relations + // + Length = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, Length); + if (!DeviceRelations) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero device relations + // + RtlZeroMemory(DeviceRelations, Length); + + // + // lets create a PDO for top level collection + // + Index = 0; + do + { + // + // lets create the device object + // + Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create device + // + DPRINT1("[HIDCLASS] Failed to create PDO %x\n", Status); + break; + } + + // + // patch stack size + // + PDODeviceObject->StackSize = DeviceObject->StackSize + 1; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // init device extension + // + PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; + PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; + PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->FDODeviceObject = DeviceObject; + PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; + PDODeviceExtension->CollectionNumber = FDODeviceExtension->Common.DeviceDescription.CollectionDesc[Index].CollectionNumber; + + // + // copy device data + // + RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); + RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); + RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + // + // set device flags + // + PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; + + // + // device is initialized + // + PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + // + // store device object in device relations + // + DeviceRelations->Objects[Index] = PDODeviceObject; + DeviceRelations->Count++; + + // + // move to next + // + Index++; + + }while(Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength); + + + // + // check if creating succeeded + // if (!NT_SUCCESS(Status)) { // - // failed to create device - // - DPRINT1("[HIDCLASS] Failed to create device %x\n", Status); + // failed + // + for(Index = 0; Index < DeviceRelations->Count; Index++) + { + // + // delete device + // + IoDeleteDevice(DeviceRelations->Objects[Index]); + } + + // + // free device relations + // + ExFreePool(DeviceRelations); return Status; } // - // patch stack size - // - PDODeviceObject->StackSize = DeviceObject->StackSize + 1; - - // - // get device extension - // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; - - // - // init device extension - // - PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; - PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; - PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; - PDODeviceExtension->Common.IsFDO = FALSE; - PDODeviceExtension->FDODeviceObject = DeviceObject; - PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; - RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); - RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); - RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - - // - // FIXME: support composite devices - // - PDODeviceExtension->CollectionIndex = 0; - ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDescLength == 1); - - // - // store in device relations struct - // - FDODeviceExtension->DeviceRelations.Count = 1; - FDODeviceExtension->DeviceRelations.Objects[0] = PDODeviceObject; - - // - // set device flags - // - PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; - - // - // device is initialized - // - PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - ObReferenceObject(PDODeviceObject); + // store device relations + // + *OutDeviceRelations = DeviceRelations; // // done Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -76,7 +76,7 @@ // // device relations // - DEVICE_RELATIONS DeviceRelations; + PDEVICE_RELATIONS DeviceRelations; }HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; @@ -95,7 +95,7 @@ // // collection index // - ULONG CollectionIndex; + ULONG CollectionNumber; // // device interface @@ -176,12 +176,22 @@ /* pdo.c */ NTSTATUS HidClassPDO_CreatePDO( - IN PDEVICE_OBJECT DeviceObject); + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutDeviceRelations); NTSTATUS HidClassPDO_PnP( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +PHIDP_COLLECTION_DESC +HidClassPDO_GetCollectionDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber); + +PHIDP_REPORT_IDS +HidClassPDO_GetReportDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber); /* eof */

1 0

[pschweitzer] 54807: [KERNEL32] Esthetical fixes.
by pschweitzer＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: pschweitzer Date: Mon Jan 2 10:02:50 2012 New Revision: 54807 URL: http://svn.reactos.org/svn/reactos?rev=54807&view=rev Log: [KERNEL32] Esthetical fixes. Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Mon Jan 2 10:02:50 2012 @@ -150,7 +150,7 @@ if (Length == 0) { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, NtPathU.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); SetLastError(ERROR_FILENAME_EXCED_RANGE); return FALSE; } @@ -201,7 +201,7 @@ 0); RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); if (NT_SUCCESS(Status)) { @@ -229,15 +229,16 @@ { DWORD Length; NTSTATUS Status; - ULONG EaLength = 0; PVOID EaBuffer = NULL; BOOL ReparsePoint = FALSE; IO_STATUS_BLOCK IoStatusBlock; FILE_EA_INFORMATION FileEaInfo; + ULONG EaLength = 0, StreamSize; OBJECT_ATTRIBUTES ObjectAttributes; FILE_BASIC_INFORMATION FileBasicInfo; PREPARSE_DATA_BUFFER ReparseDataBuffer; HANDLE TemplateHandle, DirectoryHandle; + PFILE_STREAM_INFORMATION FileStreamInfo; FILE_ATTRIBUTE_TAG_INFORMATION FileTagInfo; UNICODE_STRING NtPathU, NtTemplatePathU, NewDirectory; RTL_RELATIVE_NAME_U RelativeName, TemplateRelativeName; @@ -283,7 +284,7 @@ if (Status != STATUS_INVALID_PARAMETER) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); BaseSetLastNTError(Status); return FALSE; } @@ -300,7 +301,7 @@ if (!NT_SUCCESS(Status)) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); BaseSetLastNTError(Status); return FALSE; } @@ -315,7 +316,7 @@ if (!NT_SUCCESS(Status)) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); CloseHandle(TemplateHandle); BaseSetLastNTError(Status); return FALSE; @@ -334,7 +335,7 @@ if (!NT_SUCCESS(Status)) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); CloseHandle(TemplateHandle); BaseSetLastNTError(Status); return FALSE; @@ -352,7 +353,7 @@ if (!NT_SUCCESS(Status)) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); CloseHandle(TemplateHandle); BaseSetLastNTError(Status); return FALSE; @@ -374,7 +375,7 @@ if (!RtlDosPathNameToRelativeNtPathName_U(lpNewDirectory, &NtPathU, NULL, &RelativeName)) { RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); NtClose(TemplateHandle); SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; @@ -390,15 +391,15 @@ { RtlReleaseRelativeName(&RelativeName); RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); NtClose(TemplateHandle); SetLastError(ERROR_INVALID_NAME); return FALSE; } RtlReleaseRelativeName(&TemplateRelativeName); - RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, TemplateBuffer); /* Check if path length is < MAX_PATH (with space for file name). * If not, prefix is required. @@ -411,7 +412,7 @@ if (Length == 0) { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); CloseHandle(TemplateHandle); SetLastError(ERROR_FILENAME_EXCED_RANGE); return FALSE; @@ -423,7 +424,7 @@ if (Length > MAX_PATH) { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); CloseHandle(TemplateHandle); SetLastError(ERROR_FILENAME_EXCED_RANGE); return FALSE; @@ -451,7 +452,7 @@ if (!NT_SUCCESS(Status)) { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); CloseHandle(TemplateHandle); BaseSetLastNTError(Status); return FALSE; @@ -467,7 +468,7 @@ if (!EaBuffer) { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); CloseHandle(TemplateHandle); BaseSetLastNTError(STATUS_NO_MEMORY); return FALSE; @@ -485,7 +486,7 @@ TRUE); if (!NT_SUCCESS(Status)) { - RtlFreeHeap(GetProcessHeap(), 0, EaBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, EaBuffer); IoStatusBlock.Information = 0; } @@ -548,10 +549,10 @@ else { RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); if (EaBuffer) { - RtlFreeHeap(GetProcessHeap(), 0, EaBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, EaBuffer); } CloseHandle(TemplateHandle); BaseSetLastNTError(Status); @@ -561,7 +562,7 @@ } RtlReleaseRelativeName(&RelativeName); - RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); if (EaBuffer) { RtlFreeHeap(RtlGetProcessHeap(), 0, EaBuffer); @@ -683,12 +684,10 @@ /* In case it's not a reparse point, handle streams on the file */ else { - PVOID StreamInfo; - ULONG StreamSize = 0x1000; - for (;;) - { - StreamInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, StreamSize); - if (!StreamInfo) + for (StreamSize = 0x1000; ; StreamSize = StreamSize * 2) + { + FileStreamInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, StreamSize); + if (!FileStreamInfo) { BaseMarkFileForDelete(DirectoryHandle, FileBasicInfo.FileAttributes); SetLastError(STATUS_NO_MEMORY); @@ -698,15 +697,16 @@ /* Query stream information */ Status = NtQueryInformationFile(TemplateHandle, &IoStatusBlock, - StreamInfo, + FileStreamInfo, StreamSize, FileStreamInformation); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); - StreamInfo = NULL; - StreamSize << 1; - } + if (NT_SUCCESS(Status)) + { + break; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, FileStreamInfo); + FileStreamInfo = NULL; /* If it failed, ensure that's not because of too small buffer */ if (Status != STATUS_BUFFER_OVERFLOW && @@ -718,9 +718,9 @@ if (!NT_SUCCESS(Status) || IoStatusBlock.Information == 0) { - if (StreamInfo) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); + if (FileStreamInfo) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FileStreamInfo); } NtClose(TemplateHandle); @@ -731,7 +731,7 @@ #if 1 /* FIXME: TODO */ DPRINT1("Warning: streams copying is unimplemented!\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); + RtlFreeHeap(RtlGetProcessHeap(), 0, FileStreamInfo); NtClose(TemplateHandle); NtClose(DirectoryHandle); #endif @@ -980,7 +980,7 @@ if (!NT_SUCCESS(Status)) { - BaseSetLastNTError (Status); + BaseSetLastNTError(Status); return FALSE; }

1 0

[janderwald] 54806: [USB-BRINGUP] - Fake status success for unimplemented IRP_MN_REMOVE_DEVICE - Fix tons of bugs in the read report completion routine - Implement function to re-use a complete rep...
by janderwald＠svn.reactos.org 01 Jan '12

01 Jan '12

Author: janderwald Date: Sun Jan 1 22:48:08 2012 New Revision: 54806 URL: http://svn.reactos.org/svn/reactos?rev=54806&view=rev Log: [USB-BRINGUP] - Fake status success for unimplemented IRP_MN_REMOVE_DEVICE - Fix tons of bugs in the read report completion routine - Implement function to re-use a complete report irp - Use correct device object when invoking the mini driver's dispatch routine in the read function - silence a few traces - Mouse now works with with ReactOS USB stack + ReactOS HID stack (TBD: implement hidparse.sys) Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/drivers/hid/hidusb/hidusb.h branches/usb-bringup/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -140,7 +140,6 @@ // // only supported for PDO // - DPRINT1("[HIDCLASS] IRP_MJ_CREATE for FDO\n"); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -269,6 +268,31 @@ return STATUS_SUCCESS; } +PVOID +HidClass_GetSystemAddress( + IN PMDL ReportMDL) +{ + // + // sanity check + // + ASSERT(ReportMDL); + + if (ReportMDL->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL | MDL_MAPPED_TO_SYSTEM_VA)) + { + // + // buffer is non paged pool + // + return ReportMDL->MappedSystemVa; + } + else + { + // + // map mdl + // + return MmMapLockedPages(ReportMDL, KernelMode); + } +} + NTSTATUS NTAPI HidClass_ReadCompleteIrp( @@ -278,19 +302,23 @@ { PHIDCLASS_IRP_CONTEXT IrpContext; KIRQL OldLevel; + PUCHAR Address; + ULONG Offset; + PHIDP_DEVICE_DESC DeviceDescription; + ULONG CollectionIndex; // // get irp context // IrpContext = (PHIDCLASS_IRP_CONTEXT)Ctx; - DPRINT1("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); - DPRINT1("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); - DPRINT1("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); - DPRINT1("HidClass_ReadCompleteIrp Irp %p\n", Irp); - DPRINT1("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); - DPRINT1("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); - DPRINT1("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); + DPRINT("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); + DPRINT("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); + DPRINT("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); + DPRINT("HidClass_ReadCompleteIrp Irp %p\n", Irp); + DPRINT("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); + DPRINT("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); + DPRINT("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); // // copy result @@ -298,9 +326,28 @@ if (Irp->IoStatus.Information) { // - // copy result - // - RtlCopyMemory(IrpContext->OriginalIrp->UserBuffer, IrpContext->InputReportBuffer, IrpContext->InputReportBufferLength); + // get address + // + Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + if (Address) + { + // + // reports may have a report id prepended + // + CollectionIndex = IrpContext->FileOp->DeviceExtension->CollectionIndex; + DeviceDescription = &IrpContext->FileOp->DeviceExtension->Common.DeviceDescription; + + // + // calculate offset + // + ASSERT(DeviceDescription->CollectionDesc[CollectionIndex].InputLength >= DeviceDescription->ReportIDs[CollectionIndex].InputLength); + Offset = DeviceDescription->CollectionDesc[CollectionIndex].InputLength - DeviceDescription->ReportIDs[CollectionIndex].InputLength; + + // + // copy result + // + RtlCopyMemory(&Address[Offset], IrpContext->InputReportBuffer, IrpContext->InputReportBufferLength); + } } // @@ -315,34 +362,79 @@ ExFreePool(IrpContext->InputReportBuffer); // + // remove us from pending list + // + KeAcquireSpinLock(&IrpContext->FileOp->Lock, &OldLevel); + + // + // remove from pending list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // insert into completed list + // + InsertTailList(&IrpContext->FileOp->IrpCompletedListHead, &Irp->Tail.Overlay.ListEntry); + + // + // release lock + // + KeReleaseSpinLock(&IrpContext->FileOp->Lock, OldLevel); + + // // complete original request // IoCompleteRequest(IrpContext->OriginalIrp, IO_NO_INCREMENT); // - // remove us from pending list - // - KeAcquireSpinLock(&IrpContext->FileOp->Lock, &OldLevel); - - // - // remove from pending list - // - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + // free irp context + // + ExFreePool(IrpContext); + + // + // done + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +PIRP +HidClass_GetIrp( + IN PHIDCLASS_FILEOP_CONTEXT Context) +{ + KIRQL OldLevel; + PIRP Irp = NULL; + PLIST_ENTRY ListEntry; + + // + // acquire lock + // + KeAcquireSpinLock(&Context->Lock, &OldLevel); + + // + // is list empty? + // + if (!IsListEmpty(&Context->IrpCompletedListHead)) + { + // + // grab first entry + // + ListEntry = RemoveHeadList(&Context->IrpCompletedListHead); + + // + // get irp + // + Irp = (PIRP)CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); + } // // release lock // - KeReleaseSpinLock(&IrpContext->FileOp->Lock, OldLevel); - - // - // free irp context - // - ExFreePool(IrpContext); + KeReleaseSpinLock(&Context->Lock, OldLevel); // // done // - return STATUS_SUCCESS; + return Irp; } NTSTATUS @@ -358,17 +450,32 @@ PIRP Irp; PIO_STACK_LOCATION IoStack; PHIDCLASS_IRP_CONTEXT IrpContext; - - // - // build new irp - // - Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get an irp from fresh list + // + Irp = HidClass_GetIrp(Context); if (!Irp) { // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; + // build new irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + // + // re-use irp + // + IoReuseIrp(Irp, STATUS_SUCCESS); } // @@ -385,17 +492,31 @@ } // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // sanity checks + // + ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.CollectionDescLength); + ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.ReportIDsLength); + ASSERT(PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength > 0); + ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].InputLength == BufferLength); + + // // init irp context // RtlZeroMemory(IrpContext, sizeof(HIDCLASS_IRP_CONTEXT)); - IrpContext->InputReportBufferLength = BufferLength; + IrpContext->InputReportBufferLength = PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength; IrpContext->OriginalIrp = RequestIrp; IrpContext->FileOp = Context; // // allocate buffer // - IrpContext->InputReportBuffer = ExAllocatePool(NonPagedPool, BufferLength); + IrpContext->InputReportBuffer = ExAllocatePool(NonPagedPool, IrpContext->InputReportBufferLength); if (!IrpContext->InputReportBuffer) { // @@ -428,8 +549,6 @@ *OutIrp = Irp; *OutIrpContext = IrpContext; - DPRINT1("IRP %p Buffer %p\n", Irp, Irp->UserBuffer); - // // done // @@ -449,11 +568,18 @@ NTSTATUS Status; PIRP NewIrp; PHIDCLASS_IRP_CONTEXT NewIrpContext; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; // // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(CommonDeviceExtension->IsFDO == FALSE); // // sanity check @@ -472,12 +598,10 @@ // ASSERT(Context->DeviceExtension->Common.DriverExtension->DevicesArePolled == FALSE); - DPRINT1("[HIDCLASS] IRP_MJ_READ\n"); - // // build irp request // - Status = HidClass_BuildIrp(DeviceObject, Irp, Context, IOCTL_HID_READ_REPORT, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &NewIrp, &NewIrpContext); + Status = HidClass_BuildIrp(DeviceObject, Irp, Context, IOCTL_HID_READ_REPORT, IoStack->Parameters.Read.Length, &NewIrp, &NewIrpContext); if (!NT_SUCCESS(Status)) { // @@ -523,12 +647,12 @@ // lets dispatch the request // ASSERT(Context->DeviceExtension); - Status = Context->DeviceExtension->Common.DriverExtension->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL](DeviceObject, NewIrp); + Status = Context->DeviceExtension->Common.DriverExtension->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL](Context->DeviceExtension->FDODeviceObject, NewIrp); // // complete // - return Status; + return STATUS_PENDING; } NTSTATUS @@ -655,6 +779,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -728,7 +854,7 @@ // // dispatch to lower device object // - return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); + return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); } @@ -744,7 +870,7 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[HIDCLASS] Dispatch Major %x Minor %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + DPRINT("[HIDCLASS] Dispatch Major %x Minor %x\n", IoStack->MajorFunction, IoStack->MinorFunction); // // dispatch request based on major function Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -453,7 +453,7 @@ // // do nothing // - Status = Irp->IoStatus.Status; + Status = STATUS_SUCCESS; //Irp->IoStatus.Status; break; } case IRP_MN_QUERY_INTERFACE: @@ -544,6 +544,7 @@ PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->FDODeviceObject = DeviceObject; PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -1,6 +1,7 @@ #pragma once #define _HIDPI_NO_FUNCTION_MACROS_ +#define NDEBUG #include <ntddk.h> #include <initguid.h> #include <hidport.h> @@ -47,7 +48,6 @@ // hid attributes // HID_DEVICE_ATTRIBUTES Attributes; - }HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; @@ -101,6 +101,12 @@ // device interface // UNICODE_STRING DeviceInterface; + + // + // FDO device object + // + PDEVICE_OBJECT FDODeviceObject; + }HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; typedef struct __HIDCLASS_FILEOP_CONTEXT__ Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -340,7 +340,7 @@ // get port status // Status = HidUsb_GetPortStatus(ResetContext->DeviceObject, &PortStatus); - DPRINT1("[HIDUSB] ResetWorkerRoutine GetPortStatus %x\n", Status); + DPRINT1("[HIDUSB] ResetWorkerRoutine GetPortStatus %x PortStatus %x\n", Status, PortStatus); if (NT_SUCCESS(Status)) { if (!(PortStatus & USB_PORT_STATUS_ENABLE)) @@ -393,7 +393,6 @@ // ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); IoFreeWorkItem(ResetContext->WorkItem); - ResetContext->Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(ResetContext->Irp, IO_NO_INCREMENT); ExFreePool(ResetContext); } @@ -409,7 +408,6 @@ PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; - PUCHAR Buffer; PHID_USB_RESET_CONTEXT ResetContext; // @@ -418,6 +416,16 @@ Urb = (PURB)Context; ASSERT(Urb); + DPRINT("[HIDUSB] HidUsb_ReadReportCompletion %p Status %x Urb Status %x\n", Irp, Irp->IoStatus, Urb->UrbHeader.Status); + + if (Irp->PendingReturned) + { + // + // mark irp pending + // + IoMarkIrpPending(Irp); + } + // // did the reading report succeed / cancelled // @@ -433,11 +441,6 @@ // ASSERT(Urb->UrbHeader.Status == USBD_STATUS_SUCCESS); - - Buffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; - ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBufferLength == 4); - DPRINT("[HIDUSB] ReadCompletion Information %lu Buffer %x %x %x %x\n", Buffer[0] & 0xFF, Buffer[1] & 0xFF, Buffer[2] & 0xFF, Buffer[3] & 0xFF); - // // free the urb // @@ -446,7 +449,7 @@ // // finish completion // - return STATUS_SUCCESS; + return STATUS_CONTINUE_COMPLETION; } // @@ -502,7 +505,7 @@ // // complete request // - return STATUS_SUCCESS; + return STATUS_CONTINUE_COMPLETION; } @@ -558,6 +561,13 @@ // init urb // RtlZeroMemory(Urb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); + + // + // sanity check + // + ASSERT(Irp->UserBuffer); + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength); + ASSERT(PipeInformation->PipeHandle); // // build the urb @@ -572,6 +582,11 @@ NULL); // + // store configuration handle + // + Urb->UrbHeader.UsbdDeviceHandle = HidDeviceExtension->ConfigurationHandle; + + // // get next location to setup irp // IoStack = IoGetNextIrpStackLocation(Irp); @@ -580,8 +595,12 @@ // init irp for lower driver // IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + IoStack->Parameters.DeviceIoControl.InputBufferLength = 0; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = 0; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = NULL; IoStack->Parameters.Others.Argument1 = (PVOID)Urb; - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + // // set completion routine @@ -762,7 +781,7 @@ } case IOCTL_HID_READ_REPORT: { - DPRINT1("[HIDUSB] IOCTL_HID_READ_REPORT\n"); + DPRINT("[HIDUSB] IOCTL_HID_READ_REPORT\n"); Status = HidUsb_ReadReport(DeviceObject, Irp); return Status; } @@ -949,6 +968,11 @@ // store urb // IoStack->Parameters.Others.Argument1 = (PVOID)Urb; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); // // call driver @@ -1329,6 +1353,7 @@ // select configuration // Status = Hid_SelectConfiguration(DeviceObject); + ASSERT(Status == STATUS_SUCCESS); // // done Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -2,6 +2,7 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ +#define NDEBUG #include <ntddk.h> #include <hidport.h> #include <debug.h> Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sun Jan 1 22:48:08 2012 @@ -637,7 +637,7 @@ /* lets get the caps */ Status = HidP_GetCaps(PreparsedData, &Capabilities); - if (!NT_SUCCESS(Status)) + if (Status != HIDP_STATUS_SUCCESS) { /* failed to get capabilities */ DPRINT1("[MOUHID] failed to obtain caps with %x\n", Status); @@ -645,7 +645,7 @@ return Status; } - DPRINT1("[MOUHID] Usage %x UsagePage %x\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); + DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC)

1 0

[cfinck] 54805: Graphical Happy New Year!
by cfinck＠svn.reactos.org 01 Jan '12

01 Jan '12

Author: cfinck Date: Sun Jan 1 21:05:40 2012 New Revision: 54805 URL: http://svn.reactos.org/svn/reactos?rev=54805&view=rev Log: Graphical Happy New Year! Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

1 0

[pschweitzer] 54804: [KERNEL32] Reimplement CreateDirectoryA, CreateDirectoryExA, CreateDirectoryW, CreateDirectoryExW, RemoveDirectoryA, RemoveDirectoryW. This reimplementation now matches the w2k...
by pschweitzer＠svn.reactos.org 01 Jan '12

01 Jan '12

Author: pschweitzer Date: Sun Jan 1 17:22:35 2012 New Revision: 54804 URL: http://svn.reactos.org/svn/reactos?rev=54804&view=rev Log: [KERNEL32] Reimplement CreateDirectoryA, CreateDirectoryExA, CreateDirectoryW, CreateDirectoryExW, RemoveDirectoryA, RemoveDirectoryW. This reimplementation now matches the w2k3 one, properly handles reparse points (especially mount points) and also brings several fixes. Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sun Jan 1 17:22:35 2012 @@ -2,15 +2,9 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/file/dir.c + * FILE: lib/kernel32/client/file/dir.c * PURPOSE: Directory functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 - */ - -/* - * NOTES: Changed to using ZwCreateFile + * PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -18,7 +12,53 @@ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); + +/* Short File Name length in chars (8.3) */ +#define SFN_LENGTH 12 + +/* Match a volume name like: + * \\?\Volume{GUID} + */ +#define IS_VOLUME_NAME(s, l) \ + ((l == 96 || (l == 98 && s[48] == '\\')) && \ + s[0] == '\\'&& (s[1] == '?' || s[1] == '\\') && \ + s[2] == '?' && s[3] == '\\' && s[4] == 'V' && \ + s[5] == 'o' && s[6] == 'l' && s[7] == 'u' && \ + s[8] == 'm' && s[9] == 'e' && s[10] == '{' && \ + s[19] == '-' && s[24] == '-' && s[29] == '-' && \ + s[34] == '-' && s[47] == '}') + +/* FIXME - Get it out of here */ +typedef struct _REPARSE_DATA_BUFFER { + ULONG ReparseTag; + USHORT ReparseDataLength; + USHORT Reserved; + union { + struct { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + struct { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + struct { + UCHAR DataBuffer[1]; + } GenericReparseBuffer; + }; +} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; + +typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION { + ULONG FileAttributes; + ULONG ReparseTag; +} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; /* FUNCTIONS *****************************************************************/ @@ -27,559 +67,933 @@ */ BOOL WINAPI -CreateDirectoryA ( - LPCSTR lpPathName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes - ) +CreateDirectoryA(IN LPCSTR lpPathName, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PWCHAR PathNameW; - - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return FALSE; - - return CreateDirectoryW (PathNameW, + PUNICODE_STRING PathNameW; + + PathNameW = Basep8BitStringToStaticUnicodeString(lpPathName); + if (!PathNameW) + { + return FALSE; + } + + return CreateDirectoryW(PathNameW->Buffer, lpSecurityAttributes); } - /* * @implemented */ BOOL WINAPI -CreateDirectoryExA ( - LPCSTR lpTemplateDirectory, - LPCSTR lpNewDirectory, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) +CreateDirectoryExA(IN LPCSTR lpTemplateDirectory, + IN LPCSTR lpNewDirectory, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PWCHAR TemplateDirectoryW; - PWCHAR NewDirectoryW; - BOOL ret; - - if (!(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, TRUE))) - return FALSE; - - if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, FALSE))) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - TemplateDirectoryW); - return FALSE; - } - - ret = CreateDirectoryExW (TemplateDirectoryW, - NewDirectoryW, + PUNICODE_STRING TemplateDirectoryW; + UNICODE_STRING NewDirectoryW; + BOOL ret; + + TemplateDirectoryW = Basep8BitStringToStaticUnicodeString(lpTemplateDirectory); + if (!TemplateDirectoryW) + { + return FALSE; + } + + if (!Basep8BitStringToDynamicUnicodeString(&NewDirectoryW, lpNewDirectory)) + { + return FALSE; + } + + ret = CreateDirectoryExW(TemplateDirectoryW->Buffer, + NewDirectoryW.Buffer, lpSecurityAttributes); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - TemplateDirectoryW); - - return ret; + RtlFreeUnicodeString(&NewDirectoryW); + + return ret; } - /* * @implemented */ BOOL WINAPI -CreateDirectoryW ( - LPCWSTR lpPathName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes - ) +CreateDirectoryW(IN LPCWSTR lpPathName, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - HANDLE DirectoryHandle = NULL; - NTSTATUS Status; - - TRACE ("lpPathName %S lpSecurityAttributes %p\n", - lpPathName, lpSecurityAttributes); - - if (!RtlDosPathNameToNtPathName_U (lpPathName, - &NtPathU, - NULL, - NULL)) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - - Status = NtCreateFile (&DirectoryHandle, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, - NULL, - 0); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - WARN("NtCreateFile failed with Status %lx\n", Status); - BaseSetLastNTError(Status); - return FALSE; - } - - NtClose (DirectoryHandle); - + DWORD Length; + NTSTATUS Status; + HANDLE DirectoryHandle; + UNICODE_STRING NtPathU; + PWSTR PathUBuffer, FilePart; + IO_STATUS_BLOCK IoStatusBlock; + RTL_RELATIVE_NAME_U RelativeName; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Get relative name */ + if (!RtlDosPathNameToRelativeNtPathName_U(lpPathName, &NtPathU, NULL, &RelativeName)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Check if path length is < MAX_PATH (with space for file name). + * If not, prefix is required. + */ + if (NtPathU.Length > (MAX_PATH - SFN_LENGTH) * sizeof(WCHAR) && lpPathName[0] != L'\\' && + lpPathName[1] != L'\\' && lpPathName[2] != L'?' && lpPathName[3] != L'\\') + { + /* Get file name position and full path length */ + Length = GetFullPathNameW(lpPathName, 0, NULL, &FilePart); + if (Length == 0) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, NtPathU.Buffer); + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + + /* Keep place for 8.3 file name */ + Length += SFN_LENGTH; + /* No prefix, so, must be smaller than MAX_PATH */ + if (Length > MAX_PATH) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, NtPathU.Buffer); + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + } + + /* Save buffer to allow later freeing */ + PathUBuffer = NtPathU.Buffer; + + /* If we have relative name (and root dir), use them instead */ + if (RelativeName.RelativeName.Length != 0) + { + NtPathU.Length = RelativeName.RelativeName.Length; + NtPathU.MaximumLength = RelativeName.RelativeName.MaximumLength; + NtPathU.Buffer = RelativeName.RelativeName.Buffer; + } + else + { + RelativeName.ContainingDirectory = NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + RelativeName.ContainingDirectory, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + Status = NtCreateFile(&DirectoryHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, + NULL, + 0); + + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + + if (NT_SUCCESS(Status)) + { + NtClose(DirectoryHandle); return TRUE; + } + + if (RtlIsDosDeviceName_U(lpPathName)) + { + Status = STATUS_NOT_A_DIRECTORY; + } + + BaseSetLastNTError(Status); + return FALSE; } - /* * @implemented */ BOOL WINAPI -CreateDirectoryExW ( - LPCWSTR lpTemplateDirectory, - LPCWSTR lpNewDirectory, - LPSECURITY_ATTRIBUTES lpSecurityAttributes - ) +CreateDirectoryExW(IN LPCWSTR lpTemplateDirectory, + IN LPCWSTR lpNewDirectory, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU, NtTemplatePathU; - HANDLE DirectoryHandle = NULL; - HANDLE TemplateHandle = NULL; - FILE_EA_INFORMATION EaInformation; - FILE_BASIC_INFORMATION FileBasicInfo; - NTSTATUS Status; - ULONG OpenOptions, CreateOptions; - ACCESS_MASK DesiredAccess; - BOOLEAN ReparsePoint = FALSE; - PVOID EaBuffer = NULL; - ULONG EaLength = 0; - - OpenOptions = FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | - FILE_OPEN_FOR_BACKUP_INTENT; - CreateOptions = FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT; - DesiredAccess = FILE_LIST_DIRECTORY | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES; - - TRACE ("lpTemplateDirectory %ws lpNewDirectory %ws lpSecurityAttributes %p\n", - lpTemplateDirectory, lpNewDirectory, lpSecurityAttributes); - - /* - * Translate the template directory path - */ - - if (!RtlDosPathNameToNtPathName_U (lpTemplateDirectory, - &NtTemplatePathU, - NULL, - NULL)) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtTemplatePathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* - * Open the template directory - */ - -OpenTemplateDir: - Status = NtOpenFile (&TemplateHandle, - FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_READ_EA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - OpenOptions); + DWORD Length; + NTSTATUS Status; + ULONG EaLength = 0; + PVOID EaBuffer = NULL; + BOOL ReparsePoint = FALSE; + IO_STATUS_BLOCK IoStatusBlock; + FILE_EA_INFORMATION FileEaInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_BASIC_INFORMATION FileBasicInfo; + PREPARSE_DATA_BUFFER ReparseDataBuffer; + HANDLE TemplateHandle, DirectoryHandle; + FILE_ATTRIBUTE_TAG_INFORMATION FileTagInfo; + UNICODE_STRING NtPathU, NtTemplatePathU, NewDirectory; + RTL_RELATIVE_NAME_U RelativeName, TemplateRelativeName; + PWSTR TemplateBuffer, PathUBuffer, FilePart, SubstituteName; + + /* Get relative name of the template */ + if (!RtlDosPathNameToRelativeNtPathName_U(lpTemplateDirectory, &NtTemplatePathU, NULL, &TemplateRelativeName)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Save buffer for further freeing */ + TemplateBuffer = NtTemplatePathU.Buffer; + + /* If we have relative name (and root dir), use them instead */ + if (TemplateRelativeName.RelativeName.Length != 0) + { + NtTemplatePathU.Length = TemplateRelativeName.RelativeName.Length; + NtTemplatePathU.MaximumLength = TemplateRelativeName.RelativeName.MaximumLength; + NtTemplatePathU.Buffer = TemplateRelativeName.RelativeName.Buffer; + } + else + { + TemplateRelativeName.ContainingDirectory = NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtTemplatePathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open template directory */ + Status = NtOpenFile(&TemplateHandle, + FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_READ_EA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | FILE_OPEN_FOR_BACKUP_INTENT); + if (!NT_SUCCESS(Status)) + { + if (Status != STATUS_INVALID_PARAMETER) + { + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + +OpenWithoutReparseSupport: + /* Opening failed due to lacking reparse points support in the FSD, try without */ + Status = NtOpenFile(&TemplateHandle, + FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_READ_EA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); + if (!NT_SUCCESS(Status)) { - if (Status == STATUS_INVALID_PARAMETER && - (OpenOptions & FILE_OPEN_REPARSE_POINT)) - { - /* Some FSs (FAT) don't support reparse points, try opening - the directory without FILE_OPEN_REPARSE_POINT */ - OpenOptions &= ~FILE_OPEN_REPARSE_POINT; - - TRACE("Reparse points not supported, try with less options\n"); - - /* try again */ - goto OpenTemplateDir; - } - else - { - WARN("Failed to open the template directory: 0x%x\n", Status); - goto CleanupNoNtPath; - } - } - - /* - * Translate the new directory path and check if they're the same - */ - - if (!RtlDosPathNameToNtPathName_U (lpNewDirectory, - &NtPathU, - NULL, - NULL)) - { - Status = STATUS_OBJECT_PATH_NOT_FOUND; - goto CleanupNoNtPath; - } - - if (RtlEqualUnicodeString(&NtPathU, - &NtTemplatePathU, - TRUE)) - { - WARN("Both directory paths are the same!\n"); - Status = STATUS_OBJECT_NAME_INVALID; - goto Cleanup; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - - /* - * Query the basic file attributes from the template directory - */ - - /* Make sure FILE_ATTRIBUTE_NORMAL is used in case the information - isn't set by the FS */ + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Request file attributes */ FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; Status = NtQueryInformationFile(TemplateHandle, &IoStatusBlock, &FileBasicInfo, - sizeof(FILE_BASIC_INFORMATION), + sizeof(FileBasicInfo), FileBasicInformation); if (!NT_SUCCESS(Status)) { - WARN("Failed to query the basic directory attributes\n"); - goto Cleanup; - } - - /* clear the reparse point attribute if present. We're going to set the - reparse point later which will cause the attribute to be set */ + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + CloseHandle(TemplateHandle); + BaseSetLastNTError(Status); + return FALSE; + + } + } + else + { + /* Request file attributes */ + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FileBasicInfo), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + CloseHandle(TemplateHandle); + BaseSetLastNTError(Status); + return FALSE; + + } + + /* If it is a reparse point, then get information about it */ if (FileBasicInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { - FileBasicInfo.FileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT; - - /* writing the extended attributes requires the FILE_WRITE_DATA - access right */ - DesiredAccess |= FILE_WRITE_DATA; - - CreateOptions |= FILE_OPEN_REPARSE_POINT; + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &FileTagInfo, + sizeof(FileTagInfo), + FileAttributeTagInformation); + if (!NT_SUCCESS(Status)) + { + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + CloseHandle(TemplateHandle); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Only mount points are supported, retry without if anything different */ + if (FileTagInfo.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT) + { + CloseHandle(TemplateHandle); + goto OpenWithoutReparseSupport; + } + + /* Mark we are playing with a reparse point */ ReparsePoint = TRUE; } - - /* - * Read the Extended Attributes if present - */ - - for (;;) - { - Status = NtQueryInformationFile(TemplateHandle, - &IoStatusBlock, - &EaInformation, - sizeof(FILE_EA_INFORMATION), - FileEaInformation); - if (NT_SUCCESS(Status) && (EaInformation.EaSize != 0)) - { - EaBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - EaInformation.EaSize); - if (EaBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - + } + + /* Get relative name of the directory */ + if (!RtlDosPathNameToRelativeNtPathName_U(lpNewDirectory, &NtPathU, NULL, &RelativeName)) + { + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + NtClose(TemplateHandle); + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Save its buffer for further freeing */ + PathUBuffer = NtPathU.Buffer; + + /* Template & directory can't be the same */ + if (RtlEqualUnicodeString(&NtPathU, + &NtTemplatePathU, + TRUE)) + { + RtlReleaseRelativeName(&RelativeName); + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + NtClose(TemplateHandle); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + RtlReleaseRelativeName(&TemplateRelativeName); + RtlFreeHeap(GetProcessHeap(), 0, TemplateBuffer); + + /* Check if path length is < MAX_PATH (with space for file name). + * If not, prefix is required. + */ + if (NtPathU.Length > (MAX_PATH - SFN_LENGTH) * sizeof(WCHAR) && lpNewDirectory[0] != L'\\' && + lpNewDirectory[1] != L'\\' && lpNewDirectory[2] != L'?' && lpNewDirectory[3] != L'\\') + { + /* Get file name position and full path length */ + Length = GetFullPathNameW(lpNewDirectory, 0, NULL, &FilePart); + if (Length == 0) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + CloseHandle(TemplateHandle); + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + + /* Keep place for 8.3 file name */ + Length += SFN_LENGTH; + /* No prefix, so, must be smaller than MAX_PATH */ + if (Length > MAX_PATH) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + CloseHandle(TemplateHandle); + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + } + + /* If we have relative name (and root dir), use them instead */ + if (RelativeName.RelativeName.Length != 0) + { + NtPathU.Length = RelativeName.RelativeName.Length; + NtPathU.MaximumLength = RelativeName.RelativeName.MaximumLength; + NtPathU.Buffer = RelativeName.RelativeName.Buffer; + } + else + { + RelativeName.ContainingDirectory = NULL; + } + + /* Get extended attributes */ + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &FileEaInfo, + sizeof(FileEaInfo), + FileEaInformation); + if (!NT_SUCCESS(Status)) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + CloseHandle(TemplateHandle); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Start reading extended attributes */ + if (FileEaInfo.EaSize != 0) + { + for (EaLength = FileEaInfo.EaSize * 2; ; EaLength = EaLength * 2) + { + /* Allocate buffer for reading */ + EaBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, EaLength); + if (!EaBuffer) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + CloseHandle(TemplateHandle); + BaseSetLastNTError(STATUS_NO_MEMORY); + return FALSE; + } + + /* Query EAs */ Status = NtQueryEaFile(TemplateHandle, &IoStatusBlock, EaBuffer, - EaInformation.EaSize, + EaLength, FALSE, NULL, 0, NULL, TRUE); - - if (NT_SUCCESS(Status)) - { - /* we successfully read the extended attributes */ - EaLength = EaInformation.EaSize; - break; + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, EaBuffer); + IoStatusBlock.Information = 0; + } + + /* If we don't fail because of too small buffer, stop here */ + if (Status != STATUS_BUFFER_OVERFLOW && + Status != STATUS_BUFFER_TOO_SMALL) + { + EaLength = IoStatusBlock.Information; + break; + } + } + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + RelativeName.ContainingDirectory, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + /* Ensure attributes are valid */ + FileBasicInfo.FileAttributes &= FILE_ATTRIBUTE_VALID_FLAGS; + + /* Create the new directory */ + Status = NtCreateFile(&DirectoryHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | + FILE_READ_ATTRIBUTES | (FileBasicInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT ? FILE_ADD_FILE : 0), + &ObjectAttributes, + &IoStatusBlock, + NULL, + FileBasicInfo.FileAttributes, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT, + EaBuffer, + EaLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_INVALID_PARAMETER || Status == STATUS_ACCESS_DENIED) + { + /* If creation failed, it might be because FSD doesn't support reparse points + * Retry without asking for such support in case template is not a reparse point + */ + if (!ReparsePoint) + { + Status = NtCreateFile(&DirectoryHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE | + FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FileBasicInfo.FileAttributes, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT, + EaBuffer, + EaLength); } else { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - EaBuffer); - EaBuffer = NULL; - - if (Status != STATUS_BUFFER_TOO_SMALL) - { - /* unless we just allocated not enough memory, break the loop - and just continue without copying extended attributes */ - break; - } - } - } - else - { - if (Status == STATUS_EAS_NOT_SUPPORTED) - { - /* Extended attributes are not supported, so, this is OK */ - /* FIXME: Would deserve a deeper look, comparing with Windows */ - Status = STATUS_SUCCESS; - } - /* failure or no extended attributes present, break the loop */ - break; - } - } - - if (!NT_SUCCESS(Status)) - { - WARN("Querying the EA data failed: 0x%x\n", Status); - goto Cleanup; - } - - /* - * Create the new directory - */ - - Status = NtCreateFile (&DirectoryHandle, - DesiredAccess, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FileBasicInfo.FileAttributes, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - CreateOptions, - EaBuffer, - EaLength); - if (!NT_SUCCESS(Status)) - { - if (ReparsePoint && - (Status == STATUS_INVALID_PARAMETER || Status == STATUS_ACCESS_DENIED)) - { - /* The FS doesn't seem to support reparse points... */ - WARN("Cannot copy the hardlink, destination doesn\'t support reparse points!\n"); - } - - goto Cleanup; - } - - if (ReparsePoint) - { - /* - * Copy the reparse point - */ - - PREPARSE_GUID_DATA_BUFFER ReparseDataBuffer = - (PREPARSE_GUID_DATA_BUFFER)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - MAXIMUM_REPARSE_DATA_BUFFER_SIZE); - - if (ReparseDataBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Cleanup; - } - - /* query the size of the reparse data buffer structure */ - Status = NtFsControlFile(TemplateHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FSCTL_GET_REPARSE_POINT, - NULL, - 0, - ReparseDataBuffer, - MAXIMUM_REPARSE_DATA_BUFFER_SIZE); - if (NT_SUCCESS(Status)) - { - /* write the reparse point */ - Status = NtFsControlFile(DirectoryHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FSCTL_SET_REPARSE_POINT, - ReparseDataBuffer, - MAXIMUM_REPARSE_DATA_BUFFER_SIZE, - NULL, - 0); - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ReparseDataBuffer); - - if (!NT_SUCCESS(Status)) - { - /* fail, we were unable to read the reparse point data! */ - WARN("Querying or setting the reparse point failed: 0x%x\n", Status); - goto Cleanup; - } - } - else - { - /* - * Copy alternate file streams, if existing - */ - - /* FIXME - enumerate and copy the file streams */ - } - - /* - * We successfully created the directory and copied all information - * from the template directory - */ - Status = STATUS_SUCCESS; - -Cleanup: - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtPathU.Buffer); - -CleanupNoNtPath: - if (TemplateHandle != NULL) - { - NtClose(TemplateHandle); - } - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtTemplatePathU.Buffer); - - /* free the he extended attributes buffer */ - if (EaBuffer != NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EaBuffer); - } - - if (DirectoryHandle != NULL) - { - NtClose(DirectoryHandle); - } - - if (!NT_SUCCESS(Status)) - { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + if (EaBuffer) + { + RtlFreeHeap(GetProcessHeap(), 0, EaBuffer); + } + CloseHandle(TemplateHandle); BaseSetLastNTError(Status); return FALSE; - } - + } + } + } + + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(GetProcessHeap(), 0, PathUBuffer); + if (EaBuffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, EaBuffer); + } + + if (!NT_SUCCESS(Status)) + { + NtClose(TemplateHandle); + if (RtlIsDosDeviceName_U(lpNewDirectory)) + { + Status = STATUS_NOT_A_DIRECTORY; + } + BaseSetLastNTError(Status); + return FALSE; + } + + /* If template is a reparse point, copy reparse data */ + if (ReparsePoint) + { + ReparseDataBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (!ReparseDataBuffer) + { + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + SetLastError(STATUS_NO_MEMORY); + return FALSE; + } + + /* First query data */ + Status = NtFsControlFile(TemplateHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_GET_REPARSE_POINT, + NULL, + 0, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + SetLastError(Status); + return FALSE; + } + + /* Once again, ensure it is a mount point */ + if (ReparseDataBuffer->ReparseTag != IO_REPARSE_TAG_MOUNT_POINT) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + SetLastError(STATUS_OBJECT_NAME_INVALID); + return FALSE; + } + + /* Get volume name */ + SubstituteName = (PWSTR)((ULONG_PTR)ReparseDataBuffer->MountPointReparseBuffer.PathBuffer + + ReparseDataBuffer->MountPointReparseBuffer.SubstituteNameOffset); + if (IS_VOLUME_NAME(SubstituteName, ReparseDataBuffer->MountPointReparseBuffer.SubstituteNameLength)) + { + /* Prepare to define a new mount point for that volume */ + RtlInitUnicodeString(&NewDirectory, lpNewDirectory); + NewDirectory.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, NewDirectory.Length + 2 * sizeof(WCHAR)); + if (!NewDirectory.Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + return FALSE; + } + + RtlCopyMemory(&NewDirectory.Buffer, lpNewDirectory, NewDirectory.Length); + if (NewDirectory.Buffer[NewDirectory.Length / sizeof(WCHAR)] != L'\\') + { + NewDirectory.Buffer[NewDirectory.Length / sizeof(WCHAR)] = L'\\'; + NewDirectory.Buffer[(NewDirectory.Length / sizeof(WCHAR)) + 1] = UNICODE_NULL; + } + + /* Define a new mount point for that volume */ + SetVolumeMountPointW(NewDirectory.Buffer, SubstituteName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NewDirectory.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + return TRUE; + } + + /* Otherwise copy data raw */ + Status = NtFsControlFile(DirectoryHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + ReparseDataBuffer, + ReparseDataBuffer->ReparseDataLength + + FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer), + NULL, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + + if (NT_SUCCESS(Status)) + { + return TRUE; + } + + BaseSetLastNTError(Status); + return FALSE; + } + /* In case it's not a reparse point, handle streams on the file */ + else + { + PVOID StreamInfo; + ULONG StreamSize = 0x1000; + for (;;) + { + StreamInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, StreamSize); + if (!StreamInfo) + { + BaseMarkFileForDelete(DirectoryHandle, FileBasicInfo.FileAttributes); + SetLastError(STATUS_NO_MEMORY); + break; + } + + /* Query stream information */ + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + StreamInfo, + StreamSize, + FileStreamInformation); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); + StreamInfo = NULL; + StreamSize << 1; + } + + /* If it failed, ensure that's not because of too small buffer */ + if (Status != STATUS_BUFFER_OVERFLOW && + Status != STATUS_BUFFER_TOO_SMALL) + { + break; + } + } + + if (!NT_SUCCESS(Status) || IoStatusBlock.Information == 0) + { + if (StreamInfo) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); + } + + NtClose(TemplateHandle); + NtClose(DirectoryHandle); + return TRUE; + } + +#if 1 + /* FIXME: TODO */ + DPRINT1("Warning: streams copying is unimplemented!\n"); + RtlFreeHeap(RtlGetProcessHeap(), 0, StreamInfo); + NtClose(TemplateHandle); + NtClose(DirectoryHandle); +#endif return TRUE; + } } - /* * @implemented */ BOOL WINAPI -RemoveDirectoryA ( - LPCSTR lpPathName - ) +RemoveDirectoryA(IN LPCSTR lpPathName) { - PWCHAR PathNameW; - - TRACE("RemoveDirectoryA(%s)\n",lpPathName); - - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return FALSE; - - return RemoveDirectoryW (PathNameW); + PUNICODE_STRING PathNameW; + + PathNameW = Basep8BitStringToStaticUnicodeString(lpPathName); + if (!PathNameW) + { + return FALSE; + } + + return RemoveDirectoryW(PathNameW->Buffer); } - /* * @implemented */ BOOL WINAPI -RemoveDirectoryW ( - LPCWSTR lpPathName - ) +RemoveDirectoryW(IN LPCWSTR lpPathName) { - FILE_DISPOSITION_INFORMATION FileDispInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - HANDLE DirectoryHandle = NULL; - NTSTATUS Status; - - TRACE("lpPathName %S\n", lpPathName); - - if (!RtlDosPathNameToNtPathName_U (lpPathName, - &NtPathU, - NULL, - NULL)) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - TRACE("NtPathU '%S'\n", NtPathU.Buffer); - + NTSTATUS Status; + DWORD BytesReturned; + HANDLE DirectoryHandle; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING NtPathU, PathName; + RTL_RELATIVE_NAME_U RelativeName; + PWSTR PathUBuffer, SubstituteName; + OBJECT_ATTRIBUTES ObjectAttributes; + PREPARSE_DATA_BUFFER ReparseDataBuffer; + FILE_DISPOSITION_INFORMATION FileDispInfo; + FILE_ATTRIBUTE_TAG_INFORMATION FileTagInfo; + + /* Get relative name */ + if (!RtlDosPathNameToRelativeNtPathName_U(lpPathName, &NtPathU, NULL, &RelativeName)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Save buffer to allow later freeing */ + PathUBuffer = NtPathU.Buffer; + + /* If we have relative name (and root dir), use them instead */ + if (RelativeName.RelativeName.Length != 0) + { + NtPathU.Length = RelativeName.RelativeName.Length; + NtPathU.MaximumLength = RelativeName.RelativeName.MaximumLength; + NtPathU.Buffer = RelativeName.RelativeName.Buffer; + } + else + { + RelativeName.ContainingDirectory = NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + RelativeName.ContainingDirectory, + NULL); + + /* Try to open directory */ + Status = NtOpenFile(&DirectoryHandle, + DELETE | SYNCHRONIZE | FAILED_ACCESS_ACE_FLAG, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); + if (!NT_SUCCESS(Status)) + { + /* We only accept failure for reparse points not being supported */ + if (Status != STATUS_INVALID_PARAMETER) + { + goto Cleanup; + } + + /* Try to open, with reparse points support */ Status = NtOpenFile(&DirectoryHandle, DELETE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); - - RtlFreeUnicodeString(&NtPathU); - + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT); if (!NT_SUCCESS(Status)) { - WARN("Status 0x%08x\n", Status); - BaseSetLastNTError (Status); - return FALSE; - } - - FileDispInfo.DeleteFile = TRUE; - - Status = NtSetInformationFile (DirectoryHandle, - &IoStatusBlock, - &FileDispInfo, - sizeof(FILE_DISPOSITION_INFORMATION), - FileDispositionInformation); + goto Cleanup; + } + + /* Success, mark directory */ + goto MarkFileForDelete; + } + + /* Get information about file (and reparse point) */ + Status = NtQueryInformationFile(DirectoryHandle, + &IoStatusBlock, + &FileTagInfo, + sizeof(FileTagInfo), + FileAttributeTagInformation); + if (!NT_SUCCESS(Status)) + { + /* FSD might not support querying reparse points information */ + if (Status != STATUS_NOT_IMPLEMENTED && + Status != STATUS_INVALID_PARAMETER) + { + goto CleanupHandle; + } + + /* If that's the case, then just delete directory */ + goto MarkFileForDelete; + } + + /* If that's not a reparse point, nothing more to do than just delete */ + if (!(FileTagInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) + { + goto MarkFileForDelete; + } + + /* Check if that's a mount point */ + if (FileTagInfo.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT) + { + /* It's not */ NtClose(DirectoryHandle); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; + /* So, try to reopen directory, ignoring mount point */ + Status = NtOpenFile(&DirectoryHandle, + DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT); + if (NT_SUCCESS(Status)) + { + /* It succeed, we can safely delete directory (and ignore reparse point) */ + goto MarkFileForDelete; + } + + /* If it failed, only allow case where IO mount point was ignored */ + if (Status != STATUS_IO_REPARSE_TAG_NOT_HANDLED) + { + goto Cleanup; + } + + /* Reopen with reparse point support */ + Status = NtOpenFile(&DirectoryHandle, + DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); + if (NT_SUCCESS(Status)) + { + /* And mark for delete */ + goto MarkFileForDelete; + } + + goto Cleanup; + } + + /* Here, we have a mount point, prepare to query information about it */ + ReparseDataBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (!ReparseDataBuffer) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + NtClose(DirectoryHandle); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Query */ + if (!DeviceIoControl(DirectoryHandle, + FSCTL_GET_REPARSE_POINT, + NULL, 0, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE, + &BytesReturned, + NULL)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + goto MarkFileForDelete; + } + + /* Get volume name */ + SubstituteName = (PWSTR)((ULONG_PTR)ReparseDataBuffer->MountPointReparseBuffer.PathBuffer + + ReparseDataBuffer->MountPointReparseBuffer.SubstituteNameOffset); + if (!IS_VOLUME_NAME(SubstituteName, ReparseDataBuffer->MountPointReparseBuffer.SubstituteNameLength)) + { + /* This is not a volume, we can safely delete */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + goto MarkFileForDelete; + } + + /* Prepare to delete mount point */ + RtlInitUnicodeString(&PathName, lpPathName); + PathName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathName.Length + 2 * sizeof(WCHAR)); + if (!PathName.Buffer) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + NtClose(DirectoryHandle); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + RtlCopyMemory(&PathName.Buffer, lpPathName, PathName.Length); + if (PathName.Buffer[PathName.Length / sizeof(WCHAR)] != L'\\') + { + PathName.Buffer[PathName.Length / sizeof(WCHAR)] = L'\\'; + PathName.Buffer[(PathName.Length / sizeof(WCHAR)) + 1] = UNICODE_NULL; + } + + /* Delete mount point for that volume */ + DeleteVolumeMountPointW(PathName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, ReparseDataBuffer); + + /* And mark directory for delete */ +MarkFileForDelete: + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + + /* Mark & set */ + FileDispInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(DirectoryHandle, + &IoStatusBlock, + &FileDispInfo, + sizeof(FILE_DISPOSITION_INFORMATION), + FileDispositionInformation); + NtClose(DirectoryHandle); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError (Status); + return FALSE; + } + + return TRUE; + +CleanupHandle: + NtClose(DirectoryHandle); + +Cleanup: + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + BaseSetLastNTError(Status); + return FALSE; } /* EOF */

1 0

[pschweitzer] 54803: [KERNEL32] Implement BaseMarkFileForDelete. This will be used later.
by pschweitzer＠svn.reactos.org 01 Jan '12

01 Jan '12

Author: pschweitzer Date: Sun Jan 1 17:19:31 2012 New Revision: 54803 URL: http://svn.reactos.org/svn/reactos?rev=54803&view=rev Log: [KERNEL32] Implement BaseMarkFileForDelete. This will be used later. Modified: trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Jan 1 17:19:31 2012 @@ -828,6 +828,51 @@ } /* + * @implemented + */ +VOID +WINAPI +BaseMarkFileForDelete(IN HANDLE FileHandle, + IN ULONG FileAttributes) +{ + IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileBasicInfo; + FILE_DISPOSITION_INFORMATION FileDispositionInfo; + + /* If no attributes were given, get them */ + if (!FileAttributes) + { + FileBasicInfo.FileAttributes = 0; + NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FileBasicInfo), + FileBasicInformation); + FileAttributes = FileBasicInfo.FileAttributes; + } + + /* If file is marked as RO, reset its attributes */ + if (FileAttributes & FILE_ATTRIBUTE_READONLY) + { + RtlZeroMemory(&FileBasicInfo, sizeof(FileBasicInfo)); + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FileBasicInfo), + FileBasicInformation); + } + + /* Finally, mark the file for deletion */ + FileDispositionInfo.DeleteFile = TRUE; + NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileDispositionInfo, + sizeof(FileDispositionInfo), + FileDispositionInformation); +} + +/* * @unimplemented */ BOOL Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Jan 1 17:19:31 2012 @@ -323,3 +323,7 @@ IN PVOID Context, OUT BOOLEAN *StopEnumeration); +VOID +WINAPI +BaseMarkFileForDelete(IN HANDLE FileHandle, + IN ULONG FileAttributes);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs