November 2019 - Wine-Devel - list.winehq.org

Install issue with 32-bit Wine on 64-bit Ubuntu
by Thales Nov. 29, 2019

Nov. 29, 2019

Hello, I've gone through the compile and install process for Wine successfully several times, but this time when attempting to install the 32-bit wine ("~/wine32$ sudo make install"), the installer throws errors. It's mixing up 32 and 64 bit. On my 64-bit Ubuntu 16.04. For example... "/usr/bin/ld: i386 architecture of input file `config.o' is incompatible with i386:x86-64 output/usr/bin/ld: i386 architecture of input file `debug.o' is incompatible with i386:x86-64 output/usr/bin/ld: i386 architecture of input file `ldt.o' is incompatible with i386:x86-64 output/usr/bin/ld: i386 architecture of input file `loader.o' is incompatible with i386:x86-64 output/usr/bin/ld: i386 architecture of input file `mmap.o' is incompatible with i386:x86-64 output/usr/bin/ld: i386 architecture of input file `port.o' is incompatible with i386:x86-64 output..." Somehow it broke. I tried to uninstall using "~/wine32$ sudo make uninstall" and that failed also. I guess I need to figure out how to uninstall this. These are the directions I've been using for compiling and installing: https://wiki.winehq.org/Building_Biarch_Wine_On_Ubuntu Any ideas? :-) Thanks,...John Alway

2 2

[PATCH] dmband: Stop corruption of output string
by Alistair Leslie-Hughes Nov. 29, 2019

Nov. 29, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/dmutils.c | 2 +- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmloader/debug.c | 4 ++-- dlls/dmscript/dmscript_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..5d38d06d1d 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -141,7 +141,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return "(NULL)"; } diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..1580e215bb 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -472,7 +472,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..af76404b57 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -503,7 +503,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -519,7 +519,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..4055ea6a93 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -502,7 +502,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } -- 2.17.1

2 2

[PATCH 2/2] d3dcompiler/tests: Fix parameter desc test on d3d10.
by Matteo Bruni Nov. 29, 2019

Nov. 29, 2019

From: Sven Baars <sven.wine(a)gmail.com> Stream is not a member of D3D10_SIGNATURE_PARAMETER_DESC. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes patch 174732. dlls/d3dcompiler_43/tests/reflection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d61..c451a81f49d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -740,8 +740,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) -- 2.21.0

3 3

vkd3d: DXIL2SPIRV progress update
by Hans-Kristian Arntzen Nov. 29, 2019

Nov. 29, 2019

Hi. I've gotten a lot further on DXIL, and I've worked on translating PHI better and some actual codegen. It's getting quite workable now and a fair amount of opcodes are translated, but it's a long road ahead. Reasonably interesting code can be converted now, e.g.: https://gist.github.com/HansKristian-Work/df272ad97dc879514fdd494798b5296d. Once things come together I'll try to get this working in vkd3d. Cheers, Hans-Kristian

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa Nov. 29, 2019

Nov. 29, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

1 0

[PATCH 0/4] Update USER_SHARED_DATA timestamps more often.
by Rémi Bernon Nov. 29, 2019

Nov. 29, 2019

This is a rewrite of the ntdll-User_Shared_Data staging patch series, with a simpler approach that still solves the issue. Although it is less correct in term of timestamp update than the original series, it should also have less impact and may be more acceptable. We already update the timestamps from time to time in ntoskrnl before accessing the memory, and this adds another update after each sleep. I checked that it allows the games reported in [2] to start, and some others that also required the original patch series: * Overwatch (with some additional staging patches) * World of Warcraft (with some additional staging patches) * Star Wars: The Old Republic * Batman: Arkham Knight * Just Cause 3 [1] https://www.winehq.org/pipermail/wine-devel/2012-March/094788.html [2] https://bugs.winehq.org/show_bug.cgi?id=29168 Andrew Wesie (1): ntdll/tests: Test updating TickCount in user_shared_data. Rémi Bernon (3): ntdll: Add user_shared_data_update internal timestamp update function. ntdll: Update user_shared_data InterruptTime fields when updating time. ntdll: Update user_shared_data timestamps after NtDelayExecution. dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/sync.c | 16 ++++++++++------ dlls/ntdll/tests/time.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/thread.c | 37 +++++++++++++++++++++++++++++-------- 4 files changed, 66 insertions(+), 14 deletions(-) -- 2.24.0

3 11

[PATCH 1/2] d3dx9: Implement D3DXCreateFragmentLinker[Ex]().
by Matteo Bruni Nov. 29, 2019

Nov. 29, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 209 +++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 49 ++++++++ 2 files changed, 250 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea7..d7adc18ff6f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,220 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker +{ + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; + + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&linker->ref); + + TRACE("%p increasing refcount to %u.\n", linker, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&linker->ref); + + TRACE("%p decreasing refcount to %u.\n", linker, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(linker->device); + heap_free(linker); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p.\n", linker, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(linker->device); + *device = linker->device; + TRACE("Returning device %p.\n", *device); + + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); + + return E_NOTIMPL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + FIXME("iface %p, index %u: stub.\n", iface, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, + const char *name) +{ + FIXME("iface %p, name %s: stub.\n", iface, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *desc) +{ + FIXME("iface %p, name %p, desc %p: stub.\n", iface, name, desc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + FIXME("iface %p, fragments %p: stub.\n", iface, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + FIXME("iface %p, buffer %p: stub.\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + FIXME("iface %p, name %p, buffer %p: stub.\n", iface, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, ID3DXBuffer **buffer, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, buffer %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, buffer, errors); - if (linker) - *linker = NULL; + return E_NOTIMPL; +} +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); + + return E_NOTIMPL; +} - if (linker) - *linker = NULL; +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); return E_NOTIMPL; } +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, + ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc4119..e2925faad69 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,54 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + ID3DXFragmentLinker *linker; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create a D3D object.\n"); + DestroyWindow(window); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create a D3D device, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + hr = D3DXCreateFragmentLinkerEx(device, 1024, 0, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3D9_Release(d3d); + ok(!refcount, "The D3D object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6637,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); } -- 2.21.0

1 0

[v2 PATCH 1/3] dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Nikolay Sivov Nov. 29, 2019

Nov. 29, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 138 +++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 28 ++++++++ 2 files changed, 110 insertions(+), 56 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9b22b15b4..306f431d65 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -177,15 +177,16 @@ struct dwrite_glyphrunanalysis { UINT32 max_glyph_bitmap_size; }; -struct dwrite_colorglyphenum { - IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; - LONG ref; +struct dwrite_colorglyphenum +{ + IDWriteColorGlyphRunEnumerator1 IDWriteColorGlyphRunEnumerator1_iface; + LONG refcount; FLOAT origin_x; /* original run origin */ FLOAT origin_y; IDWriteFontFace4 *fontface; /* for convenience */ - DWRITE_COLOR_GLYPH_RUN colorrun; /* returned with GetCurrentRun() */ + DWRITE_COLOR_GLYPH_RUN1 colorrun; /* returned with GetCurrentRun() */ DWRITE_GLYPH_RUN run; /* base run */ UINT32 palette; /* palette index to get layer color from */ FLOAT *advances; /* original or measured advances for base glyphs */ @@ -309,9 +310,9 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } -static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator1(IDWriteColorGlyphRunEnumerator1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator1_iface); } static inline struct dwrite_fontlist *impl_from_IDWriteFontList2(IDWriteFontList2 *iface) @@ -5623,18 +5624,17 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit return S_OK; } -/* IDWriteColorGlyphRunEnumerator */ -static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +/* IDWriteColorGlyphRunEnumerator1 */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator1 *iface, REFIID riid, void **ppv) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator1) || + IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IDWriteColorGlyphRunEnumerator_AddRef(iface); + IDWriteColorGlyphRunEnumerator1_AddRef(iface); return S_OK; } @@ -5644,35 +5644,38 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return E_NOINTERFACE; } -static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedIncrement(&glyphenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedDecrement(&glyphenum->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - heap_free(This->advances); - heap_free(This->color_advances); - heap_free(This->offsets); - heap_free(This->color_offsets); - heap_free(This->glyphindices); - heap_free(This->glyphs); - if (This->colr.context) - IDWriteFontFace4_ReleaseFontTable(This->fontface, This->colr.context); - IDWriteFontFace4_Release(This->fontface); - heap_free(This); + if (!refcount) + { + heap_free(glyphenum->advances); + heap_free(glyphenum->color_advances); + heap_free(glyphenum->offsets); + heap_free(glyphenum->color_offsets); + heap_free(glyphenum->glyphindices); + heap_free(glyphenum->glyphs); + if (glyphenum->colr.context) + IDWriteFontFace4_ReleaseFontTable(glyphenum->fontface, glyphenum->colr.context); + IDWriteFontFace4_Release(glyphenum->fontface); + heap_free(glyphenum); } - return ref; + return refcount; } static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UINT32 g) @@ -5690,7 +5693,7 @@ static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UIN static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphenum) { - DWRITE_COLOR_GLYPH_RUN *colorrun = &glyphenum->colorrun; + DWRITE_COLOR_GLYPH_RUN1 *colorrun = &glyphenum->colorrun; FLOAT advance_adj = 0.0f; BOOL got_palette_index; UINT32 g; @@ -5776,48 +5779,69 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen return colorrun->glyphRun.glyphCount > 0; } -static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator1 *iface, BOOL *has_run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); - TRACE("(%p)->(%p)\n", This, has_run); + TRACE("%p, %p.\n", iface, has_run); *has_run = FALSE; - This->colorrun.glyphRun.glyphCount = 0; - while (This->current_layer < This->max_layer_num) { - if (colorglyphenum_build_color_run(This)) + glyphenum->colorrun.glyphRun.glyphCount = 0; + while (glyphenum->current_layer < glyphenum->max_layer_num) + { + if (colorglyphenum_build_color_run(glyphenum)) break; else - This->current_layer++; + glyphenum->current_layer++; } - *has_run = This->colorrun.glyphRun.glyphCount > 0; + *has_run = glyphenum->colorrun.glyphRun.glyphCount > 0; return S_OK; } -static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +static HRESULT colorglyphenum_get_current_run(const struct dwrite_colorglyphenum *glyphenum, + DWRITE_COLOR_GLYPH_RUN1 const **run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%p)\n", This, run); - - if (This->colorrun.glyphRun.glyphCount == 0) { + if (glyphenum->colorrun.glyphRun.glyphCount == 0) + { *run = NULL; return E_NOT_VALID_STATE; } - *run = &This->colorrun; + *run = &glyphenum->colorrun; return S_OK; } -static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, (DWRITE_COLOR_GLYPH_RUN1 const **)run); +} + +static HRESULT WINAPI colorglyphenum1_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN1 const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, run); +} + +static const IDWriteColorGlyphRunEnumerator1Vtbl colorglyphenumvtbl = +{ colorglyphenum_QueryInterface, colorglyphenum_AddRef, colorglyphenum_Release, colorglyphenum_MoveNext, - colorglyphenum_GetCurrentRun + colorglyphenum_GetCurrentRun, + colorglyphenum1_GetCurrentRun, }; HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_RUN *run, @@ -5842,8 +5866,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R if (!colorglyphenum) return E_OUTOFMEMORY; - colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; - colorglyphenum->ref = 1; + colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->refcount = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; colorglyphenum->fontface = &fontface->IDWriteFontFace4_iface; @@ -5876,7 +5900,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R /* It's acceptable to have a subset of glyphs mapped to color layers, for regular runs client is supposed to proceed normally, like if font had no color info at all. */ if (!has_colored_glyph) { - IDWriteColorGlyphRunEnumerator_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator_iface); + IDWriteColorGlyphRunEnumerator1_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface); return DWRITE_E_NOCOLOR; } @@ -5895,6 +5919,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; colorglyphenum->colorrun.glyphRunDescription = NULL; /* FIXME */ + colorglyphenum->colorrun.measuringMode = measuring_mode; + colorglyphenum->colorrun.glyphImageFormat = DWRITE_GLYPH_IMAGE_FORMATS_NONE; /* FIXME */ if (run->glyphAdvances) memcpy(colorglyphenum->advances, run->glyphAdvances, run->glyphCount * sizeof(FLOAT)); @@ -5905,7 +5931,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R run->fontEmSize, 1.0f, transform, run->glyphIndices[i], run->isSideways); } - *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + *ret = (IDWriteColorGlyphRunEnumerator *)&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c2f9dc0b1f..3cd41efc91 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7350,7 +7350,9 @@ static void test_GetPaletteEntries(void) static void test_TranslateColorGlyphRun(void) { + IDWriteColorGlyphRunEnumerator1 *layers1; IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN1 *colorrun1; const DWRITE_COLOR_GLYPH_RUN *colorrun; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; @@ -7416,6 +7418,13 @@ static void test_TranslateColorGlyphRun(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); + hr = IDWriteColorGlyphRunEnumerator_QueryInterface(layers, &IID_IDWriteColorGlyphRunEnumerator1, (void **)&layers1); + if (FAILED(hr)) + { + layers1 = NULL; + win_skip("IDWriteColorGlyphRunEnumerator1 is not supported.\n"); + } + for (;;) { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); @@ -7431,13 +7440,32 @@ static void test_TranslateColorGlyphRun(void) ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); + + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Failed to get color runt, hr %#x.\n", hr); + ok(colorrun1->glyphRun.fontFace != NULL, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "Unexpected font size %f.\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u\n", colorrun1->glyphRun.glyphCount); + ok(colorrun1->glyphRun.glyphIndices != NULL, "Unexpected indices array.\n"); + ok(colorrun1->glyphRun.glyphAdvances != NULL, "Unexpected advances array.\n"); + } } /* iterated all way through */ hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == E_NOT_VALID_STATE, "Unexpected hr %#x.\n", hr); + } + IDWriteColorGlyphRunEnumerator_Release(layers); + if (layers1) + IDWriteColorGlyphRunEnumerator1_Release(layers1); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.24.0

1 2

[PATCH 1/2] dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Nikolay Sivov Nov. 29, 2019

Nov. 29, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 138 +++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 30 +++++++++ 2 files changed, 112 insertions(+), 56 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9b22b15b4..306f431d65 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -177,15 +177,16 @@ struct dwrite_glyphrunanalysis { UINT32 max_glyph_bitmap_size; }; -struct dwrite_colorglyphenum { - IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; - LONG ref; +struct dwrite_colorglyphenum +{ + IDWriteColorGlyphRunEnumerator1 IDWriteColorGlyphRunEnumerator1_iface; + LONG refcount; FLOAT origin_x; /* original run origin */ FLOAT origin_y; IDWriteFontFace4 *fontface; /* for convenience */ - DWRITE_COLOR_GLYPH_RUN colorrun; /* returned with GetCurrentRun() */ + DWRITE_COLOR_GLYPH_RUN1 colorrun; /* returned with GetCurrentRun() */ DWRITE_GLYPH_RUN run; /* base run */ UINT32 palette; /* palette index to get layer color from */ FLOAT *advances; /* original or measured advances for base glyphs */ @@ -309,9 +310,9 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } -static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator1(IDWriteColorGlyphRunEnumerator1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator1_iface); } static inline struct dwrite_fontlist *impl_from_IDWriteFontList2(IDWriteFontList2 *iface) @@ -5623,18 +5624,17 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit return S_OK; } -/* IDWriteColorGlyphRunEnumerator */ -static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +/* IDWriteColorGlyphRunEnumerator1 */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator1 *iface, REFIID riid, void **ppv) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator1) || + IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IDWriteColorGlyphRunEnumerator_AddRef(iface); + IDWriteColorGlyphRunEnumerator1_AddRef(iface); return S_OK; } @@ -5644,35 +5644,38 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return E_NOINTERFACE; } -static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedIncrement(&glyphenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedDecrement(&glyphenum->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - heap_free(This->advances); - heap_free(This->color_advances); - heap_free(This->offsets); - heap_free(This->color_offsets); - heap_free(This->glyphindices); - heap_free(This->glyphs); - if (This->colr.context) - IDWriteFontFace4_ReleaseFontTable(This->fontface, This->colr.context); - IDWriteFontFace4_Release(This->fontface); - heap_free(This); + if (!refcount) + { + heap_free(glyphenum->advances); + heap_free(glyphenum->color_advances); + heap_free(glyphenum->offsets); + heap_free(glyphenum->color_offsets); + heap_free(glyphenum->glyphindices); + heap_free(glyphenum->glyphs); + if (glyphenum->colr.context) + IDWriteFontFace4_ReleaseFontTable(glyphenum->fontface, glyphenum->colr.context); + IDWriteFontFace4_Release(glyphenum->fontface); + heap_free(glyphenum); } - return ref; + return refcount; } static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UINT32 g) @@ -5690,7 +5693,7 @@ static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UIN static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphenum) { - DWRITE_COLOR_GLYPH_RUN *colorrun = &glyphenum->colorrun; + DWRITE_COLOR_GLYPH_RUN1 *colorrun = &glyphenum->colorrun; FLOAT advance_adj = 0.0f; BOOL got_palette_index; UINT32 g; @@ -5776,48 +5779,69 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen return colorrun->glyphRun.glyphCount > 0; } -static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator1 *iface, BOOL *has_run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); - TRACE("(%p)->(%p)\n", This, has_run); + TRACE("%p, %p.\n", iface, has_run); *has_run = FALSE; - This->colorrun.glyphRun.glyphCount = 0; - while (This->current_layer < This->max_layer_num) { - if (colorglyphenum_build_color_run(This)) + glyphenum->colorrun.glyphRun.glyphCount = 0; + while (glyphenum->current_layer < glyphenum->max_layer_num) + { + if (colorglyphenum_build_color_run(glyphenum)) break; else - This->current_layer++; + glyphenum->current_layer++; } - *has_run = This->colorrun.glyphRun.glyphCount > 0; + *has_run = glyphenum->colorrun.glyphRun.glyphCount > 0; return S_OK; } -static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +static HRESULT colorglyphenum_get_current_run(const struct dwrite_colorglyphenum *glyphenum, + DWRITE_COLOR_GLYPH_RUN1 const **run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%p)\n", This, run); - - if (This->colorrun.glyphRun.glyphCount == 0) { + if (glyphenum->colorrun.glyphRun.glyphCount == 0) + { *run = NULL; return E_NOT_VALID_STATE; } - *run = &This->colorrun; + *run = &glyphenum->colorrun; return S_OK; } -static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, (DWRITE_COLOR_GLYPH_RUN1 const **)run); +} + +static HRESULT WINAPI colorglyphenum1_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN1 const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, run); +} + +static const IDWriteColorGlyphRunEnumerator1Vtbl colorglyphenumvtbl = +{ colorglyphenum_QueryInterface, colorglyphenum_AddRef, colorglyphenum_Release, colorglyphenum_MoveNext, - colorglyphenum_GetCurrentRun + colorglyphenum_GetCurrentRun, + colorglyphenum1_GetCurrentRun, }; HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_RUN *run, @@ -5842,8 +5866,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R if (!colorglyphenum) return E_OUTOFMEMORY; - colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; - colorglyphenum->ref = 1; + colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->refcount = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; colorglyphenum->fontface = &fontface->IDWriteFontFace4_iface; @@ -5876,7 +5900,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R /* It's acceptable to have a subset of glyphs mapped to color layers, for regular runs client is supposed to proceed normally, like if font had no color info at all. */ if (!has_colored_glyph) { - IDWriteColorGlyphRunEnumerator_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator_iface); + IDWriteColorGlyphRunEnumerator1_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface); return DWRITE_E_NOCOLOR; } @@ -5895,6 +5919,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; colorglyphenum->colorrun.glyphRunDescription = NULL; /* FIXME */ + colorglyphenum->colorrun.measuringMode = measuring_mode; + colorglyphenum->colorrun.glyphImageFormat = DWRITE_GLYPH_IMAGE_FORMATS_NONE; /* FIXME */ if (run->glyphAdvances) memcpy(colorglyphenum->advances, run->glyphAdvances, run->glyphCount * sizeof(FLOAT)); @@ -5905,7 +5931,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R run->fontEmSize, 1.0f, transform, run->glyphIndices[i], run->isSideways); } - *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + *ret = (IDWriteColorGlyphRunEnumerator *)&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c2f9dc0b1f..67947e3e1f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7350,7 +7350,9 @@ static void test_GetPaletteEntries(void) static void test_TranslateColorGlyphRun(void) { + IDWriteColorGlyphRunEnumerator1 *layers1; IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN1 *colorrun1; const DWRITE_COLOR_GLYPH_RUN *colorrun; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; @@ -7416,6 +7418,13 @@ static void test_TranslateColorGlyphRun(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); + hr = IDWriteColorGlyphRunEnumerator_QueryInterface(layers, &IID_IDWriteColorGlyphRunEnumerator1, (void **)&layers1); + if (FAILED(hr)) + { + layers1 = NULL; + win_skip("IDWriteColorGlyphRunEnumerator1 is not supported.\n"); + } + for (;;) { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); @@ -7431,13 +7440,34 @@ static void test_TranslateColorGlyphRun(void) ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); + + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Failed to get color runt, hr %#x.\n", hr); + ok(colorrun1->glyphRun.fontFace != NULL, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "Unexpected font size %f.\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u\n", colorrun1->glyphRun.glyphCount); + ok(colorrun1->glyphRun.glyphIndices != NULL, "Unexpected indices array.\n"); + ok(colorrun1->glyphRun.glyphAdvances != NULL, "Unexpected advances array.\n"); + ok(colorrun1->measuringMode == DWRITE_MEASURING_MODE_NATURAL, "Unexpected measuring mode %d.\n", + colorrun1->measuringMode); + } } /* iterated all way through */ hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == E_NOT_VALID_STATE, "Unexpected hr %#x.\n", hr); + } + IDWriteColorGlyphRunEnumerator_Release(layers); + if (layers1) + IDWriteColorGlyphRunEnumerator1_Release(layers1); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.24.0

2 2

[PATCH] d3d9/tests: Fix a typo in a field name of the visual test.
by Francois Gouget Nov. 29, 2019

Nov. 29, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Yes. The field is actually never used directly: all that matters is that the structure has the right layout and its content will be used by d3d. dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f063d21fb0..cbfb98bec68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26311,7 +26311,7 @@ static void test_sample_attached_rendertarget(void) static const struct { - struct vec3 posistion; + struct vec3 position; struct vec2 texcoord; } quad[] = -- 2.20.1

2 1