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

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

10 May '23

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

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

10 May '23

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 : d3d8: Hold a reference to the wined3d swapchain from d3d8 swapchain surfaces.
by Alexandre Julliard 10 May '23

10 May '23

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 10 May '23

10 May '23

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

Michael Stefaniuc : d2d1: Remove superfluous casts to self.
by Alexandre Julliard 10 May '23

10 May '23

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 09 May '23

09 May '23

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

Piotr Caban : wineps: Move EnumFonts implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: a52167e76241cc6719255e1b4454a8bf0f17649c URL: https://gitlab.winehq.org/wine/wine/-/commit/a52167e76241cc6719255e1b4454a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:35:14 2023 +0200 wineps: Move EnumFonts implementation to unixlib. --- dlls/wineps.drv/builtin.c | 80 --------------------------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/printproc.c | 6 ---- dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/unixlib.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 88 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 5100539764d..f661aeaa591 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -374,83 +374,3 @@ BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR * return TRUE; } - - -/*********************************************************************** - * PSDRV_GetFontMetric - */ -static UINT PSDRV_GetFontMetric(HDC hdc, const AFM *afm, - NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) -{ - /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ - - TEXTMETRICW *tm = (TEXTMETRICW *)&(ntmx->ntmTm); - LOGFONTW *lf = &(elfx->elfLogFont); - PSFONT font; - - memset(ntmx, 0, sizeof(*ntmx)); - memset(elfx, 0, sizeof(*elfx)); - - ScaleFont(afm, -(LONG)(afm->WinMetrics.usUnitsPerEm), &font, tm); - - lf->lfHeight = tm->tmHeight; - lf->lfWidth = tm->tmAveCharWidth; - lf->lfWeight = tm->tmWeight; - lf->lfItalic = tm->tmItalic; - lf->lfCharSet = tm->tmCharSet; - - lf->lfPitchAndFamily = (afm->IsFixedPitch) ? FIXED_PITCH : VARIABLE_PITCH; - - lstrcpynW(lf->lfFaceName, afm->FamilyName, LF_FACESIZE); - - return DEVICE_FONTTYPE; -} - -/*********************************************************************** - * PSDRV_EnumFonts - */ -BOOL CDECL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumFonts ); - ENUMLOGFONTEXW lf; - NEWTEXTMETRICEXW tm; - BOOL ret; - AFMLISTENTRY *afmle; - FONTFAMILY *family; - - ret = next->funcs->pEnumFonts( next, plf, proc, lp ); - if (!ret) return FALSE; - - if( plf && plf->lfFaceName[0] ) { - TRACE("lfFaceName = %s\n", debugstr_w(plf->lfFaceName)); - for(family = physDev->pi->Fonts; family; family = family->next) { - if(!wcsncmp(plf->lfFaceName, family->FamilyName, - wcslen(family->FamilyName))) - break; - } - if(family) { - for(afmle = family->afmlist; afmle; afmle = afmle->next) { - UINT fm; - - TRACE("Got '%s'\n", afmle->afm->FontName); - fm = PSDRV_GetFontMetric( dev->hdc, afmle->afm, &tm, &lf ); - if (!(ret = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp ))) - break; - } - } - } else { - - TRACE("lfFaceName = NULL\n"); - for(family = physDev->pi->Fonts; family; family = family->next) { - UINT fm; - - afmle = family->afmlist; - TRACE("Got '%s'\n", afmle->afm->FontName); - fm = PSDRV_GetFontMetric( dev->hdc, afmle->afm, &tm, &lf ); - if (!(ret = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp ))) - break; - } - } - return ret; -} diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a33ec19e741..576021c6b1e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pEnumFonts = PSDRV_EnumFonts, .pGetCharWidth = PSDRV_GetCharWidth, .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .pGetTextMetrics = PSDRV_GetTextMetrics, diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d7f9ab65369..bd4e79bb96f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,11 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_EnumFonts(PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lp) -{ - return EnumFontFamiliesExW(dev->hdc, lf, proc, lp, 0); -} - static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { XFORM old, xform = { .eM11 = 1.0f }; @@ -204,7 +199,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pEnumFonts = font_EnumFonts, .pGetCharWidth = font_GetCharWidth, .pGetTextExtentExPoint = font_GetTextExtentExPoint, .pGetTextMetrics = font_GetTextMetrics, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 038798df9eb..add30651043 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -429,7 +429,6 @@ extern BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bo extern BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 859d612320c..1dd9aafadb0 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1056,6 +1056,83 @@ static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) return hfont; } +static UINT get_font_metric(HDC hdc, const AFM *afm, + NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) +{ + /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ + TEXTMETRICW *tm = (TEXTMETRICW *)&(ntmx->ntmTm); + LOGFONTW *lf = &(elfx->elfLogFont); + PSFONT font; + + memset(ntmx, 0, sizeof(*ntmx)); + memset(elfx, 0, sizeof(*elfx)); + + scale_font(afm, -(LONG)afm->WinMetrics.usUnitsPerEm, &font, tm); + + lf->lfHeight = tm->tmHeight; + lf->lfWidth = tm->tmAveCharWidth; + lf->lfWeight = tm->tmWeight; + lf->lfItalic = tm->tmItalic; + lf->lfCharSet = tm->tmCharSet; + + lf->lfPitchAndFamily = afm->IsFixedPitch ? FIXED_PITCH : VARIABLE_PITCH; + + lstrcpynW(lf->lfFaceName, afm->FamilyName, LF_FACESIZE); + return DEVICE_FONTTYPE; +} + +static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts); + ENUMLOGFONTEXW lf; + NEWTEXTMETRICEXW tm; + BOOL ret; + AFMLISTENTRY *afmle; + FONTFAMILY *family; + + ret = next->funcs->pEnumFonts(next, plf, proc, lp); + if (!ret) return FALSE; + + if (plf && plf->lfFaceName[0]) + { + TRACE("lfFaceName = %s\n", debugstr_w(plf->lfFaceName)); + for (family = pdev->pi->Fonts; family; family = family->next) + { + if (!wcsncmp(plf->lfFaceName, family->FamilyName, + wcslen(family->FamilyName))) + break; + } + if (family) + { + for (afmle = family->afmlist; afmle; afmle = afmle->next) + { + UINT fm; + + TRACE("Got '%s'\n", afmle->afm->FontName); + fm = get_font_metric(dev->hdc, afmle->afm, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + break; + } + } + } + else + { + TRACE("lfFaceName = NULL\n"); + for (family = pdev->pi->Fonts; family; family = family->next) + { + UINT fm; + + afmle = family->afmlist; + TRACE("Got '%s'\n", afmle->afm->FontName); + fm = get_font_metric(dev->hdc, afmle->afm, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + break; + } + } + return ret; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1064,6 +1141,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pResetDC = reset_dc; params->funcs->pExtEscape = ext_escape; params->funcs->pSelectFont = select_font; + params->funcs->pEnumFonts = enum_fonts; return TRUE; }

1 0

Piotr Caban : wineps: Move GetCharWidth implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: b1f7b0da98b16e37473424b5162805873546cdc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1f7b0da98b16e37473424b5162805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:48:50 2023 +0200 wineps: Move GetCharWidth implementation to unixlib. --- dlls/wineps.drv/Makefile.in | 2 +- dlls/wineps.drv/builtin.c | 35 --------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/printproc.c | 13 ---------- dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/unixlib.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 51 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index aa6bdf60996..97e75bf02b8 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = wineps.drv UNIXLIB = wineps.so IMPORTS = user32 gdi32 winspool advapi32 win32u -UNIX_LIBS = -lwin32u +UNIX_LIBS = -lwin32u -lm C_SRCS = \ afm.c \ diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index f661aeaa591..270ce1bef8a 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -339,38 +339,3 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT } return TRUE; } - -/*********************************************************************** - * PSDRV_GetCharWidth - */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - UINT i, c; - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); - } - - TRACE("U+%.4X +%u\n", first, count); - - for (i = 0; i < count; ++i) - { - c = chars ? chars[i] : first + i; - - if (c > 0xffff) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - *buffer = floor( PSDRV_UVMetrics(c, physDev->font.fontinfo.Builtin.afm)->WX - * physDev->font.fontinfo.Builtin.scale + 0.5 ); - TRACE("U+%.4X: %i\n", i, *buffer); - ++buffer; - } - - return TRUE; -} diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 576021c6b1e..8c2c6d4af4b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pGetCharWidth = PSDRV_GetCharWidth, .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .pGetTextMetrics = PSDRV_GetTextMetrics, .priority = GDI_PRIORITY_GRAPHICS_DRV diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index bd4e79bb96f..417766d4093 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,18 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) -{ - XFORM old, xform = { .eM11 = 1.0f }; - BOOL ret; - - GetWorldTransform(dev->hdc, &old); - SetWorldTransform(dev->hdc, &xform); - ret = NtGdiGetCharWidthW(dev->hdc, first, count, (WCHAR *)chars, NTGDI_GETCHARWIDTH_INT, buffer); - SetWorldTransform(dev->hdc, &old); - return ret; -} - static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) { SIZE size; @@ -199,7 +187,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pGetCharWidth = font_GetCharWidth, .pGetTextExtentExPoint = font_GetTextExtentExPoint, .pGetTextMetrics = font_GetTextMetrics, .pSelectFont = font_SelectFont, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index add30651043..a1eb444ad14 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -434,7 +434,6 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 1dd9aafadb0..283c5b8d4a7 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -25,6 +25,8 @@ #endif #include <stdarg.h> +#include <stdlib.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1133,6 +1135,62 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP return ret; } +static int metrics_by_uv(const void *a, const void *b) +{ + return (int)(((const AFMMETRICS *)a)->UV - ((const AFMMETRICS *)b)->UV); +} + +const AFMMETRICS *uv_metrics(LONG uv, const AFM *afm) +{ + const AFMMETRICS *needle; + AFMMETRICS key; + + /* + * Ugly work-around for symbol fonts. Wine is sending characters which + * belong in the Unicode private use range (U+F020 - U+F0FF) as ASCII + * characters (U+0020 - U+00FF). + */ + if ((afm->Metrics->UV & 0xff00) == 0xf000 && uv < 0x100) + uv |= 0xf000; + + key.UV = uv; + needle = bsearch(&key, afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS), metrics_by_uv); + if (!needle) + { + WARN("No glyph for U+%.4X in '%s'\n", (int)uv, afm->FontName); + needle = afm->Metrics; + } + return needle; +} + +static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + UINT i, c; + + if (pdev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV(dev, pGetCharWidth); + return dev->funcs->pGetCharWidth(dev, first, count, chars, buffer); + } + + TRACE("U+%.4X +%u\n", first, count); + + for (i = 0; i < count; ++i) + { + c = chars ? chars[i] : first + i; + + if (c > 0xffff) + return FALSE; + + *buffer = floor(uv_metrics(c, pdev->font.fontinfo.Builtin.afm)->WX + * pdev->font.fontinfo.Builtin.scale + 0.5); + TRACE("U+%.4X: %i\n", i, *buffer); + ++buffer; + } + return TRUE; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1142,6 +1200,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pExtEscape = ext_escape; params->funcs->pSelectFont = select_font; params->funcs->pEnumFonts = enum_fonts; + params->funcs->pGetCharWidth = get_char_width; return TRUE; }

1 0

Piotr Caban : wineps: Copy GetTextMetrics implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

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

Piotr Caban : wineps: Copy GetTextExtentExPoint implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 18bcec0d257f6d0b8e2c063b5dfc0c2302763835 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bcec0d257f6d0b8e2c063b5dfc0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:58:59 2023 +0200 wineps: Copy GetTextExtentExPoint implementation to unixlib. --- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 66c052db27c..b08f02ddb11 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .priority = GDI_PRIORITY_GRAPHICS_DRV }; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index d7f8eb7e9a9..72f63c81300 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1206,6 +1206,28 @@ static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) return TRUE; } +static BOOL CDECL get_text_extent_ex_point(PHYSDEV dev, const WCHAR *str, int count, int *dx) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + int i; + float width = 0.0; + + if (pdev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV(dev, pGetTextExtentExPoint); + return dev->funcs->pGetTextExtentExPoint(dev, str, count, dx); + } + + TRACE("%s %i\n", debugstr_wn(str, count), count); + + for (i = 0; i < count; ++i) + { + width += uv_metrics(str[i], pdev->font.fontinfo.Builtin.afm)->WX; + dx[i] = width * pdev->font.fontinfo.Builtin.scale; + } + return TRUE; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1217,6 +1239,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pEnumFonts = enum_fonts; params->funcs->pGetCharWidth = get_char_width; params->funcs->pGetTextMetrics = get_text_metrics; + params->funcs->pGetTextExtentExPoint = get_text_extent_ex_point; return TRUE; }

1 0