Sven Baars : d3dx9: Implement ID3DXFont_PreloadText.
Alexandre Julliard
julliard at winehq.org
Wed Mar 4 16:50:07 CST 2020
Module: wine
Branch: master
Commit: cc03400e322edea97f0e425c04cd9069f77b4c9f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc03400e322edea97f0e425c04cd9069f77b4c9f
Author: Sven Baars <sbaars at codeweavers.com>
Date: Tue Mar 3 09:38:27 2020 +0100
d3dx9: Implement ID3DXFont_PreloadText.
Based on a patch by Tony Wasserka.
Signed-off-by: Sven Baars <sbaars at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/font.c | 56 ++++++++++++++++++++++++++++++++++++++++++----
dlls/d3dx9_36/tests/core.c | 2 --
2 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
index 9196295637..81ba1e4fa0 100644
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -420,14 +420,62 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first,
static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count)
{
- FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count);
- return E_NOTIMPL;
+ WCHAR *wstr;
+ HRESULT hr;
+ int countW;
+
+ TRACE("iface %p, string %s, count %d.\n", iface, debugstr_an(string, count), count);
+
+ if (!string && !count)
+ return D3D_OK;
+
+ if (!string)
+ return D3DERR_INVALIDCALL;
+
+ countW = MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, NULL, 0);
+
+ wstr = heap_alloc(countW * sizeof(*wstr));
+ if (!wstr)
+ return E_OUTOFMEMORY;
+
+ MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, wstr, countW);
+
+ hr = ID3DXFont_PreloadTextW(iface, wstr, count < 0 ? countW - 1 : countW);
+
+ heap_free(wstr);
+
+ return hr;
}
static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count)
{
- FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count);
- return E_NOTIMPL;
+ struct d3dx_font *font = impl_from_ID3DXFont(iface);
+ WORD *indices;
+ int i;
+
+ TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count);
+
+ if (!string && !count)
+ return D3D_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)
+ ID3DXFont_PreloadGlyphs(iface, indices[i], indices[i]);
+
+ heap_free(indices);
+
+ return D3D_OK;
}
static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
index b8e680d1c5..662483b687 100644
--- a/dlls/d3dx9_36/tests/core.c
+++ b/dlls/d3dx9_36/tests/core.c
@@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- todo_wine {
hr = ID3DXFont_PreloadTextA(font, NULL, -1);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = ID3DXFont_PreloadTextA(font, NULL, 0);
@@ -530,7 +529,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3DXFont_PreloadTextW(font, L"", -1);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
- }
check_release((IUnknown*)font, 0);
More information about the wine-cvs
mailing list