https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9567bb87bd7a536e91ca43d47963f638d8faab29
commit 9567bb87bd7a536e91ca43d47963f638d8faab29 Author: winesync <[email protected]> AuthorDate: Tue Jan 5 13:16:38 2021 +0100 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9: Fully initialize the glyph position. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49376 Signed-off-by: Sven Baars <[email protected]> Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 2481e617bbd529a297266ad53b1afe1d96e9af89 by Sven Baars <[email protected]> --- dll/directx/wine/d3dx9_36/font.c | 3 ++- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c index 2fb924d77ec..56cef145461 100644 --- a/dll/directx/wine/d3dx9_36/font.c +++ b/dll/directx/wine/d3dx9_36/font.c @@ -730,7 +730,6 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len, i; GCP_RESULTSW results; - D3DXVECTOR3 pos; 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) { IDirect3DTexture9 *texture; + D3DXVECTOR3 pos; POINT cell_inc; 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.y = cell_inc.y + y; + pos.z = 0; ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 8c7f985455c..47c8d9b9134 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -34,4 +34,4 @@ files: include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h tags: - wine: 9eda5c043047fd117441473651b2089b80a4ed80 + wine: 2481e617bbd529a297266ad53b1afe1d96e9af89
