Commit b5df43b9 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3dx9: Switch character count to unsigned int in the DrawText implementation.

parent b8f0e32b
...@@ -552,11 +552,11 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, ...@@ -552,11 +552,11 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len,
heap_free(sla); heap_free(sla);
} }
static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count,
WCHAR *dest, unsigned int *dest_len, int width, DWORD format, SIZE *size) WCHAR *dest, unsigned int *dest_len, int width, DWORD format, SIZE *size)
{ {
unsigned int orig_count = *count;
unsigned int i = 0; unsigned int i = 0;
int orig_count = *count;
int num_fit; int num_fit;
*dest_len = 0; *dest_len = 0;
...@@ -600,25 +600,25 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, ...@@ -600,25 +600,25 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count,
} }
static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) const WCHAR *string, INT in_count, RECT *rect, DWORD format, D3DCOLOR color)
{ {
struct d3dx_font *font = impl_from_ID3DXFont(iface); struct d3dx_font *font = impl_from_ID3DXFont(iface);
ID3DXSprite *target = sprite; ID3DXSprite *target = sprite;
WCHAR *line;
RECT textrect = {0}; RECT textrect = {0};
int lh, x, y, width; int lh, x, y, width;
unsigned int count;
int max_width = 0; int max_width = 0;
WCHAR *line;
int ret = 0; int ret = 0;
SIZE size; SIZE size;
TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x.\n", TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#x, color 0x%08x.\n",
iface, sprite, debugstr_wn(string, count), count, wine_dbgstr_rect(rect), format, color); iface, sprite, debugstr_wn(string, in_count), in_count, wine_dbgstr_rect(rect), format, color);
if (!string) if (!string)
return 0; return 0;
if (count < 0) count = in_count < 0 ? lstrlenW(string) : in_count;
count = lstrlenW(string);
if (!count) if (!count)
return 0; return 0;
......
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