July 2023 - Wine-Commits - list.winehq.org

Jactry Zeng : wordpad: Resize buttons of toolbar to make them align with height of the font list combox.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: fcfbafe41950858741266b2f5dadcc144133510f URL: https://gitlab.winehq.org/wine/wine/-/commit/fcfbafe41950858741266b2f5dadcc… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 12 03:35:11 2023 -0500 wordpad: Resize buttons of toolbar to make them align with height of the font list combox. The current size set to these buttons is too small when in HiDPI. (cherry picked from commit 996271fc2ff63ea4df21b65ced1dce6de7075311) --- programs/wordpad/wordpad.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4a3aa2375bf..2a0d380a101 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1937,6 +1937,8 @@ static LRESULT OnCreate( HWND hWnd ) GetWindowRect(hFontListWnd, &rect); height = max(height, rect.bottom - rect.top); + SendMessageW(hToolBarWnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); + rbb.cbSize = REBARBANDINFOW_V6_SIZE; rbb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_STYLE | RBBIM_ID; rbb.fStyle = RBBS_CHILDEDGE | RBBS_BREAK | RBBS_NOGRIPPER; @@ -1977,6 +1979,7 @@ static LRESULT OnCreate( HWND hWnd ) IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); SendMessageW(hFormatBarWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS); + SendMessageW(hFormatBarWnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);

1 0

Michael Stefaniuc : threadpoolwinrt: Forward a Release() to a Release() method.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 30bad5e164511a74785ab3361bc49ce931f5bb13 URL: https://gitlab.winehq.org/wine/wine/-/commit/30bad5e164511a74785ab3361bc49c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 18:59:16 2023 +0200 threadpoolwinrt: Forward a Release() to a Release() method. (cherry picked from commit 572a9f6a68c3ab4ac2dad54f279d8d239492b685) --- dlls/threadpoolwinrt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/threadpoolwinrt/main.c b/dlls/threadpoolwinrt/main.c index 9fa475487ca..fb59a777e30 100644 --- a/dlls/threadpoolwinrt/main.c +++ b/dlls/threadpoolwinrt/main.c @@ -202,7 +202,7 @@ static ULONG STDMETHODCALLTYPE async_info_AddRef(IAsyncInfo *iface) static ULONG STDMETHODCALLTYPE async_info_Release(IAsyncInfo *iface) { struct async_action *action = impl_from_IAsyncInfo(iface); - return IAsyncAction_AddRef(&action->IAsyncAction_iface); + return IAsyncAction_Release(&action->IAsyncAction_iface); } static HRESULT STDMETHODCALLTYPE async_info_GetIids(IAsyncInfo *iface, ULONG *iid_count, IID **iids)

1 0

Brendan Shanks : winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 8b798ab30ecf29379105d5e386893f537de127d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b798ab30ecf29379105d5e386893f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 9 15:22:44 2023 -0700 winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode. retina_on was being set (indirectly) by check_retina_status(), but it relies on retina_on itself. This resulted in incorrect (non-retina) monitor and work RECTs being cached, causing odd application bugs like a window that won't resize larger than 1/4 of the screen. Initialize retina_on to the value of retina_enabled, so later calls to check_retina_status() don't result in incorrect data being cached. (cherry picked from commit d2789ef0678619d7c56a9e0c1aaa06f582a41ee3) --- dlls/winemac.drv/macdrv_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index eeed9a4bcbe..db4426db782 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -383,6 +383,8 @@ static void setup_options(void) if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer))) retina_enabled = IS_OPTION_TRUE(buffer[0]); + retina_on = retina_enabled; + if (appkey) NtClose(appkey); if (hkey) NtClose(hkey); }

1 0

Brendan Shanks : winemac: Refactor constrain_window_frame() to use separate origin and size arguments.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 4c95c5b7f0247cf210e070d5f39631050e5815e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c95c5b7f0247cf210e070d5f39631… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:16:45 2023 -0700 winemac: Refactor constrain_window_frame() to use separate origin and size arguments. (cherry picked from commit 51f9bb766add67278093ed1020b37d0272687454) --- dlls/winemac.drv/window.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 896efb6a68e..2a7998762ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -216,7 +216,7 @@ static void macdrv_mac_to_window_rect(struct macdrv_win_data *data, RECT *rect) * Alter a window frame rectangle to fit within a) Cocoa's documented * limits, and b) sane sizes, like twice the desktop rect. */ -static void constrain_window_frame(CGRect* frame) +static void constrain_window_frame(CGPoint* origin, CGSize* size) { CGRect desktop_rect = macdrv_get_desktop_rect(); int max_width, max_height; @@ -224,12 +224,18 @@ static void constrain_window_frame(CGRect* frame) max_width = min(32000, 2 * CGRectGetWidth(desktop_rect)); max_height = min(32000, 2 * CGRectGetHeight(desktop_rect)); - if (frame->origin.x < -16000) frame->origin.x = -16000; - if (frame->origin.y < -16000) frame->origin.y = -16000; - if (frame->origin.x > 16000) frame->origin.x = 16000; - if (frame->origin.y > 16000) frame->origin.y = 16000; - if (frame->size.width > max_width) frame->size.width = max_width; - if (frame->size.height > max_height) frame->size.height = max_height; + if (origin) + { + if (origin->x < -16000) origin->x = -16000; + if (origin->y < -16000) origin->y = -16000; + if (origin->x > 16000) origin->x = 16000; + if (origin->y > 16000) origin->y = 16000; + } + if (size) + { + if (size->width > max_width) size->width = max_width; + if (size->height > max_height) size->height = max_height; + } } @@ -698,7 +704,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) get_cocoa_window_features(data, style, ex_style, &wf, &data->window_rect, &data->client_rect); frame = cgrect_from_rect(data->whole_rect); - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1; @@ -1139,7 +1145,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c { if (data->minimized) return; - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1;

1 0

Brendan Shanks : winemac: Don't constrain surface dimensions to the onscreen part of a window.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 625f480cbf12f9085b89dec8149e9f4b204f7814 URL: https://gitlab.winehq.org/wine/wine/-/commit/625f480cbf12f9085b89dec8149e9f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 30 16:32:21 2023 -0700 winemac: Don't constrain surface dimensions to the onscreen part of a window. Fixes an issue where a window's image would be stretched as it was moved further offscreen. The offscreen part of a window also did not display correctly in Exposé. (cherry picked from commit 06011209d7fac818c1ffd268ef083dafea6c013b) --- dlls/winemac.drv/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3690585127..104100a0770 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,10 +2037,8 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) static inline RECT get_surface_rect(const RECT *visible_rect) { - RECT rect; - RECT desktop_rect = rect_from_cgrect(macdrv_get_desktop_rect()); + RECT rect = *visible_rect; - intersect_rect(&rect, visible_rect, &desktop_rect); OffsetRect(&rect, -visible_rect->left, -visible_rect->top); rect.left &= ~127; rect.top &= ~127;

1 0

Paul Gofman : ntdll: Avoid integer overflow in block_get_subheap().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 98827fd7aeb19f810bec5cc2ddb08ea5efe99e49 URL: https://gitlab.winehq.org/wine/wine/-/commit/98827fd7aeb19f810bec5cc2ddb08e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 21 19:19:20 2023 -0600 ntdll: Avoid integer overflow in block_get_subheap(). (cherry picked from commit 27c4c64c367f47fe7914c5c87596e6cf3501dbd6) --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index aafbbd0f523..e71c11506de 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -260,7 +260,7 @@ static inline void block_set_type( struct block *block, UINT type ) static inline SUBHEAP *block_get_subheap( const struct heap *heap, const struct block *block ) { char *offset = ROUND_ADDR( block, REGION_ALIGN - 1 ); - void *base = offset - block->base_offset * REGION_ALIGN; + void *base = offset - (SIZE_T)block->base_offset * REGION_ALIGN; if (base != (void *)heap) return base; else return (SUBHEAP *)&heap->subheap; }

1 0

Brendan Shanks : winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 9e5dfd3e9ecd34b1bc555eb960eef992be690eb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e5dfd3e9ecd34b1bc555eb960eef9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:27:57 2023 -0700 winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame(). (cherry picked from commit 88a09dd3348c57595e7076d705af25fc0e9267ab) --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2a7998762ac..a3690585127 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -641,6 +641,8 @@ static void sync_window_min_max_info(HWND hwnd) max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); } + constrain_window_frame(NULL, &max_size); + TRACE("min_size (%g,%g) max_size (%g,%g)\n", min_size.width, min_size.height, max_size.width, max_size.height); macdrv_set_window_min_max_sizes(data->cocoa_window, min_size, max_size); }

1 0

Ziqing Hui : mfreadwrite: Fix an address of operator typo.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: b86fa6cbf40420d3bd5e7f767feca586c0fbf44c URL: https://gitlab.winehq.org/wine/wine/-/commit/b86fa6cbf40420d3bd5e7f767feca5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 19 16:23:32 2023 +0800 mfreadwrite: Fix an address of operator typo. (cherry picked from commit d1c317720ab6a92811c013408844ffd9e581b2a2) --- dlls/mfreadwrite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index aaf972734c4..83b0442b20e 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -1070,7 +1070,7 @@ static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttribute for (i = 0; i < ARRAY_SIZE(class_map); ++i) { - if (IsEqualGUID(&container, &class_map[i].container)) + if (IsEqualGUID(&container, class_map[i].container)) { *clsid = *class_map[i].clsid; return S_OK;

1 0

Biswapriyo Nath : include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: fe80246ccd7878630a16c277093c1dac0171aa54 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe80246ccd7878630a16c277093c1d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Apr 11 01:07:00 2023 +0530 include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl. This matches the declaration with official documentation and fixes the following two compiler errors in apitrace project. d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive] d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive] Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> (cherry picked from commit 467604c6613e7a41201e0af34f009700bc8ac392) --- dlls/dxva2/main.c | 4 ++-- include/dxva2api.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index c5ca3439a68..d48cf8de230 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi } static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) + REFGUID guid, const DXVA2_VideoDesc *video_desc, void *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) { FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs); @@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID } static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface, - REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, + REFGUID guid, const DXVA2_VideoDesc *video_desc, const DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, UINT num_surfaces, IDirectXVideoDecoder **decoder) { FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 63de780f0df..205491e3790 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService HRESULT GetDecoderConfigurations( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] IUnknown *pReserved, + [in] void *pReserved, [out] UINT *pCount, [out] DXVA2_ConfigPictureDecode **ppConfigs); HRESULT CreateVideoDecoder( [in] REFGUID guid, [in] const DXVA2_VideoDesc *pVideoDesc, - [in] DXVA2_ConfigPictureDecode *pConfig, + [in] const DXVA2_ConfigPictureDecode *pConfig, [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode);

1 0

Biswapriyo Nath : include: Fix c++ compiler error with msxml2.idl.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: e0a74372f3778a0bba2007e6b9aabe5901bfda79 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0a74372f3778a0bba2007e6b9aabe… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Mar 27 11:44:18 2023 +0530 include: Fix c++ compiler error with msxml2.idl. This moves ISAXXMLFilter declaration after its base class ISAXXMLReader. Otherwise the following error is shown in C++ mode $ wineg++ test-msxml2.cpp In file included from test-msxml2.cpp:1: /usr/include/wine/windows/msxml2.h:16199:24: error: invalid use of incomplete type ‘struct ISAXXMLReader’ 16199 | ISAXXMLFilter : public ISAXXMLReader | ^~~~~~~~~~~~~ /usr/include/wine/windows/msxml2.h:644:19: note: forward declaration of ‘struct ISAXXMLReader’ 644 | typedef interface ISAXXMLReader ISAXXMLReader; | ^~~~~~~~~~~~~ winegcc: /usr/bin/g++ failed Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> (cherry picked from commit 787c3f73f8a3d4dc9dd653245f4967998d239be1) --- include/msxml2.idl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index 916e0e8ab3d..ede4113ecbf 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -2125,20 +2125,7 @@ interface ISAXLocator : IUnknown [ local, object, - uuid(70409222-ca09-4475-acb8-40312fe8d145) -] -interface ISAXXMLFilter : ISAXXMLReader -{ - HRESULT getParent( - [out, retval] ISAXXMLReader ** pReader); - HRESULT putParent( - [in] ISAXXMLReader * reader); -} - -[ -local, -object, -uuid (a4f96ed0-f829-476e-81c0-cdc7bd2a0802) + uuid(a4f96ed0-f829-476e-81c0-cdc7bd2a0802) ] interface ISAXXMLReader : IUnknown { @@ -2192,6 +2179,19 @@ interface ISAXXMLReader : IUnknown [in] const WCHAR * url); } +[ + local, + object, + uuid(70409222-ca09-4475-acb8-40312fe8d145) +] +interface ISAXXMLFilter : ISAXXMLReader +{ + HRESULT getParent( + [out, retval] ISAXXMLReader ** pReader); + HRESULT putParent( + [in] ISAXXMLReader * reader); +} + [ object, dual,

1 0