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

Zebediah Figura : d3d8: Hold a reference to the wined3d swapchain from d3d8 swapchain surfaces.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 3ba9a7f7b4acc016c9a7e9a41f6e17a5a413a900 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ba9a7f7b4acc016c9a7e9a41f6e17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 7 17:48:18 2023 -0500 d3d8: Hold a reference to the wined3d swapchain from d3d8 swapchain surfaces. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/surface.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 69e16a50c3a..181a952a347 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -199,6 +199,7 @@ struct d3d8_surface IDirect3DDevice8 *parent_device; IUnknown *container; struct d3d8_texture *texture; + struct wined3d_swapchain *swapchain; }; struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index b4545ca3657..37d225ede70 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -69,6 +69,8 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); + if (surface->swapchain) + wined3d_swapchain_incref(surface->swapchain); } return refcount; @@ -102,6 +104,10 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); + if (surface->swapchain) + wined3d_swapchain_decref(surface->swapchain); + /* Releasing the texture may free the d3d8 object, so do not access it + * after releasing the texture. */ wined3d_texture_decref(surface->wined3d_texture); if (parent_device) @@ -325,6 +331,7 @@ struct d3d8_surface *d3d8_surface_create(struct wined3d_texture *wined3d_texture surface->container = container; surface->wined3d_texture = wined3d_texture; surface->sub_resource_idx = sub_resource_idx; + surface->swapchain = wined3d_texture_get_swapchain(wined3d_texture); if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container, &IID_IDirect3DBaseTexture8, (void **)&texture)))

1 0

Zebediah Figura : d3d11: Hold a reference to the wined3d swapchain from d3d11 swapchain textures.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 30a7487b702b47c42293942b5334685a159003e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/30a7487b702b47c42293942b533468… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 19:20:15 2023 -0500 d3d11: Hold a reference to the wined3d swapchain from d3d11 swapchain textures. --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 226d7b6b4e1..6177f24afe3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -138,6 +138,7 @@ struct d3d_texture2d IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; + struct wined3d_swapchain *swapchain; D3D11_TEXTURE2D_DESC desc; ID3D11Device2 *device; }; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 5cd7df11f1f..1221fa035ba 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -558,6 +558,8 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) { ID3D11Device2_AddRef(texture->device); wined3d_texture_incref(texture->wined3d_texture); + if (texture->swapchain) + wined3d_swapchain_incref(texture->swapchain); } return refcount; @@ -573,6 +575,10 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { ID3D11Device2 *device = texture->device; + if (texture->swapchain) + wined3d_swapchain_decref(texture->swapchain); + /* Releasing the texture may free the d3d11 object, so do not access it + * after releasing the texture. */ wined3d_texture_decref(texture->wined3d_texture); /* Release the device last, it may cause the wined3d device to be * destroyed. */ @@ -984,6 +990,9 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE texture, &d3d_texture2d_wined3d_parent_ops); wined3d_texture_incref(wined3d_texture); texture->wined3d_texture = wined3d_texture; + + if ((texture->swapchain = wined3d_texture_get_swapchain(wined3d_texture))) + wined3d_swapchain_incref(texture->swapchain); } else {

1 0

Zebediah Figura : d3d9: Hold a reference to the wined3d swapchain from d3d9 swapchain surfaces.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: f97163f4eaaeff8fb3705d221cc9156f9bcdd9e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f97163f4eaaeff8fb3705d221cc915… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 7 17:44:50 2023 -0500 d3d9: Hold a reference to the wined3d swapchain from d3d9 swapchain surfaces. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/surface.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 53c73853e46..cb86ce678fb 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -176,6 +176,7 @@ struct d3d9_surface IDirect3DDevice9Ex *parent_device; IUnknown *container; struct d3d9_texture *texture; + struct wined3d_swapchain *swapchain; }; struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index df94aad3c59..f0cc36da3a1 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -70,6 +70,8 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); + if (surface->swapchain) + wined3d_swapchain_incref(surface->swapchain); } return refcount; @@ -103,6 +105,10 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); + if (surface->swapchain) + wined3d_swapchain_decref(surface->swapchain); + /* Releasing the texture may free the d3d9 object, so do not access it + * after releasing the texture. */ wined3d_texture_decref(surface->wined3d_texture); /* Release the device last, as it may cause the device to be destroyed. */ @@ -363,6 +369,7 @@ struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture surface->container = container; surface->wined3d_texture = wined3d_texture; surface->sub_resource_idx = sub_resource_idx; + surface->swapchain = wined3d_texture_get_swapchain(wined3d_texture); if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container, &IID_IDirect3DBaseTexture9, (void **)&texture)))

1 0

Zebediah Figura : d3d9/tests: Add some more tests for accessing an old backbuffer surface after a reset.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: eae87051847d27689a507e684b4942f2f2a3a12c URL: https://gitlab.winehq.org/wine/wine/-/commit/eae87051847d27689a507e684b4942… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 7 17:14:22 2023 -0500 d3d9/tests: Add some more tests for accessing an old backbuffer surface after a reset. --- dlls/d3d9/tests/d3d9ex.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 41f930a2408..0915d50107f 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3813,9 +3813,11 @@ static void test_swapchain_parameters(void) static void test_backbuffer_resize(void) { D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSwapChain9 *swapchain, *old_swapchain; IDirect3DSurface9 *backbuffer, *old_backbuffer; + IDirect3DDevice9Ex *device, *device2; + IDirect3DBaseTexture9 *texture; D3DSURFACE_DESC surface_desc; - IDirect3DDevice9Ex *device; unsigned int color; ULONG refcount; HWND window; @@ -3861,6 +3863,16 @@ static void test_backbuffer_resize(void) color = get_pixel_color(device, 1, 1); ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_GetSwapChain(device, 0, &old_swapchain); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DSurface9_GetContainer(backbuffer, &IID_IDirect3DSwapChain9, (void **)&swapchain); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(swapchain == old_swapchain, "Swapchains didn't match.\n"); + IDirect3DSwapChain9_Release(swapchain); + hr = IDirect3DSurface9_GetContainer(backbuffer, &IID_IDirect3DDevice9, (void **)&device2); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + present_parameters.BackBufferWidth = 800; present_parameters.BackBufferHeight = 600; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; @@ -3877,6 +3889,27 @@ static void test_backbuffer_resize(void) ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#lx.\n", hr); todo_wine ok(surface_desc.Width == 640, "Got unexpected width %u.\n", surface_desc.Width); todo_wine ok(surface_desc.Height == 480, "Got unexpected height %u.\n", surface_desc.Height); + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(swapchain == old_swapchain, "Swapchains didn't match.\n"); + IDirect3DSwapChain9_Release(swapchain); + IDirect3DSwapChain9_Release(old_swapchain); + + hr = IDirect3DSurface9_GetContainer(old_backbuffer, &IID_IDirect3DSwapChain9, (void **)&swapchain); + todo_wine ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + if (hr == S_OK) + IDirect3DSwapChain9_Release(swapchain); + hr = IDirect3DSurface9_GetContainer(old_backbuffer, &IID_IDirect3DBaseTexture9, (void **)&texture); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_GetContainer(old_backbuffer, &IID_IDirect3DDevice9, (void **)&device2); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + { + ok(device2 == device, "Devices didn't match.\n"); + IDirect3DDevice9_Release(device2); + } + refcount = IDirect3DSurface9_Release(old_backbuffer); ok(!refcount, "Surface has %lu references left.\n", refcount);

1 0

Michael Stefaniuc : d2d1: Remove superfluous casts to self.
by Alexandre Julliard May 10, 2023

May 10, 2023

Module: wine Branch: master Commit: 3d8e7ea69fe182675c57af2281304fc327b73cd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d8e7ea69fe182675c57af2281304f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 18:38:01 2023 +0200 d2d1: Remove superfluous casts to self. --- dlls/d2d1/brush.c | 2 +- dlls/d2d1/device.c | 2 +- dlls/d2d1/tests/d2d1.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 98aa889aa5f..75cd72b5b9f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1258,7 +1258,7 @@ static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, I TRACE("iface %p, image %p.\n", iface, image); - if ((*image = (ID2D1Image *)brush->u.image.image)) + if ((*image = brush->u.image.image)) ID2D1Image_AddRef(*image); } diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 89d17149ca4..93fcecf72ba 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2338,7 +2338,7 @@ static void STDMETHODCALLTYPE d2d_device_context_GetDevice(ID2D1DeviceContext1 * TRACE("iface %p, device %p.\n", iface, device); - *device = (ID2D1Device *)context->device; + *device = context->device; ID2D1Device_AddRef(*device); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 93a8c6b43b8..aedae45ca98 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9786,7 +9786,7 @@ static void test_command_list(BOOL d3d11) stroke_desc.dashStyle = D2D1_DASH_STYLE_DOT; stroke_desc.dashOffset = -1.0f; - hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)ctx.factory, &stroke_desc, NULL, 0, &stroke_style); + hr = ID2D1Factory_CreateStrokeStyle(ctx.factory, &stroke_desc, NULL, 0, &stroke_style); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);

1 0

Nikolay Sivov : mfplat/tests: Add another test for MFCopyImage().
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: de034b36b7fbad0edae0a2700376273c74e48ac6 URL: https://gitlab.winehq.org/wine/wine/-/commit/de034b36b7fbad0edae0a270037627… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 9 21:43:46 2023 +0200 mfplat/tests: Add another test for MFCopyImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ded95ec1d5a..380850da08a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3144,7 +3144,7 @@ static void test_allocate_queue(void) static void test_MFCopyImage(void) { - BYTE dest[16], src[16]; + DWORD dest[4], src[4]; HRESULT hr; if (!pMFCopyImage) @@ -3156,21 +3156,36 @@ static void test_MFCopyImage(void) memset(dest, 0xaa, sizeof(dest)); memset(src, 0x11, sizeof(src)); - hr = pMFCopyImage(dest, 8, src, 8, 4, 1); + hr = pMFCopyImage((BYTE *)dest, 8, (const BYTE *)src, 8, 4, 1); ok(hr == S_OK, "Failed to copy image %#lx.\n", hr); - ok(!memcmp(dest, src, 4) && dest[4] == 0xaa, "Unexpected buffer contents.\n"); + ok(dest[0] == src[0] && dest[1] == 0xaaaaaaaa, "Unexpected buffer contents.\n"); + + /* Negative destination stride. */ + memset(dest, 0xaa, sizeof(dest)); + + src[0] = 0x11111111; + src[1] = 0x22222222; + src[2] = 0x33333333; + src[3] = 0x44444444; + + hr = pMFCopyImage((BYTE *)(dest + 2), -8, (const BYTE *)src, 8, 4, 2); + ok(hr == S_OK, "Failed to copy image %#lx.\n", hr); + ok(dest[0] == 0x33333333, "Unexpected buffer contents %#lx.\n", dest[0]); + ok(dest[1] == 0xaaaaaaaa, "Unexpected buffer contents %#lx.\n", dest[1]); + ok(dest[2] == 0x11111111, "Unexpected buffer contents %#lx.\n", dest[2]); + ok(dest[3] == 0xaaaaaaaa, "Unexpected buffer contents %#lx.\n", dest[3]); memset(dest, 0xaa, sizeof(dest)); memset(src, 0x11, sizeof(src)); - hr = pMFCopyImage(dest, 8, src, 8, 16, 1); + hr = pMFCopyImage((BYTE *)dest, 8, (const BYTE *)src, 8, 16, 1); ok(hr == S_OK, "Failed to copy image %#lx.\n", hr); ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); memset(dest, 0xaa, sizeof(dest)); memset(src, 0x11, sizeof(src)); - hr = pMFCopyImage(dest, 8, src, 8, 8, 2); + hr = pMFCopyImage((BYTE *)dest, 8, (const BYTE *)src, 8, 8, 2); ok(hr == S_OK, "Failed to copy image %#lx.\n", hr); ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); }

1 0

Michael Stefaniuc : dbgeng: Avoid casts to IUnknown* in IUnknown method calls.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: d0e5f14a6eb82e9fe1135bc59e847b9aa202279a URL: https://gitlab.winehq.org/wine/wine/-/commit/d0e5f14a6eb82e9fe1135bc59e847b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 21:36:42 2023 +0200 dbgeng: Avoid casts to IUnknown* in IUnknown method calls. --- dlls/dbgeng/dbgeng.c | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 6d4710163c9..cc29ffc69ed 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -1162,22 +1162,19 @@ static const IDebugClient7Vtbl debugclientvtbl = static HRESULT STDMETHODCALLTYPE debugdataspaces_QueryInterface(IDebugDataSpaces *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugdataspaces_AddRef(IDebugDataSpaces *iface) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugdataspaces_Release(IDebugDataSpaces *iface) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, @@ -1391,22 +1388,19 @@ static const IDebugDataSpacesVtbl debugdataspacesvtbl = static HRESULT STDMETHODCALLTYPE debugsymbols_QueryInterface(IDebugSymbols3 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugsymbols_AddRef(IDebugSymbols3 *iface) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugsymbols_Release(IDebugSymbols3 *iface) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *iface, ULONG *options) @@ -2690,22 +2684,19 @@ static const IDebugSymbols3Vtbl debugsymbolsvtbl = static HRESULT STDMETHODCALLTYPE debugcontrol_QueryInterface(IDebugControl4 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugcontrol_AddRef(IDebugControl4 *iface) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugcontrol_Release(IDebugControl4 *iface) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterrupt(IDebugControl4 *iface) @@ -4278,19 +4269,19 @@ static const IDebugControl4Vtbl debugcontrolvtbl = static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced3 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_QueryInterface((IUnknown *)&debug_client->IDebugClient_iface, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced3 *iface) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_AddRef((IUnknown *)&debug_client->IDebugClient_iface); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced3 *iface) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_Release((IUnknown *)&debug_client->IDebugClient_iface); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced3 *iface, void *context, @@ -4404,22 +4395,19 @@ static const IDebugAdvanced3Vtbl debugadvancedvtbl = static HRESULT STDMETHODCALLTYPE debugsystemobjects_QueryInterface(IDebugSystemObjects *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugsystemobjects_AddRef(IDebugSystemObjects *iface) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugsystemobjects_Release(IDebugSystemObjects *iface) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetEventThread(IDebugSystemObjects *iface, ULONG *id) @@ -4700,7 +4688,6 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) HRESULT WINAPI DebugCreate(REFIID riid, void **obj) { struct debug_client *debug_client; - IUnknown *unk; HRESULT hr; TRACE("%s, %p.\n", debugstr_guid(riid), obj); @@ -4717,10 +4704,8 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->refcount = 1; list_init(&debug_client->targets); - unk = (IUnknown *)&debug_client->IDebugClient_iface; - - hr = IUnknown_QueryInterface(unk, riid, obj); - IUnknown_Release(unk); + hr = IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); + IUnknown_Release(&debug_client->IDebugClient_iface); return hr; }

1 0

Rémi Bernon : imm32/tests: Mark some tests as broken by prior SetForegroundWindow call.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: c11ed566cb762850f2fe84e68025c8f9071b2244 URL: https://gitlab.winehq.org/wine/wine/-/commit/c11ed566cb762850f2fe84e68025c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 9 17:15:39 2023 +0200 imm32/tests: Mark some tests as broken by prior SetForegroundWindow call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54760 --- dlls/imm32/tests/imm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 456c5d88b7e..4bdb6be4a31 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -5012,7 +5012,7 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_OPENSTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc, @@ -5046,7 +5046,7 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_CLOSESTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc, @@ -5203,7 +5203,7 @@ static void test_ImmCreateInputContext(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_OPENSTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, {0}, }; @@ -5258,7 +5258,7 @@ static void test_ImmCreateInputContext(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_CLOSESTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc,

1 0

Michael Stefaniuc : dxdiagn: Avoid assigning COM objects to interface variables.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: e4b30b46c348b63eb07d5721338bfaad3353f8d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4b30b46c348b63eb07d5721338bfa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 18:27:29 2023 +0200 dxdiagn: Avoid assigning COM objects to interface variables. --- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/provider.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index efc8cba448e..2627c321fa1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -42,7 +42,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(IDxDiagContainer *ifac if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagContainer)) { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = &This->IDxDiagContainer_iface; return S_OK; } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index d4a58dc45bc..0df10ea56ef 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -70,7 +70,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(IDxDiagProvider *iface, if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagProvider)) { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = &This->IDxDiagProvider_iface; return S_OK; }

1 0

Piotr Caban : wineps: Copy GetTextMetrics implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: df0417831a01f025b8f6e326c8de0e40c5ab674d URL: https://gitlab.winehq.org/wine/wine/-/commit/df0417831a01f025b8f6e326c8de0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:54:32 2023 +0200 wineps: Copy GetTextMetrics implementation to unixlib. --- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 8c2c6d4af4b..66c052db27c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -694,7 +694,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, - .pGetTextMetrics = PSDRV_GetTextMetrics, .priority = GDI_PRIORITY_GRAPHICS_DRV }; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 283c5b8d4a7..d7f8eb7e9a9 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1191,6 +1191,21 @@ static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHA return TRUE; } +static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + + if (pdev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV(dev, pGetTextMetrics); + return dev->funcs->pGetTextMetrics(dev, metrics); + } + + memcpy(metrics, &(pdev->font.fontinfo.Builtin.tm), + sizeof(pdev->font.fontinfo.Builtin.tm)); + return TRUE; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1201,6 +1216,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pSelectFont = select_font; params->funcs->pEnumFonts = enum_fonts; params->funcs->pGetCharWidth = get_char_width; + params->funcs->pGetTextMetrics = get_text_metrics; return TRUE; }

1 0