Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 17:47:39 2017 New Revision: 75656 URL: http://svn.reactos.org/svn/reactos?rev=75656&view=rev Log: Code formatting fix. Modified: branches/setup_improvements/base/setup/lib/inicache.c Modified: branches/setup_improvements/base/setup/lib/inicache.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/inicache.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/inicache.c [iso-8859-1] Wed Aug 23 17:47:39 2017 @@ -334,7 +334,7 @@ *NamePtr = NULL; *NameSize = 0; - while(Ptr && *Ptr) + while (Ptr && *Ptr) { *NamePtr = NULL; *NameSize = 0;

7 years, 4 months

[hbelusca] 75655: [SETUPDD]: Add a template Setup Device Driver Helper whose future aim will be to provide user-mode applications access to the kernel-mode PSETUP_LOADER_BLOCK SetupLdrBlock pointer...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 14:03:59 2017 New Revision: 75655 URL: http://svn.reactos.org/svn/reactos?rev=75655&view=rev Log: [SETUPDD]: Add a template Setup Device Driver Helper whose future aim will be to provide user-mode applications access to the kernel-mode PSETUP_LOADER_BLOCK SetupLdrBlock pointer in KeLoaderBlock. Currently the driver just dumps the whole structure on the debug channel. Added: branches/setup_improvements/base/setup/setupdd/ branches/setup_improvements/base/setup/setupdd/CMakeLists.txt (with props) branches/setup_improvements/base/setup/setupdd/dispatch.c (with props) branches/setup_improvements/base/setup/setupdd/setupdd.c (with props) branches/setup_improvements/base/setup/setupdd/setupdd.h (with props) branches/setup_improvements/base/setup/setupdd/setupdd.rc (with props) Modified: branches/setup_improvements/base/setup/CMakeLists.txt Modified: branches/setup_improvements/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/C… ============================================================================== --- branches/setup_improvements/base/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/CMakeLists.txt [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -2,5 +2,6 @@ add_subdirectory(lib) add_subdirectory(reactos) add_subdirectory(setup) +add_subdirectory(setupdd) add_subdirectory(usetup) add_subdirectory(welcome) Added: branches/setup_improvements/base/setup/setupdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/s… ============================================================================== --- branches/setup_improvements/base/setup/setupdd/CMakeLists.txt (added) +++ branches/setup_improvements/base/setup/setupdd/CMakeLists.txt [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -0,0 +1,16 @@ + +# include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) + +list(APPEND SOURCE + dispatch.c + setupdd.c + setupdd.h +) + +add_library(setupdd SHARED ${SOURCE} setupdd.rc) + +set_module_type(setupdd kernelmodedriver) +# target_link_libraries(setupdd ${PSEH_LIB}) +add_importlibs(setupdd ntoskrnl hal) +add_pch(setupdd setupdd.h SOURCE) +add_cd_file(TARGET setupdd DESTINATION reactos/system32 NO_CAB FOR bootcd regtest) Propchange: branches/setup_improvements/base/setup/setupdd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/setupdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/s… ============================================================================== --- branches/setup_improvements/base/setup/setupdd/dispatch.c (added) +++ branches/setup_improvements/base/setup/setupdd/dispatch.c [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -0,0 +1,106 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Device Driver Helper + * FILE: base/setup/setupdd/dispatch.c + * PURPOSE: Dispatching interface + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "setupdd.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +CompleteRequest(IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information) +{ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS NTAPI +CompleteRequestNoInfo(IN PIRP Irp, + IN NTSTATUS Status) +{ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS NTAPI +DispatchHelper(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ +#define HANDLE_CTRL_CODE(Code) \ + case Code : \ + { \ + DPRINT1("SpDd: " #Code ", Stack->FileObject = 0x%p\n", Stack->FileObject); \ + if (Stack->FileObject) \ + { \ + DPRINT1("Stack->FileObject->FileName = %wZ\n", &Stack->FileObject->FileName); \ + } \ + break; \ + } + + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + ULONG MajorFunction = Stack->MajorFunction; + + /* Just display all the IRP codes for now... */ + switch (MajorFunction) + { + HANDLE_CTRL_CODE(IRP_MJ_CREATE); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); + HANDLE_CTRL_CODE(IRP_MJ_CLOSE); + HANDLE_CTRL_CODE(IRP_MJ_READ); + HANDLE_CTRL_CODE(IRP_MJ_WRITE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); + HANDLE_CTRL_CODE(IRP_MJ_SET_EA); + HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); + HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_POWER); + HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_PNP); + // case IRP_MJ_PNP_POWER: + // case IRP_MJ_MAXIMUM_FUNCTION: + + default: + { + DPRINT1("Unknown Major %lu\n", MajorFunction); + break; + } + } + + return CompleteRequest(Irp, STATUS_SUCCESS, 0); +} + +NTSTATUS NTAPI +SpDdDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + DPRINT1("SpDdDispatch\n"); + return DispatchHelper(DeviceObject, Irp); +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/setupdd/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/setupdd/setupdd.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/s… ============================================================================== --- branches/setup_improvements/base/setup/setupdd/setupdd.c (added) +++ branches/setup_improvements/base/setup/setupdd/setupdd.c [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -0,0 +1,410 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Device Driver Helper + * FILE: base/setup/setupdd/setupdd.c + * PURPOSE: Management Functions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "setupdd.h" + +#define NDEBUG +#include <debug.h> + + +/* UTILITY FUNCTIONS **********************************************************/ + +VOID +DumpDetectedDeviceRegistry( + IN PDETECTED_DEVICE_REGISTRY DeviceRegistry) +{ + DbgPrint("DETECTED_DEVICE_REGISTRY 0x%p\n" + " Next = 0x%p\n" + " KeyName = 0x%p '%s'\n" + " ValueName = 0x%p '%s'\n" + " ValueType = %lu\n" + " Buffer = 0x%p\n" + " BufferSize = %lu\n", + DeviceRegistry, + DeviceRegistry->Next, + DeviceRegistry->KeyName, DeviceRegistry->KeyName, + DeviceRegistry->ValueName, DeviceRegistry->ValueName, + DeviceRegistry->ValueType, + DeviceRegistry->Buffer, + DeviceRegistry->BufferSize); + + if (DeviceRegistry->Next) + { + DbgPrint("--> "); + DumpDetectedDeviceRegistry(DeviceRegistry->Next); + } +} + +VOID +DumpDetectedDeviceFile( + IN PDETECTED_DEVICE_FILE DeviceFile) +{ + DbgPrint("DETECTED_DEVICE_FILE 0x%p\n" + " Next = 0x%p\n" + " FileName = 0x%p '%s'\n" + " FileType = %lu\n" + " ConfigName = 0x%p '%s'\n" + " RegistryValueList = 0x%p\n" + " DiskDescription = 0x%p '%s'\n" + " DiskTagfile = 0x%p '%s'\n" + " Directory = 0x%p '%s'\n" + " ArcDeviceName = 0x%p '%s'\n", + DeviceFile, + DeviceFile->Next, + DeviceFile->FileName, DeviceFile->FileName, + DeviceFile->FileType, + DeviceFile->ConfigName, DeviceFile->ConfigName, + DeviceFile->RegistryValueList, + DeviceFile->DiskDescription, DeviceFile->DiskDescription, + DeviceFile->DiskTagfile, DeviceFile->DiskTagfile, + DeviceFile->Directory, DeviceFile->Directory, + DeviceFile->ArcDeviceName, DeviceFile->ArcDeviceName); + + if (DeviceFile->RegistryValueList) + { + DbgPrint("RegistryValueList "); + DumpDetectedDeviceRegistry(DeviceFile->RegistryValueList); + /*DbgPrint("\n");*/ + } + + if (DeviceFile->Next) + { + DbgPrint("--> "); + DumpDetectedDeviceFile(DeviceFile->Next); + } +} + +VOID +DumpPnpHwID( + IN PPNP_HARDWARE_ID PnpHwID) +{ + DbgPrint("PNP_HARDWARE_ID 0x%p\n" + " Next = 0x%p\n" + " Id = 0x%p '%s'\n" + " DriverName = 0x%p '%s'\n" + " ClassGuid = 0x%p '%s'\n", + PnpHwID, + PnpHwID->Next, + PnpHwID->Id, PnpHwID->Id, + PnpHwID->DriverName, PnpHwID->DriverName, + PnpHwID->ClassGuid, PnpHwID->ClassGuid); + + if (PnpHwID->Next) + { + DbgPrint("--> "); + DumpPnpHwID(PnpHwID->Next); + } +} + +VOID +DumpDetectedDevice( + IN PDETECTED_DEVICE DetectedDevice) +{ + DbgPrint("DETECTED_DEVICE 0x%p\n" + " Next = 0x%p\n" + " IdString = 0x%p '%s'\n" + " Ordinal = %lu\n" + " Description = 0x%p '%s'\n" + " ThirdPartyOptionSelected = %s\n" + " FileTypeBits = %lu\n" + " Files = 0x%p\n" + " BaseDllName = 0x%p '%s'\n" + " MigratedDriver = %s\n" + " HardwareIds = 0x%p\n", + DetectedDevice, + DetectedDevice->Next, + DetectedDevice->IdString, DetectedDevice->IdString, + DetectedDevice->Ordinal, + DetectedDevice->Description, DetectedDevice->Description, + DetectedDevice->ThirdPartyOptionSelected ? "TRUE" : "FALSE", + DetectedDevice->FileTypeBits, + DetectedDevice->Files, + DetectedDevice->BaseDllName, DetectedDevice->BaseDllName, + DetectedDevice->MigratedDriver ? "TRUE" : "FALSE", + DetectedDevice->HardwareIds); + /*DbgPrint("\n");*/ + + if (DetectedDevice->Files) + { + DbgPrint("Files "); + DumpDetectedDeviceFile(DetectedDevice->Files); + /*DbgPrint("\n");*/ + } + + if (DetectedDevice->HardwareIds) + { + DbgPrint("HardwareIds "); + DumpPnpHwID(DetectedDevice->HardwareIds); + /*DbgPrint("\n");*/ + } + + if (DetectedDevice->Next) + { + DbgPrint("--> "); + DumpDetectedDevice(DetectedDevice->Next); + } +} + +VOID +DumpDetectedOemSrcDevice( + IN PDETECTED_OEM_SOURCE_DEVICE OemSrcDevice) +{ + DbgPrint("DETECTED_OEM_SOURCE_DEVICE 0x%p\n" + " Next = 0x%p\n" + " ArcDeviceName = 0x%p '%s'\n" + " ImageBase = %lu\n" + " ImageSize = %I64u\n", + OemSrcDevice, + OemSrcDevice->Next, + OemSrcDevice->ArcDeviceName, OemSrcDevice->ArcDeviceName, + OemSrcDevice->ImageBase, + OemSrcDevice->ImageSize); + + if (OemSrcDevice->Next) + { + DbgPrint("--> "); + DumpDetectedOemSrcDevice(OemSrcDevice->Next); + } +} + +VOID +DumpSetupLoaderBlock(IN PSETUP_LOADER_BLOCK SetupLdrBlock) +{ + DbgPrint("SETUP_LOADER_BLOCK 0x%p\n" + " ArcSetupDeviceName = 0x%p '%s'\n" + " VideoDevice = 0x%p\n" + " KeyboardDevices = 0x%p\n" + " ComputerDevice = 0x%p\n" + " ScsiDevices = 0x%p\n" + " ScalarValues: SetupOperation = %lu ; Flags = %lu\n" + " IniFile = 0x%p '%.*s'\n" + " WinntSif = 0x%p '%.*s'\n" + " MigrateInf = 0x%p '%.*s'\n" + " UnsupDriversInf = 0x%p '%.*s'\n" + " BootFontFile = 0x%p\n" + " BootFontFileLength = %lu\n" + " Monitor = 0x%p (TODO!)\n" + " MonitorId = 0x%p '%s'\n" + " BootBusExtenders = 0x%p\n" + " BusExtenders = 0x%p\n" + " InputDevicesSupport = 0x%p\n" + " HardwareIdDatabase = 0x%p\n" + " ComputerName = '%s'\n", + // " IpAddress = %02x.%02x.%02x.%02x\n" + // " SubnetMask = %02x.%02x.%02x.%02x\n" + // " ServerIpAddress = %02x.%02x.%02x.%02x\n" + // " DefaultRouter = %02x.%02x.%02x.%02x\n" + // " DnsNameServer = %02x.%02x.%02x.%02x\n", + + SetupLdrBlock, + SetupLdrBlock->ArcSetupDeviceName, SetupLdrBlock->ArcSetupDeviceName, + &SetupLdrBlock->VideoDevice, + SetupLdrBlock->KeyboardDevices, + &SetupLdrBlock->ComputerDevice, + SetupLdrBlock->ScsiDevices, + SetupLdrBlock->ScalarValues.SetupOperation, + SetupLdrBlock->ScalarValues.AsULong, + SetupLdrBlock->IniFile, SetupLdrBlock->IniFileLength, SetupLdrBlock->IniFile, + SetupLdrBlock->WinntSifFile, SetupLdrBlock->WinntSifFileLength, SetupLdrBlock->WinntSifFile, + SetupLdrBlock->MigrateInfFile, SetupLdrBlock->MigrateInfFileLength, SetupLdrBlock->MigrateInfFile, + SetupLdrBlock->UnsupDriversInfFile, SetupLdrBlock->UnsupDriversInfFileLength, SetupLdrBlock->UnsupDriversInfFile, + SetupLdrBlock->BootFontFile, + SetupLdrBlock->BootFontFileLength, + SetupLdrBlock->Monitor, + SetupLdrBlock->MonitorId, SetupLdrBlock->MonitorId, + SetupLdrBlock->BootBusExtenders, + SetupLdrBlock->BusExtenders, + SetupLdrBlock->InputDevicesSupport, + SetupLdrBlock->HardwareIdDatabase, + SetupLdrBlock->ComputerName // [64] + // SetupLdrBlock->IpAddress, + // SetupLdrBlock->SubnetMask, + // SetupLdrBlock->ServerIpAddress, + // SetupLdrBlock->DefaultRouter, + // SetupLdrBlock->DnsNameServer + ); + // WCHAR NetbootCardHardwareId[64]; + // WCHAR NetbootCardDriverName[24]; + // WCHAR NetbootCardServiceName[24]; + // PCHAR NetbootCardRegistry; + // ULONG NetbootCardRegistryLength; + // PCHAR NetbootCardInfo; + // ULONG NetbootCardInfoLength; + // ULONG Flags; + // PCHAR MachineDirectoryPath; + // PCHAR NetBootSifPath; + // PVOID NetBootSecret; + // CHAR NetBootIMirrorFilePath[260]; + // PCHAR ASRPnPSifFile; + // ULONG ASRPnPSifFileLength; + // CHAR NetBootAdministratorPassword[64]; + /*DbgPrint("\n");*/ + + DbgPrint("VideoDevice "); + DumpDetectedDevice(&SetupLdrBlock->VideoDevice); + DbgPrint("\n"); + + if (SetupLdrBlock->KeyboardDevices) + { + DbgPrint("KeyboardDevices "); + DumpDetectedDevice(SetupLdrBlock->KeyboardDevices); + DbgPrint("\n"); + } + + DbgPrint("ComputerDevice "); + DumpDetectedDevice(&SetupLdrBlock->ComputerDevice); + DbgPrint("\n"); + + if (SetupLdrBlock->ScsiDevices) + { + DbgPrint("ScsiDevices "); + DumpDetectedDevice(SetupLdrBlock->ScsiDevices); + DbgPrint("\n"); + } + + // PMONITOR_CONFIGURATION_DATA Monitor; // TODO!! + + if (SetupLdrBlock->BootBusExtenders) + { + DbgPrint("BootBusExtenders "); + DumpDetectedDevice(SetupLdrBlock->BootBusExtenders); + DbgPrint("\n"); + } + + if (SetupLdrBlock->BusExtenders) + { + DbgPrint("BusExtenders "); + DumpDetectedDevice(SetupLdrBlock->BusExtenders); + DbgPrint("\n"); + } + + if (SetupLdrBlock->InputDevicesSupport) + { + DbgPrint("InputDevicesSupport "); + DumpDetectedDevice(SetupLdrBlock->InputDevicesSupport); + DbgPrint("\n"); + } + + if (SetupLdrBlock->HardwareIdDatabase) + { + DbgPrint("HardwareIdDatabase "); + DumpPnpHwID(SetupLdrBlock->HardwareIdDatabase); + DbgPrint("\n"); + } +} + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +CompleteRequest(IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information); + +/* + * Callback functions prototypes + */ +DRIVER_INITIALIZE DriverEntry; +DRIVER_UNLOAD SpDdUnload; + +DRIVER_DISPATCH SpDdDispatch; +// DRIVER_DISPATCH ConDrvIoCtl; + +DRIVER_DISPATCH SpDdCreate; +DRIVER_DISPATCH SpDdClose; +// DRIVER_DISPATCH ConDrvCleanup; + + +NTSTATUS +NTAPI +SpDdCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return CompleteRequest(Irp, STATUS_SUCCESS, FILE_OPENED); +} + +NTSTATUS +NTAPI +SpDdClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return CompleteRequest(Irp, STATUS_SUCCESS, 0); +} + + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + USHORT i; + + DPRINT1("Loading ReactOS Setup Driver v0.0.1...\n"); + + /* Check whether we have a loader block */ + if (!KeLoaderBlock) + { + DPRINT1("No NT loader block present, quit!\n"); + return STATUS_SUCCESS; + } + DbgPrint("\n" + "Command Line: %s\n" + "ARC Paths: %s %s %s %s\n\n", + KeLoaderBlock->LoadOptions, + KeLoaderBlock->ArcBootDeviceName, + KeLoaderBlock->NtHalPathName, + KeLoaderBlock->ArcHalDeviceName, + KeLoaderBlock->NtBootPathName); + + /* Check whether we have a setup loader block */ + if (!KeLoaderBlock->SetupLdrBlock) + { + DPRINT1("No NT setup loader block present, quit!\n"); + return STATUS_SUCCESS; + } + DumpSetupLoaderBlock(KeLoaderBlock->SetupLdrBlock); + DbgPrint("\n"); + + DriverObject->DriverUnload = SpDdUnload; + + /* Initialize the different callback function pointers */ + for (i = 0 ; i <= IRP_MJ_MAXIMUM_FUNCTION ; ++i) + DriverObject->MajorFunction[i] = SpDdDispatch; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = SpDdCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = SpDdClose; + + // DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ConDrvCleanup; + // DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ConDrvIoCtl; + + Status = STATUS_SUCCESS; + + DPRINT1("Done, Status = 0x%08lx\n", Status); + return Status; +} + +VOID +NTAPI +SpDdUnload( + IN PDRIVER_OBJECT DriverObject) +{ + DPRINT1("Unloading ReactOS Setup Driver v0.0.1...\n"); + + /* Sanity check: No devices must exist at this point */ + ASSERT(DriverObject->DeviceObject == NULL); + + DPRINT1("Done\n"); + return; +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/setupdd/setupdd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/setupdd/setupdd.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/s… ============================================================================== --- branches/setup_improvements/base/setup/setupdd/setupdd.h (added) +++ branches/setup_improvements/base/setup/setupdd/setupdd.h [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Device Driver Helper + * FILE: base/setup/setupdd/setupdd.h + * PURPOSE: Management Functions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef __SETUPDD_H__ +#define __SETUPDD_H__ + +// #pragma once + +/* INCLUDES *******************************************************************/ + +#include <ntddk.h> +#include <ntifs.h> + +#include <ketypes.h> // For KeLoaderBlock +#include <arc/arc.h> +#include <arc/setupblk.h> + +#endif /* __SETUPDD_H__ */ + +/* EOF */ Propchange: branches/setup_improvements/base/setup/setupdd/setupdd.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/setupdd/setupdd.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/s… ============================================================================== --- branches/setup_improvements/base/setup/setupdd/setupdd.rc (added) +++ branches/setup_improvements/base/setup/setupdd/setupdd.rc [iso-8859-1] Wed Aug 23 14:03:59 2017 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup Device Driver Helper" +#define REACTOS_STR_INTERNAL_NAME "setupdd" +#define REACTOS_STR_ORIGINAL_FILENAME "setupdd.sys" +#include <reactos/version.rc> Propchange: branches/setup_improvements/base/setup/setupdd/setupdd.rc ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 4 months

[hbelusca] 75654: [USETUP]: Group constant strings together. In EventThread(), use RtlReAllocateHeap() to resize the pnp-event buffer.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 13:40:43 2017 New Revision: 75654 URL: http://svn.reactos.org/svn/reactos?rev=75654&view=rev Log: [USETUP]: Group constant strings together. In EventThread(), use RtlReAllocateHeap() to resize the pnp-event buffer. Modified: branches/setup_improvements/base/setup/usetup/devinst.c Modified: branches/setup_improvements/base/setup/usetup/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/devinst.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/devinst.c [iso-8859-1] Wed Aug 23 13:40:43 2017 @@ -46,6 +46,9 @@ UNICODE_STRING ImagePathU = RTL_CONSTANT_STRING(L"ImagePath"); UNICODE_STRING StartU = RTL_CONSTANT_STRING(L"Start"); UNICODE_STRING TypeU = RTL_CONSTANT_STRING(L"Type"); + UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); + PWSTR keyboardClass = L"kbdclass\0"; + UNICODE_STRING StringU; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hService; @@ -55,8 +58,6 @@ ULONG Disposition; NTSTATUS Status; BOOLEAN deviceInstalled = FALSE; - UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); - PWSTR keyboardClass = L"kbdclass\0"; /* Check if we know the hardware */ if (!SetupFindFirstLineW(hInf, L"HardwareIdsDatabase", HardwareId, &Context)) @@ -206,6 +207,7 @@ { UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); UNICODE_STRING CompatibleIDsU = RTL_CONSTANT_STRING(L"CompatibleIDs"); + UNICODE_STRING DeviceIdU; OBJECT_ATTRIBUTES ObjectAttributes; LPCWSTR HardwareID; @@ -339,14 +341,15 @@ { UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - PPLUGPLAY_EVENT_BLOCK PnpEvent; + + PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; OBJECT_ATTRIBUTES ObjectAttributes; ULONG PnpEventSize; HINF hInf; HANDLE hEnum, hServices; NTSTATUS Status; - hInf = *(HINF *)lpParameter; + hInf = *(HINF*)lpParameter; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenKey(&hEnum, KEY_QUERY_VALUE, &ObjectAttributes); @@ -366,33 +369,31 @@ } PnpEventSize = 0x1000; - PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); + PnpEvent = RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); if (PnpEvent == NULL) { - NtClose(hEnum); - NtClose(hServices); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto Quit; } for (;;) { DPRINT("Calling NtGetPlugPlayEvent()\n"); - /* Wait for the next pnp event */ + /* Wait for the next PnP event */ Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - /* Resize the buffer for the PnP event if it's too small. */ + /* Resize the buffer for the PnP event if it's too small */ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - RtlFreeHeap(ProcessHeap, 0, PnpEvent); - PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); - if (PnpEvent == NULL) + NewPnpEvent = RtlReAllocateHeap(ProcessHeap, 0, PnpEvent, PnpEventSize); + if (NewPnpEvent == NULL) { - NtClose(hEnum); - NtClose(hServices); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto Quit; } + PnpEvent = NewPnpEvent; continue; } @@ -402,7 +403,7 @@ break; } - /* Process the pnp event */ + /* Process the PnP event */ DPRINT("Received PnP Event\n"); if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) { @@ -414,15 +415,20 @@ DPRINT("Unknown event\n"); } - /* Dequeue the current pnp event and signal the next one */ + /* Dequeue the current PnP event and signal the next one */ NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); } - RtlFreeHeap(ProcessHeap, 0, PnpEvent); + Status = STATUS_SUCCESS; + +Quit: + if (PnpEvent) + RtlFreeHeap(ProcessHeap, 0, PnpEvent); + + NtClose(hServices); NtClose(hEnum); - NtClose(hServices); - - return STATUS_SUCCESS; + + return Status; } DWORD WINAPI

7 years, 4 months

[hbelusca] 75653: [BOOTDATA]: Sync hivesetup.inf

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 12:41:00 2017 New Revision: 75653 URL: http://svn.reactos.org/svn/reactos?rev=75653&view=rev Log: [BOOTDATA]: Sync hivesetup.inf Modified: branches/setup_improvements/boot/bootdata/hivesetup.inf Modified: branches/setup_improvements/boot/bootdata/hivesetup.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… ============================================================================== --- branches/setup_improvements/boot/bootdata/hivesetup.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/hivesetup.inf [iso-8859-1] Wed Aug 23 12:41:00 2017 @@ -1354,6 +1354,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020002,"%SystemRoot%" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIMENG_DEBUG_LEVEL",0x00000000,"4" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIM_DEBUG_LEVEL",0x00000000,"4" ; Known DLLs @@ -2202,6 +2204,142 @@ VIETNAMESE = "Vietnamese" +; LANG_ROMANIAN SUBLANG_NEUTRAL +[Strings.0018] + +; Services names and descriptions +AUDIO_SERVICE="Serviciu audio" +AUDIO_SERVICE_DESCRIPTION="OferÄ aplicaÈiilor funcÈionalitÄÈi audio." + +BITS_SERVICE="Serviciu de transfer inteligent Ã®n fundal" +BITS_SERVICE_DESCRIPTION="TransferÄ fiÈiere Ã®n fundal utilizÃ¢nd lÄÈimea de bandÄ nefolositÄ a reÈelei." + +EVENTLOG_SERVICE="Jurnal de evenimente" +EVENTLOG_SERVICE_DESCRIPTION="JurnalizeazÄ mesajele sau evenimentele transmise de sistemul de operare Ã®ntr-o bazÄ de date accesibilÄ cu instrumentul âobservator de evenimenteâ." + +MSISERVER_SERVICE="Instalare ReactOS" +MSISERVER_SERVICE_DESCRIPTION="ControleazÄ instalarea, mentenanÈa, Èi eliminarea de programe de instalare MSI (Windows Installer)." + +NETLOGON_SERVICE="Autentificare Ã®n reÈea" +NETLOGON_SERVICE_DESCRIPTION="StabileÈte un canal securizat cÄtre un controlor de domentiu pentru autentificarea domeniului." + +PLUGPLAY_SERVICE="Plug and Play" +PLUGPLAY_SERVICE_DESCRIPTION="DetecteazÄ schimbÄrile Ã®n configuraÈia fizicÄ Èi instaleazÄ programele necesare dacÄ este posibil." + +RPCSS_SERVICE="Apel procedural la distanÈÄ" +RPCSS_SERVICE_DESCRIPTION="Subsistemul responsabil pentru apel procedural la distanÈÄ Ã®n calculatorul local." + +SCHEDULE_SERVICE="Serviciu de planificare" +SCHEDULE_SERVICE_DESCRIPTION="Permite pornirea de programe la o anumitÄ orÄ." + +SERVER_SERVICE="Server" +SERVER_SERVICE_DESCRIPTION="Permite partajarea Ã®n reÈea a fiÈierelor, imprimantelor Èi a altor resurse." + +SPOOLER_SERVICE="CoadÄ de imprimare" +SPOOLER_SERVICE_DESCRIPTION="ÃncarcÄ fiÈierele Ã®n memorie pentru imprimare ulterioarÄ." + +TCPSVCS_SERVICE="Servicii TCP/IP simple" +TCPSVCS_SERVICE_DECRIPTION="Permite urmÄtoarele servicii (protocoale) TCP/IP: Chargen, Daytime, Discard, Echo, QOTD." + +TELNETD_SERVICE="Serviciu Telnet" +TELNETD_SERVICE_DESCRIPTION="Serviciul Telnet al ReactOS." + +THEMES_SERVICE="Teme" +THEMES_SERVICE_DESCRIPTION="Permite teme pentru interfaÈa graficÄ de utilizare." + +WINMGMT_SERVICE="InfrastructurÄ de gestiune" +WINMGMT_SERVICE_DESCRIPTION="FurnizeazÄ interfaÈa pentru informaÈiile de gestiune ale sistemului." + +WLANSVC_SERVICE="Serviciu WLAN" +WLANSVC_SERVICE_DESCRIPTION="Serviciu pentru reÈele locale fÄrÄ fir." + +WORKSTATION_SERVICE="StaÈie de lucru" +WORKSTATION_SERVICE_DESCRIPTION="Serviciu responsabil pentru crearea Èi menÈinerea conexiunilor la servere Ã®n reÈea." + +; Keyboard layouts +ALBANIAN = "AlbanezÄ" +ARABIC_101 = "ArabÄ (101)" +ARABIC_102 = "ArabÄ (102)" +ARABIC_102_AZERTY = "ArabÄ (102) AZERTY" +ARMENIAN_EASTERN = "ArmeanÄ EsticÄ" +ARMENIAN_WESTERN = "ArmeanÄ VesticÄ" +ASSAMESE = "AssamezÄ - INSCRIPT" +AZERI_CYRILLIC = "AzerÄ alfabet chirilic" +AZERI_LATIN = "AzerÄ alfabet latin" +BELARUSIAN = "BelarusÄ" +BELGIAN_DUTCH = "BelgianÄ (OlandezÄ)" +BELGIAN_FRENCH = "BelgianÄ (FrancezÄ)" +BENGALI = "BengalezÄ" +BULGARIAN_BDS = "BulgarÄ BDS 5237-1978" +BULGARIAN_PHONETIC = "BulgarÄ, foneticÄ clasicÄ" +BULGARIAN_PHONETIC_BDS = "BulgarÄ, foneticÄ BDS 5237-2006" +BURMESE = "BirmanÄ" +CANADIAN_FRENCH = "CanadianÄ FrancezÄ (moÈtenire)" +CANADIAN_MULTILINGUAL = "CanadianÄ MultilingvÄ Standard" +CROATIAN = "CroatÄ" +CZECH = "CehÄ" +CZECH_QWERTY = "CehÄ (QWERTY)" +DANISH = "DanezÄ" +DEVANAGARI = "Devanagari - INSCRIPT" +DUTCH = "OlandezÄ" +ESTONIAN = "EstonÄ" +GERMAN_ERGO = "GermanÄ (de_ergo)" +GERMAN_NEO = "GermanÄ (NEO-1.1)" +GERMAN_RISTOME = "GermanÄ (RISTOME)" +GERMAN = "GermanÄ" +GREEK = "GreacÄ" +GUJARATI = "Gujarati" +IRISH = "IrlandezÄ" +FINNISH = "FinlandezÄ" +FRENCH = "FrancezÄ" +GEORGIAN = "GeorgianÄ" +HEBREW = "AbraicÄ" +HUNGARIAN = "MaghiarÄ" +ICELANDIC = "IslandezÄ" +ITALIAN = "ItalianÄ" +JAPANESE = "JaponezÄ" +KAZAKH = "KazahÄ" +KOREAN = "CoreeanÄ" +LATIN_AMERICAN = "IberoamericanÄ" +LATVIAN = "LetonÄ" +LITHUANIAN = "LituanianÄ" +MACEDONIAN = "MacedonÄ (FYRO)" +MALAYALAM = "Malayalam" +NORWEGIAN = "NorvegianÄ" +POLISH_214 = "PolonezÄ (214)" +POLISH_PROGRAMMERS = "PolonezÄ (programatori)" +PORTUGESE = "PortughezÄ (Portugalia)" +PORTUGESE_BRAZILIAN% = "PortughezÄ (BrazilianÄ ABNT2)" +ROMANIAN = "RomÃ¢nÄ" +RUSSIAN = "RusÄ" +RUSSIAN_TYPEWRITER = "RusÄ (dactilografiere)" +SERBIAN_CYRILLIC = "SÃ¢rbÄ (alfabet chirilic)" +SERBIAN_LATIN = "SÃ¢rbÄ (alfabet latin)" +SLOVAK = "SlovacÄ" +SLOVAK_QWERTY = "SlovacÄ (QWERTY)" +SPANISH = "SpaniolÄ" +SWEDISH = "SuedezÄ" +SWISS_GERMAN = "ElveÈianÄ (GermanÄ)" +TATAR = "TatarÄ" +THAI_KEDMANEE = "Thai Kedmanee" +THAI_KEDMANEE_NON_SHIFTLOCK = "Thai Kedmanee (non-ShiftLock)" +THAI_PATTACHOTE = "Thai Pattachote" +THAI_PATTACHOTE_NON_SHIFTLOCK = "Thai Pattachote (non-ShiftLock)" +TURKISH_Q = "TurcÄ Q" +TURKISH_F = "TurcÄ F" +UK = "BritanicÄ" +UKRAINIAN = "UkraineanÄ" +UKRAINIAN_STUDENT = "UkraineanÄ (studenÈeascÄ)" +US = "Statele Unite" +US_ARABIC = "EnglezÄ SUA (IBM Arabic 238_L)" +US_DVORAK = "Dvorak SUA" +US_DVORAK_LEFT = "Dvorak SUA pentru mÃ¢na stÃ¢ngÄ" +US_DVORAK_RIGHT = "Dvorak SUA pentru mÃ¢na dreaptÄ" +US_INTERNATIONAL = "SUA internaÈionalÄ" +UZBEK_CYRILLIC = "UzbecÄ (alfabet chirilic)" +VIETNAMESE = "VietnamezÄ" + + ; LANG_RUSSIAN SUBLANG_NEUTRAL [Strings.0019]

7 years, 4 months

[hbelusca] 75652: [SETUPLIB]: Fix build.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 12:29:51 2017 New Revision: 75652 URL: http://svn.reactos.org/svn/reactos?rev=75652&view=rev Log: [SETUPLIB]: Fix build. Modified: branches/setup_improvements/base/setup/lib/arcname.c branches/setup_improvements/base/setup/lib/filesup.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Wed Aug 23 12:29:51 2017 @@ -250,7 +250,7 @@ return Index; } -static ULONG +/* static */ ULONG ArcMatchTokenU( IN PCWSTR CandidateToken, IN const PCWSTR* TokenTable) @@ -773,7 +773,6 @@ } #endif -Quit: if (FAILED(hr)) { /* Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Wed Aug 23 12:29:51 2017 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include "precomp.h" +#include "filesup.h" #define NDEBUG #include <debug.h>

7 years, 4 months

[hbelusca] 75651: [SETUPLIB]: Introduce and use a UnMapAndCloseFile() macro that calls UnMapFile() and NtClose() on handles returned by the OpenAndMapFile() function.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 12:20:15 2017 New Revision: 75651 URL: http://svn.reactos.org/svn/reactos?rev=75651&view=rev Log: [SETUPLIB]: Introduce and use a UnMapAndCloseFile() macro that calls UnMapFile() and NtClose() on handles returned by the OpenAndMapFile() function. Modified: branches/setup_improvements/base/setup/lib/bldrsup.c branches/setup_improvements/base/setup/lib/filesup.h branches/setup_improvements/base/setup/lib/osdetect.c branches/setup_improvements/base/setup/lib/partlist.c branches/setup_improvements/base/setup/lib/setuplib.c Modified: branches/setup_improvements/base/setup/lib/bldrsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bldrsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bldrsup.c [iso-8859-1] Wed Aug 23 12:20:15 2017 @@ -461,8 +461,9 @@ DPRINT1("IniCacheLoadFromMemory() failed (Status 0x%08lx)\n", Status); /* Finally, unmap and close the file */ - UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); - NtClose(BootStore->FileHandle); + UnMapAndCloseFile(BootStore->FileHandle, + BootStore->SectionHandle, + BootStore->ViewBase); RtlFreeHeap(ProcessHeap, 0, BootStore); return Status; @@ -715,8 +716,9 @@ if (BootStore->SectionHandle) { /* Finally, unmap and close the file */ - UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); - NtClose(BootStore->FileHandle); + UnMapAndCloseFile(BootStore->FileHandle, + BootStore->SectionHandle, + BootStore->ViewBase); } else // if (BootStore->FileHandle) { Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Wed Aug 23 12:20:15 2017 @@ -102,4 +102,10 @@ IN HANDLE SectionHandle, IN PVOID BaseAddress); +#define UnMapAndCloseFile(FileHandle, SectionHandle, BaseAddress) \ +do { \ + UnMapFile((SectionHandle), (BaseAddress)); \ + NtClose(FileHandle); \ +} while (1) + /* EOF */ Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Wed Aug 23 12:20:15 2017 @@ -280,7 +280,7 @@ { DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); Status = STATUS_INVALID_IMAGE_FORMAT; - goto UnmapFile; + goto UnmapCloseFile; } /* @@ -291,7 +291,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status); - goto UnmapFile; + goto UnmapCloseFile; } Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); @@ -329,10 +329,9 @@ if (!NT_SUCCESS(Status)) DPRINT1("No version vendor found for file '%S'\n", PathNameToFile); -UnmapFile: +UnmapCloseFile: /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(FileHandle); + UnMapAndCloseFile(FileHandle, SectionHandle, ViewBase); return Success; } Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Wed Aug 23 12:20:15 2017 @@ -838,7 +838,7 @@ continue; } - /* check if the signature already exist */ + /* Check if the signature already exist */ /* FIXME: * Check also signatures from disks, which are * not visible (bootable) by the bios. Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Wed Aug 23 12:20:15 2017 @@ -370,8 +370,7 @@ } /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(UnattendFileHandle); + UnMapAndCloseFile(UnattendFileHandle, SectionHandle, ViewBase); NtClose(FileHandle); #endif

7 years, 4 months

[rgampa] 75650: [USBXHCI] - Fixed GCC build - removed commented out code except for XHCI_ControllerWorkTest functions code. - XHCI_ControllerWorkTest is a test function so the commented code in it ...

by rgampa＠svn.reactos.org

Author: rgampa Date: Wed Aug 23 11:44:56 2017 New Revision: 75650 URL: http://svn.reactos.org/svn/reactos?rev=75650&view=rev Log: [USBXHCI] - Fixed GCC build - removed commented out code except for XHCI_ControllerWorkTest functions code. - XHCI_ControllerWorkTest is a test function so the commented code in it can be used to understand how other functions work - also left out a few debug prints which were commented out to reduce windbg output CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Wed Aug 23 11:44:56 2017 @@ -9,10 +9,10 @@ XHCI_RH_GetRootHubData(IN PVOID xhciExtension, IN PVOID rootHubData) { + + PXHCI_EXTENSION XhciExtension; + PUSBPORT_ROOT_HUB_DATA RootHubData; DPRINT1("XHCI_RH_GetRootHubData: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PUSBPORT_ROOT_HUB_DATA RootHubData; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; DPRINT_RH("XHCI_RH_GetRootHubData: XhciExtension - %p, rootHubData - %p\n", @@ -28,7 +28,6 @@ Identifies a Compound Device: Hub is not part of a compound device. Over-current Protection Mode: Global Over-current Protection. */ - //RootHubData->HubCharacteristics &= 3; RootHubData->HubCharacteristics.AsUSHORT &= 3; RootHubData->PowerOnToPowerGood = 2; RootHubData->HubControlCurrent = 0; @@ -48,13 +47,11 @@ NTAPI XHCI_RH_GetPortStatus(IN PVOID xhciExtension, IN USHORT Port, - IN PULONG PortStatus) -{ - //DPRINT1("XHCI_RH_GetPortStatus: function initiated\n"); commented to remove too many windbg outputs - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - //USBHUB_PORT_STATUS portstatus; + IN PUSB_PORT_STATUS_AND_CHANGE PortStatus) +{ + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; USB_PORT_STATUS_AND_CHANGE portstatus; XhciExtension = (PXHCI_EXTENSION)xhciExtension; @@ -62,58 +59,6 @@ PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer); - /* - ULONG ConnectStatus : 1; // Current Connect Status - ULONG EnableStatus : 1; // Port Enabled/Disabled - ULONG SuspendStatus : 1; - ULONG OverCurrent : 1; - ULONG ResetStatus : 1; - ULONG Reserved1 : 3; - ULONG PowerStatus : 1; - ULONG LsDeviceAttached : 1; // Low-Speed Device Attached - ULONG HsDeviceAttached : 1; // High-speed Device Attached - ULONG TestMode : 1; // Port Test Mode - ULONG IndicatorControl : 1; // Port Indicator Control - ULONG Reserved2 : 3; - ULONG ConnectStatusChange : 1; - ULONG EnableStatusChange : 1; - ULONG SuspendStatusChange : 1; - ULONG OverCurrentChange : 1; - ULONG ResetStatusChange : 1; - ULONG Reserved3 : 3; - ULONG PowerStatusChange : 1; - ULONG LsDeviceAttachedChange : 1; - ULONG HsDeviceAttachedChange : 1; - ULONG TestModeChange : 1; - ULONG IndicatorControlChange : 1; - ULONG Reserved4 : 3; - */ - /* register interface - ULONG CurrentConnectStatus : 1; - ULONG PortEnableDisable : 1; - ULONG RsvdZ1 : 1; - ULONG OverCurrentActive : 1; - ULONG PortReset : 1; - ULONG PortLinkState : 4; - ULONG PortPower : 1; - ULONG PortSpeed : 4; - ULONG PortIndicatorControl : 2; - ULONG LinkWriteStrobe : 1; - ULONG ConnectStatusChange : 1; - ULONG PortEnableDisableChange : 1; - ULONG WarmResetChange : 1; - ULONG OverCurrentChange : 1; - ULONG PortResetChange : 1; - ULONG PortLinkStateChange : 1; - ULONG ConfigErrorChange : 1; - ULONG ColdAttachStatus : 1; - ULONG WakeONConnectEnable : 1; - ULONG WakeONDisconnectEnable : 1; - ULONG WakeONOverCurrentEnable : 1; - ULONG RsvdZ2 : 2; - ULONG DeviceRemovable : 1; - ULONG WarmPortReset : 1; - */ portstatus.AsUlong32 = 0; portstatus.PortStatus.Usb20PortStatus.CurrentConnectStatus = PortStatusRegister.CurrentConnectStatus; @@ -123,12 +68,7 @@ portstatus.PortStatus.Usb20PortStatus.Reset = PortStatusRegister.PortReset; portstatus.PortStatus.Usb20PortStatus.PortPower = PortStatusRegister.PortPower; portstatus.PortStatus.Usb20PortStatus.LowSpeedDeviceAttached = 0;//PortStatusRegister.PortEnableDisabl - //portstatus.PortStatus.Usb20PortStatus.LsDeviceAttached = 0;//PortStatusRegister.PortEnableDisable; - // if (PortStatusRegister.PortSpeed) - //{ // this check is not needed in vmware. removed for testing. - //portstatus.PortStatus.Usb20PortStatus.HsDeviceAttached = PortStatusRegister.CurrentConnectStatus; - portstatus.PortStatus.Usb20PortStatus.HighSpeedDeviceAttached = PortStatusRegister.CurrentConnectStatus; - //} + portstatus.PortStatus.Usb20PortStatus.HighSpeedDeviceAttached = PortStatusRegister.CurrentConnectStatus; portstatus.PortStatus.Usb20PortStatus.PortTestMode = 0;//PortStatusRegister.PortPower; portstatus.PortStatus.Usb20PortStatus.PortIndicatorControl = 0;//PortStatusRegister.PortIndicatorControl; @@ -139,7 +79,7 @@ portstatus.PortChange.Usb20PortChange.OverCurrentIndicatorChange = PortStatusRegister.OverCurrentChange; portstatus.PortChange.Usb20PortChange.ResetChange = PortStatusRegister.PortResetChange; - *PortStatus = portstatus.AsUlong32; + *PortStatus = portstatus; return MP_STATUS_SUCCESS; } @@ -147,10 +87,10 @@ MPSTATUS NTAPI XHCI_RH_GetHubStatus(IN PVOID xhciExtension, - IN PULONG HubStatus) + IN PUSB_HUB_STATUS_AND_CHANGE HubStatus) { //DPRINT1("XHCI_RH_GetHubStatus: function initiated\n"); //removed to reduce windbg output - *HubStatus = 0; + HubStatus->AsUlong32 = 0; return 0; } @@ -176,12 +116,12 @@ XHCI_RH_SetFeaturePortReset(IN PVOID xhciExtension, IN USHORT Port) { + + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; + DPRINT1("XHCI_RH_SetFeaturePortReset: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - - XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); @@ -200,11 +140,11 @@ XHCI_RH_SetFeaturePortPower(IN PVOID xhciExtension, IN USHORT Port) { + + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; DPRINT1("XHCI_RH_SetFeaturePortPower: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); @@ -240,11 +180,11 @@ XHCI_RH_ClearFeaturePortEnable(IN PVOID xhciExtension, IN USHORT Port) { + + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; DPRINT1("XHCI_RH_ClearFeaturePortEnable: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); @@ -301,11 +241,11 @@ XHCI_RH_ClearFeaturePortConnectChange(IN PVOID xhciExtension, IN USHORT Port) { + + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; DPRINT1("XHCI_RH_ClearFeaturePortConnectChange: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); @@ -327,11 +267,11 @@ XHCI_RH_ClearFeaturePortResetChange(IN PVOID xhciExtension, IN USHORT Port) { + + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; DPRINT1("XHCI_RH_ClearFeaturePortResetChange: function initiated\n"); - PXHCI_EXTENSION XhciExtension; - PULONG PortStatusRegPointer; - XHCI_PORT_STATUS_CONTROL PortStatusRegister; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Wed Aug 23 11:44:56 2017 @@ -40,40 +40,28 @@ IN PVOID endpointParameters, IN PULONG EndpointRequirements) { - DPRINT1("XHCI_QueryEndpointRequirements: function initiated\n"); PUSBPORT_ENDPOINT_PROPERTIES EndpointProperties = endpointParameters; ULONG TransferType; - + + DPRINT1("XHCI_QueryEndpointRequirements: function initiated\n"); TransferType = EndpointProperties->TransferType; switch (TransferType) { case USBPORT_TRANSFER_TYPE_ISOCHRONOUS: DPRINT1("XHCI_QueryEndpointRequirements: IsoTransfer\n"); - //EndpointRequirements[1] = OHCI_MAX_ISO_TRANSFER_SIZE; - //EndpointRequirements[0] = sizeof(OHCI_HCD_ED) + - // OHCI_MAX_ISO_TD_COUNT * sizeof(OHCI_HCD_TD); break; case USBPORT_TRANSFER_TYPE_CONTROL: DPRINT1("XHCI_QueryEndpointRequirements: ControlTransfer\n"); - //EndpointRequirements[1] = 0; //OHCI_MAX_CONTROL_TRANSFER_SIZE; - //EndpointRequirements[0] = 0; //sizeof(OHCI_HCD_ED) + - // OHCI_MAX_CONTROL_TD_COUNT * sizeof(OHCI_HCD_TD); break; case USBPORT_TRANSFER_TYPE_BULK: DPRINT1("XHCI_QueryEndpointRequirements: BulkTransfer\n"); - //EndpointRequirements[1] = OHCI_MAX_BULK_TRANSFER_SIZE; - //EndpointRequirements[0] = sizeof(OHCI_HCD_ED) + - // OHCI_MAX_BULK_TD_COUNT * sizeof(OHCI_HCD_TD); break; case USBPORT_TRANSFER_TYPE_INTERRUPT: DPRINT1("XHCI_QueryEndpointRequirements: InterruptTransfer\n"); - //EndpointRequirements[1] = OHCI_MAX_INTERRUPT_TRANSFER_SIZE; - //EndpointRequirements[0] = sizeof(OHCI_HCD_ED) + - // OHCI_MAX_INTERRUPT_TD_COUNT * sizeof(OHCI_HCD_TD); break; default: @@ -246,7 +234,7 @@ IN PXHCI_HC_RESOURCES HcResourcesVA, IN PVOID resourcesStartPA) { - DPRINT1("XHCI_ControllerWorkTest: Initiated.\n"); + /*PULONG DoorBellRegisterBase; //XHCI_DOORBELL Doorbell_0; LARGE_INTEGER CurrentTime = {{0, 0}}; @@ -265,7 +253,9 @@ XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; */ // place a no op command trb on the command ring XHCI_TRB trb; + int i = 0; //XHCI_TRB eventtrb; + DPRINT1("XHCI_ControllerWorkTest: Initiated.\n"); trb.CommandTRB.NoOperation.RsvdZ1 = 0; trb.CommandTRB.NoOperation.RsvdZ2 = 0; trb.CommandTRB.NoOperation.RsvdZ3 = 0; @@ -273,7 +263,7 @@ trb.CommandTRB.NoOperation.RsvdZ4 = 0; trb.CommandTRB.NoOperation.TRBType = NO_OP_COMMAND; trb.CommandTRB.NoOperation.RsvdZ5 = 0; - for(int i=0; i<256; i++){ + for(i=0; i<256; i++){ XHCI_SendCommand(trb,XhciExtension); //XHCI_ProcessEvent(XhciExtension); @@ -352,11 +342,10 @@ IN PVOID resourcesStartVA, IN PVOID resourcesStartPA) { - DPRINT1("XHCI_InitializeResources: function initiated\n"); + PXHCI_HC_RESOURCES HcResourcesVA; PHYSICAL_ADDRESS HcResourcesPA; - PULONG BaseIoAdress; PULONG OperationalRegs; USHORT PageSize; USHORT MaxScratchPadBuffers; @@ -376,7 +365,9 @@ PMDL ScratchPadArrayMDL; PXHCI_SCRATCHPAD_BUFFER_ARRAY BufferArrayPointer; PMDL ScratchPadBufferMDL; - + int i = 0; + + DPRINT1("XHCI_InitializeResources: function initiated\n"); DPRINT_XHCI("XHCI_InitializeResources: BaseVA - %p, BasePA - %p\n", resourcesStartVA, resourcesStartPA); @@ -387,7 +378,6 @@ HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; XhciExtension->HcResourcesPA = HcResourcesPA; - BaseIoAdress = XhciExtension->BaseIoAdress; OperationalRegs = XhciExtension->OperationalRegs; //DCBAA init @@ -399,7 +389,7 @@ // command ring intialisation. HcResourcesVA->CommandRing.enqueue_pointer = &(HcResourcesVA->CommandRing.firstSeg.XhciTrb[0]); HcResourcesVA->CommandRing.dequeue_pointer = &(HcResourcesVA->CommandRing.firstSeg.XhciTrb[0]); - for (int i=0; i<256; i++) + for (i=0; i<256; i++) { HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].GenericTRB.Word0 = 0; HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].GenericTRB.Word1 = 0; @@ -468,7 +458,7 @@ // intially enque and deque are equal. - for (int i=0; i<256; i++) + for (i=0; i<256; i++) { HcResourcesVA->EventRing.firstSeg.XhciTrb[i].GenericTRB.Word0 = 0; HcResourcesVA->EventRing.firstSeg.XhciTrb[i].GenericTRB.Word1 = 0; @@ -484,7 +474,6 @@ { // xHCI may declare 0 scratchpad arrays. if so there is no need for memory allocation. return MP_STATUS_SUCCESS; } - //if ((PageSize & (1 << 0)) == 0){ // this is how it is implemented in Haiko if ((PageSize & (1 << 0)) == 0) { DPRINT1("XHCI_InitializeResources : fail. does not support 4k page size %p\n",PageSize); @@ -528,7 +517,7 @@ MmFreeContiguousMemory(BufferArrayPointer); return MP_STATUS_FAILURE; } - for (int i = 0; i < MaxScratchPadBuffers ; i++) + for (i = 0; i < MaxScratchPadBuffers ; i++) { BufferArrayPointer[i].AsULONGLONG = MmGetMdlPfnArray(ScratchPadBufferMDL)[i] << PAGE_SHIFT; } @@ -541,7 +530,6 @@ NTAPI XHCI_InitializeHardware(IN PXHCI_EXTENSION XhciExtension) { - DPRINT1("XHCI_InitializeHardware: function initiated\n"); PULONG BaseIoAdress; PULONG OperationalRegs; XHCI_USB_COMMAND Command; @@ -551,6 +539,7 @@ XHCI_HC_STRUCTURAL_PARAMS_1 StructuralParams_1; XHCI_CONFIGURE Config; + DPRINT1("XHCI_InitializeHardware: function initiated\n"); DPRINT1("XHCI_InitializeHardware: ... \n"); OperationalRegs = XhciExtension->OperationalRegs; @@ -604,7 +593,7 @@ XHCI_StartController(IN PVOID xhciExtension, IN PUSBPORT_RESOURCES Resources) { - DPRINT1("XHCI_StartController: function initiated\n"); + PXHCI_EXTENSION XhciExtension; PULONG BaseIoAdress; PULONG OperationalRegs; @@ -621,6 +610,7 @@ USHORT MaxScratchPadBuffers; XHCI_HC_STRUCTURAL_PARAMS_2 HCSPARAMS2; + DPRINT1("XHCI_StartController: function initiated\n"); if ((Resources->ResourcesTypes & (USBPORT_RESOURCES_MEMORY | USBPORT_RESOURCES_INTERRUPT)) != (USBPORT_RESOURCES_MEMORY | USBPORT_RESOURCES_INTERRUPT)) { @@ -709,13 +699,14 @@ XHCI_StopController(IN PVOID xhciExtension, IN BOOLEAN IsDoDisableInterrupts) { - DPRINT1("XHCI_StopController: Function initiated. FIXME\n"); + PXHCI_EXTENSION XhciExtension; USHORT MaxScratchPadBuffers; PMDL ScratchPadArrayMDL; PMDL ScratchPadBufferMDL; PXHCI_SCRATCHPAD_BUFFER_ARRAY BufferArrayPointer; + DPRINT1("XHCI_StopController: Function initiated. FIXME\n"); XhciExtension = (PXHCI_EXTENSION) xhciExtension; MaxScratchPadBuffers = XhciExtension->MaxScratchPadBuffers; // free memory allocated to scratchpad buffers. @@ -738,20 +729,22 @@ NTAPI XHCI_SuspendController(IN PVOID xhciExtension) { + + PXHCI_EXTENSION XhciExtension; DPRINT1("XHCI_SuspendController: function initiated\n"); + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + + XhciExtension->Flags |= XHCI_FLAGS_CONTROLLER_SUSPEND; + +} + +MPSTATUS +NTAPI +XHCI_ResumeController(IN PVOID xhciExtension) +{ + PXHCI_EXTENSION XhciExtension; - XhciExtension = (PXHCI_EXTENSION)xhciExtension; - - XhciExtension->Flags |= XHCI_FLAGS_CONTROLLER_SUSPEND; - -} - -MPSTATUS -NTAPI -XHCI_ResumeController(IN PVOID xhciExtension) -{ DPRINT1("XHCI_ResumeController: function initiated\n"); - PXHCI_EXTENSION XhciExtension; XhciExtension = (PXHCI_EXTENSION)xhciExtension; XhciExtension->Flags &= ~XHCI_FLAGS_CONTROLLER_SUSPEND; @@ -771,11 +764,12 @@ NTAPI XHCI_InterruptService(IN PVOID xhciExtension) { - DPRINT1("XHCI_InterruptService: function initiated\n"); + PULONG RunTimeRegisterBase; XHCI_INTERRUPTER_MANAGEMENT Iman; PXHCI_EXTENSION XhciExtension; + DPRINT1("XHCI_InterruptService: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; RunTimeRegisterBase = XhciExtension->RunTimeRegisterBase; @@ -883,7 +877,6 @@ NTAPI XHCI_CheckController(IN PVOID xhciExtension) { - //RegPacket.UsbPortInvalidateController(xhciExtension, 2); //DPRINT1("XHCI_CheckController: function initiated\n"); } @@ -906,14 +899,13 @@ NTAPI XHCI_EnableInterrupts(IN PVOID xhciExtension) { - DPRINT1("XHCI_EnableInterrupts: function initiated\n"); + PXHCI_EXTENSION XhciExtension; - PULONG OperationalRegs; PULONG RunTimeRegisterBase; XHCI_INTERRUPTER_MANAGEMENT Iman; + DPRINT1("XHCI_EnableInterrupts: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; - OperationalRegs = XhciExtension->OperationalRegs; RunTimeRegisterBase = XhciExtension->RunTimeRegisterBase; Iman.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN); @@ -926,14 +918,12 @@ NTAPI XHCI_DisableInterrupts(IN PVOID xhciExtension) { - DPRINT1("XHCI_DisableInterrupts: function initiated\n"); + PXHCI_EXTENSION XhciExtension; - PULONG OperationalRegs; PULONG RunTimeRegisterBase; XHCI_INTERRUPTER_MANAGEMENT Iman; - + DPRINT1("XHCI_DisableInterrupts: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; - OperationalRegs = XhciExtension->OperationalRegs; RunTimeRegisterBase = XhciExtension -> RunTimeRegisterBase; Iman.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN); @@ -949,10 +939,8 @@ { //DPRINT1("XHCI_PollController: function initiated\n"); commented out to reduce windbg output PXHCI_EXTENSION XhciExtension; - PULONG OperationalRegs; XhciExtension = (PXHCI_EXTENSION)xhciExtension; - OperationalRegs = XhciExtension->OperationalRegs; if (!(XhciExtension->Flags & XHCI_FLAGS_CONTROLLER_SUSPEND)) { Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Wed Aug 23 11:44:56 2017 @@ -136,7 +136,6 @@ ULONG TRBType : 6; ULONG RsvdZ5 : 16; }; - //ULONG AsULONG; } XHCI_LINK_TRB; C_ASSERT(sizeof(XHCI_LINK_TRB) == 16); @@ -460,13 +459,13 @@ XHCI_RH_GetPortStatus( IN PVOID xhciExtension, IN USHORT Port, - IN PULONG PortStatus); + IN PUSB_PORT_STATUS_AND_CHANGE PortStatus); MPSTATUS NTAPI XHCI_RH_GetHubStatus( IN PVOID xhciExtension, - IN PULONG HubStatus); + IN PUSB_HUB_STATUS_AND_CHANGE HubStatus); MPSTATUS NTAPI

7 years, 4 months

[hbelusca] 75649: Sync with trunk r75648.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 11:33:57 2017 New Revision: 75649 URL: http://svn.reactos.org/svn/reactos?rev=75649&view=rev Log: Sync with trunk r75648. Added: branches/setup_improvements/dll/appcompat/shims/layer/vmhorizon.c - copied unchanged from r75648, trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c branches/setup_improvements/dll/shellext/stobject/hotplug.cpp - copied unchanged from r75648, trunk/reactos/dll/shellext/stobject/hotplug.cpp branches/setup_improvements/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp - copied unchanged from r75648, trunk/reactos/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp branches/setup_improvements/dll/win32/ucdfs/ - copied from r75648, trunk/reactos/dll/win32/ucdfs/ branches/setup_improvements/drivers/filesystems/fs_rec/cdfs.h - copied unchanged from r75648, trunk/reactos/drivers/filesystems/fs_rec/cdfs.h branches/setup_improvements/sdk/lib/fslib/cdfslib/ - copied from r75648, trunk/reactos/sdk/lib/fslib/cdfslib/ Removed: branches/setup_improvements/media/rapps/utorrent.txt Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/base/applications/calc/lang/ro-RO.rc branches/setup_improvements/base/applications/fltmc/CMakeLists.txt branches/setup_improvements/base/applications/fltmc/fltmc.cpp branches/setup_improvements/base/applications/mscutils/servman/lang/ro-RO.rc branches/setup_improvements/base/applications/mspaint/CMakeLists.txt branches/setup_improvements/base/applications/mspaint/dib.cpp branches/setup_improvements/base/applications/rapps/lang/ro-RO.rc branches/setup_improvements/base/services/eventlog/eventlog.h branches/setup_improvements/base/services/eventlog/file.c branches/setup_improvements/base/services/nfsd/CMakeLists.txt branches/setup_improvements/base/services/nfsd/readwrite.c branches/setup_improvements/base/setup/reactos/lang/ro-RO.rc branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/welcome/lang/ro-RO.rc branches/setup_improvements/base/shell/cmd/lang/ro-RO.rc branches/setup_improvements/base/shell/explorer/explorer.rc branches/setup_improvements/base/shell/explorer/lang/bg-BG.rc branches/setup_improvements/base/shell/explorer/lang/cs-CZ.rc branches/setup_improvements/base/shell/explorer/lang/de-DE.rc branches/setup_improvements/base/shell/explorer/lang/en-US.rc branches/setup_improvements/base/shell/explorer/lang/es-ES.rc branches/setup_improvements/base/shell/explorer/lang/fr-FR.rc branches/setup_improvements/base/shell/explorer/lang/he-IL.rc branches/setup_improvements/base/shell/explorer/lang/it-IT.rc branches/setup_improvements/base/shell/explorer/lang/ja-JP.rc branches/setup_improvements/base/shell/explorer/lang/ko-KR.rc branches/setup_improvements/base/shell/explorer/lang/lt-LT.rc branches/setup_improvements/base/shell/explorer/lang/ms-MY.rc branches/setup_improvements/base/shell/explorer/lang/nl-NL.rc branches/setup_improvements/base/shell/explorer/lang/no-NO.rc branches/setup_improvements/base/shell/explorer/lang/pl-PL.rc branches/setup_improvements/base/shell/explorer/lang/pt-BR.rc branches/setup_improvements/base/shell/explorer/lang/ro-RO.rc branches/setup_improvements/base/shell/explorer/lang/ru-RU.rc branches/setup_improvements/base/shell/explorer/lang/sk-SK.rc branches/setup_improvements/base/shell/explorer/lang/sq-AL.rc branches/setup_improvements/base/shell/explorer/lang/tr-TR.rc branches/setup_improvements/base/shell/explorer/lang/uk-UA.rc branches/setup_improvements/base/shell/explorer/lang/zh-CN.rc branches/setup_improvements/base/shell/explorer/lang/zh-TW.rc branches/setup_improvements/base/shell/explorer/trayprop.cpp branches/setup_improvements/base/system/autochk/autochk.c branches/setup_improvements/base/system/userinit/lang/ro-RO.rc branches/setup_improvements/boot/CMakeLists.txt branches/setup_improvements/boot/bootdata/bootcd/unattend.inf branches/setup_improvements/boot/bootdata/hivesft.inf branches/setup_improvements/boot/bootdata/hivesys.inf branches/setup_improvements/boot/bootdata/txtsetup.sif branches/setup_improvements/boot/freeldr/bootsect/fat32.S branches/setup_improvements/boot/freeldr/freeldr/include/arch/pc/x86common.h branches/setup_improvements/dll/appcompat/apphelp/apphelp.h branches/setup_improvements/dll/appcompat/apphelp/shimeng.c branches/setup_improvements/dll/appcompat/apphelp/shimeng.h branches/setup_improvements/dll/appcompat/shims/layer/CMakeLists.txt branches/setup_improvements/dll/cpl/console/lang/ro-RO.rc branches/setup_improvements/dll/cpl/desk/lang/ro-RO.rc branches/setup_improvements/dll/cpl/mmsys/lang/ro-RO.rc branches/setup_improvements/dll/directx/wine/wined3d/context.c branches/setup_improvements/dll/shellext/acppage/CLayerUIPropPage.cpp branches/setup_improvements/dll/shellext/acppage/lang/ro-RO.rc branches/setup_improvements/dll/shellext/stobject/CMakeLists.txt branches/setup_improvements/dll/shellext/stobject/csystray.cpp branches/setup_improvements/dll/shellext/stobject/lang/cs-CZ.rc branches/setup_improvements/dll/shellext/stobject/lang/de-DE.rc branches/setup_improvements/dll/shellext/stobject/lang/en-US.rc branches/setup_improvements/dll/shellext/stobject/lang/es-ES.rc branches/setup_improvements/dll/shellext/stobject/lang/fr-FR.rc branches/setup_improvements/dll/shellext/stobject/lang/it-IT.rc branches/setup_improvements/dll/shellext/stobject/lang/ro-RO.rc branches/setup_improvements/dll/shellext/stobject/lang/ru-RU.rc branches/setup_improvements/dll/shellext/stobject/lang/tr-TR.rc branches/setup_improvements/dll/shellext/stobject/lang/zh-CN.rc branches/setup_improvements/dll/shellext/stobject/lang/zh-TW.rc branches/setup_improvements/dll/shellext/stobject/power.cpp branches/setup_improvements/dll/shellext/stobject/precomp.h branches/setup_improvements/dll/shellext/stobject/stobject.cpp branches/setup_improvements/dll/shellext/stobject/stobject.rc branches/setup_improvements/dll/shellext/stobject/volume.cpp branches/setup_improvements/dll/win32/CMakeLists.txt branches/setup_improvements/dll/win32/advapi32/reg/reg.c branches/setup_improvements/dll/win32/browseui/lang/ro-RO.rc branches/setup_improvements/dll/win32/browseui/res/barbtn.bmp branches/setup_improvements/dll/win32/comctl32/commctrl.c branches/setup_improvements/dll/win32/kernel32/client/file/filemap.c branches/setup_improvements/dll/win32/kernel32/client/time.c branches/setup_improvements/dll/win32/kernel32/winnls/lang/ro-RO.rc branches/setup_improvements/dll/win32/ole32/clipboard.c branches/setup_improvements/dll/win32/setupapi/cfgmgr.c branches/setup_improvements/dll/win32/setupapi/setupapi.spec branches/setup_improvements/dll/win32/shell32/CDefView.cpp branches/setup_improvements/dll/win32/shell32/CDefViewBckgrndMenu.cpp branches/setup_improvements/dll/win32/shell32/CDefaultContextMenu.cpp branches/setup_improvements/dll/win32/shell32/CMakeLists.txt branches/setup_improvements/dll/win32/shell32/CNewMenu.cpp branches/setup_improvements/dll/win32/shell32/CNewMenu.h branches/setup_improvements/dll/win32/shell32/CShellLink.cpp branches/setup_improvements/dll/win32/shell32/dialogs/folder_options.cpp branches/setup_improvements/dll/win32/shell32/droptargets/CFSDropTarget.cpp branches/setup_improvements/dll/win32/shell32/droptargets/CFSDropTarget.h branches/setup_improvements/dll/win32/shell32/folders/CDesktopFolder.cpp branches/setup_improvements/dll/win32/shell32/folders/CFSFolder.cpp branches/setup_improvements/dll/win32/shell32/folders/CFSFolder.h branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.h branches/setup_improvements/dll/win32/shell32/iconcache.cpp branches/setup_improvements/dll/win32/shell32/lang/bg-BG.rc branches/setup_improvements/dll/win32/shell32/lang/ca-ES.rc branches/setup_improvements/dll/win32/shell32/lang/cs-CZ.rc branches/setup_improvements/dll/win32/shell32/lang/da-DK.rc branches/setup_improvements/dll/win32/shell32/lang/de-DE.rc branches/setup_improvements/dll/win32/shell32/lang/el-GR.rc branches/setup_improvements/dll/win32/shell32/lang/en-GB.rc branches/setup_improvements/dll/win32/shell32/lang/en-US.rc branches/setup_improvements/dll/win32/shell32/lang/es-ES.rc branches/setup_improvements/dll/win32/shell32/lang/fi-FI.rc branches/setup_improvements/dll/win32/shell32/lang/fr-FR.rc branches/setup_improvements/dll/win32/shell32/lang/he-IL.rc branches/setup_improvements/dll/win32/shell32/lang/hu-HU.rc branches/setup_improvements/dll/win32/shell32/lang/it-IT.rc branches/setup_improvements/dll/win32/shell32/lang/ja-JP.rc branches/setup_improvements/dll/win32/shell32/lang/ko-KR.rc branches/setup_improvements/dll/win32/shell32/lang/nl-NL.rc branches/setup_improvements/dll/win32/shell32/lang/no-NO.rc branches/setup_improvements/dll/win32/shell32/lang/pl-PL.rc branches/setup_improvements/dll/win32/shell32/lang/pt-BR.rc branches/setup_improvements/dll/win32/shell32/lang/pt-PT.rc branches/setup_improvements/dll/win32/shell32/lang/ro-RO.rc branches/setup_improvements/dll/win32/shell32/lang/ru-RU.rc branches/setup_improvements/dll/win32/shell32/lang/sk-SK.rc branches/setup_improvements/dll/win32/shell32/lang/sl-SI.rc branches/setup_improvements/dll/win32/shell32/lang/sq-AL.rc branches/setup_improvements/dll/win32/shell32/lang/sv-SE.rc branches/setup_improvements/dll/win32/shell32/lang/tr-TR.rc branches/setup_improvements/dll/win32/shell32/lang/uk-UA.rc branches/setup_improvements/dll/win32/shell32/lang/zh-CN.rc branches/setup_improvements/dll/win32/shell32/lang/zh-TW.rc branches/setup_improvements/dll/win32/shell32/shelldesktop/CMakeLists.txt branches/setup_improvements/dll/win32/shell32/shlfolder.cpp branches/setup_improvements/dll/win32/shell32/shresdef.h branches/setup_improvements/dll/win32/shell32/wine/pidl.c branches/setup_improvements/dll/win32/shlwapi/ordinal.c branches/setup_improvements/dll/win32/syssetup/lang/ja-JP.rc branches/setup_improvements/dll/win32/syssetup/lang/ro-RO.rc branches/setup_improvements/dll/win32/uxtheme/nonclient.c branches/setup_improvements/dll/win32/uxtheme/system.c branches/setup_improvements/dll/win32/uxtheme/themehooks.c branches/setup_improvements/dll/win32/wlanapi/main.c branches/setup_improvements/drivers/filesystems/cdfs/cdfs.c branches/setup_improvements/drivers/filesystems/cdfs/cdfs.h branches/setup_improvements/drivers/filesystems/cdfs/cleanup.c branches/setup_improvements/drivers/filesystems/cdfs/close.c branches/setup_improvements/drivers/filesystems/cdfs/create.c branches/setup_improvements/drivers/filesystems/cdfs/dispatch.c branches/setup_improvements/drivers/filesystems/cdfs/fcb.c branches/setup_improvements/drivers/filesystems/cdfs/fsctl.c branches/setup_improvements/drivers/filesystems/cdfs/volinfo.c branches/setup_improvements/drivers/filesystems/fs_rec/cdfs.c branches/setup_improvements/drivers/filesystems/fs_rec/fs_rec.c branches/setup_improvements/drivers/filesystems/fs_rec/udfs.c branches/setup_improvements/drivers/usb/usbhub_new/usbhub.c branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32-WaveRT.inf (contents, props changed) branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32.inf (contents, props changed) branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64-WaveRT.inf (contents, props changed) branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64.inf (contents, props changed) branches/setup_improvements/drivers/wdm/audio/hdaudbus/fdo.cpp branches/setup_improvements/media/sdb/sysmain.xml branches/setup_improvements/ntoskrnl/config/cmkcbncb.c branches/setup_improvements/ntoskrnl/config/cmsysini.c branches/setup_improvements/ntoskrnl/ex/sysinfo.c branches/setup_improvements/ntoskrnl/include/internal/cm_x.h branches/setup_improvements/ntoskrnl/include/internal/mm.h branches/setup_improvements/ntoskrnl/mm/ARM3/virtual.c branches/setup_improvements/ntoskrnl/mm/marea.c branches/setup_improvements/ntoskrnl/ps/kill.c branches/setup_improvements/sdk/include/crt/intrin.h branches/setup_improvements/sdk/include/crt/msc/intrin.h branches/setup_improvements/sdk/include/ddk/ndis.h branches/setup_improvements/sdk/include/ndk/exfuncs.h branches/setup_improvements/sdk/include/psdk/dbghelp.h branches/setup_improvements/sdk/include/psdk/gdiplusbrush.h branches/setup_improvements/sdk/include/psdk/gdiplusgraphics.h branches/setup_improvements/sdk/include/psdk/gdiplusheaders.h branches/setup_improvements/sdk/include/psdk/gdiplusmatrix.h branches/setup_improvements/sdk/include/psdk/gdipluspen.h branches/setup_improvements/sdk/include/psdk/ntdddisk.h branches/setup_improvements/sdk/include/psdk/sdkddkver.h branches/setup_improvements/sdk/lib/atl/atlsimpstr.h branches/setup_improvements/sdk/lib/delayimp/delayimp.c branches/setup_improvements/sdk/lib/evtlib/evtlib.c branches/setup_improvements/sdk/lib/evtlib/evtlib.h branches/setup_improvements/sdk/lib/fslib/CMakeLists.txt branches/setup_improvements/subsystems/mvdm/ntvdm/hardware/video/svga.c branches/setup_improvements/win32ss/drivers/font/ftfd/rosglue.c branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c branches/setup_improvements/win32ss/gdi/dib/dib32bpp.c branches/setup_improvements/win32ss/gdi/ntgdi/dibobj.c branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c branches/setup_improvements/win32ss/user/ntuser/clipboard.c branches/setup_improvements/win32ss/user/user32/windows/class.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/fltmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/fltmc/fltmc.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/dib.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/service… Modified: branches/setup_improvements/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/service… Modified: branches/setup_improvements/base/services/nfsd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/service… Modified: branches/setup_improvements/base/services/nfsd/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/service… Modified: branches/setup_improvements/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/w… Modified: branches/setup_improvements/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/c… Modified: branches/setup_improvements/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… Modified: branches/setup_improvements/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… Modified: branches/setup_improvements/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/CMakeLi… Modified: branches/setup_improvements/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… Modified: branches/setup_improvements/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/shimeng.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/layer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/cons… Modified: branches/setup_improvements/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/desk… Modified: branches/setup_improvements/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/mmsy… Modified: branches/setup_improvements/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/directx/… Modified: branches/setup_improvements/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/acppage/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/power.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/CM… Modified: branches/setup_improvements/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ad… Modified: branches/setup_improvements/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/res/barbtn.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/co… Modified: branches/setup_improvements/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ol… Modified: branches/setup_improvements/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/se… Modified: branches/setup_improvements/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/se… Modified: branches/setup_improvements/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CDefViewBckgrndMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CNewMenu.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/droptargets/CFSDropTarget.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/droptargets/CFSDropTarget.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/shelldesktop/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sy… Modified: branches/setup_improvements/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sy… Modified: branches/setup_improvements/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/wl… Modified: branches/setup_improvements/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/fs_rec/cdfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/usb/… Modified: branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x32.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64-WaveRT.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/drivers/CMIDriver/CM8738-x64.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Removed: branches/setup_improvements/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/rapps/… Modified: branches/setup_improvements/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/sdb/sy… Modified: branches/setup_improvements/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/ex/… Modified: branches/setup_improvements/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/inc… Modified: branches/setup_improvements/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/inc… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/ps/… Modified: branches/setup_improvements/sdk/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/atl/… Modified: branches/setup_improvements/sdk/lib/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/dela… Modified: branches/setup_improvements/sdk/lib/evtlib/evtlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/evtl… Modified: branches/setup_improvements/sdk/lib/evtlib/evtlib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/evtl… Modified: branches/setup_improvements/sdk/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/subsystems/m… Modified: branches/setup_improvements/win32ss/drivers/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/gdi/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user… Modified: branches/setup_improvements/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user…

7 years, 4 months

[rgampa] 75648: [USBXHCI] - small changes after merging with the trunk CORE-13344

by rgampa＠svn.reactos.org

Author: rgampa Date: Wed Aug 23 11:05:53 2017 New Revision: 75648 URL: http://svn.reactos.org/svn/reactos?rev=75648&view=rev Log: [USBXHCI] - small changes after merging with the trunk CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Wed Aug 23 11:05:53 2017 @@ -28,7 +28,8 @@ Identifies a Compound Device: Hub is not part of a compound device. Over-current Protection Mode: Global Over-current Protection. */ - RootHubData->HubCharacteristics &= 3; + //RootHubData->HubCharacteristics &= 3; + RootHubData->HubCharacteristics.AsUSHORT &= 3; RootHubData->PowerOnToPowerGood = 2; RootHubData->HubControlCurrent = 0; } @@ -53,7 +54,8 @@ PXHCI_EXTENSION XhciExtension; PULONG PortStatusRegPointer; XHCI_PORT_STATUS_CONTROL PortStatusRegister; - USBHUB_PORT_STATUS portstatus; + //USBHUB_PORT_STATUS portstatus; + USB_PORT_STATUS_AND_CHANGE portstatus; XhciExtension = (PXHCI_EXTENSION)xhciExtension; ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); @@ -112,33 +114,32 @@ ULONG DeviceRemovable : 1; ULONG WarmPortReset : 1; */ - portstatus.AsULONG = 0; - portstatus.UsbPortStatus.ConnectStatus = PortStatusRegister.CurrentConnectStatus; - portstatus.UsbPortStatus.EnableStatus = PortStatusRegister.PortEnableDisable; - portstatus.UsbPortStatus.SuspendStatus = 0;//PortStatusRegister.PortEnableDisable; - portstatus.UsbPortStatus.OverCurrent = PortStatusRegister.OverCurrentActive; - portstatus.UsbPortStatus.ResetStatus = PortStatusRegister.PortReset; - portstatus.UsbPortStatus.PowerStatus = PortStatusRegister.PortPower; - portstatus.UsbPortStatus.LsDeviceAttached = 0;//PortStatusRegister.PortEnableDisable; + + portstatus.AsUlong32 = 0; + portstatus.PortStatus.Usb20PortStatus.CurrentConnectStatus = PortStatusRegister.CurrentConnectStatus; + portstatus.PortStatus.Usb20PortStatus.PortEnabledDisabled = PortStatusRegister.PortEnableDisable; + portstatus.PortStatus.Usb20PortStatus.Suspend = 0;//PortStatusRegister.PortEnableDisable; + portstatus.PortStatus.Usb20PortStatus.OverCurrent = PortStatusRegister.OverCurrentActive; + portstatus.PortStatus.Usb20PortStatus.Reset = PortStatusRegister.PortReset; + portstatus.PortStatus.Usb20PortStatus.PortPower = PortStatusRegister.PortPower; + portstatus.PortStatus.Usb20PortStatus.LowSpeedDeviceAttached = 0;//PortStatusRegister.PortEnableDisabl + //portstatus.PortStatus.Usb20PortStatus.LsDeviceAttached = 0;//PortStatusRegister.PortEnableDisable; // if (PortStatusRegister.PortSpeed) //{ // this check is not needed in vmware. removed for testing. - portstatus.UsbPortStatus.HsDeviceAttached = PortStatusRegister.CurrentConnectStatus; + //portstatus.PortStatus.Usb20PortStatus.HsDeviceAttached = PortStatusRegister.CurrentConnectStatus; + portstatus.PortStatus.Usb20PortStatus.HighSpeedDeviceAttached = PortStatusRegister.CurrentConnectStatus; //} - portstatus.UsbPortStatus.TestMode = 0;//PortStatusRegister.PortPower; - portstatus.UsbPortStatus.IndicatorControl = 0;//PortStatusRegister.PortIndicatorControl; - - portstatus.UsbPortStatusChange.ConnectStatusChange = PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.EnableStatusChange = PortStatusRegister.PortEnableDisableChange; - portstatus.UsbPortStatusChange.SuspendStatusChange = 0;//PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.OverCurrentChange = PortStatusRegister.OverCurrentChange; - portstatus.UsbPortStatusChange.ResetStatusChange = PortStatusRegister.PortResetChange; - portstatus.UsbPortStatusChange.PowerStatusChange = 0;//PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.LsDeviceAttachedChange = 0;//PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.HsDeviceAttachedChange = PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.TestModeChange = 0;//PortStatusRegister.ConnectStatusChange; - portstatus.UsbPortStatusChange.IndicatorControlChange = 0;// PortStatusRegister.ConnectStatusChange; - - *PortStatus = portstatus.AsULONG; + + portstatus.PortStatus.Usb20PortStatus.PortTestMode = 0;//PortStatusRegister.PortPower; + portstatus.PortStatus.Usb20PortStatus.PortIndicatorControl = 0;//PortStatusRegister.PortIndicatorControl; + + portstatus.PortChange.Usb20PortChange.ConnectStatusChange = PortStatusRegister.ConnectStatusChange; + portstatus.PortChange.Usb20PortChange.PortEnableDisableChange = PortStatusRegister.PortEnableDisableChange; + portstatus.PortChange.Usb20PortChange.SuspendChange = 0;//PortStatusRegister.ConnectStatusChange; + portstatus.PortChange.Usb20PortChange.OverCurrentIndicatorChange = PortStatusRegister.OverCurrentChange; + portstatus.PortChange.Usb20PortChange.ResetChange = PortStatusRegister.PortResetChange; + + *PortStatus = portstatus.AsUlong32; return MP_STATUS_SUCCESS; } Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Wed Aug 23 11:05:53 2017 @@ -423,7 +423,7 @@ CommandLinkTRB.GenericTRB.Word3 = 0; RingStartAddr.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.firstSeg); - CommandLinkTRB.GenericTRB.RsvdZ1 = 0; + CommandLinkTRB.LinkTRB.RsvdZ1 = 0; CommandLinkTRB.LinkTRB.RingSegmentPointerLo = RingStartAddr.RingSegmentPointerLo; CommandLinkTRB.LinkTRB.RingSegmentPointerHi = RingStartAddr.RingSegmentPointerHi; CommandLinkTRB.LinkTRB.InterrupterTarget = 0; @@ -621,11 +621,11 @@ USHORT MaxScratchPadBuffers; XHCI_HC_STRUCTURAL_PARAMS_2 HCSPARAMS2; - if ((Resources->TypesResources & (USBPORT_RESOURCES_MEMORY | USBPORT_RESOURCES_INTERRUPT)) != + if ((Resources->ResourcesTypes & (USBPORT_RESOURCES_MEMORY | USBPORT_RESOURCES_INTERRUPT)) != (USBPORT_RESOURCES_MEMORY | USBPORT_RESOURCES_INTERRUPT)) { - DPRINT1("XHCI_StartController: Resources->TypesResources - %x\n", - Resources->TypesResources); + DPRINT1("XHCI_StartController: Resources->ResourcesTypes - %x\n", + Resources->ResourcesTypes); return MP_STATUS_ERROR; }

7 years, 4 months

[tfaber] 75647: [USBXHCI] - Adjust build system to new directory layout

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Aug 23 10:16:40 2017 New Revision: 75647 URL: http://svn.reactos.org/svn/reactos?rev=75647&view=rev Log: [USBXHCI] - Adjust build system to new directory layout Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Wed Aug 23 10:16:40 2017 @@ -1,8 +1,8 @@ add_subdirectory(usbccgp) add_subdirectory(usbd) add_subdirectory(usbehci) -add_subdirectory(usbhub) -#add_subdirectory(usbhub_new) +#add_subdirectory(usbhub) +add_subdirectory(usbhub_new) add_subdirectory(usbohci) add_subdirectory(usbport) add_subdirectory(usbstor) Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt [iso-8859-1] Wed Aug 23 10:16:40 2017 @@ -1,3 +1,5 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE #debug.c Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Wed Aug 23 10:16:40 2017 @@ -7,7 +7,7 @@ #include <hubbusif.h> #include <usbbusif.h> #include <usbdlib.h> -#include "..\usbmport.h" +#include <usbport/usbmport.h> #include "hardware.h" extern USBPORT_REGISTRATION_PACKET RegPacket;

7 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017