ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Implement ID3DXFont_PreloadText. 

Based on a patch by Tony Wasserka.

Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sven Baars 2020-03-03 09:38:27 +01:00 committed by Alexandre Julliard
parent 027e2b01fa
commit cc03400e32
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dlls/d3dx9_36/font.c
View File

@ -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) 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); WCHAR *wstr;
return E_NOTIMPL; 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) 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); struct d3dx_font *font = impl_from_ID3DXFont(iface);
return E_NOTIMPL; 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, static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,

2
dlls/d3dx9_36/tests/core.c
View File

@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
todo_wine {
hr = ID3DXFont_PreloadTextA(font, NULL, -1); hr = ID3DXFont_PreloadTextA(font, NULL, -1);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = ID3DXFont_PreloadTextA(font, NULL, 0); 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); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3DXFont_PreloadTextW(font, L"", -1); hr = ID3DXFont_PreloadTextW(font, L"", -1);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
}
check_release((IUnknown*)font, 0); check_release((IUnknown*)font, 0);