mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 18:54:25 +00:00
[WINESYNC] d3dx9: Fully initialize the glyph position.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49376 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 2481e617bbd529a297266ad53b1afe1d96e9af89 by Sven Baars <sbaars@codeweavers.com>
This commit is contained in:
parent
31f063ffbf
commit
9567bb87bd
|
@ -730,7 +730,6 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
|
||||||
{
|
{
|
||||||
unsigned int line_len, i;
|
unsigned int line_len, i;
|
||||||
GCP_RESULTSW results;
|
GCP_RESULTSW results;
|
||||||
D3DXVECTOR3 pos;
|
|
||||||
|
|
||||||
string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size);
|
string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size);
|
||||||
|
|
||||||
|
@ -760,6 +759,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
|
||||||
for (i = 0; i < results.nGlyphs; ++i)
|
for (i = 0; i < results.nGlyphs; ++i)
|
||||||
{
|
{
|
||||||
IDirect3DTexture9 *texture;
|
IDirect3DTexture9 *texture;
|
||||||
|
D3DXVECTOR3 pos;
|
||||||
POINT cell_inc;
|
POINT cell_inc;
|
||||||
RECT black_box;
|
RECT black_box;
|
||||||
|
|
||||||
|
@ -770,6 +770,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
|
||||||
|
|
||||||
pos.x = cell_inc.x + x + results.lpCaretPos[i];
|
pos.x = cell_inc.x + x + results.lpCaretPos[i];
|
||||||
pos.y = cell_inc.y + y;
|
pos.y = cell_inc.y + y;
|
||||||
|
pos.z = 0;
|
||||||
|
|
||||||
ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color);
|
ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color);
|
||||||
IDirect3DTexture9_Release(texture);
|
IDirect3DTexture9_Release(texture);
|
||||||
|
|
|
@ -34,4 +34,4 @@ files:
|
||||||
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
|
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
|
||||||
include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h
|
include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h
|
||||||
tags:
|
tags:
|
||||||
wine: 9eda5c043047fd117441473651b2089b80a4ed80
|
wine: 2481e617bbd529a297266ad53b1afe1d96e9af89
|
||||||
|
|
Loading…
Reference in a new issue