Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
176d27e8
Commit
176d27e8
authored
Jun 01, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 01, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Use wine_dbgstr_rect() in some more places.
parent
34c9586b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
14 deletions
+16
-14
font.c
dlls/d3dx9_36/font.c
+12
-11
sprite.c
dlls/d3dx9_36/sprite.c
+4
-3
surface.c
dlls/d3dx9_36/surface.c
+0
-0
No files found.
dlls/d3dx9_36/font.c
View file @
176d27e8
...
...
@@ -145,10 +145,11 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface)
}
static
HRESULT
WINAPI
ID3DXFontImpl_GetGlyphData
(
ID3DXFont
*
iface
,
UINT
glyph
,
LPDIRECT3DTEXTURE9
*
texture
,
RECT
*
blackbox
,
POINT
*
cellinc
)
IDirect3DTexture9
*
*
texture
,
RECT
*
blackbox
,
POINT
*
cellinc
)
{
ID3DXFontImpl
*
This
=
impl_from_ID3DXFont
(
iface
);
FIXME
(
"(%p)->(%u, %p, %p, %p): stub
\n
"
,
This
,
glyph
,
texture
,
blackbox
,
cellinc
);
FIXME
(
"iface %p, glyph %#x, texture %p, baclbox %s, cellinc %s stub!
\n
"
,
iface
,
glyph
,
texture
,
wine_dbgstr_rect
(
blackbox
),
wine_dbgstr_point
(
cellinc
));
return
D3D_OK
;
}
...
...
@@ -180,19 +181,19 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, LPCWSTR strin
return
D3D_OK
;
}
static
INT
WINAPI
ID3DXFontImpl_DrawTextA
(
ID3DXFont
*
iface
,
LPD3DXSPRITE
sprite
,
LPCSTR
string
,
INT
count
,
LPRECT
rect
,
DWORD
format
,
D3DCOLOR
color
)
static
INT
WINAPI
ID3DXFontImpl_DrawTextA
(
ID3DXFont
*
iface
,
ID3DXSprite
*
sprite
,
const
char
*
string
,
INT
count
,
RECT
*
rect
,
DWORD
format
,
D3DCOLOR
color
)
{
ID3DXFontImpl
*
This
=
impl_from_ID3DXFont
(
iface
);
FIXME
(
"(%p)->(%p, %s, %d, %p, %d, %#x): stub
\n
"
,
This
,
sprite
,
string
,
count
,
rect
,
format
,
color
);
FIXME
(
"iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!
\n
"
,
iface
,
sprite
,
debugstr_a
(
string
),
count
,
wine_dbgstr_rect
(
rect
),
format
,
color
);
return
1
;
}
static
INT
WINAPI
ID3DXFontImpl_DrawTextW
(
ID3DXFont
*
iface
,
LPD3DXSPRITE
sprite
,
LPCWSTR
string
,
INT
count
,
LPRECT
rect
,
DWORD
format
,
D3DCOLOR
color
)
static
INT
WINAPI
ID3DXFontImpl_DrawTextW
(
ID3DXFont
*
iface
,
ID3DXSprite
*
sprite
,
const
WCHAR
*
string
,
INT
count
,
RECT
*
rect
,
DWORD
format
,
D3DCOLOR
color
)
{
ID3DXFontImpl
*
This
=
impl_from_ID3DXFont
(
iface
);
FIXME
(
"(%p)->(%p, %s, %d, %p, %d, %#x): stub
\n
"
,
This
,
sprite
,
debugstr_w
(
string
),
count
,
rect
,
format
,
color
);
FIXME
(
"iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!
\n
"
,
iface
,
sprite
,
debugstr_w
(
string
),
count
,
wine_dbgstr_rect
(
rect
),
format
,
color
);
return
1
;
}
...
...
dlls/d3dx9_36/sprite.c
View file @
176d27e8
...
...
@@ -317,13 +317,14 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
return
D3D_OK
;
}
static
HRESULT
WINAPI
ID3DXSpriteImpl_Draw
(
ID3DXSprite
*
iface
,
LPDIRECT3DTEXTURE9
texture
,
CONST
RECT
*
rect
,
CONST
D3DXVECTOR3
*
center
,
CONST
D3DXVECTOR3
*
position
,
D3DCOLOR
color
)
static
HRESULT
WINAPI
ID3DXSpriteImpl_Draw
(
ID3DXSprite
*
iface
,
IDirect3DTexture9
*
texture
,
const
RECT
*
rect
,
const
D3DXVECTOR3
*
center
,
const
D3DXVECTOR3
*
position
,
D3DCOLOR
color
)
{
ID3DXSpriteImpl
*
This
=
impl_from_ID3DXSprite
(
iface
);
D3DSURFACE_DESC
texdesc
;
TRACE
(
"(%p)->(%p, %p, %p, %p, %#x): relay
\n
"
,
This
,
texture
,
rect
,
center
,
position
,
color
);
TRACE
(
"iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.
\n
"
,
iface
,
texture
,
wine_dbgstr_rect
(
rect
),
center
,
position
,
color
);
if
(
texture
==
NULL
)
return
D3DERR_INVALIDCALL
;
if
(
!
This
->
ready
)
return
D3DERR_INVALIDCALL
;
...
...
dlls/d3dx9_36/surface.c
View file @
176d27e8
This diff is collapsed.
Click to expand it.
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