[ros-diffs] [reactos] 173/218: [WINESYNC] d3dx9: Implement ID3DXFont_PreloadText.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa86f68321460ee81131d…

commit aa86f68321460ee81131d37f1abca2dda08859bc
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:03:28 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:05 2021 +0100

    [WINESYNC] d3dx9: Implement ID3DXFont_PreloadText.
    
    Based on a patch by Tony Wasserka.
    
    Signed-off-by: Sven Baars <sbaars(a)codeweavers.com>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id cc03400e322edea97f0e425c04cd9069f77b4c9f by Sven Baars
<sbaars(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/font.c           | 56 +++++++++++++++++++++++++++---
 modules/rostests/winetests/d3dx9_36/core.c |  2 --
 sdk/tools/winesync/d3dx9.cfg               |  2 +-
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c
index 11e20ed2bdc..6a4a6ed32c3 100644
--- a/dll/directx/wine/d3dx9_36/font.c
+++ b/dll/directx/wine/d3dx9_36/font.c
@@ -424,14 +424,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/modules/rostests/winetests/d3dx9_36/core.c
b/modules/rostests/winetests/d3dx9_36/core.c
index b8e680d1c55..662483b687a 100644
--- a/modules/rostests/winetests/d3dx9_36/core.c
+++ b/modules/rostests/winetests/d3dx9_36/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);
 
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 0181a5fd9b2..abf1b70c129 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 21fc1f37e76eaced9228eaf62a45489a2bf8ac11}
+tags: {wine: cc03400e322edea97f0e425c04cd9069f77b4c9f}