Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 01/01: [SHDOCVW][EXPLORER][RSHELL][SDK] Populate WinList_* stubs (#7691)
by Katayama Hirofumi MZ 31 Jan '25

31 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee19792605da47f5ea783… commit ee19792605da47f5ea783596383c0b35f93a2bef Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 1 07:14:36 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 1 07:14:36 2025 +0900 [SHDOCVW][EXPLORER][RSHELL][SDK] Populate WinList_* stubs (#7691) Implementing missing features... JIRA issue: CORE-9368 - Modify shdocvw.spec. - Add dll/win32/shdocvw/winlist.cpp. - Add stubs of WinList_* functions. - Add WinList_* function prototypes to <shdocvw_undoc.h>. - Adapt explorer and rshell to new WinList_Init prototype. --- base/shell/explorer/precomp.h | 3 +- base/shell/explorer/rshell.cpp | 6 +- base/shell/rshell/misc.cpp | 6 - dll/win32/shdocvw/CMakeLists.txt | 3 +- dll/win32/shdocvw/shdocvw.spec | 12 +- dll/win32/shdocvw/shdocvw_main.c | 2 + dll/win32/shdocvw/winlist.cpp | 255 ++++++++++++++++++++++++++++++++++++ sdk/include/reactos/shdocvw_undoc.h | 33 ++++- sdk/include/reactos/undocshell.h | 1 - 9 files changed, 300 insertions(+), 21 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index df60ef3a6f5..f90ec62f1a8 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -42,6 +42,7 @@ #include <shlwapi_undoc.h> #include <shlobj_undoc.h> #include <shlguid_undoc.h> +#include <shdocvw_undoc.h> #include <undocshell.h> #include <ui/rosctrls.h> @@ -119,7 +120,7 @@ VOID InitRSHELL(VOID); HRESULT WINAPI _CStartMenu_CreateInstance(REFIID riid, void **ppv); HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); -DWORD WINAPI _WinList_Init(void); +BOOL WINAPI _WinList_Init(void); void WINAPI _ShellDDEInit(BOOL bInit); HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv); HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); diff --git a/base/shell/explorer/rshell.cpp b/base/shell/explorer/rshell.cpp index 9767c23504d..bdd5571ade6 100644 --- a/base/shell/explorer/rshell.cpp +++ b/base/shell/explorer/rshell.cpp @@ -105,9 +105,9 @@ BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop) return FALSE; } -typedef DWORD(WINAPI* PWINLIST_INIT)(void); +typedef BOOL (WINAPI *PWINLIST_INIT)(void); -DWORD WINAPI _WinList_Init(void) +BOOL WINAPI _WinList_Init(void) { HINSTANCE hFallback; @@ -131,7 +131,7 @@ DWORD WINAPI _WinList_Init(void) } } - return 0; + return FALSE; } typedef void (WINAPI *PSHELLDDEINIT)(BOOL bInit); diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index d0ed8c83e1b..8e0403f4cfd 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -52,12 +52,6 @@ extern "C" HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); } -DWORD WINAPI WinList_Init(void) -{ - /* do something here (perhaps we may want to add our own implementation fo win8) */ - return 0; -} - class CRShellModule : public CComModule { public: diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 119e8aaf882..6d178708672 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -37,7 +37,8 @@ add_library(shdocvw_sublib OBJECT CNSCBand.cpp mrulist.cpp objects.cpp - utility.cpp) + utility.cpp + winlist.cpp) target_link_libraries(shdocvw_sublib PRIVATE atl_classes) target_compile_definitions(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_DEFINITIONS>) target_compile_options(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_OPTIONS>) diff --git a/dll/win32/shdocvw/shdocvw.spec b/dll/win32/shdocvw/shdocvw.spec index 0a8bd10cd84..e0b72b28de3 100644 --- a/dll/win32/shdocvw/shdocvw.spec +++ b/dll/win32/shdocvw/shdocvw.spec @@ -8,7 +8,7 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) 110 stdcall -noname WinList_Init() -111 stub -noname WinList_Terminate +111 stdcall -noname WinList_Terminate() @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stub DllRegisterWindowClasses @@ -74,11 +74,11 @@ 174 stub -noname SHIsGlobalOffline 175 stub -noname DetectAndFixAssociations 176 stub -noname EnsureWebViewRegSettings -177 stub -noname WinList_NotifyNewLocation -178 stub -noname WinList_FindFolderWindow -179 stub -noname WinList_GetShellWindows -180 stub -noname WinList_RegisterPending -181 stub -noname WinList_Revoke +177 stdcall -noname WinList_NotifyNewLocation(ptr long ptr) +178 stdcall -noname WinList_FindFolderWindow(ptr long ptr ptr) +179 stdcall -noname WinList_GetShellWindows(long) +180 stdcall -noname WinList_RegisterPending(long ptr long ptr) +181 stdcall -noname WinList_Revoke(long) 182 stdcall SetQueryNetSessionCount(long) 183 stub -noname SHMapNbspToSp 184 stub SetShellOfflineState diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index c817bbb3c5f..65e3c733c79 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -236,6 +236,7 @@ static BOOL SHDOCVW_LoadShell32(void) return ((SHDOCVW_hshell32 = LoadLibraryA("shell32.dll")) != NULL); } +#ifndef __REACTOS__ /* See winlist.cpp */ /*********************************************************************** * @ (SHDOCVW.110) * @@ -247,6 +248,7 @@ DWORD WINAPI WinList_Init(void) FIXME("(), stub!\n"); return 0x0deadfeed; } +#endif /* ndef __REACTOS__ */ /*********************************************************************** * @ (SHDOCVW.118) diff --git a/dll/win32/shdocvw/winlist.cpp b/dll/win32/shdocvw/winlist.cpp new file mode 100644 index 00000000000..72562d77b42 --- /dev/null +++ b/dll/win32/shdocvw/winlist.cpp @@ -0,0 +1,255 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CLSID_ShellWindows and WinList_* functions + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "objects.h" + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +static VARIANT s_vaEmpty = { VT_EMPTY }; + +static HRESULT +InitVariantFromBuffer( + _Out_ LPVARIANTARG pvarg, + _In_ LPCVOID pv, + _In_ SIZE_T cb) +{ + VariantInit(pvarg); + + LPSAFEARRAY pArray = SafeArrayCreateVector(VT_UI1, 0, cb); + if (!pArray) + { + ERR("!pArray\n"); + return E_OUTOFMEMORY; + } + + V_ARRAY(pvarg) = pArray; + V_VT(pvarg) = VT_ARRAY | VT_UI1; + CopyMemory(pArray->pvData, pv, cb); + return S_OK; +} + +static HRESULT +InitVariantFromIDList( + _Out_ LPVARIANTARG pvarg, + _In_ LPCITEMIDLIST pidl) +{ + return InitVariantFromBuffer(pvarg, pidl, ILGetSize(pidl)); +} + +static HRESULT +VariantClearLazy(_Inout_ LPVARIANTARG pvarg) +{ + switch (V_VT(pvarg)) + { + case VT_EMPTY: + case VT_BOOL: + case VT_I4: + case VT_UI4: + break; + case VT_UNKNOWN: + if (V_UNKNOWN(pvarg)) + V_UNKNOWN(pvarg)->Release(); + break; + case VT_DISPATCH: + if (V_DISPATCH(pvarg)) + V_DISPATCH(pvarg)->Release(); + break; + case VT_SAFEARRAY: + SafeArrayDestroy(V_ARRAY(pvarg)); + break; + default: + return VariantClear(pvarg); + } + V_VT(pvarg) = VT_EMPTY; + return S_OK; +} + +/************************************************************************* + * WinList_Init (SHDOCVW.110) + * + * Retired in NT 6.1. + */ +EXTERN_C +BOOL WINAPI +WinList_Init(VOID) +{ + FIXME("()\n"); + return FALSE; +} + +/************************************************************************* + * WinList_Terminate (SHDOCVW.111) + * + * NT 4.71 and higher. Retired in NT 6.1. + */ +EXTERN_C +VOID WINAPI +WinList_Terminate(VOID) +{ + FIXME("()\n"); +} + +/************************************************************************* + * WinList_GetShellWindows (SHDOCVW.179) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nn-exdisp-ishell… + */ +EXTERN_C +IShellWindows* WINAPI +WinList_GetShellWindows( + _In_ BOOL bCreate) +{ + FIXME("(%d)\n", bCreate); + return NULL; +} + +/************************************************************************* + * WinList_NotifyNewLocation (SHDOCVW.177) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_NotifyNewLocation( + _In_ IShellWindows *pShellWindows, + _In_ LONG lCookie, + _In_ LPCITEMIDLIST pidl) +{ + TRACE("(%p, %ld, %p)\n", pShellWindows, lCookie, pidl); + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellWindows->OnNavigate(lCookie, &varg); + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_FindFolderWindow (SHDOCVW.178) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_FindFolderWindow( + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_opt_ PLONG phwnd, // Stores a window handle but LONG type + _Out_opt_ IWebBrowserApp **ppWebBrowserApp) +{ + UNREFERENCED_PARAMETER(dwUnused); + + TRACE("(%p, %ld, %p, %p)\n", pidl, dwUnused, phwnd, ppWebBrowserApp); + + if (ppWebBrowserApp) + *ppWebBrowserApp = NULL; + + if (phwnd) + *phwnd = 0; + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(ppWebBrowserApp != NULL)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IDispatch> pDispatch; + const INT options = SWFO_INCLUDEPENDING | (ppWebBrowserApp ? SWFO_NEEDDISPATCH : 0); + hr = pShellWindows->FindWindowSW(&varg, &s_vaEmpty, SWC_BROWSER, phwnd, options, &pDispatch); + if (pDispatch && ppWebBrowserApp) + hr = pDispatch->QueryInterface(IID_PPV_ARG(IWebBrowserApp, ppWebBrowserApp)); + + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_RegisterPending (SHDOCVW.180) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_RegisterPending( + _In_ DWORD dwThreadId, + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_ PLONG plCookie) +{ + TRACE("(%ld, %p, %ld, %p)\n", dwThreadId, pidl, dwUnused, plCookie); + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(FALSE)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellWindows->RegisterPending(dwThreadId, &varg, &s_vaEmpty, SWC_BROWSER, plCookie); + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_Revoke (SHDOCVW.181) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_Revoke( + _In_ LONG lCookie) +{ + TRACE("(%ld)\n", lCookie); + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(TRUE)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_FAIL; + } + + return pShellWindows->Revoke(lCookie); +} diff --git a/sdk/include/reactos/shdocvw_undoc.h b/sdk/include/reactos/shdocvw_undoc.h index 57e3ee8b9d7..31be12fa29c 100644 --- a/sdk/include/reactos/shdocvw_undoc.h +++ b/sdk/include/reactos/shdocvw_undoc.h @@ -2,14 +2,16 @@ * PROJECT: ReactOS Headers * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: shdocvw.dll undocumented APIs - * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2024-2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once +#include <exdisp.h> // For IShellWindows + #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif BOOL WINAPI IEILIsEqual( @@ -17,6 +19,31 @@ IEILIsEqual( _In_ LPCITEMIDLIST pidl2, _In_ BOOL bUnknown); +BOOL WINAPI WinList_Init(VOID); +VOID WINAPI WinList_Terminate(VOID); +HRESULT WINAPI WinList_Revoke(_In_ LONG lCookie); +IShellWindows* WINAPI WinList_GetShellWindows(_In_ BOOL bCreate); + +HRESULT WINAPI +WinList_NotifyNewLocation( + _In_ IShellWindows *pShellWindows, + _In_ LONG lCookie, + _In_ LPCITEMIDLIST pidl); + +HRESULT WINAPI +WinList_FindFolderWindow( + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_opt_ PLONG phwnd, + _Out_opt_ IWebBrowserApp **ppWebBrowserApp); + +HRESULT WINAPI +WinList_RegisterPending( + _In_ DWORD dwThreadId, + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_ PLONG plCookie); + #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ +#endif diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 187a74f4d44..52ef6f27f0b 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -928,7 +928,6 @@ BOOL WINAPI SHSettingsChanged(LPCVOID unused, LPCWSTR pszKey); #define TABDMC_LOADINPROC 2 void WINAPI ShellDDEInit(BOOL bInit); -DWORD WINAPI WinList_Init(void); IStream* WINAPI SHGetViewStream(LPCITEMIDLIST, DWORD, LPCTSTR, LPCTSTR, LPCTSTR);

1 0

[reactos] 01/01: [SHELL32] SEE_MASK_IDLIST should not assume the PIDL is always a FS path (#7693)
by Whindmar Saksit 31 Jan '25

31 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f335322ace05590c3edc7… commit f335322ace05590c3edc74de58f90ee070307c5a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Jan 31 21:15:13 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 21:15:13 2025 +0100 [SHELL32] SEE_MASK_IDLIST should not assume the PIDL is always a FS path (#7693) CORE-16898 CORE-14177 --- dll/win32/shell32/shlexec.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 371f6ad44eb..9e3af71a27f 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2076,10 +2076,10 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if (sei_tmp.fMask & SEE_MASK_IDLIST && (sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) != SEE_MASK_INVOKEIDLIST) { - CComPtr<IShellExecuteHookW> pSEH; - - HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); + LPCITEMIDLIST pidl = (LPCITEMIDLIST)sei_tmp.lpIDList; + CComPtr<IShellExecuteHookW> pSEH; + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); if (SUCCEEDED(hr)) { hr = pSEH->Execute(&sei_tmp); @@ -2087,7 +2087,14 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) return TRUE; } - SHGetPathFromIDListW((LPCITEMIDLIST)sei_tmp.lpIDList, wszApplicationName); + hr = SHGetNameAndFlagsW(pidl, SHGDN_FORPARSING, wszApplicationName, dwApplicationNameLen, NULL); + if (FAILED(hr)) + { + if (dwApplicationNameLen) + *wszApplicationName = UNICODE_NULL; + if (!_ILIsDesktop(pidl)) + TRACE("Unable to get PIDL parsing path\n"); + } appKnownSingular = TRUE; TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); }

1 0

[reactos] 01/01: [SHELL32] Don't close Run dialog on execution failure (#7686)
by Whindmar Saksit 31 Jan '25

31 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6265add14704b955b9ea3… commit 6265add14704b955b9ea325713ec6e6f6e0e7e10 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Jan 31 12:52:20 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 12:52:20 2025 +0100 [SHELL32] Don't close Run dialog on execution failure (#7686) CORE-19983 --- dll/win32/shell32/dialogs/dialogs.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index a01a442a500..44f8935211a 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -583,7 +583,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA INT ic; WCHAR *psz, *pszExpanded, *parent = NULL; DWORD cchExpand; - SHELLEXECUTEINFOW sei; + SHELLEXECUTEINFOW sei = { sizeof(sei) }; NMRUNFILEDLGW nmrfd; ic = GetWindowTextLengthW(htxt); @@ -593,9 +593,6 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA return TRUE; } - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - /* * Allocate a new MRU entry, we need to add two characters * for the terminating "\\1" part, then the NULL character. @@ -694,7 +691,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA EndDialog(hwnd, IDOK); break; } - else if (SUCCEEDED(ShellExecuteExW(&sei))) + else if (ShellExecuteExW(&sei)) { /* Call GetWindowText again in case the contents of the edit box have changed. */ GetWindowTextW(htxt, psz, ic + 1);

1 0

[reactos] 01/01: [SHELL32] Load shell icon size from registry (#7683)
by Katayama Hirofumi MZ 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dddceeb10d3d1afa41d7c… commit dddceeb10d3d1afa41d7ce36cfa0494d00566c76 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 31 08:21:05 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 08:21:05 2025 +0900 [SHELL32] Load shell icon size from registry (#7683) Improve usability. Re-trial of #7679 with different approach. JIRA issue: CORE-12905 - Add ShellSmallIconSize, ShellLargeIconSize, and ShellIconBPP global variables in iconcache.cpp. - Add SIC_GetMetricsValue, SIC_GetLargeIconSize, SIC_GetSmallIconSize, and SIC_GetIconBPP helper functions in iconcache.cpp. - Load shell icon size from registry key "HKEY_CURRENT_USER\\Control Panel\\Desktop\\WindowMetrics". - Load icon BPP (bits per pixel) from registry. - Fix SIC_Initialize and SIC_LoadIcon functions for icon size. - Fix SHGetFileInfoW function for SHGFI_SHELLICONSIZE flag. --- dll/win32/shell32/iconcache.cpp | 124 ++++++++++++++++++---------------- dll/win32/shell32/wine/shell32_main.c | 37 ++++++---- dll/win32/shell32/wine/shell32_main.h | 3 + 3 files changed, 93 insertions(+), 71 deletions(-) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 9fb41f9389c..392d5fa75ea 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -1,21 +1,9 @@ /* - * shell icon cache (SIC) - * - * Copyright 1998, 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Shell Icon Cache (SIC) + * COPYRIGHT: Copyright 1998, 1999 Juergen Schmied + * Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -39,6 +27,9 @@ static HDPA sic_hdpa = 0; static HIMAGELIST ShellSmallIconList; static HIMAGELIST ShellBigIconList; +INT ShellSmallIconSize = 0; +INT ShellLargeIconSize = 0; +INT ShellIconBPP = 0; // Bits Per Pixel namespace { @@ -52,6 +43,48 @@ CRITICAL_SECTION_DEBUG critsect_debug = CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; } +// Load metric value from registry +static INT +SIC_GetMetricsValue( + _In_ PCWSTR pszValueName, + _In_ INT nDefaultValue) +{ + WCHAR szValue[64]; + DWORD cbValue = sizeof(szValue); + DWORD error = SHGetValueW(HKEY_CURRENT_USER, L"Control Panel\\Desktop\\WindowMetrics", + pszValueName, NULL, szValue, &cbValue); + if (error) + return nDefaultValue; + szValue[_countof(szValue) - 1] = UNICODE_NULL; // Avoid buffer overrun + return _wtoi(szValue); +} + +static INT +SIC_GetLargeIconSize(VOID) +{ + // NOTE: Shell icon size is always square + INT nDefaultSize = GetSystemMetrics(SM_CXICON); + INT nIconSize = SIC_GetMetricsValue(L"Shell Icon Size", nDefaultSize); + return (nIconSize > 0) ? nIconSize : nDefaultSize; +} + +static INT +SIC_GetSmallIconSize(VOID) +{ + // NOTE: Shell icon size is always square + INT nDefaultSize = GetSystemMetrics(SM_CXSMICON); + INT nIconSize = SIC_GetMetricsValue(L"Shell Small Icon Size", nDefaultSize); + return (nIconSize > 0) ? nIconSize : nDefaultSize; +} + +static INT +SIC_GetIconBPP(VOID) // Bits Per Pixel +{ + INT nDefaultBPP = SHGetCurColorRes(); + INT nIconBPP = SIC_GetMetricsValue(L"Shell Icon BPP", nDefaultBPP); + return (nIconBPP > 0) ? nIconBPP : nDefaultBPP; +} + /***************************************************************************** * SIC_CompareEntries * @@ -386,14 +419,15 @@ leave: */ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) { - HICON hiconLarge=0; - HICON hiconSmall=0; + HICON hiconLarge = NULL, hiconSmall = NULL; UINT ret; - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, NULL, 1, LR_COPYFROMRESOURCE); - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, ShellLargeIconSize, ShellLargeIconSize, + &hiconLarge, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, ShellSmallIconSize, ShellSmallIconSize, + &hiconSmall, NULL, 1, LR_COPYFROMRESOURCE); - if ( !hiconLarge || !hiconSmall) + if (!hiconLarge || !hiconSmall) { WARN("failure loading icon %i from %s (%p %p)\n", dwSourceIndex, debugstr_w(sSourceFile), hiconLarge, hiconSmall); if(hiconLarge) DestroyIcon(hiconLarge); @@ -481,9 +515,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) BOOL SIC_Initialize(void) { HICON hSm = NULL, hLg = NULL; - INT cx_small, cy_small; - INT cx_large, cy_large; - HDC hDC; INT bpp; DWORD ilMask; BOOL result = FALSE; @@ -502,16 +533,10 @@ BOOL SIC_Initialize(void) return FALSE; } - hDC = CreateICW(L"DISPLAY", NULL, NULL, NULL); - if (!hDC) - { - ERR("Failed to create information context (error %d)\n", GetLastError()); - goto end; - } - - bpp = GetDeviceCaps(hDC, BITSPIXEL); - DeleteDC(hDC); + ShellSmallIconSize = SIC_GetSmallIconSize(); + ShellLargeIconSize = SIC_GetLargeIconSize(); + bpp = ShellIconBPP = SIC_GetIconBPP(); // Bits Per Pixel if (bpp <= 4) ilMask = ILC_COLOR4; else if (bpp <= 8) @@ -527,27 +552,14 @@ BOOL SIC_Initialize(void) ilMask |= ILC_MASK; - cx_small = GetSystemMetrics(SM_CXSMICON); - cy_small = GetSystemMetrics(SM_CYSMICON); - cx_large = GetSystemMetrics(SM_CXICON); - cy_large = GetSystemMetrics(SM_CYICON); - - ShellSmallIconList = ImageList_Create(cx_small, - cy_small, - ilMask, - 100, - 100); + ShellSmallIconList = ImageList_Create(ShellSmallIconSize, ShellSmallIconSize, ilMask, 100, 100); if (!ShellSmallIconList) { ERR("Failed to create the small icon list.\n"); goto end; } - ShellBigIconList = ImageList_Create(cx_large, - cy_large, - ilMask, - 100, - 100); + ShellBigIconList = ImageList_Create(ShellLargeIconSize, ShellLargeIconSize, ilMask, 100, 100); if (!ShellBigIconList) { ERR("Failed to create the big icon list.\n"); @@ -555,11 +567,8 @@ BOOL SIC_Initialize(void) } /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_small, - cy_small, + hSm = (HICON)LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, ShellSmallIconSize, ShellSmallIconSize, LR_SHARED | LR_DEFAULTCOLOR); if (!hSm) { @@ -567,11 +576,8 @@ BOOL SIC_Initialize(void) goto end; } - hLg = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_large, - cy_large, + hLg = (HICON)LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, ShellLargeIconSize, ShellLargeIconSize, LR_SHARED | LR_DEFAULTCOLOR); if (!hLg) { diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 04967da66d1..0a24d36e4ec 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -607,9 +607,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (flags & SHGFI_SELECTED) FIXME("set icon to selected, stub\n"); - if (flags & SHGFI_SHELLICONSIZE) - FIXME("set icon to shell size, stub\n"); - /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { @@ -700,16 +697,32 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { UINT ret; - if (flags & SHGFI_SMALLICON) - ret = PrivateExtractIconsW( sTemp,icon_idx, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), - &psfi->hIcon, 0, 1, 0); + INT cxIcon, cyIcon; + + /* Get icon size */ + if (flags & SHGFI_SHELLICONSIZE) + { + if (flags & SHGFI_SMALLICON) + cxIcon = cyIcon = ShellSmallIconSize; + else + cxIcon = cyIcon = ShellLargeIconSize; + } else - ret = PrivateExtractIconsW( sTemp, icon_idx, - GetSystemMetrics( SM_CXICON), - GetSystemMetrics( SM_CYICON), - &psfi->hIcon, 0, 1, 0); + { + if (flags & SHGFI_SMALLICON) + { + cxIcon = GetSystemMetrics(SM_CXSMICON); + cyIcon = GetSystemMetrics(SM_CYSMICON); + } + else + { + cxIcon = GetSystemMetrics(SM_CXICON); + cyIcon = GetSystemMetrics(SM_CYICON); + } + } + + ret = PrivateExtractIconsW(sTemp, icon_idx, cxIcon, cyIcon, + &psfi->hIcon, 0, 1, 0); if (ret != 0 && ret != (UINT)-1) { IconNotYetLoaded=FALSE; diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index fa5bafd8880..b631c67a5ef 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -44,6 +44,9 @@ BOOL SIC_Initialize(void); void SIC_Destroy(void) DECLSPEC_HIDDEN; BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN; +extern INT ShellLargeIconSize; +extern INT ShellSmallIconSize; +extern INT ShellIconBPP; /* Classes Root */ HRESULT HCR_GetProgIdKeyOfExtension(PCWSTR szExtension, PHKEY phKey, BOOL AllowFallback);

1 0

[reactos] 01/01: [SDK][SHELL32][SHLWAPI][SHLWAPI_APITEST] Split IShellFolder helpers hack (#7685)
by Katayama Hirofumi MZ 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=909468c4dc6c21661b6b3… commit 909468c4dc6c21661b6b3a75c2ec120ed7a05e34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 31 08:15:36 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 08:15:36 2025 +0900 [SDK][SHELL32][SHLWAPI][SHLWAPI_APITEST] Split IShellFolder helpers hack (#7685) Splitting the hack will improve our code quality. JIRA issue: N/A - Add sdk/include/reactos/ishellfolder_helpers.h header file. - Split conflicting code. --- dll/win32/shell32/precomp.h | 2 +- dll/win32/shlwapi/utils.cpp | 9 +--- .../apitests/shlwapi/IShellFolderHelpers.cpp | 2 +- sdk/include/reactos/ishellfolder_helpers.h | 51 ++++++++++++++++++++++ sdk/include/reactos/shlobj_undoc.h | 1 - sdk/include/reactos/shlwapi_undoc.h | 35 --------------- 6 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 6d65aeac056..267ed1d44c9 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -42,8 +42,8 @@ #include <shlguid_undoc.h> #include <shlobj_undoc.h> -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> #include <shellapi.h> #undef ShellExecute diff --git a/dll/win32/shlwapi/utils.cpp b/dll/win32/shlwapi/utils.cpp index 8cfb8ab2d61..51a881363c7 100644 --- a/dll/win32/shlwapi/utils.cpp +++ b/dll/win32/shlwapi/utils.cpp @@ -21,15 +21,8 @@ #include <shlguid_undoc.h> #include <atlstr.h> -/* - * HACK! - */ -#undef IShellFolder_GetDisplayNameOf -#undef IShellFolder_ParseDisplayName -#undef IShellFolder_CompareIDs - -#define SHLWAPI_ISHELLFOLDER_HELPERS /* HACK! */ #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> #include <strsafe.h> diff --git a/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp b/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp index 588ef3f329c..0a94af1c3e7 100644 --- a/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp +++ b/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp @@ -10,8 +10,8 @@ #include <shlwapi.h> #include <versionhelpers.h> -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> static INT s_nStep = 0; diff --git a/sdk/include/reactos/ishellfolder_helpers.h b/sdk/include/reactos/ishellfolder_helpers.h new file mode 100644 index 00000000000..28591f71589 --- /dev/null +++ b/sdk/include/reactos/ishellfolder_helpers.h @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: SHLWAPI IShellFolder helpers + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +/* HACK! These function names are conflicting with <shobjidl.h> functions. */ +#undef IShellFolder_GetDisplayNameOf +#undef IShellFolder_ParseDisplayName +#undef IShellFolder_CompareIDs + +HRESULT WINAPI +IShellFolder_GetDisplayNameOf( + _In_ IShellFolder *psf, + _In_ LPCITEMIDLIST pidl, + _In_ SHGDNF uFlags, + _Out_ LPSTRRET lpName, + _In_ DWORD dwRetryFlags); + +/* Flags for IShellFolder_GetDisplayNameOf */ +#define SFGDNO_RETRYWITHFORPARSING 0x00000001 +#define SFGDNO_RETRYALWAYS 0x80000000 + +HRESULT WINAPI +IShellFolder_ParseDisplayName( + _In_ IShellFolder *psf, + _In_ HWND hwndOwner, + _In_ LPBC pbcReserved, + _In_ LPOLESTR lpszDisplayName, + _Out_ ULONG *pchEaten, + _Out_ PIDLIST_RELATIVE *ppidl, + _Out_ ULONG *pdwAttributes); + +EXTERN_C HRESULT WINAPI +IShellFolder_CompareIDs( + _In_ IShellFolder *psf, + _In_ LPARAM lParam, + _In_ PCUIDLIST_RELATIVE pidl1, + _In_ PCUIDLIST_RELATIVE pidl2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index b0392644ecd..c7f080ede36 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -9,7 +9,6 @@ #pragma once -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> // For ASSOCQUERY #ifdef __cplusplus diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index d4b2cf3fd1d..2ca22001c21 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -376,41 +376,6 @@ DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid); #define SHACF_WIN95SHLEXEC 0x00000200 /* Geoff Chappell */ DWORD WINAPI SHGetAppCompatFlags(DWORD dwMask); -/* - * HACK! These functions are conflicting with <shobjidl.h> inline functions... - * We provide a macro option SHLWAPI_ISHELLFOLDER_HELPERS for using these functions. - */ -#ifdef SHLWAPI_ISHELLFOLDER_HELPERS -HRESULT WINAPI -IShellFolder_GetDisplayNameOf( - _In_ IShellFolder *psf, - _In_ LPCITEMIDLIST pidl, - _In_ SHGDNF uFlags, - _Out_ LPSTRRET lpName, - _In_ DWORD dwRetryFlags); - -/* Flags for IShellFolder_GetDisplayNameOf */ -#define SFGDNO_RETRYWITHFORPARSING 0x00000001 -#define SFGDNO_RETRYALWAYS 0x80000000 - -HRESULT WINAPI -IShellFolder_ParseDisplayName( - _In_ IShellFolder *psf, - _In_ HWND hwndOwner, - _In_ LPBC pbcReserved, - _In_ LPOLESTR lpszDisplayName, - _Out_ ULONG *pchEaten, - _Out_ PIDLIST_RELATIVE *ppidl, - _Out_ ULONG *pdwAttributes); - -EXTERN_C HRESULT WINAPI -IShellFolder_CompareIDs( - _In_ IShellFolder *psf, - _In_ LPARAM lParam, - _In_ PCUIDLIST_RELATIVE pidl1, - _In_ PCUIDLIST_RELATIVE pidl2); -#endif /* SHLWAPI_ISHELLFOLDER_HELPERS */ - /***************************************************************************** * IAssociationElementOld interface *

1 0

[reactos] 01/01: [RAPPS] Don't display Freeware license string if the type is also Freeware (#7689)
by Whindmar Saksit 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5ce3d28abb48c0a1e0b4… commit d5ce3d28abb48c0a1e0b40f7c6802154433c9ac2 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Jan 30 21:14:10 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 21:14:10 2025 +0100 [RAPPS] Don't display Freeware license string if the type is also Freeware (#7689) License=Freeware, LicenseType=2 should not display as "Freeware (Freeware)" --- base/applications/rapps/appinfo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/appinfo.cpp b/base/applications/rapps/appinfo.cpp index eefbb91d2e5..1970b9459d9 100644 --- a/base/applications/rapps/appinfo.cpp +++ b/base/applications/rapps/appinfo.cpp @@ -163,16 +163,16 @@ CAvailableApplicationInfo::LicenseString() LicenseType licenseType; if (IsKnownLicenseType(IntBuffer)) - { licenseType = static_cast<LicenseType>(IntBuffer); - } else - { licenseType = LICENSE_NONE; + + if (licenseType == LICENSE_NONE || licenseType == LICENSE_FREEWARE) + { if (szLicenseString.CompareNoCase(L"Freeware") == 0) { licenseType = LICENSE_FREEWARE; - szLicenseString = L""; + szLicenseString = L""; // Don't display as "Freeware (Freeware)" } }

1 0

[reactos] 01/01: [RAPPS] Allow database to override download filename (#7668)
by Whindmar Saksit 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23db39c8a422b40c3dea… commit a23db39c8a422b40c3deab643996aac6e775217d Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Jan 30 17:46:39 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 17:46:39 2025 +0100 [RAPPS] Allow database to override download filename (#7668) http://example.com/setup.exe?foo=bar needs to use be able to use setup.exe as the filename. --- base/applications/rapps/include/appinfo.h | 1 + base/applications/rapps/loaddlg.cpp | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/base/applications/rapps/include/appinfo.h b/base/applications/rapps/include/appinfo.h index 175048b6008..32cfc20b3dd 100644 --- a/base/applications/rapps/include/appinfo.h +++ b/base/applications/rapps/include/appinfo.h @@ -82,6 +82,7 @@ enum InstallerType #define DB_REGNAME L"RegName" #define DB_INSTALLER L"Installer" #define DB_SCOPE L"Scope" // User or Machine +#define DB_SAVEAS L"SaveAs" #define DB_GENINSTSECTION L"Generate" #define GENERATE_ARPSUBKEY L"RApps" // Our uninstall data is stored here diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index df8afcbeeea..c863a5e2165 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -144,6 +144,10 @@ struct DownloadInfo IType = AppInfo.GetInstallerType(); if (IType == INSTALLER_GENERATE) szPackageName = AppInfo.szIdentifier; + + CConfigParser *cfg = static_cast<const CAvailableApplicationInfo&>(AppInfo).GetConfigParser(); + if (cfg) + cfg->GetString(DB_SAVEAS, szFileName); } bool Equal(const DownloadInfo &other) const @@ -157,6 +161,7 @@ struct DownloadInfo CStringW szName; CStringW szSHA1; CStringW szPackageName; + CStringW szFileName; ULONG SizeInBytes; }; @@ -719,7 +724,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) CStringW str; CPathW Path; - PCWSTR p, q; + PCWSTR p; ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus, dwStatusLen; ULONG dwCurrentBytesRead = 0; @@ -734,7 +739,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) const DWORD dwUrlConnectFlags = INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION; URL_COMPONENTSW urlComponents; - size_t urlLength, filenameLength; + size_t urlLength; unsigned char lpBuffer[4096]; // Change caption to show the currently downloaded app @@ -768,7 +773,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) // build the path for the download p = wcsrchr(Info.szUrl.GetString(), L'/'); - q = wcsrchr(Info.szUrl.GetString(), L'?'); // do we have a final slash separator? if (!p) @@ -777,14 +781,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) goto end; } - // prepare the tentative length of the filename, maybe we've to remove part of it later on - filenameLength = wcslen(p) * sizeof(WCHAR); - - /* do we have query arguments in the target URL after the filename? account for them - (e.g. https://example.org/myfile.exe?no_adware_plz) */ - if (q && q > p && (q - p) > 0) - filenameLength -= wcslen(q - 1) * sizeof(WCHAR); - // is the path valid? can we access it? if (GetFileAttributesW(Path) == INVALID_FILE_ATTRIBUTES) { @@ -803,9 +799,11 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) break; case DLTYPE_APPLICATION: { - CStringW str = p + 1; // use the filename retrieved from URL - UrlUnescapeAndMakeFileNameValid(str); - Path += str; + CStringW name = Info.szFileName; + if (name.IsEmpty()) + name = p + 1; // use the filename retrieved from URL + UrlUnescapeAndMakeFileNameValid(name); + Path += name; break; } }

1 0

[reactos] 01/01: [SDK] Define IAssociationElement, IAssociationArray etc. (#7678)
by Katayama Hirofumi MZ 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e52f64044259fc7d53aa… commit 7e52f64044259fc7d53aac1c28ff36d99c1178bc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 30 22:16:46 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 22:16:46 2025 +0900 [SDK] Define IAssociationElement, IAssociationArray etc. (#7678) Defining missing interfaces for file association... JIRA issue: CORE-19278 - Define IID_IAssociationElementOld, and IID_IAssociationElement interface IDs in <shlguid_undoc.h>. - Define ASSOCQUERY, and IAssociationElementOld in <shlwapi_undoc.h>. - Define IAssociationElement, IEnumAssociationElements, IAssociationArrayOld, and IAssociationArray interfaces in <shlobj_undoc.h>. - Simplify <shlwapi_undoc.h> and <shlobj_undoc.h>. --- sdk/include/reactos/shlguid_undoc.h | 2 + sdk/include/reactos/shlobj_undoc.h | 171 +++++++++++++++++++++++++++++++----- sdk/include/reactos/shlwapi_undoc.h | 86 +++++++++++++----- 3 files changed, 212 insertions(+), 47 deletions(-) diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index b72e61c9e3d..01dbfda2fe2 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -161,6 +161,8 @@ DEFINE_GUID(IID_IDelegateHostItemContainer,0x02468693, 0xE7E5, 0x4C6B, 0x99, 0x9 DEFINE_GUID(IID_IDrawPropertyControl, 0xE6DFF6FD, 0xBCD5, 0x4162, 0x9C, 0x65, 0xA3, 0xB1, 0x8C, 0x61, 0x6F, 0xDB); DEFINE_GUID(IID_IEnumAssociationElements, 0xA6B0FB57, 0x7523, 0x4439, 0x94, 0x25, 0xEB, 0xE9, 0x98, 0x23, 0xB8, 0x28); DEFINE_GUID(IID_IEnumerateAssociationElements,0x7513A16E,0xCF00,0x4817,0xA8, 0x90, 0xA2, 0x3C, 0x60, 0x8F, 0xE7, 0xB7); +DEFINE_GUID(IID_IAssociationElementOld, 0xE58B1ABF, 0x9596, 0x4DBA, 0x89, 0x97, 0x89, 0xDC, 0xDE, 0xF4, 0x69, 0x92); +DEFINE_GUID(IID_IAssociationElement, 0xD8F6AD5B, 0xB44F, 0x4BCC, 0x88, 0xFD, 0xEB, 0x34, 0x73, 0xDB, 0x75, 0x02); DEFINE_GUID(IID_IFilterCondition, 0xFCA2857D, 0x1760, 0x4AD3, 0x8C, 0x63, 0xC9, 0xB6, 0x02, 0xFC, 0xBA, 0xEA); DEFINE_GUID(IID_IFolderNotify, 0x0FF22D71, 0x5172, 0x11D1, 0xA9, 0xC6, 0x08, 0x00, 0x36, 0xAF, 0x3F, 0x03); DEFINE_GUID(IID_IFolderProperties, 0x7361EE29, 0x5BAD, 0x459D, 0xA9, 0xF5, 0xF6, 0x55, 0x06, 0x89, 0x82, 0xF0); diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index c9796909aa1..b0392644ecd 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -1,30 +1,20 @@ /* - * ReactOS undocumented shell interface - * - * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> - * Copyright 2013 Dominik Hornung - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Undocumented shell interface + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2013 Dominik Hornung + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#ifndef __SHLOBJ_UNDOC__H -#define __SHLOBJ_UNDOC__H +#pragma once + +#define SHLWAPI_ISHELLFOLDER_HELPERS +#include <shlwapi_undoc.h> // For ASSOCQUERY #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif typedef struct tagSLOTITEMDATA { @@ -817,12 +807,145 @@ DECLARE_INTERFACE_(ITrayPriv, IUnknown) #define ITrayPriv_AppendMenu(T,a) (T)->lpVtbl->AppendMenu(T,a) #endif +/***************************************************************************** + * IAssociationElement interface + * + * @see IAssociationElementOld + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/interfaces/iass… + */ +#define INTERFACE IAssociationElement +DECLARE_INTERFACE_(IAssociationElement, IUnknown) // {D8F6AD5B-B44F-4BCC-88FD-EB3473DB7502} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationElement ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryGuid)(THIS_ ASSOCQUERY query, PCWSTR key, GUID *pguid) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationElement_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationElement_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationElement_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationElement_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationElement_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationElement_QueryGuid(T,a,b,c) (T)->lpVtbl->QueryGuid(T,a,b,c) +#define IAssociationElement_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationElement_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationElement_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + +/***************************************************************************** + * IEnumAssociationElements interface + * + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/ienu… + */ +#define INTERFACE IEnumAssociationElements +DECLARE_INTERFACE_(IEnumAssociationElements, IUnknown) // {A6B0FB57-7523-4439-9425-EBE99823B828} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IEnumAssociationElements ***/ + STDMETHOD(Next)(THIS_ ULONG celt, IAssociationElement *pElement, ULONG *pceltFetched) PURE; + STDMETHOD(Skip)(THIS_ ULONG celt) PURE; + STDMETHOD(Reset)(THIS) PURE; + STDMETHOD(Clone)(THIS_ IEnumAssociationElements **ppNew) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IEnumAssociationElements_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IEnumAssociationElements_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IEnumAssociationElements_Release(T) (T)->lpVtbl->Release(T) +#define IEnumAssociationElements_Next(T,a,b,c) (T)->lpVtbl->Next(T,a,b,c) +#define IEnumAssociationElements_Skip(T,a) (T)->lpVtbl->Skip(T,a) +#define IEnumAssociationElements_Reset(T) (T)->lpVtbl->Reset(T) +#define IEnumAssociationElements_Clone(T,a) (T)->lpVtbl->Clone(T,a) +#endif + +/***************************************************************************** + * IAssociationArrayOld interface + * + * @see IAssociationArray + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/iass… + */ +#define INTERFACE IAssociationArrayOld +DECLARE_INTERFACE_(IAssociationArrayOld, IUnknown) // {3B877E3C-67DE-4F9A-B29B-17D0A1521C6A} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationArrayOld ***/ + STDMETHOD(EnumElements)(THIS_ ULONG flags, IEnumAssociationElements **ppElement) PURE; + STDMETHOD(QueryString)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryExists)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ULONG flags, ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationArrayOld_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationArrayOld_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationArrayOld_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationArrayOld_EnumElements(T,a,b) (T)->lpVtbl->EnumElements(T,a,b) +#define IAssociationArrayOld_QueryString(T,a,b,c,d) (T)->lpVtbl->QueryString(T,a,b,c,d) +#define IAssociationArrayOld_QueryDword(T,a,b,c,d) (T)->lpVtbl->QueryDword(T,a,b,c,d) +#define IAssociationArrayOld_QueryExists(T,a,b,c) (T)->lpVtbl->QueryExists(T,a,b,c) +#define IAssociationArrayOld_QueryDirect(T,a,b,c,d) (T)->lpVtbl->QueryDirect(T,a,b,c,d) +#define IAssociationArrayOld_QueryObject(T,a,b,c,d,e) (T)->lpVtbl->QueryObject(T,a,b,c,d,e) +#endif + +/***************************************************************************** + * IAssociationArray interface + * + * @see IAssociationArrayOld + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/iass… + */ +#define INTERFACE IAssociationArray +DECLARE_INTERFACE_(IAssociationArray, IUnknown) // {19ADBAFD-1C5F-4FC7-94EE-846702DFB58B} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationArray ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryGuid)(THIS_ ASSOCQUERY query, PCWSTR key, GUID *pguid) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationArray_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationArray_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationArray_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationArray_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationArray_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationArray_QueryGuid(T,a,b,c) (T)->lpVtbl->QueryGuid(T,a,b,c) +#define IAssociationArray_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationArray_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationArray_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE); HRESULT WINAPI SHCreateFileDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject* pDataInner, IDataObject** ppDataObj); #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif // __SHLOBJ_UNDOC__H +#endif diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index c3ffe8c93df..d4b2cf3fd1d 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -1,29 +1,38 @@ /* - * ReactOS shlwapi - * - * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Undocumented SHLWAPI definitions + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#ifndef __SHLWAPI_UNDOC_H -#define __SHLWAPI_UNDOC_H +#pragma once + +#include <winreg.h> // For REGSAM #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif + +/***************************************************************************** + * ASSOCQUERY --- The type flags of association query + * + * @see IAssociationElementOld, IAssociationElement, IAssociationArrayOld, IAssociationArray + * @see https://www.geoffchappell.com/studies/windows/shell/shell32/api/assocelem/q… + */ +typedef DWORD ASSOCQUERY; +#define ASSOCQUERY_LOWORD_MASK 0x0000FFFF // The low-order word of flags +#define ASSOCQUERY_STRING 0x00010000 // Responds to QueryString method +#define ASSOCQUERY_EXISTS 0x00020000 // Responds to QueryExists method +#define ASSOCQUERY_DIRECT 0x00040000 // Responds to QueryDirect method +#define ASSOCQUERY_DWORD 0x00080000 // Responds to QueryDword method +#define ASSOCQUERY_INDIRECT 0x00100000 // Obtains resource string from QueryString +#define ASSOCQUERY_OBJECT 0x00200000 // Responds to QueryObject method +#define ASSOCQUERY_GUID 0x00400000 // Responds to QueryGuid method +#define ASSOCQUERY_EXTRA_NON_VERB 0x01000000 // Expects pszExtra for path or value +#define ASSOCQUERY_EXTRA_VERB 0x02000000 // Expects pszExtra for verb +#define ASSOCQUERY_SIGNIFICANCE 0x04000000 // Significance unknown +#define ASSOCQUERY_FALLBACK 0x80000000 // Fallback to secondary query source #define SHELL_NO_POLICY ((DWORD)-1) @@ -402,8 +411,39 @@ IShellFolder_CompareIDs( _In_ PCUIDLIST_RELATIVE pidl2); #endif /* SHLWAPI_ISHELLFOLDER_HELPERS */ +/***************************************************************************** + * IAssociationElementOld interface + * + * @see IAssociationElement + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/interfaces/iass… + */ +#define INTERFACE IAssociationElementOld +DECLARE_INTERFACE_(IAssociationElementOld, IUnknown) // {E58B1ABF-9596-4DBA-8997-89DCDEF46992} +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IAssociationElementOld ***/ + STDMETHOD(QueryString)(THIS_ ASSOCQUERY query, PCWSTR key, PWSTR *ppszValue) PURE; + STDMETHOD(QueryDword)(THIS_ ASSOCQUERY query, PCWSTR key, DWORD *pdwValue) PURE; + STDMETHOD(QueryExists)(THIS_ ASSOCQUERY query, PCWSTR key) PURE; + STDMETHOD(QueryDirect)(THIS_ ASSOCQUERY query, PCWSTR key, FLAGGED_BYTE_BLOB **ppBlob) PURE; + STDMETHOD(QueryObject)(THIS_ ASSOCQUERY query, PCWSTR key, REFIID riid, PVOID *ppvObj) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IAssociationElementOld_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IAssociationElementOld_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IAssociationElementOld_Release(T) (T)->lpVtbl->Release(T) +#define IAssociationElementOld_QueryString(T,a,b,c) (T)->lpVtbl->QueryString(T,a,b,c) +#define IAssociationElementOld_QueryDword(T,a,b,c) (T)->lpVtbl->QueryDword(T,a,b,c) +#define IAssociationElementOld_QueryExists(T,a,b) (T)->lpVtbl->QueryExists(T,a,b) +#define IAssociationElementOld_QueryDirect(T,a,b,c) (T)->lpVtbl->QueryDirect(T,a,b,c) +#define IAssociationElementOld_QueryObject(T,a,b,c,d) (T)->lpVtbl->QueryObject(T,a,b,c,d) +#endif + #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __SHLWAPI_UNDOC_H */ +#endif

1 0

[reactos] 04/04: [UCRT] fenv.h: Fix GCC build of _Fenv1
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de3a6706e7ea508024ccd… commit de3a6706e7ea508024ccd63a4b7993931b4354d6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 4 16:28:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] fenv.h: Fix GCC build of _Fenv1 --- sdk/include/ucrt/fenv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk/include/ucrt/fenv.h b/sdk/include/ucrt/fenv.h index 6384e4697b5..37e0ecd4110 100644 --- a/sdk/include/ucrt/fenv.h +++ b/sdk/include/ucrt/fenv.h @@ -64,12 +64,17 @@ _ACRTIMP int __cdecl fesetround(_In_ int _Round); // initialized, indicating no exceptions are masked. In the current // implementation (_Fenv1), the global variable is initialized with all // exceptions masked, which is the actual initial environment. + #ifdef __cplusplus + #define CPP_EXTERN extern + #else + #define CPP_EXTERN + #endif #if defined _M_IX86 - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x3f3f103f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x3f3f103f, 0 }; #elif defined _M_X64 - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x3f00003f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x3f00003f, 0 }; #else - __declspec(selectany) extern const fenv_t _Fenv1 = { 0x0000003f, 0 }; + CPP_EXTERN __declspec(selectany) const fenv_t _Fenv1 = { 0x0000003f, 0 }; #endif #endif

1 0

[reactos] 03/04: [UCRT] Add GCC compatible definition of _CRT_STDIO_INLINE
by Timo Kreuzer 30 Jan '25

30 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a438d7c3b88d33bdb393e… commit a438d7c3b88d33bdb393e3dc3eec3214d7acbf15 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 9 19:19:52 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] Add GCC compatible definition of _CRT_STDIO_INLINE In C99 mode GCC emits global symbols for inline functions, as soon as the compilation unit contains a declaration that marks the function as "extern". A number of functions like printf are implicitly declared as extern by GCC, which seemingly cannot be disabled. This would lead to the inline function being emitted as a global symbol in every compilation unit. Using static inline prevents duplicate symbol errors. --- sdk/include/ucrt/corecrt_stdio_config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/ucrt/corecrt_stdio_config.h b/sdk/include/ucrt/corecrt_stdio_config.h index 360a45824d6..cc4b410b525 100644 --- a/sdk/include/ucrt/corecrt_stdio_config.h +++ b/sdk/include/ucrt/corecrt_stdio_config.h @@ -23,7 +23,11 @@ _CRT_BEGIN_C_HEADER #undef _CRT_STDIO_INLINE #define _CRT_STDIO_INLINE #elif !defined _CRT_STDIO_INLINE + #if defined(__GNUC__) + #define _CRT_STDIO_INLINE static __inline + #else #define _CRT_STDIO_INLINE __inline + #endif #endif #if !defined RC_INVOKED // RC has no target architecture

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2025