Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 75254: [PSDK] Patch by Vadim Galyant: - Add USB port status change constants and structures - Add USB hub descriptor type constants and missing device class constants
by tfaber＠svn.reactos.org 01 Jul '17

01 Jul '17

Author: tfaber Date: Sat Jul 1 06:19:26 2017 New Revision: 75254 URL: http://svn.reactos.org/svn/reactos?rev=75254&view=rev Log: [PSDK] Patch by Vadim Galyant: - Add USB port status change constants and structures - Add USB hub descriptor type constants and missing device class constants Modified: trunk/reactos/sdk/include/psdk/usb200.h Modified: trunk/reactos/sdk/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/usb200.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] Sat Jul 1 06:19:26 2017 @@ -127,20 +127,6 @@ UCHAR iFunction; } USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR; -typedef union _USB_20_PORT_CHANGE { - USHORT AsUshort16; - struct { - USHORT ConnectStatusChange:1; - USHORT PortEnableDisableChange:1; - USHORT SuspendChange:1; - USHORT OverCurrentIndicatorChange:1; - USHORT ResetChange:1; - USHORT Reserved2:11; - }; -} USB_20_PORT_CHANGE, *PUSB_20_PORT_CHANGE; - -C_ASSERT(sizeof(USB_20_PORT_CHANGE) == sizeof(USHORT)); - typedef union _USB_20_PORT_STATUS { USHORT AsUshort16; struct { @@ -162,6 +148,29 @@ C_ASSERT(sizeof(USB_20_PORT_STATUS) == sizeof(USHORT)); +#define USB_PORT_STATUS_CONNECT 0x0001 +#define USB_PORT_STATUS_ENABLE 0x0002 +#define USB_PORT_STATUS_SUSPEND 0x0004 +#define USB_PORT_STATUS_OVER_CURRENT 0x0008 +#define USB_PORT_STATUS_RESET 0x0010 +#define USB_PORT_STATUS_POWER 0x0100 +#define USB_PORT_STATUS_LOW_SPEED 0x0200 +#define USB_PORT_STATUS_HIGH_SPEED 0x0400 + +typedef union _USB_20_PORT_CHANGE { + USHORT AsUshort16; + struct { + USHORT ConnectStatusChange:1; + USHORT PortEnableDisableChange:1; + USHORT SuspendChange:1; + USHORT OverCurrentIndicatorChange:1; + USHORT ResetChange:1; + USHORT Reserved2:11; + }; +} USB_20_PORT_CHANGE, *PUSB_20_PORT_CHANGE; + +C_ASSERT(sizeof(USB_20_PORT_CHANGE) == sizeof(USHORT)); + typedef union _USB_30_PORT_STATUS { USHORT AsUshort16; struct { @@ -179,12 +188,62 @@ C_ASSERT(sizeof(USB_30_PORT_STATUS) == sizeof(USHORT)); +#define PORT_LINK_STATE_U0 0 +#define PORT_LINK_STATE_U1 1 +#define PORT_LINK_STATE_U2 2 +#define PORT_LINK_STATE_U3 3 +#define PORT_LINK_STATE_DISABLED 4 +#define PORT_LINK_STATE_RX_DETECT 5 +#define PORT_LINK_STATE_INACTIVE 6 +#define PORT_LINK_STATE_POLLING 7 +#define PORT_LINK_STATE_RECOVERY 8 +#define PORT_LINK_STATE_HOT_RESET 9 +#define PORT_LINK_STATE_COMPLIANCE_MODE 10 +#define PORT_LINK_STATE_LOOPBACK 11 +#define PORT_LINK_STATE_TEST_MODE 11 // xHCI-specific, replacing LOOPBACK + +typedef union _USB_30_PORT_CHANGE { + USHORT AsUshort16; + struct { + USHORT ConnectStatusChange :1; + USHORT Reserved2 :2; + USHORT OverCurrentIndicatorChange :1; + USHORT ResetChange :1; + USHORT BHResetChange :1; + USHORT PortLinkStateChange :1; + USHORT PortConfigErrorChange :1; + USHORT Reserved3 :8; + }; +} USB_30_PORT_CHANGE, *PUSB_30_PORT_CHANGE; + +C_ASSERT(sizeof(USB_30_PORT_CHANGE) == sizeof(USHORT)); + typedef union _USB_PORT_STATUS { USHORT AsUshort16; USB_20_PORT_STATUS Usb20PortStatus; USB_30_PORT_STATUS Usb30PortStatus; } USB_PORT_STATUS, *PUSB_PORT_STATUS; +C_ASSERT(sizeof(USB_PORT_STATUS) == sizeof(USHORT)); + +typedef union _USB_PORT_CHANGE { + USHORT AsUshort16; + USB_20_PORT_CHANGE Usb20PortChange; + USB_30_PORT_CHANGE Usb30PortChange; +} USB_PORT_CHANGE, *PUSB_PORT_CHANGE; + +C_ASSERT(sizeof(USB_PORT_CHANGE) == sizeof(USHORT)); + +typedef union _USB_PORT_STATUS_AND_CHANGE { + ULONG AsUlong32; + struct { + USB_PORT_STATUS PortStatus; + USB_PORT_CHANGE PortChange; + }; +} USB_PORT_STATUS_AND_CHANGE, *PUSB_PORT_STATUS_AND_CHANGE; + +C_ASSERT(sizeof(USB_PORT_STATUS_AND_CHANGE) == sizeof(ULONG)); + typedef union _USB_HUB_STATUS { USHORT AsUshort16; struct { @@ -216,6 +275,9 @@ } USB_HUB_STATUS_AND_CHANGE, *PUSB_HUB_STATUS_AND_CHANGE; C_ASSERT(sizeof(USB_HUB_STATUS_AND_CHANGE) == sizeof(ULONG)); + +#define USB_20_HUB_DESCRIPTOR_TYPE 0x29 +#define USB_30_HUB_DESCRIPTOR_TYPE 0x2A #define USB_DEVICE_CLASS_RESERVED 0x00 #define USB_DEVICE_CLASS_AUDIO 0x01 @@ -233,6 +295,8 @@ #define USB_DEVICE_CLASS_CONTENT_SECURITY 0x0D #define USB_DEVICE_CLASS_VIDEO 0x0E #define USB_DEVICE_CLASS_PERSONAL_HEALTHCARE 0x0F +#define USB_DEVICE_CLASS_AUDIO_VIDEO 0x10 +#define USB_DEVICE_CLASS_BILLBOARD 0x11 #define USB_DEVICE_CLASS_DIAGNOSTIC_DEVICE 0xDC #define USB_DEVICE_CLASS_WIRELESS_CONTROLLER 0xE0 #define USB_DEVICE_CLASS_MISCELLANEOUS 0xEF

1 0

[tfaber] 75253: [USBPORT] Patch by Vadim Galyant: - Add USBPORT_HUB_CHARACTERISTICS structure - Indicate the USB3 hub descriptor type when the miniport is an XHCI controller
by tfaber＠svn.reactos.org 01 Jul '17

01 Jul '17

Author: tfaber Date: Sat Jul 1 06:06:12 2017 New Revision: 75253 URL: http://svn.reactos.org/svn/reactos?rev=75253&view=rev Log: [USBPORT] Patch by Vadim Galyant: - Add USBPORT_HUB_CHARACTERISTICS structure - Indicate the USB3 hub descriptor type when the miniport is an XHCI controller Modified: trunk/reactos/drivers/usb/usbport/roothub.c trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/roothu… ============================================================================== --- trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] Sat Jul 1 06:06:12 2017 @@ -853,9 +853,27 @@ RH_HubDescriptor = &PdoExtension->RootHubDescriptors->Descriptor; RH_HubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR) + 2 * NumMaskByte; - RH_HubDescriptor->bDescriptorType = 0x29; // USB_20_HUB_DESCRIPTOR_TYPE - need add in .h file + + if (Packet->MiniPortVersion == USB_MINIPORT_VERSION_OHCI || + Packet->MiniPortVersion == USB_MINIPORT_VERSION_UHCI || + Packet->MiniPortVersion == USB_MINIPORT_VERSION_EHCI) + { + RH_HubDescriptor->bDescriptorType = 0x29; // #define USB_20_HUB_DESCRIPTOR_TYPE 0x29 - need add in .h file + } + else if (Packet->MiniPortVersion == USB_MINIPORT_VERSION_XHCI) + { + RH_HubDescriptor->bDescriptorType = 0x2A; // #define USB_30_HUB_DESCRIPTOR_TYPE 0x2A - need add in .h file + } + else + { + DPRINT1("USBPORT_RootHubCreateDevice: Unknown MiniPortVersion - %x\n", + Packet->MiniPortVersion); + + DbgBreakPoint(); + } + RH_HubDescriptor->bNumberOfPorts = RootHubData.NumberOfPorts; - RH_HubDescriptor->wHubCharacteristics = RootHubData.HubCharacteristics; + RH_HubDescriptor->wHubCharacteristics = RootHubData.HubCharacteristics.AsUSHORT; RH_HubDescriptor->bPowerOnToPowerGood = RootHubData.PowerOnToPowerGood; RH_HubDescriptor->bHubControlCurrent = RootHubData.HubControlCurrent; Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Sat Jul 1 06:06:12 2017 @@ -453,6 +453,7 @@ #define USB_MINIPORT_VERSION_OHCI 0x01 #define USB_MINIPORT_VERSION_UHCI 0x02 #define USB_MINIPORT_VERSION_EHCI 0x03 +#define USB_MINIPORT_VERSION_XHCI 0x04 #define USB_MINIPORT_FLAGS_INTERRUPT 0x0001 #define USB_MINIPORT_FLAGS_PORT_IO 0x0002 @@ -625,9 +626,53 @@ C_ASSERT(sizeof(USBPORT_TRANSFER_PARAMETERS) == 28); +/* For USB1.1 or USB3 Hub Descriptors */ +typedef union _USBPORT_HUB_11_CHARACTERISTICS { + struct { + USHORT PowerControlMode :1; + USHORT NoPowerSwitching :1; // Reserved. Used only on 1.0 compliant hubs that implement no power switching. + USHORT PartOfCompoundDevice :1; + USHORT OverCurrentProtectionMode :1; + USHORT NoOverCurrentProtection :1; + USHORT Reserved1 :11; + }; + USHORT AsUSHORT; +} USBPORT_HUB_11_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_11_CHARACTERISTICS) == sizeof(USHORT)); + +/* For USB2.0 Hub Descriptors */ +typedef union _USBPORT_HUB_20_CHARACTERISTICS { + struct { + USHORT PowerControlMode :1; + USHORT NoPowerSwitching :1; // Reserved. Used only on 1.0 compliant hubs that implement no power switching. + USHORT PartOfCompoundDevice :1; + USHORT OverCurrentProtectionMode :1; + USHORT NoOverCurrentProtection :1; + USHORT TtThinkTime :2; + USHORT PortIndicatorsSupported :1; + USHORT Reserved1 :8; + }; + USHORT AsUSHORT; +} USBPORT_HUB_20_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_20_CHARACTERISTICS) == sizeof(USHORT)); + +typedef USBPORT_HUB_11_CHARACTERISTICS USBPORT_HUB_30_CHARACTERISTICS; + +typedef union _USBPORT_HUB_CHARACTERISTICS { + USHORT AsUSHORT; + USBPORT_HUB_11_CHARACTERISTICS Usb11HubCharacteristics; + USBPORT_HUB_20_CHARACTERISTICS Usb20HubCharacteristics; + USBPORT_HUB_30_CHARACTERISTICS Usb30HubCharacteristics; +} USBPORT_HUB_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_CHARACTERISTICS) == sizeof(USHORT)); + typedef struct _USBPORT_ROOT_HUB_DATA { ULONG NumberOfPorts; - ULONG HubCharacteristics; + USBPORT_HUB_CHARACTERISTICS HubCharacteristics; + USHORT Padded1; ULONG PowerOnToPowerGood; ULONG HubControlCurrent; } USBPORT_ROOT_HUB_DATA, *PUSBPORT_ROOT_HUB_DATA;

1 0

[jimtabor] 75252: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888.
by jimtabor＠svn.reactos.org 01 Jul '17

01 Jul '17

Author: jimtabor Date: Sat Jul 1 02:35:28 2017 New Revision: 75252 URL: http://svn.reactos.org/svn/reactos?rev=75252&view=rev Log: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888. Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Sat Jul 1 02:35:28 2017 @@ -303,7 +303,7 @@ if (!dc->dclevel.pSurface) { - return FALSE; + return TRUE; } DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);

1 0

[jimtabor] 75251: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888.
by jimtabor＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: jimtabor Date: Fri Jun 30 23:23:33 2017 New Revision: 75251 URL: http://svn.reactos.org/svn/reactos?rev=75251&view=rev Log: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888. Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Jun 30 23:23:33 2017 @@ -597,7 +597,7 @@ psurf = dc->dclevel.pSurface; if (!psurf) { - ret = FALSE; + ret = TRUE; goto cleanup; } @@ -1085,7 +1085,7 @@ if (!dc->dclevel.pSurface) { - Ret = FALSE; + Ret = TRUE; goto cleanup; } Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Jun 30 23:23:33 2017 @@ -5147,6 +5147,13 @@ goto good; } + if (!dc->dclevel.pSurface) + { + /* Memory DC with no surface selected */ + DC_UnlockDc(dc); + return TRUE; + } + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { IntLPtoDP(dc, (POINT *)lprc, 2); @@ -5171,11 +5178,6 @@ MaskRect.top = 0; BrushOrigin.x = 0; BrushOrigin.y = 0; - - if (!dc->dclevel.pSurface) - { - goto fail; - } if ((fuOptions & ETO_OPAQUE) && lprc) {

1 0

[hbelusca] 75250: [USETUP]: Move SetDefaultPagefile() into settings.c and remove the now-empty registry.c/.h files.
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 22:46:15 2017 New Revision: 75250 URL: http://svn.reactos.org/svn/reactos?rev=75250&view=rev Log: [USETUP]: Move SetDefaultPagefile() into settings.c and remove the now-empty registry.c/.h files. Removed: branches/setup_improvements/base/setup/usetup/registry.c branches/setup_improvements/base/setup/usetup/registry.h Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/settings.c branches/setup_improvements/base/setup/usetup/settings.h branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Jun 30 22:46:15 2017 @@ -29,7 +29,6 @@ mui.c partlist.c progress.c - registry.c settings.c usetup.h) Removed: branches/setup_improvements/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/registry.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/registry.c (removed) @@ -1,70 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/registry.c - * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "usetup.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID -SetDefaultPagefile( - WCHAR Drive) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"PagingFiles"); - WCHAR ValueBuffer[] = L"?:\\pagefile.sys 0 0\0"; - HANDLE KeyHandle; - NTSTATUS Status; - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return; - - ValueBuffer[0] = Drive; - - NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)&ValueBuffer, - sizeof(ValueBuffer)); - - NtClose(KeyHandle); -} - -/* EOF */ Removed: branches/setup_improvements/base/setup/usetup/registry.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/registry.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/registry.h (removed) @@ -1,33 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/registry.h - * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl - */ - -#pragma once - -VOID -SetDefaultPagefile( - WCHAR Drive); - -/* EOF */ Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Fri Jun 30 22:46:15 2017 @@ -180,7 +180,6 @@ return ret; } - static BOOLEAN GetComputerIdentifier( @@ -374,7 +373,6 @@ return List; } - static BOOLEAN @@ -542,7 +540,6 @@ return FALSE; } - PGENERIC_LIST CreateDisplayDriverList( HINF InfFile) @@ -670,7 +667,6 @@ return TRUE; } - BOOLEAN ProcessDisplayRegistry( @@ -830,7 +826,6 @@ return TRUE; } - BOOLEAN ProcessLocaleRegistry( PGENERIC_LIST List) @@ -992,13 +987,11 @@ return List; } - ULONG GetDefaultLanguageIndex(VOID) { return DefaultLanguageIndex; } - PGENERIC_LIST CreateLanguageList( @@ -1077,7 +1070,6 @@ return List; } - PGENERIC_LIST CreateKeyboardLayoutList( @@ -1215,7 +1207,6 @@ return TRUE; } - #if 0 BOOLEAN ProcessKeyboardLayoutFiles( @@ -1224,7 +1215,6 @@ return TRUE; } #endif - BOOLEAN SetGeoID( @@ -1268,4 +1258,40 @@ return TRUE; } + +BOOLEAN +SetDefaultPagefile( + WCHAR Drive) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"PagingFiles"); + WCHAR ValueBuffer[] = L"?:\\pagefile.sys 0 0\0"; + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return FALSE; + + ValueBuffer[0] = Drive; + + NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_MULTI_SZ, + (PVOID)&ValueBuffer, + sizeof(ValueBuffer)); + + NtClose(KeyHandle); + return TRUE; +} + /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] Fri Jun 30 22:46:15 2017 @@ -21,7 +21,8 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/settings.h * PURPOSE: Device settings support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Colin Finck */ #pragma once @@ -78,4 +79,8 @@ SetGeoID( PWCHAR Id); +BOOLEAN +SetDefaultPagefile( + WCHAR Drive); + /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Fri Jun 30 22:46:15 2017 @@ -65,7 +65,6 @@ #include "infros.h" #include "filequeue.h" #endif -#include "registry.h" #include "fslist.h" #include "partlist.h" #include "cabinet.h"

1 0

[hbelusca] 75249: [USETUP]: Move SetupDeleteFile(), SetupCopyFile() and SetupMoveFile() from usetup code into the setuplib's filesup.c . Remove the commented-out IsValidPath() in that file too. And...
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 22:28:06 2017 New Revision: 75249 URL: http://svn.reactos.org/svn/reactos?rev=75249&view=rev Log: [USETUP]: Move SetupDeleteFile(), SetupCopyFile() and SetupMoveFile() from usetup code into the setuplib's filesup.c . Remove the commented-out IsValidPath() in that file too. And remove the temporary prototypes in regutil.c . Modified: branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h branches/setup_improvements/base/setup/lib/regutil.c branches/setup_improvements/base/setup/usetup/filesup.c branches/setup_improvements/base/setup/usetup/filesup.h 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] Fri Jun 30 22:28:06 2017 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/filesup.c * PURPOSE: File support functions - * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Eric Kohl + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *****************************************************************/ @@ -13,30 +14,401 @@ #define NDEBUG #include <debug.h> + +// ACHTUNG! HAXX FIXME!! +#define _SEH2_TRY +#define _SEH2_LEAVE goto __SEH2_FINALLY__label; +#define _SEH2_FINALLY __SEH2_FINALLY__label: +#define _SEH2_END + + /* FUNCTIONS ****************************************************************/ -#if 0 - -BOOLEAN -IsValidPath( - IN PWCHAR InstallDir, - IN ULONG Length) -{ - UINT i; - - // TODO: Add check for 8.3 too. - - /* Check for whitespaces */ - for (i = 0; i < Length; i++) - { - if (iswspace(InstallDir[i])) - return FALSE; - } - - return TRUE; -} - -#endif +// TODO: Move SetupCreateDirectory later... + +NTSTATUS +SetupDeleteFile( + IN PCWSTR FileName, + IN BOOLEAN ForceDelete) // ForceDelete can be used to delete read-only files +{ + NTSTATUS Status; + UNICODE_STRING NtPathU; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + FILE_DISPOSITION_INFORMATION FileDispInfo; + BOOLEAN RetryOnce = FALSE; + + /* Open the directory name that was passed in */ + RtlInitUnicodeString(&NtPathU, FileName); + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + +Retry: // We go back there once if RetryOnce == TRUE + Status = NtOpenFile(&FileHandle, + DELETE | FILE_READ_ATTRIBUTES | + (RetryOnce ? FILE_WRITE_ATTRIBUTES : 0), + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile failed with Status 0x%08lx\n", Status); + return Status; + } + + if (RetryOnce) + { + FILE_BASIC_INFORMATION FileInformation; + + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileInformation, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationFile failed with Status 0x%08lx\n", Status); + NtClose(FileHandle); + return Status; + } + + FileInformation.FileAttributes = FILE_ATTRIBUTE_NORMAL; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileInformation, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed with Status 0x%08lx\n", Status); + return Status; + } + } + + /* Ask for the file to be deleted */ + FileDispInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileDispInfo, + sizeof(FILE_DISPOSITION_INFORMATION), + FileDispositionInformation); + NtClose(FileHandle); + + if (!NT_SUCCESS(Status)) + DPRINT1("Deletion of file '%S' failed, Status 0x%08lx\n", FileName, Status); + + // FIXME: Check the precise value of Status! + if (!NT_SUCCESS(Status) && ForceDelete && !RetryOnce) + { + /* Retry once */ + RetryOnce = TRUE; + goto Retry; + } + + /* Return result to the caller */ + return Status; +} + +NTSTATUS +SetupCopyFile( + IN PCWSTR SourceFileName, + IN PCWSTR DestinationFileName, + IN BOOLEAN FailIfExists) +{ + NTSTATUS Status; + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE FileHandleSource; + HANDLE FileHandleDest; + IO_STATUS_BLOCK IoStatusBlock; + FILE_STANDARD_INFORMATION FileStandard; + FILE_BASIC_INFORMATION FileBasic; + ULONG RegionSize; + HANDLE SourceFileSection; + PVOID SourceFileMap = NULL; + SIZE_T SourceSectionSize = 0; + LARGE_INTEGER ByteOffset; + + RtlInitUnicodeString(&FileName, SourceFileName); + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandleSource, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SEQUENTIAL_ONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); + goto done; + } + + Status = NtQueryInformationFile(FileHandleSource, + &IoStatusBlock, + &FileStandard, + sizeof(FILE_STANDARD_INFORMATION), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationFile failed: %x\n", Status); + goto closesrc; + } + + Status = NtQueryInformationFile(FileHandleSource, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationFile failed: %x\n", Status); + goto closesrc; + } + + Status = NtCreateSection(&SourceFileSection, + SECTION_MAP_READ, + NULL, + NULL, + PAGE_READONLY, + SEC_COMMIT, + FileHandleSource); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSection failed: %x, %S\n", Status, SourceFileName); + goto closesrc; + } + + Status = NtMapViewOfSection(SourceFileSection, + NtCurrentProcess(), + &SourceFileMap, + 0, + 0, + NULL, + &SourceSectionSize, + ViewUnmap, + 0, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtMapViewOfSection failed: %x, %S\n", Status, SourceFileName); + goto closesrcsec; + } + + RtlInitUnicodeString(&FileName, DestinationFileName); + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&FileHandleDest, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FileBasic.FileAttributes, // FILE_ATTRIBUTE_NORMAL, + 0, + FailIfExists ? FILE_CREATE : FILE_OVERWRITE_IF, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); + goto unmapsrcsec; + } + + RegionSize = (ULONG)PAGE_ROUND_UP(FileStandard.EndOfFile.u.LowPart); + IoStatusBlock.Status = 0; + ByteOffset.QuadPart = 0ULL; + Status = NtWriteFile(FileHandleDest, + NULL, + NULL, + NULL, + &IoStatusBlock, + SourceFileMap, + RegionSize, + &ByteOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile failed: %x:%x, iosb: %p src: %p, size: %x\n", + Status, IoStatusBlock.Status, &IoStatusBlock, SourceFileMap, RegionSize); + goto closedest; + } + + /* Copy file date/time from source file */ + Status = NtSetInformationFile(FileHandleDest, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed: %x\n", Status); + goto closedest; + } + + /* Shorten the file back to its real size after completing the write */ + Status = NtSetInformationFile(FileHandleDest, + &IoStatusBlock, + &FileStandard.EndOfFile, + sizeof(FILE_END_OF_FILE_INFORMATION), + FileEndOfFileInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed: %x\n", Status); + } + +closedest: + NtClose(FileHandleDest); + +unmapsrcsec: + NtUnmapViewOfSection(NtCurrentProcess(), SourceFileMap); + +closesrcsec: + NtClose(SourceFileSection); + +closesrc: + NtClose(FileHandleSource); + +done: + return Status; +} + +/* + * Synchronized with its kernel32 counterpart, but we don't manage reparse points here. + */ +NTSTATUS +SetupMoveFile( + IN PCWSTR ExistingFileName, + IN PCWSTR NewFileName, + IN ULONG Flags) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILE_RENAME_INFORMATION RenameInfo; + UNICODE_STRING NewPathU, ExistingPathU; + HANDLE SourceHandle = NULL; + BOOLEAN ReplaceIfExists; + + RtlInitUnicodeString(&ExistingPathU, ExistingFileName); + RtlInitUnicodeString(&NewPathU, NewFileName); + + _SEH2_TRY + { + ReplaceIfExists = !!(Flags & MOVEFILE_REPLACE_EXISTING); + + /* Unless we manage a proper opening, we'll attempt to reopen without reparse support */ + InitializeObjectAttributes(&ObjectAttributes, + &ExistingPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + /* Attempt to open source file */ + Status = NtOpenFile(&SourceHandle, + FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_FOR_BACKUP_INTENT | ((Flags & MOVEFILE_WRITE_THROUGH) ? FILE_WRITE_THROUGH : 0)); + if (!NT_SUCCESS(Status)) + { + if (Status != STATUS_INVALID_PARAMETER) + { + _SEH2_LEAVE; + } + } + + /* At that point, we MUST have a source handle */ + ASSERT(SourceHandle); + + /* Allocate renaming buffer and fill it */ + RenameInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, NewPathU.Length + sizeof(FILE_RENAME_INFORMATION)); + if (RenameInfo == NULL) + { + Status = STATUS_NO_MEMORY; + _SEH2_LEAVE; + } + + RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length); + RenameInfo->ReplaceIfExists = ReplaceIfExists; + RenameInfo->RootDirectory = NULL; + RenameInfo->FileNameLength = NewPathU.Length; + + /* Attempt to rename the file */ + Status = NtSetInformationFile(SourceHandle, + &IoStatusBlock, + RenameInfo, + NewPathU.Length + sizeof(FILE_RENAME_INFORMATION), + FileRenameInformation); + RtlFreeHeap(RtlGetProcessHeap(), 0, RenameInfo); + if (NT_SUCCESS(Status)) + { + /* If it succeeded, all fine, quit */ + _SEH2_LEAVE; + } + /* + * If we failed for any other reason than not the same device, fail. + * If we failed because of different devices, only allow renaming + * if user allowed copy. + */ + if (Status != STATUS_NOT_SAME_DEVICE || !(Flags & MOVEFILE_COPY_ALLOWED)) + { + /* ReactOS hack! To be removed once all FSD have proper renaming support + * Just leave status to error and leave + */ + if (Status == STATUS_NOT_IMPLEMENTED) + { + DPRINT1("Forcing copy, renaming not supported by FSD\n"); + } + else + { + _SEH2_LEAVE; + } + } + + /* Close the source file */ + NtClose(SourceHandle); + SourceHandle = NULL; + + /* Perform the file copy */ + Status = SetupCopyFile(ExistingFileName, + NewFileName, + !ReplaceIfExists); + + /* If it succeeded, delete the source file */ + if (NT_SUCCESS(Status)) + { + /* Force-delete files even if read-only */ + SetupDeleteFile(ExistingFileName, TRUE); + } + } + _SEH2_FINALLY + { + if (SourceHandle) + NtClose(SourceHandle); + } + _SEH2_END; + + return Status; +} HRESULT ConcatPathsV( 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] Fri Jun 30 22:28:06 2017 @@ -3,18 +3,36 @@ * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/filesup.h * PURPOSE: File support functions - * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Eric Kohl + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once -#if 0 +NTSTATUS +SetupDeleteFile( + IN PCWSTR FileName, + IN BOOLEAN ForceDelete); // ForceDelete can be used to delete read-only files -BOOLEAN -IsValidPath( - IN PWCHAR InstallDir, - IN ULONG Length); +NTSTATUS +SetupCopyFile( + IN PCWSTR SourceFileName, + IN PCWSTR DestinationFileName, + IN BOOLEAN FailIfExists); + +#ifndef _WINBASE_ + +#define MOVEFILE_REPLACE_EXISTING 1 +#define MOVEFILE_COPY_ALLOWED 2 +#define MOVEFILE_WRITE_THROUGH 8 + #endif + +NTSTATUS +SetupMoveFile( + IN PCWSTR ExistingFileName, + IN PCWSTR NewFileName, + IN ULONG Flags); HRESULT ConcatPathsV( Modified: branches/setup_improvements/base/setup/lib/regutil.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/regutil.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/regutil.c [iso-8859-1] Fri Jun 30 22:28:06 2017 @@ -15,27 +15,6 @@ #define NDEBUG #include <debug.h> - - -// HACK!! These functions should actually be moved in the setup lib! -// For the moment, see usetup/filesup.c (or .h) -#if 1 - -NTSTATUS -SetupCopyFile( - IN PCWSTR SourceFileName, - IN PCWSTR DestinationFileName, - IN BOOLEAN FailIfExists); - -#define MOVEFILE_REPLACE_EXISTING 1 - -NTSTATUS -SetupMoveFile( - IN PCWSTR ExistingFileName, - IN PCWSTR NewFileName, - IN ULONG Flags); - -#endif /* FUNCTIONS ****************************************************************/ Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Fri Jun 30 22:28:06 2017 @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.c * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -143,390 +143,6 @@ return Status; } -NTSTATUS -SetupDeleteFile( - IN PCWSTR FileName, - IN BOOLEAN ForceDelete) // ForceDelete can be used to delete read-only files -{ - NTSTATUS Status; - UNICODE_STRING NtPathU; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - FILE_DISPOSITION_INFORMATION FileDispInfo; - BOOLEAN RetryOnce = FALSE; - - /* Open the directory name that was passed in */ - RtlInitUnicodeString(&NtPathU, FileName); - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - -Retry: // We go back there once if RetryOnce == TRUE - Status = NtOpenFile(&FileHandle, - DELETE | FILE_READ_ATTRIBUTES | - (RetryOnce ? FILE_WRITE_ATTRIBUTES : 0), - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_NON_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile failed with Status 0x%08lx\n", Status); - return Status; - } - - if (RetryOnce) - { - FILE_BASIC_INFORMATION FileInformation; - - Status = NtQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileInformation, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryInformationFile failed with Status 0x%08lx\n", Status); - NtClose(FileHandle); - return Status; - } - - FileInformation.FileAttributes = FILE_ATTRIBUTE_NORMAL; - Status = NtSetInformationFile(FileHandle, - &IoStatusBlock, - &FileInformation, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - NtClose(FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationFile failed with Status 0x%08lx\n", Status); - return Status; - } - } - - /* Ask for the file to be deleted */ - FileDispInfo.DeleteFile = TRUE; - Status = NtSetInformationFile(FileHandle, - &IoStatusBlock, - &FileDispInfo, - sizeof(FILE_DISPOSITION_INFORMATION), - FileDispositionInformation); - NtClose(FileHandle); - - if (!NT_SUCCESS(Status)) - DPRINT1("Deletion of file '%S' failed, Status 0x%08lx\n", FileName, Status); - - // FIXME: Check the precise value of Status! - if (!NT_SUCCESS(Status) && ForceDelete && !RetryOnce) - { - /* Retry once */ - RetryOnce = TRUE; - goto Retry; - } - - /* Return result to the caller */ - return Status; -} - -NTSTATUS -SetupCopyFile( - IN PCWSTR SourceFileName, - IN PCWSTR DestinationFileName, - IN BOOLEAN FailIfExists) -{ - NTSTATUS Status; - UNICODE_STRING FileName; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE FileHandleSource; - HANDLE FileHandleDest; - IO_STATUS_BLOCK IoStatusBlock; - FILE_STANDARD_INFORMATION FileStandard; - FILE_BASIC_INFORMATION FileBasic; - ULONG RegionSize; - HANDLE SourceFileSection; - PVOID SourceFileMap = NULL; - SIZE_T SourceSectionSize = 0; - LARGE_INTEGER ByteOffset; - - RtlInitUnicodeString(&FileName, SourceFileName); - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenFile(&FileHandleSource, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SEQUENTIAL_ONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); - goto done; - } - - Status = NtQueryInformationFile(FileHandleSource, - &IoStatusBlock, - &FileStandard, - sizeof(FILE_STANDARD_INFORMATION), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryInformationFile failed: %x\n", Status); - goto closesrc; - } - - Status = NtQueryInformationFile(FileHandleSource, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryInformationFile failed: %x\n", Status); - goto closesrc; - } - - Status = NtCreateSection(&SourceFileSection, - SECTION_MAP_READ, - NULL, - NULL, - PAGE_READONLY, - SEC_COMMIT, - FileHandleSource); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateSection failed: %x, %S\n", Status, SourceFileName); - goto closesrc; - } - - Status = NtMapViewOfSection(SourceFileSection, - NtCurrentProcess(), - &SourceFileMap, - 0, - 0, - NULL, - &SourceSectionSize, - ViewUnmap, - 0, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtMapViewOfSection failed: %x, %S\n", Status, SourceFileName); - goto closesrcsec; - } - - RtlInitUnicodeString(&FileName, DestinationFileName); - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtCreateFile(&FileHandleDest, - GENERIC_WRITE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FileBasic.FileAttributes, // FILE_ATTRIBUTE_NORMAL, - 0, - FailIfExists ? FILE_CREATE : FILE_OVERWRITE_IF, - FILE_NO_INTERMEDIATE_BUFFERING | - FILE_SEQUENTIAL_ONLY | - FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); - goto unmapsrcsec; - } - - RegionSize = (ULONG)PAGE_ROUND_UP(FileStandard.EndOfFile.u.LowPart); - IoStatusBlock.Status = 0; - ByteOffset.QuadPart = 0ULL; - Status = NtWriteFile(FileHandleDest, - NULL, - NULL, - NULL, - &IoStatusBlock, - SourceFileMap, - RegionSize, - &ByteOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtWriteFile failed: %x:%x, iosb: %p src: %p, size: %x\n", - Status, IoStatusBlock.Status, &IoStatusBlock, SourceFileMap, RegionSize); - goto closedest; - } - - /* Copy file date/time from source file */ - Status = NtSetInformationFile(FileHandleDest, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationFile failed: %x\n", Status); - goto closedest; - } - - /* Shorten the file back to its real size after completing the write */ - Status = NtSetInformationFile(FileHandleDest, - &IoStatusBlock, - &FileStandard.EndOfFile, - sizeof(FILE_END_OF_FILE_INFORMATION), - FileEndOfFileInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationFile failed: %x\n", Status); - } - -closedest: - NtClose(FileHandleDest); - -unmapsrcsec: - NtUnmapViewOfSection(NtCurrentProcess(), SourceFileMap); - -closesrcsec: - NtClose(SourceFileSection); - -closesrc: - NtClose(FileHandleSource); - -done: - return Status; -} - -/* - * Synchronized with its kernel32 counterpart, but we don't manage reparse points here. - */ -NTSTATUS -SetupMoveFile( - IN PCWSTR ExistingFileName, - IN PCWSTR NewFileName, - IN ULONG Flags) -{ - NTSTATUS Status; - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - PFILE_RENAME_INFORMATION RenameInfo; - UNICODE_STRING NewPathU, ExistingPathU; - HANDLE SourceHandle = NULL; - BOOLEAN ReplaceIfExists; - - RtlInitUnicodeString(&ExistingPathU, ExistingFileName); - RtlInitUnicodeString(&NewPathU, NewFileName); - - _SEH2_TRY - { - ReplaceIfExists = !!(Flags & MOVEFILE_REPLACE_EXISTING); - - /* Unless we manage a proper opening, we'll attempt to reopen without reparse support */ - InitializeObjectAttributes(&ObjectAttributes, - &ExistingPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - /* Attempt to open source file */ - Status = NtOpenFile(&SourceHandle, - FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_OPEN_FOR_BACKUP_INTENT | ((Flags & MOVEFILE_WRITE_THROUGH) ? FILE_WRITE_THROUGH : 0)); - if (!NT_SUCCESS(Status)) - { - if (Status != STATUS_INVALID_PARAMETER) - { - _SEH2_LEAVE; - } - } - - /* At that point, we MUST have a source handle */ - ASSERT(SourceHandle); - - /* Allocate renaming buffer and fill it */ - RenameInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, NewPathU.Length + sizeof(FILE_RENAME_INFORMATION)); - if (RenameInfo == NULL) - { - Status = STATUS_NO_MEMORY; - _SEH2_LEAVE; - } - - RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length); - RenameInfo->ReplaceIfExists = ReplaceIfExists; - RenameInfo->RootDirectory = NULL; - RenameInfo->FileNameLength = NewPathU.Length; - - /* Attempt to rename the file */ - Status = NtSetInformationFile(SourceHandle, - &IoStatusBlock, - RenameInfo, - NewPathU.Length + sizeof(FILE_RENAME_INFORMATION), - FileRenameInformation); - RtlFreeHeap(RtlGetProcessHeap(), 0, RenameInfo); - if (NT_SUCCESS(Status)) - { - /* If it succeeded, all fine, quit */ - _SEH2_LEAVE; - } - /* - * If we failed for any other reason than not the same device, fail. - * If we failed because of different devices, only allow renaming - * if user allowed copy. - */ - if (Status != STATUS_NOT_SAME_DEVICE || !(Flags & MOVEFILE_COPY_ALLOWED)) - { - /* ReactOS hack! To be removed once all FSD have proper renaming support - * Just leave status to error and leave - */ - if (Status == STATUS_NOT_IMPLEMENTED) - { - DPRINT1("Forcing copy, renaming not supported by FSD\n"); - } - else - { - _SEH2_LEAVE; - } - } - - /* Close the source file */ - NtClose(SourceHandle); - SourceHandle = NULL; - - /* Perform the file copy */ - Status = SetupCopyFile(ExistingFileName, - NewFileName, - !ReplaceIfExists); - - /* If it succeeded, delete the source file */ - if (NT_SUCCESS(Status)) - { - /* Force-delete files even if read-only */ - SetupDeleteFile(ExistingFileName, TRUE); - } - } - _SEH2_FINALLY - { - if (SourceHandle) - NtClose(SourceHandle); - } - _SEH2_END; - - return Status; -} - #ifdef __REACTOS__ NTSTATUS SetupExtractFile( @@ -607,7 +223,6 @@ } #endif - BOOLEAN IsValidPath( IN PWCHAR InstallDir, Modified: branches/setup_improvements/base/setup/usetup/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] Fri Jun 30 22:28:06 2017 @@ -3,7 +3,8 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.h * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once @@ -13,43 +14,10 @@ PWCHAR DirectoryName); NTSTATUS -SetupDeleteFile( - IN PCWSTR FileName, - IN BOOLEAN ForceDelete); // ForceDelete can be used to delete read-only files - -NTSTATUS -SetupCopyFile( - IN PCWSTR SourceFileName, - IN PCWSTR DestinationFileName, - IN BOOLEAN FailIfExists); - -#ifndef _WINBASE_ - -#define MOVEFILE_REPLACE_EXISTING 1 -#define MOVEFILE_COPY_ALLOWED 2 -#define MOVEFILE_WRITE_THROUGH 8 - -#endif - -// ACHTUNG! HAXX FIXME!! -#define _SEH2_TRY -#define _SEH2_LEAVE goto __SEH2_FINALLY__label; -#define _SEH2_FINALLY __SEH2_FINALLY__label: -#define _SEH2_END - - -NTSTATUS -SetupMoveFile( - IN PCWSTR ExistingFileName, - IN PCWSTR NewFileName, - IN ULONG Flags); - -NTSTATUS SetupExtractFile( PWCHAR CabinetFileName, PWCHAR SourceFileName, PWCHAR DestinationFileName); - BOOLEAN IsValidPath(

1 0

[hbelusca] 75248: [USETUP]: Use UNICODE_NULL.
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 22:17:18 2017 New Revision: 75248 URL: http://svn.reactos.org/svn/reactos?rev=75248&view=rev Log: [USETUP]: Use UNICODE_NULL. Modified: branches/setup_improvements/base/setup/usetup/filequeue.c Modified: branches/setup_improvements/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filequeue.c [iso-8859-1] Fri Jun 30 22:17:18 2017 @@ -157,7 +157,9 @@ SourceRootPath == NULL || SourceFilename == NULL || TargetDirectory == NULL) - return FALSE; + { + return FALSE; + } QueueHeader = (PFILEQUEUEHEADER)QueueHandle; @@ -185,7 +187,7 @@ } wcsncpy(Entry->SourceCabinet, SourceCabinet, Length); - Entry->SourceCabinet[Length] = (WCHAR)0; + Entry->SourceCabinet[Length] = UNICODE_NULL; } else { @@ -209,7 +211,7 @@ } wcsncpy(Entry->SourceRootPath, SourceRootPath, Length); - Entry->SourceRootPath[Length] = (WCHAR)0; + Entry->SourceRootPath[Length] = UNICODE_NULL; /* Copy source path */ if (SourcePath != NULL) @@ -233,7 +235,7 @@ } wcsncpy(Entry->SourcePath, SourcePath, Length); - Entry->SourcePath[Length] = (WCHAR)0; + Entry->SourcePath[Length] = UNICODE_NULL; } /* Copy source file name */ @@ -255,7 +257,7 @@ } wcsncpy(Entry->SourceFilename, SourceFilename, Length); - Entry->SourceFilename[Length] = (WCHAR)0; + Entry->SourceFilename[Length] = UNICODE_NULL; /* Copy target directory */ Length = wcslen(TargetDirectory); @@ -279,7 +281,7 @@ } wcsncpy(Entry->TargetDirectory, TargetDirectory, Length); - Entry->TargetDirectory[Length] = (WCHAR)0; + Entry->TargetDirectory[Length] = UNICODE_NULL; /* Copy optional target filename */ if (TargetFilename != NULL) @@ -304,7 +306,7 @@ } wcsncpy(Entry->TargetFilename, TargetFilename, Length); - Entry->TargetFilename[Length] = (WCHAR)0; + Entry->TargetFilename[Length] = UNICODE_NULL; } /* Append queue entry */

1 0

[hbelusca] 75247: [SETUPLIB][USETUP]: Split the registry helper code into registry utility functions (create/mount/unmount/verify hives) and registry creation code (the rest: initializing the syste...
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 19:07:02 2017 New Revision: 75247 URL: http://svn.reactos.org/svn/reactos?rev=75247&view=rev Log: [SETUPLIB][USETUP]: Split the registry helper code into registry utility functions (create/mount/unmount/verify hives) and registry creation code (the rest: initializing the system hives) and move it in the setup library. This commit won't correctly compile yet due to problems related to the interfacing of the INF functions. Added: branches/setup_improvements/base/setup/lib/registry.c - copied, changed from r75245, branches/setup_improvements/base/setup/usetup/registry.c branches/setup_improvements/base/setup/lib/registry.h - copied, changed from r75245, branches/setup_improvements/base/setup/usetup/registry.h branches/setup_improvements/base/setup/lib/regutil.c - copied, changed from r75245, branches/setup_improvements/base/setup/usetup/registry.c branches/setup_improvements/base/setup/lib/regutil.h - copied, changed from r75245, branches/setup_improvements/base/setup/usetup/registry.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/registry.c branches/setup_improvements/base/setup/usetup/registry.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/registry.c (from r75245, branches/setup_improvements/base/setup/usetup/registry.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/registry.h (from r75245, branches/setup_improvements/base/setup/usetup/registry.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/regutil.c (from r75245, branches/setup_improvements/base/setup/usetup/registry.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/regutil.h (from r75245, branches/setup_improvements/base/setup/usetup/registry.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/registry.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…

1 0

[hbelusca] 75246: [USETUP]: Moving around some code: - As GetSourcePaths() is used once in usetup to initialize global UNICODE_STRING path strings once, move it out of drivesup.c and put it in uset...
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 19:02:35 2017 New Revision: 75246 URL: http://svn.reactos.org/svn/reactos?rev=75246&view=rev Log: [USETUP]: Moving around some code: - As GetSourcePaths() is used once in usetup to initialize global UNICODE_STRING path strings once, move it out of drivesup.c and put it in usetup.c. Then remove drivesup.c : 1 file less! - Move some INF file prototype declarations out of usetup.h and inside inffile.h where they should better be, as inffile.h and .c is the glue code for the INF library, defining similar functions as the ones in setupapi.dll. - I rename our local SetupOpenInfFileW into SetupOpenInfFileExW because the latter one takes an extra user-provided LCID parameter, and this is this one that we use in usetup. - Make UNICODE_STRING SourcePath; visible only inside usetup.c (not used elsewhere). - Implement installation path validity check in case we are either in repair/update, or unattended setup mode. If the path is detected as invalid, then we fall back into manual path specification (for now...; note that we could instead fail the installation too). Removed: branches/setup_improvements/base/setup/usetup/drivesup.c branches/setup_improvements/base/setup/usetup/drivesup.h Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/inffile.c branches/setup_improvements/base/setup/usetup/inffile.h branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Jun 30 19:02:35 2017 @@ -20,7 +20,6 @@ cabinet.c chkdsk.c cmdcons.c - drivesup.c filesup.c filequeue.c format.c Removed: branches/setup_improvements/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/drivesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/drivesup.c (removed) @@ -1,76 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/drivesup.c - * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "usetup.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); - UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = L""; - HANDLE Handle; - ULONG Length; - PWCHAR Ptr; - - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); - - Status = NtQuerySymbolicLinkObject(Handle, - &SourceName, - &Length); - NtClose(Handle); - - if (!NT_SUCCESS(Status)) - return Status; - - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); - - /* Strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); - if (Ptr) - { - RtlCreateUnicodeString(SourceRootDir, Ptr); - *Ptr = UNICODE_NULL; - } - else - { - RtlCreateUnicodeString(SourceRootDir, L""); - } - - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); - - return STATUS_SUCCESS; -} - -/* EOF */ Removed: branches/setup_improvements/base/setup/usetup/drivesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/drivesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/drivesup.h (removed) @@ -1,17 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/drivesup.h - * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl - */ - -#pragma once - -NTSTATUS -GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir); - -/* EOF */ Modified: branches/setup_improvements/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] Fri Jun 30 19:02:35 2017 @@ -81,6 +81,7 @@ return hInf; } + #endif /* __REACTOS__ */ Modified: branches/setup_improvements/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] Fri Jun 30 19:02:35 2017 @@ -34,10 +34,39 @@ #include <infcommon.h> +extern VOID InfSetHeap(PVOID Heap); +extern VOID InfCloseFile(HINF InfHandle); +extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); +extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetStringField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +#define SetupCloseInfFile InfCloseFile +#define SetupFindNextLine InfFindNextLine +#define SetupGetBinaryField InfGetBinaryField +#define SetupGetMultiSzFieldW InfGetMultiSzField +#define SetupGetStringFieldW InfGetStringField + + #define SetupFindFirstLineW InfpFindFirstLineW #define SetupGetFieldCount InfGetFieldCount #define SetupGetIntField InfGetIntField -#define SetupOpenInfFileW InfpOpenInfFileW + +// SetupOpenInfFileW with support for a user-provided LCID +#define SetupOpenInfFileExW InfpOpenInfFileW #define INF_STYLE_WIN4 0x00000002 Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Jun 30 19:02:35 2017 @@ -32,7 +32,6 @@ #include "chkdsk.h" #include "cmdcons.h" #include "format.h" -#include "drivesup.h" #include "settings.h" #define NDEBUG @@ -45,7 +44,7 @@ static UNICODE_STRING SourceRootPath; static UNICODE_STRING SourceRootDir; -/* static */ UNICODE_STRING SourcePath; +static UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; LONG UnattendDestinationDiskNumber; @@ -70,6 +69,10 @@ static PFILE_SYSTEM_LIST FileSystemList = NULL; +/* + * NOTE: Technically only used for the COPYCONTEXT InstallPath member + * for the filequeue functionality. + */ static UNICODE_STRING InstallPath; /* @@ -87,7 +90,7 @@ */ static UNICODE_STRING SystemRootPath; -/* Path to the install directory inside the ReactOS boot partition */ +/* Path to the installation directory inside the ReactOS boot partition */ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; @@ -442,15 +445,15 @@ } /* Load 'unattend.inf' from install media. */ - UnattendInf = SetupOpenInfFileW(UnattendInfPath, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); + UnattendInf = SetupOpenInfFileExW(UnattendInfPath, + NULL, + INF_STYLE_WIN4, + LanguageId, + &ErrorLine); if (UnattendInf == INVALID_HANDLE_VALUE) { - DPRINT("SetupOpenInfFileW() failed\n"); + DPRINT("SetupOpenInfFileExW() failed\n"); return; } @@ -768,6 +771,65 @@ } return WELCOME_PAGE; +} + + +static NTSTATUS +GetSourcePaths( + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); + UNICODE_STRING SourceName; + WCHAR SourceBuffer[MAX_PATH] = L""; + HANDLE Handle; + ULONG Length; + PWCHAR Ptr; + + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); + + Status = NtQuerySymbolicLinkObject(Handle, + &SourceName, + &Length); + NtClose(Handle); + + if (!NT_SUCCESS(Status)) + return Status; + + RtlCreateUnicodeString(SourcePath, + SourceName.Buffer); + + /* Strip trailing directory */ + Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + { + RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = UNICODE_NULL; + } + else + { + RtlCreateUnicodeString(SourceRootDir, L""); + } + + RtlCreateUnicodeString(SourceRootPath, + SourceName.Buffer); + + return STATUS_SUCCESS; } @@ -823,11 +885,11 @@ /* Load txtsetup.sif from install media. */ CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"txtsetup.sif"); - SetupInf = SetupOpenInfFileW(FileNameBuffer, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); + SetupInf = SetupOpenInfFileExW(FileNameBuffer, + NULL, + INF_STYLE_WIN4, + LanguageId, + &ErrorLine); if (SetupInf == INVALID_HANDLE_VALUE) { @@ -3272,6 +3334,7 @@ { WCHAR PathBuffer[MAX_PATH]; +/** Equivalent of 'NTOS_INSTALLATION::PathComponent' **/ /* Create 'InstallPath' string */ RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); @@ -3285,12 +3348,14 @@ RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); +/** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/ /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, DestinationRootPath.Buffer, InstallDir); RtlCreateUnicodeString(&DestinationPath, PathBuffer); +/** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ /* Create 'DestinationArcPath' */ RtlFreeUnicodeString(&DestinationArcPath); StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), @@ -3326,7 +3391,7 @@ WCHAR c; ULONG Length; - /* We do not need the filesystem list any more */ + /* We do not need the filesystem list anymore */ if (FileSystemList != NULL) { DestroyFileSystemList(FileSystemList); @@ -3352,26 +3417,24 @@ wcscpy(InstallDir, L"\\ReactOS"); Length = wcslen(InstallDir); - CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); - MUIDisplayPage(INSTALL_DIRECTORY_PAGE); - - // FIXME: Check the validity of the InstallDir; however what to do - // if it is invalid but we are in unattended setup? (case of somebody - // specified an invalid installation directory in the unattended file). - - if (RepairUpdateFlag) + + /* + * Check the validity of the predefined 'InstallDir'. If we are either + * in unattended setup or in update/repair mode, and the installation path + * is valid, just perform the installation. Otherwise (either in the case + * of an invalid path, or we are in regular setup), display the UI and allow + * the user to specify a new installation path. + */ + if ((RepairUpdateFlag || IsUnattendedSetup) && + IsValidPath(InstallDir, Length)) { return InstallDirectoryPage1(InstallDir, DiskEntry, PartEntry); } - if (IsUnattendedSetup) - { - return InstallDirectoryPage1(InstallDir, - DiskEntry, - PartEntry); - } + MUIDisplayPage(INSTALL_DIRECTORY_PAGE); + CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); while (TRUE) { @@ -4160,7 +4223,7 @@ CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); - if (!ImportRegistryFile(File, Section, LanguageId, Delete)) + if (!ImportRegistryFile(SourcePath.Buffer, File, Section, LanguageId, Delete)) { DPRINT1("Importing %S failed\n", File); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Fri Jun 30 19:02:35 2017 @@ -75,39 +75,8 @@ #include "mui.h" extern HANDLE ProcessHeap; -extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId; - -#ifdef __REACTOS__ - -extern VOID InfSetHeap(PVOID Heap); -extern VOID InfCloseFile(HINF InfHandle); -extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); -extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -#define SetupCloseInfFile InfCloseFile -#define SetupFindNextLine InfFindNextLine -#define SetupGetBinaryField InfGetBinaryField -#define SetupGetMultiSzFieldW InfGetMultiSzField -#define SetupGetStringFieldW InfGetStringField - -#endif /* __REACTOS__ */ typedef enum _PAGE_NUMBER {

1 0

[hbelusca] 75245: [BOOTDATA]: Update the hivesetup.inf.
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 17:52:41 2017 New Revision: 75245 URL: http://svn.reactos.org/svn/reactos?rev=75245&view=rev Log: [BOOTDATA]: Update the 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] Fri Jun 30 17:52:41 2017 @@ -787,7 +787,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetTrans" -HKLM,"SYSTEM\CurrentControlSet\Control\NetworkProvider\Order","ProviderOrder",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NetworkProvider\Order","ProviderOrder",0x00000000,"nfs41_driver" ; NLS Files HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","37",0x00000000,"c_037.nls" @@ -1214,9 +1214,12 @@ ; Printing +HKLM,"SYSTEM\CurrentControlSet\Control\Print","BeepEnabled",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Control\Print","MajorVersion",0x00010001,2 HKLM,"SYSTEM\CurrentControlSet\Control\Print","MinorVersion",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Control\Print","PortThreadPriority",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Control\Print","PriorityClass",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Control\Print","SchedulerThreadPriority",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86","Directory",,"W32X86" @@ -1225,22 +1228,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",,"localmon.dll" - -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Attributes",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Datatype",,"RAW" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Description",,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Default DevMode",1,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,dc,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ -00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Location",,"At Home" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Port",,"LPT1:" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Print Processor",,"winprint" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Printer Driver",,"Dummy Printer Driver" -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Status",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Providers",,0x00000010 @@ -1352,21 +1339,21 @@ "\RPC Control" ; DOS devices -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000000,"\DosDevices\LPT1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000002,"\DosDevices\COM1" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000002,"\Device\MailSlot" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000002,"\Device\Null" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000002,"\Device\NamedPipe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000002,"\DosDevices\LPT1" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000002,"\Device\Mup" ; System environment settings -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000000,".COM;.EXE;.BAT;.CMD" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000000,"$P$G$I" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemRoot%\TEMP" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemRoot%\TEMP" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020002,"%SystemRoot%\system32\cmd.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020002,"%SystemRoot%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000002,".COM;.EXE;.BAT;.CMD" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000002,"$P$G$I" +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%" ; Known DLLs @@ -1397,7 +1384,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 ; SubSystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020002,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" @@ -1412,7 +1399,7 @@ fe,0f,dc,ba,00,00,00,00 ; WOW Support -HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\WOW",,0x00000012 ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" @@ -2029,6 +2016,24 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Type",0x00010001,0x00000002 +; NFS Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ImagePath",0x00020000,"system32\drivers\nfs41_driver.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","DeviceName",0x00000000,\Device\nfs41_driver +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","Name",0x00000000,"NFS41 Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","ProviderPath",0x00000000,System32\nfs41_np.dll + +; NFS daemon +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","DisplayName",0x00000000,"NFSv4.1 Client" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ImagePath",0x00020000,"%SystemRoot%\system32\nfsd.exe --noldap" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Type",0x00010001,0x00000010 + ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","ErrorControl",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Group",0x00000000,"FSFilter Infrastructure" @@ -2037,10 +2042,10 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Type",0x00010001,0x00000002 ; ControlSet selection settings -HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 -HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001 -HKLM,"SYSTEM\Select","Failed",0x00010001,0x00000000 -HKLM,"SYSTEM\Select","LastKnownGood",0x00010001,0x00000000 +HKLM,"SYSTEM\Select","Current",0x00010003,0x00000001 +HKLM,"SYSTEM\Select","Default",0x00010003,0x00000001 +HKLM,"SYSTEM\Select","Failed",0x00010003,0x00000000 +HKLM,"SYSTEM\Select","LastKnownGood",0x00010003,0x00000001 ; System setup settings HKLM,"SYSTEM\Setup","CmdLine",0x00000000,"setup -newsetup"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs