November 2022 - Wine-commits

Zhiyi Zhang : explorer/tests: Add taskbar tests.
by Alexandre Julliard 17 Nov '22

17 Nov '22

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

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

17 Nov '22

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 : dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 6a57ed804a37a3697c1ba9af8caccc2f6a212145 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a57ed804a37a3697c1ba9af8caccc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 17 15:46:52 2022 +0800 dwmapi: Fallback to 60Hz if the display frequency is invalid in get_display_frequency(). DwmGetCompositionTimingInfo() may throw a zero division exception if the display reports a 0Hz frequency, which can happen when testing under Xephyr without -fakescreenfps option. --- dlls/dwmapi/dwmapi_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 1a65410c7eb..56730f79cac 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -213,12 +213,16 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i static int get_display_frequency(void) { - DEVMODEA mode; + DEVMODEW mode; + BOOL ret; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode)) + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0); + if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency) + { return mode.dmDisplayFrequency; + } else { WARN("Failed to query display frequency, returning a fallback value.\n");

1 0

Alex Henrie : msxml3: Remove unused function heap_strdupW.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 0a5932e1a714d2938b397bdd85bbcfefd4bd8011 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a5932e1a714d2938b397bdd85bbcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 23:54:09 2022 -0700 msxml3: Remove unused function heap_strdupW. This function has not been used since commit 5b43c42c8832f3e6d0b70a54b01938f43b950647. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8003c1a9650..e41b7c9979d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -85,22 +85,6 @@ static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t siz return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -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; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Nikolay Sivov : oleaut32/tests: Add a test for VT_NULL input for VarFormatDateTime().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 41f456f3a48896a10392836a76008f916563c32d URL: https://gitlab.winehq.org/wine/wine/-/commit/41f456f3a48896a10392836a76008f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 17:25:17 2022 +0300 oleaut32/tests: Add a test for VT_NULL input for VarFormatDateTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/varformat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 16506d8e97f..bc3b6c175f9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -659,6 +659,19 @@ static void test_VarFormatCurrency(void) VariantClear(&in); } +static void test_VarFormatDateTime(void) +{ + VARIANT in; + HRESULT hr; + BSTR str; + + V_VT(&in) = VT_NULL; + str = (void *)0xdeadbeef; + hr = VarFormatDateTime(&in, 0, 0, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!str, "Unexpected out string %p.\n", str); +} + START_TEST(varformat) { test_VarFormatNumber(); @@ -667,4 +680,5 @@ START_TEST(varformat) test_VarFormatFromTokens(); test_GetAltMonthNames(); test_VarFormatCurrency(); + test_VarFormatDateTime(); }

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in client.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: a407ba9fe1a2e81ee70c8afb6d445417bd163166 URL: https://gitlab.winehq.org/wine/wine/-/commit/a407ba9fe1a2e81ee70c8afb6d4454… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:06:41 2022 -0700 dpnet: Use standard C functions for memory allocation in client.c. --- dlls/dpnet/client.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 4af8daf6d3e..c3d25f5ea6b 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -87,9 +87,9 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) if (!ref) { - heap_free(This->username); - heap_free(This->data); - heap_free(This); + free(This->username); + free(This->data); + free(This); } return ref; } @@ -217,12 +217,12 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->username); + free(This->username); This->username = NULL; if(pdpnPlayerInfo->pwszName) { - This->username = heap_strdupW(pdpnPlayerInfo->pwszName); + This->username = wcsdup(pdpnPlayerInfo->pwszName); if (!This->username) return E_OUTOFMEMORY; } @@ -230,7 +230,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->data = NULL; This->datasize = 0; @@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) { - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -393,7 +393,7 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, if(pUnkOuter) return CLASS_E_NOAGGREGATION; - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); + client = calloc(1, sizeof(IDirectPlay8ClientImpl)); if (!client) return E_OUTOFMEMORY; @@ -448,7 +448,7 @@ static ULONG WINAPI lobbyclient_Release(IDirectPlay8LobbyClient *iface) if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -564,7 +564,7 @@ HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *outer TRACE("%p (%p, %s, %p)\n", iface, outer, debugstr_guid(riid), obj); - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*client)); + client = calloc(1, sizeof(*client)); if (!client) { *obj = NULL;

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in peer.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 8ef070b6c27eddf5faa162e0896646fb7e3c2674 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ef070b6c27eddf5faa162e0896646… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:07:40 2022 -0700 dpnet: Use standard C functions for memory allocation in peer.c. --- dlls/dpnet/peer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index bbcda6a72c2..143be9aa5eb 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -92,10 +92,10 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) if(!RefCount) { - heap_free(This->username); - heap_free(This->data); + free(This->username); + free(This->data); - heap_free(This); + free(This); } return RefCount; @@ -389,12 +389,12 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->username); + free(This->username); This->username = NULL; if(pdpnPlayerInfo->pwszName) { - This->username = heap_strdupW(pdpnPlayerInfo->pwszName); + This->username = wcsdup(pdpnPlayerInfo->pwszName); if (!This->username) return E_OUTOFMEMORY; } @@ -402,10 +402,10 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->datasize = pdpnPlayerInfo->dwDataSize; - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -638,7 +638,7 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R IDirectPlay8PeerImpl* Client; HRESULT ret; - Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8PeerImpl)); + Client = calloc(1, sizeof(IDirectPlay8PeerImpl)); *ppobj = NULL;

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in server.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: e2d94b5cdf7aa5ff8f145ba841fe8a79eb0aad5f URL: https://gitlab.winehq.org/wine/wine/-/commit/e2d94b5cdf7aa5ff8f145ba841fe8a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:08:27 2022 -0700 dpnet: Use standard C functions for memory allocation in server.c. --- dlls/dpnet/server.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 8a8ed04642d..923d0d5bfa5 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -95,9 +95,9 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) if (!ref) { - heap_free(This->servername); - heap_free(This->data); - heap_free(This); + free(This->servername); + free(This->data); + free(This); } return ref; @@ -182,12 +182,12 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->servername); + free(This->servername); This->servername = NULL; if(pdpnPlayerInfo->pwszName) { - This->servername = heap_strdupW(pdpnPlayerInfo->pwszName); + This->servername = wcsdup(pdpnPlayerInfo->pwszName); if (!This->servername) return E_OUTOFMEMORY; } @@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->data = NULL; This->datasize = 0; @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) { - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -460,7 +460,7 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter, if(pUnkOuter) return CLASS_E_NOAGGREGATION; - server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ServerImpl)); + server = calloc(1, sizeof(IDirectPlay8ServerImpl)); if (!server) return E_OUTOFMEMORY;

1 0

Alex Henrie : dpnet: Remove unused function heap_strdupW.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: f6f89bf67d6327b4e5741d38c706b8aade8ad898 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6f89bf67d6327b4e5741d38c706b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:08:55 2022 -0700 dpnet: Remove unused function heap_strdupW. --- dlls/dpnet/dpnet_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 9458a5123aa..2e36b9ffeee 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -21,7 +21,6 @@ #ifndef __WINE_DPNET_PRIVATE_H #define __WINE_DPNET_PRIVATE_H -#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" @@ -150,12 +149,4 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline WCHAR *heap_strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - #endif

1 0

Nikolay Sivov : d2d1: Derive shared bitmap format from the source bitmap.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: a50dbd6c15f5d55cf47ca9900d7ad3c8788f9648 URL: https://gitlab.winehq.org/wine/wine/-/commit/a50dbd6c15f5d55cf47ca9900d7ad3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 07:32:05 2022 +0300 d2d1: Derive shared bitmap format from the source bitmap. --- dlls/d2d1/bitmap.c | 12 ++++++++-- dlls/d2d1/tests/d2d1.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 1cba26f5ca4..316d0f25ad6 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -544,15 +544,23 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - if (!desc) + if (desc) + { + d = *desc; + if (d.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + d.pixelFormat.format = src_impl->format.format; + if (d.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) + d.pixelFormat.alphaMode = src_impl->format.alphaMode; + } + else { d.pixelFormat = src_impl->format; d.dpiX = src_impl->dpi_x; d.dpiY = src_impl->dpi_y; d.bitmapOptions = src_impl->options; d.colorContext = NULL; - desc = &d; } + desc = &d; if (!format_supported(&desc->pixelFormat)) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1935955ec84..47efba66447 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5254,6 +5254,68 @@ static void test_shared_bitmap(BOOL d3d11) } } + ID2D1Bitmap_Release(bitmap1); + + /* Create from another bitmap, with a different description. */ + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt2, size, NULL, 0, &bitmap_desc, &bitmap1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + { + static const struct bitmap_format_test + { + D2D1_PIXEL_FORMAT original; + D2D1_PIXEL_FORMAT result; + HRESULT hr; + } + bitmap_format_tests[] = + { + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(bitmap_format_tests); ++i) + { + bitmap_desc.pixelFormat = bitmap_format_tests[i].original; + + hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, &bitmap_desc, &bitmap2); + ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr); + + if (SUCCEEDED(hr) && hr == bitmap_format_tests[i].hr) + { + pixel_format = ID2D1Bitmap_GetPixelFormat(bitmap2); + ok(pixel_format.format == bitmap_format_tests[i].result.format, "%u: unexpected pixel format %#x.\n", + i, pixel_format.format); + ok(pixel_format.alphaMode == bitmap_format_tests[i].result.alphaMode, "%u: unexpected alpha mode %d.\n", + i, pixel_format.alphaMode); + } + + if (SUCCEEDED(hr)) + ID2D1Bitmap_Release(bitmap2); + } + } + ID2D1RenderTarget_Release(rt2); ID2D1Bitmap_Release(bitmap1);

1 0