Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[hbelusca] 74725: [FREELDR/WINLDR]: Rework LoadModule() so that we can load custom kernels & hals via the /KERNEL= and /HAL= boot option switches.
by hbelusca＠svn.reactos.org 31 May '17

31 May '17

Author: hbelusca Date: Wed May 31 18:40:29 2017 New Revision: 74725 URL: http://svn.reactos.org/svn/reactos?rev=74725&view=rev Log: [FREELDR/WINLDR]: Rework LoadModule() so that we can load custom kernels & hals via the /KERNEL= and /HAL= boot option switches. Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] Wed May 31 18:40:29 2017 @@ -96,7 +96,7 @@ /* Construct SystemRoot and ArcBoot from SystemPath */ PathSeparator = strstr(BootPath, "\\") - BootPath; strncpy(ArcBoot, BootPath, PathSeparator); - ArcBoot[PathSeparator] = 0; + ArcBoot[PathSeparator] = ANSI_NULL; TRACE("ArcBoot: %s\n", ArcBoot); TRACE("SystemRoot: %s\n", SystemRoot); @@ -249,7 +249,7 @@ { // There is no directory in the path strcpy(DllName, DriverPath); - DriverPath[0] = 0; + DriverPath[0] = ANSI_NULL; } TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); @@ -426,13 +426,13 @@ static BOOLEAN LoadModule( - PLOADER_PARAMETER_BLOCK LoaderBlock, - PCCH Path, - PCCH File, - TYPE_OF_MEMORY MemoryType, - PLDR_DATA_TABLE_ENTRY *Dte, - BOOLEAN IsKdTransportDll, - ULONG Percentage) + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PCCH Path, + IN PCCH File, + IN PCCH ImportName, // BaseDllName + IN TYPE_OF_MEMORY MemoryType, + OUT PLDR_DATA_TABLE_ENTRY *Dte, + IN ULONG Percentage) { BOOLEAN Success; CHAR FullFileName[MAX_PATH]; @@ -444,7 +444,6 @@ UiDrawProgressBarCenter(Percentage, 100, ProgressString); strcpy(FullFileName, Path); - strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAddress); @@ -455,15 +454,13 @@ } TRACE("%s loaded successfully at %p\n", File, BaseAddress); - strcpy(FullFileName, "WINDOWS\\SYSTEM32\\"); - strcat(FullFileName, File); /* * Cheat about the base DLL name if we are loading * the Kernel Debugger Transport DLL, to make the * PE loader happy. */ Success = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, - (IsKdTransportDll ? "KDCOM.DLL" : File), + ImportName, FullFileName, BaseAddress, Dte); @@ -475,22 +472,82 @@ BOOLEAN LoadWindowsCore(IN USHORT OperatingSystemVersion, IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR BootOptions, - IN LPCSTR BootPath, + IN PCSTR BootOptions, + IN PCSTR BootPath, IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) { BOOLEAN Success; + PCSTR Options; CHAR DirPath[MAX_PATH]; + CHAR KernelFileName[MAX_PATH]; + CHAR HalFileName[MAX_PATH]; CHAR KdTransportDllName[MAX_PATH]; PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; if (!KernelDTE) return FALSE; + /* Initialize SystemRoot\System32 path */ + strcpy(DirPath, BootPath); + strcat(DirPath, "SYSTEM32\\"); + + // + // TODO: Parse also the separate INI values "Kernel=" and "Hal=" + // + + /* Default KERNEL and HAL file names */ + strcpy(KernelFileName, "NTOSKRNL.EXE"); + strcpy(HalFileName , "HAL.DLL"); + + /* Find any /KERNEL= or /HAL= switch in the boot options */ + Options = BootOptions; + while (Options) + { + /* Skip possible initial whitespace */ + Options += strspn(Options, " \t"); + + /* Check whether a new commutator starts and it is either KERNEL or HAL */ + if (*Options != '/' || (++Options, + !(_strnicmp(Options, "KERNEL=", 7) == 0 || + _strnicmp(Options, "HAL=", 4) == 0)) ) + { + /* Search for another whitespace */ + Options = strpbrk(Options, " \t"); + continue; + } + else + { + size_t i = strcspn(Options, " \t"); /* Skip whitespace */ + if (i == 0) + { + /* Use the default values */ + break; + } + + /* We have found either KERNEL or HAL commutator */ + if (_strnicmp(Options, "KERNEL=", 7) == 0) + { + Options += 7; i -= 7; + strncpy(KernelFileName, Options, i); + KernelFileName[i] = ANSI_NULL; + _strupr(KernelFileName); + } + else if (_strnicmp(Options, "HAL=", 4) == 0) + { + Options += 4; i -= 4; + strncpy(HalFileName, Options, i); + HalFileName[i] = ANSI_NULL; + _strupr(HalFileName); + } + } + } + + TRACE("Kernel file = '%s' ; HAL file = '%s'\n", KernelFileName, HalFileName); + /* Load the Kernel */ - LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, FALSE, 30); + LoadModule(LoaderBlock, DirPath, KernelFileName, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, 30); /* Load the HAL */ - LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, FALSE, 45); + LoadModule(LoaderBlock, DirPath, HalFileName, "HAL.DLL", LoaderHalCode, &HalDTE, 45); /* Load the Kernel Debugger Transport DLL */ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) @@ -525,27 +582,28 @@ * "...foo /DEBUGPORT= bar..." * (in that case, we default the port to COM). */ - while (BootOptions) + Options = BootOptions; + while (Options) { /* Skip possible initial whitespace */ - BootOptions += strspn(BootOptions, " \t"); + Options += strspn(Options, " \t"); /* Check whether a new commutator starts and it is the DEBUGPORT one */ - if (*BootOptions != '/' || _strnicmp(++BootOptions, "DEBUGPORT=", 10) != 0) + if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) { /* Search for another whitespace */ - BootOptions = strpbrk(BootOptions, " \t"); + Options = strpbrk(Options, " \t"); continue; } else { /* We found the DEBUGPORT commutator. Move to the port name. */ - BootOptions += 10; + Options += 10; break; } } - if (BootOptions) + if (Options) { /* * We have found the DEBUGPORT commutator. Parse the port name. @@ -553,33 +611,30 @@ * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". */ strcpy(KdTransportDllName, "KD"); - if (_strnicmp(BootOptions, "COM", 3) == 0 && '0' <= BootOptions[3] && BootOptions[3] <= '9') + if (_strnicmp(Options, "COM", 3) == 0 && '0' <= Options[3] && Options[3] <= '9') { - strncat(KdTransportDllName, BootOptions, 3); + strncat(KdTransportDllName, Options, 3); } else { - size_t i = strcspn(BootOptions, " \t:"); /* Skip valid separators: whitespace or colon */ + size_t i = strcspn(Options, " \t:"); /* Skip valid separators: whitespace or colon */ if (i == 0) strcat(KdTransportDllName, "COM"); else - strncat(KdTransportDllName, BootOptions, i); + strncat(KdTransportDllName, Options, i); } strcat(KdTransportDllName, ".DLL"); _strupr(KdTransportDllName); /* - * Load the transport DLL. Specify it to LoadModule so that it can - * change the base DLL name of the loaded transport DLL to the default - * "KDCOM.DLL" name, to make the PE loader happy. + * Load the transport DLL. Override the base DLL name of the + * loaded transport DLL to the default "KDCOM.DLL" name. */ - LoadModule(LoaderBlock, BootPath, KdTransportDllName, LoaderSystemCode, &KdComDTE, TRUE, 60); + LoadModule(LoaderBlock, DirPath, KdTransportDllName, "KDCOM.DLL", LoaderSystemCode, &KdComDTE, 60); } } /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ - strcpy(DirPath, BootPath); - strcat(DirPath, "system32\\"); Success = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); if (KdComDTE) @@ -691,7 +746,7 @@ /* Allocate and minimalist-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - /* Load Hive */ + /* Load the system hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath);

1 0

[pschweitzer] 74724: [RXCE] Fix broken cast By Thomas
by pschweitzer＠svn.reactos.org 31 May '17

31 May '17

Author: pschweitzer Date: Wed May 31 17:10:45 2017 New Revision: 74724 URL: http://svn.reactos.org/svn/reactos?rev=74724&view=rev Log: [RXCE] Fix broken cast By Thomas Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Wed May 31 17:10:45 2017 @@ -4728,7 +4728,7 @@ { PKEVENT TearDownEvent; - TearDownEvent = InterlockedExchangePointer((volatile PVOID)&DeviceObject->DispatcherContext.pTearDownEvent, NULL); + TearDownEvent = InterlockedExchangePointer((void * volatile*)&DeviceObject->DispatcherContext.pTearDownEvent, NULL); if (TearDownEvent != NULL) { KeSetEvent(TearDownEvent, IO_NO_INCREMENT, FALSE);

1 0

[pschweitzer] 74723: [DDK] sed -i s/__volatile/volatile/g to fix build with VS2010 CORE-13345
by pschweitzer＠svn.reactos.org 31 May '17

31 May '17

Author: pschweitzer Date: Wed May 31 17:02:44 2017 New Revision: 74723 URL: http://svn.reactos.org/svn/reactos?rev=74723&view=rev Log: [DDK] sed -i s/__volatile/volatile/g to fix build with VS2010 CORE-13345 Modified: trunk/reactos/sdk/include/ddk/rxcontx.h trunk/reactos/sdk/include/ddk/rxworkq.h Modified: trunk/reactos/sdk/include/ddk/rxcontx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxcontx.h?… ============================================================================== --- trunk/reactos/sdk/include/ddk/rxcontx.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/rxcontx.h [iso-8859-1] Wed May 31 17:02:44 2017 @@ -263,8 +263,8 @@ PWCH AlsoCanonicalNameBuffer; PUNICODE_STRING LoudCompletionString; #ifdef RDBSS_TRACKER - __volatile LONG AcquireReleaseFcbTrackerX; - __volatile ULONG TrackerHistoryPointer; + volatile LONG AcquireReleaseFcbTrackerX; + volatile ULONG TrackerHistoryPointer; RX_FCBTRACKER_CALLINFO TrackerHistory[RDBSS_TRACKER_HISTORY_SIZE]; #endif #if DBG Modified: trunk/reactos/sdk/include/ddk/rxworkq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxworkq.h?… ============================================================================== --- trunk/reactos/sdk/include/ddk/rxworkq.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/rxworkq.h [iso-8859-1] Wed May 31 17:02:44 2017 @@ -40,16 +40,16 @@ UCHAR Type; KSPIN_LOCK SpinLock; PRX_WORK_QUEUE_RUNDOWN_CONTEXT pRundownContext; - __volatile LONG NumberOfWorkItemsDispatched; - __volatile LONG NumberOfWorkItemsToBeDispatched; + volatile LONG NumberOfWorkItemsDispatched; + volatile LONG NumberOfWorkItemsToBeDispatched; LONG CumulativeQueueLength; LONG NumberOfSpinUpRequests; LONG MaximumNumberOfWorkerThreads; LONG MinimumNumberOfWorkerThreads; - __volatile LONG NumberOfActiveWorkerThreads; - __volatile LONG NumberOfIdleWorkerThreads; + volatile LONG NumberOfActiveWorkerThreads; + volatile LONG NumberOfIdleWorkerThreads; LONG NumberOfFailedSpinUpRequests; - __volatile LONG WorkQueueItemForSpinUpWorkerThreadInUse; + volatile LONG WorkQueueItemForSpinUpWorkerThreadInUse; RX_WORK_QUEUE_ITEM WorkQueueItemForTearDownWorkQueue; RX_WORK_QUEUE_ITEM WorkQueueItemForSpinUpWorkerThread; RX_WORK_QUEUE_ITEM WorkQueueItemForSpinDownWorkerThread;

1 0

[ssawant] 74722: GSoC_Project: TSE (Taskbar Shell Extension) [qcklnch] -Added basic files for coding. -Made changes in corresponding CMakeLists.txt.
by ssawant＠svn.reactos.org 31 May '17

31 May '17

Author: ssawant Date: Wed May 31 12:08:03 2017 New Revision: 74722 URL: http://svn.reactos.org/svn/reactos?rev=74722&view=rev Log: GSoC_Project: TSE (Taskbar Shell Extension) [qcklnch] -Added basic files for coding. -Made changes in corresponding CMakeLists.txt. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.spec (with props) Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] Wed May 31 12:08:03 2017 @@ -0,0 +1,38 @@ + +project(SHELL) + +set_cpp(WITH_RUNTIME) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${REACTOS_SOURCE_DIR}) + +spec2def(qcklnch.dll qcklnch.spec) + +add_library(qcklnch SHARED + qcklnch.cpp + ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) + +set_module_type(qcklnch win32dll UNICODE) +target_link_libraries(qcklnch uuid wine atlnew) + +add_importlibs(qcklnch + advapi32 + winmm + ole32 + oleaut32 + shlwapi + shell32 + comctl32 + msvcrt + gdi32 + user32 + kernel32 + ntdll) + +add_cd_file(TARGET qcklnch DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] Wed May 31 12:08:03 2017 @@ -0,0 +1,51 @@ +#pragma once + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <tchar.h> + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> +#include <ddeml.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi_undoc.h> +#include <tchar.h> +#include <strsafe.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <undocshell.h> +#include <shellutils.h> + +#include <shellapi.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +//#include "resource.h" + +#undef DbgPrint + +/*extern HINSTANCE g_hInstance; + +#define ID_ICON_VOLUME (WM_APP + 0x4CB) + +// {845B0FB2-66E0-416B-8F91-314E23F7C12D} +DEFINE_GUID(CLSID_NtObjectFolder, + 0x845b0fb2, 0x66e0, 0x416b, 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d); + +//#include "ntobjfolder.h" +//#include "regfolder.h" +*/ Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp [iso-8859-1] Wed May 31 12:08:03 2017 @@ -0,0 +1,67 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/qcklnch.cpp + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ + +#include "precomp.h" + +#include <atlwin.h> + +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + +BEGIN_OBJECT_MAP(ObjectMap) + //OBJECT_ENTRY(CLSID_RegistryFolder, CRegistryFolder) +END_OBJECT_MAP() + +HINSTANCE g_hInstance; +CComModule g_Module; + +void *operator new (size_t, void *buf) +{ + return buf; +} + +STDAPI_(BOOL) +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + if (fdwReason == DLL_PROCESS_ATTACH) + { + g_hInstance = hinstDLL; + DisableThreadLibraryCalls(g_hInstance); + + g_Module.Init(ObjectMap, g_hInstance, NULL); + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + g_hInstance = NULL; + g_Module.Term(); + } + return TRUE; +} + +STDAPI +DllRegisterServer(void) +{ + return g_Module.DllRegisterServer(FALSE); +} + +STDAPI +DllUnregisterServer(void) +{ + return g_Module.DllUnregisterServer(FALSE); +} + +STDAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return g_Module.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI +DllCanUnloadNow(void) +{ + return g_Module.DllCanUnloadNow(); +} Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.spec URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.spec (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.spec [iso-8859-1] Wed May 31 12:08:03 2017 @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ssawant] 74721: GSoC_Project: TSE (Taskbar Shell Extension) Test Commit 1. Added folder to create my project files within.
by ssawant＠svn.reactos.org 31 May '17

31 May '17

Author: ssawant Date: Wed May 31 11:17:43 2017 New Revision: 74721 URL: http://svn.reactos.org/svn/reactos?rev=74721&view=rev Log: GSoC_Project: TSE (Taskbar Shell Extension) Test Commit 1. Added folder to create my project files within. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/

1 0

[tfaber] 74720: [USBXHCI] - Replace usbhub with usbhub_new CORE-13344
by tfaber＠svn.reactos.org 31 May '17

31 May '17

Author: tfaber Date: Wed May 31 09:40:09 2017 New Revision: 74720 URL: http://svn.reactos.org/svn/reactos?rev=74720&view=rev Log: [USBXHCI] - Replace usbhub with usbhub_new CORE-13344 Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub/ - copied from r74719, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/ Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/

1 0

[tfaber] 74719: [USBXHCI] - Rename usbehci_new to usbxhci CORE-13344
by tfaber＠svn.reactos.org 31 May '17

31 May '17

Author: tfaber Date: Wed May 31 09:38:05 2017 New Revision: 74719 URL: http://svn.reactos.org/svn/reactos?rev=74719&view=rev Log: [USBXHCI] - Rename usbehci_new to usbxhci CORE-13344 Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/ - copied from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h - copied unchanged from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/dbg_ehci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c - copied, changed from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h - copied unchanged from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.rc - copied unchanged from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.rc Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_ehci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.rc 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/debug.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_ehci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbehci.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Copied: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c (from r74718, branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive…

1 0

[tfaber] 74718: [USBXHCI] - Import usbport, usbehci_new and usbhub_new from Vadim Galyant's work. CORE-13344
by tfaber＠svn.reactos.org 31 May '17

31 May '17

Author: tfaber Date: Wed May 31 09:34:10 2017 New Revision: 74718 URL: http://svn.reactos.org/svn/reactos?rev=74718&view=rev Log: [USBXHCI] - Import usbport, usbehci_new and usbhub_new from Vadim Galyant's work. CORE-13344 Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/CMakeLists.txt (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/dbg_ehci.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/debug.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/guid.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/hardware.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/roothub.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.rc (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/CMakeLists.txt (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/dbg_uhub.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/debug.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/guid.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/ioctl.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/pnp.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/power.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.rc (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbmport.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/CMakeLists.txt (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/debug.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/device.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/endpoint.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/guid.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/iface.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/ioctl.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/pnp.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/power.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/queue.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/roothub.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/urb.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usb2.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbdebug.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.c (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.h (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.rc (with props) branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.spec (with props) Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/dbg_ehci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/guid.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbehci_new/usbehci.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/dbg_uhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/guid.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/power.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbhub_new/usbhub.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbmport.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/guid.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/iface.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/power.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usb2.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbdebug.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbport/usbport.spec URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive…

1 0

[hbelusca] 74717: [USETUP]: Diverse fixes: - Convert almost all swprintf into StringCchPrintfW, and wcscpy into StringCchCopyW; - Explicitly add a trailing path separator to the "\Device\HarddiskX\...
by hbelusca＠svn.reactos.org 31 May '17

31 May '17

Author: hbelusca Date: Wed May 31 02:19:08 2017 New Revision: 74717 URL: http://svn.reactos.org/svn/reactos?rev=74717&view=rev Log: [USETUP]: Diverse fixes: - Convert almost all swprintf into StringCchPrintfW, and wcscpy into StringCchCopyW; - Explicitly add a trailing path separator to the "\Device\HarddiskX\PartitionY(\)" paths when they refer to FS directories (and not to partition objects); - Remove useless (and half-buggy) "Remove trailing backslash" code; With that, it is possible to install ReactOS in e.g. C:\ReactOS (as usual), C:\ReactOS\dir1\dir2 (as many dirs as you wish), and also in C:\ (yes yes!). But in that latter case, a strange bug related to the registry arises... Additionally: - Adjust some comments; - Add some debugging DPRINTs; - The SetInstallPathValue() is part of the big hack I've mentioned in r74709; Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/usetup.h 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] Wed May 31 02:19:08 2017 @@ -42,9 +42,9 @@ /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; -UNICODE_STRING SourceRootPath; -UNICODE_STRING SourceRootDir; -UNICODE_STRING SourcePath; +static UNICODE_STRING SourceRootPath; +static UNICODE_STRING SourceRootDir; +/* static */ UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; LONG UnattendDestinationDiskNumber; LONG UnattendDestinationPartitionNumber; @@ -430,7 +430,7 @@ INT IntValue; PWCHAR Value; - CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"\\unattend.inf"); + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"unattend.inf"); if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { @@ -583,7 +583,7 @@ if (INF_GetData(&Context, NULL, &Value)) { LONG Id = wcstol(Value, NULL, 16); - swprintf(LocaleID,L"%08lx", Id); + swprintf(LocaleID, L"%08lx", Id); } } @@ -809,24 +809,18 @@ Status = GetSourcePaths(&SourcePath, &SourceRootPath, &SourceRootDir); - if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); MUIDisplayError(ERROR_NO_SOURCE_DRIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } -#if 0 - else - { - CONSOLE_PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); - CONSOLE_PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); - CONSOLE_PrintTextXY(6, 17, "SourceRootDir: '%wZ'", &SourceRootDir); - } -#endif + DPRINT1("SourcePath: '%wZ'", &SourcePath); + DPRINT1("SourceRootPath: '%wZ'", &SourceRootPath); + DPRINT1("SourceRootDir: '%wZ'", &SourceRootDir); /* Load txtsetup.sif from install media. */ - CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"\\txtsetup.sif"); + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"txtsetup.sif"); SetupInf = SetupOpenInfFileW(FileNameBuffer, NULL, INF_STYLE_WIN4, @@ -2717,6 +2711,13 @@ if (PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ + // + // Error dialog should say that we cannot find a suitable + // system partition and create one on the system. At this point, + // it may be nice to ask the user whether he wants to continue, + // or use an external drive as the system drive/partition + // (e.g. floppy, USB drive, etc...) + // return QUIT_PAGE; } @@ -3106,12 +3107,11 @@ } /* Set PartitionRootPath */ - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, - PathBuffer); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); /* Format the partition */ @@ -3180,10 +3180,10 @@ } /* Set PartitionRootPath */ - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); @@ -3284,10 +3284,10 @@ /* Create 'DestinationRootPath' string */ RtlFreeUnicodeString(&DestinationRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); @@ -3299,10 +3299,10 @@ /* Create 'DestinationArcPath' */ RtlFreeUnicodeString(&DestinationArcPath); - swprintf(PathBuffer, - L"multi(0)disk(0)rdisk(%lu)partition(%lu)", - DiskEntry->BiosDiskNumber, - PartEntry->PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", + DiskEntry->BiosDiskNumber, + PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); @@ -3446,18 +3446,23 @@ PWCHAR DirKeyValue; PWCHAR TargetFileName; + /* + * This code enumerates the list of files in reactos.dff / reactos.inf + * that need to be extracted from reactos.cab and be installed in their + * respective directories. + */ + /* Search for the SectionName section */ if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) { - char Buffer[128]; + CHAR Buffer[128]; sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return FALSE; } /* - * Enumerate the files in the section - * and add them to the file queue. + * Enumerate the files in the section and add them to the file queue. */ do { @@ -3520,24 +3525,27 @@ PWCHAR FileKeyValue; PWCHAR DirKeyValue; PWCHAR TargetFileName; - ULONG Length; - WCHAR CompleteOrigDirName[512]; + WCHAR CompleteOrigDirName[512]; // FIXME: MAX_PATH is not enough? if (SourceCabinet) return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); + /* + * This code enumerates the list of files in txtsetup.sif + * that need to be installed in their respective directories. + */ + /* Search for the SectionName section */ if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext)) { - char Buffer[128]; + CHAR Buffer[128]; sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName); PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); return FALSE; } /* - * Enumerate the files in the section - * and add them to the file queue. + * Enumerate the files in the section and add them to the file queue. */ do { @@ -3583,25 +3591,32 @@ if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) { /* Installation path */ - wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); + DPRINT("InstallationPath: '%S'\n", DirKeyValue); + + StringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + SourceRootDir.Buffer); + + DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); } else if (DirKeyValue[0] == L'\\') { /* Absolute path */ - wcscpy(CompleteOrigDirName, DirKeyValue); + DPRINT("AbsolutePath: '%S'\n", DirKeyValue); + + StringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + DirKeyValue); + + DPRINT("AbsolutePath(2): '%S'\n", CompleteOrigDirName); } else // if (DirKeyValue[0] != L'\\') { /* Path relative to the installation path */ + DPRINT("RelativePath: '%S'\n", DirKeyValue); + CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, SourceRootDir.Buffer, DirKeyValue); - } - - /* Remove trailing backslash */ - Length = wcslen(CompleteOrigDirName); - if ((Length > 0) && (CompleteOrigDirName[Length - 1] == L'\\')) - { - CompleteOrigDirName[Length - 1] = UNICODE_NULL; + + DPRINT("RelativePath(2): '%S'\n", CompleteOrigDirName); } if (!SetupQueueCopy(SetupFileQueue, @@ -3626,12 +3641,11 @@ PWCHAR SourceCabinet, PINPUT_RECORD Ir) { - WCHAR PathBuffer[MAX_PATH]; + NTSTATUS Status; INFCONTEXT DirContext; PWCHAR AdditionalSectionName = NULL; PWCHAR DirKeyValue; - ULONG Length; - NTSTATUS Status; + WCHAR PathBuffer[MAX_PATH]; /* Add common files */ if (!AddSectionToCopyQueue(InfFile, L"SourceDisksFiles", SourceCabinet, &DestinationPath, Ir)) @@ -3654,28 +3668,22 @@ /* * FIXME: - * - Install directories like '\reactos\test' are not handled yet. - * - Copying files to DestinationRootPath should be done from within - * the SystemPartitionFiles section. - * At the moment we check whether we specify paths like '\foo' or '\\' for that. - * For installing to DestinationPath specify just '\' . + * Copying files to DestinationRootPath should be done from within + * the SystemPartitionFiles section. + * At the moment we check whether we specify paths like '\foo' or '\\' for that. + * For installing to DestinationPath specify just '\' . */ /* Get destination path */ - wcscpy(PathBuffer, DestinationPath.Buffer); - - /* Remove trailing backslash */ - Length = wcslen(PathBuffer); - if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) - { - PathBuffer[Length - 1] = UNICODE_NULL; - } + StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), DestinationPath.Buffer); + + DPRINT("FullPath(1): '%S'\n", PathBuffer); /* Create the install directory */ Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT1("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); MUIDisplayError(ERROR_CREATE_INSTALL_DIR, Ir, POPUP_WAIT_ENTER); return FALSE; } @@ -3709,26 +3717,20 @@ /* Installation path */ DPRINT("InstallationPath: '%S'\n", DirKeyValue); - wcscpy(PathBuffer, DestinationPath.Buffer); - - DPRINT("FullPath: '%S'\n", PathBuffer); + StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), + DestinationPath.Buffer); + + DPRINT("InstallationPath(2): '%S'\n", PathBuffer); } else if (DirKeyValue[0] == L'\\') { /* Absolute path */ - DPRINT("Absolute Path: '%S'\n", DirKeyValue); + DPRINT("AbsolutePath: '%S'\n", DirKeyValue); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, DestinationRootPath.Buffer, DirKeyValue); - /* Remove trailing backslash */ - Length = wcslen(PathBuffer); - if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) - { - PathBuffer[Length - 1] = UNICODE_NULL; - } - - DPRINT("FullPath: '%S'\n", PathBuffer); + DPRINT("AbsolutePath(2): '%S'\n", PathBuffer); Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) @@ -3746,14 +3748,7 @@ CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, DestinationPath.Buffer, DirKeyValue); - /* Remove trailing backslash */ - Length = wcslen(PathBuffer); - if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) - { - PathBuffer[Length - 1] = UNICODE_NULL; - } - - DPRINT("FullPath: '%S'\n", PathBuffer); + DPRINT("RelativePath(2): '%S'\n", PathBuffer); Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) @@ -4075,12 +4070,14 @@ return SUCCESS_PAGE; } + /************************ HACK!!!!!!!!!!! *********************************/ if (!SetInstallPathValue(&DestinationPath)) { DPRINT1("SetInstallPathValue() failed\n"); MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } + /************************ HACK!!!!!!!!!!! *********************************/ /* Create the default hives */ Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); @@ -4230,10 +4227,10 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); RtlFreeUnicodeString(&SystemRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->SystemPartition->DiskEntry->DiskNumber, - PartitionList->SystemPartition->PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + PartitionList->SystemPartition->DiskEntry->DiskNumber, + PartitionList->SystemPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT1("SystemRootPath: %wZ\n", &SystemRootPath); @@ -4472,7 +4469,7 @@ * * SIDEEFFECTS * Calls InstallVBRToPartition() - * CallsInstallMbrBootCodeToDisk() + * Calls InstallMbrBootCodeToDisk() * * RETURNS * Number of the next page. @@ -4497,16 +4494,16 @@ } /* Step 2: Write the MBR */ - swprintf(DestinationDevicePathBuffer, - L"\\Device\\Harddisk%d\\Partition0", - PartitionList->SystemPartition->DiskEntry->DiskNumber); + StringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + PartitionList->SystemPartition->DiskEntry->DiskNumber); CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); if (IsThereAValidBootSector(DestinationDevicePathBuffer)) { /* Save current MBR */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath.Buffer, L"\\mbr.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath.Buffer, L"mbr.old"); DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); 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] Wed May 31 02:19:08 2017 @@ -75,8 +75,6 @@ #include "mui.h" extern HANDLE ProcessHeap; -extern UNICODE_STRING SourceRootPath; -extern UNICODE_STRING SourceRootDir; extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId;

1 0

[hbelusca] 74716: [USETUP]: Try to use correct flags for the NtCreateFile call that creates new file directories. DIRECTORY_ALL_ACCESS is not the correct flag, because it is used with the NtCreateD...
by hbelusca＠svn.reactos.org 31 May '17

31 May '17

Author: hbelusca Date: Wed May 31 02:08:16 2017 New Revision: 74716 URL: http://svn.reactos.org/svn/reactos?rev=74716&view=rev Log: [USETUP]: Try to use correct flags for the NtCreateFile call that creates new file directories. DIRECTORY_ALL_ACCESS is not the correct flag, because it is used with the NtCreateDirectoryObject API that creates virtual "directories" in the NT object namespace; that's not our purpose here. This commit needs review to verify which flags are actually the best. Modified: branches/setup_improvements/base/setup/usetup/filesup.c 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] Wed May 31 02:08:16 2017 @@ -56,14 +56,14 @@ NULL); Status = NtCreateFile(&DirectoryHandle, - DIRECTORY_ALL_ACCESS, + FILE_LIST_DIRECTORY | FILE_TRAVERSE | FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN_IF, - FILE_DIRECTORY_FILE, + FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE, NULL, 0); if (NT_SUCCESS(Status))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017