November 2022 - Wine-Commits

Alex Henrie : inetcomm: Use standard C functions for memory allocation in protocol.c.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 02bb8401d7890f66f3f70e7a8010c7aa109034fa URL: https://gitlab.winehq.org/wine/wine/-/commit/02bb8401d7890f66f3f70e7a8010c7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:16:27 2022 -0700 inetcomm: Use standard C functions for memory allocation in protocol.c. --- dlls/inetcomm/protocol.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index 5cb0d53d253..c98139ad49e 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -25,7 +25,6 @@ #include "inetcomm_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -62,22 +61,6 @@ typedef struct { static const WCHAR mhtml_prefixW[] = L"mhtml:"; static const WCHAR mhtml_separatorW[] = L"!x-usc:"; -static inline LPWSTR heap_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD size; - - size = (lstrlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); - if(ret) - memcpy(ret, str, size); - } - - return ret; -} - static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; @@ -247,7 +230,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) IInternetProtocol_Release(&This->protocol->IInternetProtocol_iface); if(This->stream) IStream_Release(This->stream); - heap_free(This); + free(This); } return ref; @@ -419,8 +402,8 @@ static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface) IInternetProtocolSink_Release(This->sink); if(This->stream) IStream_Release(This->stream); - heap_free(This->location); - heap_free(This); + free(This->location); + free(This); } return ref; @@ -475,7 +458,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH if(FAILED(hres)) return hres; - if(url.location && !(This->location = heap_strdupW(url.location))) + if(url.location && !(This->location = wcsdup(url.location))) return E_OUTOFMEMORY; hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); @@ -488,7 +471,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH IInternetProtocolSink_AddRef(This->sink = pOIProtSink); - binding = heap_alloc(FIELD_OFFSET(MimeHtmlBinding, url[url.mhtml_len+1])); + binding = malloc(FIELD_OFFSET(MimeHtmlBinding, url[url.mhtml_len+1])); if(!binding) return E_OUTOFMEMORY; memcpy(binding->url, url.mhtml, url.mhtml_len*sizeof(WCHAR)); @@ -496,7 +479,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH hres = CreateURLMoniker(NULL, binding->url, &mon); if(FAILED(hres)) { - heap_free(binding); + free(binding); return hres; } @@ -729,7 +712,7 @@ HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) { MimeHtmlProtocol *protocol; - protocol = heap_alloc(sizeof(*protocol)); + protocol = malloc(sizeof(*protocol)); if(!protocol) return E_OUTOFMEMORY;

1 0

Zebediah Figura : setupapi: Fill the required size in SetupDiGetDeviceInterfaceDetail() also on success.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: d15262e464ba3536567ad73f68d95e6b7f88f3aa URL: https://gitlab.winehq.org/wine/wine/-/commit/d15262e464ba3536567ad73f68d95e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:31:35 2022 -0600 setupapi: Fill the required size in SetupDiGetDeviceInterfaceDetail() also on success. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53387 --- dlls/setupapi/devinst.c | 24 ++++++++++++++---------- dlls/setupapi/tests/devinst.c | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 930ed670e84..896e77d9b38 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2976,15 +2976,15 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) */ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, SP_DEVICE_INTERFACE_DETAIL_DATA_A *DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, DWORD *RequiredSize, SP_DEVINFO_DATA *device_data) + DWORD DeviceInterfaceDetailDataSize, DWORD *ret_size, SP_DEVINFO_DATA *device_data) { struct device_iface *iface; DWORD bytesNeeded = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); BOOL ret = FALSE; - TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n", + TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, ret_size %p, device_data %p.\n", devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, - RequiredSize, device_data); + ret_size, device_data); if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; @@ -3004,6 +3004,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA if (iface->symlink) bytesNeeded += WideCharToMultiByte(CP_ACP, 0, iface->symlink, -1, NULL, 0, NULL, NULL) - 1; + + if (ret_size) + *ret_size = bytesNeeded; + if (DeviceInterfaceDetailDataSize >= bytesNeeded) { if (iface->symlink) @@ -3019,8 +3023,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA } else { - if (RequiredSize) - *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } @@ -3035,16 +3037,16 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA */ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, SP_DEVICE_INTERFACE_DETAIL_DATA_W *DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, DWORD *RequiredSize, SP_DEVINFO_DATA *device_data) + DWORD DeviceInterfaceDetailDataSize, DWORD *ret_size, SP_DEVINFO_DATA *device_data) { struct device_iface *iface; DWORD bytesNeeded = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR); /* include NULL terminator */ BOOL ret = FALSE; - TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n", + TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, ret_size %p, device_data %p.\n", devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, - RequiredSize, device_data); + ret_size, device_data); if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; @@ -3064,6 +3066,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA if (iface->symlink) bytesNeeded += sizeof(WCHAR) * lstrlenW(iface->symlink); + + if (ret_size) + *ret_size = bytesNeeded; + if (DeviceInterfaceDetailDataSize >= bytesNeeded) { if (iface->symlink) @@ -3075,8 +3081,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA } else { - if (RequiredSize) - *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2a33da2d72a..be0831f6882 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1257,14 +1257,14 @@ static void test_device_iface_detail(void) ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, expected_size, &size, NULL); ok(ret, "Failed to get interface detail, error %#lx.\n", GetLastError()); ok(!strcasecmp(path, detail->DevicePath), "Got unexpected path %s.\n", detail->DevicePath); - todo_wine ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); + ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); SetLastError(0xdeadbeef); size = 0xdeadbeef; ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, expected_size * 2, &size, NULL); ok(ret, "Failed to get interface detail, error %#lx.\n", GetLastError()); ok(!strcasecmp(path, detail->DevicePath), "Got unexpected path %s.\n", detail->DevicePath); - todo_wine ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); + ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); expected_size = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[strlen(path) + 1]);

1 0

Zebediah Figura : setupapi: Correctly calculate the required size in SetupDiGetDeviceInterfaceDetailA().
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 5711f03e8479936ac5e3bc71ba7987f6b7cb5586 URL: https://gitlab.winehq.org/wine/wine/-/commit/5711f03e8479936ac5e3bc71ba7987… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:29:30 2022 -0600 setupapi: Correctly calculate the required size in SetupDiGetDeviceInterfaceDetailA(). Don't include the null terminator twice. --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/devinst.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 901af4650c8..930ed670e84 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3003,7 +3003,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA if (iface->symlink) bytesNeeded += WideCharToMultiByte(CP_ACP, 0, iface->symlink, -1, - NULL, 0, NULL, NULL); + NULL, 0, NULL, NULL) - 1; if (DeviceInterfaceDetailDataSize >= bytesNeeded) { if (iface->symlink) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9d6a61c08c8..2a33da2d72a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1232,7 +1232,7 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#lx.\n", GetLastError()); expected_size = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[strlen(path) + 1]); - todo_wine ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); + ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); detail = heap_alloc(size * 2); detail->cbSize = 0; @@ -1255,9 +1255,8 @@ static void test_device_iface_detail(void) SetLastError(0xdeadbeef); size = 0xdeadbeef; ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, expected_size, &size, NULL); - todo_wine ok(ret, "Failed to get interface detail, error %#lx.\n", GetLastError()); - if (ret) - ok(!strcasecmp(path, detail->DevicePath), "Got unexpected path %s.\n", detail->DevicePath); + ok(ret, "Failed to get interface detail, error %#lx.\n", GetLastError()); + ok(!strcasecmp(path, detail->DevicePath), "Got unexpected path %s.\n", detail->DevicePath); todo_wine ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); SetLastError(0xdeadbeef);

1 0

Alex Henrie : msado15: Remove unused functions heap_realloc_zero and strdupW.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: c591687d82c37c987989318d308f6670ab17b244 URL: https://gitlab.winehq.org/wine/wine/-/commit/c591687d82c37c987989318d308f66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:44:05 2022 -0700 msado15: Remove unused functions heap_realloc_zero and strdupW. --- dlls/msado15/msado15_private.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index bb55eaaa3aa..71344934b95 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,20 +26,6 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; -static inline void *heap_realloc_zero( void *mem, SIZE_T len ) -{ - if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(*dst) ))) lstrcpyW( dst, src ); - return dst; -} - typedef enum tid_t { ADORecordsetConstruction_tid, Command_tid,

1 0

Alex Henrie : msado15: Use standard C functions for memory allocation in stream.c.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: bb8d69d9c20c6859236499bb63d264e26602f7ca URL: https://gitlab.winehq.org/wine/wine/-/commit/bb8d69d9c20c6859236499bb63d264… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:44:05 2022 -0700 msado15: Use standard C functions for memory allocation in stream.c. --- dlls/msado15/stream.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index bd8d4972274..50833aecf34 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -25,7 +25,6 @@ #include "msado15_backcompat.h" #include "wine/debug.h" -#include "wine/heap.h" #include "msado15_private.h" @@ -64,9 +63,9 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); - heap_free( stream->charset ); - heap_free( stream->buf ); - heap_free( stream ); + free( stream->charset ); + free( stream->buf ); + free( stream ); } return refs; } @@ -183,7 +182,8 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) { BYTE *tmp; LONG new_size = max( size, stream->allocated * 2 ); - if (!(tmp = heap_realloc_zero( stream->buf, new_size ))) return E_OUTOFMEMORY; + if (!(tmp = realloc( stream->buf, new_size ))) return E_OUTOFMEMORY; + memset( tmp + stream->allocated, 0, new_size - stream->allocated ); stream->buf = tmp; stream->allocated = new_size; } @@ -289,8 +289,8 @@ static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) TRACE( "%p, %s\n", stream, debugstr_w(charset) ); - if (!(str = strdupW( charset ))) return E_OUTOFMEMORY; - heap_free( stream->charset ); + if (!(str = wcsdup( charset ))) return E_OUTOFMEMORY; + free( stream->charset ); stream->charset = str; return S_OK; } @@ -360,7 +360,7 @@ static HRESULT WINAPI stream_Close( _Stream *iface ) if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - heap_free( stream->buf ); + free( stream->buf ); stream->buf = NULL; stream->size = stream->allocated = stream->pos = 0; @@ -539,7 +539,7 @@ HRESULT Stream_create( void **obj ) { struct stream *stream; - if (!(stream = heap_alloc_zero( sizeof(*stream) ))) return E_OUTOFMEMORY; + if (!(stream = calloc( 1, sizeof(*stream) ))) return E_OUTOFMEMORY; stream->Stream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; stream->type = adTypeText;

1 0

Zhiyi Zhang : explorer: Use a valid taskbar position when the taskbar is hidden.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 8459a5272a5b16bf99d058aade01c946a71c94f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8459a5272a5b16bf99d058aade01c9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 14 22:19:26 2022 +0800 explorer: Use a valid taskbar position when the taskbar is hidden. Some applications use FindWindowA() with class Shell_TrayWnd to find the taskbar window on Windows. Then GetWindowRect() is called to get the taskbar window rectangle. Finally, the taskbar window rectangle is subtracted from the primary screen rectangle to calculate the work area. Without a valid taskbar window position, these applications end up getting an incorrect work area and going down the wrong path. So use the same position and size as the host system panel for explorer taskbar when it's hidden. --- programs/explorer/systray.c | 15 +++++++++------ programs/explorer/tests/explorer.c | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 5b7216b2904..7790648d021 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -712,10 +712,7 @@ static void show_taskbar_contextmenu( HWND button, LPARAM lparam ) static void do_hide_systray(void) { - SetWindowPos( tray_window, 0, - GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), - GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN), - 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + ShowWindow( tray_window, SW_HIDE ); } static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) @@ -899,6 +896,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab { WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT work_rect, primary_rect, taskbar_rect; if (using_root && graphics_driver) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); @@ -924,8 +922,13 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - tray_window = CreateWindowExW( WS_EX_NOACTIVATE, classname, NULL, WS_POPUP, - 0, GetSystemMetrics( SM_CYSCREEN ), 0, 0, 0, 0, 0, 0 ); + SystemParametersInfoW( SPI_GETWORKAREA, 0, &work_rect, 0 ); + SetRect( &primary_rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + SubtractRect( &taskbar_rect, &primary_rect, &work_rect ); + + tray_window = CreateWindowExW( WS_EX_NOACTIVATE, classname, NULL, WS_POPUP, taskbar_rect.left, + taskbar_rect.top, taskbar_rect.right - taskbar_rect.left, + taskbar_rect.bottom - taskbar_rect.top, 0, 0, 0, 0 ); if (!tray_window) { WINE_ERR("Could not create tray window\n"); diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c index c9ed7a900f2..3882027ae46 100644 --- a/programs/explorer/tests/explorer.c +++ b/programs/explorer/tests/explorer.c @@ -40,7 +40,6 @@ static void test_taskbar(void) SystemParametersInfoW(SPI_GETWORKAREA, 0, &work_rect, 0); SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); SubtractRect(&expected_rect, &primary_rect, &work_rect); - todo_wine ok(EqualRect(&taskbar_rect, &expected_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&taskbar_rect)); }

1 0

Zhiyi Zhang : explorer/tests: Add taskbar tests.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: b6818e2c20e756ea52fb7d783e283b2ee6b6b9a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6818e2c20e756ea52fb7d783e283b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 15 10:39:30 2022 +0800 explorer/tests: Add taskbar tests. --- configure | 1 + configure.ac | 1 + programs/explorer/tests/Makefile.in | 5 ++++ programs/explorer/tests/explorer.c | 51 +++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) diff --git a/configure b/configure index 8f780aff3ad..71dfee4444e 100755 --- a/configure +++ b/configure @@ -22063,6 +22063,7 @@ wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer +wine_fn_config_makefile programs/explorer/tests enable_tests wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/find enable_find diff --git a/configure.ac b/configure.ac index 1d0ae5c3fc2..cc3f42ecbf0 100644 --- a/configure.ac +++ b/configure.ac @@ -3348,6 +3348,7 @@ WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) +WINE_CONFIG_MAKEFILE(programs/explorer/tests) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/find) diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100644 index 00000000000..01dfc134fe5 --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = explorer.exe +IMPORTS = user32 + +C_SRCS = \ + explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 00000000000..c9ed7a900f2 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,51 @@ +/* + * Explorer.exe tests + * + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 <windows.h> +#include "wine/test.h" + +static void test_taskbar(void) +{ + RECT taskbar_rect, expected_rect, primary_rect, work_rect; + HWND hwnd; + BOOL ret; + + hwnd = FindWindowA("Shell_TrayWnd", NULL); + if (!hwnd) + { + skip("Failed to find the taskbar window.\n"); + return; + } + + ret = GetWindowRect(hwnd, &taskbar_rect); + ok(ret, "GetWindowRect failed, error %ld.\n", GetLastError()); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &work_rect, 0); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + SubtractRect(&expected_rect, &primary_rect, &work_rect); + todo_wine + ok(EqualRect(&taskbar_rect, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&taskbar_rect)); +} + +START_TEST(explorer) +{ + test_taskbar(); +}

1 0

Alex Henrie : msado15: Use standard C functions for memory allocation in command.c.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: f601c01529a08f7a77120302a507e64bd0a4f8cb URL: https://gitlab.winehq.org/wine/wine/-/commit/f601c01529a08f7a77120302a507e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:44:05 2022 -0700 msado15: Use standard C functions for memory allocation in command.c. --- dlls/msado15/command.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index b796dd0a8a4..152528308e0 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -24,7 +24,6 @@ #include "msado15_backcompat.h" #include "wine/debug.h" -#include "wine/heap.h" #include "msado15_private.h" @@ -83,8 +82,8 @@ static ULONG WINAPI command_Release( _Command *iface ) { TRACE( "destroying %p\n", command ); if (command->connection) _Connection_Release(command->connection); - heap_free( command->text ); - heap_free( command ); + free( command->text ); + free( command ); } return ref; } @@ -196,8 +195,8 @@ static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) TRACE( "%p, %s\n", command, debugstr_w( text ) ); - if (text && !(source = strdupW( text ))) return E_OUTOFMEMORY; - heap_free( command->text ); + if (text && !(source = wcsdup( text ))) return E_OUTOFMEMORY; + free( command->text ); command->text = source; return S_OK; } @@ -379,7 +378,7 @@ HRESULT Command_create( void **obj ) { struct command *command; - if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; + if (!(command = malloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL;

1 0

Alex Henrie : mstask: Use standard C functions for memory allocation in task.c.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 9dcd2b3ce4fd5c51d499aed1fff7f038ceae84d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9dcd2b3ce4fd5c51d499aed1fff7f0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 23:47:01 2022 -0700 mstask: Use standard C functions for memory allocation in task.c. --- dlls/mstask/mstask_private.h | 10 ---------- dlls/mstask/task.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index aed4c80cbe9..326cd4743bd 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -32,14 +32,4 @@ extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, IT extern HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; extern HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 72592b27c09..d2a03aa8b56 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -89,11 +89,11 @@ static void TaskDestructor(TaskImpl *This) if (This->action) IExecAction_Release(This->action); ITaskDefinition_Release(This->task); - heap_free(This->data); - heap_free(This->task_name); - heap_free(This->accountName); - heap_free(This->trigger); - heap_free(This); + free(This->data); + free(This->task_name); + free(This->accountName); + free(This->trigger); + free(This); InterlockedDecrement(&dll_ref); } @@ -322,9 +322,9 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT if (hr != S_OK) return hr; if (This->trigger) - new_trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); + new_trigger = realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); else - new_trigger = heap_alloc(sizeof(This->trigger[0])); + new_trigger = malloc(sizeof(This->trigger[0])); if (!new_trigger) { ITaskTrigger_Release(*task_trigger); @@ -365,7 +365,7 @@ static HRESULT WINAPI MSTASK_ITask_DeleteTrigger(ITask *iface, WORD idx) This->trigger_count--; memmove(&This->trigger[idx], &This->trigger[idx + 1], (This->trigger_count - idx) * sizeof(This->trigger[0])); /* this shouldn't fail in practice since we're shrinking the memory block */ - This->trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); + This->trigger = realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); return S_OK; } @@ -829,8 +829,8 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT { if (!data) return E_INVALIDARG; - heap_free(This->data); - This->data = heap_alloc(count); + free(This->data); + This->data = malloc(count); if (!This->data) return E_OUTOFMEMORY; memcpy(This->data, data, count); This->data_count = count; @@ -839,7 +839,7 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT { if (data) return E_INVALIDARG; - heap_free(This->data); + free(This->data); This->data = NULL; This->data_count = 0; } @@ -933,11 +933,11 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( FIXME("Partial stub ignores passwords\n"); n = (lstrlenW(pwszAccountName) + 1); - tmp_account_name = heap_alloc(n * sizeof(WCHAR)); + tmp_account_name = malloc(n * sizeof(WCHAR)); if (!tmp_account_name) return E_OUTOFMEMORY; lstrcpyW(tmp_account_name, pwszAccountName); - heap_free(This->accountName); + free(This->accountName); This->accountName = tmp_account_name; This->is_dirty = TRUE; return S_OK; @@ -983,7 +983,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn { LPWSTR tmp_name; - tmp_name = heap_alloc(len * sizeof(WCHAR)); + tmp_name = malloc(len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); @@ -995,7 +995,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn else hr = HRESULT_FROM_WIN32(GetLastError()); - heap_free(tmp_name); + free(tmp_name); return hr; } @@ -1792,8 +1792,8 @@ failed: DeleteFileW(task_name); else if (remember) { - heap_free(This->task_name); - This->task_name = heap_strdupW(task_name); + free(This->task_name); + This->task_name = wcsdup(task_name); } } return hr; @@ -1901,7 +1901,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) { ITaskDefinition_Release(taskdef); @@ -1914,7 +1914,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task = taskdef; This->data = NULL; This->data_count = 0; - This->task_name = heap_strdupW(task_name); + This->task_name = wcsdup(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; This->exit_code = 0;

1 0

Alex Henrie : msado15: Use standard C functions for memory allocation in recordset.c.
by Alexandre Julliard Nov. 17, 2022

Nov. 17, 2022

Module: wine Branch: master Commit: 4899ff5828678b99f794c01fae4b7296ed077d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/4899ff5828678b99f794c01fae4b72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:44:05 2022 -0700 msado15: Use standard C functions for memory allocation in recordset.c. --- dlls/msado15/recordset.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 6d3b3ca352f..177938af2f7 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -26,7 +26,6 @@ #include "oledb.h" #include "wine/debug.h" -#include "wine/heap.h" #include "msado15_private.h" @@ -102,8 +101,8 @@ static ULONG WINAPI field_Release( Field *iface ) if (!refs) { TRACE( "destroying %p\n", field ); - heap_free( field->name ); - heap_free( field ); + free( field->name ); + free( field ); } return refs; } @@ -591,14 +590,14 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re { struct field *field; - if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; + if (!(field = calloc( 1, sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; field->Properties_iface.lpVtbl = &field_properties_vtbl; field->refs = 1; - if (!(field->name = strdupW( name ))) + if (!(field->name = wcsdup( name ))) { - heap_free( field ); + free( field ); return E_OUTOFMEMORY; } field->index = index; @@ -799,7 +798,7 @@ static BOOL resize_fields( struct fields *fields, ULONG count ) { Field **tmp; ULONG new_size = max( count, fields->allocated * 2 ); - if (!(tmp = heap_realloc( fields->field, new_size * sizeof(*tmp) ))) return FALSE; + if (!(tmp = realloc( fields->field, new_size * sizeof(*tmp) ))) return FALSE; fields->field = tmp; fields->allocated = new_size; } @@ -976,7 +975,7 @@ static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) { struct fields *fields; - if (!(fields = heap_alloc_zero( sizeof(*fields) ))) return E_OUTOFMEMORY; + if (!(fields = calloc( 1, sizeof(*fields) ))) return E_OUTOFMEMORY; fields->Fields_iface.lpVtbl = &fields_vtbl; fields->ISupportErrorInfo_iface.lpVtbl = &fields_supporterrorinfo_vtbl; fields->refs = 1; @@ -1034,7 +1033,7 @@ static void close_recordset( struct recordset *recordset ) for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); recordset->count = recordset->allocated = recordset->index = 0; - heap_free( recordset->data ); + free( recordset->data ); recordset->data = NULL; } @@ -1047,7 +1046,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) { TRACE( "destroying %p\n", recordset ); close_recordset( recordset ); - heap_free( recordset ); + free( recordset ); } return refs; } @@ -1339,7 +1338,8 @@ static BOOL resize_recordset( struct recordset *recordset, ULONG row_count ) { VARIANT *tmp; ULONG count = max( row_count, recordset->allocated * 2 ); - if (!(tmp = heap_realloc_zero( recordset->data, count * row_size ))) return FALSE; + if (!(tmp = realloc( recordset->data, count * row_size ))) return FALSE; + memset( tmp + recordset->allocated, 0, (count - recordset->allocated) * row_size ); recordset->data = tmp; recordset->allocated = count; } @@ -2121,7 +2121,7 @@ HRESULT Recordset_create( void **obj ) { struct recordset *recordset; - if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; + if (!(recordset = calloc( 1, sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->ADORecordsetConstruction_iface.lpVtbl = &rsconstruction_vtbl;

1 0