reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-03-03 18:28:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3dx9: Make ID3DXFont_PreloadCharacters return S_OK.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2014-12-11 14:22:51 +11:00 committed by Alexandre Julliard
parent 89ecba6c48
commit e5d7982c4d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx9_36/font.c
View File

@ -155,7 +155,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph,
static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last)
{
FIXME("iface %p, first %u, last %u stub!\n", iface, first, last);
return E_NOTIMPL;
return S_OK;
}
static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last)

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

@ -511,15 +511,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL);
if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1);
ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK);
}
hr = ID3DXFont_PreloadCharacters(font, 'b', 'a');
ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK);
hr = ID3DXFont_PreloadGlyphs(font, 1, 0);
ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK);
todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK);
hr = ID3DXFont_PreloadCharacters(font, 'a', 'a');
ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK);
}
for(c = 'b'; c <= 'z'; c++) {
WORD glyph;
@ -548,7 +547,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
}
hr = ID3DXFont_PreloadCharacters(font, 'a', 'z');
todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK);
ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK);
check_release((IUnknown*)font, 0);
} else skip("Failed to create a ID3DXFont object\n");