Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 08:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText.

Browse source 
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 a097f54ea1e7e75b78842ceb835f5db5f08fea06 by Sven Baars <sbaars@codeweavers.com>
This commit is contained in:
winesync 2021-01-05 13:16:38 +01:00 committed by Jérôme Gardou
parent 06bd040614
commit d7f9f9f6e8
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dll/directx/wine/d3dx9_36/font.c
View file

@ -516,7 +516,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
}
static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len,
unsigned int chars_fit, unsigned int *chars_used, DWORD format, SIZE *size)
unsigned int chars_fit, unsigned int *chars_used, SIZE *size)
{
SCRIPT_LOGATTR *sla;
SCRIPT_ANALYSIS sa;
@ -539,7 +539,7 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len,
--i;
/* If the there is no word that fits put in all characters that do fit */
if (!sla[i].fSoftBreak || (format & DT_SINGLELINE))
if (!sla[i].fSoftBreak)
i = chars_fit;
*chars_used = i;
@ -575,20 +575,13 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count,
num_fit = 0;
GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, size);
if (num_fit < *dest_len)
if (num_fit < *dest_len && (format & DT_WORDBREAK))
{
if (format & DT_WORDBREAK)
{
unsigned int chars_used;
unsigned int chars_used;
word_break(hdc, dest, dest_len, num_fit, &chars_used, format, size);
*count = orig_count - chars_used;
i = chars_used;
}
else if (format & DT_SINGLELINE)
{
*count = 0;
}
word_break(hdc, dest, dest_len, num_fit, &chars_used, size);
*count = orig_count - chars_used;
i = chars_used;
}
if (*count && str[i] == '\n')

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -34,4 +34,4 @@ files:
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h
tags:
wine: 84cbf6a49dfe75b9fd497b2c3ef7e922857bb618
wine: a097f54ea1e7e75b78842ceb835f5db5f08fea06