Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[sginsberg] 55808: [DDK] - Fix a whole fat bunch of Prefast warnings by making the IoCsqxxx declarations in csq.h match the ones in wdm.h.
by sginsberg＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: sginsberg Date: Wed Feb 22 17:00:06 2012 New Revision: 55808 URL: http://svn.reactos.org/svn/reactos?rev=55808&view=rev Log: [DDK] - Fix a whole fat bunch of Prefast warnings by making the IoCsqxxx declarations in csq.h match the ones in wdm.h. Modified: trunk/reactos/include/ddk/csq.h Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=5580… ============================================================================== --- trunk/reactos/include/ddk/csq.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/csq.h [iso-8859-1] Wed Feb 22 17:00:06 2012 @@ -275,7 +275,7 @@ * there are no IRQL restrictions. */ NTKERNELAPI -NTSTATUS NTAPI IoCsqInitialize(_In_ PIO_CSQ Csq, +NTSTATUS NTAPI IoCsqInitialize(_Out_ PIO_CSQ Csq, _In_ PIO_CSQ_INSERT_IRP CsqInsertIrp, _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, @@ -289,7 +289,7 @@ * information for use with the queue. */ NTKERNELAPI -NTSTATUS NTAPI IoCsqInitializeEx(_In_ PIO_CSQ Csq, +NTSTATUS NTAPI IoCsqInitializeEx(_Out_ PIO_CSQ Csq, _In_ PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, @@ -301,32 +301,32 @@ * Insert an IRP into the queue */ NTKERNELAPI -VOID NTAPI IoCsqInsertIrp(_In_ PIO_CSQ Csq, - _In_ PIRP Irp, - _In_opt_ PIO_CSQ_IRP_CONTEXT Context); +VOID NTAPI IoCsqInsertIrp(_Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context); /* * Insert an IRP into the queue, with special context maintained that * makes it easy to find IRPs in the queue */ NTKERNELAPI -NTSTATUS NTAPI IoCsqInsertIrpEx(_In_ PIO_CSQ Csq, - _In_ PIRP Irp, - _In_opt_ PIO_CSQ_IRP_CONTEXT Context, +NTSTATUS NTAPI IoCsqInsertIrpEx(_Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context, _In_opt_ PVOID InsertContext); /* * Remove a particular IRP from the queue */ NTKERNELAPI -PIRP NTAPI IoCsqRemoveIrp(_In_ PIO_CSQ Csq, - _In_ PIO_CSQ_IRP_CONTEXT Context); +PIRP NTAPI IoCsqRemoveIrp(_Inout_ PIO_CSQ Csq, + _Inout_ PIO_CSQ_IRP_CONTEXT Context); /* * Remove the next IRP from the queue */ NTKERNELAPI -PIRP NTAPI IoCsqRemoveNextIrp(_In_ PIO_CSQ Csq, +PIRP NTAPI IoCsqRemoveNextIrp(_Inout_ PIO_CSQ Csq, _In_opt_ PVOID PeekContext); #ifdef __cplusplus

1 0

[spetreolle] 55807: [CABMAN] Enable debug in order to figure the testbot problems.
by spetreolle＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: spetreolle Date: Wed Feb 22 15:30:48 2012 New Revision: 55807 URL: http://svn.reactos.org/svn/reactos?rev=55807&view=rev Log: [CABMAN] Enable debug in order to figure the testbot problems. Modified: trunk/reactos/tools/cabman/CMakeLists.txt trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/cabman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/CMakeLists.txt [iso-8859-1] Wed Feb 22 15:30:48 2012 @@ -6,7 +6,7 @@ raw.cxx) include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) - +add_definitions(-DDBG=1) add_executable(cabman ${SOURCE}) target_link_libraries(cabman zlibhost) Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Wed Feb 22 15:30:48 2012 @@ -19,8 +19,8 @@ #if DBG -ULONG DebugTraceLevel = MIN_TRACE; -//ULONG DebugTraceLevel = MID_TRACE; +//ULONG DebugTraceLevel = MIN_TRACE; +ULONG DebugTraceLevel = MID_TRACE; //ULONG DebugTraceLevel = MAX_TRACE; #endif /* DBG */

1 0

[janderwald] 55806: [USBUHCI] - Write the configure bit - Clear connection change and port suspend bit when set after controller initialization - Queue work item after the reset port is complete - ...
by janderwald＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: janderwald Date: Wed Feb 22 14:11:23 2012 New Revision: 55806 URL: http://svn.reactos.org/svn/reactos?rev=55806&view=rev Log: [USBUHCI] - Write the configure bit - Clear connection change and port suspend bit when set after controller initialization - Queue work item after the reset port is complete - Disable port before reseting it - Wait time for reset is 50ms, not 25ms - Clear reset change bit when clearing reset feature - Implement enabling port feature Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hardware.h trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Wed Feb 22 14:11:23 2012 @@ -289,7 +289,7 @@ // Store Resource base // m_Base = (PULONG)ResourceDescriptor->u.Port.Start.LowPart; //FIXME - DPRINT1("UHCI Base %p\n", m_Base); + DPRINT1("UHCI Base %p Length %x\n", m_Base, ResourceDescriptor->u.Port.Length); break; } } @@ -499,6 +499,9 @@ } } + DPRINT1("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); + + if ((Status & UHCI_USBSTS_HCHALT)) { // @@ -509,9 +512,31 @@ return STATUS_UNSUCCESSFUL; } + // + // Set the configure bit + // + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_CF); + + for(Index = 0; Index < 2; Index++) + { + // + // get port status + // + Status = ReadRegister16(UHCI_PORTSC1 + Index * 2); + + // + // clear connection change and port suspend + // + WriteRegister16(UHCI_PORTSC1 + Index * 2, Status & ~(UHCI_PORTSC_STATCHA | UHCI_PORTSC_SUSPEND)); + } + DPRINT1("[USBUHCI] Controller Started\n"); DPRINT1("[USBUHCI] Controller Status %x\n", ReadRegister16(UHCI_USBSTS)); + DPRINT1("[USBUHCI] Controller Cmd Status %x\n", ReadRegister16(UHCI_USBCMD)); + DPRINT1("[USBUHCI] Controller Interrupt Status %x\n", ReadRegister16(UHCI_USBINTR)); DPRINT1("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); + DPRINT1("[USBUHCI] Controller Port Status 0 %x\n", ReadRegister16(UHCI_PORTSC1)); + DPRINT1("[USBUHCI] Controller Port Status 1 %x\n", ReadRegister16(UHCI_PORTSC1 + 2)); // // done @@ -533,12 +558,15 @@ // WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), UHCI_USBCMD_GRESET); + KeStallExecutionProcessor(100); + // // clear command register // WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), 0); - KeStallExecutionProcessor(1000); + KeStallExecutionProcessor(10); + // // restore start of modify register @@ -558,6 +586,12 @@ DPRINT1("[USBUHCI] InitializeController\n"); // + // now disable all interrupts + // + WriteRegister16(UHCI_USBINTR, 0); + + + // // UHCI has two ports // m_NumberOfPorts = 2; @@ -580,10 +614,6 @@ DPRINT1("[USBUHCI] Acquired ownership\n"); - // - // now disable all interrupts - // - WriteRegister16(UHCI_USBINTR, 0); // // perform global reset @@ -682,14 +712,15 @@ // // init stray descriptor // - m_StrayDescriptor->PhysicalAddress = m_StrayDescriptorPhysicalAddress; + m_StrayDescriptor->PhysicalAddress = m_StrayDescriptorPhysicalAddress.LowPart; m_StrayDescriptor->LinkPhysical = TD_TERMINATE; m_StrayDescriptor->Token = TD_TOKEN_NULL_DATA | (0x7f << TD_TOKEN_DEVADDR_SHIFT) | TD_TOKEN_IN; + // // link to last queue head // - m_QueueHead[4]->LinkPhysical = m_StrayDescriptor->PhysicalAddress.LowPart; + m_QueueHead[4]->LinkPhysical = m_StrayDescriptor->PhysicalAddress; m_QueueHead[4]->NextLogicalDescriptor = m_StrayDescriptor; @@ -805,6 +836,17 @@ Status = ReadRegister16(Port); // + // Before port reset, disable the port + // + WriteRegister16(Port, ReadRegister16(Port) & ~UHCI_PORTSC_ENABLED); + while(ReadRegister16(Port) & UHCI_PORTSC_ENABLED) + { + DPRINT1("Port %x Status %x\n", PortIndex, ReadRegister16(Port)); + KeStallExecutionProcessor(5); + } + + + // // remove unwanted bits // Status &= UHCI_PORTSC_DATAMASK; @@ -817,7 +859,7 @@ // // now wait a bit // - KeStallExecutionProcessor(25); + KeStallExecutionProcessor(50); // // re-read status @@ -832,12 +874,17 @@ // // clear reset port // - WriteRegister16(Port, Status & ~UHCI_PORTSC_RESET); + WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); + + // + // set enabled bit + // + WriteRegister16(Port, ReadRegister16(Port) | UHCI_PORTSC_ENABLED); // // now wait a bit // - KeStallExecutionProcessor(25); + KeStallExecutionProcessor(10); for (Index = 0; Index < 10; Index++) { @@ -854,7 +901,7 @@ // // enable port // - WriteRegister16(Port, Status | UHCI_PORTSC_ENABLED); + WriteRegister16(Port, Status); // // wait a bit @@ -891,6 +938,16 @@ m_PortResetChange |= (1 << PortIndex); DPRINT1("[USBOHCI] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + + if (Status & UHCI_PORTSC_CURSTAT) + { + // + // queue work item + // + DPRINT1("Queueing work item\n"); + ExQueueWorkItem(&m_StatusChangeWorkItem, DelayedWorkQueue); + } + return STATUS_SUCCESS; } @@ -1003,7 +1060,7 @@ // // UHCI is not supporting port reset register bit // - m_PortResetChange &= (1 << PortId); + m_PortResetChange &= ~(1 << PortId); } else if (Feature == C_PORT_CONNECTION) { @@ -1029,6 +1086,8 @@ ULONG PortId, ULONG Feature) { + ULONG PortRegister; + DPRINT1("[UHCI] SetPortFeature PortId %x Feature %x\n", PortId, Feature); // @@ -1043,12 +1102,21 @@ return STATUS_INVALID_PARAMETER; } + PortRegister = UHCI_PORTSC1 + PortId * 2; + if (Feature == PORT_RESET) { // // reset port // return ResetPort(PortId); + } + else if (Feature == PORT_ENABLE) + { + // + // reset port + // + WriteRegister16(PortRegister, ReadRegister16(PortRegister) | UHCI_PORTSC_ENABLED); } else if (Feature == PORT_POWER) { @@ -1107,12 +1175,12 @@ // get context // This = (CUSBHardwareDevice*) ServiceContext; - DPRINT("InterruptServiceRoutine\n"); // // read register // Status = This->ReadRegister16(UHCI_USBSTS); + DPRINT("InterruptServiceRoutine %x\n", Status); // // check if the interrupt signaled are from us Modified: trunk/reactos/drivers/usb/usbuhci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] Wed Feb 22 14:11:23 2012 @@ -92,7 +92,7 @@ ULONG BufferPhysical; // pointer to the buffer // Software part - PHYSICAL_ADDRESS PhysicalAddress; // Physical address of this descriptor + ULONG PhysicalAddress; // Physical address of this descriptor PVOID NextLogicalDescriptor; ULONG BufferSize; // Size of the buffer PVOID BufferLogical; // Logical pointer to the buffer Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Wed Feb 22 14:11:23 2012 @@ -718,7 +718,7 @@ // // init descriptor // - Descriptor->PhysicalAddress = Address; + Descriptor->PhysicalAddress = Address.LowPart; Descriptor->Status = TD_STATUS_ACTIVE; if (InternalGetTransferType() == USB_ENDPOINT_TYPE_ISOCHRONOUS) @@ -829,7 +829,7 @@ // // FIXME FIXME FIXME FIXME FIXME // - MaxPacketSize = 64; + MaxPacketSize = 1280; do { @@ -872,7 +872,7 @@ // // link descriptor // - LastDescriptor->LinkPhysical = CurrentDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + LastDescriptor->LinkPhysical = CurrentDescriptor->PhysicalAddress | TD_DEPTH_FIRST; LastDescriptor->NextLogicalDescriptor = (PVOID)CurrentDescriptor; } @@ -1095,13 +1095,13 @@ // // link setup descriptor to first data descriptor // - SetupDescriptor->LinkPhysical = FirstDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + SetupDescriptor->LinkPhysical = FirstDescriptor->PhysicalAddress | TD_DEPTH_FIRST; SetupDescriptor->NextLogicalDescriptor = (PVOID)FirstDescriptor; // // link last data descriptor to status descriptor // - LastDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + LastDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress | TD_DEPTH_FIRST; LastDescriptor->NextLogicalDescriptor = (PVOID)StatusDescriptor; } else @@ -1109,7 +1109,7 @@ // // directly link setup to status descriptor // - SetupDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + SetupDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress | TD_DEPTH_FIRST; SetupDescriptor->NextLogicalDescriptor = (PVOID)StatusDescriptor; } @@ -1117,7 +1117,7 @@ // link queue head with setup descriptor // QueueHead->NextElementDescriptor = (PVOID)SetupDescriptor; - QueueHead->ElementPhysical = SetupDescriptor->PhysicalAddress.LowPart; + QueueHead->ElementPhysical = SetupDescriptor->PhysicalAddress; // // store result Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Wed Feb 22 14:11:23 2012 @@ -2,7 +2,7 @@ #define USBOHCI_H__ #include <ntddk.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

1 0

[tfaber] 55805: [RTL] - Fix use of uninitialized variables in failure case of RtlSetCurrentDirectory_U. CID 15339, 15340 - Handles should be NULL, not 0
by tfaber＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: tfaber Date: Wed Feb 22 12:02:59 2012 New Revision: 55805 URL: http://svn.reactos.org/svn/reactos?rev=55805&view=rev Log: [RTL] - Fix use of uninitialized variables in failure case of RtlSetCurrentDirectory_U. CID 15339, 15340 - Handles should be NULL, not 0 Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=55805&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Feb 22 12:02:59 2012 @@ -1009,9 +1009,12 @@ OBJECT_ATTRIBUTES ObjectAttributes; FILE_FS_DEVICE_INFORMATION FileFsDeviceInfo; ULONG SavedLength, CharLength, FullPathLength; - HANDLE OldHandle = 0, CurDirHandle, OldCurDirHandle = 0; + HANDLE OldHandle = NULL, CurDirHandle = NULL, OldCurDirHandle = NULL; DPRINT("RtlSetCurrentDirectory_U %wZ\n", Path); + + /* Initialize for failure case */ + RtlInitEmptyUnicodeString(&NtName, NULL, 0); /* Can't set current directory on DOS device */ if (RtlIsDosDeviceName_Ustr(Path)) @@ -1075,7 +1078,7 @@ { /* Get back normal handle */ CurDirHandle = (HANDLE)((ULONG_PTR)(CurDir->Handle) & ~RTL_CURDIR_ALL_FLAGS); - CurDir->Handle = 0; + CurDir->Handle = NULL; /* Get device information */ Status = NtQueryVolumeInformationFile(CurDirHandle, @@ -1157,7 +1160,7 @@ /* Save new data */ CurDir->Handle = CurDirHandle; RtlpCurDirRef->Handle = CurDirHandle; - CurDirHandle = 0; + CurDirHandle = NULL; /* Copy full path */ RtlCopyMemory(CurDir->DosPath.Buffer, FullPath.Buffer, FullPath.Length + sizeof(WCHAR));

1 0

[tfaber] 55804: [SMSS2] - Fix an uninitialized variable usage, CID 15345 - Fix an incorrect sizeof usage, CID 15317
by tfaber＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: tfaber Date: Wed Feb 22 11:31:04 2012 New Revision: 55804 URL: http://svn.reactos.org/svn/reactos?rev=55804&view=rev Log: [SMSS2] - Fix an uninitialized variable usage, CID 15345 - Fix an incorrect sizeof usage, CID 15317 Modified: trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Wed Feb 22 11:31:04 2012 @@ -1977,7 +1977,7 @@ NTAPI SmpProcessFileRenames(VOID) { - BOOLEAN OldState, HavePrivilege; + BOOLEAN OldState, HavePrivilege = FALSE; NTSTATUS Status; HANDLE FileHandle, OtherFileHandle; FILE_INFORMATION_CLASS InformationClass; Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Wed Feb 22 11:31:04 2012 @@ -317,7 +317,7 @@ /* This is the POSIX or OS/2 subsystem process, copy its information */ RtlCopyMemory(&CreateSession->ProcessInfo, &ProcessInformation, - sizeof(&CreateSession->ProcessInfo)); + sizeof(CreateSession->ProcessInfo)); /* Not sure these field mean what I think they do -- but clear them */ *(PULONGLONG)&CreateSession->ClientId = 0;

1 0

[tfaber] 55803: [SMSS2] - When deleting an old page file, take the newly freed space into account - Keep at least 64 MB of disk free instead of 32 so that 2nd stage can succeed with a small disk - ...
by tfaber＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: tfaber Date: Wed Feb 22 09:07:03 2012 New Revision: 55803 URL: http://svn.reactos.org/svn/reactos?rev=55803&view=rev Log: [SMSS2] - When deleting an old page file, take the newly freed space into account - Keep at least 64 MB of disk free instead of 32 so that 2nd stage can succeed with a small disk - Miscellaneous fixes and simplifications in the page file code Modified: trunk/reactos/base/system/smss2/pagefile.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Wed Feb 22 09:07:03 2012 @@ -15,10 +15,15 @@ /* GLOBALS ********************************************************************/ // -// Taken from ASSERTs +// Constants // #define STANDARD_PAGING_FILE_NAME L"\\??\\?:\\pagefile.sys" #define STANDARD_DRIVE_LETTER_OFFSET 4 +#define MEGABYTE 0x100000UL +#define MAXIMUM_PAGEFILE_SIZE (4095 * MEGABYTE) +/* This should be 32 MB, but we need more than that for 2nd stage setup */ +#define MINIMUM_TO_KEEP_FREE (64 * MEGABYTE) +#define FUZZ_FACTOR (16 * MEGABYTE) // // Structure and flags describing each pagefile @@ -83,9 +88,8 @@ PSMP_PAGEFILE_DESCRIPTOR Descriptor, ListDescriptor; ULONG i; WCHAR c; - PWCHAR p, ArgBuffer; PLIST_ENTRY NextEntry; - UNICODE_STRING PageFileName, Arguments; + UNICODE_STRING PageFileName, Arguments, SecondArgument; /* Make sure we don't have too many */ if (SmpNumberOfPagingFiles >= 16) @@ -131,7 +135,7 @@ } /* Was a pagefile not specified, or was it specified with no size? */ - if ((Arguments.Buffer) || (ZeroSize)) + if (!(Arguments.Buffer) || (ZeroSize)) { /* In this case, the system will manage its size */ SystemManaged = TRUE; @@ -149,17 +153,18 @@ } /* Now advance to the next argument */ - ArgBuffer = Arguments.Buffer; - p = ArgBuffer; - while (*p++) - { - /* Which should be a space... */ - if (*p == L' ') + for (i = 0; i < Arguments.Length / sizeof(WCHAR); i++) + { + /* Found a space -- second argument must start here */ + if (Arguments.Buffer[i] == L' ') { - /* And use the rest of the arguments as a maximum size */ - Arguments.Length -= ((PCHAR)p - (PCHAR)ArgBuffer); - Arguments.Buffer = ArgBuffer; - Status = RtlUnicodeStringToInteger(&Arguments, 0, &MaxSize); + /* Use the rest of the arguments as a maximum size */ + SecondArgument.Buffer = &Arguments.Buffer[i]; + SecondArgument.Length = Arguments.Length - + i * sizeof(WCHAR); + SecondArgument.MaximumLength = Arguments.MaximumLength - + i * sizeof(WCHAR); + Status = RtlUnicodeStringToInteger(&SecondArgument, 0, &MaxSize); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -168,8 +173,6 @@ return Status; } - /* We have both min and max, restore argument buffer */ - Arguments.Buffer = ArgBuffer; // Actual Windows Bug in faillure case above. break; } } @@ -192,8 +195,8 @@ /* Capture all our data into the descriptor */ Descriptor->Token = *PageFileToken; Descriptor->Name = PageFileName; - Descriptor->MinSize.QuadPart = MinSize * 0x100000; - Descriptor->MaxSize.QuadPart = MaxSize * 0x100000; + Descriptor->MinSize.QuadPart = MinSize * MEGABYTE; + Descriptor->MaxSize.QuadPart = MaxSize * MEGABYTE; if (SystemManaged) Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED; Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = RtlUpcaseUnicodeChar(Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET]); @@ -271,8 +274,7 @@ } NtClose(FileHandle); - Size->LowPart = StandardInfo.AllocationSize.LowPart; - Size->HighPart = StandardInfo.AllocationSize.HighPart; + Size->QuadPart = StandardInfo.AllocationSize.QuadPart; return STATUS_SUCCESS; } @@ -346,9 +348,7 @@ /* Build the standard path */ wcscpy(PathString, L"\\??\\A:\\"); - VolumeName.Buffer = PathString; - VolumeName.Length = wcslen(PathString) * sizeof(WCHAR); - VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL); + RtlInitUnicodeString(&VolumeName, PathString); VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); @@ -378,13 +378,12 @@ FileFsSizeInformation); if (!NT_SUCCESS(Status)) { - /* We failed -- keep going */ + /* We failed */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" " with status %X \n", &VolumeName, VolumeHandle, Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Volume); NtClose(VolumeHandle); return Status; } @@ -394,10 +393,9 @@ FreeSpace.QuadPart = SizeInfo.AvailableAllocationUnits.QuadPart * SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; - Volume->FreeSpace = FinalFreeSpace; /* Check if there's less than 32MB free so we don't starve the disk */ - if (FinalFreeSpace.QuadPart <= 0x2000000) + if (FinalFreeSpace.QuadPart <= MINIMUM_TO_KEEP_FREE) { /* In this case, act as if there's no free space */ Volume->FreeSpace.QuadPart = 0; @@ -405,7 +403,8 @@ else { /* Trim off 32MB to give the disk a bit of breathing room */ - Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - 0x2000000; + Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - + MINIMUM_TO_KEEP_FREE; } return STATUS_SUCCESS; @@ -540,7 +539,7 @@ /* Check how big we can make the pagefile */ Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize); - if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE; + if (NT_SUCCESS(Status) && PageFileSize.QuadPart > 0) ShouldDelete = TRUE; DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", PageFileSize, &Descriptor->Name); @@ -588,7 +587,13 @@ if (Descriptor->ActualMinSize.QuadPart < MinimumSize->QuadPart) { /* Delete the current page file and fail */ - if (ShouldDelete) SmpDeletePagingFile(&Descriptor->Name); + if (ShouldDelete) + { + SmpDeletePagingFile(&Descriptor->Name); + + /* FIXFIX: Windows Vista does this, and it seems like we should too, so try to see if this fixes KVM */ + Volume->FreeSpace.QuadPart = PageFileSize.QuadPart; + } DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X \n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, @@ -644,8 +649,8 @@ { /* The default descriptor uses 128MB as a pagefile size */ Descriptor->Flags |= SMP_PAGEFILE_DEFAULT; - Descriptor->MinSize.QuadPart = 0x8000000; - Descriptor->MaxSize.QuadPart = 0x8000000; + Descriptor->MinSize.QuadPart = 128 * MEGABYTE; + Descriptor->MaxSize.QuadPart = 128 * MEGABYTE; } VOID @@ -674,7 +679,7 @@ MaximumSize = 3 * Ram; /* If we have more than 1GB, use that as minimum, otherwise, use 1.5X RAM */ - MinimumSize = (Ram >= 0x40000000) ? Ram : MaximumSize / 2; + MinimumSize = (Ram >= 1024 * MEGABYTE) ? Ram : MaximumSize / 2; /* Write the new sizes in the descriptor and mark it as system managed */ Descriptor->MinSize.QuadPart = MinimumSize; @@ -708,19 +713,19 @@ else { /* Check if the minimum is more then 4095 MB */ - if (MinSize > 0xFFF00000) + if (MinSize > MAXIMUM_PAGEFILE_SIZE) { /* Trim it, this isn't allowed */ WasTooBig = TRUE; - MinSize = 0xFFF00000; + MinSize = MAXIMUM_PAGEFILE_SIZE; } /* Check if the maximum is more then 4095 MB */ - if (MaxSize > 0xFFF00000) + if (MaxSize > MAXIMUM_PAGEFILE_SIZE) { /* Trim it, this isn't allowed */ WasTooBig = TRUE; - MaxSize = 0xFFF00000; + MaxSize = MAXIMUM_PAGEFILE_SIZE; } } @@ -752,14 +757,14 @@ ASSERT(Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED); // Descriptor->SystemManaged == 1 in ASSERT. /* Keep decreasing the pagefile by this amount if we run out of space */ - FuzzFactor.QuadPart = 0x1000000; + FuzzFactor.QuadPart = FUZZ_FACTOR; /* Create the descriptor for it (mainly the right sizes) and validate */ SmpMakeSystemManagedPagingFileDescriptor(Descriptor); SmpValidatePagingFileSizes(Descriptor); /* Use either the minimum size in the descriptor, or 16MB in minimal mode */ - Size.QuadPart = DecreaseSize ? 0x1000000 : Descriptor->MinSize.QuadPart; + Size.QuadPart = DecreaseSize ? 16 * MEGABYTE : Descriptor->MinSize.QuadPart; /* Check if this should be a fixed pagefile or an any pagefile*/ if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == '?') @@ -777,7 +782,6 @@ SmpCreateEmergencyPagingFile(VOID) { PSMP_PAGEFILE_DESCRIPTOR Descriptor; - ULONG Length; WCHAR Buffer[32]; /* Allocate a descriptor */ @@ -787,18 +791,14 @@ if (!Descriptor) return STATUS_NO_MEMORY; /* Initialize it */ - RtlInitUnicodeString(&Descriptor->Name, NULL); RtlInitUnicodeString(&Descriptor->Token, NULL); /* Copy the default pagefile name */ + ASSERT(sizeof(Buffer) >= sizeof(STANDARD_PAGING_FILE_NAME)); wcscpy(Buffer, STANDARD_PAGING_FILE_NAME); - Length = wcslen(Buffer) * sizeof(WCHAR); - ASSERT(sizeof(Buffer) > Length); /* Fill the rest of the descriptor out */ - Descriptor->Name.Buffer = Buffer; - Descriptor->Name.Length = Length; - Descriptor->Name.MaximumLength = Length + sizeof(UNICODE_NULL); + RtlInitUnicodeString(&Descriptor->Name, Buffer); Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = '?'; Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED | SMP_PAGEFILE_EMERGENCY | @@ -818,7 +818,6 @@ { NTSTATUS Status; UNICODE_STRING VolumePath; - ULONG Length; BOOLEAN BootVolumeFound = FALSE; WCHAR StartChar, Drive, DriveDiff; HANDLE VolumeHandle; @@ -849,14 +848,11 @@ /* Build the volume string, starting with A: (we'll edit this in place) */ wcscpy(Buffer, L"\\??\\A:\\"); - Length = wcslen(Buffer); - VolumePath.Buffer = Buffer; - VolumePath.Length = Length * sizeof(WCHAR); - VolumePath.MaximumLength = Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); + RtlInitUnicodeString(&VolumePath, Buffer); /* Start with the C drive except on weird Japanese NECs... */ StartChar = SharedUserData->AlternativeArchitecture ? L'A' : L'C'; - for (Drive = StartChar, DriveDiff = StartChar - 'A'; Drive <= L'Z'; Drive++, DriveDiff++) + for (Drive = StartChar, DriveDiff = StartChar - L'A'; Drive <= L'Z'; Drive++, DriveDiff++) { /* Skip the disk if it's not in the drive map */ if (!((1 << DriveDiff) & ProcessInformation.Query.DriveMap)) continue; @@ -967,10 +963,9 @@ FreeSpace.QuadPart = SizeInfo.AvailableAllocationUnits.QuadPart * SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; - Volume->FreeSpace = FinalFreeSpace; /* Check if there's less than 32MB free so we don't starve the disk */ - if (FinalFreeSpace.QuadPart <= 0x2000000) + if (FinalFreeSpace.QuadPart <= MINIMUM_TO_KEEP_FREE) { /* In this case, act as if there's no free space */ Volume->FreeSpace.QuadPart = 0; @@ -978,7 +973,8 @@ else { /* Trim off 32MB to give the disk a bit of breathing room */ - Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - 0x2000000; + Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - + MINIMUM_TO_KEEP_FREE; } /* All done, add this volume to our descriptor list */ @@ -1026,7 +1022,7 @@ } /* If we fail creating pagefiles, try to reduce by this much each time */ - FuzzFactor.QuadPart = 0x1000000; + FuzzFactor.QuadPart = FUZZ_FACTOR; /* Loop the descriptor list */ NextEntry = SmpPagingFileDescriptorList.Flink; @@ -1068,7 +1064,7 @@ /* We failed to create it. Try again with a smaller size */ DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", &Descriptor->Name); - Size.QuadPart = 0x1000000; + Size.QuadPart = 16 * MEGABYTE; Status = SmpCreatePagingFileOnAnyDrive(Descriptor, &FuzzFactor, &Size); @@ -1077,7 +1073,7 @@ else { /* It's a fixed pagefile: override the minimum and use ours */ - Size.QuadPart = 0x1000000; + Size.QuadPart = 16 * MEGABYTE; Status = SmpCreatePagingFileOnFixedDrive(Descriptor, &FuzzFactor, &Size);

1 0

[akhaldi] 55802: * Sync with trunk r55800.
by akhaldi＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: akhaldi Date: Tue Feb 21 23:31:14 2012 New Revision: 55802 URL: http://svn.reactos.org/svn/reactos?rev=55802&view=rev Log: * Sync with trunk r55800. Added: branches/arty-newcc/base/applications/cacls/lang/da-DK.rc - copied unchanged from r55787, trunk/reactos/base/applications/cacls/lang/da-DK.rc branches/arty-newcc/dll/3rdparty/libpng/png.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/png.h branches/arty-newcc/dll/3rdparty/libpng/pngconf.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/pngconf.h branches/arty-newcc/dll/3rdparty/libpng/pngdebug.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/pngdebug.h branches/arty-newcc/dll/3rdparty/libpng/pnginfo.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/pnginfo.h branches/arty-newcc/dll/3rdparty/libpng/pngpriv.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/pngpriv.h branches/arty-newcc/dll/3rdparty/libpng/pngstruct.h - copied unchanged from r55787, trunk/reactos/dll/3rdparty/libpng/pngstruct.h branches/arty-newcc/dll/cpl/inetcpl/lang/pt-BR.rc - copied unchanged from r55787, trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc branches/arty-newcc/dll/win32/comdlg32/cdlg_Tw.rc - copied unchanged from r55787, trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc branches/arty-newcc/drivers/usb/usbuhci/ (props changed) - copied from r55787, trunk/reactos/drivers/usb/usbuhci/ Removed: branches/arty-newcc/base/applications/cacls/lang/da-DA.rc branches/arty-newcc/dll/3rdparty/libpng/new_push_process_row.c branches/arty-newcc/dll/cpl/inetcpl/lang/pt-PT.rc branches/arty-newcc/dll/win32/comdlg32/cdlg_Cn.rc branches/arty-newcc/drivers/input/i8042prt/setup.c branches/arty-newcc/drivers/input/kbdclass/setup.c Modified: branches/arty-newcc/ (props changed) branches/arty-newcc/CMakeLists.txt branches/arty-newcc/base/applications/cacls/rsrc.rc branches/arty-newcc/base/setup/usetup/filesup.c branches/arty-newcc/base/setup/usetup/interface/devinst.c branches/arty-newcc/base/shell/explorer/notifyhook/CMakeLists.txt branches/arty-newcc/base/system/autochk/autochk.c branches/arty-newcc/base/system/smss2/pagefile.c branches/arty-newcc/base/system/smss2/smloop.c branches/arty-newcc/base/system/smss2/smss.c branches/arty-newcc/base/system/smss2/smsubsys.c branches/arty-newcc/boot/bootdata/bootcdregtest/regtest.cmd branches/arty-newcc/boot/bootdata/hivesys_i386.inf branches/arty-newcc/boot/bootdata/txtsetup.sif branches/arty-newcc/cmake/CMakeMacros.cmake branches/arty-newcc/cmake/baseaddress.cmake branches/arty-newcc/cmake/gcc.cmake branches/arty-newcc/cmake/msvc.cmake branches/arty-newcc/dll/3rdparty/libpng/CMakeLists.txt branches/arty-newcc/dll/3rdparty/libpng/libpng.rbuild branches/arty-newcc/dll/3rdparty/libpng/png.c branches/arty-newcc/dll/3rdparty/libpng/pngerror.c branches/arty-newcc/dll/3rdparty/libpng/pngget.c branches/arty-newcc/dll/3rdparty/libpng/pngmem.c branches/arty-newcc/dll/3rdparty/libpng/pngpread.c branches/arty-newcc/dll/3rdparty/libpng/pngread.c branches/arty-newcc/dll/3rdparty/libpng/pngrtran.c branches/arty-newcc/dll/3rdparty/libpng/pngrutil.c branches/arty-newcc/dll/3rdparty/libpng/pngset.c branches/arty-newcc/dll/3rdparty/libpng/pngtest.c branches/arty-newcc/dll/3rdparty/libpng/pngwrite.c branches/arty-newcc/dll/3rdparty/libpng/pngwtran.c branches/arty-newcc/dll/3rdparty/libpng/pngwutil.c branches/arty-newcc/dll/3rdparty/libxslt/CMakeLists.txt branches/arty-newcc/dll/cpl/inetcpl/inetcpl.rc branches/arty-newcc/dll/directx/dinput/CMakeLists.txt branches/arty-newcc/dll/directx/dinput8/CMakeLists.txt branches/arty-newcc/dll/directx/dplay/CMakeLists.txt branches/arty-newcc/dll/directx/dplayx/CMakeLists.txt branches/arty-newcc/dll/directx/dsound/CMakeLists.txt branches/arty-newcc/dll/directx/ksuser/CMakeLists.txt branches/arty-newcc/dll/directx/wine/d3d9/CMakeLists.txt branches/arty-newcc/dll/directx/wine/d3dx9_24/CMakeLists.txt branches/arty-newcc/dll/directx/wine/d3dx9_25/CMakeLists.txt branches/arty-newcc/dll/directx/wine/d3dx9_36/CMakeLists.txt branches/arty-newcc/dll/directx/wine/ddraw/CMakeLists.txt branches/arty-newcc/dll/directx/wine/wined3d/CMakeLists.txt branches/arty-newcc/dll/ntdll/CMakeLists.txt branches/arty-newcc/dll/ntdll/def/ntdll.pspec branches/arty-newcc/dll/ntdll/def/ntdll.spec branches/arty-newcc/dll/win32/acledit/CMakeLists.txt branches/arty-newcc/dll/win32/aclui/CMakeLists.txt branches/arty-newcc/dll/win32/advapi32/CMakeLists.txt branches/arty-newcc/dll/win32/atl/CMakeLists.txt branches/arty-newcc/dll/win32/avicap32/CMakeLists.txt branches/arty-newcc/dll/win32/avifil32/CMakeLists.txt branches/arty-newcc/dll/win32/batt/CMakeLists.txt branches/arty-newcc/dll/win32/beepmidi/CMakeLists.txt branches/arty-newcc/dll/win32/cabinet/CMakeLists.txt branches/arty-newcc/dll/win32/cards/CMakeLists.txt branches/arty-newcc/dll/win32/comctl32/CMakeLists.txt branches/arty-newcc/dll/win32/comdlg32/CMakeLists.txt branches/arty-newcc/dll/win32/comdlg32/rsrc.rc branches/arty-newcc/dll/win32/compstui/CMakeLists.txt branches/arty-newcc/dll/win32/credui/CMakeLists.txt branches/arty-newcc/dll/win32/crypt32/CMakeLists.txt branches/arty-newcc/dll/win32/cryptnet/CMakeLists.txt branches/arty-newcc/dll/win32/cryptui/CMakeLists.txt branches/arty-newcc/dll/win32/dbghelp/CMakeLists.txt branches/arty-newcc/dll/win32/devmgr/CMakeLists.txt branches/arty-newcc/dll/win32/dhcpcsvc/CMakeLists.txt branches/arty-newcc/dll/win32/dnsapi/CMakeLists.txt branches/arty-newcc/dll/win32/fmifs/CMakeLists.txt branches/arty-newcc/dll/win32/gdi32/CMakeLists.txt branches/arty-newcc/dll/win32/gdiplus/CMakeLists.txt branches/arty-newcc/dll/win32/getuname/CMakeLists.txt branches/arty-newcc/dll/win32/glu32/CMakeLists.txt branches/arty-newcc/dll/win32/hlink/CMakeLists.txt branches/arty-newcc/dll/win32/icmp/CMakeLists.txt branches/arty-newcc/dll/win32/imagehlp/CMakeLists.txt branches/arty-newcc/dll/win32/imm32/CMakeLists.txt branches/arty-newcc/dll/win32/inetcomm/CMakeLists.txt branches/arty-newcc/dll/win32/iphlpapi/CMakeLists.txt branches/arty-newcc/dll/win32/kernel32/CMakeLists.txt branches/arty-newcc/dll/win32/kernel32/client/dllmain.c branches/arty-newcc/dll/win32/kernel32/client/file/hardlink.c branches/arty-newcc/dll/win32/kernel32/client/file/iocompl.c branches/arty-newcc/dll/win32/kernel32/client/file/lock.c branches/arty-newcc/dll/win32/kernel32/client/file/mailslot.c branches/arty-newcc/dll/win32/kernel32/client/proc.c branches/arty-newcc/dll/win32/kernel32/client/thread.c branches/arty-newcc/dll/win32/kernel32/include/base_x.h branches/arty-newcc/dll/win32/loadperf/CMakeLists.txt branches/arty-newcc/dll/win32/localui/CMakeLists.txt branches/arty-newcc/dll/win32/lpk/CMakeLists.txt branches/arty-newcc/dll/win32/lsasrv/CMakeLists.txt branches/arty-newcc/dll/win32/lz32/CMakeLists.txt branches/arty-newcc/dll/win32/mlang/CMakeLists.txt branches/arty-newcc/dll/win32/mpr/CMakeLists.txt branches/arty-newcc/dll/win32/msacm32/CMakeLists.txt branches/arty-newcc/dll/win32/msi/CMakeLists.txt branches/arty-newcc/dll/win32/msimg32/CMakeLists.txt branches/arty-newcc/dll/win32/msports/CMakeLists.txt branches/arty-newcc/dll/win32/msvcrt/CMakeLists.txt branches/arty-newcc/dll/win32/msvfw32/CMakeLists.txt branches/arty-newcc/dll/win32/mswsock/CMakeLists.txt branches/arty-newcc/dll/win32/netapi32/CMakeLists.txt branches/arty-newcc/dll/win32/newdev/CMakeLists.txt branches/arty-newcc/dll/win32/ntdsapi/CMakeLists.txt branches/arty-newcc/dll/win32/odbccp32/CMakeLists.txt branches/arty-newcc/dll/win32/ole32/CMakeLists.txt branches/arty-newcc/dll/win32/oleacc/CMakeLists.txt branches/arty-newcc/dll/win32/oleaut32/CMakeLists.txt branches/arty-newcc/dll/win32/oledlg/CMakeLists.txt branches/arty-newcc/dll/win32/opengl32/CMakeLists.txt branches/arty-newcc/dll/win32/pdh/CMakeLists.txt branches/arty-newcc/dll/win32/powrprof/CMakeLists.txt branches/arty-newcc/dll/win32/psapi/CMakeLists.txt branches/arty-newcc/dll/win32/rasapi32/CMakeLists.txt branches/arty-newcc/dll/win32/riched20/CMakeLists.txt branches/arty-newcc/dll/win32/rpcrt4/CMakeLists.txt branches/arty-newcc/dll/win32/rsaenh/CMakeLists.txt branches/arty-newcc/dll/win32/samlib/CMakeLists.txt branches/arty-newcc/dll/win32/secur32/CMakeLists.txt branches/arty-newcc/dll/win32/sensapi/CMakeLists.txt branches/arty-newcc/dll/win32/setupapi/CMakeLists.txt branches/arty-newcc/dll/win32/sfc_os/CMakeLists.txt branches/arty-newcc/dll/win32/shdocvw/CMakeLists.txt branches/arty-newcc/dll/win32/shell32/CMakeLists.txt branches/arty-newcc/dll/win32/shlwapi/CMakeLists.txt branches/arty-newcc/dll/win32/smdll/CMakeLists.txt branches/arty-newcc/dll/win32/snmpapi/CMakeLists.txt branches/arty-newcc/dll/win32/spoolss/CMakeLists.txt branches/arty-newcc/dll/win32/ufatx/CMakeLists.txt branches/arty-newcc/dll/win32/urlmon/CMakeLists.txt branches/arty-newcc/dll/win32/user32/CMakeLists.txt branches/arty-newcc/dll/win32/userenv/CMakeLists.txt branches/arty-newcc/dll/win32/usp10/CMakeLists.txt branches/arty-newcc/dll/win32/uxtheme/CMakeLists.txt branches/arty-newcc/dll/win32/version/CMakeLists.txt branches/arty-newcc/dll/win32/windowscodecs/CMakeLists.txt branches/arty-newcc/dll/win32/winhttp/CMakeLists.txt branches/arty-newcc/dll/win32/wininet/CMakeLists.txt branches/arty-newcc/dll/win32/winmm/CMakeLists.txt branches/arty-newcc/dll/win32/winspool/CMakeLists.txt branches/arty-newcc/dll/win32/wintrust/CMakeLists.txt branches/arty-newcc/dll/win32/wlanapi/CMakeLists.txt branches/arty-newcc/dll/win32/wldap32/CMakeLists.txt branches/arty-newcc/dll/win32/ws2_32/CMakeLists.txt branches/arty-newcc/dll/win32/ws2help/CMakeLists.txt branches/arty-newcc/dll/win32/xinput1_3/CMakeLists.txt branches/arty-newcc/dll/win32/xmllite/CMakeLists.txt branches/arty-newcc/drivers/base/bootvid/CMakeLists.txt branches/arty-newcc/drivers/base/kdcom/CMakeLists.txt branches/arty-newcc/drivers/base/kddll/CMakeLists.txt branches/arty-newcc/drivers/battery/battc/CMakeLists.txt branches/arty-newcc/drivers/directx/dxgthk/CMakeLists.txt branches/arty-newcc/drivers/hid/hidclass/CMakeLists.txt branches/arty-newcc/drivers/hid/hidclass/fdo.c branches/arty-newcc/drivers/hid/hidclass/hidclass.c branches/arty-newcc/drivers/hid/hidclass/precomp.h branches/arty-newcc/drivers/hid/hidparse/ (props changed) branches/arty-newcc/drivers/hid/hidparse/CMakeLists.txt branches/arty-newcc/drivers/hid/hidusb/ (props changed) branches/arty-newcc/drivers/hid/hidusb/hidusb.c branches/arty-newcc/drivers/hid/hidusb/hidusb.h branches/arty-newcc/drivers/input/i8042prt/CMakeLists.txt branches/arty-newcc/drivers/input/i8042prt/i8042prt.c branches/arty-newcc/drivers/input/i8042prt/i8042prt.h branches/arty-newcc/drivers/input/i8042prt/i8042prt.rbuild branches/arty-newcc/drivers/input/i8042prt/pnp.c branches/arty-newcc/drivers/input/kbdclass/CMakeLists.txt branches/arty-newcc/drivers/input/kbdclass/kbdclass.c branches/arty-newcc/drivers/input/kbdclass/kbdclass.h branches/arty-newcc/drivers/input/kbdclass/kbdclass.rbuild branches/arty-newcc/drivers/input/mouclass/mouclass.c branches/arty-newcc/drivers/ksfilter/ks/CMakeLists.txt branches/arty-newcc/drivers/network/ndis/CMakeLists.txt branches/arty-newcc/drivers/storage/class/class2/CMakeLists.txt branches/arty-newcc/drivers/storage/classpnp/CMakeLists.txt branches/arty-newcc/drivers/storage/ide/pciidex/CMakeLists.txt branches/arty-newcc/drivers/storage/scsiport/CMakeLists.txt branches/arty-newcc/drivers/usb/usbccgp/fdo.c branches/arty-newcc/drivers/usb/usbccgp/pdo.c branches/arty-newcc/drivers/usb/usbd/CMakeLists.txt branches/arty-newcc/drivers/usb/usbehci/ (props changed) branches/arty-newcc/drivers/usb/usbehci/hardware.cpp branches/arty-newcc/drivers/usb/usbehci/usb_queue.cpp branches/arty-newcc/drivers/usb/usbehci/usb_request.cpp branches/arty-newcc/drivers/usb/usbhub/ (props changed) branches/arty-newcc/drivers/usb/usbhub/pdo.c branches/arty-newcc/drivers/usb/usbohci/ (props changed) branches/arty-newcc/drivers/usb/usbohci/hardware.cpp branches/arty-newcc/drivers/usb/usbohci/hardware.h branches/arty-newcc/drivers/usb/usbohci/hub_controller.cpp branches/arty-newcc/drivers/usb/usbohci/interfaces.h branches/arty-newcc/drivers/usb/usbohci/usb_device.cpp branches/arty-newcc/drivers/usb/usbohci/usb_queue.cpp branches/arty-newcc/drivers/usb/usbohci/usb_request.cpp branches/arty-newcc/drivers/usb/usbohci/usbohci.h branches/arty-newcc/drivers/usb/usbstor/error.c branches/arty-newcc/drivers/usb/usbstor/pdo.c branches/arty-newcc/drivers/usb/usbstor/scsi.c branches/arty-newcc/drivers/usb/usbstor/usbstor.h branches/arty-newcc/drivers/usb/usbuhci/hardware.cpp branches/arty-newcc/drivers/usb/usbuhci/hcd_controller.cpp branches/arty-newcc/drivers/usb/usbuhci/hub_controller.cpp branches/arty-newcc/drivers/usb/usbuhci/interfaces.h branches/arty-newcc/drivers/usb/usbuhci/memory_manager.cpp branches/arty-newcc/drivers/usb/usbuhci/usb_device.cpp branches/arty-newcc/drivers/usb/usbuhci/usb_queue.cpp branches/arty-newcc/drivers/usb/usbuhci/usb_request.cpp branches/arty-newcc/drivers/usb/usbuhci/usbuhci.h branches/arty-newcc/drivers/video/font/ftfd/CMakeLists.txt branches/arty-newcc/drivers/video/videoprt/CMakeLists.txt branches/arty-newcc/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/arty-newcc/drivers/wmi/CMakeLists.txt branches/arty-newcc/hal/halx86/CMakeLists.txt branches/arty-newcc/hal/halx86/acpi/halacpi.c branches/arty-newcc/include/ndk/extypes.h branches/arty-newcc/include/ndk/mmtypes.h branches/arty-newcc/include/ndk/rtlfuncs.h branches/arty-newcc/include/ndk/rtltypes.h branches/arty-newcc/include/reactos/subsys/csrss/csrss.h branches/arty-newcc/include/reactos/wine/test.h branches/arty-newcc/lib/rtl/error.c branches/arty-newcc/lib/rtl/network.c branches/arty-newcc/lib/rtl/timerqueue.c branches/arty-newcc/lib/rtl/workitem.c branches/arty-newcc/lib/sdk/crt/stdio/file.c branches/arty-newcc/lib/sdk/crt/wine/heap.c branches/arty-newcc/media/inf/NET_NIC.inf branches/arty-newcc/media/inf/acpi.inf branches/arty-newcc/media/inf/audio.inf (contents, props changed) branches/arty-newcc/media/inf/battery.inf branches/arty-newcc/media/inf/bda.inf branches/arty-newcc/media/inf/cdrom.inf branches/arty-newcc/media/inf/cpu.inf branches/arty-newcc/media/inf/disk.inf branches/arty-newcc/media/inf/display.inf branches/arty-newcc/media/inf/fdc.inf branches/arty-newcc/media/inf/hal.inf branches/arty-newcc/media/inf/hdc.inf branches/arty-newcc/media/inf/input.inf (contents, props changed) branches/arty-newcc/media/inf/keyboard.inf branches/arty-newcc/media/inf/ks.inf branches/arty-newcc/media/inf/kscaptur.inf branches/arty-newcc/media/inf/machine.inf branches/arty-newcc/media/inf/msmouse.inf branches/arty-newcc/media/inf/netamd.inf branches/arty-newcc/media/inf/netisa.inf branches/arty-newcc/media/inf/netrtpnt.inf branches/arty-newcc/media/inf/nettcpip.inf branches/arty-newcc/media/inf/ports.inf branches/arty-newcc/media/inf/scsi.inf branches/arty-newcc/media/inf/unknown.inf branches/arty-newcc/media/inf/usb.inf branches/arty-newcc/media/inf/usbport.inf branches/arty-newcc/media/inf/usbstor.inf branches/arty-newcc/media/inf/xboxdisp.inf branches/arty-newcc/ntoskrnl/CMakeLists.txt branches/arty-newcc/ntoskrnl/dbgk/dbgkobj.c branches/arty-newcc/ntoskrnl/ex/sysinfo.c branches/arty-newcc/ntoskrnl/include/internal/dbgk.h branches/arty-newcc/ntoskrnl/include/internal/i386/trap_x.h branches/arty-newcc/ntoskrnl/include/internal/ke.h branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/include/internal/se.h branches/arty-newcc/ntoskrnl/io/iomgr/device.c branches/arty-newcc/ntoskrnl/io/iomgr/driver.c branches/arty-newcc/ntoskrnl/io/iomgr/file.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpinit.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c branches/arty-newcc/ntoskrnl/ke/i386/traphdlr.c branches/arty-newcc/ntoskrnl/ke/i386/v86vdm.c branches/arty-newcc/ntoskrnl/mm/ARM3/pagfault.c branches/arty-newcc/ntoskrnl/mm/ARM3/pfnlist.c branches/arty-newcc/ntoskrnl/mm/ARM3/procsup.c branches/arty-newcc/ntoskrnl/mm/ARM3/virtual.c branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/i386/page.c branches/arty-newcc/ntoskrnl/mm/marea.c branches/arty-newcc/ntoskrnl/mm/section.c branches/arty-newcc/ntoskrnl/ob/obname.c branches/arty-newcc/ntoskrnl/ps/query.c branches/arty-newcc/ntoskrnl/se/priv.c branches/arty-newcc/ntoskrnl/se/semgr.c branches/arty-newcc/subsystems/csr/csrsrv/CMakeLists.txt branches/arty-newcc/subsystems/csr/csrsrv/api.c branches/arty-newcc/subsystems/csr/csrsrv/process.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/CMakeLists.txt branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/process.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/user.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/wapi.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.spec branches/arty-newcc/subsystems/win32/csrss/csrsrv/init.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/procsup.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/server.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/session.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/thredsup.c branches/arty-newcc/subsystems/win32/csrss/csrss.c branches/arty-newcc/subsystems/win32/csrss/include/api.h branches/arty-newcc/subsystems/win32/csrss/win32csr/coninput.c branches/arty-newcc/subsystems/win32/csrss/win32csr/conoutput.c branches/arty-newcc/subsystems/win32/csrss/win32csr/console.c branches/arty-newcc/subsystems/win32/csrss/win32csr/desktopbg.c branches/arty-newcc/subsystems/win32/csrss/win32csr/dllmain.c branches/arty-newcc/subsystems/win32/csrss/win32csr/exitros.c branches/arty-newcc/subsystems/win32/csrss/win32csr/handle.c branches/arty-newcc/subsystems/win32/csrss/win32csr/win32csr.h branches/arty-newcc/subsystems/win32/csrss/win32csr/win32csr.spec branches/arty-newcc/subsystems/win32/win32k/CMakeLists.txt branches/arty-newcc/subsystems/win32/win32k/eng/mouse.c branches/arty-newcc/subsystems/win32/win32k/include/dce.h branches/arty-newcc/subsystems/win32/win32k/include/monitor.h branches/arty-newcc/subsystems/win32/win32k/include/tags.h branches/arty-newcc/subsystems/win32/win32k/include/text.h branches/arty-newcc/subsystems/win32/win32k/main/dllmain.c branches/arty-newcc/subsystems/win32/win32k/ntuser/desktop.c branches/arty-newcc/subsystems/win32/win32k/ntuser/display.c branches/arty-newcc/subsystems/win32/win32k/ntuser/input.c branches/arty-newcc/subsystems/win32/win32k/ntuser/monitor.c branches/arty-newcc/subsystems/win32/win32k/ntuser/sysparams.c branches/arty-newcc/subsystems/win32/win32k/ntuser/timer.c branches/arty-newcc/subsystems/win32/win32k/ntuser/windc.c branches/arty-newcc/subsystems/win32/win32k/ntuser/window.c branches/arty-newcc/subsystems/win32/win32k/ntuser/winpos.c branches/arty-newcc/subsystems/win32/win32k/objects/dclife.c branches/arty-newcc/subsystems/win32/win32k/objects/device.c branches/arty-newcc/subsystems/win32/win32k/objects/freetype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/CMakeLists.txt?rev=5… Removed: branches/arty-newcc/base/applications/cacls/lang/da-DA.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ca… Modified: branches/arty-newcc/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ca… Modified: branches/arty-newcc/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/fi… Modified: branches/arty-newcc/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/in… Modified: branches/arty-newcc/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/shell/explorer/… Modified: branches/arty-newcc/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/autochk/… Modified: branches/arty-newcc/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/pa… Modified: branches/arty-newcc/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/sm… Modified: branches/arty-newcc/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/sm… Modified: branches/arty-newcc/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/sm… Modified: branches/arty-newcc/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/bootcd… Modified: branches/arty-newcc/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/hivesy… Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/txtset… Modified: branches/arty-newcc/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/cmake/CMakeMacros.cm… Modified: branches/arty-newcc/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/cmake/baseaddress.cm… Modified: branches/arty-newcc/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/cmake/gcc.cmake?rev=… Modified: branches/arty-newcc/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/cmake/msvc.cmake?rev… Modified: branches/arty-newcc/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/libpng.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Removed: branches/arty-newcc/dll/3rdparty/libpng/new_push_process_row.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/png.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngerror.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngget.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngtest.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngwtran.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libpng/… Modified: branches/arty-newcc/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/libxslt… Modified: branches/arty-newcc/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/inetcpl/inet… Removed: branches/arty-newcc/dll/cpl/inetcpl/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/inetcpl/lang… Modified: branches/arty-newcc/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/dinput/C… Modified: branches/arty-newcc/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/dinput8/… Modified: branches/arty-newcc/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/dplay/CM… Modified: branches/arty-newcc/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/dplayx/C… Modified: branches/arty-newcc/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/dsound/C… Modified: branches/arty-newcc/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/ksuser/C… Modified: branches/arty-newcc/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/d3d… Modified: branches/arty-newcc/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/d3d… Modified: branches/arty-newcc/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/d3d… Modified: branches/arty-newcc/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/d3d… Modified: branches/arty-newcc/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/ddr… Modified: branches/arty-newcc/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/wine/win… Modified: branches/arty-newcc/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/CMakeLists… Modified: branches/arty-newcc/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/def/ntdll.… Modified: branches/arty-newcc/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/def/ntdll.… Modified: branches/arty-newcc/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/acledit/CM… Modified: branches/arty-newcc/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/aclui/CMak… Modified: branches/arty-newcc/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/advapi32/C… Modified: branches/arty-newcc/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/atl/CMakeL… Modified: branches/arty-newcc/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/avicap32/C… Modified: branches/arty-newcc/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/avifil32/C… Modified: branches/arty-newcc/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/batt/CMake… Modified: branches/arty-newcc/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/beepmidi/C… Modified: branches/arty-newcc/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/cabinet/CM… Modified: branches/arty-newcc/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/cards/CMak… Modified: branches/arty-newcc/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/comctl32/C… Modified: branches/arty-newcc/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/comdlg32/C… Removed: branches/arty-newcc/dll/win32/comdlg32/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/comdlg32/c… Modified: branches/arty-newcc/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/comdlg32/r… Modified: branches/arty-newcc/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/compstui/C… Modified: branches/arty-newcc/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/credui/CMa… Modified: branches/arty-newcc/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/crypt32/CM… Modified: branches/arty-newcc/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/cryptnet/C… Modified: branches/arty-newcc/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/cryptui/CM… Modified: branches/arty-newcc/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/dbghelp/CM… Modified: branches/arty-newcc/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/CMa… Modified: branches/arty-newcc/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/dhcpcsvc/C… Modified: branches/arty-newcc/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/dnsapi/CMa… Modified: branches/arty-newcc/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/fmifs/CMak… Modified: branches/arty-newcc/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/gdi32/CMak… Modified: branches/arty-newcc/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/gdiplus/CM… Modified: branches/arty-newcc/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/getuname/C… Modified: branches/arty-newcc/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/glu32/CMak… Modified: branches/arty-newcc/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/hlink/CMak… Modified: branches/arty-newcc/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/icmp/CMake… Modified: branches/arty-newcc/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/imagehlp/C… Modified: branches/arty-newcc/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/imm32/CMak… Modified: branches/arty-newcc/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/inetcomm/C… Modified: branches/arty-newcc/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/iphlpapi/C… Modified: branches/arty-newcc/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/C… Modified: branches/arty-newcc/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/file/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/i… Modified: branches/arty-newcc/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/loadperf/C… Modified: branches/arty-newcc/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/localui/CM… Modified: branches/arty-newcc/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/lpk/CMakeL… Modified: branches/arty-newcc/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/lsasrv/CMa… Modified: branches/arty-newcc/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/lz32/CMake… Modified: branches/arty-newcc/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/mlang/CMak… Modified: branches/arty-newcc/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/mpr/CMakeL… Modified: branches/arty-newcc/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msacm32/CM… Modified: branches/arty-newcc/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msi/CMakeL… Modified: branches/arty-newcc/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msimg32/CM… Modified: branches/arty-newcc/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msports/CM… Modified: branches/arty-newcc/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msvcrt/CMa… Modified: branches/arty-newcc/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msvfw32/CM… Modified: branches/arty-newcc/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/mswsock/CM… Modified: branches/arty-newcc/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/netapi32/C… Modified: branches/arty-newcc/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/newdev/CMa… Modified: branches/arty-newcc/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/ntdsapi/CM… Modified: branches/arty-newcc/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/odbccp32/C… Modified: branches/arty-newcc/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/ole32/CMak… Modified: branches/arty-newcc/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/oleacc/CMa… Modified: branches/arty-newcc/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/oleaut32/C… Modified: branches/arty-newcc/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/oledlg/CMa… Modified: branches/arty-newcc/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/opengl32/C… Modified: branches/arty-newcc/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/pdh/CMakeL… Modified: branches/arty-newcc/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/powrprof/C… Modified: branches/arty-newcc/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/psapi/CMak… Modified: branches/arty-newcc/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/rasapi32/C… Modified: branches/arty-newcc/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/riched20/C… Modified: branches/arty-newcc/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/rpcrt4/CMa… Modified: branches/arty-newcc/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/rsaenh/CMa… Modified: branches/arty-newcc/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/samlib/CMa… Modified: branches/arty-newcc/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/secur32/CM… Modified: branches/arty-newcc/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/sensapi/CM… Modified: branches/arty-newcc/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/setupapi/C… Modified: branches/arty-newcc/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/sfc_os/CMa… Modified: branches/arty-newcc/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shdocvw/CM… Modified: branches/arty-newcc/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/CM… Modified: branches/arty-newcc/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shlwapi/CM… Modified: branches/arty-newcc/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/smdll/CMak… Modified: branches/arty-newcc/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/snmpapi/CM… Modified: branches/arty-newcc/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/spoolss/CM… Modified: branches/arty-newcc/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/ufatx/CMak… Modified: branches/arty-newcc/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/urlmon/CMa… Modified: branches/arty-newcc/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/user32/CMa… Modified: branches/arty-newcc/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/CM… Modified: branches/arty-newcc/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/usp10/CMak… Modified: branches/arty-newcc/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/uxtheme/CM… Modified: branches/arty-newcc/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/version/CM… Modified: branches/arty-newcc/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/windowscod… Modified: branches/arty-newcc/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/winhttp/CM… Modified: branches/arty-newcc/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/wininet/CM… Modified: branches/arty-newcc/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/winmm/CMak… Modified: branches/arty-newcc/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/winspool/C… Modified: branches/arty-newcc/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/wintrust/C… Modified: branches/arty-newcc/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/wlanapi/CM… Modified: branches/arty-newcc/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/wldap32/CM… Modified: branches/arty-newcc/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/ws2_32/CMa… Modified: branches/arty-newcc/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/ws2help/CM… Modified: branches/arty-newcc/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/xinput1_3/… Modified: branches/arty-newcc/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/xmllite/CM… Modified: branches/arty-newcc/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/base/bootvid… Modified: branches/arty-newcc/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/base/kdcom/C… Modified: branches/arty-newcc/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/base/kddll/C… Modified: branches/arty-newcc/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/battery/batt… Modified: branches/arty-newcc/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/directx/dxgt… Modified: branches/arty-newcc/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidclass… Modified: branches/arty-newcc/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidclass… Modified: branches/arty-newcc/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidclass… Modified: branches/arty-newcc/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidclass… Modified: branches/arty-newcc/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidparse… Modified: branches/arty-newcc/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidusb/h… Modified: branches/arty-newcc/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/hid/hidusb/h… Modified: branches/arty-newcc/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Modified: branches/arty-newcc/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Modified: branches/arty-newcc/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Modified: branches/arty-newcc/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Modified: branches/arty-newcc/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Removed: branches/arty-newcc/drivers/input/i8042prt/setup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/i8042p… Modified: branches/arty-newcc/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/kbdcla… Modified: branches/arty-newcc/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/kbdcla… Modified: branches/arty-newcc/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/kbdcla… Modified: branches/arty-newcc/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/kbdcla… Removed: branches/arty-newcc/drivers/input/kbdclass/setup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/kbdcla… Modified: branches/arty-newcc/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/input/moucla… Modified: branches/arty-newcc/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/ksfilter/ks/… Modified: branches/arty-newcc/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/ndis… Modified: branches/arty-newcc/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/clas… Modified: branches/arty-newcc/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/clas… Modified: branches/arty-newcc/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/ide/… Modified: branches/arty-newcc/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/scsi… Modified: branches/arty-newcc/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbccgp/… Modified: branches/arty-newcc/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbccgp/… Modified: branches/arty-newcc/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbd/CMa… Modified: branches/arty-newcc/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbehci/… Modified: branches/arty-newcc/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbehci/… Modified: branches/arty-newcc/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbehci/… Modified: branches/arty-newcc/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbhub/p… Modified: branches/arty-newcc/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbstor/… Modified: branches/arty-newcc/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbstor/… Modified: branches/arty-newcc/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbstor/… Modified: branches/arty-newcc/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbstor/… Modified: branches/arty-newcc/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/video/font/f… Modified: branches/arty-newcc/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/video/videop… Modified: branches/arty-newcc/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/wdm/audio/dr… Modified: branches/arty-newcc/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/wmi/CMakeLis… Modified: branches/arty-newcc/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/CMakeList… Modified: branches/arty-newcc/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/acpi/hala… Modified: branches/arty-newcc/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/extypes.… Modified: branches/arty-newcc/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/mmtypes.… Modified: branches/arty-newcc/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/rtlfuncs… Modified: branches/arty-newcc/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/rtltypes… Modified: branches/arty-newcc/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/subs… Modified: branches/arty-newcc/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/wine… Modified: branches/arty-newcc/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/error.c?rev=… Modified: branches/arty-newcc/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/network.c?re… Modified: branches/arty-newcc/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/timerqueue.c… Modified: branches/arty-newcc/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/workitem.c?r… Modified: branches/arty-newcc/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/stdio/fi… Modified: branches/arty-newcc/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/wine/hea… Modified: branches/arty-newcc/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/NET_NIC.in… Modified: branches/arty-newcc/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/acpi.inf?r… Modified: branches/arty-newcc/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/audio.inf?… Modified: branches/arty-newcc/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/battery.in… Modified: branches/arty-newcc/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/bda.inf?re… Modified: branches/arty-newcc/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/cdrom.inf?… Modified: branches/arty-newcc/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/cpu.inf?re… Modified: branches/arty-newcc/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/disk.inf?r… Modified: branches/arty-newcc/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/display.in… Modified: branches/arty-newcc/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/fdc.inf?re… Modified: branches/arty-newcc/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/hal.inf?re… Modified: branches/arty-newcc/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/hdc.inf?re… Modified: branches/arty-newcc/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/input.inf?… Modified: branches/arty-newcc/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/keyboard.i… Modified: branches/arty-newcc/media/inf/ks.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/ks.inf?rev… Modified: branches/arty-newcc/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/kscaptur.i… Modified: branches/arty-newcc/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/machine.in… Modified: branches/arty-newcc/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/msmouse.in… Modified: branches/arty-newcc/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/netamd.inf… Modified: branches/arty-newcc/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/netisa.inf… Modified: branches/arty-newcc/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/netrtpnt.i… Modified: branches/arty-newcc/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/nettcpip.i… Modified: branches/arty-newcc/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/ports.inf?… Modified: branches/arty-newcc/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/scsi.inf?r… Modified: branches/arty-newcc/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/unknown.in… Modified: branches/arty-newcc/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/usb.inf?re… Modified: branches/arty-newcc/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/usbport.in… Modified: branches/arty-newcc/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/usbstor.in… Modified: branches/arty-newcc/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/xboxdisp.i… Modified: branches/arty-newcc/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/CMakeLists.… Modified: branches/arty-newcc/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/dbgk/dbgkob… Modified: branches/arty-newcc/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/sysinfo.… Modified: branches/arty-newcc/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/de… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/dr… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/fi… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/i386/tra… Modified: branches/arty-newcc/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/i386/v86… Modified: branches/arty-newcc/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/ARM3/pag… Modified: branches/arty-newcc/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/ARM3/pfn… Modified: branches/arty-newcc/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/ARM3/pro… Modified: branches/arty-newcc/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/ARM3/vir… Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… Modified: branches/arty-newcc/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/i386/pag… Modified: branches/arty-newcc/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/marea.c?… Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… Modified: branches/arty-newcc/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obname.c… Modified: branches/arty-newcc/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/query.c?… Modified: branches/arty-newcc/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/se/priv.c?r… Modified: branches/arty-newcc/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/se/semgr.c?… Modified: branches/arty-newcc/subsystems/csr/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/csr/csrsr… Modified: branches/arty-newcc/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/csr/csrsr… Modified: branches/arty-newcc/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/csr/csrsr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… Modified: branches/arty-newcc/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win… Modified: branches/arty-newcc/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/win…

1 0

[ion] 55801: [KERNEL32]: Rewrite the File Change Notification APIs since they were pretty much wrong (not surprising as we don't implement the functionality in the kernel/filesystems). [KERNEL32]: ...
by ion＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: ion Date: Tue Feb 21 23:27:45 2012 New Revision: 55801 URL: http://svn.reactos.org/svn/reactos?rev=55801&view=rev Log: [KERNEL32]: Rewrite the File Change Notification APIs since they were pretty much wrong (not surprising as we don't implement the functionality in the kernel/filesystems). [KERNEL32]: Enable support for asynchronous I/O callbacks with SxS/Fusion activation context support. Right now only added to the file Change notification APIs, but ReadFileEx and WriteFileEx should use them too. Modified: trunk/reactos/dll/win32/kernel32/client/file/cnotify.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/wine/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/cnotify.c [iso-8859-1] Tue Feb 21 23:27:45 2012 @@ -9,30 +9,106 @@ * Created 01/11/98 */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -BOOL WINAPI -FindCloseChangeNotification (HANDLE hChangeHandle) -{ - NTSTATUS Status = NtClose(hChangeHandle); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - +/* GLOBALS ********************************************************************/ + +CHAR staticchangebuff[sizeof(FILE_NOTIFY_INFORMATION) + 16]; +IO_STATUS_BLOCK staticIoStatusBlock; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +WINAPI +BasepIoCompletion(IN PVOID ApcContext, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN DWORD Reserved) +{ + PBASEP_ACTCTX_BLOCK ActivationBlock = ApcContext; + LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; + DWORD BytesTransfered, Result; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActCtx; + PVOID ActivationContext = NULL; + + /* Setup the activation frame */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + + /* Check if the routine returned an error */ + if (NT_ERROR(IoStatusBlock->Status)) + { + /* Convert the error code and don't copy anything */ + Result = RtlNtStatusToDosError(IoStatusBlock->Status); + BytesTransfered = 0; + } + else + { + /* Set success code and copy the bytes transferred */ + Result = ERROR_SUCCESS; + BytesTransfered = IoStatusBlock->Information; + } + + /* Read context and routine out from the activation block */ + ActivationContext = ActivationBlock->ActivationContext; + CompletionRoutine = ActivationBlock->CompletionRoutine; + + /* Check if the block should be freed */ + if (!(ActivationBlock->Flags & 1)) + { + /* Free it */ + BasepFreeActivationContextActivationBlock(ActivationBlock); + } + + /* Activate the context, call the routine, and then deactivate the context */ + RtlActivateActivationContextUnsafeFast(&ActCtx, ActivationContext); + CompletionRoutine(Result, BytesTransfered, (LPOVERLAPPED)IoStatusBlock); + RtlDeactivateActivationContextUnsafeFast(&ActCtx); +} + +VOID +WINAPI +BasepIoCompletionSimple(IN PVOID ApcContext, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN DWORD Reserved) +{ + LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine = ApcContext; + DWORD Result, BytesTransfered; + + /* Check if the routine returned an error */ + if (NT_ERROR(IoStatusBlock->Status)) + { + /* Convert the error code and don't copy anything */ + Result = RtlNtStatusToDosError(IoStatusBlock->Status); + BytesTransfered = 0; + } + else + { + /* Set success code and copy the bytes transferred */ + Result = ERROR_SUCCESS; + BytesTransfered = IoStatusBlock->Information; + } + + /* Call the callback routine */ + CompletionRoutine(Result, BytesTransfered, (LPOVERLAPPED)IoStatusBlock); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +FindCloseChangeNotification(IN HANDLE hChangeHandle) +{ + /* Just close the handle */ + return CloseHandle(hChangeHandle); +} /* * @implemented @@ -50,206 +126,255 @@ dwNotifyFilter); } - /* * @implemented */ HANDLE WINAPI -FindFirstChangeNotificationW ( - LPCWSTR lpPathName, - BOOL bWatchSubtree, - DWORD dwNotifyFilter - ) -{ - NTSTATUS Status; - UNICODE_STRING NtPathU; - IO_STATUS_BLOCK IoStatus; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hDir; - - if (!RtlDosPathNameToNtPathName_U (lpPathName, - &NtPathU, - NULL, - NULL)) - { - BaseSetLastNTError(STATUS_OBJECT_PATH_SYNTAX_BAD); - return INVALID_HANDLE_VALUE; - } - - - - InitializeObjectAttributes (&ObjectAttributes, +FindFirstChangeNotificationW(IN LPCWSTR lpPathName, + IN BOOL bWatchSubtree, + IN DWORD dwNotifyFilter) +{ + NTSTATUS Status; + UNICODE_STRING NtPathU; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hDir; + RTL_RELATIVE_NAME_U RelativeName; + PWCHAR PathBuffer; + IO_STATUS_BLOCK IoStatusBlock; + + /* Convert to NT path and get the relative name too */ + if (!RtlDosPathNameToNtPathName_U(lpPathName, + &NtPathU, + NULL, + &RelativeName)) + { + /* Bail out if the path name makes no sense */ + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + /* Save the path buffer in case we free it later */ + PathBuffer = NtPathU.Buffer; + + /* If we have a relative name... */ + if (RelativeName.RelativeName.Length) + { + /* Do a relative open with only the relative path set */ + NtPathU = RelativeName.RelativeName; + } + else + { + /* Do a full path open with no containing directory */ + RelativeName.ContainingDirectory = NULL; + } + + /* Now open the directory name that was passed in */ + InitializeObjectAttributes(&ObjectAttributes, &NtPathU, OBJ_CASE_INSENSITIVE, - NULL, + RelativeName.ContainingDirectory, NULL); - - Status = NtOpenFile (&hDir, - SYNCHRONIZE|FILE_LIST_DIRECTORY, + Status = NtOpenFile(&hDir, + SYNCHRONIZE | FILE_LIST_DIRECTORY, &ObjectAttributes, - &IoStatus, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - NtPathU.Buffer); - - - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return INVALID_HANDLE_VALUE; - } - - Status = NtNotifyChangeDirectoryFile(hDir, - NULL, - NULL, - NULL, - &IoStatus, - NULL,//Buffer, - 0,//BufferLength, - dwNotifyFilter, - (BOOLEAN)bWatchSubtree); - if (!NT_SUCCESS(Status)) - { - NtClose(hDir); - BaseSetLastNTError(Status); - return INVALID_HANDLE_VALUE; - } - - return hDir; -} - + /* Release our buffer and relative name structure */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + + /* Check if the open failed */ + if (!NT_SUCCESS(Status)) + { + /* Bail out in that case */ + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + /* Now setup the notification on the directory as requested */ + Status = NtNotifyChangeDirectoryFile(hDir, + NULL, + NULL, + NULL, + &staticIoStatusBlock, + staticchangebuff, + sizeof(staticchangebuff), + dwNotifyFilter, + (BOOLEAN)bWatchSubtree); + if (!NT_SUCCESS(Status)) + { + /* We failed, close the handle and convert the error */ + NtClose(hDir); + BaseSetLastNTError(Status); + hDir = INVALID_HANDLE_VALUE; + } + + /* Return the directory handle on success, or invalid handle otherwise */ + return hDir; +} /* * @implemented */ BOOL WINAPI -FindNextChangeNotification ( - HANDLE hChangeHandle - ) -{ - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - - Status = NtNotifyChangeDirectoryFile(hChangeHandle, - NULL, - NULL, - NULL, - &IoStatus, - NULL,//Buffer, - 0,//BufferLength, - FILE_NOTIFY_CHANGE_SECURITY,//meaningless/ignored for subsequent calls, but must contain a valid flag - 0 //meaningless/ignored for subsequent calls - ); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -extern VOID -(WINAPI ApcRoutine)(PVOID ApcContext, - struct _IO_STATUS_BLOCK* IoStatusBlock, - ULONG Reserved); - +FindNextChangeNotification(IN HANDLE hChangeHandle) +{ + NTSTATUS Status; + + /* Just call the native API directly, dealing with the non-optional parameters */ + Status = NtNotifyChangeDirectoryFile(hChangeHandle, + NULL, + NULL, + NULL, + &staticIoStatusBlock, + staticchangebuff, + sizeof(staticchangebuff), + FILE_NOTIFY_CHANGE_SECURITY, + TRUE); + if (!NT_SUCCESS(Status)) + { + /* Convert the error code and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* All went well */ + return TRUE; +} /* * @implemented */ BOOL WINAPI -ReadDirectoryChangesW( - HANDLE hDirectory, - LPVOID lpBuffer OPTIONAL, - DWORD nBufferLength, - BOOL bWatchSubtree, - DWORD dwNotifyFilter, - LPDWORD lpBytesReturned, /* undefined for asych. operations */ - LPOVERLAPPED lpOverlapped OPTIONAL, - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine /* OPTIONAL???????? */ - ) -{ - PVOID CompletionRoutine; - NTSTATUS Status; - IO_STATUS_BLOCK IoStatus; - HANDLE EventHandle; - PIO_APC_ROUTINE IoApcRoutine; - - if (lpOverlapped ) - { - if (lpCompletionRoutine) - { - CompletionRoutine = (PVOID) lpCompletionRoutine; - EventHandle = NULL; - IoApcRoutine = ApcRoutine; - } - else - { - if (((ULONG_PTR) lpOverlapped->hEvent & 1) == 0) - CompletionRoutine = (PVOID) lpOverlapped; - else - CompletionRoutine = NULL; - - EventHandle = lpOverlapped->hEvent; - IoApcRoutine = NULL; - } - - lpOverlapped->Internal = STATUS_PENDING; - } - else - { - EventHandle = NULL; - IoApcRoutine = NULL; - CompletionRoutine = NULL; - } - - Status = NtNotifyChangeDirectoryFile( - hDirectory, - EventHandle, - IoApcRoutine, - CompletionRoutine, /* ApcContext */ - lpOverlapped ? (PIO_STATUS_BLOCK) lpOverlapped : &IoStatus, - lpBuffer, - nBufferLength, - dwNotifyFilter, - (BOOLEAN)bWatchSubtree - ); - - if ((Status == STATUS_PENDING) && (!lpOverlapped)) - { - Status = NtWaitForSingleObject(hDirectory, FALSE, NULL); - - if (NT_SUCCESS(Status)) - { - Status = IoStatus.Status; - } - } - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - - /* NOTE: lpBytesReturned is undefined for asynch. operations */ - *lpBytesReturned = IoStatus.Information; - - return TRUE; -} - - - - +ReadDirectoryChangesW(IN HANDLE hDirectory, + IN LPVOID lpBuffer OPTIONAL, + IN DWORD nBufferLength, + IN BOOL bWatchSubtree, + IN DWORD dwNotifyFilter, + OUT LPDWORD lpBytesReturned, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + + NTSTATUS Status; + HANDLE EventHandle; + PVOID ApcContext; + PIO_APC_ROUTINE ApcRoutine; + PBASEP_ACTCTX_BLOCK ActivationContext = NULL; + BOOL Result = TRUE; + IO_STATUS_BLOCK IoStatusBlock; + + /* Is the caller doing this synchronously? */ + if (!lpOverlapped) + { + /* Great, just pass in the parameters */ + Status = NtNotifyChangeDirectoryFile(hDirectory, + NULL, + NULL, + NULL, + &IoStatusBlock, + lpBuffer, + nBufferLength, + dwNotifyFilter, + bWatchSubtree); + if (Status == STATUS_PENDING) + { + /* Wait for completion since we are synchronous */ + Status = NtWaitForSingleObject(hDirectory, FALSE, NULL); + if (!NT_SUCCESS(Status)) + { + /* The wait failed, bail out */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Retrieve the final status code */ + Status = IoStatusBlock.Status; + } + + /* Did the operation succeed? */ + if (NT_SUCCESS(Status)) + { + /* Return the bytes transferd and success */ + *lpBytesReturned = IoStatusBlock.Information; + return Result; + } + + /* Convert error code and return failure */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Does the caller want an APC callbac? */ + if (lpCompletionRoutine) + { + /* Don't use an event in this case */ + EventHandle = NULL; + + /* Allocate a Fusion/SxS activation context for the callback routine */ + Status = BasepAllocateActivationContextActivationBlock(1 | 2, + lpCompletionRoutine, + lpOverlapped, + &ActivationContext); + if (!NT_SUCCESS(Status)) + { + /* This failed, so abandon the call */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Use the SxS context as the APC context */ + ApcContext = ActivationContext; + if (ActivationContext) + { + /* And use a special stub routine that deals with activation */ + ApcRoutine = BasepIoCompletion; + } + else + { + /* If there was no context, however, use the simple stub routine */ + ApcContext = lpCompletionRoutine; + ApcRoutine = BasepIoCompletionSimple; + } + } + else + { + /* Use the even with no APC routine */ + EventHandle = lpOverlapped->hEvent; + ApcRoutine = 0; + + /* LPOVERLAPPED should be ignored if event is ORed with 1 */ + ApcContext = (ULONG_PTR)lpOverlapped->hEvent & 1 ? NULL : lpOverlapped; + } + + /* Set the initial status to pending and call the native API */ + lpOverlapped->Internal = STATUS_PENDING; + Status = NtNotifyChangeDirectoryFile(hDirectory, + EventHandle, + ApcRoutine, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + lpBuffer, + nBufferLength, + dwNotifyFilter, + (BOOLEAN)bWatchSubtree); + if (NT_ERROR(Status)) + { + /* Normally we cleanup the context in the completon routine, but we failed */ + if (ActivationContext) BasepFreeActivationContextActivationBlock(ActivationContext); + + /* Convert the error and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Return success */ + return Result; +} /* EOF */ 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] Tue Feb 21 23:27:45 2012 @@ -143,6 +143,14 @@ BaseCurrentDirPlacementMax } BASE_CURRENT_DIR_PLACEMENT; +typedef struct _BASEP_ACTCTX_BLOCK +{ + ULONG Flags; + PVOID ActivationContext; + PVOID CompletionContext; + LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; +} BASEP_ACTCTX_BLOCK, *PBASEP_ACTCTX_BLOCK; + #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 @@ -246,6 +254,21 @@ VOID WINAPI BaseProcessStartThunk(VOID); + +VOID +NTAPI +BasepFreeActivationContextActivationBlock( + IN PBASEP_ACTCTX_BLOCK ActivationBlock +); + +NTSTATUS +NTAPI +BasepAllocateActivationContextActivationBlock( + IN DWORD Flags, + IN PVOID CompletionRoutine, + IN PVOID CompletionContext, + OUT PBASEP_ACTCTX_BLOCK *ActivationBlock +); __declspec(noreturn) VOID Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] Tue Feb 21 23:27:45 2012 @@ -280,3 +280,117 @@ } return TRUE; } + +/* REACTOS PRIVATE ************************************************************/ + +VOID +NTAPI +BasepFreeActivationContextActivationBlock(IN PBASEP_ACTCTX_BLOCK ActivationBlock) +{ + /* Exit if there was nothing passed in */ + if (!ActivationBlock) return; + + /* Do we have a context? */ + if (ActivationBlock->ActivationContext) + { + /* Release and clear it */ + RtlReleaseActivationContext(ActivationBlock->ActivationContext); + ActivationBlock->ActivationContext = NULL; + } + + /* Free the block */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ActivationBlock); +} + +NTSTATUS +NTAPI +BasepAllocateActivationContextActivationBlock(IN DWORD Flags, + IN PVOID CompletionRoutine, + IN PVOID CompletionContext, + OUT PBASEP_ACTCTX_BLOCK *ActivationBlock) +{ + NTSTATUS Status; + ACTIVATION_CONTEXT_BASIC_INFORMATION ContextInfo; + + /* Clear the info structure */ + ContextInfo.dwFlags = 0; + ContextInfo.hActCtx = NULL; + + /* Assume failure */ + if (ActivationBlock) *ActivationBlock = NULL; + + /* Only support valid flags */ + if (Flags & ~(1 | 2)) // FIXME: What are they? 2 looks like BASEP_ACTCTX_FORCE_BLOCK + { + /* Fail if unknown flags are passed in */ + Status = STATUS_INVALID_PARAMETER_1; + goto Quickie; + } + + /* Caller should have passed in an activation block */ + if (!ActivationBlock) + { + /* Fail otherwise */ + Status = STATUS_INVALID_PARAMETER_4; + goto Quickie; + } + + /* Query RTL for information on the current activation context */ + Status = RtlQueryInformationActivationContext(1, + NULL, + 0, + ActivationContextBasicInformation, + &ContextInfo, + sizeof(ContextInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed -- bail out */ + DPRINT1("SXS: %s - Failure getting active activation context; ntstatus %08lx\n", + __FUNCTION__, Status); + goto Quickie; + } + + /* Check if the current one should be freed */ + if (ContextInfo.dwFlags & 1) + { + /* Release and clear it */ + RtlReleaseActivationContext(ContextInfo.hActCtx); + ContextInfo.hActCtx = NULL; + } + + /* Check if there's an active context, or if the caller is forcing one */ + if (!(Flags & 2) || (ContextInfo.hActCtx)) + { + /* Allocate the block */ + *ActivationBlock = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(BASEP_ACTCTX_BLOCK)); + if (!(*ActivationBlock)) + { + /* Ran out of memory, fail */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Fill it out */ + (*ActivationBlock)->ActivationContext = ContextInfo.hActCtx; + (*ActivationBlock)->Flags = 0; + if (Flags & 1) (*ActivationBlock)->Flags |= 1; // Not sure about this flag + (*ActivationBlock)->CompletionRoutine = CompletionRoutine; + (*ActivationBlock)->CompletionContext = CompletionContext; + + /* Tell Quickie below not to free anything, since this is success */ + ContextInfo.hActCtx = NULL; + } + + /* Set success status */ + Status = STATUS_SUCCESS; + +Quickie: + /* Failure or success path, return to caller and free on failure */ + if (ContextInfo.hActCtx) RtlReleaseActivationContext(ContextInfo.hActCtx); + return Status; +} + +/* EOF */

1 0

[jgardou] 55800: [CRT] - fix array size to match what implementation expects. Found by Thomas Faber. See issue 6903 for details.
by jgardou＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: jgardou Date: Tue Feb 21 23:19:47 2012 New Revision: 55800 URL: http://svn.reactos.org/svn/reactos?rev=55800&view=rev Log: [CRT] - fix array size to match what implementation expects. Found by Thomas Faber. See issue 6903 for details. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Feb 21 23:19:47 2012 @@ -112,8 +112,8 @@ CRITICAL_SECTION crit; } file_crit; -FILE _iob[3] = { { 0 } }; -static file_crit* fstream[MAX_FILES/FD_BLOCK_SIZE]; +FILE _iob[_IOB_ENTRIES] = { { 0 } }; +static file_crit* fstream[MAX_FILES/FD_BLOCK_SIZE] = { NULL }; static int max_streams = 512, stream_idx; /* INTERNAL: process umask */

1 0

[janderwald] 55799: [USBUHCI] - Sync shared parts with usbohci driver - Fixes memory bug, includes data toggle support, device cleanup etc...
by janderwald＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: janderwald Date: Tue Feb 21 23:18:46 2012 New Revision: 55799 URL: http://svn.reactos.org/svn/reactos?rev=55799&view=rev Log: [USBUHCI] - Sync shared parts with usbohci driver - Fixes memory bug, includes data toggle support, device cleanup etc... Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp trunk/reactos/drivers/usb/usbuhci/interfaces.h trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp trunk/reactos/drivers/usb/usbuhci/usb_device.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -234,7 +234,7 @@ // PC_ASSERT(DeviceExtension->IsFDO); - DPRINT1("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", + DPRINT("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -394,7 +394,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO\n"); // // first start lower device object @@ -423,12 +423,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -502,14 +502,13 @@ // // not supported // - PC_ASSERT(0); Status = STATUS_NOT_SUPPORTED; } break; } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); if (m_Hardware) { @@ -535,9 +534,34 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // sure + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + + // + // delete the symbolic link + // + SetSymbolicLink(FALSE); + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + IoCallDriver(m_NextDeviceObject, Irp); // // detach device from device stack @@ -549,8 +573,7 @@ // IoDeleteDevice(m_FunctionalDeviceObject); - Status = STATUS_SUCCESS; - break; + return STATUS_SUCCESS; } default: { @@ -650,7 +673,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT("CreateFDO: DeviceName %wZ\n", &DeviceName); /* done */ return Status; Modified: trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -70,6 +70,9 @@ NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleSyncResetAndClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleAbortPipe(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -190,7 +193,7 @@ USHORT VendorID, DeviceID; ULONG Dummy1; - DPRINT1("CHubController::Initialize\n"); + DPRINT("CHubController::Initialize\n"); // // initialize members @@ -305,7 +308,7 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; @@ -316,7 +319,7 @@ { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + DPRINT("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); // @@ -427,16 +430,25 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); // // register device interface // Status = SetDeviceInterface(TRUE); break; } + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + // + // sure + // + Status = STATUS_SUCCESS; + break; + } case IRP_MN_QUERY_ID: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -462,7 +474,7 @@ swprintf(Buffer, L"USB\\ROOT_HUB"); } - DPRINT1("Name %S\n", Buffer); + DPRINT("Name %S\n", Buffer); // // calculate length @@ -539,7 +551,7 @@ Index++; - DPRINT1("Name %S\n", Buffer); + DPRINT("Name %S\n", Buffer); // // allocate buffer @@ -573,7 +585,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -593,7 +605,7 @@ DeviceCapabilities->HardwareDisabled = FALSE; DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; - for (Index = 0; Index < PowerSystemMaximum; Index++) + for (Index = 1; Index < PowerSystemMaximum; Index++) DeviceCapabilities->DeviceState[Index] = PowerDeviceD3; DeviceCapabilities->DeviceWake = PowerDeviceUnspecified; DeviceCapabilities->D1Latency = 0; @@ -605,7 +617,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); // // handle device interface requests @@ -615,7 +627,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); // // deactivate device interface for BUS PDO @@ -645,7 +657,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -686,7 +698,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); // // allocate buffer for bus information @@ -719,7 +731,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); // // stop device // @@ -790,7 +802,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleIsochronousTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -827,7 +847,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT1("Pending SCE Irp\n");; + DPRINT("Pending SCE Irp\n");; m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -847,7 +867,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleBuldOrInterruptTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -984,7 +1012,6 @@ // reset port feature // Status = m_Hardware->SetPortFeature(PortId, PORT_RESET); - PC_ASSERT(Status == STATUS_SUCCESS); break; } default: @@ -1057,7 +1084,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleSelectConfiguration invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1099,7 +1134,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleSelectInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1149,7 +1192,15 @@ // // check if this is a valid usb device handle // - ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleGetStatusFromDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1172,7 +1223,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); ASSERT(Status == STATUS_SUCCESS); - DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); + DPRINT("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done @@ -1205,7 +1256,15 @@ // // check if this is a valid usb device handle // - ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("USB_REQUEST_GET_STATUS invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1311,7 +1370,15 @@ // // check if this is a valid usb device handle // - ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleGetDescriptorFromInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1381,7 +1448,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleGetDescriptor invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1452,7 +1527,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1494,11 +1577,18 @@ PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength); - // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1552,7 +1642,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClassEndpoint invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1573,12 +1671,21 @@ // // initialize setup packet // - CtrlSetup.bmRequestType.B = 0xa2; //FIXME: Const. + CtrlSetup.bmRequestType.B = 0x22; //FIXME: Const. CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) + { + // + // data direction is device to host + // + CtrlSetup.bmRequestType.B |= 0x80; + } + + // // issue request // @@ -1595,6 +1702,196 @@ // return Status; } + +NTSTATUS +CHubController::HandleSyncResetAndClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + NTSTATUS Status = STATUS_SUCCESS; + PUSB_ENDPOINT EndpointDescriptor; + ULONG Type; + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbPipeRequest.PipeHandle; + + // + // abort pipe + // + Status = HandleAbortPipe(Irp, Urb); + if (!NT_SUCCESS(Status)) + { + // + // abort pipe failed + // + DPRINT1("[USBOHCI] AbortPipe failed with %x\n", Status); + } + + // + // get type + // + Type = (EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK); + if (Type != USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // clear stall + // + Status = HandleClearStall(Irp, Urb); + } + DPRINT1("URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); + + // + // reset data toggle + // + EndpointDescriptor->DataToggle = 0; + + // + // done + // + return Status; +} + +NTSTATUS +CHubController::HandleAbortPipe( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT EndpointDescriptor; + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // issue request + // + Status = UsbDevice->AbortPipe(EndpointDescriptor); + DPRINT1("URB_FUNCTION_ABORT_PIPE Status %x\n", Status); + + // + // done + // + return Status; +} + + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("URB_FUNCTION_SYNC_CLEAR_STALL\n"); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0x02; + CtrlSetup.bRequest = USB_REQUEST_CLEAR_FEATURE; + CtrlSetup.wValue.W = USB_FEATURE_ENDPOINT_STALL; + CtrlSetup.wIndex.W = EndpointDescriptor->bEndpointAddress; + CtrlSetup.wLength = 0; + CtrlSetup.wValue.W = 0; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); + + DPRINT1("URB_FUNCTION_CLEAR_STALL Status %x\n", Status); + + // + // done + // + return Status; +} + //----------------------------------------------------------------------------------------- NTSTATUS @@ -1616,7 +1913,15 @@ // // check if this is a valid usb device handle // - PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClassInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } // // get device @@ -1634,21 +1939,23 @@ DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); - if (Urb->UrbControlVendorClassRequest.TransferBufferLength == 0) - { - DPRINT1("Invalid request length\n"); - return STATUS_SUCCESS; - } - // // initialize setup packet // - CtrlSetup.bmRequestType.B = 0xa1; + CtrlSetup.bmRequestType.B = 0x21; CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) + { + // + // data direction is device to host + // + CtrlSetup.bmRequestType.B |= 0x80; + } + // // issue request // @@ -1657,8 +1964,13 @@ // // assert on failure // - PC_ASSERT(NT_SUCCESS(Status)); - + if (!NT_SUCCESS(Status)) + { + // + // display error + // + DPRINT1("URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", Urb->UrbHeader.Status); + } // // done @@ -1702,6 +2014,16 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_SYNC_RESET_PIPE: + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + Status = HandleSyncResetAndClearStall(Irp, Urb); + break; + case URB_FUNCTION_ABORT_PIPE: + Status = HandleAbortPipe(Irp, Urb); + break; + case URB_FUNCTION_SYNC_CLEAR_STALL: + Status = HandleClearStall(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: Status = HandleGetDescriptorFromInterface(Irp, Urb); break; @@ -2132,7 +2454,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceReference\n"); + DPRINT("USBH_InterfaceReference\n"); // // add reference @@ -2147,7 +2469,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceDereference\n"); + DPRINT("USBH_InterfaceDereference\n"); // // release @@ -2171,7 +2493,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_CreateUsbDevice\n"); + DPRINT("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus); // // first get hub controller @@ -2261,7 +2583,7 @@ NTSTATUS Status; ULONG Index = 0; - DPRINT1("USBHI_InitializeUsbDevice\n"); + DPRINT("USBHI_InitializeUsbDevice\n"); // // first get controller @@ -2357,7 +2679,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_GetUsbDescriptors\n"); + DPRINT("USBHI_GetUsbDescriptors\n"); // // sanity check @@ -2426,7 +2748,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_RemoveUsbDevice\n"); + DPRINT("USBHI_RemoveUsbDevice\n"); // // first get controller @@ -2499,7 +2821,7 @@ PUSBDEVICE OldUsbDevice, NewUsbDevice; CHubController * Controller; - DPRINT1("USBHI_RestoreUsbDevice\n"); + DPRINT("USBHI_RestoreUsbDevice\n"); // // first get controller @@ -2521,8 +2843,8 @@ PC_ASSERT(Controller->ValidateUsbDevice(NewUsbDevice)); PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice)); - DPRINT1("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); - DPRINT1("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); + DPRINT("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); + DPRINT("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); // // remove old device handle @@ -2545,7 +2867,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); + DPRINT("USBHI_QueryDeviceInformation %p\n", BusContext); // // sanity check @@ -2667,7 +2989,7 @@ { PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; - DPRINT1("USBHI_GetControllerInformation\n"); + DPRINT("USBHI_GetControllerInformation\n"); // // sanity checks @@ -2730,7 +3052,7 @@ USHORT Dummy1; NTSTATUS Status; - DPRINT1("USBHI_GetExtendedHubInformation\n"); + DPRINT("USBHI_GetExtendedHubInformation\n"); // // sanity checks @@ -2909,7 +3231,7 @@ // looks like we need apply a dragon voodoo to fixup the device stack // otherwise usbhub will cause a bugcheck // - DPRINT1("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); + DPRINT("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); // // sanity check @@ -2946,7 +3268,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_GetUSBDIVersion\n"); + DPRINT("USBDI_GetUSBDIVersion\n"); // // get controller @@ -3026,7 +3348,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_IsDeviceHighSpeed\n"); + DPRINT("USBDI_IsDeviceHighSpeed\n"); // // get controller @@ -3287,7 +3609,7 @@ // // done // - return Status; + return STATUS_SUCCESS; } NTSTATUS @@ -3349,7 +3671,7 @@ } } - DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); + DPRINT("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); // // fixup device stack voodoo part #1 @@ -3407,7 +3729,7 @@ Irp = This->m_PendingSCEIrp; if (!Irp) { - DPRINT1("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n"); + DPRINT("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n"); return; } Modified: trunk/reactos/drivers/usb/usbuhci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -38,6 +38,7 @@ // a list of registered controllers and provides support functions for the host controllers struct IHCDController; +struct _USB_ENDPOINT; DECLARE_INTERFACE_(IRootHCDController, IUnknown) { @@ -359,8 +360,8 @@ virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, + IN OPTIONAL struct _USB_ENDPOINT *EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) = 0; @@ -436,7 +437,6 @@ // Description: returns device speed virtual USB_DEVICE_SPEED GetDeviceSpeed() = 0; - }; @@ -496,6 +496,15 @@ // Description: creates an usb request virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; + + +//----------------------------------------------------------------------------------------- +// +// AbortDevicePipe +// +// Description: aborts all pending requsts of an device + + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN struct _USB_ENDPOINT * EndpointDescriptor) = 0; }; @@ -750,6 +759,16 @@ virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface) = 0; + +//----------------------------------------------------------------------------------------- +// +// AbortPipe +// +// Description: aborts all pending requsts of an device + + virtual NTSTATUS AbortPipe(IN struct _USB_ENDPOINT * EndpointDescriptor) = 0; + + }; typedef IUSBDevice *PUSBDEVICE; Modified: trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/memory… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -271,7 +271,7 @@ IN ULONG Size) { KIRQL OldLevel; - ULONG BlockOffset = 0, BlockLength; + ULONG BlockOffset = 0, BlockLength, BlockCount; // // sanity checks @@ -302,14 +302,25 @@ Size = (Size + m_BlockSize - 1) & ~(m_BlockSize - 1); // + // convert to blocks + // + BlockCount = Size / m_BlockSize; + ASSERT(BlockCount); + + // // acquire lock // KeAcquireSpinLock(m_Lock, &OldLevel); // + // sanity check + // + ASSERT(RtlAreBitsSet(&m_Bitmap, BlockOffset, BlockCount)); + + // // release buffer // - RtlClearBits(&m_Bitmap, BlockOffset, Size); + RtlClearBits(&m_Bitmap, BlockOffset, BlockCount); // // release lock Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -52,18 +52,20 @@ virtual NTSTATUS SubmitSetupPacket(IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, OUT ULONG BufferLength, OUT PVOID Buffer); virtual NTSTATUS SelectConfiguration(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PUSBD_INTERFACE_INFORMATION Interface, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle); virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface); + virtual NTSTATUS AbortPipe(IN struct _USB_ENDPOINT * EndpointDescriptor); + // local function virtual NTSTATUS CommitIrp(PIRP Irp); - virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); - virtual NTSTATUS CreateConfigurationDescriptor(ULONG ConfigurationIndex); + virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); + virtual NTSTATUS CreateConfigurationDescriptor(UCHAR ConfigurationIndex); virtual NTSTATUS CreateDeviceDescriptor(); virtual VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual VOID DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); // constructor / destructor CUSBDevice(IUnknown *OuterUnknown){} - virtual ~CUSBDevice(){} + virtual ~CUSBDevice(); protected: LONG m_Ref; @@ -79,8 +81,76 @@ ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; - PUSB_CONFIGURATION_DESCRIPTOR *m_ConfigurationDescriptors; + + PUSB_CONFIGURATION m_ConfigurationDescriptors; }; + +CUSBDevice::~CUSBDevice() +{ + ULONG Index, InterfaceIndex, EndpointIndex; + //NTSTATUS Status; + + if (!m_ConfigurationDescriptors) + { + // + // nothing to do + // + return; + } + + + // + // clean up resources + // + for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) + { + for(InterfaceIndex = 0; InterfaceIndex < m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) + { + // + // are there any endpoint descriptors + // + for(EndpointIndex = 0; EndpointIndex < m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints; EndpointIndex++) + { + // + // abort pipe + // + //Status = AbortPipe((PUSB_ENDPOINT_DESCRIPTOR)&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndpointIndex]); + //DPRINT1("[USBOHCI] Deleting Device Abort Pipe Status %x\n", Status); + } + + if (m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) + { + // + // free endpoints + // + ExFreePool(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints); + } + } + + if (m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bNumInterfaces) + { + // + // free interface descriptors + // + ExFreePool(m_ConfigurationDescriptors[Index].Interfaces); + } + + if (m_ConfigurationDescriptors[Index].ConfigurationDescriptor) + { + // + // free configuration descriptor + // + ExFreePool(m_ConfigurationDescriptors[Index].ConfigurationDescriptor); + } + } + + // + // free configuration descriptor + // + ExFreePool(m_ConfigurationDescriptors); +} + + //---------------------------------------------------------------------------------------- NTSTATUS @@ -267,7 +337,7 @@ } DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); - PC_ASSERT(FALSE); + //PC_ASSERT(FALSE); return Usb11Device; } @@ -299,7 +369,7 @@ PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; UCHAR OldAddress; - ULONG Index; + UCHAR Index; DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); @@ -381,12 +451,12 @@ // // allocate configuration descriptor // - m_ConfigurationDescriptors = (PUSB_CONFIGURATION_DESCRIPTOR*) ExAllocatePoolWithTag(NonPagedPool, sizeof(PUSB_CONFIGURATION_DESCRIPTOR) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); + m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); // // zero configuration descriptor // - RtlZeroMemory(m_ConfigurationDescriptors, sizeof(PUSB_CONFIGURATION_DESCRIPTOR) * m_DeviceDescriptor.bNumConfigurations); + RtlZeroMemory(m_ConfigurationDescriptors, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations); // // retrieve the configuration descriptors @@ -518,7 +588,7 @@ NTSTATUS CUSBDevice::CommitSetupPacket( IN PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl) { @@ -550,7 +620,7 @@ // // initialize request // - Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, GetSpeed(), EndpointDescriptor, BufferLength, Mdl); + Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, (struct _USB_ENDPOINT*)EndpointDescriptor, GetSpeed(), BufferLength, Mdl); if (!NT_SUCCESS(Status)) { // @@ -598,11 +668,24 @@ USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; PMDL Mdl; NTSTATUS Status; + PVOID DeviceDescriptor; + + // + // allocate descriptor page aligned + // + DeviceDescriptor = ExAllocatePool(NonPagedPool, PAGE_SIZE); + if (!DeviceDescriptor) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } // // zero descriptor // - RtlZeroMemory(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + RtlZeroMemory(DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); // @@ -616,7 +699,7 @@ // // allocate mdl describing the device descriptor // - Mdl = IoAllocateMdl(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR), FALSE, FALSE, 0); + Mdl = IoAllocateMdl(DeviceDescriptor, PAGE_SIZE, FALSE, FALSE, 0); if (!Mdl) { // @@ -645,8 +728,14 @@ // // informal dbg print // + RtlCopyMemory(&m_DeviceDescriptor, DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); DumpDeviceDescriptor(&m_DeviceDescriptor); } + + // + // free buffer + // + ExFreePool(DeviceDescriptor); // // done @@ -658,13 +747,16 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::CreateConfigurationDescriptor( - ULONG Index) + UCHAR Index) { PVOID Buffer; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; PMDL Mdl; + ULONG InterfaceIndex, EndPointIndex; PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndPointDescriptor; // @@ -683,11 +775,6 @@ // return STATUS_INSUFFICIENT_RESOURCES; } - - // - // zero buffer - // - RtlZeroMemory(Buffer, PAGE_SIZE); // // build setup packet @@ -697,16 +784,12 @@ CtrlSetup.bmRequestType._BM.Reserved = 0; CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.LowByte = Index; CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = PAGE_SIZE; // - // FIXME: where put configuration index? - // - - // // now build MDL describing the buffer // Mdl = IoAllocateMdl(Buffer, PAGE_SIZE, FALSE, FALSE, 0); @@ -761,9 +844,124 @@ PC_ASSERT(ConfigurationDescriptor->bNumInterfaces); // - // store configuration descriptor - // - m_ConfigurationDescriptors[Index] = ConfigurationDescriptor; + // request is complete, initialize configuration descriptor + // + m_ConfigurationDescriptors[Index].ConfigurationDescriptor = ConfigurationDescriptor; + + // + // now allocate interface descriptors + // + m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBOHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces) + { + // + // failed to allocate interface descriptors + // + ExFreePool(Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero interface descriptor + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces); + + // + // get first interface descriptor + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ConfigurationDescriptor + 1); + + // + // setup interface descriptors + // + for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) + { + while(InterfaceDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && InterfaceDescriptor->bLength != sizeof(USB_INTERFACE_DESCRIPTOR)) + { + // + // move to next descriptor + // + ASSERT(InterfaceDescriptor->bLength); + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + } + + // + // sanity checks + // + ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + ASSERT(InterfaceDescriptor->bNumEndpoints); + + // + // copy current interface descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor, InterfaceDescriptor, InterfaceDescriptor->bLength); + + // + // allocate end point descriptors + // + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBOHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) + { + // + // failed to allocate endpoint + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // zero memory + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints); + + // + // initialize end point descriptors + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)(InterfaceDescriptor + 1); + + for(EndPointIndex = 0; EndPointIndex < InterfaceDescriptor->bNumEndpoints; EndPointIndex++) + { + // + // skip other descriptors + // + while(EndPointDescriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE && EndPointDescriptor->bLength != sizeof(USB_ENDPOINT_DESCRIPTOR)) + { + // + // assert when next interface descriptor is reached before the next endpoint + // + ASSERT(EndPointDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength); + + DPRINT1("InterfaceDescriptor bNumEndpoints %x EndpointIndex %x Skipping Descriptor Type %x\n", InterfaceDescriptor->bNumEndpoints, EndPointIndex, EndPointDescriptor->bDescriptorType); + // + // move to next descriptor + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // sanity check + // + ASSERT(EndPointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + + // + // copy endpoint descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndPointIndex].EndPointDescriptor, EndPointDescriptor, EndPointDescriptor->bLength); + + // + // move to next offset + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // update interface descriptor offset + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)EndPointDescriptor; + } // // done @@ -797,8 +995,8 @@ // // copy configuration descriptor // - RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0], min(m_ConfigurationDescriptors[0]->wTotalLength, BufferLength)); - *OutBufferLength = m_ConfigurationDescriptors[0]->wTotalLength; + RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0].ConfigurationDescriptor, min(m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength, BufferLength)); + *OutBufferLength = m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- @@ -809,11 +1007,7 @@ // FIXME: support multiple configurations // PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - - ASSERT(m_ConfigurationDescriptors[0]); - ASSERT(m_ConfigurationDescriptors[0]->wTotalLength); - - return m_ConfigurationDescriptors[0]->wTotalLength; + return m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- VOID @@ -858,27 +1052,40 @@ OUT PVOID Buffer) { NTSTATUS Status; - PMDL Mdl; - - // - // allocate mdl - // - Mdl = IoAllocateMdl(Buffer, BufferLength, FALSE, FALSE, 0); - - // - // HACK HACK HACK: assume the buffer is build from non paged pool - // - MmBuildMdlForNonPagedPool(Mdl); + PMDL Mdl = NULL; + + if (BufferLength) + { + // + // allocate mdl + // + Mdl = IoAllocateMdl(Buffer, BufferLength, FALSE, FALSE, 0); + if (!Mdl) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // HACK HACK HACK: assume the buffer is build from non paged pool + // + MmBuildMdlForNonPagedPool(Mdl); + } // // commit setup packet // Status = CommitSetupPacket(SetupPacket, 0, BufferLength, Mdl); - // - // free mdl - // - IoFreeMdl(Mdl); + if (Mdl != NULL) + { + // + // free mdl + // + IoFreeMdl(Mdl); + } // // done @@ -896,25 +1103,70 @@ ULONG InterfaceIndex, PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - PUSB_CONFIGURATION_DESCRIPTOR CurrentConfigurationDescriptor; - PUSB_INTERFACE_DESCRIPTOR CurrentInterfaceDescriptor; - PUSB_ENDPOINT_DESCRIPTOR CurrentEndpointDescriptor; - PVOID StartPosition; - - // - // FIXME: support multiple configurations - // - ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - ASSERT(m_ConfigurationDescriptors[0]); - CurrentConfigurationDescriptor = m_ConfigurationDescriptors[0]; - - // - // sanity check - // - PC_ASSERT(ConfigurationDescriptor->iConfiguration == CurrentConfigurationDescriptor->iConfiguration); - PC_ASSERT(ConfigurationDescriptor->bNumInterfaces <= CurrentConfigurationDescriptor->bNumInterfaces); - DPRINT1("CUSBDevice::SelectConfiguration NumInterfaces %lu\n", ConfigurationDescriptor->bNumInterfaces); - + UCHAR bConfigurationValue = 0; + + if (ConfigurationDescriptor) + { + // + // sanity checks + // + ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->iConfiguration); + + // + // sanity check + // + ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->bNumInterfaces); + + // + // get configuration value + // + bConfigurationValue = ConfigurationDescriptor->bConfigurationValue; + } + + // + // now build setup packet + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; + CtrlSetup.wValue.W = bConfigurationValue; + + // + // select configuration + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + + if (!ConfigurationDescriptor) + { + // + // unconfigure request + // + DPRINT1("CUsbDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); + m_ConfigurationIndex = 0; + return Status; + } + + // + // informal debug print + // + DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store configuration device index + // + m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; + + // + // store configuration handle + // + *ConfigurationHandle = &m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration]; // // copy interface info and pipe info @@ -922,98 +1174,47 @@ for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) { // - // find interface descriptor - // - CurrentInterfaceDescriptor = USBD_ParseConfigurationDescriptor(CurrentConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); - - // - // sanity check - // - ASSERT(CurrentInterfaceDescriptor); - ASSERT(CurrentInterfaceDescriptor->bLength != 0); - ASSERT(InterfaceInfo->NumberOfPipes == CurrentInterfaceDescriptor->bNumEndpoints); - ASSERT(InterfaceInfo->Length != 0); + // sanity check: is the info pre-layed out + // + PC_ASSERT(InterfaceInfo->NumberOfPipes == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints); + PC_ASSERT(InterfaceInfo->Length != 0); #ifdef _MSC_VER PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); #endif - DPRINT1("CUSBDevice::SelectConfiguration InterfaceNumber %lu AlternativeSetting %lu bNumEndpoints %lu\n", InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting, CurrentInterfaceDescriptor->bNumEndpoints); - // // copy interface info // - InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)CurrentInterfaceDescriptor; - InterfaceInfo->Class = CurrentInterfaceDescriptor->bInterfaceClass; - InterfaceInfo->SubClass = CurrentInterfaceDescriptor->bInterfaceSubClass; - InterfaceInfo->Protocol = CurrentInterfaceDescriptor->bInterfaceProtocol; + InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex]; + InterfaceInfo->Class = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceClass; + InterfaceInfo->SubClass = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceSubClass; + InterfaceInfo->Protocol = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceProtocol; InterfaceInfo->Reserved = 0; // // copy endpoint info // - StartPosition = CurrentInterfaceDescriptor; for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) { // - // find corresponding endpoint descriptor - // - CurrentEndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)USBD_ParseDescriptors(CurrentConfigurationDescriptor, CurrentConfigurationDescriptor->wTotalLength, StartPosition, USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // sanity checks - // - ASSERT(CurrentEndpointDescriptor); - ASSERT(CurrentEndpointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); - - // // copy pipe info // - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = CurrentEndpointDescriptor->wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = CurrentEndpointDescriptor->bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = CurrentEndpointDescriptor->bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)CurrentEndpointDescriptor->bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)CurrentEndpointDescriptor; - - // - // move start position beyond the current endpoint descriptor - // - StartPosition = (PVOID)(CurrentEndpointDescriptor + 1); + InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[PipeIndex].EndpointAddress = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[PipeIndex].Interval = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; + InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor; + + // + // data toggle is reset on configuration requests + // + m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].DataToggle = FALSE; } // // move offset // InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)PtrToUlong(InterfaceInfo) + InterfaceInfo->Length); - } - - // - // now build setup packet - // - RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; - CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; - - // - // select configuration - // - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); - - // - // informal debug print - // - DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); - - if (NT_SUCCESS(Status)) - { - // - // store configuration device index - // - m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; - - // - // store configuration handle - // - *ConfigurationHandle = m_ConfigurationDescriptors[0]; } // @@ -1028,49 +1229,31 @@ IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo) { - PUSB_CONFIGURATION_DESCRIPTOR Configuration; + PUSB_CONFIGURATION Configuration; ULONG PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PUSB_ENDPOINT_DESCRIPTOR CurrentEndpointDescriptor; - PVOID StartPosition; - - // - // FIXME support multiple configurations - // - PC_ASSERT(m_ConfigurationDescriptors[0] == (PUSB_CONFIGURATION_DESCRIPTOR)ConfigurationHandle); // // get configuration struct // - Configuration = (PUSB_CONFIGURATION_DESCRIPTOR)ConfigurationHandle; - - // - // sanity checks - // - PC_ASSERT(Configuration->bNumInterfaces > InterfaceInfo->InterfaceNumber); -#ifdef _MSC_VER - //PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); -#endif - - // - // FIXME: check bandwidth - // - - // - // find interface number - // - InterfaceDescriptor = USBD_ParseConfigurationDescriptor(Configuration, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); - ASSERT(InterfaceDescriptor); + Configuration = (PUSB_CONFIGURATION)ConfigurationHandle; + + // + // sanity check + // + ASSERT(Configuration->ConfigurationDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(Configuration->ConfigurationDescriptor->bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(Configuration->ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(&m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration] == Configuration); // // initialize setup packet // RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE; - CtrlSetup.wValue.W = InterfaceDescriptor->bAlternateSetting; - CtrlSetup.wIndex.W = InterfaceDescriptor->bInterfaceNumber; + CtrlSetup.wValue.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting; + CtrlSetup.wIndex.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber; CtrlSetup.bmRequestType.B = 0x01; // @@ -1082,60 +1265,80 @@ // informal debug print // DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); - DPRINT1("CUSBDevice::SelectInterface bInterfaceNumber %u bAlternateSetting %u NumberOfPipes %u Length %lu\n", - InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, InterfaceInfo->NumberOfPipes, InterfaceInfo->Length); - InterfaceInfo->InterfaceHandle = InterfaceDescriptor; - InterfaceInfo->NumberOfPipes = InterfaceDescriptor->bNumEndpoints; - - // - // are there end points - // - if (InterfaceDescriptor->bNumEndpoints) - { - // - // sanity check - // - ASSERT(InterfaceInfo->Length == sizeof(USBD_INTERFACE_INFORMATION) + (InterfaceDescriptor->bNumEndpoints > 1 ? sizeof(USBD_PIPE_INFORMATION) * (InterfaceDescriptor->bNumEndpoints - 1) : 0)); - - // - // store number of pipes - // - InterfaceInfo->NumberOfPipes = InterfaceDescriptor->bNumEndpoints; - - StartPosition = InterfaceDescriptor; - for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) + if (!NT_SUCCESS(Status)) + { + // + // failed to select interface + // + return Status; + } + + + // + // sanity checks + // + PC_ASSERT(Configuration->ConfigurationDescriptor->bNumInterfaces > InterfaceInfo->InterfaceNumber); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bNumEndpoints == InterfaceInfo->NumberOfPipes); +#ifdef _MSC_VER + PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); +#endif + + // + // copy pipe handles + // + for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) + { + // + // copy pipe handle + // + DPRINT1("PipeIndex %lu\n", PipeIndex); + DPRINT1("EndpointAddress %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + DPRINT1("Interval %d\n", InterfaceInfo->Pipes[PipeIndex].Interval); + DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); + DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); + DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); + DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); + DPRINT1("UsbEndPoint %x\n", Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress == InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + + InterfaceInfo->Pipes[PipeIndex].PipeHandle = &Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor; + + // + // data toggle is reset on select interface requests + // + m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].DataToggle = FALSE; + + if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) { // - // find corresponding endpoint descriptor - // - CurrentEndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)USBD_ParseDescriptors(Configuration, Configuration->wTotalLength, StartPosition, USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // sanity checks - // - ASSERT(CurrentEndpointDescriptor); - ASSERT(CurrentEndpointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // copy pipe info - // - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = CurrentEndpointDescriptor->wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = CurrentEndpointDescriptor->bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = CurrentEndpointDescriptor->bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)CurrentEndpointDescriptor->bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)CurrentEndpointDescriptor; - - // - // move start position beyond the current endpoint descriptor - // - StartPosition = (PVOID)(CurrentEndpointDescriptor + 1); + // FIXME: check if enough bandwidth is available + // } } + + // // done // return Status; } + +NTSTATUS +CUSBDevice::AbortPipe( + IN struct _USB_ENDPOINT *EndpointDescriptor) +{ + // + // let it handle usb queue + // + ASSERT(m_Queue); + ASSERT(m_DeviceAddress); + + // + // done + // + return m_Queue->AbortDevicePipe(m_DeviceAddress, EndpointDescriptor); +} + //---------------------------------------------------------------------------------------- NTSTATUS Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -39,6 +39,8 @@ virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); virtual NTSTATUS CancelRequests(); virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN struct _USB_ENDPOINT * EndpointDescriptor); + // local VOID LinkQueueHead(PUHCI_QUEUE_HEAD QueueHead, PUHCI_QUEUE_HEAD NextQueueHead); @@ -204,6 +206,16 @@ } NTSTATUS +CUSBQueue::AbortDevicePipe( + IN UCHAR DeviceAddress, + IN struct _USB_ENDPOINT *EndpointDescriptor) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS CUSBQueue::CreateUSBRequest( IUSBRequest **OutRequest) { Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -36,7 +36,7 @@ } // IUSBRequest interface functions - virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN USB_DEVICE_SPEED DeviceSpeed, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); + virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL struct _USB_ENDPOINT * EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp, IN USB_DEVICE_SPEED DeviceSpeed); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); @@ -119,7 +119,7 @@ // // store end point address // - PUSB_ENDPOINT_DESCRIPTOR m_EndpointDescriptor; + PUSB_ENDPOINT m_EndpointDescriptor; // // allocated setup packet from the DMA pool @@ -156,8 +156,8 @@ IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, + IN OPTIONAL struct _USB_ENDPOINT * EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) { @@ -321,7 +321,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbIsochronousTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbIsochronousTransfer.PipeHandle; // // completed initialization @@ -396,7 +396,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbBulkOrInterruptTransfer.PipeHandle; } break; @@ -461,19 +461,19 @@ // // return max packet size // - return m_EndpointDescriptor->wMaxPacketSize; + return m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; } UCHAR CUSBRequest::GetInterval() { ASSERT(m_EndpointDescriptor); - ASSERT((m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT((m_EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); // // return interrupt interval // - return m_EndpointDescriptor->bInterval; + return m_EndpointDescriptor->EndPointDescriptor.bInterval; } UCHAR @@ -493,7 +493,7 @@ // // endpoint number is between 1-15 // - return (m_EndpointDescriptor->bEndpointAddress & 0xF); + return (m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0xF); } //---------------------------------------------------------------------------------------- @@ -512,7 +512,7 @@ // // end point is defined in the low byte of bmAttributes // - TransferType = (m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + TransferType = (m_EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK); } else { @@ -536,7 +536,7 @@ // // end point direction is highest bit in bEndpointAddress // - return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + return (m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } else { Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Tue Feb 21 23:18:46 2012 @@ -107,4 +107,26 @@ // NTSTATUS InternalCreateUSBRequest(PUSBREQUEST *OutRequest); + +typedef struct _USB_ENDPOINT +{ + USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; + UCHAR HubAddress; + UCHAR HubPort; + UCHAR DataToggle; +} USB_ENDPOINT, *PUSB_ENDPOINT; + +typedef struct _USB_INTERFACE +{ + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USB_ENDPOINT *EndPoints; +} USB_INTERFACE, *PUSB_INTERFACE; + +typedef struct _USB_CONFIGURATION +{ + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + USB_INTERFACE *Interfaces; +} USB_CONFIGURATION, *PUSB_CONFIGURATION; + + #endif

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
58
Older →

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 February 2012