November 2022 - Wine-commits

Nikolay Sivov : comctl32/static: Use CRT allocation functions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 7ef99635fbbec9c553bfb70f945730aa43e9ed0f URL: https://gitlab.winehq.org/wine/wine/-/commit/7ef99635fbbec9c553bfb70f945730… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 08:53:32 2022 +0300 comctl32/static: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/static.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 25eee289204..cab0235b8d3 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -29,6 +29,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -37,7 +38,6 @@ #include "commctrl.h" #include "uxtheme.h" -#include "wine/heap.h" #include "wine/debug.h" #include "comctl32.h" @@ -94,7 +94,7 @@ static struct static_extra_info *get_extra_ptr( HWND hwnd, BOOL force ) struct static_extra_info *extra = (struct static_extra_info *)GetWindowLongPtrW( hwnd, 0 ); if (!extra && force) { - extra = heap_alloc_zero( sizeof(*extra) ); + extra = calloc( 1, sizeof(*extra) ); if (extra) SetWindowLongPtrW( hwnd, 0, (ULONG_PTR)extra ); } @@ -470,7 +470,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { if (extra->image_has_alpha) DeleteObject( extra->image.hbitmap ); - heap_free( extra ); + free( extra ); } /* * FIXME @@ -751,13 +751,13 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) } buf_size = 256; - if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) + if (!(text = malloc( buf_size * sizeof(WCHAR) ))) goto no_TextOut; while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) { buf_size *= 2; - if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) + if (!(text = realloc( text, buf_size * sizeof(WCHAR) ))) goto no_TextOut; } @@ -777,7 +777,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) } no_TextOut: - HeapFree( GetProcessHeap(), 0, text ); + free( text ); if (hFont) SelectObject( hdc, hOldFont );

1 0

Alex Henrie : mountmgr: Use standard C functions for memory allocation.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 61dc7de497413e0ea7e16809fa0406781f092aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/61dc7de497413e0ea7e16809fa0406… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 29 18:11:30 2022 -0700 mountmgr: Use standard C functions for memory allocation. --- dlls/mountmgr.sys/device.c | 72 +++++++++++++++++--------------------------- dlls/mountmgr.sys/mountmgr.c | 30 +++++++++--------- 2 files changed, 42 insertions(+), 60 deletions(-)

1 0

Nikolay Sivov : wshom: Fix WshNetwork interface definition.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: b98c2a757ebfc72e4529982ef922299b385a3095 URL: https://gitlab.winehq.org/wine/wine/-/commit/b98c2a757ebfc72e4529982ef92229… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 08:42:10 2022 +0300 wshom: Fix WshNetwork interface definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 129 +++++++++++++++++++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 23 ++++++-- dlls/wshom.ocx/tests/wshom.idl | 73 ++++++++++++++++++++++- dlls/wshom.ocx/wshom.idl | 73 ++++++++++++++++++++++- 4 files changed, 278 insertions(+), 20 deletions(-)

1 0

Alex Henrie : include: Annotate I_RpcAllocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 41b4d9b30159f410ce59c0c3e690bafcf5041b95 URL: https://gitlab.winehq.org/wine/wine/-/commit/41b4d9b30159f410ce59c0c3e690ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 29 20:06:07 2022 -0700 include: Annotate I_RpcAllocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/rpcdcep.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index bf518064553..2eeef973ff0 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -152,10 +152,11 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcReceive( RPC_MESSAGE* Message ); -RPCRTAPI void* RPC_ENTRY - I_RpcAllocate( unsigned int Size ); RPCRTAPI void RPC_ENTRY I_RpcFree( void* Object ); +RPCRTAPI void* RPC_ENTRY + I_RpcAllocate( unsigned int Size ) + __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(I_RpcFree) __WINE_MALLOC; RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY I_RpcGetCurrentCallHandle( void );

1 0

Alex Henrie : hhctrl: Use standard C functions for memory allocation.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 9dba420d0a786ce69fca13372e900af805dae5de URL: https://gitlab.winehq.org/wine/wine/-/commit/9dba420d0a786ce69fca13372e900a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 29 18:08:30 2022 -0700 hhctrl: Use standard C functions for memory allocation. --- dlls/hhctrl.ocx/chm.c | 119 +++++++++++++++++++++---------------------- dlls/hhctrl.ocx/content.c | 14 ++--- dlls/hhctrl.ocx/help.c | 64 +++++++++++------------ dlls/hhctrl.ocx/hhctrl.c | 40 +++++++-------- dlls/hhctrl.ocx/hhctrl.h | 25 +-------- dlls/hhctrl.ocx/index.c | 26 +++++----- dlls/hhctrl.ocx/search.c | 16 +++--- dlls/hhctrl.ocx/stream.c | 14 ++--- dlls/hhctrl.ocx/webbrowser.c | 4 +- 9 files changed, 148 insertions(+), 174 deletions(-)

1 0

Robert Wilhelm : wshom.ocx: Added WshNetwork class factory implementation.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 10d256c64fc4317e7ad17eac62e6cc91464a166e URL: https://gitlab.winehq.org/wine/wine/-/commit/10d256c64fc4317e7ad17eac62e6cc… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 26 23:28:57 2022 +0100 wshom.ocx: Added WshNetwork class factory implementation. --- dlls/wshom.ocx/Makefile.in | 1 + dlls/wshom.ocx/network.c | 29 +++++++++++++++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 13 +++++++++++++ dlls/wshom.ocx/wshom_private.h | 1 + 4 files changed, 44 insertions(+) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 1264e9c96a5..27297eed2f0 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 scrrun EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ + network.c \ shell.c \ wshom_main.c diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c new file mode 100644 index 00000000000..64b8551e6cc --- /dev/null +++ b/dlls/wshom.ocx/network.c @@ -0,0 +1,29 @@ +/* + * Copyright 2022 Robert Wilhelm + * + * 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 + */ + +#include "wshom_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index b2dc79a1948..aed9f2dedf4 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -209,7 +209,16 @@ static const IClassFactoryVtbl WshShellFactoryVtbl = { ClassFactory_LockServer }; +static const IClassFactoryVtbl WshNetworkFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WshNetworkFactory_CreateInstance, + ClassFactory_LockServer +}; + static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; +static IClassFactory WshNetworkFactory = { &WshNetworkFactoryVtbl }; /****************************************************************** * DllMain (wshom.ocx.@) @@ -241,6 +250,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&WshShellFactory, riid, ppv); } + else if(IsEqualGUID(&CLSID_WshNetwork, rclsid)) { + TRACE("(CLSID_WshNetwork %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WshNetworkFactory, riid, ppv); + } FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index a10cf2683a3..c2a66bf0610 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -47,3 +47,4 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Robert Wilhelm : wshom.ocx: Add IWshNetwork2 interface stub implementation.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 57fa2ddd5ee99661a35ecc244d93731b9e094877 URL: https://gitlab.winehq.org/wine/wine/-/commit/57fa2ddd5ee99661a35ecc244d9373… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 26 23:48:21 2022 +0100 wshom.ocx: Add IWshNetwork2 interface stub implementation. --- dlls/wshom.ocx/network.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index 64b8551e6cc..8ac3f35ad41 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -17,13 +17,96 @@ */ #include "wshom_private.h" +#include "wshom.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static HRESULT WINAPI WshNetwork2_QueryInterface(IWshNetwork2 *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatch)) { + TRACE("(IID_IDispatch %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWshNetwork2)) { + TRACE("(IID_IWshNetwork2 %p)\n", ppv); + *ppv = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WshNetwork2_AddRef(IWshNetwork2 *iface) +{ + TRACE("()\n"); + return 2; +} + +static ULONG WINAPI WshNetwork2_Release(IWshNetwork2 *iface) +{ + TRACE("()\n"); + return 2; +} + +static HRESULT WINAPI WshNetwork2_GetTypeInfoCount(IWshNetwork2 *iface, UINT *pctinfo) +{ + TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshNetwork2_GetTypeInfo(IWshNetwork2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + FIXME("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshNetwork2_GetIDsOfNames(IWshNetwork2 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + FIXME("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshNetwork2_Invoke(IWshNetwork2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + FIXME("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *UserDomain) +{ + FIXME("(%p)\n", UserDomain); + return E_NOTIMPL; +} + +static const IWshNetwork2Vtbl WshNetwork2Vtbl = { + WshNetwork2_QueryInterface, + WshNetwork2_AddRef, + WshNetwork2_Release, + WshNetwork2_GetTypeInfoCount, + WshNetwork2_GetTypeInfo, + WshNetwork2_GetIDsOfNames, + WshNetwork2_Invoke, + WshNetwork2_get_UserDomain, +}; + +static IWshNetwork2 WshNetwork2 = { &WshNetwork2Vtbl }; + HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + + return IWshNetwork2_QueryInterface(&WshNetwork2, riid, ppv); }

1 0

Robert Wilhelm : wshom.ocx: Add WShNetwork object creation test.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 7ed17ec2511c85ce2e1f1fed0a9d04d85f658a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/7ed17ec2511c85ce2e1f1fed0a9d04… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 26 23:51:15 2022 +0100 wshom.ocx: Add WShNetwork object creation test. --- dlls/wshom.ocx/tests/wshom.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 34a02a8d1f9..f3b6ec77c51 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -673,6 +673,21 @@ static void test_popup(void) SysFreeString(text); IWshShell_Release(sh); } +static void test_wshnetwork(void) +{ + IDispatch *disp; + IUnknown *network; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WshNetwork, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDispatch, (void**)&disp); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&network); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IUnknown_Release(network); +} START_TEST(wshom) { @@ -693,6 +708,7 @@ START_TEST(wshom) test_wshshell(); test_registry(); test_popup(); + test_wshnetwork(); CoUninitialize(); }

1 0

Alex Henrie : shell32: Rename ShellItem to struct shell_item.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 27eee424674e0389ae90d7ca1bd8c510fd04050d URL: https://gitlab.winehq.org/wine/wine/-/commit/27eee424674e0389ae90d7ca1bd8c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 21:01:28 2022 -0700 shell32: Rename ShellItem to struct shell_item. To avoid confusion or conflict with the ShellItem struct defined in the Windows headers. --- dlls/shell32/shellitem.c | 82 ++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-)

1 0

Alex Henrie : include: Add shobjidl_core.idl.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 3d8a412a90dd9b609ecdc115bec8749298ba0c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/3d8a412a90dd9b609ecdc115bec874… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 21:01:28 2022 -0700 include: Add shobjidl_core.idl. Needed to compile Tera Term. --- include/Makefile.in | 1 + include/shlguid.h | 5 ----- include/shobjidl.idl | 1 + include/shobjidl_core.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 62904d8d2a0..848837f84fc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -685,6 +685,7 @@ SOURCES = \ shlobj.h \ shlwapi.h \ shobjidl.idl \ + shobjidl_core.idl \ shtypes.idl \ sipbase.h \ slerror.h \ diff --git a/include/shlguid.h b/include/shlguid.h index c6878c36864..8d68700accf 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -19,8 +19,6 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400, 0, 0); - DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490, 0, 0); DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491, 0, 0); DEFINE_OLEGUID(CATID_DeskBand, 0x00021492, 0, 0); @@ -124,13 +122,11 @@ DEFINE_GUID(IID_IInputObjectSite, 0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00 /**************************************************************************** * the next IID's are the namespace elements of the pidls */ -DEFINE_GUID(CLSID_NetworkPlaces, 0x208D2C60, 0x3AEA, 0x1069, 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_NetworkDomain, 0x46e06680, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49); DEFINE_GUID(CLSID_NetworkServer, 0xc0542a90, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49); DEFINE_GUID(CLSID_NetworkShare, 0x54a754c0, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49); DEFINE_GUID(CLSID_MyComputer, 0x20D04FE0, 0x3AEA, 0x1069, 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_Internet, 0x871C5380, 0x42A0, 0x1069, 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); -DEFINE_GUID(CLSID_ShellFSFolder, 0xF3364BA0, 0x65B9, 0x11CE, 0xA9, 0xBA, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_RecycleBin, 0x645FF040, 0x5081, 0x101B, 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E); DEFINE_GUID(CLSID_ControlPanel, 0x21EC2020, 0x3AEA, 0x1069, 0xA2, 0xDD, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); @@ -145,7 +141,6 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(CLSID_NewMenu, 0xd969a300, 0xe7ff, 0x11d0, 0xa9, 0x3b, 0x0, 0xa0, 0xc9, 0xf, 0x27, 0x19); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 065e0c8c528..a5b27ec1003 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -33,6 +33,7 @@ import "wtypes.idl"; import "propsys.idl"; import "objectarray.idl"; /* FIXME: import "structuredquery.idl"; */ +import "shobjidl_core.idl"; cpp_quote("/* FIXME: #include <sherrors.h> */") diff --git a/include/shobjidl_core.idl b/include/shobjidl_core.idl new file mode 100644 index 00000000000..dd64204682e --- /dev/null +++ b/include/shobjidl_core.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Alex Henrie + * + * 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 + */ + +[ + uuid(56f9f44f-f74c-4e38-99bc-9f3ebd3d696a) +] +library ShellCoreObjects +{ + [ + uuid(208d2c60-3aea-1069-a2d7-08002b30309d) + ] + coclass NetworkPlaces + { + interface IShellFolder2; + } + + [ + uuid(00021400-0000-0000-c000-000000000046) + ] + coclass ShellDesktop + { + interface IShellFolder2; + } + + [ + uuid(f3364ba0-65b9-11ce-a9ba-00aa004ae837) + ] + coclass ShellFSFolder + { + interface IShellFolder2; + } + + [ + uuid(9ac9fbe1-e0a2-4ad6-b4ee-e212013ea917) + ] + coclass ShellItem + { + interface IShellItem2; + } +}

1 0