Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e5d7982c
Commit
e5d7982c
authored
Dec 11, 2014
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Dec 12, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Make ID3DXFont_PreloadCharacters return S_OK.
parent
89ecba6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
font.c
dlls/d3dx9_36/font.c
+1
-1
core.c
dlls/d3dx9_36/tests/core.c
+3
-4
No files found.
dlls/d3dx9_36/font.c
View file @
e5d7982c
...
...
@@ -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
)
...
...
dlls/d3dx9_36/tests/core.c
View file @
e5d7982c
...
...
@@ -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
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment