d3dx9: ID3DXFont PreloadCharacters return S_OK (try 3)

[Alistair Leslie-Hughes]

Hi,
Corrected tests.

Changelog:
       d3dx9: ID3DXFont PreloadCharacters return S_OK


Best Regards
   Alistair Leslie-Hughes
-------------- next part --------------
>From 61ef439e695b0d58a966c20bda551de1c53d97cc Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 11 Dec 2014 14:22:51 +1100
Subject: [PATCH 16/16] ID3DXFont PreloadCharacters return S_OK

---
 dlls/d3dx9_36/font.c       | 2 +-
 dlls/d3dx9_36/tests/core.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
index 014fa95..dd1243e 100644
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -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)
diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
index 2990893..b55f7ea 100644
--- a/dlls/d3dx9_36/tests/core.c
+++ b/dlls/d3dx9_36/tests/core.c
@@ -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");
-- 
1.9.1