Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 06:16:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Implement ID3DXFont_PreloadCharacters.

Browse source 
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>

wine commit id 21fc1f37e76eaced9228eaf62a45489a2bf8ac11 by Sven Baars <sbaars@codeweavers.com>
This commit is contained in:
winesync 2020-09-21 23:03:28 +02:00 • committed by Jérôme Gardou
parent ea944e7a9e
commit 6f6f4d1501
2 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

46
dll/directx/wine/d3dx9_36/font.c
View file

@ -224,8 +224,50 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph,
static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last)
{ {
FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); struct d3dx_font *font = impl_from_ID3DXFont(iface);
return S_OK; unsigned int i, count, start, end;
WORD *indices;
WCHAR *chars;
TRACE("iface %p, first %u, last %u.\n", iface, first, last);
if (last < first)
return D3D_OK;
count = last - first + 1;
indices = heap_alloc(count * sizeof(*indices));
if (!indices)
return E_OUTOFMEMORY;
chars = heap_alloc(count * sizeof(*chars));
if (!chars)
{
heap_free(indices);
return E_OUTOFMEMORY;
}
for (i = 0; i < count; ++i)
chars[i] = first + i;
GetGlyphIndicesW(font->hdc, chars, count, indices, 0);
start = end = indices[0];
for (i = 1; i < count; ++i)
{
if (indices[i] == end + 1)
{
end = indices[i];
continue;
}
ID3DXFont_PreloadGlyphs(iface, start, end);
start = end = indices[i];
}
ID3DXFont_PreloadGlyphs(iface, start, end);
heap_free(chars);
heap_free(indices);
return D3D_OK;
} }
static uint32_t morton_decode(uint32_t x) static uint32_t morton_decode(uint32_t x)

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: e9ea8a05e54f1c950e5c15979d1393ad013402b1} tags: {wine: 21fc1f37e76eaced9228eaf62a45489a2bf8ac11}