Commit a097f54e authored by Sven Baars's avatar Sven Baars Committed by Alexandre Julliard

d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText.

parent 84cbf6a4
......@@ -512,7 +512,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;
......@@ -535,7 +535,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;
......@@ -571,20 +571,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')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment