September 2021 - Wine-devel

[PATCH 1/3] d3dx10/font: Add PreloadTextW().
by Nikolay Sivov 02 Sep '21

02 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/font.c | 28 ++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 9 --------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 2145b1c6f1e..51704e2bbbe 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -210,9 +210,33 @@ static HRESULT WINAPI d3dx_font_PreloadTextA(ID3DX10Font *iface, const char *str static HRESULT WINAPI d3dx_font_PreloadTextW(ID3DX10Font *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_wn(string, count), count); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + WORD *indices; + int i; - return E_NOTIMPL; + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return S_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DX10Font_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return S_OK; } static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8c55dd5810b..65bccb71521 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2263,32 +2263,23 @@ static void test_font(void) hr = ID3DX10Font_PreloadTextA(font, NULL, 1); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "test", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, -1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, testW, -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Font_Release(font); -- 2.33.0

2 5

[PATCH 9/9] gdi32: Move GdiConvertToDevmodeW to gdidc.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 52 +-------------------------------------------- dlls/gdi32/gdidc.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 51 deletions(-)

2 1

[PATCH 8/9] gdi32: Use ntgdi interface for printer driver functions.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 21 +++++++++------------ 2 files changed, 41 insertions(+), 12 deletions(-)

2 1

[PATCH 7/9] gdi32: Use NtGdiStartDoc for StartDoc.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 55 ++--------------------------------- include/ntgdi.h | 2 +- 3 files changed, 70 insertions(+), 54 deletions(-)

2 1

[PATCH 6/9] gdi32: Store abort proc in DC_ATTR.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/printdrv.c | 17 +---------------- include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 17 deletions(-)

2 1

[PATCH 5/9] gdi32: Use ntgdi names for spool functions.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-)

2 1

[PATCH 4/9] gdi32: Use NtGdiGetRandomRgn for GetMetaRgn.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 26 ++------------------------ dlls/gdi32/gdidc.c | 8 ++++++++ 2 files changed, 10 insertions(+), 24 deletions(-)

2 1

[PATCH 3/9] gdi32: Use NtGdiGetRandomRgn for GetClipRgn.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I couldn't find a way to get what we need from ntgdi without an extension. Technically, we could mirror the region on gdi32 side, but that seems suboptimal. dlls/gdi32/clipping.c | 36 ++++++++---------------------------- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/tests/clipping.c | 7 ++++++- include/ntgdi.h | 3 +++ 4 files changed, 25 insertions(+), 29 deletions(-)

2 1

[PATCH 2/9] gdi32: Move GdiDllInitialize to objects.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 12 ------------ dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-)

2 1

[PATCH 1/9] gdi32: Move LineDDA to objects.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/painting.c | 58 ------------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-)

2 1