Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[hbelusca] 75676: [SETUPLIB]: Initialization fixes: - Use correct inf style flags in SetupOpenInfFileEx() calls when opening txtsetup.sif and unattend.inf. Technically txtsetup.sif would be INF_STY...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 26 14:33:48 2017 New Revision: 75676 URL: http://svn.reactos.org/svn/reactos?rev=75676&view=rev Log: [SETUPLIB]: Initialization fixes: - Use correct inf style flags in SetupOpenInfFileEx() calls when opening txtsetup.sif and unattend.inf. Technically txtsetup.sif would be INF_STYLE_WIN4 but since we use "$ReactOS$" as its version signature, it would not work when opening it with setupapi.dll functions. Hence I combine the flag with INF_STYLE_OLDNT too. - Don't fail if opening the \SystemRoot symbolic link doesn't work (usually due to incorrect access rights); in that case, just use the installer image file path as the installation source path. Modified: branches/setup_improvements/base/setup/lib/setuplib.c Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Sat Aug 26 14:33:48 2017 @@ -49,7 +49,7 @@ /* Load 'unattend.inf' from installation media */ UnattendInf = SetupOpenInfFileExW(UnattendInfPath, NULL, - INF_STYLE_WIN4, + INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine); @@ -262,7 +262,8 @@ #if 0 /* TODO: Append the standard unattend.inf file */ - CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, + pSetupData->SourcePath.Buffer, L"unattend.inf"); if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); @@ -437,7 +438,16 @@ SYMBOLIC_LINK_QUERY, &ObjectAttributes); if (!NT_SUCCESS(Status)) - return Status; + { + /* + * We failed at opening the \SystemRoot link (usually due to wrong + * access rights). Do not consider this as a fatal error, but use + * instead the image file path as the installation source path. + */ + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed with Status 0x%08lx\n", + &SystemRootPath, Status); + goto InitPaths; + } RtlInitEmptyUnicodeString(&SystemRootPath, SystemRootBuffer, @@ -449,7 +459,7 @@ NtClose(Handle); if (!NT_SUCCESS(Status)) - return Status; + return Status; // Unexpected error /* Check whether the resolved \SystemRoot is a prefix of the image file path */ if (RtlPrefixUnicodeString(&SystemRootPath, InstallSourcePath, TRUE)) @@ -459,6 +469,7 @@ } +InitPaths: /* * Retrieve the different source path components */ @@ -499,7 +510,7 @@ *SetupInf = SetupOpenInfFileExW(FileNameBuffer, NULL, - INF_STYLE_WIN4, + INF_STYLE_WIN4 | INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine);

7 years

[hbelusca] 75675: [BOOTDATA]: Move an inf comment where it belongs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 26 12:52:28 2017 New Revision: 75675 URL: http://svn.reactos.org/svn/reactos?rev=75675&view=rev Log: [BOOTDATA]: Move an inf comment where it belongs. Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Sat Aug 26 12:52:28 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = no Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sat Aug 26 12:52:28 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = yes

7 years

[hbelusca] 75674: [SETUPLIB]: Move the bootsup.c code into the setuplib, as the code is generic enough to be used by both USETUP and the 1st-stage GUI installer. [USETUP]: Perform the necessary adj...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 26 11:42:32 2017 New Revision: 75674 URL: http://svn.reactos.org/svn/reactos?rev=75674&view=rev Log: [SETUPLIB]: Move the bootsup.c code into the setuplib, as the code is generic enough to be used by both USETUP and the 1st-stage GUI installer. [USETUP]: Perform the necessary adjustments. Added: branches/setup_improvements/base/setup/lib/bootsup.c - copied, changed from r75673, branches/setup_improvements/base/setup/usetup/bootsup.c branches/setup_improvements/base/setup/lib/bootsup.h - copied, changed from r75673, branches/setup_improvements/base/setup/usetup/bootsup.h Removed: branches/setup_improvements/base/setup/usetup/bootsup.c branches/setup_improvements/base/setup/usetup/bootsup.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/fsutil.h branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/usetup.c [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/bootsup.c (from r75673, branches/setup_improvements/base/setup/usetup/bootsup.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/bootsup.h (from r75673, branches/setup_improvements/base/setup/usetup/bootsup.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/fsutil.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/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…

7 years

[ashaposhnikov] 75673: [RAPPS] - Added language strings to all .rc - Replaced hardcoded strings with resource counterparts - Fixed settings loading always default - Fixed force update not working -...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Aug 26 08:39:42 2017 New Revision: 75673 URL: http://svn.reactos.org/svn/reactos?rev=75673&view=rev Log: [RAPPS] - Added language strings to all .rc - Replaced hardcoded strings with resource counterparts - Fixed settings loading always default - Fixed force update not working - Removed hInst from LoadStringW() where possible Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/bg-BG.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/cs-CZ.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/es-ES.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/fr-FR.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/he-IL.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/it-IT.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ja-JP.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/no-NO.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/pl-PL.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/pt-BR.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ro-RO.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sk-SK.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sq-AL.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sv-SE.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/tr-TR.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/zh-CN.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/zh-TW.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…

7 years

[tfaber] 75672: [WIN32K:NTUSER] - Remove unnecessary thread reference in IsThreadSuspended.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Aug 26 07:31:38 2017 New Revision: 75672 URL: http://svn.reactos.org/svn/reactos?rev=75672&view=rev Log: [WIN32K:NTUSER] - Remove unnecessary thread reference in IsThreadSuspended. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Aug 26 07:31:38 2017 @@ -2216,9 +2216,7 @@ if (pti->pEThread) { BOOL Ret = TRUE; - ObReferenceObject(pti->pEThread); if (!(pti->pEThread->Tcb.SuspendCount) && !PsGetThreadFreezeCount(pti->pEThread)) Ret = FALSE; - ObDereferenceObject(pti->pEThread); return Ret; } return FALSE; @@ -2347,7 +2345,7 @@ { CurrentSentMessage->flags |= SMF_RECEIVERFREE; } - + if (!(CurrentSentMessage->flags & SMF_RECEIVERFREE)) { @@ -2385,7 +2383,7 @@ /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->HardwareMessagesListHead)) { - CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; + CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); ERR("MQ Cleanup Post Messages %p\n",CurrentMessage); MsqDestroyMessage(CurrentMessage);

7 years

[tthompson] 75671: [NTFS] - When creating files: -Don't add a preceding backslash when creating files on root. -Use NTFS_FILE_NAME_POSIX name type if CaseSensitive option is specified. -Don't try t...

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Aug 25 17:16:04 2017 New Revision: 75671 URL: http://svn.reactos.org/svn/reactos?rev=75671&view=rev Log: [NTFS] - When creating files: -Don't add a preceding backslash when creating files on root. -Use NTFS_FILE_NAME_POSIX name type if CaseSensitive option is specified. -Don't try to create a file when a folder is requested (folder creation is still TODO). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Fri Aug 25 17:16:04 2017 @@ -172,10 +172,10 @@ // we need to extract the filename from the path DPRINT1("Pathname: %wZ\n", &FileObject->FileName); - FilenameNoPath.Buffer = FileObject->FileName.Buffer; - FilenameNoPath.MaximumLength = FilenameNoPath.Length = FileObject->FileName.Length; - FsRtlDissectName(FileObject->FileName, &Current, &Remaining); + + FilenameNoPath.Buffer = Current.Buffer; + FilenameNoPath.MaximumLength = FilenameNoPath.Length = Current.Length; while (Current.Length != 0) { @@ -232,7 +232,7 @@ // For now, we're emulating the way Windows behaves when 8.3 name generation is disabled // TODO: add DOS Filename as needed - if (RtlIsNameLegalDOS8Dot3(&FilenameNoPath, NULL, NULL)) + if (!CaseSensitive && RtlIsNameLegalDOS8Dot3(&FilenameNoPath, NULL, NULL)) FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; else FileNameAttribute->NameType = NTFS_FILE_NAME_POSIX; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Fri Aug 25 17:16:04 2017 @@ -567,6 +567,13 @@ DPRINT1("NTFS write-support is EXPERIMENTAL and is disabled by default!\n"); NtfsCloseFile(DeviceExt, FileObject); return STATUS_ACCESS_DENIED; + } + + // We can't create directories yet + if (RequestedOptions & FILE_DIRECTORY_FILE) + { + DPRINT1("FIXME: Folder creation is still TODO!\n"); + return STATUS_NOT_IMPLEMENTED; } // Create the file record on disk

7 years

[gadamopoulos] 75670: [BROWSEUI] -CAddressEditBox: Populate address bar combobox. Patch by Barrett Karish with improvements by me to fix leaks and add error checks. CORE-10988

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 25 15:03:25 2017 New Revision: 75670 URL: http://svn.reactos.org/svn/reactos?rev=75670&view=rev Log: [BROWSEUI] -CAddressEditBox: Populate address bar combobox. Patch by Barrett Karish with improvements by me to fix leaks and add error checks. CORE-10988 Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/addresseditbox.h Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Fri Aug 25 15:03:25 2017 @@ -26,21 +26,22 @@ /* TODO: - Handle listbox dropdown message and fill contents Add drag and drop of icon in edit box Handle change notifies to update appropriately - Fix so selection in combo listbox navigates */ CAddressEditBox::CAddressEditBox() : fCombobox(NULL, this, 1), fEditWindow(NULL, this, 1), - fSite(NULL) + fSite(NULL), + pidlLastParsed(NULL) { } CAddressEditBox::~CAddressEditBox() { + if (pidlLastParsed) + ILFree(pidlLastParsed); } HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *pOwner) @@ -74,6 +75,7 @@ fCombobox.SubclassWindow(comboboxEx); fEditWindow.SubclassWindow(editControl); fSite = param18; + hComboBoxEx = comboboxEx; SHAutoComplete(fEditWindow.m_hWnd, SHACF_FILESYSTEM | SHACF_URLALL | SHACF_USETAB); @@ -258,21 +260,42 @@ switch (uMsg) { - case WM_NOTIFY: - hdr = (LPNMHDR) lParam; - if (hdr->code == CBEN_ENDEDIT) - { - NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; - if (endEdit->iWhy == CBENF_RETURN) + case WM_COMMAND: + { + if (HIWORD(wParam) == CBN_SELCHANGE) { + UINT selectedIndex = SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); + pidlLastParsed = ILClone((LPITEMIDLIST)SendMessageW((HWND)lParam, CB_GETITEMDATA, selectedIndex, 0)); Execute(0); } - else if (endEdit->iWhy == CBENF_ESCAPE) + break; + } + case WM_NOTIFY: + { + hdr = (LPNMHDR) lParam; + if (hdr->code == CBEN_ENDEDIT) { - /* Reset the contents of the combo box */ + NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; + if (endEdit->iWhy == CBENF_RETURN) + { + Execute(0); + } + else if (endEdit->iWhy == CBENF_ESCAPE) + { + /* Reset the contents of the combo box */ + } } + else if (hdr->code == CBEN_DELETEITEM) + { + PNMCOMBOBOXEX pCBEx = (PNMCOMBOBOXEX) lParam; + LPITEMIDLIST itemPidl = (LPITEMIDLIST)pCBEx->ceItem.lParam; + if (itemPidl) + { + ILFree(itemPidl); + } + } + break; } - break; } return S_OK; } @@ -320,12 +343,8 @@ CComPtr<IBrowserService> isb; CComPtr<IShellFolder> sf; HRESULT hr; - INT indexClosed, indexOpen, itemExists, oldIndex; - DWORD result; - COMBOBOXEXITEMW item; PIDLIST_ABSOLUTE absolutePIDL; LPCITEMIDLIST pidlChild; - LPITEMIDLIST pidlPrevious; STRRET ret; WCHAR buf[4096]; @@ -336,23 +355,12 @@ { case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: + + if (pidlLastParsed) + ILFree(pidlLastParsed); pidlLastParsed = NULL; - oldIndex = fCombobox.SendMessage(CB_GETCURSEL, 0, 0); - - itemExists = FALSE; - pidlPrevious = NULL; - - ZeroMemory(&item, sizeof(item)); - item.mask = CBEIF_LPARAM; - item.iItem = 0; - if (fCombobox.SendMessage(CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) - { - pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); - if (pidlPrevious) - itemExists = TRUE; - } - + /* Get the current pidl of the browser */ hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -361,6 +369,28 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* Fill the combobox */ + PopulateComboBox(absolutePIDL); + + /* Find the current item in the combobox and select it */ + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = psfDesktop->GetDisplayNameOf(absolutePIDL, SHGDN_FORADDRESSBAR, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = StrRetToBufW(&ret, absolutePIDL, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + int index = SendMessageW(hComboBoxEx, CB_FINDSTRINGEXACT, 0, (LPARAM)buf); + if (index != -1) + SendMessageW(hComboBoxEx, CB_SETCURSEL, index, 0); + + /* Add the item that will be visible when the combobox is not expanded */ hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -373,37 +403,17 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + INT indexClosed, indexOpen; indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + COMBOBOXEXITEMW item = {0}; item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = 0; + item.iItem = -1; item.iImage = indexClosed; item.iSelectedImage = indexOpen; item.pszText = buf; item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - - if (itemExists) - { - result = fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); - oldIndex = 0; - - if (result) - { - ILFree(pidlPrevious); - } - } - else - { - oldIndex = fCombobox.SendMessage(CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); - - if (oldIndex < 0) - DbgPrint("ERROR %d\n", GetLastError()); - } - - fCombobox.SendMessage(CB_SETCURSEL, -1, 0); - fCombobox.SendMessage(CB_SETCURSEL, oldIndex, 0); - - //fAddressEditBox->SetCurrentDir(index); + fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); } return S_OK; } @@ -435,3 +445,150 @@ { return E_NOTIMPL; } + +void CAddressEditBox::PopulateComboBox(LPITEMIDLIST pidlCurrent) +{ + HRESULT hr; + LPITEMIDLIST pidl; + int indent = 0; + int index; + + index = SendMessageW(hComboBoxEx, CB_GETCOUNT, 0, 0); + for (int i = 0; i < index; i++) + SendMessageW(hComboBoxEx, CBEM_DELETEITEM, i, 0); + SendMessageW(hComboBoxEx, CB_RESETCONTENT, 0, 0); + + /* Calculate the indent level. No need to clone the pidl */ + pidl = pidlCurrent; + do + { + if(!pidl->mkid.cb) + break; + pidl = ILGetNext(pidl); + indent++; + } while (pidl); + index = indent; + + /* Add every id from the pidl in the combo box */ + pidl = ILClone(pidlCurrent); + do + { + AddComboBoxItem(pidl, 0, index); + ILRemoveLastID(pidl); + index--; + } while (index >= 0); + ILFree(pidl); + + /* Add the items of the desktop */ + FillOneLevel(0, 1, indent); + + /* Add the items of My Computer */ + hr = SHGetSpecialFolderLocation(0, CSIDL_DRIVES, &pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + for(LPITEMIDLIST i = GetItemData(0); i; i = GetItemData(index)) + { + if (ILIsEqual(i, pidl)) + { + FillOneLevel(index, 2, indent); + break; + } + index++; + } + ILFree(pidl); +} + +void CAddressEditBox::AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent) +{ + HRESULT hr; + WCHAR buf[4096]; + + LPCITEMIDLIST pidlChild; + CComPtr<IShellFolder> sf; + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + STRRET strret; + hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = StrRetToBufW(&strret, pidlChild, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + COMBOBOXEXITEMW item = {0}; + item.mask = CBEIF_LPARAM | CBEIF_INDENT | CBEIF_SELECTEDIMAGE | CBEIF_IMAGE | CBEIF_TEXT; + item.iImage = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &item.iSelectedImage); + item.pszText = buf; + item.lParam = (LPARAM)(ILClone(pidl)); + item.iIndent = indent; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_INSERTITEMW, 0, (LPARAM)&item); +} + +void CAddressEditBox::FillOneLevel(int index, int levelIndent, int indent) +{ + HRESULT hr; + ULONG numObj; + int count; + LPITEMIDLIST pidl, pidl2, pidl3, pidl4; + + count = index + 1; + pidl = GetItemData(index); + pidl2 = GetItemData(count); + if(pidl) + { + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfItem; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + if (!pidl->mkid.cb) + { + psfItem = psfDesktop; + } + else + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfItem)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + } + + CComPtr<IEnumIDList> pEnumIDList; + hr = psfItem->EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_INCLUDEHIDDEN, &pEnumIDList); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + do + { + hr = pEnumIDList->Next(1, &pidl3, &numObj); + if(hr != S_OK || !numObj) + break; + + pidl4 = ILCombine(pidl, pidl3); + if (pidl2 && ILIsEqual(pidl4, pidl2)) + count += (indent - levelIndent); + else + AddComboBoxItem(pidl4, count, levelIndent); + count++; + ILFree(pidl3); + ILFree(pidl4); + } while (true); + } +} + +LPITEMIDLIST CAddressEditBox::GetItemData(int index) +{ + COMBOBOXEXITEMW item; + + memset(&item, 0, sizeof(COMBOBOXEXITEMW)); + item.mask = CBEIF_LPARAM; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_GETITEMW, 0, (LPARAM)&item); + return (LPITEMIDLIST)item.lParam; +} Modified: trunk/reactos/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] Fri Aug 25 15:03:25 2017 @@ -38,10 +38,15 @@ DWORD fAdviseCookie; CComPtr<IUnknown> fSite; LPITEMIDLIST pidlLastParsed; + HWND hComboBoxEx; public: CAddressEditBox(); ~CAddressEditBox(); private: + void PopulateComboBox(LPITEMIDLIST pidl); + void AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent); + void FillOneLevel(int index, int levelIndent, int indent); + LPITEMIDLIST GetItemData(int index); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *);

7 years

[hbelusca] 75669: [USETUP]: Add few checks to forbid the user to attempt installing ReactOS in the installation source directory, or a subdirectory thereof, or to delete the partition containing th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 25 14:38:12 2017 New Revision: 75669 URL: http://svn.reactos.org/svn/reactos?rev=75669&view=rev Log: [USETUP]: Add few checks to forbid the user to attempt installing ReactOS in the installation source directory, or a subdirectory thereof, or to delete the partition containing the installation source. This is needed because the ReactOS installer can also be present from within a HDD partition! Modified: branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Fri Aug 25 14:38:12 2017 @@ -1614,9 +1614,31 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { + WCHAR PathBuffer[MAX_PATH]; + UNICODE_STRING CurrentPartition; + if (PartitionList->CurrentPartition->IsPartitioned == FALSE) { MUIDisplayError(ERROR_DELETE_SPACE, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; + } + + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + PartitionList->CurrentDisk->DiskNumber, + PartitionList->CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&CurrentPartition, PathBuffer); + + /* + * Check whether the user attempts to delete the partition on which + * the installation source is present. If so, fail with an error. + */ + // &USetupData.SourceRootPath + if (RtlPrefixUnicodeString(&CurrentPartition, &USetupData.SourcePath, TRUE)) + { + PopupError("You cannot delete the partition containing the installation source!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); return SELECT_PARTITION_PAGE; } @@ -2591,6 +2613,8 @@ PartTypeString, ARRAYSIZE(PartTypeString)); + MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); + if (PartEntry->AutoCreate == TRUE) { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); @@ -2674,8 +2698,6 @@ &DiskEntry->DriverName, DiskEntry->NoMbr ? "GPT" : "MBR"); } - - MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); if (FileSystemList == NULL) { @@ -3068,6 +3090,20 @@ /* Initialize DestinationDriveLetter */ DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; + + /* + * Check whether the user attempts to install ReactOS within the + * installation source directory, or in a subdirectory thereof. + * If so, fail with an error. + */ + if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) + { + INPUT_RECORD Ir; + PopupError("You cannot install ReactOS within the installation source directory!", + MUIGetString(STRING_CONTINUE), + &Ir, POPUP_WAIT_ENTER); + return INSTALL_DIRECTORY_PAGE; + } return PREPARE_COPY_PAGE; }

7 years

[hbelusca] 75668: [REACTOS]: More interfacing of the 1st-stage GUI installer with the setuplib: - Add a ConvertNtPathToWin32Path() helper function that allows me to convert NT paths like: \Device\C...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 25 09:29:20 2017 New Revision: 75668 URL: http://svn.reactos.org/svn/reactos?rev=75668&view=rev Log: [REACTOS]: More interfacing of the 1st-stage GUI installer with the setuplib: - Add a ConvertNtPathToWin32Path() helper function that allows me to convert NT paths like: \Device\CdRom0\i386\txtsetup.sif file into a Win32 path that the Win32 versions of the SetupApi functions (e.g. SetupOpenInfFileW) can accept. Note that RtlNtPathNameToDosPathName() cannot be used here because this function only works for NT paths within the \DosDevices\ (or \??\) NTObj directory, and not in other directories. - Use this helper function in the implementation of SetupOpenInfFileExW. Now the txtsetup.sif function can be loaded by setuplib *when being used* by the 1st-stage GUI installer! - Remove deprecated code. Modified: branches/setup_improvements/base/setup/reactos/inffile.c branches/setup_improvements/base/setup/reactos/reactos.c branches/setup_improvements/base/setup/reactos/reactos.h Modified: branches/setup_improvements/base/setup/reactos/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/inffile.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/inffile.c [iso-8859-1] Fri Aug 25 09:29:20 2017 @@ -28,8 +28,26 @@ IN LCID LocaleId, OUT PUINT ErrorLine) { + WCHAR Win32FileName[MAX_PATH]; + UNREFERENCED_PARAMETER(LocaleId); - return SetupOpenInfFileW(FileName, InfClass, InfStyle, ErrorLine); + + /* + * SetupOpenInfFileExW is called within setuplib with NT paths, however + * the Win32 SetupOpenInfFileW API only takes Win32 paths. We therefore + * map the NT path to Win32 path and then call the Win32 API. + */ + if (!ConvertNtPathToWin32Path(Win32FileName, + _countof(Win32FileName), + FileName)) + { + return INVALID_HANDLE_VALUE; + } + + return SetupOpenInfFileW(Win32FileName, + InfClass, + InfStyle, + ErrorLine); } Modified: branches/setup_improvements/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] Fri Aug 25 09:29:20 2017 @@ -701,45 +701,55 @@ return TotalCount; } -BOOL IsUnattendSetup(VOID) -{ - WCHAR szPath[MAX_PATH]; - WCHAR *ch; - HINF hUnattendedInf; - INFCONTEXT InfContext; - TCHAR szValue[MAX_PATH]; - DWORD LineLength; - //HKEY hKey; - BOOL result = 0; - - GetModuleFileNameW(NULL, szPath, MAX_PATH); - ch = wcsrchr(szPath, L'\\'); - if (ch != NULL) - *ch = L'\0'; - - wcscat(szPath, L"\\unattend.inf"); - hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); - - if (hUnattendedInf != INVALID_HANDLE_VALUE) - { - if (SetupFindFirstLine(hUnattendedInf, _T("Unattend"), _T("UnattendSetupEnabled"),&InfContext)) - { - if (SetupGetStringField(&InfContext, - 1, - szValue, - sizeof(szValue) / sizeof(TCHAR), - &LineLength) && (_tcsicmp(szValue, _T("yes")) == 0)) - { - result = 1; // unattendSetup enabled - // read values and store in SetupData - } - } - SetupCloseInfFile(hUnattendedInf); - } - - return result; -} - +/* + * Attempts to convert a pure NT file path into a corresponding Win32 path. + * Adapted from GetInstallSourceWin32() in dll/win32/syssetup/wizard.c + */ +BOOL +ConvertNtPathToWin32Path( + OUT PWSTR pwszPath, + IN DWORD cchPathMax, + IN PCWSTR pwszNTPath) +{ + WCHAR wszDrives[512]; + WCHAR wszNTPath[512]; // MAX_PATH ? + DWORD cchDrives; + PWCHAR pwszDrive; + + *pwszPath = UNICODE_NULL; + + cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); + if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) + { + /* Buffer too small or failure */ + DPRINT1("GetLogicalDriveStringsW failed\n"); + return FALSE; + } + + for (pwszDrive = wszDrives; *pwszDrive; pwszDrive += wcslen(pwszDrive) + 1) + { + /* Retrieve the NT path corresponding to the current Win32 DOS path */ + pwszDrive[2] = UNICODE_NULL; // Temporarily remove the backslash + QueryDosDeviceW(pwszDrive, wszNTPath, _countof(wszNTPath)); + pwszDrive[2] = L'\\'; // Restore the backslash + + wcscat(wszNTPath, L"\\"); // Concat a backslash + + DPRINT1("Testing '%S' --> '%S'\n", pwszDrive, wszNTPath); + + /* Check whether the NT path corresponds to the NT installation source path */ + if (!_wcsnicmp(wszNTPath, pwszNTPath, wcslen(wszNTPath))) + { + /* Found it! */ + wsprintf(pwszPath, L"%s%s", // cchPathMax + pwszDrive, pwszNTPath + wcslen(wszNTPath)); + DPRINT1("ConvertNtPathToWin32Path: %S\n", pwszPath); + return TRUE; + } + } + + return FALSE; +} /* Used to enable and disable the shutdown privilege */ /* static */ BOOL @@ -768,7 +778,6 @@ CloseHandle(hToken); return Success; } - int WINAPI _tWinMain(HINSTANCE hInst, @@ -778,17 +787,12 @@ { NTSTATUS Status; ULONG Error; - // PSETUPDATA pSetupData = NULL; PROPSHEETHEADER psh; HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; ProcessHeap = GetProcessHeap(); - - // pSetupData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SETUPDATA)); - // if (pSetupData == NULL) - // return 1; /* Initialize global unicode strings */ RtlInitUnicodeString(&SetupData.USetupData.SourcePath, NULL); @@ -833,7 +837,6 @@ SetupData.hInstance = hInst; - // SetupData.bUnattend = IsUnattendSetup(); CheckUnattendedSetup(&SetupData.USetupData); SetupData.bUnattend = IsUnattendedSetup; @@ -940,7 +943,6 @@ SetupCloseInfFile(SetupData.SetupInf); Quit: - // HeapFree(GetProcessHeap(), 0, pSetupData); #if 0 // NOTE: Disabled for testing purposes only! EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); Modified: branches/setup_improvements/base/setup/reactos/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] Fri Aug 25 09:29:20 2017 @@ -29,6 +29,7 @@ #define _REACTOS_PCH_ /* C Headers */ +#include <stdlib.h> #include <stdarg.h> #include <tchar.h> @@ -133,6 +134,17 @@ +/* + * Attempts to convert a pure NT file path into a corresponding Win32 path. + * Adapted from GetInstallSourceWin32() in dll/win32/syssetup/wizard.c + */ +BOOL +ConvertNtPathToWin32Path( + OUT PWSTR pwszPath, + IN DWORD cchPathMax, + IN PCWSTR pwszNTPath); + + /* drivepage.c */ INT_PTR CALLBACK

7 years

[hbelusca] 75667: [SETUPLIB]: - Compute the installation source paths based on the full path of the installer program that uses the setup library. - Add INF_STYLE_OLDNT define in infsupp.h. - Add s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 25 09:19:44 2017 New Revision: 75667 URL: http://svn.reactos.org/svn/reactos?rev=75667&view=rev Log: [SETUPLIB]: - Compute the installation source paths based on the full path of the installer program that uses the setup library. - Add INF_STYLE_OLDNT define in infsupp.h. - Add some (silenced) diagnostic DPRINTs. Modified: branches/setup_improvements/base/setup/lib/infsupp.h branches/setup_improvements/base/setup/lib/setuplib.c Modified: branches/setup_improvements/base/setup/lib/infsupp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/infsupp.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/infsupp.h [iso-8859-1] Fri Aug 25 09:19:44 2017 @@ -95,6 +95,10 @@ #undef MAX_INF_STRING_LENGTH #define MAX_INF_STRING_LENGTH 1024 // Still larger than in infcommon.h +#ifndef INF_STYLE_OLDNT +#define INF_STYLE_OLDNT 0x00000001 +#endif + #ifndef INF_STYLE_WIN4 #define INF_STYLE_WIN4 0x00000002 #endif Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Fri Aug 25 09:19:44 2017 @@ -37,6 +37,8 @@ CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + + DPRINT("UnattendInf path: '%S'\n", UnattendInfPath); if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { @@ -376,8 +378,6 @@ #endif } - - NTSTATUS GetSourcePaths( OUT PUNICODE_STRING SourcePath, @@ -385,41 +385,87 @@ OUT PUNICODE_STRING SourceRootDir) { NTSTATUS Status; + HANDLE Handle; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); - UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = L""; - HANDLE Handle; - ULONG Length; + UCHAR ImageFileBuffer[sizeof(UNICODE_STRING) + MAX_PATH * sizeof(WCHAR)]; + PUNICODE_STRING InstallSourcePath = (PUNICODE_STRING)&ImageFileBuffer; + WCHAR SystemRootBuffer[MAX_PATH] = L""; + UNICODE_STRING SystemRootPath = RTL_CONSTANT_STRING(L"\\SystemRoot"); + ULONG BufferSize; PWCHAR Ptr; + /* Determine the installation source path via the full path of the installer */ + RtlInitEmptyUnicodeString(InstallSourcePath, + (PWSTR)((ULONG_PTR)ImageFileBuffer + sizeof(UNICODE_STRING)), + sizeof(ImageFileBuffer) - sizeof(UNICODE_STRING) + /* Reserve space for a NULL terminator */ - sizeof(UNICODE_NULL)); + BufferSize = sizeof(ImageFileBuffer); + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessImageFileName, + InstallSourcePath, + BufferSize, + NULL); + // STATUS_INFO_LENGTH_MISMATCH or STATUS_BUFFER_TOO_SMALL ? + if (!NT_SUCCESS(Status)) + return Status; + + /* Manually NULL-terminate */ + InstallSourcePath->Buffer[InstallSourcePath->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Strip the trailing file name */ + Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + *Ptr = UNICODE_NULL; + InstallSourcePath->Length = wcslen(InstallSourcePath->Buffer) * sizeof(WCHAR); + + + /* + * Now resolve the full path to \SystemRoot. In case it prefixes + * the installation source path determined from the full path of + * the installer, we use instead the resolved \SystemRoot as the + * installation source path. + * Otherwise, we use instead the path from the full installer path. + */ + InitializeObjectAttributes(&ObjectAttributes, - &LinkName, + &SystemRootPath, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, + SYMBOLIC_LINK_QUERY, &ObjectAttributes); if (!NT_SUCCESS(Status)) return Status; - RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); + RtlInitEmptyUnicodeString(&SystemRootPath, + SystemRootBuffer, + sizeof(SystemRootBuffer)); Status = NtQuerySymbolicLinkObject(Handle, - &SourceName, - &Length); + &SystemRootPath, + &BufferSize); NtClose(Handle); if (!NT_SUCCESS(Status)) return Status; - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); + /* Check whether the resolved \SystemRoot is a prefix of the image file path */ + if (RtlPrefixUnicodeString(&SystemRootPath, InstallSourcePath, TRUE)) + { + /* Yes it is, so we use instead SystemRoot as the installation source path */ + InstallSourcePath = &SystemRootPath; + } + + + /* + * Retrieve the different source path components + */ + RtlCreateUnicodeString(SourcePath, InstallSourcePath->Buffer); /* Strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); if (Ptr) { RtlCreateUnicodeString(SourceRootDir, Ptr); @@ -430,12 +476,10 @@ RtlCreateUnicodeString(SourceRootDir, L""); } - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); + RtlCreateUnicodeString(SourceRootPath, InstallSourcePath->Buffer); return STATUS_SUCCESS; } - ERROR_NUMBER LoadSetupInf( @@ -451,6 +495,8 @@ CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, pSetupData->SourcePath.Buffer, L"txtsetup.sif"); + DPRINT("SetupInf path: '%S'\n", FileNameBuffer); + *SetupInf = SetupOpenInfFileExW(FileNameBuffer, NULL, INF_STYLE_WIN4,

7 years

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017