Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMCTL32][COMCTL32_APITEST] Implement ImageList Get/SetFlags and the system flag (#7701)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=705a985789ddba840e7cd… commit 705a985789ddba840e7cd9ad1af0744574ba1b48 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Feb 17 13:46:20 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 17 13:46:20 2025 +0100 [COMCTL32][COMCTL32_APITEST] Implement ImageList Get/SetFlags and the system flag (#7701) The shell needs to be able to change the color depth of the system image lists on the fly and it does that by changing the ILC_COLOR* flags. --- dll/win32/comctl32/imagelist.c | 51 +++++++- modules/rostests/apitests/comctl32/CMakeLists.txt | 2 +- modules/rostests/apitests/comctl32/imagelist.c | 152 ++++++++++++++++++++++ modules/rostests/apitests/comctl32/testlist.c | 2 + sdk/include/reactos/comctl32_undoc.h | 8 ++ 5 files changed, 211 insertions(+), 4 deletions(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index 5692af16ae8..e56431edc6f 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -121,7 +121,13 @@ struct _IMAGELIST #ifdef __REACTOS__ #define IMAGELIST_MAGIC_DESTROYED 0x44454144 #define IMAGELIST_VERSION 0x101 -#endif + +#define WinVerMajor() LOBYTE(GetVersion()) + +#include <comctl32_undoc.h> +#define ILC_PUBLICFLAGS ( 0xFFFFFFFF ) /* Allow all flags for now */ +#define ILC_COLORMASK 0xFE +#endif /* __REACTOS__ */ /* Header used by ImageList_Read() and ImageList_Write() */ #include "pshpack2.h" @@ -935,7 +941,12 @@ BOOL WINAPI ImageList_Destroy (HIMAGELIST himl) { if (!is_valid(himl)) - return FALSE; + return FALSE; + +#ifdef __REACTOS__ + if ((himl->flags & ILC_SYSTEM) && WinVerMajor() >= 6) + return FALSE; +#endif IImageList_Release((IImageList *) himl); return TRUE; @@ -1944,7 +1955,7 @@ ImageList_GetFlags(HIMAGELIST himl) #ifdef __REACTOS__ if(!is_valid2(himl)) return 0; - return himl->flags; + return himl->flags & ILC_PUBLICFLAGS; #else return is_valid(himl) ? himl->flags : 0; #endif @@ -3047,12 +3058,46 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) * Stub. */ +#ifdef __REACTOS__ +static BOOL +ChangeColorDepth(HIMAGELIST himl) +{ + UINT ilc = himl->flags & ILC_COLORMASK; + if (ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) + himl->uBitsPixel = ilc; + else + himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); + + /* Create new himl->hbmImage for BPP changes (for SHELL32) */ + return ((IImageList*)himl)->lpVtbl->SetImageCount((IImageList*)himl, 0) == S_OK; +} + +BOOL WINAPI +ImageList_SetFlags(HIMAGELIST himl, DWORD flags) +{ + if (!is_valid(himl)) + return FALSE; + + if (flags & ~ILC_PUBLICFLAGS) + return FALSE; + + if (((himl->flags ^ flags) & ILC_SYSTEM) && WinVerMajor() < 6) + return FALSE; /* Can't change this flag */ + + if (himl->flags == flags && WinVerMajor() >= 6) + return TRUE; + + himl->flags = flags; + return ChangeColorDepth(himl); +} +#else DWORD WINAPI ImageList_SetFlags(HIMAGELIST himl, DWORD flags) { FIXME("(%p %08x):empty stub\n", himl, flags); return 0; } +#endif /* __REACTOS__ */ /************************************************************************* diff --git a/modules/rostests/apitests/comctl32/CMakeLists.txt b/modules/rostests/apitests/comctl32/CMakeLists.txt index d3d11b9be77..2198b4d9fe7 100644 --- a/modules/rostests/apitests/comctl32/CMakeLists.txt +++ b/modules/rostests/apitests/comctl32/CMakeLists.txt @@ -1,5 +1,5 @@ -add_executable(comctl32_apitest button.c propsheet.c toolbar.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) +add_executable(comctl32_apitest button.c imagelist.c propsheet.c toolbar.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) target_link_libraries(comctl32_apitest wine) set_module_type(comctl32_apitest win32cui) add_importlibs(comctl32_apitest uxtheme comctl32 user32 gdi32 msvcrt kernel32 ntdll) diff --git a/modules/rostests/apitests/comctl32/imagelist.c b/modules/rostests/apitests/comctl32/imagelist.c new file mode 100644 index 00000000000..8ef72f0520d --- /dev/null +++ b/modules/rostests/apitests/comctl32/imagelist.c @@ -0,0 +1,152 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for imagelist + * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#include "wine/test.h" +#include <stdio.h> +#include <windows.h> +#include <commctrl.h> +#include <comctl32_undoc.h> + +#define WinVerMajor() LOBYTE(GetVersion()) + +#define ILC_COLORMASK 0xfe +#define IL_IMGSIZE 16 + +static BOOL IL_IsValid(HIMAGELIST himl) +{ + int w = -42, h; + if (!himl || IsBadReadPtr(himl, sizeof(void*))) + return FALSE; + return ImageList_GetIconSize(himl, &w, &h) && w != -42; +} + +static HRESULT IL_Destroy(HIMAGELIST himl) +{ + if (himl && !IL_IsValid(himl)) + return E_INVALIDARG; + return ImageList_Destroy(himl) ? S_OK : S_FALSE; +} + +static inline HIMAGELIST IL_Create(UINT flags) +{ + return ImageList_Create(IL_IMGSIZE, IL_IMGSIZE, flags, 1, 0); +} + +static UINT IL_CalculateOtherBpp(UINT ilc) +{ + UINT bpp = (ilc & ILC_COLORMASK) == ILC_COLOR32 ? ILC_COLOR16 : ILC_COLOR32; + return (ilc & ~ILC_COLORMASK) | bpp; +} + +static BOOL IL_AddImagesForTest(HIMAGELIST himl) +{ + int idx = -1; + HINSTANCE hInst = LoadLibraryW(L"USER32"); + if (!hInst) + return FALSE; + HICON hIco = (HICON)LoadImage(hInst, MAKEINTRESOURCE(100), /* Windows */ + IMAGE_ICON, IL_IMGSIZE, IL_IMGSIZE, 0); + if (!hIco) + hIco = (HICON)LoadImage(hInst, MAKEINTRESOURCE(32512), /* ReactOS */ + IMAGE_ICON, IL_IMGSIZE, IL_IMGSIZE, 0); + + if (hIco) + { + idx = ImageList_AddIcon(himl, hIco); + DestroyIcon(hIco); + } + FreeLibrary(hInst); + return idx != -1; +} + +static void Test_SystemIL(void) +{ + const UINT flags = ILC_COLOR16 | ILC_MASK; + HIMAGELIST himl; + + himl = IL_Create(flags); + ok(IL_Destroy(himl) == S_OK && !IL_IsValid(himl), "Can destroy normal\n"); + + /* You can (sometimes) destroy a system imagelist! + * On Win9x it destroys it for all processes according to + * https://sporks.space/2021/09/18/notes-on-the-system-image-list/ and + * https://www.catch22.net/tuts/win32/system-image-list/ + */ + himl = IL_Create(flags | ILC_SYSTEM); + if (WinVerMajor() >= 6) + ok(IL_Destroy(himl) == S_FALSE && IL_IsValid(himl), "Can't destroy system\n"); + else + ok(IL_Destroy(himl) == S_OK && !IL_IsValid(himl), "Can destroy system\n"); +} + +static void Test_Flags(void) +{ + const UINT flags = ILC_COLOR16 | ILC_MASK; + UINT flagsIn, flagsOut; + HIMAGELIST himl; + + himl = IL_Create(flagsIn = flags); + flagsOut = ImageList_GetFlags(himl); + if (himl ? TRUE : (skip("Could not initialize\n"), FALSE)) + { + ok((flagsOut & ILC_COLORMASK) == (flagsIn & ILC_COLORMASK), "ILC_COLOR\n"); + ok(!(flagsOut & ILC_SYSTEM), "!ILC_SYSTEM\n"); + + ok(IL_AddImagesForTest(himl), "Initialize\n"); + flagsIn = IL_CalculateOtherBpp(flagsIn); + ok(ImageList_SetFlags(himl, flagsIn), "Can change BPP\n"); + ok(ImageList_GetImageCount(himl) == 0, "SetFlags deletes all images\n"); + + ok(IL_AddImagesForTest(himl), "Initialize\n"); + ok(ImageList_SetFlags(himl, ImageList_GetFlags(himl)), "Can set same flags\n"); + if (WinVerMajor() >= 6) + { + ok(ImageList_GetImageCount(himl) != 0, "SetFlags does not delete with same flags\n"); + ok(ImageList_SetFlags(himl, flagsIn ^ ILC_SYSTEM), "Can change ILC_SYSTEM\n"); + } + else + { + ok(ImageList_GetImageCount(himl) == 0, "SetFlags deletes all images even with same flags\n"); + ok(!ImageList_SetFlags(himl, flagsIn ^ ILC_SYSTEM), "Can't change ILC_SYSTEM\n"); + } + + IL_Destroy(himl); + } + + himl = IL_Create(flagsIn = flags | ILC_SYSTEM); + flagsOut = ImageList_GetFlags(himl); + if (himl ? TRUE : (skip("Could not initialize\n"), FALSE)) + { + ok((flagsOut & ILC_SYSTEM), "ILC_SYSTEM\n"); /* Flag is not hidden */ + + ok(IL_AddImagesForTest(himl), "Initialize\n"); + + flagsIn = IL_CalculateOtherBpp(flagsIn); + ok(ImageList_SetFlags(himl, flagsIn), "Can change BPP\n"); + ok(ImageList_GetImageCount(himl) == 0, "SetFlags deletes all images\n"); + + ok(IL_AddImagesForTest(himl), "Initialize\n"); + ok(ImageList_SetFlags(himl, ImageList_GetFlags(himl)), "Can set same flags\n"); + if (WinVerMajor() >= 6) + { + ok(ImageList_SetFlags(himl, flagsIn ^ ILC_SYSTEM), "Can change ILC_SYSTEM\n"); + } + else + { + ok(!ImageList_SetFlags(himl, flagsIn ^ ILC_SYSTEM), "Can't change ILC_SYSTEM\n"); + } + + IL_Destroy(himl); + } +} + +START_TEST(imagelist) +{ + InitCommonControls(); + Test_SystemIL(); + Test_Flags(); +} diff --git a/modules/rostests/apitests/comctl32/testlist.c b/modules/rostests/apitests/comctl32/testlist.c index da44fe7e3fb..eeb9146bf79 100644 --- a/modules/rostests/apitests/comctl32/testlist.c +++ b/modules/rostests/apitests/comctl32/testlist.c @@ -2,12 +2,14 @@ #include <apitest.h> extern void func_button(void); +extern void func_imagelist(void); extern void func_propsheet(void); extern void func_toolbar(void); const struct test winetest_testlist[] = { { "buttonv6", func_button }, + { "imagelist", func_imagelist }, { "propsheetv6", func_propsheet }, { "toolbarv6", func_toolbar }, { 0, 0 } diff --git a/sdk/include/reactos/comctl32_undoc.h b/sdk/include/reactos/comctl32_undoc.h index 1a36f4267f8..4b48e4ad5c4 100644 --- a/sdk/include/reactos/comctl32_undoc.h +++ b/sdk/include/reactos/comctl32_undoc.h @@ -140,6 +140,14 @@ typedef INT (WINAPI *FN_FreeMRUList)(HANDLE); // #define GET_PROC(hComCtl32, fn) fn = (FN_##fn)GetProcAddress((hComCtl32), (LPSTR)I_##fn) +#ifndef NOIMAGEAPIS + +#define ILC_SYSTEM 0x0100 /* Used by the shell system image lists */ +DWORD WINAPI ImageList_GetFlags(HIMAGELIST himl); +BOOL WINAPI ImageList_SetFlags(HIMAGELIST himl, DWORD flags); + +#endif /* NOIMAGEAPIS */ + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

4 months, 1 week

[reactos] 01/01: [NETCFGX][PSDK] Add the interfaces INetCfgClass and INetCfgClassSetup

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47bae01cfad2275efb3e6… commit 47bae01cfad2275efb3e68d7b31e7a809d6cb749 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 16 21:23:12 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 16 21:23:12 2025 +0100 [NETCFGX][PSDK] Add the interfaces INetCfgClass and INetCfgClassSetup This will enable us to install networking drivers and services properly. --- dll/win32/netcfgx/CMakeLists.txt | 1 + dll/win32/netcfgx/netcfg_iface.c | 2 +- dll/win32/netcfgx/netcfgclass_iface.c | 233 ++++++++++++++++++++++++++++++++++ dll/win32/netcfgx/precomp.h | 3 + sdk/include/psdk/netcfgx.h | 69 ++++++++++ 5 files changed, 307 insertions(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index bde3f69f9db..3e4dfb3f8b8 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE netcfg_iface.c netcfgbindinginterface_iface.c netcfgbindingpath_iface.c + netcfgclass_iface.c inetcfgcomp_iface.c tcpipconf_notify.c propertypage.c diff --git a/dll/win32/netcfgx/netcfg_iface.c b/dll/win32/netcfgx/netcfg_iface.c index e292e4c7b4b..72122513843 100644 --- a/dll/win32/netcfgx/netcfg_iface.c +++ b/dll/win32/netcfgx/netcfg_iface.c @@ -845,7 +845,7 @@ INetCfg_fnQueryNetCfgClass( REFIID riid, void **ppvObject) { - return E_FAIL; + return INetCfgClass_Constructor((IUnknown *)iface, riid, ppvObject, pguidClass, iface); } static const INetCfgVtbl vt_NetCfg = diff --git a/dll/win32/netcfgx/netcfgclass_iface.c b/dll/win32/netcfgx/netcfgclass_iface.c new file mode 100644 index 00000000000..10eda26cad6 --- /dev/null +++ b/dll/win32/netcfgx/netcfgclass_iface.c @@ -0,0 +1,233 @@ +#include "precomp.h" + +typedef struct +{ + const INetCfgClass *lpVtbl; + const INetCfgClassSetup *lpVtblSetup; + LONG ref; + GUID ClassGuid; + INetCfg *pNetCfg; +} INetCfgClassImpl, *LPINetCfgClassImpl; + +static __inline LPINetCfgClassImpl impl_from_INetCfgClassSetup(INetCfgClassSetup *iface) +{ + return (INetCfgClassImpl*)((char *)iface - FIELD_OFFSET(INetCfgClassImpl, lpVtblSetup)); +} + +/*************************************************************** + * INetCfgClassSetup + */ + +HRESULT +WINAPI +INetCfgClassSetup_fnQueryInterface( + INetCfgClassSetup *iface, + REFIID iid, + LPVOID *ppvObj) +{ + INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + return INetCfgClass_QueryInterface((INetCfgClass*)This, iid, ppvObj); +} + + +ULONG +WINAPI +INetCfgClassSetup_fnAddRef( + INetCfgClassSetup *iface) +{ + INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + return INetCfgClass_AddRef((INetCfgClass*)This); +} + +ULONG +WINAPI +INetCfgClassSetup_fnRelease( + INetCfgClassSetup *iface) +{ + INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + return INetCfgClass_Release((INetCfgClass*)This); +} + +HRESULT +WINAPI +INetCfgClassSetup_fnSelectAndInstall( + _In_ INetCfgClassSetup *iface, + _In_ HWND hwndParent, + _In_opt_ OBO_TOKEN *pOboToken, + _Out_opt_ INetCfgComponent **ppnccItem) +{ +// INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + return S_OK; +} + +HRESULT +WINAPI +INetCfgClassSetup_fnInstall( + _In_ INetCfgClassSetup *iface, + _In_ LPCWSTR pszwComponentId, + _In_opt_ OBO_TOKEN *pOboToken, + _In_opt_ DWORD dwSetupFlags, + _In_opt_ DWORD dwUpgradeFromBuildNo, + _In_opt_ LPCWSTR pszwAnswerFile, + _In_opt_ LPCWSTR pszwAnswerSections, + _Out_opt_ INetCfgComponent **ppComponent) +{ +// INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + + if (ppComponent) + *ppComponent = NULL; + + return S_OK; +} + + +HRESULT +WINAPI +INetCfgClassSetup_fnDeInstall( + _In_ INetCfgClassSetup *iface, + _In_ INetCfgComponent *pComponent, + _In_opt_ OBO_TOKEN *pOboToken, + _Out_opt_ LPWSTR *pmszwRefs) +{ +// INetCfgClassImpl *This = impl_from_INetCfgClassSetup(iface); + + return S_OK; +} + +static const INetCfgClassSetupVtbl vt_NetCfgClassSetup = +{ + INetCfgClassSetup_fnQueryInterface, + INetCfgClassSetup_fnAddRef, + INetCfgClassSetup_fnRelease, + INetCfgClassSetup_fnSelectAndInstall, + INetCfgClassSetup_fnInstall, + INetCfgClassSetup_fnDeInstall +}; + +/*************************************************************** + * INetCfgClass + */ + +HRESULT +WINAPI +INetCfgClass_fnQueryInterface( + INetCfgClass *iface, + REFIID iid, + LPVOID *ppvObj) +{ + INetCfgClassImpl *This = (INetCfgClassImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetCfgClass)) + { + *ppvObj = This; + INetCfgClass_AddRef(iface); + return S_OK; + } + else if (IsEqualIID (iid, &IID_INetCfgClassSetup)) + { + *ppvObj = (LPVOID)&This->lpVtblSetup; + INetCfgClass_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +ULONG +WINAPI +INetCfgClass_fnAddRef( + INetCfgClass *iface) +{ + INetCfgClassImpl *This = (INetCfgClassImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +WINAPI +INetCfgClass_fnRelease( + INetCfgClass *iface) +{ + INetCfgClassImpl *This = (INetCfgClassImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree(This); + } + return refCount; +} + +HRESULT +WINAPI +INetCfgClass_fnFindComponent( + INetCfgClass *iface, + INetCfgComponent **pComponent) +{ +// HRESULT hr; +// INetCfgClassImpl *This = (INetCfgClassImpl *)iface; + + + /* TODO */ + + return S_FALSE; +} + +HRESULT +WINAPI +INetCfgClass_fnEnumComponents( + INetCfgClass *iface, + IEnumNetCfgComponent **ppenumComponent) +{ +// INetCfgClassImpl *This = (INetCfgClassImpl *)iface; + + + return E_NOINTERFACE; +} + +static const INetCfgClassVtbl vt_NetCfgClass = +{ + INetCfgClass_fnQueryInterface, + INetCfgClass_fnAddRef, + INetCfgClass_fnRelease, + INetCfgClass_fnFindComponent, + INetCfgClass_fnEnumComponents, +}; + +HRESULT +WINAPI +INetCfgClass_Constructor( + IUnknown *pUnkOuter, + REFIID riid, + LPVOID *ppv, + const GUID *pguidClass, + INetCfg *pNetCfg) +{ + INetCfgClassImpl *This; + + if (!ppv) + return E_POINTER; + + This = (INetCfgClassImpl *)CoTaskMemAlloc(sizeof(INetCfgClassImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const INetCfgClass*)&vt_NetCfgClass; + This->lpVtblSetup = (const INetCfgClassSetup*)&vt_NetCfgClassSetup; + + memcpy(&This->ClassGuid, pguidClass, sizeof(GUID)); + This->pNetCfg = pNetCfg; + + if (!SUCCEEDED(INetCfgClass_QueryInterface((INetCfgClass*)This, riid, ppv))) + { + INetCfgClass_Release((INetCfgClass*)This); + return E_NOINTERFACE; + } + + INetCfgClass_Release((INetCfgClass*)This); + return S_OK; +} diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index 77ba0e96968..e8551f7c43f 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -73,6 +73,9 @@ HRESULT WINAPI IEnumNetCfgBindingInterface_Constructor(IUnknown *pUnkOuter, REFI HRESULT WINAPI INetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI IEnumNetCfgBindingPath_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, DWORD dwFlags); +/* netcfgclass_iface.c */ +HRESULT WINAPI INetCfgClass_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const GUID *pguidClass, INetCfg *pNetCfg); + /* tcpipconf_notify.c */ HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); diff --git a/sdk/include/psdk/netcfgx.h b/sdk/include/psdk/netcfgx.h index 90ef3ae6d25..bcd6758c4c6 100644 --- a/sdk/include/psdk/netcfgx.h +++ b/sdk/include/psdk/netcfgx.h @@ -314,5 +314,74 @@ EXTERN_C const IID IID_INetCfg; #define NETCFG_S_CAUSED_SETUP_CHANGE 0x8004A024 #define NETCFG_S_COMMIT_NOW 0x8004A025 +EXTERN_C const IID IID_INetCfgClass; + +#undef INTERFACE +#define INTERFACE INetCfgClass +DECLARE_INTERFACE_(INetCfgClass, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD_(HRESULT,FindComponent) (THIS_ INetCfgComponent **ppnccItem) PURE; + STDMETHOD_(HRESULT,EnumComponents) (THIS_ IEnumNetCfgComponent **ppenumComponent) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgClass_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgClass_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgClass_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgClass_FindComponent(p,a) (p)->lpVtbl->FindComponent(p,a) +#define INetCfgClass_EnumComponents(p,a) (p)->lpVtbl->EnumComponents(p,a) +#endif + +typedef +enum tagOBO_TOKEN_TYPE +{ + OBO_USER = 1, + OBO_COMPONENT = 2, + OBO_SOFTWARE = 3 +} OBO_TOKEN_TYPE; + +typedef struct tagOBO_TOKEN +{ + OBO_TOKEN_TYPE Type; + INetCfgComponent *pncc; + LPCWSTR pszwManufacturer; + LPCWSTR pszwProduct; + LPCWSTR pszwDisplayName; + BOOL fRegistered; +} OBO_TOKEN; + +#define NSF_PRIMARYINSTALL 1 +#define NSF_POSTSYSINSTALL 2 + +EXTERN_C const IID IID_INetCfgClassSetup; + +#undef INTERFACE +#define INTERFACE INetCfgClassSetup +DECLARE_INTERFACE_(INetCfgClassSetup, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD_(HRESULT,SelectAndInstall)(THIS_ HWND hwndParent, OBO_TOKEN *pOboToken, INetCfgComponent **ppnccItem) PURE; + STDMETHOD_(HRESULT,Install)(THIS_ LPCWSTR pszwInfId, OBO_TOKEN *pOboToken, DWORD dwSetupFlags, DWORD dwUpgradeFromBuildNo, + LPCWSTR pszwAnswerFile, LPCWSTR pszwAnswerSections, INetCfgComponent **ppnccItem) PURE; + STDMETHOD_(HRESULT,DeInstall)(THIS_ INetCfgComponent *pComponent, OBO_TOKEN *pOboToken, LPWSTR *pmszwRefs) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgClassSetup_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgClassSetup_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgClassSetup_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgClassSetup_SelectAndInstall(p,a,b,c) (p)->lpVtbl->SelectAndInstall(p,a,b,c) +#define INetCfgClassSetup_Install(p,a,b,c,d,e,f,g) (p)->lpVtbl->Install(p,a,b,c,d,e,f,g) +#define INetCfgClassSetup_DeInstall(p,a,b,c) (p)->lpVtbl->DeInstall(p,a,b,c) +#endif #endif

4 months, 2 weeks

[reactos] 01/01: [UCRT] Fix MSVC compiling on VS 2017 after Timo's UCRT commits (#7718)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45ed1a9b6d02168bac7f1… commit 45ed1a9b6d02168bac7f1b9b94e6067bc1d4f647 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Feb 15 20:03:52 2025 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 15 20:03:52 2025 -0600 [UCRT] Fix MSVC compiling on VS 2017 after Timo's UCRT commits (#7718) CORE-19996 Verified using https://godbolt.org. --- sdk/lib/ucrt/math/_dclass.c | 2 +- sdk/lib/ucrt/math/_dtest.c | 2 +- sdk/lib/ucrt/math/_fdclass.c | 2 +- sdk/lib/ucrt/math/_fdtest.c | 2 +- sdk/lib/ucrt/stdlib/div.cpp | 2 +- sdk/lib/ucrt/stdlib/ldiv.cpp | 2 +- sdk/lib/ucrt/stdlib/lldiv.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/lib/ucrt/math/_dclass.c b/sdk/lib/ucrt/math/_dclass.c index aeeff8ccde0..076f495ca30 100644 --- a/sdk/lib/ucrt/math/_dclass.c +++ b/sdk/lib/ucrt/math/_dclass.c @@ -11,7 +11,7 @@ #include <math.h> #include <stdint.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(_dclass) #endif diff --git a/sdk/lib/ucrt/math/_dtest.c b/sdk/lib/ucrt/math/_dtest.c index 34b03b52b36..fb659f17739 100644 --- a/sdk/lib/ucrt/math/_dtest.c +++ b/sdk/lib/ucrt/math/_dtest.c @@ -10,7 +10,7 @@ #include <math.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(_dtest) #endif diff --git a/sdk/lib/ucrt/math/_fdclass.c b/sdk/lib/ucrt/math/_fdclass.c index 4714a9d6664..39190f82fcb 100644 --- a/sdk/lib/ucrt/math/_fdclass.c +++ b/sdk/lib/ucrt/math/_fdclass.c @@ -11,7 +11,7 @@ #include <math.h> #include <stdint.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(_fdclass) #endif diff --git a/sdk/lib/ucrt/math/_fdtest.c b/sdk/lib/ucrt/math/_fdtest.c index 584d193191f..756fd89cbdd 100644 --- a/sdk/lib/ucrt/math/_fdtest.c +++ b/sdk/lib/ucrt/math/_fdtest.c @@ -10,7 +10,7 @@ #include <math.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(_fdtest) #endif diff --git a/sdk/lib/ucrt/stdlib/div.cpp b/sdk/lib/ucrt/stdlib/div.cpp index 199c2d6da64..9eb9e479b85 100644 --- a/sdk/lib/ucrt/stdlib/div.cpp +++ b/sdk/lib/ucrt/stdlib/div.cpp @@ -9,7 +9,7 @@ #include <stdlib.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(div) #endif extern "C" div_t __cdecl div(int const numerator, int const denominator) diff --git a/sdk/lib/ucrt/stdlib/ldiv.cpp b/sdk/lib/ucrt/stdlib/ldiv.cpp index e9d7bca0e3f..956503ad71d 100644 --- a/sdk/lib/ucrt/stdlib/ldiv.cpp +++ b/sdk/lib/ucrt/stdlib/ldiv.cpp @@ -9,7 +9,7 @@ #include <stdlib.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(ldiv) #endif extern "C" ldiv_t __cdecl ldiv(long const numerator, long const denominator) diff --git a/sdk/lib/ucrt/stdlib/lldiv.cpp b/sdk/lib/ucrt/stdlib/lldiv.cpp index c07838841d9..d3f40c30b41 100644 --- a/sdk/lib/ucrt/stdlib/lldiv.cpp +++ b/sdk/lib/ucrt/stdlib/lldiv.cpp @@ -9,7 +9,7 @@ #include <stdlib.h> -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER >= 1922) #pragma function(lldiv) #endif extern "C" lldiv_t __cdecl lldiv(long long const numerator, long long const denominator)

4 months, 2 weeks

[reactos] 01/01: [SHELL32] OpenWith should use dll path instead when the command starts with rundll32 (#7712)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1157f86f2766e2916147… commit a1157f86f2766e2916147965293bc532e70f66af Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Feb 15 14:27:51 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 15 14:27:51 2025 +0100 [SHELL32] OpenWith should use dll path instead when the command starts with rundll32 (#7712) CORE-16980 --- dll/win32/shell32/COpenWithMenu.cpp | 77 +++++++++++++++++++++++++------- dll/win32/shell32/dialogs/filedefext.cpp | 10 ++++- dll/win32/shell32/precomp.h | 1 + 3 files changed, 71 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 96a73dd822d..3e081de625b 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -31,6 +31,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); EXTERN_C BOOL PathIsExeW(LPCWSTR lpszPath); +static SIZE_T PathGetAppFromCommandLine(LPCWSTR pszIn, LPWSTR pszOut, SIZE_T cchMax) +{ + SIZE_T count = 0; + WCHAR stop = ' '; + if (pszIn[0] == '"') + stop = *(pszIn++); + + for (LPCWSTR pwszSrc = pszIn; *pwszSrc && *pwszSrc != stop; ++pwszSrc) + { + if (++count >= cchMax) + return 0; + *(pszOut++) = *pwszSrc; + } + *pszOut = UNICODE_NULL; + return count; +} + +HRESULT SHELL32_GetDllFromRundll32CommandLine(LPCWSTR pszCmd, LPWSTR pszOut, SIZE_T cchMax) +{ + WCHAR szDll[MAX_PATH + 100]; + if (!PathGetAppFromCommandLine(pszCmd, szDll, _countof(szDll))) + return HRESULT_FROM_WIN32(ERROR_BUFFER_OVERFLOW); + + PWSTR pszName = PathFindFileNameW(szDll); + if (_wcsicmp(pszName, L"rundll32") && _wcsicmp(pszName, L"rundll32.exe")) + return E_UNEXPECTED; + + PCWSTR pszDllStart = pszCmd + (pszName - szDll) + lstrlenW(pszName); + + if (*pszDllStart == '\"') + ++pszDllStart; // Skip possible end quote of ..\rundll32.exe" foo.dll,func + while (*pszDllStart <= ' ' && *pszDllStart) + ++pszDllStart; + if (PathGetAppFromCommandLine(pszDllStart, szDll, _countof(szDll))) + { + BOOL quoted = *pszDllStart == '\"'; + PWSTR pszComma = szDll + lstrlenW(szDll); + while (!quoted && pszComma > szDll && *pszComma != ',' && *pszComma != '\\' && *pszComma != '/') + --pszComma; + SIZE_T cch = pszComma - szDll; + if (cch <= cchMax && (quoted || *pszComma == ',')) + { + *pszComma = UNICODE_NULL; + lstrcpynW(pszOut, szDll, cchMax); + return S_OK; + } + } + return HRESULT_FROM_WIN32(ERROR_BUFFER_OVERFLOW); +} + class COpenWithList { public: @@ -396,26 +446,23 @@ BOOL COpenWithList::LoadInfo(COpenWithList::SApp *pApp) BOOL COpenWithList::GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd) { - WCHAR wszBuf[MAX_PATH], *pwszDest = wszBuf; + WCHAR wszBuf[MAX_PATH]; /* Remove arguments */ - if (pwszCmd[0] == '"') - { - for(LPCWSTR pwszSrc = pwszCmd + 1; *pwszSrc && *pwszSrc != '"'; ++pwszSrc) - *(pwszDest++) = *pwszSrc; - } - else - { - for(LPCWSTR pwszSrc = pwszCmd; *pwszSrc && *pwszSrc != ' '; ++pwszSrc) - *(pwszDest++) = *pwszSrc; - } + if (!PathGetAppFromCommandLine(pwszCmd, wszBuf, _countof(wszBuf))) + return FALSE; - *pwszDest = 0; + /* Replace rundll32.exe with the dll path */ + SHELL32_GetDllFromRundll32CommandLine(pwszCmd, wszBuf, _countof(wszBuf)); - /* Expand evn vers and optionally search for path */ + /* Expand env. vars and optionally search for path */ ExpandEnvironmentStrings(wszBuf, pwszAppPath, MAX_PATH); if (!PathFileExists(pwszAppPath)) - return SearchPath(NULL, pwszAppPath, NULL, MAX_PATH, pwszAppPath, NULL); + { + UINT cch = SearchPathW(NULL, pwszAppPath, NULL, MAX_PATH, pwszAppPath, NULL); + if (!cch || cch >= MAX_PATH) + return FALSE; + } return TRUE; } @@ -644,7 +691,7 @@ VOID COpenWithList::LoadRecommendedFromHKCU(LPCWSTR pwszExt) LoadMRUList(hKey); LoadProgIdList(hKey, pwszExt); - /* Handle "Aplication" value */ + /* Handle "Application" value */ DWORD cbBuf = sizeof(wszBuf); if (RegGetValueW(hKey, NULL, L"Application", RRF_RT_REG_SZ, NULL, wszBuf, &cbBuf) == ERROR_SUCCESS) { diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index e8beb7f936a..ce7f1dbe3f2 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -299,17 +299,23 @@ CFileDefExt::InitOpensWithField(HWND hwndDlg) BOOL bUnknownApp = TRUE; LPCWSTR pwszExt = PathFindExtensionW(m_wszPath); + // TODO: Use ASSOCSTR_EXECUTABLE with ASSOCF_REMAPRUNDLL | ASSOCF_IGNOREBASECLASS if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, L"", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) == ERROR_SUCCESS) { bUnknownApp = FALSE; StringCbCatW(wszBuf, sizeof(wszBuf), L"\\shell\\open\\command"); dwSize = sizeof(wszPath); + // FIXME: Missing FileExt check, see COpenWithList::SetDefaultHandler for details + // FIXME: Use HCR_GetDefaultVerbW to find the default verb if (RegGetValueW(HKEY_CLASSES_ROOT, wszBuf, L"", RRF_RT_REG_SZ, NULL, wszPath, &dwSize) == ERROR_SUCCESS) { /* Get path from command line */ ExpandEnvironmentStringsW(wszPath, wszBuf, _countof(wszBuf)); - PathRemoveArgs(wszBuf); - PathUnquoteSpacesW(wszBuf); + if (SHELL32_GetDllFromRundll32CommandLine(wszBuf, wszBuf, _countof(wszBuf)) != S_OK) + { + PathRemoveArgs(wszBuf); + PathUnquoteSpacesW(wszBuf); + } PathSearchAndQualify(wszBuf, wszPath, _countof(wszPath)); HICON hIcon; diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 267ed1d44c9..3a70cb606c8 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -293,6 +293,7 @@ BindCtx_RegisterObjectParam( BOOL PathIsDotOrDotDotW(_In_ LPCWSTR pszPath); BOOL PathIsValidElement(_In_ LPCWSTR pszPath); BOOL PathIsDosDevice(_In_ LPCWSTR pszName); +HRESULT SHELL32_GetDllFromRundll32CommandLine(LPCWSTR pszCmd, LPWSTR pszOut, SIZE_T cchMax); HRESULT SHILAppend(_Inout_ LPITEMIDLIST pidl, _Inout_ LPITEMIDLIST *ppidl); PIDLIST_ABSOLUTE SHELL_CIDA_ILCloneFull(_In_ const CIDA *pCIDA, _In_ UINT Index);

4 months, 2 weeks

[reactos] 01/01: [APPWIZ] Don't set the .lnk filename as the shortcut comment (#7720)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=396249d9e04adc3eb4898… commit 396249d9e04adc3eb4898778cc0b9d8c7e97a7af Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Feb 15 14:17:01 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 15 14:17:01 2025 +0100 [APPWIZ] Don't set the .lnk filename as the shortcut comment (#7720) --- dll/cpl/appwiz/createlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 768bdbcebd0..cfb3e820f31 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -489,6 +489,9 @@ FinishDlgProc(HWND hwndDlg, PathRemoveExtensionW(pContext->szLinkName); PathAddExtensionW(pContext->szLinkName, L".lnk"); + /* Don't set a comment */ + pContext->szDescription[0] = UNICODE_NULL; + if (!CreateShortcut(pContext)) { WCHAR szMessage[128];

4 months, 2 weeks

[reactos] 01/01: [WALLPAPERS] Retire using ugly filenames (#7716)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac175b23b77b833af7f45… commit ac175b23b77b833af7f4509269be0d4c4ac6c9eb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 15 20:58:09 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 15 20:58:09 2025 +0900 [WALLPAPERS] Retire using ugly filenames (#7716) JIRA issue: CORE-19989 - Rename wallpapers filenames. - Adapt CMakeLists.txt and ReadMe.txt to renaming. --- ...9.jpg => Angelus ReactOS Dark 16x9 1067x600.jpg} | Bin ...4-3.jpg => Angelus ReactOS Dark 4x3 800x600.jpg} | Bin modules/wallpapers/Angelus/ReactOS/CMakeLists.txt | 4 ++-- modules/wallpapers/Mizu/CMakeLists.txt | 8 ++++---- ...tOS_Mizu.png => ReactOS Mizu 16x9 1920x1080.png} | Bin ..._Mizu_4x3.png => ReactOS Mizu 4x3 1440x1080.png} | Bin ...16x9_A.png => ReactOS Mizu A 16x9 1920x1080.png} | Bin ...16x9_B.png => ReactOS Mizu B 16x9 1920x1080.png} | Bin modules/wallpapers/ReadMe.txt | 20 ++++++++++---------- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_16-9.jpg b/modules/wallpapers/Angelus/ReactOS/Angelus ReactOS Dark 16x9 1067x600.jpg similarity index 100% rename from modules/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_16-9.jpg rename to modules/wallpapers/Angelus/ReactOS/Angelus ReactOS Dark 16x9 1067x600.jpg diff --git a/modules/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_4-3.jpg b/modules/wallpapers/Angelus/ReactOS/Angelus ReactOS Dark 4x3 800x600.jpg similarity index 100% rename from modules/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_4-3.jpg rename to modules/wallpapers/Angelus/ReactOS/Angelus ReactOS Dark 4x3 800x600.jpg diff --git a/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt b/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt index ea729e2fd71..518a0ea5bc7 100644 --- a/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt +++ b/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt @@ -1,2 +1,2 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Dark_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Dark_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Angelus ReactOS Dark 16x9 1067x600.jpg" DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Angelus ReactOS Dark 4x3 800x600.jpg" DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Mizu/CMakeLists.txt b/modules/wallpapers/Mizu/CMakeLists.txt index 1dcff54b296..2931961ed2a 100644 --- a/modules/wallpapers/Mizu/CMakeLists.txt +++ b/modules/wallpapers/Mizu/CMakeLists.txt @@ -1,4 +1,4 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu.png DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_4x3.png DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_16x9_A.png DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_16x9_B.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReactOS Mizu 16x9 1920x1080.png" DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReactOS Mizu 4x3 1440x1080.png" DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReactOS Mizu A 16x9 1920x1080.png" DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReactOS Mizu B 16x9 1920x1080.png" DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Mizu/ReactOS_Mizu.png b/modules/wallpapers/Mizu/ReactOS Mizu 16x9 1920x1080.png similarity index 100% rename from modules/wallpapers/Mizu/ReactOS_Mizu.png rename to modules/wallpapers/Mizu/ReactOS Mizu 16x9 1920x1080.png diff --git a/modules/wallpapers/Mizu/ReactOS_Mizu_4x3.png b/modules/wallpapers/Mizu/ReactOS Mizu 4x3 1440x1080.png similarity index 100% rename from modules/wallpapers/Mizu/ReactOS_Mizu_4x3.png rename to modules/wallpapers/Mizu/ReactOS Mizu 4x3 1440x1080.png diff --git a/modules/wallpapers/Mizu/ReactOS_Mizu_16x9_A.png b/modules/wallpapers/Mizu/ReactOS Mizu A 16x9 1920x1080.png similarity index 100% rename from modules/wallpapers/Mizu/ReactOS_Mizu_16x9_A.png rename to modules/wallpapers/Mizu/ReactOS Mizu A 16x9 1920x1080.png diff --git a/modules/wallpapers/Mizu/ReactOS_Mizu_16x9_B.png b/modules/wallpapers/Mizu/ReactOS Mizu B 16x9 1920x1080.png similarity index 100% rename from modules/wallpapers/Mizu/ReactOS_Mizu_16x9_B.png rename to modules/wallpapers/Mizu/ReactOS Mizu B 16x9 1920x1080.png diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index 6ad4db51863..ce75cb7cf4e 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -1,16 +1,16 @@ Wallpapers =========== -|-------------------------------|-----------------------------------------------|--------------------------------------------------------| -|Filename | Author | Origin | -|-------------------------------|-----------------------------------------------|--------------------------------------------------------| -|Angelus.ReactOS7.Dark_4-3.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | https://reactos.org/forum/viewtopic.php?p=50543#p50543 | -|Angelus.ReactOS7.Dark_16-9.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | https://reactos.org/forum/viewtopic.php?p=50543#p50543 | -|ReactOS_Mizu.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | -|ReactOS_Mizu_4x3.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | -|ReactOS_Mizu_16x9_A.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | -|ReactOS_Mizu_16x9_B.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | -|-------------------------------|-----------------------------------------------|--------------------------------------------------------| +|--------------------------------|-----------------------------------------------|--------------------------------------------------------| +|Filename | Author | Origin | +|--------------------------------|-----------------------------------------------|--------------------------------------------------------| +|"Angelus ReactOS Dark 4x3.jpg" | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | https://reactos.org/forum/viewtopic.php?p=50543#p50543 | +|"Angelus ReactOS Dark 16x9.jpg" | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | https://reactos.org/forum/viewtopic.php?p=50543#p50543 | +|"ReactOS Mizu.png" | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | +|"ReactOS Mizu 4x3.png" | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | +|"ReactOS Mizu 16x9 A.png" | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | +|"ReactOS Mizu 16x9 B.png" | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 | +|--------------------------------|-----------------------------------------------|--------------------------------------------------------| You can also download the other wallpapers from the "ReactOS Standard Wallpapers" package in the ReactOS Applications Manager.

4 months, 2 weeks

[reactos] 01/01: [SHIMGVW] Display shell context menu for the image on right-click (#7711)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc52d5f1f4591dc5b1569… commit bc52d5f1f4591dc5b15698cccb59b379539aaadf Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Feb 13 13:13:02 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 13 13:13:02 2025 +0100 [SHIMGVW] Display shell context menu for the image on right-click (#7711) CORE-13340 --- dll/win32/shimgvw/CMakeLists.txt | 1 + dll/win32/shimgvw/loader.cpp | 18 ++--- dll/win32/shimgvw/shimgvw.c | 23 ++++-- dll/win32/shimgvw/shimgvw.h | 5 ++ dll/win32/shimgvw/util.c | 158 +++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/shellutils.h | 12 +-- 6 files changed, 198 insertions(+), 19 deletions(-) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 15983aff150..b9b55c42233 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE shimgvw.c comsup.c shimgvw.rc + util.c ${CMAKE_CURRENT_BINARY_DIR}/shimgvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) diff --git a/dll/win32/shimgvw/loader.cpp b/dll/win32/shimgvw/loader.cpp index 50112f6c486..bde8b12ac13 100644 --- a/dll/win32/shimgvw/loader.cpp +++ b/dll/win32/shimgvw/loader.cpp @@ -21,7 +21,7 @@ static HRESULT Read(HANDLE hFile, void* Buffer, DWORD Size) return Size == Transferred ? S_OK : HResultFromWin32(ERROR_HANDLE_EOF); } -struct IMAGEINFO +struct IMAGESTATS { UINT w, h; BYTE bpp; @@ -91,7 +91,7 @@ static BYTE GetPngBppFromIHDRData(const void* buffer) return (depth <= 16 && type <= 6) ? channels[type] * depth : 0; } -static bool GetInfoFromPng(const void* file, SIZE_T size, IMAGEINFO& info) +static bool GetInfoFromPng(const void* file, SIZE_T size, IMAGESTATS& info) { C_ASSERT(sizeof(PNGSIGNATURE) == 8); C_ASSERT(sizeof(PNGSIGANDIHDR) == 8 + (4 + 4 + (4 + 4 + 5) + 4)); @@ -111,7 +111,7 @@ static bool GetInfoFromPng(const void* file, SIZE_T size, IMAGEINFO& info) return false; } -static bool GetInfoFromBmp(const void* pBitmapInfo, IMAGEINFO& info) +static bool GetInfoFromBmp(const void* pBitmapInfo, IMAGESTATS& info) { BitmapInfoHeader bih(pBitmapInfo); info.w = bih.biWidth; @@ -121,11 +121,11 @@ static bool GetInfoFromBmp(const void* pBitmapInfo, IMAGEINFO& info) return info.w && bpp == info.bpp; } -static bool GetInfoFromIcoBmp(const void* pBitmapInfo, IMAGEINFO& stat) +static bool GetInfoFromIcoBmp(const void* pBitmapInfo, IMAGESTATS& info) { - bool ret = GetInfoFromBmp(pBitmapInfo, stat); - stat.h /= 2; // Don't include mask - return ret && stat.h; + bool ret = GetInfoFromBmp(pBitmapInfo, info); + info.h /= 2; // Don't include mask + return ret && info.h; } EXTERN_C PCWSTR GetExtraExtensionsGdipList(VOID) @@ -158,7 +158,7 @@ static void OverrideFileContent(HGLOBAL& hMem, DWORD& Size) for (UINT i = 0; i < count; ++i) { BOOL valid = FALSE; - IMAGEINFO info; + IMAGESTATS info; const BYTE* data = buffer + entries[i].offset; if (IsPngSignature(data, entries[i].size)) valid = GetInfoFromPng(data, entries[i].size, info); @@ -189,7 +189,7 @@ static void OverrideFileContent(HGLOBAL& hMem, DWORD& Size) const BYTE* data = buffer + entries[i].offset; if (IsPngSignature(data, entries[i].size)) { - IMAGEINFO info; + IMAGESTATS info; if (!GetInfoFromPng(data, entries[i].size, info)) continue; bih.biPlanes = 1; diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 7284266b94a..ba8dd000e81 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -1190,7 +1190,7 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_RBUTTONUP: { ZoomWnd_OnButtonUp(hwnd, uMsg, wParam, lParam); - break; + goto doDefault; } case WM_LBUTTONDBLCLK: { @@ -1209,6 +1209,10 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); break; } + case WM_CONTEXTMENU: + if (Preview_IsMainWnd(pData->m_hwnd)) + DoShellContextMenuOnFile(hwnd, pData->m_szFile, lParam); + break; case WM_HSCROLL: case WM_VSCROLL: ZoomWnd_OnHVScroll(pData, hwnd, wParam, uMsg == WM_VSCROLL); @@ -1230,7 +1234,7 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; } - default: + default: doDefault: { return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -1429,9 +1433,7 @@ Preview_ToggleSlideShowEx(PPREVIEW_DATA pData, BOOL StartTimer) if (IsWindowVisible(g_hwndFullscreen)) { - KillTimer(g_hwndFullscreen, SLIDESHOW_TIMER_ID); - ShowWindow(g_hMainWnd, SW_SHOW); - ShowWindow(g_hwndFullscreen, SW_HIDE); + Preview_EndSlideShow(g_hwndFullscreen); } else { @@ -1577,6 +1579,10 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) Preview_Edit(hwnd); break; + case IDC_HELP_TOC: + DisplayHelp(hwnd); + break; + default: break; } @@ -1693,6 +1699,13 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnDestroy(hwnd); break; } + case WM_CONTEXTMENU: + { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + if ((int)lParam == -1) + return ZoomWndProc(pData->m_hwndZoom, uMsg, wParam, lParam); + break; + } case WM_TIMER: { if (wParam == SLIDESHOW_TIMER_ID) diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index c17a15bb8f2..279d08cd244 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -12,6 +12,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H #define INITGUID +#define COBJMACROS #include <windef.h> #include <winbase.h> @@ -23,6 +24,7 @@ #include <gdiplus.h> #include <shlwapi.h> #include <strsafe.h> +#include <shobjidl.h> #include <debug.h> @@ -69,6 +71,9 @@ void Anime_Start(PANIME pAnime, DWORD dwDelay); void Anime_Pause(PANIME pAnime); BOOL Anime_OnTimer(PANIME pAnime, WPARAM wParam); +void DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam); +void DisplayHelp(HWND hwnd); + static inline LPVOID QuickAlloc(SIZE_T cbSize, BOOL bZero) { return HeapAlloc(GetProcessHeap(), (bZero ? HEAP_ZERO_MEMORY : 0), cbSize); diff --git a/dll/win32/shimgvw/util.c b/dll/win32/shimgvw/util.c new file mode 100644 index 00000000000..290ad083fad --- /dev/null +++ b/dll/win32/shimgvw/util.c @@ -0,0 +1,158 @@ +/* + * PROJECT: ReactOS Picture and Fax Viewer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Utility routines + * COPYRIGHT: Copyright 2025 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#include "shimgvw.h" +#include <windowsx.h> +#include <shlobj.h> +#include <shellapi.h> +#include <shellutils.h> +#include <shlwapi_undoc.h> + +IContextMenu *g_pContextMenu = NULL; + +static int +GetMenuItemIdByPos(HMENU hMenu, UINT Pos) +{ + MENUITEMINFOW mii; + mii.cbSize = FIELD_OFFSET(MENUITEMINFOW, hbmpItem); /* USER32 version agnostic */ + mii.fMask = MIIM_ID; + mii.cch = 0; + return GetMenuItemInfoW(hMenu, Pos, TRUE, &mii) ? mii.wID : -1; +} + +static BOOL +IsMenuSeparator(HMENU hMenu, UINT Pos) +{ + MENUITEMINFOW mii; + mii.cbSize = FIELD_OFFSET(MENUITEMINFOW, hbmpItem); /* USER32 version agnostic */ + mii.fMask = MIIM_FTYPE; + mii.cch = 0; + return GetMenuItemInfoW(hMenu, Pos, TRUE, &mii) && (mii.fType & MFT_SEPARATOR); +} + +static BOOL +IsSelfShellVerb(PCWSTR Assoc, PCWSTR Verb) +{ + WCHAR buf[MAX_PATH * 3]; + DWORD cch = _countof(buf); + HRESULT hr = AssocQueryStringW(ASSOCF_NOTRUNCATE, ASSOCSTR_COMMAND, Assoc, Verb, buf, &cch); + return hr == S_OK && *Assoc == L'.' && StrStrW(buf, L",ImageView_Fullscreen"); +} + +static void +ModifyShellContextMenu(IContextMenu *pCM, HMENU hMenu, UINT CmdIdFirst, PCWSTR Assoc) +{ + HRESULT hr; + UINT id, i; + for (i = 0; i < GetMenuItemCount(hMenu); ++i) + { + WCHAR buf[200]; + id = GetMenuItemIdByPos(hMenu, i); + if (id == (UINT)-1) + continue; + + *buf = UNICODE_NULL; + /* Note: We just ask for the wide string because all the items we care about come from shell32 and it handles both */ + hr = IContextMenu_GetCommandString(pCM, id - CmdIdFirst, GCS_VERBW, NULL, (char*)buf, _countof(buf)); + if (SUCCEEDED(hr)) + { + UINT remove = FALSE; + if (IsSelfShellVerb(Assoc, buf)) + ++remove; + else if (!lstrcmpiW(L"cut", buf) || !lstrcmpiW(L"copy", buf) || !lstrcmpiW(L"link", buf)) + ++remove; + + if (remove && DeleteMenu(hMenu, i, MF_BYPOSITION)) + { + if (i-- > 0) + { + if (IsMenuSeparator(hMenu, i) && IsMenuSeparator(hMenu, i + 1)) + DeleteMenu(hMenu, i, MF_BYPOSITION); + } + } + } + } + + while (IsMenuSeparator(hMenu, 0) && DeleteMenu(hMenu, 0, MF_BYPOSITION)) {} +} + +static LRESULT CALLBACK +ShellContextMenuWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LRESULT lRes = 0; + if (FAILED(SHForwardContextMenuMsg((IUnknown*)g_pContextMenu, uMsg, wParam, lParam, &lRes, TRUE))) + lRes = DefWindowProc(hwnd, uMsg, wParam, lParam); + return lRes; +} + +static void +DoShellContextMenu(HWND hwnd, IContextMenu *pCM, PCWSTR File, LPARAM lParam) +{ + enum { first = 1, last = 0x7fff }; + HRESULT hr; + HMENU hMenu = CreatePopupMenu(); + UINT cmf = GetKeyState(VK_SHIFT) < 0 ? CMF_EXTENDEDVERBS : 0; + + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + if ((int)lParam == -1) + { + RECT rect; + GetWindowRect(hwnd, &rect); + pt.x = (rect.left + rect.right) / 2; + pt.y = rect.top; + } + + g_pContextMenu = pCM; + hwnd = SHCreateWorkerWindowW(ShellContextMenuWindowProc, hwnd, 0, WS_VISIBLE | WS_CHILD, NULL, 0); + if (!hwnd) + goto die; + hr = IContextMenu_QueryContextMenu(pCM, hMenu, 0, first, last, cmf | CMF_NODEFAULT); + if (SUCCEEDED(hr)) + { + UINT id; + ModifyShellContextMenu(pCM, hMenu, first, PathFindExtensionW(File)); + id = TrackPopupMenuEx(hMenu, TPM_RETURNCMD, pt.x, pt.y, hwnd, NULL); + if (id) + { + UINT flags = (GetKeyState(VK_SHIFT) < 0 ? CMIC_MASK_SHIFT_DOWN : 0) | + (GetKeyState(VK_CONTROL) < 0 ? CMIC_MASK_CONTROL_DOWN : 0); + CMINVOKECOMMANDINFO ici = { sizeof(ici), flags, hwnd, MAKEINTRESOURCEA(id - first) }; + ici.nShow = SW_SHOW; + hr = IContextMenu_InvokeCommand(pCM, &ici); + } + } + DestroyWindow(hwnd); +die: + DestroyMenu(hMenu); + g_pContextMenu = NULL; +} + +void +DoShellContextMenuOnFile(HWND hwnd, PCWSTR File, LPARAM lParam) +{ + HRESULT hr; + IShellFolder *pSF; + PCUITEMID_CHILD pidlItem; + PIDLIST_ABSOLUTE pidl = ILCreateFromPath(File); + if (pidl && SUCCEEDED(SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &pSF), &pidlItem))) + { + IContextMenu *pCM; + hr = IShellFolder_GetUIObjectOf(pSF, hwnd, 1, &pidlItem, &IID_IContextMenu, NULL, (void**)&pCM); + if (SUCCEEDED(hr)) + { + DoShellContextMenu(hwnd, pCM, File, lParam); + IContextMenu_Release(pCM); + } + IShellFolder_Release(pSF); + } + SHFree(pidl); +} + +void DisplayHelp(HWND hwnd) +{ + SHELL_ErrorBox(hwnd, ERROR_NOT_SUPPORTED); +} diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 756c57c9d73..c45b6ad8770 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -23,7 +23,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -inline ULONG +static inline ULONG Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) { char szMsg[512]; @@ -63,11 +63,11 @@ Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) # define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) # define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) #else -# define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) -# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, (void**)(ppType) +# define IID_PPV_ARG(Itype, ppType) &IID_##Itype, (void**)(ppType) +# define IID_NULL_PPV_ARG(Itype, ppType) &IID_##Itype, NULL, (void**)(ppType) #endif -inline HRESULT HResultFromWin32(DWORD hr) +static inline HRESULT HResultFromWin32(DWORD hr) { // HRESULT_FROM_WIN32 will evaluate its parameter twice, this function will not. return HRESULT_FROM_WIN32(hr); @@ -75,7 +75,7 @@ inline HRESULT HResultFromWin32(DWORD hr) #if 1 -inline BOOL _ROS_FAILED_HELPER(HRESULT hr, const char* expr, const char* filename, int line) +static inline BOOL _ROS_FAILED_HELPER(HRESULT hr, const char* expr, const char* filename, int line) { if (FAILED(hr)) { @@ -122,6 +122,8 @@ SHELL_ErrorBox(H hwndOwner, UINT Error = GetLastError()) { return SHELL_ErrorBoxHelper(const_cast<HWND>(hwndOwner), Error); } +#else +#define SHELL_ErrorBox SHELL_ErrorBoxHelper #endif #ifdef __cplusplus

4 months, 2 weeks

[reactos] 01/01: [SHIMGVW] Choose a better icon image and also support .cur files (#7706)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=329a41458416f633fb6ec… commit 329a41458416f633fb6ec016dc434b063cd92b9b Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Feb 12 20:57:51 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 12 20:57:51 2025 +0100 [SHIMGVW] Choose a better icon image and also support .cur files (#7706) - Choose an icon image based on size and color and place it first so GDI+ will pick it - Change .cur files to .ico so GDI+ can open it CORE-19945 --- dll/win32/shimgvw/CMakeLists.txt | 1 + dll/win32/shimgvw/loader.cpp | 283 +++++++++++++++++++++++++++++++++++++++ dll/win32/shimgvw/shimgvw.c | 81 ++++------- dll/win32/shimgvw/shimgvw.h | 43 ++++++ 4 files changed, 350 insertions(+), 58 deletions(-) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 1a4589abd43..15983aff150 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(shimgvw.dll shimgvw.spec) list(APPEND SOURCE anime.c + loader.cpp shimgvw.c comsup.c shimgvw.rc diff --git a/dll/win32/shimgvw/loader.cpp b/dll/win32/shimgvw/loader.cpp new file mode 100644 index 00000000000..50112f6c486 --- /dev/null +++ b/dll/win32/shimgvw/loader.cpp @@ -0,0 +1,283 @@ +/* + * PROJECT: ReactOS Picture and Fax Viewer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Image file browsing and manipulation + * COPYRIGHT: Copyright 2025 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#include <windows.h> +#include <objbase.h> +#include <gdiplus.h> +using namespace Gdiplus; +#include "shimgvw.h" + +#define HResultFromWin32 SHIMGVW_HResultFromWin32 + +static HRESULT Read(HANDLE hFile, void* Buffer, DWORD Size) +{ + DWORD Transferred; + if (!ReadFile(hFile, Buffer, Size, &Transferred, NULL)) + return HResultFromWin32(GetLastError()); + return Size == Transferred ? S_OK : HResultFromWin32(ERROR_HANDLE_EOF); +} + +struct IMAGEINFO +{ + UINT w, h; + BYTE bpp; +}; + +class BitmapInfoHeader : public BITMAPINFOHEADER +{ +public: + BitmapInfoHeader() {} + BitmapInfoHeader(const void* pbmiHeader) { Initialize(pbmiHeader); } + + void Initialize(const void* pbmiHeader) + { + BITMAPINFOHEADER& bih = *(BITMAPINFOHEADER*)pbmiHeader; + if (bih.biSize >= sizeof(BITMAPINFOHEADER)) + { + CopyMemory(this, &bih, min(bih.biSize, sizeof(*this))); + } + else + { + ZeroMemory(this, sizeof(*this)); + BITMAPCOREHEADER& bch = *(BITMAPCOREHEADER*)pbmiHeader; + if (bih.biSize >= sizeof(BITMAPCOREHEADER)) + { + biSize = bch.bcSize; + biWidth = bch.bcWidth; + biHeight = bch.bcHeight; + biPlanes = bch.bcPlanes; + biBitCount = bch.bcBitCount; + biCompression = BI_RGB; + } + } + } +}; + +#include <pshpack1.h> +union PNGSIGNATURE { UINT64 number; BYTE bytes[8]; }; +struct PNGCHUNKHEADER { UINT length, type; }; +struct PNGCHUNKFOOTER { UINT crc; }; +struct PNGIHDR { UINT w, h; BYTE depth, type, compression, filter, interlace; }; +struct PNGSIGANDIHDR +{ + PNGSIGNATURE sig; + PNGCHUNKHEADER chunkheader; + PNGIHDR ihdr; + PNGCHUNKFOOTER chunkfooter; +}; +struct PNGFOOTER { PNGCHUNKHEADER chunkheader; PNGCHUNKFOOTER footer; }; +#include <poppack.h> + +static inline bool IsPngSignature(const void* buffer) +{ + const BYTE* p = (BYTE*)buffer; + return p[0] == 0x89 && p[1] == 'P' && p[2] == 'N' && p[3] == 'G' && + p[4] == 0x0D && p[5] == 0x0A && p[6] == 0x1A && p[7] == 0x0A; +} + +static inline bool IsPngSignature(const void* buffer, SIZE_T size) +{ + return size >= sizeof(PNGSIGNATURE) && IsPngSignature(buffer); +} + +static BYTE GetPngBppFromIHDRData(const void* buffer) +{ + static const BYTE channels[] = { 1, 0, 3, 1, 2, 0, 4 }; + const BYTE* p = (BYTE*)buffer, depth = p[8], type = p[8 + 1]; + return (depth <= 16 && type <= 6) ? channels[type] * depth : 0; +} + +static bool GetInfoFromPng(const void* file, SIZE_T size, IMAGEINFO& info) +{ + C_ASSERT(sizeof(PNGSIGNATURE) == 8); + C_ASSERT(sizeof(PNGSIGANDIHDR) == 8 + (4 + 4 + (4 + 4 + 5) + 4)); + + if (size > sizeof(PNGSIGANDIHDR) + sizeof(PNGFOOTER) && IsPngSignature(file)) + { + const UINT PNGIHDRSIG = 0x52444849; // Note: Big endian + const UINT* chunkhdr = (UINT*)((char*)file + sizeof(PNGSIGNATURE)); + if (BigToHost32(chunkhdr[0]) >= sizeof(PNGIHDR) && chunkhdr[1] == PNGIHDRSIG) + { + info.w = BigToHost32(chunkhdr[2]); + info.h = BigToHost32(chunkhdr[3]); + info.bpp = GetPngBppFromIHDRData(&chunkhdr[2]); + return info.bpp != 0; + } + } + return false; +} + +static bool GetInfoFromBmp(const void* pBitmapInfo, IMAGEINFO& info) +{ + BitmapInfoHeader bih(pBitmapInfo); + info.w = bih.biWidth; + info.h = abs((int)bih.biHeight); + UINT bpp = bih.biBitCount * bih.biPlanes; + info.bpp = LOBYTE(bpp); + return info.w && bpp == info.bpp; +} + +static bool GetInfoFromIcoBmp(const void* pBitmapInfo, IMAGEINFO& stat) +{ + bool ret = GetInfoFromBmp(pBitmapInfo, stat); + stat.h /= 2; // Don't include mask + return ret && stat.h; +} + +EXTERN_C PCWSTR GetExtraExtensionsGdipList(VOID) +{ + return L"*.CUR"; // "*.FOO;*.BAR" etc. +} + +static void OverrideFileContent(HGLOBAL& hMem, DWORD& Size) +{ + PBYTE buffer = (PBYTE)GlobalLock(hMem); + if (!buffer) + return; + + // TODO: We could try to load an ICO/PNG/BMP resource from a PE file here into buffer + + // ICO/CUR + struct ICOHDR { WORD Sig, Type, Count; }; + ICOHDR* pIcoHdr = (ICOHDR*)buffer; + if (Size > sizeof(ICOHDR) && !pIcoHdr->Sig && pIcoHdr->Type > 0 && pIcoHdr->Type < 3 && pIcoHdr->Count) + { + const UINT minbmp = sizeof(BITMAPCOREHEADER) + 1, minpng = sizeof(PNGSIGANDIHDR); + const UINT minfile = min(minbmp, minpng), count = pIcoHdr->Count; + struct ICOENTRY { BYTE w, h, pal, null; WORD planes, bpp; UINT size, offset; }; + ICOENTRY* entries = (ICOENTRY*)&pIcoHdr[1]; + if (Size - sizeof(ICOHDR) > (sizeof(ICOENTRY) + minfile) * count) + { + UINT64 best = 0; + int bestindex = -1; + // Inspect all the images and find the "best" image + for (UINT i = 0; i < count; ++i) + { + BOOL valid = FALSE; + IMAGEINFO info; + const BYTE* data = buffer + entries[i].offset; + if (IsPngSignature(data, entries[i].size)) + valid = GetInfoFromPng(data, entries[i].size, info); + else + valid = GetInfoFromIcoBmp(data, info); + + if (valid) + { + // Note: This treats bpp as more important compared to LookupIconIdFromDirectoryEx + UINT64 score = UINT64(info.w) * info.h * info.bpp; + if (score > best) + { + best = score; + bestindex = i; + } + } + } + if (bestindex >= 0) + { + if (pIcoHdr->Type == 2) + { + // GDI+ does not support .cur files, convert to .ico + pIcoHdr->Type = 1; +#if 0 // Because we are already overriding the order, we don't need to correct the ICOENTRY lookup info + for (UINT i = 0; i < count; ++i) + { + BitmapInfoHeader bih; + const BYTE* data = buffer + entries[i].offset; + if (IsPngSignature(data, entries[i].size)) + { + IMAGEINFO info; + if (!GetInfoFromPng(data, entries[i].size, info)) + continue; + bih.biPlanes = 1; + bih.biBitCount = info.bpp; + entries[i].pal = 0; + } + else + { + bih.Initialize(data); + entries[i].pal = bih.biPlanes * bih.biBitCount <= 8 ? bih.biClrUsed : 0; + } + entries[i].planes = (WORD)bih.biPlanes; + entries[i].bpp = (WORD)bih.biBitCount; + } +#endif + } +#if 0 + // Convert to a .ico with a single image + pIcoHdr->Count = 1; + const BYTE* data = buffer + entries[bestindex].offset; + entries[0] = entries[bestindex]; + entries[0].offset = (UINT)UINT_PTR((PBYTE)&entries[1] - buffer); + MoveMemory(buffer + entries[0].offset, data, entries[0].size); + Size = entries[0].offset + entries[0].size; +#else + // Place the best image first, GDI+ will return the first image + ICOENTRY temp = entries[0]; + entries[0] = entries[bestindex]; + entries[bestindex] = temp; +#endif + } + } + } + + GlobalUnlock(hMem); +} + +static HRESULT LoadImageFromStream(IStream* pStream, GpImage** ppImage) +{ + Status status = DllExports::GdipLoadImageFromStream(pStream, ppImage); + return HResultFromGdiplus(status); +} + +static HRESULT LoadImageFromFileHandle(HANDLE hFile, GpImage** ppImage) +{ + DWORD size = GetFileSize(hFile, NULL); + if (!size || size == INVALID_FILE_SIZE) + return HResultFromWin32(ERROR_NOT_SUPPORTED); + + HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, size); + if (!hMem) + return HResultFromWin32(ERROR_OUTOFMEMORY); + HRESULT hr = E_FAIL; + void* buffer = GlobalLock(hMem); + if (buffer) + { + hr = Read(hFile, buffer, size); + GlobalUnlock(hMem); + if (SUCCEEDED(hr)) + { + OverrideFileContent(hMem, size); + IStream* pStream; + if (SUCCEEDED(hr = CreateStreamOnHGlobal(hMem, TRUE, &pStream))) + { + // CreateStreamOnHGlobal does not know the real size, we do + pStream->SetSize(MakeULargeInteger(size)); + hr = LoadImageFromStream(pStream, ppImage); + pStream->Release(); // Calls GlobalFree + return hr; + } + } + } + GlobalFree(hMem); + return hr; +} + +EXTERN_C HRESULT LoadImageFromPath(LPCWSTR Path, GpImage** ppImage) +{ + // NOTE: GdipLoadImageFromFile locks the file. + // Avoid file locking by using GdipLoadImageFromStream and memory stream. + + HANDLE hFile = CreateFileW(Path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + HRESULT hr = LoadImageFromFileHandle(hFile, ppImage); + CloseHandle(hFile); + return hr; + } + return HResultFromWin32(GetLastError()); +} diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index c0ce4de2d39..7284266b94a 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -4,6 +4,7 @@ * PURPOSE: Image file browsing and manipulation * COPYRIGHT: Copyright Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2018-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * Copyright 2025 Whindmar Saksit <whindsaks(a)proton.me> */ #include "shimgvw.h" @@ -13,6 +14,9 @@ #include <shlobj.h> #include <shellapi.h> +EXTERN_C PCWSTR GetExtraExtensionsGdipList(VOID); +EXTERN_C HRESULT LoadImageFromPath(LPCWSTR Path, GpImage** ppImage); + /* Toolbar image size */ #define TB_IMAGE_WIDTH 16 #define TB_IMAGE_HEIGHT 16 @@ -114,7 +118,6 @@ typedef struct tagPREVIEW_DATA UINT m_nTimerInterval; BOOL m_bHideCursor; POINT m_ptOrigin; - IStream *m_pMemStream; WCHAR m_szFile[MAX_PATH]; } PREVIEW_DATA, *PPREVIEW_DATA; @@ -371,67 +374,20 @@ Preview_pFreeImage(PPREVIEW_DATA pData) g_pImage = NULL; } - if (pData->m_pMemStream) - { - pData->m_pMemStream->lpVtbl->Release(pData->m_pMemStream); - pData->m_pMemStream = NULL; - } - pData->m_szFile[0] = UNICODE_NULL; } -IStream* MemStreamFromFile(LPCWSTR pszFileName) -{ - HANDLE hFile; - DWORD dwFileSize, dwRead; - LPBYTE pbMemFile = NULL; - IStream *pStream; - - hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return NULL; - - dwFileSize = GetFileSize(hFile, NULL); - pbMemFile = QuickAlloc(dwFileSize, FALSE); - if (!dwFileSize || (dwFileSize == INVALID_FILE_SIZE) || !pbMemFile) - { - CloseHandle(hFile); - return NULL; - } - - if (!ReadFile(hFile, pbMemFile, dwFileSize, &dwRead, NULL) || (dwRead != dwFileSize)) - { - QuickFree(pbMemFile); - CloseHandle(hFile); - return NULL; - } - - CloseHandle(hFile); - pStream = SHCreateMemStream(pbMemFile, dwFileSize); - QuickFree(pbMemFile); - return pStream; -} - static VOID Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) { + HRESULT hr; Preview_pFreeImage(pData); + InvalidateRect(pData->m_hwnd, NULL, FALSE); /* Schedule redraw in case we change to "No preview" */ - pData->m_pMemStream = MemStreamFromFile(szOpenFileName); - if (!pData->m_pMemStream) - { - DPRINT1("MemStreamFromFile() failed\n"); - Preview_UpdateTitle(pData, NULL); - return; - } - - /* NOTE: GdipLoadImageFromFile locks the file. - Avoid file locking by using GdipLoadImageFromStream and memory stream. */ - GdipLoadImageFromStream(pData->m_pMemStream, &g_pImage); - if (!g_pImage) + hr = LoadImageFromPath(szOpenFileName, &g_pImage); + if (FAILED(hr)) { - DPRINT1("GdipLoadImageFromStream() failed\n"); + DPRINT1("GdipLoadImageFromStream() failed, %d\n", hr); Preview_pFreeImage(pData); Preview_UpdateTitle(pData, NULL); return; @@ -439,8 +395,8 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) Anime_LoadInfo(&pData->m_Anime); - SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); GetFullPathNameW(szOpenFileName, _countof(pData->m_szFile), pData->m_szFile, NULL); + SHAddToRecentDocs(SHARD_PATHW, pData->m_szFile); /* Reset zoom and redraw display */ Preview_ResetZoom(pData); @@ -625,7 +581,7 @@ static SHIMGVW_FILENODE* pBuildFileList(LPCWSTR szFirstFile) { HANDLE hFindHandle; - WCHAR *extension; + WCHAR *extension, *buffer; WCHAR szSearchPath[MAX_PATH]; WCHAR szSearchMask[MAX_PATH]; WCHAR szFileTypes[MAX_PATH]; @@ -634,15 +590,19 @@ pBuildFileList(LPCWSTR szFirstFile) SHIMGVW_FILENODE *root = NULL; SHIMGVW_FILENODE *conductor = NULL; ImageCodecInfo *codecInfo; - UINT num; - UINT size; + UINT num = 0, size = 0, ExtraSize = 0; UINT j; + const PCWSTR ExtraExtensions = GetExtraExtensionsGdipList(); + const UINT ExtraCount = ExtraExtensions[0] ? 1 : 0; + if (ExtraCount) + ExtraSize += sizeof(*codecInfo) + (wcslen(ExtraExtensions) + 1) * sizeof(WCHAR); + StringCbCopyW(szSearchPath, sizeof(szSearchPath), szFirstFile); PathRemoveFileSpecW(szSearchPath); GdipGetImageDecodersSize(&num, &size); - codecInfo = QuickAlloc(size, FALSE); + codecInfo = QuickAlloc(size + ExtraSize, FALSE); if (!codecInfo) { DPRINT1("QuickAlloc() failed in pLoadFileList()\n"); @@ -650,6 +610,10 @@ pBuildFileList(LPCWSTR szFirstFile) } GdipGetImageDecoders(num, size, codecInfo); + buffer = (PWSTR)((UINT_PTR)codecInfo + size + (sizeof(*codecInfo) * ExtraCount)); + if (ExtraCount) + codecInfo[num].FilenameExtension = wcscpy(buffer, ExtraExtensions); + num += ExtraCount; root = QuickAlloc(sizeof(SHIMGVW_FILENODE), FALSE); if (!root) @@ -663,6 +627,7 @@ pBuildFileList(LPCWSTR szFirstFile) for (j = 0; j < num; ++j) { + // FIXME: Parse each FilenameExtension list to bypass szFileTypes limit StringCbCopyW(szFileTypes, sizeof(szFileTypes), codecInfo[j].FilenameExtension); extension = wcstok(szFileTypes, L";"); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 776da7f849c..c17a15bb8f2 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -78,3 +78,46 @@ static inline VOID QuickFree(LPVOID ptr) { HeapFree(GetProcessHeap(), 0, ptr); } + +static inline WORD Swap16(WORD v) +{ + return MAKEWORD(HIBYTE(v), LOBYTE(v)); +} + +static inline UINT Swap32(UINT v) +{ + return MAKELONG(Swap16(HIWORD(v)), Swap16(LOWORD(v))); +} + +#ifdef _WIN32 +#define BigToHost32 Swap32 +#endif + +static inline ULARGE_INTEGER MakeULargeInteger(UINT64 value) +{ + ULARGE_INTEGER ret; + ret.QuadPart = value; + return ret; +} + +static inline HRESULT SHIMGVW_HResultFromWin32(DWORD hr) +{ + // HRESULT_FROM_WIN32 will evaluate its parameter twice, this function will not. + return HRESULT_FROM_WIN32(hr); +} + +static inline HRESULT HResultFromGdiplus(Status status) +{ + switch ((UINT)status) + { + case Ok: return S_OK; + case InvalidParameter: return E_INVALIDARG; + case OutOfMemory: return E_OUTOFMEMORY; + case NotImplemented: return HRESULT_FROM_WIN32(ERROR_CALL_NOT_IMPLEMENTED); + case Win32Error: return SHIMGVW_HResultFromWin32(GetLastError()); + case FileNotFound: return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + case AccessDenied: return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED); + case UnknownImageFormat: return HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); + } + return E_FAIL; +}

4 months, 2 weeks

[reactos] 08/08: [CRT] Fix cvt to not overflow the buffer on NAN/INF

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166d83b2065c1b15051a6… commit 166d83b2065c1b15051a68b8a6092e4d2727f63e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 3 11:06:44 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Feb 12 16:54:45 2025 +0200 [CRT] Fix cvt to not overflow the buffer on NAN/INF Fixes crash in msvcrt_winetest printf --- sdk/lib/crt/stdlib/fcvtbuf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sdk/lib/crt/stdlib/fcvtbuf.c b/sdk/lib/crt/stdlib/fcvtbuf.c index a76b27bc515..18966efcb0b 100644 --- a/sdk/lib/crt/stdlib/fcvtbuf.c +++ b/sdk/lib/crt/stdlib/fcvtbuf.c @@ -48,6 +48,21 @@ static char *cvt(double arg, int ndigits, int *decpt, int *sign, char *buf, int double fi, fj; char *p, *p1; + if (_isnan(arg)) + { + snprintf(buf, ndigits, "1.#QNAN"); + *decpt = 0; + *sign = 0; + return buf; + } + if (!_finite(arg)) + { + snprintf(buf, ndigits, "1.#INF"); + *decpt = 0; + *sign = 0; + return buf; + } + if (ndigits >= CVTBUFSIZE - 1) ndigits = CVTBUFSIZE - 2; r2 = 0; *sign = 0;

4 months, 2 weeks

[reactos] 07/08: [MSVCRT_WINETEST] Add checks to not crash on reactos

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a63e19e47ef12ea630ec… commit 4a63e19e47ef12ea630ec69205f9b303b0df14e3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 3 11:08:26 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Feb 12 16:54:45 2025 +0200 [MSVCRT_WINETEST] Add checks to not crash on reactos --- modules/rostests/winetests/msvcrt/locale.c | 6 ++++++ modules/rostests/winetests/msvcrt/misc.c | 8 ++++++++ modules/rostests/winetests/msvcrt/string.c | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/modules/rostests/winetests/msvcrt/locale.c b/modules/rostests/winetests/msvcrt/locale.c index 62632ce4b9d..a9ade6f5c41 100644 --- a/modules/rostests/winetests/msvcrt/locale.c +++ b/modules/rostests/winetests/msvcrt/locale.c @@ -627,6 +627,9 @@ static void test_setlocale(void) if(IsValidCodePage(atoi(buf))) { ret = setlocale(LC_ALL, ".OCP"); ok(ret != NULL, "ret == NULL\n"); +#ifdef __REACTOS__ + if (ret == NULL) ptr = NULL; else +#endif ptr = strchr(ret, '.'); ok(ptr && !strcmp(ptr + 1, buf), "ret %s, buf %s.\n", ret, buf); } @@ -636,6 +639,9 @@ static void test_setlocale(void) len = sprintf(buf, "%d", GetACP()); ret = setlocale(LC_ALL, ".ACP"); ok(ret != NULL, "ret == NULL\n"); +#ifdef __REACTOS__ + if (ret == NULL) ptr = NULL; else +#endif ptr = strchr(ret, '.'); ok(ptr && !strncmp(ptr + 1, buf, len), "ret %s, buf %s.\n", ret, buf); diff --git a/modules/rostests/winetests/msvcrt/misc.c b/modules/rostests/winetests/msvcrt/misc.c index 7b54b3aeb88..cb7dc24e18c 100644 --- a/modules/rostests/winetests/msvcrt/misc.c +++ b/modules/rostests/winetests/msvcrt/misc.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <math.h> #include <process.h> +#include <versionhelpers.h> static inline BOOL almost_equal(double d1, double d2) { if(d1-d2>-1e-30 && d1-d2<1e-30) @@ -393,6 +394,13 @@ static void test__popen(const char *name) ret = fputs("child-to-parent\n", pipe); ok(ret != EOF, "fputs returned %x\n", ret); +#ifdef __REACTOS__ + if (IsReactOS()) + { + skip("Skipping _pclose, because it hangs on reactos\n"); + return; + } +#endif ret = _pclose(pipe); ok(ret == 0x3, "_pclose returned %x, expected 0x3\n", ret); } diff --git a/modules/rostests/winetests/msvcrt/string.c b/modules/rostests/winetests/msvcrt/string.c index b6115c08bd1..f88d672d573 100644 --- a/modules/rostests/winetests/msvcrt/string.c +++ b/modules/rostests/winetests/msvcrt/string.c @@ -37,6 +37,7 @@ #include "winbase.h" #include "winnls.h" #include "winuser.h" +#include <versionhelpers.h> static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -2117,6 +2118,13 @@ static void test__strtod(void) for (i=0; i<ARRAY_SIZE(tests); i++) { +#ifdef __REACTOS__ + if ((i == 19) && IsReactOS()) + { + skip("Skipping i == 19, because it crashes on ReactOS\n"); + continue; + } +#endif errno = 0xdeadbeef; d = strtod(tests[i].str, &end); ok(d == tests[i].ret, "%d) d = %.16e\n", i, d);

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