Ros-diffs

ros-diffs@reactos.org

10 participants
81009 discussions

[reactos] 01/01: [VIRTIO] Misc fixes (#7283)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3560c68301ce8fd1dae5… commit c3560c68301ce8fd1dae5a4359dcf2cb5d819a47 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Fri Aug 30 07:26:55 2024 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 30 10:26:55 2024 +0300 [VIRTIO] Misc fixes (#7283) - Add bugcodes dependency, fixes a rare build failure - Fix for the sync part of commit 823fdb19d75b29352b1621e16f5c955153d90ed3, somehow it didn't pick up the change from the upstream commit https://github.com/virtio-win/kvm-guest-drivers-windows/commit/b22efbb8b80f… --- sdk/lib/drivers/virtio/CMakeLists.txt | 2 +- sdk/lib/drivers/virtio/linux/virtio_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/drivers/virtio/CMakeLists.txt b/sdk/lib/drivers/virtio/CMakeLists.txt index c7cffcc09a7..2e4b6d0b2d3 100644 --- a/sdk/lib/drivers/virtio/CMakeLists.txt +++ b/sdk/lib/drivers/virtio/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE VirtIORing-Packed.c) add_library(virtio ${SOURCE}) -add_dependencies(virtio xdk) +add_dependencies(virtio bugcodes xdk) if(NOT MSVC) target_compile_options(virtio PRIVATE diff --git a/sdk/lib/drivers/virtio/linux/virtio_config.h b/sdk/lib/drivers/virtio/linux/virtio_config.h index bd459199fc6..7f94d243b00 100644 --- a/sdk/lib/drivers/virtio/linux/virtio_config.h +++ b/sdk/lib/drivers/virtio/linux/virtio_config.h @@ -62,7 +62,7 @@ /* v1.0 compliant. */ #define VIRTIO_F_VERSION_1 32 -#define VIRTIO_F_IOMMU_PLATFORM 33 +#define VIRTIO_F_ACCESS_PLATFORM 33 /* This feature indicates support for the packed virtqueue layout. */ #define VIRTIO_F_RING_PACKED 34

4 months, 1 week

[reactos] 01/01: [BOOTDATA] Fix LiveCD autorun (#7282)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03d41008d42716c52e4f7… commit 03d41008d42716c52e4f7ba03e662b9da5eb54dd Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Fri Aug 30 07:16:31 2024 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 30 10:16:31 2024 +0300 [BOOTDATA] Fix LiveCD autorun (#7282) Use 'shellexecute' entry instead of 'open', because the latter tries to execute a non-executable readme.txt file. https://learn.microsoft.com/en-us/windows/win32/shell/autorun-cmds Addendum to 4cc03bbf0192 (r71342). --- boot/bootdata/autorun-livecd.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/autorun-livecd.inf b/boot/bootdata/autorun-livecd.inf index 2198117319f..e4e41890ae4 100644 --- a/boot/bootdata/autorun-livecd.inf +++ b/boot/bootdata/autorun-livecd.inf @@ -1,3 +1,3 @@ [autorun] -open=readme.txt +shellexecute=readme.txt icon=icon.ico

4 months, 1 week

[reactos] 01/01: [RTL] Fix overflow case in vDbgPrintExWithPrefixInternal

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cddd76f57130581f691d… commit 3cddd76f57130581f691d8936f38ee3ac8a2dc91 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 21 11:05:09 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 30 06:38:29 2024 +0300 [RTL] Fix overflow case in vDbgPrintExWithPrefixInternal The string should always be NULL terminated. --- sdk/lib/rtl/debug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/lib/rtl/debug.c b/sdk/lib/rtl/debug.c index 3c0be055496..f9e9c192295 100644 --- a/sdk/lib/rtl/debug.c +++ b/sdk/lib/rtl/debug.c @@ -102,10 +102,11 @@ vDbgPrintExWithPrefixInternal(IN PCCH Prefix, if (Length == MAXULONG) { /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; + Buffer[sizeof(Buffer) - 2] = '\n'; + Buffer[sizeof(Buffer) - 1] = '\0'; /* Put maximum */ - Length = sizeof(Buffer); + Length = sizeof(Buffer) - 1; } else {

4 months, 1 week

[reactos] 01/01: [CRT] Fix link issues with __ftol2 when compiling for NT6

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f80d978fc039ceb1bc070… commit f80d978fc039ceb1bc070d6e8a5b6eca5abe2f13 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 29 20:57:30 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 30 06:29:13 2024 +0300 [CRT] Fix link issues with __ftol2 when compiling for NT6 __ftol2 is exported from msvcrt on NT6+, not from ntdll for some reason. So native apps still need to statically link _ftol2 and _ftoul2_legacy, but apps linking to msvcrt only need to statically link _ftoul2_legacy (via msvcrtex), when on NT6+. --- sdk/lib/crt/CMakeLists.txt | 1 + sdk/lib/crt/math/i386/ftol2_asm.s | 66 ++-------------------- .../math/i386/{ftol2_asm.s => ftoul2_legacy_asm.s} | 15 +---- sdk/lib/crt/math/math.cmake | 1 + sdk/lib/crt/msvcrtex.cmake | 3 +- 5 files changed, 12 insertions(+), 74 deletions(-) diff --git a/sdk/lib/crt/CMakeLists.txt b/sdk/lib/crt/CMakeLists.txt index 6c38c518e56..740b9aec154 100644 --- a/sdk/lib/crt/CMakeLists.txt +++ b/sdk/lib/crt/CMakeLists.txt @@ -49,6 +49,7 @@ target_compile_definitions(user32_wsprintf PRIVATE _USER32_WSPRINTF) if(MSVC AND ARCH STREQUAL "i386") add_asm_files(ftol2_asm math/i386/ftol2_asm.s + math/i386/ftoul2_legacy_asm.s ) add_library(ftol2 ${ftol2_asm}) set_target_properties(ftol2 PROPERTIES LINKER_LANGUAGE "C") diff --git a/sdk/lib/crt/math/i386/ftol2_asm.s b/sdk/lib/crt/math/i386/ftol2_asm.s index a15a7031abc..974d6f5a468 100644 --- a/sdk/lib/crt/math/i386/ftol2_asm.s +++ b/sdk/lib/crt/math/i386/ftol2_asm.s @@ -1,8 +1,10 @@ /* - * PROJECT: ReactOS CRT - * LICENSE: MIT (https://spdx.org/licenses/MIT) - * PURPOSE: Floating point conversion routines - * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/sdk/crt/math/i386/ftol2_asm.s + * PROGRAMER: + * */ #include <asm.inc> @@ -10,7 +12,6 @@ EXTERN __ftol:PROC PUBLIC __ftol2 PUBLIC __ftol2_sse -PUBLIC __ftoul2_legacy /* FUNCTIONS ***************************************************************/ .code @@ -24,59 +25,4 @@ __ftol2: __ftol2_sse: jmp __ftol -__real@43e0000000000000: - .quad HEX(43e0000000000000) - -__ftoul2_legacy: - - /* Compare the fp number, passed in st(0), against (LLONG_MAX + 1) - aka 9223372036854775808.0 (which is 0x43e0000000000000 in double format). - If it is smaller, it fits into an __int64, so we can pass it to _ftol2. - After this the original fp value has moved to st(1) */ - fld qword ptr [__real@43e0000000000000] - fcom - - /* Put the comparison result bits into ax */ - fnstsw ax - - /* Here we test the bits for c0 (0x01) and c3 (0x40). - We check the parity bit after the test. If it is set, - an even number of bits were set. - If both are 0, st(1) < st(0), i.e. our value is ok. - If both are 1, the value is NaN/Inf and we let _ftol2 handle it. */ - test ah, HEX(41) - jnp __ftoul2_legacy2 - - /* Clean up the fp stack and forward to _ftol2 */ - fstp st(0) - jmp __ftol2 - -__ftoul2_legacy2: - - /* Subtract (LLONG_MAX + 1) from the given fp value and put the result in st(1). - st(0) = 9223372036854775808.0 - st(1) = original fp value - 9223372036854775808.0 */ - fsub st(1), st(0) - - /* Compare the result to (LLONG_MAX + 1) again and pop the fp stack. - Here we check, whether c0 and c3 are both 0, indicating that st(0) > st(1), - i.e. fp - (LLONG_MAX + 1) < (LLONG_MAX + 1) */ - fcomp - fnstsw ax - test ah, HEX(41) - jnz __ftoul2_legacy3 - - /* We have established that fp - (LLONG_MAX + 1) fits into an __int64, - so pass that to _ftol2 and manually add the difference to the result */ - call __ftol2 - add edx, HEX(80000000) - ret - -__ftoul2_legacy3: - - /* The value is too large, just return the error value */ - xor eax, eax - mov edx, HEX(80000000) - ret - END diff --git a/sdk/lib/crt/math/i386/ftol2_asm.s b/sdk/lib/crt/math/i386/ftoul2_legacy_asm.s similarity index 87% copy from sdk/lib/crt/math/i386/ftol2_asm.s copy to sdk/lib/crt/math/i386/ftoul2_legacy_asm.s index a15a7031abc..432d95435f1 100644 --- a/sdk/lib/crt/math/i386/ftol2_asm.s +++ b/sdk/lib/crt/math/i386/ftoul2_legacy_asm.s @@ -7,26 +7,15 @@ #include <asm.inc> -EXTERN __ftol:PROC -PUBLIC __ftol2 -PUBLIC __ftol2_sse -PUBLIC __ftoul2_legacy +EXTERN __ftol2:PROC /* FUNCTIONS ***************************************************************/ .code -/* - * This routine is called by MSVC-generated code to convert from floating point - * to integer representation. The floating point number to be converted is - * on the top of the floating point stack. - */ -__ftol2: -__ftol2_sse: - jmp __ftol - __real@43e0000000000000: .quad HEX(43e0000000000000) +PUBLIC __ftoul2_legacy __ftoul2_legacy: /* Compare the fp number, passed in st(0), against (LLONG_MAX + 1) diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 5821259646a..3a6c69995b5 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -40,6 +40,7 @@ if(ARCH STREQUAL "i386") math/i386/floor_asm.s math/i386/ftol_asm.s math/i386/ftol2_asm.s + math/i386/ftoul2_legacy_asm.s math/i386/log_asm.s math/i386/log10_asm.s math/i386/pow_asm.s diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 6377cfa688b..232f7bda6bd 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -47,7 +47,8 @@ if(ARCH STREQUAL "i386") endif() if(MSVC AND DLL_EXPORT_VERSION LESS 0x600) list(APPEND MSVCRTEX_ASM_SOURCE - except/i386/__CxxFrameHandler3.s) + except/i386/__CxxFrameHandler3.s + math/i386/ftoul2_legacy_asm.s) list(APPEND MSVCRTEX_SOURCE except/i386/CxxHandleV8Frame.c) endif()

4 months, 1 week

[reactos] 01/01: [NTOS:CC] CcRosCreateVacb: Return error code on pool allocation failure (#7275)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95c340dfb770e6b8c48cd… commit 95c340dfb770e6b8c48cd522d029a8dddcaaffb9 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Fri Aug 30 07:34:48 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 30 07:34:48 2024 +0700 [NTOS:CC] CcRosCreateVacb: Return error code on pool allocation failure (#7275) Return STATUS_INSUFFICIENT_RESOURCES error code instead of accessing the invalid pointer. --- ntoskrnl/cc/view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 7c13afb3220..f35d5c227c2 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -812,6 +812,10 @@ CcRosCreateVacb ( DPRINT("CcRosCreateVacb()\n"); current = ExAllocateFromNPagedLookasideList(&VacbLookasideList); + if (!current) + { + return STATUS_INSUFFICIENT_RESOURCES; + } current->BaseAddress = NULL; current->Dirty = FALSE; current->PageOut = FALSE;

4 months, 1 week

[reactos] 01/01: [SHELL32] Don't display non-enumerable nor non-folder items in Explorer tree (#7189)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ae11ba09d4fa8d16336a… commit 6ae11ba09d4fa8d16336a1ed40a112b3df19a474 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 29 20:45:59 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 29 20:45:59 2024 +0200 [SHELL32] Don't display non-enumerable nor non-folder items in Explorer tree (#7189) This partially implements RegFolder required items as described by Geoff Chappell. CORE-19176 CORE-14061 --- dll/win32/shell32/CDefView.cpp | 12 +- dll/win32/shell32/CEnumIDListBase.cpp | 27 -- dll/win32/shell32/CEnumIDListBase.h | 16 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 14 +- dll/win32/shell32/folders/CDesktopFolder.cpp | 197 +++++------ dll/win32/shell32/folders/CDesktopFolder.h | 29 ++ dll/win32/shell32/folders/CDrivesFolder.cpp | 56 +++- dll/win32/shell32/folders/CDrivesFolder.h | 13 +- dll/win32/shell32/folders/CFSFolder.cpp | 44 ++- dll/win32/shell32/folders/CRegFolder.cpp | 362 +++++++++++++-------- dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp | 3 +- dll/win32/shell32/shfldr.h | 42 +++ dll/win32/shell32/shlfolder.cpp | 28 ++ dll/win32/shell32/wine/pidl.c | 2 +- dll/win32/shell32/wine/pidl.h | 14 + dll/win32/shell32/wine/shell32_main.h | 2 - sdk/include/psdk/shobjidl.idl | 33 ++ sdk/include/reactos/shellutils.h | 11 + 18 files changed, 601 insertions(+), 304 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 7617f85e5d7..bb3e88239c2 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -231,6 +231,7 @@ private: CComPtr<IShellFolderViewCB> m_pShellFolderViewCB; CComPtr<IShellBrowser> m_pShellBrowser; CComPtr<ICommDlgBrowser> m_pCommDlgBrowser; + CComPtr<IFolderFilter> m_pFolderFilter; CComPtr<IShellFolderViewDual> m_pShellFolderViewDual; CListView m_ListView; HWND m_hWndParent; @@ -636,14 +637,16 @@ HRESULT WINAPI CDefView::Initialize(IShellFolder *shellFolder) HRESULT CDefView::IncludeObject(PCUITEMID_CHILD pidl) { HRESULT ret = S_OK; - if (m_pCommDlgBrowser && !(GetCommDlgViewFlags() & CDB2GVF_NOINCLUDEITEM)) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = m_pCommDlgBrowser->IncludeObject(this, pidl); TRACE("-- returns 0x%08x\n", ret); } - + else if (m_pFolderFilter) + { + ret = m_pFolderFilter->ShouldShow(m_pSFParent, m_pidlParent, pidl); + } return ret; } @@ -1484,7 +1487,7 @@ HRESULT CDefView::FillList(BOOL IsRefreshCommand) DWORD dwFetched; HRESULT hRes; HDPA hdpa; - DWORD dFlags = SHCONTF_NONFOLDERS | SHCONTF_FOLDERS; + DWORD dFlags = SHCONTF_NONFOLDERS | ((m_FolderSettings.fFlags & FWF_NOSUBFOLDERS) ? 0 : SHCONTF_FOLDERS); TRACE("%p\n", this); @@ -4006,6 +4009,9 @@ HRESULT STDMETHODCALLTYPE CDefView::SetCallback(IShellFolderViewCB *new_cb, ISh *old_cb = m_pShellFolderViewCB.Detach(); m_pShellFolderViewCB = new_cb; + m_pFolderFilter = NULL; + if (new_cb) + new_cb->QueryInterface(IID_PPV_ARG(IFolderFilter, &m_pFolderFilter)); return S_OK; } diff --git a/dll/win32/shell32/CEnumIDListBase.cpp b/dll/win32/shell32/CEnumIDListBase.cpp index 47adf6e2ea8..d0a79b350d1 100644 --- a/dll/win32/shell32/CEnumIDListBase.cpp +++ b/dll/win32/shell32/CEnumIDListBase.cpp @@ -96,33 +96,6 @@ BOOL CEnumIDListBase::DeleteList() return TRUE; } -/************************************************************************** - * HasItemWithCLSID() - */ -BOOL CEnumIDListBase::HasItemWithCLSID(LPITEMIDLIST pidl) -{ - ENUMLIST *pCur; - IID *ptr = _ILGetGUIDPointer(pidl); - - if (ptr) - { - REFIID refid = *ptr; - pCur = mpFirst; - - while(pCur) - { - LPGUID curid = _ILGetGUIDPointer(pCur->pidl); - if (curid && IsEqualGUID(*curid, refid)) - { - return TRUE; - } - pCur = pCur->pNext; - } - } - - return FALSE; -} - HRESULT CEnumIDListBase::AppendItemsFromEnumerator(IEnumIDList* pEnum) { LPITEMIDLIST pidl; diff --git a/dll/win32/shell32/CEnumIDListBase.h b/dll/win32/shell32/CEnumIDListBase.h index 65ec9058c42..68ce0966617 100644 --- a/dll/win32/shell32/CEnumIDListBase.h +++ b/dll/win32/shell32/CEnumIDListBase.h @@ -27,7 +27,7 @@ class CEnumIDListBase : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IEnumIDList { -private: +protected: ENUMLIST *mpFirst; ENUMLIST *mpLast; ENUMLIST *mpCurrent; @@ -37,7 +37,19 @@ public: BOOL AddToEnumList(LPITEMIDLIST pidl); BOOL DeleteList(); BOOL HasItemWithCLSID(LPITEMIDLIST pidl); - HRESULT AppendItemsFromEnumerator(IEnumIDList* pEnum); + HRESULT AppendItemsFromEnumerator(IEnumIDList* pEnum); + + template <class T> BOOL HasItemWithCLSIDImpl(LPCITEMIDLIST pidl) + { + const CLSID * const pClsid = static_cast<T*>(this)->GetPidlClsid((PCUITEMID_CHILD)pidl); + for (ENUMLIST *pCur = mpFirst; pClsid && pCur; pCur = pCur->pNext) + { + const CLSID * const pEnumClsid = static_cast<T*>(this)->GetPidlClsid((PCUITEMID_CHILD)pCur->pidl); + if (pEnumClsid && IsEqualCLSID(*pClsid, *pEnumClsid)) + return TRUE; + } + return FALSE; + } // *** IEnumIDList methods *** STDMETHOD(Next)(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched) override; diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 58d5c36353c..729112d68e8 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static const REGFOLDERINFO g_RegFolderInfo = +{ + PT_CONTROLS_NEWREGITEM, + 0, NULL, + CLSID_ControlPanel, + L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", + L"ControlPanel", +}; + /*********************************************************************** * control panel implementation in shell namespace */ @@ -627,11 +636,10 @@ HRESULT WINAPI CControlPanelFolder::Initialize(PCIDLIST_ABSOLUTE pidl) pidlRoot = ILClone(pidl); /* Create the inner reg folder */ + REGFOLDERINITDATA RegInit = { static_cast<IShellFolder*>(this), &g_RegFolderInfo }; HRESULT hr; - hr = CRegFolder_CreateInstance(&CLSID_ControlPanel, + hr = CRegFolder_CreateInstance(&RegInit, pidlRoot, - L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", - L"ControlPanel", IID_PPV_ARG(IShellFolder2, &m_regFolder)); if (FAILED_UNEXPECTEDLY(hr)) return hr; diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index c95828dc6fc..ee1c10834dc 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -25,11 +25,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +extern BOOL SHELL32_IsShellFolderNamespaceItemHidden(LPCWSTR SubKey, REFCLSID Clsid); + +static const REQUIREDREGITEM g_RequiredItems[] = +{ + { CLSID_MyComputer, "sysdm.cpl", 0x50 }, + { CLSID_NetworkPlaces, "ncpa.cpl", 0x58 }, + { CLSID_Internet, "inetcpl.cpl", 0x68 }, +}; +static const REGFOLDERINFO g_RegFolderInfo = +{ + PT_DESKTOP_REGITEM, + _countof(g_RequiredItems), g_RequiredItems, + CLSID_ShellDesktop, + L"", + L"Desktop", +}; + static BOOL IsSelf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl) { return cidl == 0 || (cidl == 1 && apidl && _ILIsEmpty(apidl[0])); } +static const CLSID* IsRegItem(PCUITEMID_CHILD pidl) +{ + if (pidl && pidl->mkid.cb == 2 + 2 + sizeof(CLSID) && pidl->mkid.abID[0] == PT_GUID) + return (const CLSID*)(&pidl->mkid.abID[2]); + return NULL; +} + STDMETHODIMP CDesktopFolder::ShellUrlParseDisplayName( HWND hwndOwner, @@ -153,49 +177,13 @@ The CDesktopFolderEnum class should create two enumerators, one for each of the system folders, and enumerate the contents of each folder. Since the CRegFolder implementation of IShellFolder::EnumObjects enumerates the virtual items, the CDesktopFolderEnum is only responsible for returning the physical items. -CDesktopFolderEnum is incorrect where it filters My Computer from the enumeration -if the new start menu is used. The CDesktopViewCallback is responsible for filtering -it from the view by handling the IncludeObject query to return S_FALSE. The enumerator -always shows My Computer. +CDesktopFolderViewCB is responsible for filtering hidden regitems. +The enumerator always shows My Computer. */ /* Undocumented functions from shdocvw */ extern "C" HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); -static const WCHAR ClassicStartMenuW[] = L"SOFTWARE\\Microsoft\\Windows\\" - L"CurrentVersion\\Explorer\\HideDesktopIcons\\ClassicStartMenu"; - -static INT -IsNamespaceExtensionHidden(const WCHAR *iid) -{ - DWORD Result, dwResult; - dwResult = sizeof(DWORD); - - if (RegGetValueW(HKEY_CURRENT_USER, /* FIXME use NewStartPanel when activated */ - ClassicStartMenuW, - iid, - RRF_RT_DWORD, - NULL, - &Result, - &dwResult) != ERROR_SUCCESS) - { - return -1; - } - - return Result; -} - -static INT IsNamespaceExtensionHidden(LPCITEMIDLIST pidl) -{ - GUID const *clsid = _ILGetGUIDPointer (pidl); - if (!clsid) - return -1; - - WCHAR pwszGuid[CHARS_IN_GUID]; - SHELL32_GUIDToStringW(*clsid, pwszGuid); - return IsNamespaceExtensionHidden(pwszGuid); -} - class CDesktopFolderEnum : public CEnumIDListBase { @@ -204,85 +192,20 @@ class CDesktopFolderEnum : // CComPtr fCommonDesktopEnumerator; public: - void AddItemsFromClassicStartMenuKey(HKEY hKeyRoot) + HRESULT WINAPI Initialize(IShellFolder *pRegFolder, SHCONTF dwFlags, IEnumIDList *pRegEnumerator, + IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) { - DWORD dwResult; - HKEY hkey; - DWORD j = 0, dwVal, Val, dwType, dwIID; - LONG r; - WCHAR iid[50]; - LPITEMIDLIST pidl; - - dwResult = RegOpenKeyExW(hKeyRoot, ClassicStartMenuW, 0, KEY_READ, &hkey); - if (dwResult != ERROR_SUCCESS) - return; - - while(1) - { - dwVal = sizeof(Val); - dwIID = sizeof(iid) / sizeof(WCHAR); - - r = RegEnumValueW(hkey, j++, iid, &dwIID, NULL, &dwType, (LPBYTE)&Val, &dwVal); - if (r != ERROR_SUCCESS) - break; - - if (Val == 0 && dwType == REG_DWORD) - { - pidl = _ILCreateGuidFromStrW(iid); - if (pidl != NULL) - { - if (!HasItemWithCLSID(pidl)) - AddToEnumList(pidl); - else - SHFree(pidl); - } - } - } - RegCloseKey(hkey); - } - - HRESULT WINAPI Initialize(DWORD dwFlags,IEnumIDList * pRegEnumerator, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) - { - BOOL ret = TRUE; - LPITEMIDLIST pidl; - - static const WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; - static const WCHAR InternetClassString[] = L"{871C5380-42A0-1069-A2EA-08002B30309D}"; - TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - /* enumerate the root folders */ - if (dwFlags & SHCONTF_FOLDERS) - { - AddToEnumList(_ILCreateMyComputer()); - if (IsNamespaceExtensionHidden(MyDocumentsClassString) < 1) - AddToEnumList(_ILCreateMyDocuments()); - if (IsNamespaceExtensionHidden(InternetClassString) < 1) - AddToEnumList(_ILCreateIExplore()); - - DWORD dwFetched; - while((S_OK == pRegEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) - { - if (IsNamespaceExtensionHidden(pidl) < 1) - { - if (!HasItemWithCLSID(pidl)) - AddToEnumList(pidl); - else - SHFree(pidl); - } - } - AddItemsFromClassicStartMenuKey(HKEY_LOCAL_MACHINE); - AddItemsFromClassicStartMenuKey(HKEY_CURRENT_USER); - } + AppendItemsFromEnumerator(pRegEnumerator); /* Enumerate the items in the two fs folders */ AppendItemsFromEnumerator(pDesktopEnumerator); AppendItemsFromEnumerator(pCommonDesktopEnumerator); - return ret ? S_OK : E_FAIL; + return S_OK; } - BEGIN_COM_MAP(CDesktopFolderEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) END_COM_MAP() @@ -337,10 +260,9 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct() return hr; /* Create the inner reg folder */ - hr = CRegFolder_CreateInstance(&CLSID_ShellDesktop, + REGFOLDERINITDATA RegInit = { static_cast<IShellFolder*>(this), &g_RegFolderInfo }; + hr = CRegFolder_CreateInstance(&RegInit, pidlRoot, - L"", - L"Desktop", IID_PPV_ARG(IShellFolder2, &m_regFolder)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -621,7 +543,8 @@ HRESULT WINAPI CDesktopFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUM if (FAILED(hr)) ERR("EnumObjects for shared desktop fs folder failed\n"); - return ShellObjectCreatorInit<CDesktopFolderEnum>(dwFlags,pRegEnumerator, pDesktopEnumerator, pCommonDesktopEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + return ShellObjectCreatorInit<CDesktopFolderEnum>(m_regFolder, dwFlags, pRegEnumerator, pDesktopEnumerator, + pCommonDesktopEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** @@ -726,8 +649,14 @@ HRESULT WINAPI CDesktopFolder::CreateViewObject( } else if (IsEqualIID (riid, IID_IShellView)) { - SFV_CREATE sfvparams = {sizeof(SFV_CREATE), this}; - hr = SHCreateShellFolderView(&sfvparams, (IShellView**)ppvOut); + CComPtr<CDesktopFolderViewCB> sfviewcb; + if (SUCCEEDED(hr = ShellObjectCreator(sfviewcb))) + { + SFV_CREATE create = { sizeof(create), this, NULL, sfviewcb }; + hr = SHCreateShellFolderView(&create, (IShellView**)ppvOut); + if (SUCCEEDED(hr)) + sfviewcb->Initialize((IShellView*)*ppvOut); + } } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); return hr; @@ -1102,6 +1031,48 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData return SHELL32_DefaultContextMenuCallBack(psf, pdtobj, uMsg); } +/************************************************************************* + * CDesktopFolderViewCB + */ + +bool CDesktopFolderViewCB::IsProgmanHostedBrowser(IShellView *psv) +{ + FOLDERSETTINGS settings; + return SUCCEEDED(psv->GetCurrentInfo(&settings)) && (settings.fFlags & FWF_DESKTOP); +} + +bool CDesktopFolderViewCB::IsProgmanHostedBrowser() +{ + enum { Uninitialized = 0, NotHosted, IsHosted }; + C_ASSERT(Uninitialized == 0); + if (m_IsProgmanHosted == Uninitialized) + m_IsProgmanHosted = m_pShellView && IsProgmanHostedBrowser(m_pShellView) ? IsHosted : NotHosted; + return m_IsProgmanHosted == IsHosted; +} + +HRESULT WINAPI CDesktopFolderViewCB::ShouldShow(IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, PCUITEMID_CHILD pidlItem) +{ + const CLSID* pClsid; + if (IsProgmanHostedBrowser() && (pClsid = IsRegItem(pidlItem)) != NULL) + { + const BOOL NewStart = SHELL_GetSetting(SSF_STARTPANELON, fStartPanelOn); + LPCWSTR SubKey = NewStart ? L"HideDesktopIcons\\NewStartPanel" : L"HideDesktopIcons\\ClassicStartMenu"; + return SHELL32_IsShellFolderNamespaceItemHidden(SubKey, *pClsid) ? S_FALSE : S_OK; + } + return S_OK; +} + +HRESULT WINAPI CDesktopFolderViewCB::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case SFVM_VIEWRELEASE: + m_pShellView = NULL; + return S_OK; + } + return E_NOTIMPL; +} + /************************************************************************* * SHGetDesktopFolder [SHELL32.@] */ diff --git a/dll/win32/shell32/folders/CDesktopFolder.h b/dll/win32/shell32/folders/CDesktopFolder.h index 66eda8df0ee..0f8ea5a35a2 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.h +++ b/dll/win32/shell32/folders/CDesktopFolder.h @@ -145,4 +145,33 @@ class CDesktopFolder : END_COM_MAP() }; +class CDesktopFolderViewCB : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellFolderViewCB, + public IFolderFilter +{ + IShellView *m_pShellView; // Not ref-counted! + UINT8 m_IsProgmanHosted; + + public: + CDesktopFolderViewCB() : m_IsProgmanHosted(0) {} + void Initialize(IShellView *psv) { m_pShellView = psv; } + static bool IsProgmanHostedBrowser(IShellView *psv); + bool IsProgmanHostedBrowser(); + + // IShellFolderViewCB + STDMETHOD(MessageSFVCB)(UINT uMsg, WPARAM wParam, LPARAM lParam) override; + + // IFolderFilter + STDMETHOD(ShouldShow)(IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, PCUITEMID_CHILD pidlItem) override; + STDMETHODIMP GetEnumFlags(IShellFolder*, PCIDLIST_ABSOLUTE, HWND*, DWORD*) override { return E_NOTIMPL; } + + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(CDesktopFolderViewCB) + BEGIN_COM_MAP(CDesktopFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IFolderFilter, IFolderFilter) + END_COM_MAP() +}; + #endif /* _CDESKTOPFOLDER_H_ */ diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 9cc549a842a..56422f83946 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -55,6 +55,29 @@ static int iDriveTypeIds[7] = { IDS_DRIVE_FIXED, /* DRIVE_UNKNOWN */ IDS_DRIVE_FIXED /* DRIVE_RAMDISK*/ }; +static const REQUIREDREGITEM g_RequiredItems[] = +{ + { CLSID_ControlPanel, 0, 0x50 }, +}; +static const REGFOLDERINFO g_RegFolderInfo = +{ + PT_COMPUTER_REGITEM, + _countof(g_RequiredItems), g_RequiredItems, + CLSID_MyComputer, + L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + L"MyComputer", +}; + +static const CLSID* IsRegItem(PCUITEMID_CHILD pidl) +{ + if (pidl && pidl->mkid.cb == 2 + 2 + sizeof(CLSID)) + { + if (pidl->mkid.abID[0] == PT_SHELLEXT || pidl->mkid.abID[0] == PT_GUID) // FIXME: Remove PT_GUID when CRegFolder is fixed + return (const CLSID*)(&pidl->mkid.abID[2]); + } + return NULL; +} + BOOL _ILGetDriveType(LPCITEMIDLIST pidl) { WCHAR szDrive[8]; @@ -66,6 +89,16 @@ BOOL _ILGetDriveType(LPCITEMIDLIST pidl) return ::GetDriveTypeW(szDrive); } +BOOL SHELL32_IsShellFolderNamespaceItemHidden(LPCWSTR SubKey, REFCLSID Clsid) +{ + // If this function returns true, the item should be hidden in DefView but not in the Explorer folder tree. + WCHAR path[MAX_PATH], name[CHARS_IN_GUID]; + wsprintfW(path, L"%s\\%s", REGSTR_PATH_EXPLORER, SubKey); + SHELL32_GUIDToStringW(Clsid, name); + DWORD data = 0, size = sizeof(data); + return !RegGetValueW(HKEY_CURRENT_USER, path, name, RRF_RT_DWORD, NULL, &data, &size) && data; +} + /*********************************************************************** * IShellFolder implementation */ @@ -643,10 +676,9 @@ HRESULT WINAPI CDrivesFolder::FinalConstruct() if (pidlRoot == NULL) return E_OUTOFMEMORY; - HRESULT hr = CRegFolder_CreateInstance(&CLSID_MyComputer, + REGFOLDERINITDATA RegInit = { static_cast<IShellFolder*>(this), &g_RegFolderInfo }; + HRESULT hr = CRegFolder_CreateInstance(&RegInit, pidlRoot, - L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", - L"MyComputer", IID_PPV_ARG(IShellFolder2, &m_regFolder)); return hr; @@ -901,7 +933,7 @@ HRESULT WINAPI CDrivesFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVO } else if (IsEqualIID(riid, IID_IShellView)) { - SFV_CREATE sfvparams = {sizeof(SFV_CREATE), this}; + SFV_CREATE sfvparams = { sizeof(SFV_CREATE), this, NULL, static_cast<IShellFolderViewCB*>(this) }; hr = SHCreateShellFolderView(&sfvparams, (IShellView**)ppvOut); } TRACE("-- (%p)->(interface=%p)\n", this, ppvOut); @@ -937,11 +969,17 @@ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a *rgfInOut &= ~SFGAO_CANRENAME; // CD-ROM drive cannot rename } else if (_ILIsControlPanel(apidl[i])) + { *rgfInOut &= dwControlPanelAttributes; + } else if (_ILIsSpecialFolder(*apidl)) + { m_regFolder->GetAttributesOf(1, &apidl[i], rgfInOut); + } else + { ERR("Got unknown pidl type!\n"); + } } } @@ -1302,6 +1340,16 @@ HRESULT WINAPI CDrivesFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) return S_OK; } +/************************************************************************** + * CDrivesFolder::ShouldShow + */ +HRESULT WINAPI CDrivesFolder::ShouldShow(IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, PCUITEMID_CHILD pidlItem) +{ + if (const CLSID* pClsid = IsRegItem(pidlItem)) + return SHELL32_IsShellFolderNamespaceItemHidden(L"HideMyComputerIcons", *pClsid) ? S_FALSE : S_OK; + return S_OK; +} + /************************************************************************/ /* IContextMenuCB interface */ diff --git a/dll/win32/shell32/folders/CDrivesFolder.h b/dll/win32/shell32/folders/CDrivesFolder.h index 7958027b545..a4222b88362 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.h +++ b/dll/win32/shell32/folders/CDrivesFolder.h @@ -28,7 +28,9 @@ class CDrivesFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, - public IContextMenuCB + public IContextMenuCB, + public IShellFolderViewCB, // Only exists so DefView can get IFolderFilter + public IFolderFilter { private: /* both paths are parsible from the desktop */ @@ -73,6 +75,13 @@ class CDrivesFolder : // IContextMenuCB STDMETHOD(CallBack)(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + // IShellFolderViewCB + STDMETHODIMP MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) override { return E_NOTIMPL; } + + // IFolderFilter + STDMETHOD(ShouldShow)(IShellFolder *psf, PCIDLIST_ABSOLUTE pidlFolder, PCUITEMID_CHILD pidlItem) override; + STDMETHODIMP GetEnumFlags(IShellFolder*, PCIDLIST_ABSOLUTE, HWND*, DWORD*) override { return E_NOTIMPL; } + DECLARE_REGISTRY_RESOURCEID(IDR_MYCOMPUTER) DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(CDrivesFolder) @@ -85,6 +94,8 @@ class CDrivesFolder : COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IContextMenuCB, IContextMenuCB) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IFolderFilter, IFolderFilter) END_COM_MAP() }; diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 8b444f05635..bde0d6dbb42 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -596,13 +596,33 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW BOOL bDirectory = (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + if (SFGAO_VALIDATE & *pdwAttributes) + { + STRRET strret; + LPWSTR path; + if (SUCCEEDED(psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret)) && + SUCCEEDED(StrRetToStrW(&strret, pidl, &path))) + { + BOOL exists = PathFileExistsW(path); + SHFree(path); + if (!exists) + return E_FAIL; + } + } + if (!bDirectory) { // https://git.reactos.org/?p=reactos.git;a=blob;f=dll/shellext/zipfldr/res/zi… WCHAR szFileName[MAX_PATH]; LPWSTR pExtension; + BOOL hasName = _ILSimpleGetTextW(pidl, szFileName, _countof(szFileName)); + + // Vista+ feature: Hidden files with a leading tilde treated as super-hidden + // See https://devblogs.microsoft.com/oldnewthing/20170526-00/?p=96235 + if (hasName && szFileName[0] == '~' && (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + dwShellAttributes |= SFGAO_HIDDEN | SFGAO_SYSTEM; - if (_ILSimpleGetTextW(pidl, szFileName, _countof(szFileName)) && (pExtension = PathFindExtensionW(szFileName))) + if (hasName && (pExtension = PathFindExtensionW(szFileName))) { CLSID clsidFile; // FIXME: Cache this? @@ -626,7 +646,7 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW ::RegCloseKey(hkey); // This should be presented as directory! - bDirectory = TRUE; + bDirectory = (dwAttributes & SFGAO_FOLDER) != 0 || dwAttributes == 0; TRACE("Treating '%S' as directory!\n", szFileName); } } @@ -650,10 +670,26 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW } if (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - dwShellAttributes |= SFGAO_HIDDEN; + dwShellAttributes |= SFGAO_HIDDEN | SFGAO_GHOSTED; if (dwFileAttributes & FILE_ATTRIBUTE_READONLY) - dwShellAttributes |= SFGAO_READONLY; + dwShellAttributes |= SFGAO_READONLY; + + if (dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + dwShellAttributes |= SFGAO_SYSTEM; + + if (dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) + dwShellAttributes |= SFGAO_COMPRESSED; + + if (dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED) + dwShellAttributes |= SFGAO_ENCRYPTED; + + if ((SFGAO_NONENUMERATED & *pdwAttributes) && (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + { + SHCONTF shcf = SHELL_GetDefaultFolderEnumSHCONTF(); + if ((!(shcf & SHCONTF_INCLUDEHIDDEN)) || ((dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) && !(shcf & SHCONTF_INCLUDESUPERHIDDEN))) + dwShellAttributes |= SFGAO_NONENUMERATED; + } if (SFGAO_LINK & *pdwAttributes) { diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 8d8223c3924..510727a6b67 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -16,116 +16,114 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The required-regitem design is based on the research by Geoff Chappell + * https://www.geoffchappell.com/studies/windows/shell/shell32/classes/regfold… */ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); -HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, - HWND hwnd, - IDataObject *pdtobj, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) - return SHELL32_DefaultContextMenuCallBack(psf, pdtobj, uMsg); +#define DEFAULTSORTORDERINDEX 0x80 // The default for registry items according to Geoff Chappell - PIDLIST_ABSOLUTE pidlFolder; - PUITEMID_CHILD *apidl; - UINT cidl; - HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; +static HRESULT CRegItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, IShellFolder *psf, IContextMenu **ppcm); - if (_ILIsMyComputer(apidl[0])) - { - if (!SHELL_ExecuteControlPanelCPL(hwnd, L"sysdm.cpl")) - { - hr = E_FAIL; - } - } - else if (_ILIsDesktop(apidl[0])) - { - if (!SHELL_ExecuteControlPanelCPL(hwnd, L"desk.cpl")) - { - hr = E_FAIL; - } - } - else if (_ILIsNetHood(apidl[0])) - { - // FIXME path! - if (32 >= (UINT_PTR)ShellExecuteW(NULL, - L"open", - L"explorer.exe", - L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", - NULL, - SW_SHOWDEFAULT)) - { - hr = E_FAIL; - } - } - else if (_ILIsBitBucket(apidl[0])) - { - /* FIXME: detect the drive path of bitbucket if appropiate */ - if (!SH_ShowRecycleBinProperties(L'C')) - hr = E_FAIL; - } - else +static inline UINT GetRegItemCLSIDOffset(PIDLTYPE type) +{ + return type == PT_CONTROLS_NEWREGITEM ? 14 : 4; +} + +static LPITEMIDLIST CreateRegItem(PIDLTYPE type, REFCLSID clsid, BYTE order = 0) +{ +#if 1 // FIXME: CControlPanelFolder is not ready for this yet + if (type == PT_CONTROLS_NEWREGITEM) + type = PT_CONTROLS_OLDREGITEM; +#endif + const UINT offset = GetRegItemCLSIDOffset(type); + const UINT cb = offset + sizeof(CLSID), cbTotal = cb + sizeof(WORD); + LPITEMIDLIST pidl = (LPITEMIDLIST)SHAlloc(cbTotal); + if (pidl) { - /* Tell the caller to run the default action */ - hr = S_FALSE; + ZeroMemory(pidl, cbTotal); // Note: This also initializes the terminator WORD + pidl->mkid.cb = cb; + pidl->mkid.abID[0] = type; + pidl->mkid.abID[1] = order; + *(CLSID*)(SIZE_T(pidl) + offset) = clsid; } + return pidl; +} - SHFree(pidlFolder); - _ILFreeaPidl(apidl, cidl); - - return hr; +static LPITEMIDLIST CreateRegItem(PIDLTYPE type, LPCWSTR clsidstr) +{ + CLSID clsid; + return SUCCEEDED(CLSIDFromString(clsidstr, &clsid)) ? CreateRegItem(type, clsid) : NULL; } -HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, - HWND hwnd, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - IShellFolder *psf, - IContextMenu **ppcm) +HRESULT FormatGUIDKey(LPWSTR KeyName, SIZE_T KeySize, LPCWSTR RegPath, const GUID* riid) { - HKEY hKeys[10]; - UINT cKeys = 0; + WCHAR xriid[CHARS_IN_GUID]; + StringFromGUID2(*riid, xriid, _countof(xriid)); + return StringCchPrintfW(KeyName, KeySize, RegPath, xriid); +} - GUID *pGuid = _ILGetGUIDPointer(apidl[0]); - if (pGuid) +static DWORD SHELL_QueryCLSIDValue(_In_ REFCLSID clsid, _In_opt_ LPCWSTR SubKey, _In_opt_ LPCWSTR Value, _In_opt_ PVOID pData, _In_opt_ PDWORD pSize) +{ + WCHAR Path[MAX_PATH]; + wcscpy(Path, L"CLSID\\"); + StringFromGUID2(clsid, Path + 6, 39); + if (SubKey) { - WCHAR key[60]; - wcscpy(key, L"CLSID\\"); - StringFromGUID2(*pGuid, &key[6], 39); - AddClassKeyToArray(key, hKeys, &cKeys); + wcscpy(Path + 6 + 38, L"\\"); + wcscpy(Path + 6 + 39, SubKey); } + return RegGetValueW(HKEY_CLASSES_ROOT, Path, Value, RRF_RT_ANY, NULL, pData, pSize); +} - // FIXME: CRegFolder should be aggregated by its outer folder and should - // provide the attributes for all required non-registry folders. - // It currently does not so we have to ask the outer folder ourself so - // that we get the correct attributes for My Computer etc. - CComPtr<IShellFolder> pOuterSF; - SHBindToObject(NULL, pidlFolder, IID_PPV_ARG(IShellFolder, &pOuterSF)); - - SFGAOF att = (psf && cidl) ? SHGetAttributes(pOuterSF ? pOuterSF.p : psf, apidl[0], SFGAO_FOLDER) : 0; - if (att & SFGAO_FOLDER) - AddClassKeyToArray(L"Folder", hKeys, &cKeys); - - return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, RegFolderContextMenuCallback, cKeys, hKeys, ppcm); +static bool HasCLSIDShellFolderValue(REFCLSID clsid, LPCWSTR Value) +{ + return SHELL_QueryCLSIDValue(clsid, L"ShellFolder", Value, NULL, NULL) == ERROR_SUCCESS; } -HRESULT FormatGUIDKey(LPWSTR KeyName, SIZE_T KeySize, LPCWSTR RegPath, const GUID* riid) +struct CRegFolderInfo { - WCHAR xriid[40]; + const REGFOLDERINFO *m_pInfo; - if (!StringFromGUID2(*riid, xriid, _countof(xriid) - 1)) - return E_FAIL; + void InitializeFolderInfo(const REGFOLDERINFO *pInfo) + { + m_pInfo = pInfo; + } - return StringCchPrintfW(KeyName, KeySize, RegPath, xriid); -} + const CLSID* IsRegItem(LPCITEMIDLIST pidl) const + { + if (pidl && pidl->mkid.cb >= sizeof(WORD) + 1 + 1 + sizeof(GUID)) + { + if (pidl->mkid.abID[0] == m_pInfo->PidlType) + return (CLSID*)(SIZE_T(pidl) + GetCLSIDOffset()); + if (pidl->mkid.abID[0] == PT_CONTROLS_OLDREGITEM) + return (CLSID*)(SIZE_T(pidl) + GetRegItemCLSIDOffset(PT_CONTROLS_OLDREGITEM)); + } + if (const IID* pIID = _ILGetGUIDPointer(pidl)) + { + FIXME("Unexpected GUID PIDL type %#x\n", pidl->mkid.abID[0]); + return pIID; // FIXME: Remove this when all folders have been fixed + } + return NULL; + } + + LPITEMIDLIST CreateItem(size_t i) const + { + const REQUIREDREGITEM &item = GetAt(i); + return CreateRegItem(GetPidlType(), item.clsid, item.Order); + } + + LPCWSTR GetParsingPath() const { return m_pInfo->pszParsingPath; } + UINT GetCLSIDOffset() const { return GetRegItemCLSIDOffset(m_pInfo->PidlType); } + PIDLTYPE GetPidlType() const { return m_pInfo->PidlType; } + UINT GetRequiredItemsCount() const { return m_pInfo->Count; } + const REQUIREDREGITEM& GetAt(size_t i) const { return m_pInfo->Items[i]; } +}; HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) { @@ -213,47 +211,52 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO } class CRegFolderEnum : - public CEnumIDListBase + public CEnumIDListBase, + public CRegFolderInfo { + SHCONTF m_SHCTF; public: - CRegFolderEnum(); - ~CRegFolderEnum(); - HRESULT Initialize(LPCWSTR lpszEnumKeyName, DWORD dwFlags); - HRESULT AddItemsFromKey(HKEY hkey_root, LPCWSTR szRepPath); + HRESULT Initialize(const REGFOLDERINFO *pInfo, IShellFolder *pSF, DWORD dwFlags); + HRESULT AddItemsFromKey(IShellFolder *pSF, HKEY hkey_root, LPCWSTR szRepPath); + + const CLSID* GetPidlClsid(PCUITEMID_CHILD pidl) { return IsRegItem(pidl); } + BOOL HasItemWithCLSID(LPCITEMIDLIST pidl) { return HasItemWithCLSIDImpl<CRegFolderEnum>(pidl); } BEGIN_COM_MAP(CRegFolderEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) END_COM_MAP() }; -CRegFolderEnum::CRegFolderEnum() +HRESULT CRegFolderEnum::Initialize(const REGFOLDERINFO *pInfo, IShellFolder *pSF, DWORD dwFlags) { -} - -CRegFolderEnum::~CRegFolderEnum() -{ -} - -HRESULT CRegFolderEnum::Initialize(LPCWSTR lpszEnumKeyName, DWORD dwFlags) -{ - WCHAR KeyName[MAX_PATH]; - + InitializeFolderInfo(pInfo); + m_SHCTF = (SHCONTF)dwFlags; if (!(dwFlags & SHCONTF_FOLDERS)) return S_OK; - HRESULT hr = StringCchPrintfW(KeyName, MAX_PATH, + WCHAR KeyName[MAX_PATH]; + HRESULT hr = StringCchPrintfW(KeyName, _countof(KeyName), L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\Namespace", - lpszEnumKeyName); + pInfo->pszEnumKeyName); if (FAILED_UNEXPECTEDLY(hr)) return hr; - AddItemsFromKey(HKEY_LOCAL_MACHINE, KeyName); - AddItemsFromKey(HKEY_CURRENT_USER, KeyName); - + // First add the required items and then the items from the registry + SFGAOF query = SHELL_CreateFolderEnumItemAttributeQuery(m_SHCTF, TRUE); + for (size_t i = 0; i < GetRequiredItemsCount(); ++i) + { + LPITEMIDLIST pidl = CreateItem(i); + if (pidl && SHELL_IncludeItemInFolderEnum(pSF, pidl, query, m_SHCTF)) + AddToEnumList(pidl); + else + ILFree(pidl); + } + AddItemsFromKey(pSF, HKEY_LOCAL_MACHINE, KeyName); + AddItemsFromKey(pSF, HKEY_CURRENT_USER, KeyName); return S_OK; } -HRESULT CRegFolderEnum::AddItemsFromKey(HKEY hkey_root, LPCWSTR szRepPath) +HRESULT CRegFolderEnum::AddItemsFromKey(IShellFolder *pSF, HKEY hkey_root, LPCWSTR szRepPath) { WCHAR name[MAX_PATH]; HKEY hkey; @@ -275,13 +278,16 @@ HRESULT CRegFolderEnum::AddItemsFromKey(HKEY hkey_root, LPCWSTR szRepPath) if (*name == '{') { - LPITEMIDLIST pidl = _ILCreateGuidFromStrW(name); - - if (pidl) - AddToEnumList(pidl); + if (LPITEMIDLIST pidl = CreateRegItem(GetPidlType(), name)) + { + SFGAOF query = SHELL_CreateFolderEnumItemAttributeQuery(m_SHCTF, TRUE); + if (SHELL_IncludeItemInFolderEnum(pSF, pidl, query, m_SHCTF) && !HasItemWithCLSID(pidl)) + AddToEnumList(pidl); + else + ILFree(pidl); + } } } - RegCloseKey(hkey); return S_OK; @@ -301,12 +307,11 @@ enum REGFOLDERCOLUMNINDEX class CRegFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellFolder2 + public IShellFolder2, + public CRegFolderInfo { private: - GUID m_guid; - CAtlStringW m_rootPath; - CAtlStringW m_enumKeyName; + IShellFolder *m_pOuterFolder; // Not ref-counted CComHeapPtr<ITEMIDLIST> m_pidlRoot; HRESULT GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes); @@ -315,7 +320,19 @@ class CRegFolder : public: CRegFolder(); ~CRegFolder(); - HRESULT WINAPI Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName); + HRESULT WINAPI Initialize(PREGFOLDERINITDATA pInit, LPCITEMIDLIST pidlRoot); + + const REQUIREDREGITEM* IsRequiredItem(LPCITEMIDLIST pidl) const + { + const CLSID* const pCLSID = IsRegItem(pidl); + for (size_t i = 0; pCLSID && i < GetRequiredItemsCount(); ++i) + { + const REQUIREDREGITEM &item = GetAt(i); + if (item.clsid == *pCLSID) + return &item; + } + return NULL; + } // IShellFolder STDMETHOD(ParseDisplayName)(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) override; @@ -356,17 +373,10 @@ CRegFolder::~CRegFolder() { } -HRESULT WINAPI CRegFolder::Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName) +HRESULT WINAPI CRegFolder::Initialize(PREGFOLDERINITDATA pInit, LPCITEMIDLIST pidlRoot) { - memcpy(&m_guid, pGuid, sizeof(m_guid)); - - m_rootPath = lpszPath; - if (!m_rootPath) - return E_OUTOFMEMORY; - - m_enumKeyName = lpszEnumKeyName; - if (!m_enumKeyName) - return E_OUTOFMEMORY; + InitializeFolderInfo(pInit->pInfo); + m_pOuterFolder = pInit->psfOuter; m_pidlRoot.Attach(ILClone(pidlRoot)); if (!m_pidlRoot) @@ -442,7 +452,7 @@ HRESULT WINAPI CRegFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR l return E_FAIL; } - CComHeapPtr<ITEMIDLIST> pidlTemp(_ILCreateGuid(PT_GUID, clsid)); + CComHeapPtr<ITEMIDLIST> pidlTemp(CreateRegItem(GetPidlType(), clsid)); if (!pidlTemp) return E_OUTOFMEMORY; @@ -471,7 +481,8 @@ HRESULT WINAPI CRegFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR l HRESULT WINAPI CRegFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CRegFolderEnum>(m_enumKeyName, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + return ShellObjectCreatorInit<CRegFolderEnum>(m_pInfo, m_pOuterFolder, dwFlags, + IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } HRESULT WINAPI CRegFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -529,14 +540,10 @@ HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, P /* Guid folders come first compared to everything else */ /* And Drives come before folders in My Computer */ - if (_ILIsMyComputer(m_pidlRoot)) - { + if (GetPidlType() == PT_COMPUTER_REGITEM) return MAKE_COMPARE_HRESULT(clsid1 ? 1 : -1); - } else - { return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); - } } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) @@ -591,7 +598,7 @@ HRESULT WINAPI CRegFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CH return E_FAIL; } - hr = CGuidItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + hr = CRegItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { @@ -626,7 +633,7 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, /* parsing name like ::{...} */ pszPath[0] = ':'; pszPath[1] = ':'; - SHELL32_GUIDToStringW(m_guid, &pszPath[2]); + SHELL32_GUIDToStringW(m_pInfo->clsid, &pszPath[2]); strRet->uType = STRRET_WSTR; strRet->pOleStr = pszPath; return S_OK; @@ -635,7 +642,7 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, { BOOL bRet; WCHAR wstrName[MAX_PATH+1]; - bRet = HCR_GetClassNameW(m_guid, wstrName, MAX_PATH); + bRet = HCR_GetClassNameW(m_pInfo->clsid, wstrName, MAX_PATH); if (!bRet) return E_FAIL; @@ -698,7 +705,7 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, PWCHAR pItemName = pszPath; // GET_SHGDN_RELATION(dwFlags) == SHGDN_INFOLDER if (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER) { - hr = StringCchCopyW(pszPath, cchPath, m_rootPath); + hr = StringCchCopyW(pszPath, cchPath, GetParsingPath()); if (SUCCEEDED(hr)) { pathlen = wcslen(pszPath); @@ -861,8 +868,79 @@ HRESULT WINAPI CRegFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) return E_NOTIMPL; } +static HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, HWND hwnd, IDataObject *pdtobj, + UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return SHELL32_DefaultContextMenuCallBack(psf, pdtobj, uMsg); + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CRegFolder *pRegFolder = static_cast<CRegFolder*>(psf); + const REQUIREDREGITEM* pRequired = pRegFolder->IsRequiredItem(apidl[0]); + if (pRequired && pRequired->pszCpl) + { + WCHAR buf[MAX_PATH]; + wsprintfW(buf, L"%hs", const_cast<LPCSTR>(pRequired->pszCpl)); + hr = SHELL_ExecuteControlPanelCPL(hwnd, buf) ? S_OK : E_FAIL; + } +#if 0 // Should never happen, CDesktopFolder.cpp handles this + else if (_ILIsDesktop(pidlFolder) && _ILIsDesktop(apidl[0])) + { + hr = SHELL_ExecuteControlPanelCPL(hwnd, L"desk.cpl") ? S_OK : E_FAIL; + } +#endif + else if (_ILIsDesktop(pidlFolder) && _ILIsBitBucket(apidl[0])) + { + FIXME("Use SHOpenPropSheet on Recyclers PropertySheetHandlers from the registry\n"); + hr = SH_ShowRecycleBinProperties(L'C') ? S_OK : E_FAIL; + } + else + { + hr = S_FALSE; // Tell the caller to run the default action + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + return hr; +} + +static HRESULT CRegItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, IShellFolder *psf, IContextMenu **ppcm) +{ + HKEY hKeys[3]; + UINT cKeys = 0; + + const GUID *pGuid = _ILGetGUIDPointer(apidl[0]); + if (pGuid) + { + WCHAR key[sizeof("CLSID\\") + 38]; + wcscpy(key, L"CLSID\\"); + StringFromGUID2(*pGuid, &key[6], 39); + AddClassKeyToArray(key, hKeys, &cKeys); + } + + // FIXME: CRegFolder should be aggregated by its outer folder and should + // provide the attributes for all required non-registry folders. + // It currently does not so we have to ask the outer folder ourself so + // that we get the correct attributes for My Computer etc. + CComPtr<IShellFolder> pOuterSF; + SHBindToObject(NULL, pidlFolder, IID_PPV_ARG(IShellFolder, &pOuterSF)); + + SFGAOF att = (psf && cidl) ? SHGetAttributes(pOuterSF ? pOuterSF.p : psf, apidl[0], SFGAO_FOLDER) : 0; + if ((att & SFGAO_FOLDER) && (!pGuid || !HasCLSIDShellFolderValue(*pGuid, L"HideFolderVerbs"))) + AddClassKeyToArray(L"Folder", hKeys, &cKeys); + + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, RegFolderContextMenuCallback, cKeys, hKeys, ppcm); +} + /* In latest windows version this is exported but it takes different arguments! */ -HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName, REFIID riid, void **ppv) +HRESULT CRegFolder_CreateInstance(PREGFOLDERINITDATA pInit, LPCITEMIDLIST pidlRoot, REFIID riid, void **ppv) { - return ShellObjectCreatorInit<CRegFolder>(pGuid, pidlRoot, lpszPath, lpszEnumKeyName, riid, ppv); + return ShellObjectCreatorInit<CRegFolder>(pInit, pidlRoot, riid, ppv); } diff --git a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp index 11c65fb9819..d14c1c15626 100644 --- a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp +++ b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp @@ -226,8 +226,7 @@ HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk) if (!m_hWnd) return E_FAIL; - CSFV csfv = {sizeof(CSFV), psfDesktop}; - hRet = SHCreateShellFolderViewEx(&csfv, &m_ShellView); + hRet = psfDesktop->CreateViewObject(m_hWnd, IID_PPV_ARG(IShellView, &m_ShellView)); if (FAILED_UNEXPECTEDLY(hRet)) return hRet; diff --git a/dll/win32/shell32/shfldr.h b/dll/win32/shell32/shfldr.h index 2b055833464..ff397123b8e 100644 --- a/dll/win32/shell32/shfldr.h +++ b/dll/win32/shell32/shfldr.h @@ -47,11 +47,53 @@ https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobji… #define SHFSF_COL_FATTS 4 // File attributes #define SHFSF_COL_COMMENT 5 +typedef struct _REQUIREDREGITEM +{ + REFCLSID clsid; + LPCSTR pszCpl; + BYTE Order; // According to Geoff Chappell, required items have a fixed sort order +} REQUIREDREGITEM; + +typedef struct _REGFOLDERINFO +{ + PIDLTYPE PidlType; + BYTE Count; // Count of required items + const REQUIREDREGITEM *Items; + REFCLSID clsid; + LPCWSTR pszParsingPath; + LPCWSTR pszEnumKeyName; +} REGFOLDERINFO; + +typedef struct _REGFOLDERINITDATA +{ + IShellFolder *psfOuter; + const REGFOLDERINFO *pInfo; +} REGFOLDERINITDATA, *PREGFOLDERINITDATA; + +HRESULT CRegFolder_CreateInstance(PREGFOLDERINITDATA pInit, LPCITEMIDLIST pidlRoot, REFIID riid, void **ppv); + #define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) #define IS_SHGDN_FOR_PARSING(flags) ( ((flags) & (SHGDN_FORADDRESSBAR | SHGDN_FORPARSING)) == SHGDN_FORPARSING) #define IS_SHGDN_DESKTOPABSOLUTEPARSING(flags) ( ((flags) & (SHGDN_FORADDRESSBAR | SHGDN_FORPARSING | 0xFF)) == SHGDN_FORPARSING) +static inline SFGAOF +SHELL_CreateFolderEnumItemAttributeQuery(SHCONTF Flags, BOOL ForRegItem) +{ + SFGAOF query = SFGAO_FOLDER | (ForRegItem ? SFGAO_NONENUMERATED : 0); + if (!(Flags & SHCONTF_INCLUDEHIDDEN)) + query |= SFGAO_HIDDEN; + if (!(Flags & SHCONTF_INCLUDESUPERHIDDEN)) + query |= SFGAO_HIDDEN | SFGAO_SYSTEM; + return query; +} + +SHCONTF +SHELL_GetDefaultFolderEnumSHCONTF(); + +BOOL +SHELL_IncludeItemInFolderEnum(IShellFolder *pSF, PCUITEMID_CHILD pidl, SFGAOF Query, SHCONTF Flags); + HRESULT Shell_NextElement( _Inout_ LPWSTR *ppch, diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index a6ea823212f..1d32793d746 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -26,6 +26,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +SHCONTF SHELL_GetDefaultFolderEnumSHCONTF() +{ + SHCONTF Flags = SHCONTF_FOLDERS | SHCONTF_NONFOLDERS; + SHELLSTATE ss; + SHGetSetSettings(&ss, SSF_SHOWALLOBJECTS | SSF_SHOWSUPERHIDDEN, FALSE); + if (ss.fShowAllObjects) + Flags |= SHCONTF_INCLUDEHIDDEN; + if (ss.fShowSuperHidden) + Flags |= SHCONTF_INCLUDESUPERHIDDEN; + return Flags; +} + +BOOL SHELL_IncludeItemInFolderEnum(IShellFolder *pSF, PCUITEMID_CHILD pidl, SFGAOF Query, SHCONTF Flags) +{ + if (SUCCEEDED(pSF->GetAttributesOf(1, &pidl, &Query))) + { + if (Query & SFGAO_NONENUMERATED) + return FALSE; + if ((Query & SFGAO_HIDDEN) && !(Flags & SHCONTF_INCLUDEHIDDEN)) + return FALSE; + if ((Query & (SFGAO_HIDDEN | SFGAO_SYSTEM)) == (SFGAO_HIDDEN | SFGAO_SYSTEM) && !(Flags & SHCONTF_INCLUDESUPERHIDDEN)) + return FALSE; + if ((Flags & (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS)) != (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS)) + return (Flags & SHCONTF_FOLDERS) ? (Query & SFGAO_FOLDER) : !(Query & SFGAO_FOLDER); + } + return TRUE; +} + HRESULT Shell_NextElement( _Inout_ LPWSTR *ppch, diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c index 09b09112adb..54751ded772 100644 --- a/dll/win32/shell32/wine/pidl.c +++ b/dll/win32/shell32/wine/pidl.c @@ -1767,7 +1767,6 @@ LPITEMIDLIST _ILCreateGuidFromStrA(LPCSTR szGUID) } return _ILCreateGuid(PT_GUID, &iid); } -#endif LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) { @@ -1784,6 +1783,7 @@ LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) } return _ILCreateGuid(PT_GUID, &iid); } +#endif /* __REACTOS__ */ LPITEMIDLIST _ILCreateFromFindDataW( const WIN32_FIND_DATAW *wfd ) { diff --git a/dll/win32/shell32/wine/pidl.h b/dll/win32/shell32/wine/pidl.h index b25481bd6c8..304ce1cc19b 100644 --- a/dll/win32/shell32/wine/pidl.h +++ b/dll/win32/shell32/wine/pidl.h @@ -104,6 +104,18 @@ extern "C" { #define PT_IESPECIAL2 0xb1 #define PT_SHARE 0xc3 +#ifdef __REACTOS__ +#define PT_DESKTOP_REGITEM 0x1F // => SHDID_ROOT_REGITEM +#define PT_COMPUTER_REGITEM 0x2E // => SHDID_COMPUTER_OTHER +#define PT_FS 0x30 // Win95 SHSimpleIDListFromPath +#define PT_FS_FOLDER_FLAG 0x01 +#define PT_FS_FILE_FLAG 0x02 +#define PT_FS_UNICODE_FLAG 0x04 +// PT_NET_REGITEM 0x4? // => SHDID_NET_OTHER +#define PT_CONTROLS_OLDREGITEM 0x70 +#define PT_CONTROLS_NEWREGITEM 0x71 +#endif + #include "pshpack1.h" typedef BYTE PIDLTYPE; @@ -263,9 +275,11 @@ BOOL _ILIsEmpty (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl) */ LPITEMIDLIST _ILCreateGuid(PIDLTYPE type, REFIID guid) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ /* Like _ILCreateGuid, but using the string szGUID. */ LPITEMIDLIST _ILCreateGuidFromStrA(LPCSTR szGUID) DECLSPEC_HIDDEN; LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) DECLSPEC_HIDDEN; +#endif /* Commonly used PIDLs representing file system objects. */ LPITEMIDLIST _ILCreateDesktop (void) DECLSPEC_HIDDEN; diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index db03e2ad794..73bebc71d3b 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -90,8 +90,6 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; -HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName, REFIID riid, void **ppv); - /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ {\ diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index a31a145190b..8738863eb55 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -195,6 +195,7 @@ interface IShellFolder : IUnknown cpp_quote("#define SFGAO_HASPROPSHEET 0x00000040L") cpp_quote("#define SFGAO_DROPTARGET 0x00000100L") cpp_quote("#define SFGAO_CAPABILITYMASK 0x00000177L") + cpp_quote("#define SFGAO_SYSTEM 0x00001000L") cpp_quote("#define SFGAO_ENCRYPTED 0x00002000L") cpp_quote("#define SFGAO_ISSLOW 0x00004000L") cpp_quote("#define SFGAO_GHOSTED 0x00008000L") @@ -1485,6 +1486,38 @@ interface ICommDlgBrowser3 : ICommDlgBrowser2 [in] IShellView *ppshv); } +/***************************************************************************** + * IFolderFilterSite & IFolderFilter interfaces + */ +[ + object, + uuid(C0A651F5-B48B-11d2-B5ED-006097C686F6), + pointer_default(unique) +] +interface IFolderFilterSite : IUnknown +{ + HRESULT SetFilter([in] IUnknown* punk); +} + +[ + object, + uuid(9CC22886-DC8E-11d2-B1D0-00C04F8EEB3E), + pointer_default(unique) +] +interface IFolderFilter : IUnknown +{ + HRESULT ShouldShow( + [in] IShellFolder* psf, + [in, unique] PCIDLIST_ABSOLUTE pidlFolder, + [in] PCUITEMID_CHILD pidlItem); + + HRESULT GetEnumFlags( + [in] IShellFolder* psf, + [in] PCIDLIST_ABSOLUTE pidlFolder, + [out] HWND *phwnd, + [in, out] DWORD *pgrfFlags); +} + /***************************************************************************** * IDockingWindow interface */ diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 17d7e0e74e7..825e834897b 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -293,6 +293,17 @@ HRESULT inline ShellDebugObjectCreator(REFIID riid, R ** ppv) return S_OK; } +template<class T> +HRESULT inline ShellObjectCreator(CComPtr<T> &objref) +{ + _CComObject<T> *pobj; + HRESULT hResult = _CComObject<T>::CreateInstance(&pobj); + objref = pobj; // AddRef() gets called here + if (FAILED(hResult)) + return hResult; + return S_OK; +} + template<class T> HRESULT inline ShellObjectCreator(REFIID riid, void ** ppv) {

4 months, 1 week

[reactos] 03/03: [SETUP:REACTOS] Add the update-registry code (#7222)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a75ed2acd93961412d2d2… commit a75ed2acd93961412d2d2bda1797862fba726284 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 9 03:21:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 28 22:05:21 2024 +0200 [SETUP:REACTOS] Add the update-registry code (#7222) This code has been tested on Windows and works as expected. --- base/setup/reactos/lang/bg-BG.rc | 17 +++++++++++ base/setup/reactos/lang/cs-CZ.rc | 17 +++++++++++ base/setup/reactos/lang/de-DE.rc | 17 +++++++++++ base/setup/reactos/lang/el-GR.rc | 17 +++++++++++ base/setup/reactos/lang/en-US.rc | 17 +++++++++++ base/setup/reactos/lang/es-ES.rc | 17 +++++++++++ base/setup/reactos/lang/et-EE.rc | 17 +++++++++++ base/setup/reactos/lang/eu-ES.rc | 17 +++++++++++ base/setup/reactos/lang/fi-FI.rc | 17 +++++++++++ base/setup/reactos/lang/fr-FR.rc | 17 +++++++++++ base/setup/reactos/lang/he-IL.rc | 17 +++++++++++ base/setup/reactos/lang/hi-IN.rc | 17 +++++++++++ base/setup/reactos/lang/hu-HU.rc | 17 +++++++++++ base/setup/reactos/lang/id-ID.rc | 17 +++++++++++ base/setup/reactos/lang/it-IT.rc | 17 +++++++++++ base/setup/reactos/lang/ja-JP.rc | 17 +++++++++++ base/setup/reactos/lang/ms-MY.rc | 17 +++++++++++ base/setup/reactos/lang/no-NO.rc | 17 +++++++++++ base/setup/reactos/lang/pl-PL.rc | 17 +++++++++++ base/setup/reactos/lang/pt-BR.rc | 17 +++++++++++ base/setup/reactos/lang/pt-PT.rc | 17 +++++++++++ base/setup/reactos/lang/ro-RO.rc | 17 +++++++++++ base/setup/reactos/lang/ru-RU.rc | 17 +++++++++++ base/setup/reactos/lang/sk-SK.rc | 17 +++++++++++ base/setup/reactos/lang/sq-AL.rc | 17 +++++++++++ base/setup/reactos/lang/tr-TR.rc | 17 +++++++++++ base/setup/reactos/lang/uk-UA.rc | 17 +++++++++++ base/setup/reactos/lang/vi-VN.rc | 17 +++++++++++ base/setup/reactos/lang/zh-CN.rc | 17 +++++++++++ base/setup/reactos/lang/zh-HK.rc | 17 +++++++++++ base/setup/reactos/lang/zh-TW.rc | 17 +++++++++++ base/setup/reactos/reactos.c | 66 +++++++++++++++++++++++++++++++++++++++- base/setup/reactos/resource.h | 12 ++++++++ 33 files changed, 604 insertions(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index e1f401df9c1..2f43f74839a 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index ed499e1caf5..9645e7cbc00 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -227,6 +227,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 5423229f2a5..00b0347afe4 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index e547eaebf4d..4ef7d7f2485 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index a118f6f4f51..f408db08e42 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index fb875e1f0e4..e2f2443cda4 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index f524373aaf3..2173ed3fe83 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 75ce0cf14ee..174b6c36c1f 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -228,6 +228,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index abc7cbe9162..2cdadc38d2b 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 90d9d5a3a9c..c1655ba3a56 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Prépare les partitions..." IDS_PREPARE_FILES "Prépare la liste de fichiers à copier, veuillez patienter..." IDS_COPYING_FILES "Copie les fichiers..." + + IDS_CREATE_REGISTRY "Crée la base de registres..." + IDS_UPDATE_REGISTRY "Mise à jour de la base de registres..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Terminé" + IDS_REG_REGHIVEUPDATE "Mise à jour de la base de registres" + IDS_REG_IMPORTFILE "Importe %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Mise à jour des paramètres de registre pour l'écran" + IDS_REG_LOCALESETTINGSUPDATE "Mise à jour des paramètres régionaux" + IDS_REG_ADDKBLAYOUTS "Ajout des dispositions de clavier" + IDS_REG_KEYBOARDSETTINGSUPDATE "Mise à jour des paramètres de disposition du clavier" + IDS_REG_CODEPAGEINFOUPDATE "Ajout des informations de pages de codes" + IDS_REG_UNKNOWN "Statut %d inconnu" END /* Error Strings */ diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index da55c6c1206..bca834654ca 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 1922772dea2..649fbc1c0bc 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -191,6 +191,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 3b7da052e54..21498adb4c4 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 606cc28bda5..8a02a29a0bb 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 639097aba5b..c1415f9b2f2 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 844dee36824..e432ae65f22 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 0a217d2e948..da8c49cc800 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 4dd353f5505..8ffecfa7a0e 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index b9cc2a83c7a..fadc7d1ac62 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -232,6 +232,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index a912761ebbc..38fab3d8b8f 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 657009a66b8..26c8547d453 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index f81d116c7d7..efebc60631a 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index b1544f5ce69..1c6ea120e51 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 13fa7f99c5b..0314a8adb61 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -226,6 +226,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 531be78dab3..67df75a0690 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -223,6 +223,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 3e9493faf4c..984d7469379 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -228,6 +228,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 47c935add18..7b3cc3f6368 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -229,6 +229,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index c1f35322f5c..412fbc53fac 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 86357dcd187..ceaab5efa48 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -221,6 +221,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 888eb35c3b4..0c31f4db676 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -229,6 +229,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 541d8869cdd..f7860c17214 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -230,6 +230,23 @@ BEGIN IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." + + IDS_CREATE_REGISTRY "Creating the registry..." + IDS_UPDATE_REGISTRY "Updating the registry..." +END + +// Note to translators: please refer to the corresponding usetup/lang/*.h translations. +STRINGTABLE +BEGIN + IDS_REG_DONE "Done" + IDS_REG_REGHIVEUPDATE "Updating registry hives" + IDS_REG_IMPORTFILE "Importing %s" + IDS_REG_DISPLAYSETTINGSUPDATE "Updating display registry settings" + IDS_REG_LOCALESETTINGSUPDATE "Updating locale settings" + IDS_REG_ADDKBLAYOUTS "Adding keyboard layouts" + IDS_REG_KEYBOARDSETTINGSUPDATE "Updating keyboard layout settings" + IDS_REG_CODEPAGEINFOUPDATE "Adding codepage information" + IDS_REG_UNKNOWN "Unknown status %d" END /* Error Strings */ diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 3dd9eae4e35..4c0b3d64f80 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1706,6 +1706,38 @@ FileCopyCallback(PVOID Context, return FILEOP_DOIT; } +static VOID +__cdecl +RegistryStatus(IN REGISTRY_STATUS RegStatus, ...) +{ + /* WARNING: Please keep this lookup table in sync with the resources! */ + static const UINT StringIDs[] = + { + IDS_REG_DONE, /* Success */ + IDS_REG_REGHIVEUPDATE, /* RegHiveUpdate */ + IDS_REG_IMPORTFILE, /* ImportRegHive */ + IDS_REG_DISPLAYSETTINGSUPDATE, /* DisplaySettingsUpdate */ + IDS_REG_LOCALESETTINGSUPDATE, /* LocaleSettingsUpdate */ + IDS_REG_ADDKBLAYOUTS, /* KeybLayouts */ + IDS_REG_KEYBOARDSETTINGSUPDATE, /* KeybSettingsUpdate */ + IDS_REG_CODEPAGEINFOUPDATE, /* CodePageInfoUpdate */ + }; + + if (RegStatus < _countof(StringIDs)) + { + va_list args; + va_start(args, RegStatus); + SetWindowResPrintfVW(UiContext.hWndItem, SetupData.hInstance, StringIDs[RegStatus], args); + va_end(args); + } + else + { + SetWindowResPrintfW(UiContext.hWndItem, SetupData.hInstance, IDS_REG_UNKNOWN, RegStatus); + } + + SendMessageW(UiContext.hWndProgress, PBM_STEPIT, 0, 0); +} + /** * @brief * Enables or disables the Cancel and the Close title-bar @@ -1732,7 +1764,7 @@ PrepareAndDoCopyThread( HWND hwndDlg = (HWND)Param; HWND hWndProgress; LONG_PTR dwStyle; - // ERROR_NUMBER ErrorNumber; + ERROR_NUMBER ErrorNumber; BOOLEAN Success; NTSTATUS Status; FSVOL_CONTEXT FsVolContext; @@ -1923,6 +1955,38 @@ PrepareAndDoCopyThread( /* Create the $winnt$.inf file */ InstallSetupInfFile(&pSetupData->USetupData); + + /* + * Create or update the registry hives + */ + + /* Set status text */ + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + pSetupData->RepairUpdateFlag ? IDS_UPDATE_REGISTRY + : IDS_CREATE_REGISTRY); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + /* Set up the progress bar */ + SendMessageW(hWndProgress, + PBM_SETRANGE, 0, + MAKELPARAM(0, 8)); // FIXME: hardcoded number of steps, see StringIDs[] array in RegistryStatus() + SendMessageW(hWndProgress, + PBM_SETSTEP, 1, 0); + SendMessageW(hWndProgress, + PBM_SETPOS, 0, 0); + + ErrorNumber = UpdateRegistry(&pSetupData->USetupData, + pSetupData->RepairUpdateFlag, + pSetupData->PartitionList, + InstallVolume->Info.DriveLetter, + pSetupData->SelectedLanguageId, + RegistryStatus, + NULL /* SubstSettings */); + DBG_UNREFERENCED_PARAMETER(ErrorNumber); + SendMessageW(UiContext.hWndProgress, PBM_SETPOS, 100, 0); + + /* We are done! Switch to the Terminate page */ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); return 0; diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 7e53e711194..fac1ad7b48d 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -127,6 +127,18 @@ #define IDS_PREPARE_PARTITIONS 5208 #define IDS_PREPARE_FILES 5209 #define IDS_COPYING_FILES 5210 +#define IDS_CREATE_REGISTRY 5211 +#define IDS_UPDATE_REGISTRY 5212 + +#define IDS_REG_DONE 5220 +#define IDS_REG_REGHIVEUPDATE 5221 +#define IDS_REG_IMPORTFILE 5222 +#define IDS_REG_DISPLAYSETTINGSUPDATE 5223 +#define IDS_REG_LOCALESETTINGSUPDATE 5224 +#define IDS_REG_ADDKBLAYOUTS 5225 +#define IDS_REG_KEYBOARDSETTINGSUPDATE 5226 +#define IDS_REG_CODEPAGEINFOUPDATE 5227 +#define IDS_REG_UNKNOWN 5228 /* Error Strings */

4 months, 2 weeks

[reactos] 02/03: [SETUP:REACTOS] Add some SetWindowRes* helper functions

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd6701751220e9365eef0… commit fd6701751220e9365eef0f84673d98f482d2ad3d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 8 13:36:03 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 28 22:03:05 2024 +0200 [SETUP:REACTOS] Add some SetWindowRes* helper functions --- base/setup/reactos/reactos.c | 41 +++++++++++++++++++++++++++++++++++++++++ base/setup/reactos/reactos.h | 21 +++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index fe08e2f428c..3dd9eae4e35 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -246,6 +246,47 @@ DisplayError( return iRes; } +VOID +SetWindowResTextW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID) +{ + WCHAR szText[256]; + LoadStringW(hInstance, uID, szText, _countof(szText)); + SetWindowTextW(hWnd, szText); +} + +VOID +SetWindowResPrintfVW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID, + _In_ va_list args) +{ + WCHAR ResBuffer[256]; + WCHAR szText[256]; + + LoadStringW(hInstance, uID, ResBuffer, _countof(ResBuffer)); + StringCchVPrintfW(szText, _countof(szText), ResBuffer, args); + SetWindowTextW(hWnd, szText); +} + +VOID +__cdecl +SetWindowResPrintfW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID, + ...) +{ + va_list args; + + va_start(args, uID); + SetWindowResPrintfVW(hWnd, hInstance, uID, args); + va_end(args); +} + static INT_PTR CALLBACK StartDlgProc( IN HWND hwndDlg, diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index a2c86c155f0..8beffc4c86a 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -255,6 +255,27 @@ DisplayError( _In_ UINT uIDMessage, ...); +VOID +SetWindowResTextW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID); + +VOID +SetWindowResPrintfVW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID, + _In_ va_list args); + +VOID +__cdecl +SetWindowResPrintfW( + _In_ HWND hWnd, + _In_opt_ HINSTANCE hInstance, + _In_ UINT uID, + ...); + #endif /* _REACTOS_PCH_ */ /* EOF */

4 months, 2 weeks

[reactos] 01/03: [USETUP] Update translations for some registry-related messages

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b07c33031988e901815f… commit 5b07c33031988e901815fe8836836f6a72bd0b66 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 28 22:00:06 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 28 22:03:04 2024 +0200 [USETUP] Update translations for some registry-related messages --- base/setup/usetup/lang/bg-BG.h | 2 +- base/setup/usetup/lang/bn-BD.h | 6 +++--- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/el-GR.h | 4 ++-- base/setup/usetup/lang/en-US.h | 6 +++--- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/eu-ES.h | 2 +- base/setup/usetup/lang/fr-FR.h | 12 ++++++------ base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/hr-HR.h | 2 +- base/setup/usetup/lang/hu-HU.h | 2 +- base/setup/usetup/lang/id-ID.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/lt-LT.h | 6 +++--- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 2 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/pt-PT.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 6 +++--- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- 28 files changed, 42 insertions(+), 42 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 07c850bca31..01d6593f20d 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -2287,7 +2287,7 @@ MUI_STRING bgBGStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " \216\341\352\242\340\245\254\245\255\357\242\240\255\245 \255\240\341\342\340\256\251\252\250\342\245 \255\240 \252\253\240\242\250\240\342\343\340\255\250\342\245 \257\256\244\340\245\244\241\250..."}, {STRING_CODEPAGEINFOUPDATE, - " \204\256\241\240\242\357\255\245 \242 \340\245\243\250\341\342\352\340\240 \255\240 \341\242\245\244\245\255\250\357 \247\240 \247\255\240\252\256\242\250\357 \255\240\241\256\340..."}, + " \204\256\241\240\242\357\255\245 \255\240 \341\242\245\244\245\255\250\357 \247\240 \247\255\240\252\256\242\250\357 \255\240\241\256\340..."}, {STRING_DONE, " \203\256\342\256\242\256..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 6a14204684e..8b58c3ea11c 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -2017,7 +2017,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" + "Setup failed to add codepage to the registry.\n" "ENTER = Reboot computer" }, { @@ -2027,7 +2027,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" + "Setup failed to add keyboard layouts to the registry.\n" "ENTER = Reboot computer" }, { @@ -2262,7 +2262,7 @@ MUI_STRING bnBDStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Updating keyboard layout settings..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Adding codepage information..."}, {STRING_DONE, " Done..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 8fb06935c3f..e56e1965d97 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -2270,7 +2270,7 @@ MUI_STRING csCZStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Aktualizuji nastaven\241 rozlo\247en\241 kl\240ves..."}, {STRING_CODEPAGEINFOUPDATE, - " P\375id\240v\240m do registru informaci o znakov\202 str\240nce..."}, + " P\375id\240v\240m informaci o znakov\202 str\240nce..."}, {STRING_DONE, " Hotovo..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index d1dca3c7489..3fd9627e772 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -2272,7 +2272,7 @@ MUI_STRING daDKStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Opdatere indstillinger for tastaturlauout..."}, {STRING_CODEPAGEINFOUPDATE, - " Tilf\233jrer tegntabelsinfomation til registrerinsdatabasen..."}, + " Tilf\233jrer tegntabelsinfomation..."}, {STRING_DONE, " Udf\233rt..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index a90a275a4f5..a6a380a4807 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -2047,7 +2047,7 @@ MUI_ERROR elGRErrorEntries[] = }, { // ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" + "Setup failed to add codepage to the registry.\n" "ENTER = \204\247\230\244\234\241\241\345\244\236\251\236 \254\247\246\242\246\232\240\251\253\343" }, { @@ -2285,7 +2285,7 @@ MUI_STRING elGRStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " \202\345\244\234\253\230\240 \230\244\230\244\342\340\251\236 \253\340\244 \250\254\237\243\345\251\234\340\244 \233\240\341\253\230\245\236\252 \247\242\236\241\253\250\246\242\246\232\345\246\254..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Adding codepage information..."}, {STRING_DONE, " \216\242\246\241\242\236\250\351\237\236\241\234..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index d294b0d9e2b..309758f4b5b 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -2017,7 +2017,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" + "Setup failed to add codepage to the registry.\n" "ENTER = Reboot computer" }, { @@ -2027,7 +2027,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" + "Setup failed to add keyboard layouts to the registry.\n" "ENTER = Reboot computer" }, { @@ -2262,7 +2262,7 @@ MUI_STRING enUSStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Updating keyboard layout settings..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Adding codepage information..."}, {STRING_DONE, " Done..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 33597d614ec..2c56ef80a82 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -2283,7 +2283,7 @@ MUI_STRING esESStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Actualizando configuraci\242n de distribuci\242n de teclado..."}, {STRING_CODEPAGEINFOUPDATE, - " A\244adiendo informaci\242n al registro..."}, + " A\244adiendo informaci\242n..."}, {STRING_DONE, " Terminado..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index ee54344d1aa..4efdb8a8b50 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -2264,7 +2264,7 @@ MUI_STRING etEEStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Klaviatuuriasetuse seadistuse uuendamine..."}, {STRING_CODEPAGEINFOUPDATE, - " Kooditabeli info lisamine registrisse..."}, + " Kooditabeli info lisamine..."}, {STRING_DONE, " Valmis..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index e6f2a7b4441..3547baf0de9 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -2270,7 +2270,7 @@ MUI_STRING euESStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Teklatu konfigurazioa eguneratzen..."}, {STRING_CODEPAGEINFOUPDATE, - " Kodeorri informazioa gehitu da registron..."}, + " Kodeorri informazioa gehitu..."}, {STRING_DONE, " Amaitu da..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index c72eb43a475..ec0ddef4b33 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -2054,7 +2054,7 @@ MUI_ERROR frFRErrorEntries[] = }, { // ERROR_ADDING_CODEPAGE, - "Setup n'a pu ajouter la page de codes \205 la base de registres.\n" + "Setup n'a pu ajouter la page de codes au registre.\n" "ENTR\220E = Red\202marrer l'ordinateur" }, { @@ -2289,17 +2289,17 @@ MUI_STRING frFRStrings[] = {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_REGHIVEUPDATE, - " Mise \205 jour de la base de registre..."}, + " Mise \205 jour de la base de registres..."}, {STRING_IMPORTFILE, " Importe %S..."}, {STRING_DISPLAYSETTINGSUPDATE, - " Mise \205 jour des param\212tres du registre pour l'\202cran..."}, + " Mise \205 jour des param\212tres de registre pour l'\202cran..."}, {STRING_LOCALESETTINGSUPDATE, " Mise \205 jour des param\212tres r\202gionaux..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Mise \205 jour des param\212tres de la dispoition clavier..."}, + " Mise \205 jour des param\212tres de disposition du clavier..."}, {STRING_CODEPAGEINFOUPDATE, - " Ajout des informations de pages de codes \205 la base de registres..."}, + " Ajout des informations de pages de codes..."}, {STRING_DONE, " Termin\202..."}, {STRING_REBOOTCOMPUTER2, @@ -2353,6 +2353,6 @@ MUI_STRING frFRStrings[] = {STRING_GB, "Go"}, {STRING_ADDKBLAYOUTS, - "Ajout des dispositions clavier"}, + "Ajout des dispositions de clavier"}, {0, 0} }; diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index f852ae19eaf..485bcadbe3e 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -2264,7 +2264,7 @@ MUI_STRING heILStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " ...\232\203\214\227\216\204 \232\230\205\226\232 \232\205\230\203\202\204 \232\200 \217\213\203\222\216"}, {STRING_CODEPAGEINFOUPDATE, - " ...\215\205\231\211\230\214 codepage \222\203\211\216 \223\211\221\205\216"}, + " ...codepage \222\203\211\216 \223\211\221\205\216"}, {STRING_DONE, " ...\215\211\211\221\216"}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index a1c9f7afcce..d7740a97211 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -2293,7 +2293,7 @@ MUI_STRING hrHRStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " A\247uriranje postavki rasporeda tipkovnice..."}, {STRING_CODEPAGEINFOUPDATE, - " Dodavanje codepage inforamcija u registry..."}, + " Dodavanje codepage inforamcija..."}, {STRING_DONE, " Gotovo..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 6859b79c314..914f559d89d 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -2160,7 +2160,7 @@ MUI_STRING huHUStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Billenty\373zetkioszt\240s be\240ll\241t\240sok friss\241t\202se..."}, {STRING_CODEPAGEINFOUPDATE, - " K\242dlap inform\240ci\242k hozz\240ad\240sa a regisztr\240ci\242s adatb\240zishoz..."}, + " K\242dlap inform\240ci\242k hozz\240ad\240sa..."}, {STRING_DONE, " K\202sz..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index da888302121..2feda13d150 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -2269,7 +2269,7 @@ MUI_STRING idIDStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Memperbarui pengaturan tata letak papan ketik..."}, {STRING_CODEPAGEINFOUPDATE, - " Menambahkan informasi halaman kode pada registri..."}, + " Menambahkan informasi halaman kode..."}, {STRING_DONE, " Selesai..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 49981ce393c..f9f5c91e362 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -2276,7 +2276,7 @@ MUI_STRING itITStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Aggiornamento delle impostazioni della tastiera..."}, {STRING_CODEPAGEINFOUPDATE, - " Aggiunta delle informazioni di codepage al registry..."}, + " Aggiunta delle informazioni di codepage..."}, {STRING_DONE, " Fatto..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index cf5e0cccce3..1485b406360 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -2028,7 +2028,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" + "Setup failed to add codepage to the registry.\n" "ENTER = Reboot computer" }, { @@ -2038,7 +2038,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" + "Setup failed to add keyboard layouts to the registry.\n" "ENTER = Reboot computer" }, { @@ -2273,7 +2273,7 @@ MUI_STRING ltLTStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Updating keyboard layout settings..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Adding codepage information..."}, {STRING_DONE, " Done..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index fd63fc8c3d6..1b69ece4df8 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -2261,7 +2261,7 @@ MUI_STRING msMYStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Mengemaskini seting susun atur papan kekunci..."}, {STRING_CODEPAGEINFOUPDATE, - " Menambah maklumat codepage untuk pendaftaran..."}, + " Menambah maklumat codepage..."}, {STRING_DONE, " Siap..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 202d5e19e1b..cb3f3c58d0b 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -2296,7 +2296,7 @@ MUI_STRING nlNLStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Bijwerken toetsenbordindeling..."}, {STRING_CODEPAGEINFOUPDATE, - " Toevoegen informatie codepagina aan register..."}, + " Toevoegen informatie codepagina..."}, {STRING_DONE, " Voltooid..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index a77c56a9b97..d8444f200dc 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -2281,7 +2281,7 @@ MUI_STRING plPLStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Zmiana uk\210adu klawiatury..."}, {STRING_CODEPAGEINFOUPDATE, - " Dodawanie informacji o stronie kodowej do rejestru..."}, + " Dodawanie informacji o stronie kodowej..."}, {STRING_DONE, " Uko\344czone..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 04c9a820315..676228cdbdf 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -2306,7 +2306,7 @@ MUI_STRING ptBRStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Atualizando as configura\207\344es de leiaute do teclado..."}, {STRING_CODEPAGEINFOUPDATE, - " Adicionando as informa\207\344es de localidade no registro..."}, + " Adicionando as informa\207\344es de localidade..."}, {STRING_DONE, " Pronto..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 6d504d37a62..01f5ae9c3d5 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -2307,7 +2307,7 @@ MUI_STRING ptPTStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " A actualizar as configura\207\344es do teclado..."}, {STRING_CODEPAGEINFOUPDATE, - " A adicionar as informa\207\344es de localiza\207\306o no registo..."}, + " A adicionar as informa\207\344es de localiza\207\306o..."}, {STRING_DONE, " Pronto..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index dc700f60d34..ad29b302ac8 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -2329,7 +2329,7 @@ MUI_STRING roROStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Configura\376ie de tastatur\343 \356n actualizare..."}, {STRING_CODEPAGEINFOUPDATE, - " Date de paginare \356n curs de adaugare \356n registru..."}, + " Date de paginare \356n curs de adaugare..."}, {STRING_DONE, " Terminat!"}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 745138aaa1b..2585660c222 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -2292,7 +2292,7 @@ MUI_STRING ruRUStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " \216\241\255\256\242\253\245\255\250\245 \257\240\340\240\254\245\342\340\256\242 \340\240\341\252\253\240\244\252\250 \252\253\240\242\250\240\342\343\340\353..."}, {STRING_CODEPAGEINFOUPDATE, - " \204\256\241\240\242\253\245\255\250\245 \250\255\344\256\340\254\240\346\250\250 \256 \252\256\244\256\242\256\251 \341\342\340\240\255\250\346\245 \242 \340\245\245\341\342\340..."}, + " \204\256\241\240\242\253\245\255\250\245 \250\255\344\256\340\254\240\346\250\250 \256 \252\256\244\256\242\256\251 \341\342\340\240\255\250\346\245..."}, {STRING_DONE, " \207\240\242\245\340\350\245\255\256..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index e5d80ed2b7a..3e350056413 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -2283,7 +2283,7 @@ MUI_STRING skSKStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Aktualizujem nastavenia rozlo\247enia kl\240vesnice..."}, {STRING_CODEPAGEINFOUPDATE, - " Prid\240vam do registrov inform\240cie o k\242dovej str\240nke..."}, + " Prid\240inform\240cie o k\242dovej str\240nke..."}, {STRING_DONE, " Hotovo..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 8a2270accb7..82d8048318c 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -2283,7 +2283,7 @@ MUI_STRING sqALStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Apdejtimi i p\211rzgjedhj\211s se konfigurimit t\211 tastier\211s..."}, {STRING_CODEPAGEINFOUPDATE, - " Shtimi i informacioneve codepage n\211 regjister..."}, + " Shtimi i informacioneve codepage..."}, {STRING_DONE, " Mbaruam..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index d333fb9c47e..0b5dbf17695 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -976,7 +976,7 @@ static MUI_ENTRY svSESelectPartitionEntries[] = { 8, 15, - "\x07 Tryck C f\224r att skapa en prim�r/logisk partition.", + "\x07 Tryck C f\224r att skapa en prim\344r/logisk partition.", // "\x07 Tryck C f\224r att skapa en ny partition.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC @@ -2213,7 +2213,7 @@ MUI_STRING svSEStrings[] = {STRING_PLEASEWAIT, " Var v\204nlig v\204nta..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Installera C = Skapa Prim�r Partition E = Skapa Ut\224kad Partition F3 = Avsluta"}, + " ENTER = Installera C = Skapa Prim\344r Partition E = Skapa Ut\224kad Partition F3 = Avsluta"}, {STRING_INSTALLCREATELOGICAL, " ENTER = Installera C = Skapa Logisk Partition F3 = Avsluta"}, {STRING_INSTALLDELETEPARTITION, @@ -2272,7 +2272,7 @@ MUI_STRING svSEStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Uppdaterar tangentbordslayoutinst\204llningar..."}, {STRING_CODEPAGEINFOUPDATE, - " L\204gger till information om codepage till registret..."}, + " L\204gger till information om codepage..."}, {STRING_DONE, " F\204rdigt..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 84cfd297eff..bad8b72b9a2 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -2246,7 +2246,7 @@ MUI_STRING trTRStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " Klavye d\201zeni ayarlar\215 g\201ncelle\237tiriliyor..."}, {STRING_CODEPAGEINFOUPDATE, - " Kay\215t defterine kod sayfas\215 bilgisi ekleniyor..."}, + " Kod sayfas\215 bilgisi ekleniyor..."}, {STRING_DONE, " Bitti..."}, {STRING_REBOOTCOMPUTER2, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index bbc1fa55aff..fefc81cd259 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -2279,7 +2279,7 @@ MUI_STRING ukUAStrings[] = {STRING_KEYBOARDSETTINGSUPDATE, " \216\255\256\242\253\245\255\255\357 \257\240\340\240\254\245\342\340i\242 \340\256\247\252\253\240\244\252\250 \252\253\240\242i\240\342\343\340\250..."}, {STRING_CODEPAGEINFOUPDATE, - " \204\256\244\240\242\240\255\255\357 \244\240\255\250\345 \257\340\256 \252\256\244\256\242\343 \341\342\256\340i\255\252\343 \242 \340\245\363\341\342\340..."}, + " \204\256\244\240\242\240\255\255\357 \244\240\255\250\345 \257\340\256 \252\256\244\256\242\343 \341\342\256\340i\255\252\343..."}, {STRING_DONE, " \203\256\342\256\242\256..."}, {STRING_REBOOTCOMPUTER2,

4 months, 2 weeks

[reactos] 01/01: [NTUSER] Fix window not updating when scrollbars created and removed. (#7245)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c0eee03335d4edc893c2… commit 9c0eee03335d4edc893c2369678f808a3b4aae11 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Aug 28 02:56:28 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 28 02:56:28 2024 -0500 [NTUSER] Fix window not updating when scrollbars created and removed. (#7245) * Revise conditions for window complete redraw. CORE-19669 Co-authored-by: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> Co-authored-by: Vitaly Orekhov <7opex0(a)mail.ru> --- win32ss/user/ntuser/winpos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index f69f39bd7ed..7256f59ad56 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2047,11 +2047,11 @@ co_WinPosSetWindowPos( * class need to be completely repainted on (horizontal/vertical) size * change. */ - if ( ( VisBefore != NULL && - VisAfter != NULL && - !(WinPos.flags & SWP_NOCOPYBITS) && - ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && - !(Window->ExStyle & WS_EX_TRANSPARENT) ) ) + if (VisBefore != NULL && + VisAfter != NULL && + !(WvrFlags & WVR_REDRAW) && + !(WinPos.flags & SWP_NOCOPYBITS) && + !(Window->ExStyle & WS_EX_TRANSPARENT)) { /*

4 months, 2 weeks

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