November 2022 - Wine-Commits

Nikolay Sivov : comctl32/header: Use CRT allocation functions.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

Module: wine Branch: master Commit: 8fe1c2282e92fb455c55d4c999133b10aa927ed9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fe1c2282e92fb455c55d4c999133b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 08:49:03 2022 +0300 comctl32/header: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index be4c5616bb7..e905d18e2fa 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -41,7 +41,6 @@ #include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(header); @@ -141,7 +140,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (mask & HDI_TEXT) { - heap_free(lpItem->pszText); + free(lpItem->pszText); lpItem->pszText = NULL; if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ @@ -336,7 +335,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) if (size > sizeof(buffer)) { - data = heap_alloc( size ); + data = malloc( size ); if (!data) return NULL; } data->rdh.dwSize = sizeof(data->rdh); @@ -362,7 +361,7 @@ static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) data->rdh.nCount++; } rgn = ExtCreateRegion( NULL, size, data ); - if (data != (RGNDATA *)buffer) heap_free( data ); + if (data != (RGNDATA *)buffer) free( data ); return rgn; } @@ -983,7 +982,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) if (mask&HDI_TEXT && lpItem->pszText != NULL) { ERR("(): function called without a call to FreeCallbackItems\n"); - heap_free(lpItem->pszText); + free(lpItem->pszText); lpItem->pszText = NULL; } @@ -994,13 +993,13 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) { dispInfo.hdr.code = HDN_GETDISPINFOW; if (mask & HDI_TEXT) - pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); + pvBuffer = calloc(MAX_HEADER_TEXT_LEN, sizeof(WCHAR)); } else { dispInfo.hdr.code = HDN_GETDISPINFOA; if (mask & HDI_TEXT) - pvBuffer = heap_alloc_zero(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); + pvBuffer = calloc(MAX_HEADER_TEXT_LEN, sizeof(CHAR)); } dispInfo.pszText = pvBuffer; dispInfo.cchTextMax = (pvBuffer!=NULL?MAX_HEADER_TEXT_LEN:0); @@ -1031,7 +1030,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) else { Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)dispInfo.pszText); - heap_free(pvBuffer); + free(pvBuffer); } } @@ -1057,7 +1056,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) { if (lpItem->callbackMask&HDI_TEXT) { - heap_free(lpItem->pszText); + free(lpItem->pszText); lpItem->pszText = NULL; } @@ -1179,15 +1178,15 @@ HEADER_DeleteItem (HEADER_INFO *infoPtr, INT iItem) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); iOrder = infoPtr->items[iItem].iOrder; - heap_free(infoPtr->items[iItem].pszText); + free(infoPtr->items[iItem].pszText); infoPtr->uNumItem--; memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], (infoPtr->uNumItem - iOrder) * sizeof(INT)); - infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* Correct the orders */ for (i = 0; i < infoPtr->uNumItem; i++) @@ -1417,8 +1416,8 @@ HEADER_InsertItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL b iOrder = infoPtr->uNumItem; infoPtr->uNumItem++; - infoPtr->items = heap_realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = heap_realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + infoPtr->items = realloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = realloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); /* make space for the new item */ memmove(&infoPtr->items[nItem + 1], &infoPtr->items[nItem], @@ -1537,7 +1536,7 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni HEADER_CopyHDItemForNotify(infoPtr, &hdNotify, phdi, bUnicode, &pvScratch); if (HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCHANGINGW, nItem, &hdNotify)) { - heap_free(pvScratch); + free(pvScratch); return FALSE; } @@ -1554,7 +1553,7 @@ HEADER_SetItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL bUni InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - heap_free(pvScratch); + free(pvScratch); return TRUE; } @@ -1577,7 +1576,7 @@ HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) HFONT hOldFont; HDC hdc; - infoPtr = heap_alloc_zero (sizeof(*infoPtr)); + infoPtr = calloc(1, sizeof(*infoPtr)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); infoPtr->hwndSelf = hwnd; @@ -1632,14 +1631,14 @@ HEADER_NCDestroy (HEADER_INFO *infoPtr) if (infoPtr->items) { lpItem = infoPtr->items; for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) - heap_free(lpItem->pszText); - heap_free(infoPtr->items); + free(lpItem->pszText); + free(infoPtr->items); } - heap_free(infoPtr->order); + free(infoPtr->order); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - heap_free(infoPtr); + free(infoPtr); return 0; }

1 0

Nikolay Sivov : wshom: Fix WshNetwork interface definition.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

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 : mountmgr: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 30, 2022

Nov. 30, 2022

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

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

Nov. 30, 2022

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 Nov. 30, 2022

Nov. 30, 2022

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 Nov. 29, 2022

Nov. 29, 2022

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 Nov. 29, 2022

Nov. 29, 2022

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 Nov. 29, 2022

Nov. 29, 2022

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

Brendan Shanks : wpcap: Free wine_get_unix_file_name memory with HeapFree.
by Alexandre Julliard Nov. 29, 2022

Nov. 29, 2022

Module: wine Branch: master Commit: 8a18836efce36fb33f94a02d97f0b2ff76260ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a18836efce36fb33f94a02d97f0b2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 28 09:03:22 2022 -0800 wpcap: Free wine_get_unix_file_name memory with HeapFree. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index c93c8540145..bc4cb63c623 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -135,7 +135,7 @@ void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) params.name = unix_path; params.ret = &dumper; PCAP_CALL( dump_open, &params ); - RtlFreeHeap( GetProcessHeap(), 0, unix_path ); + HeapFree( GetProcessHeap(), 0, unix_path ); return dumper; }

1 0

Brendan Shanks : mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree.
by Alexandre Julliard Nov. 29, 2022

Nov. 29, 2022

Module: wine Branch: master Commit: 2d4b588afca00b3fafd3fb4509f577a85bd9588b URL: https://gitlab.winehq.org/wine/wine/-/commit/2d4b588afca00b3fafd3fb4509f577… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 28 09:02:26 2022 -0800 mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree. --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 328b0b2f344..bc934e2f494 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -895,7 +895,7 @@ static BOOL get_volume_device_info( struct volume *volume ) } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - RtlFreeHeap( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError());

1 0