Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-11 21:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b5df43b9118074485a1f4a917b16d37bc068839d by Matteo Bruni <mbruni@codeweavers.com>
This commit is contained in:
winesync 2020-09-21 23:07:33 +02:00 committed by Jérôme Gardou
parent 1697b87434
commit 4f3d8e9fbf
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -556,11 +556,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;
@ -604,25 +604,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;

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

@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 9bcb1f5195d1e65e0e7afb288d36fee716fe3a60} tags: {wine: b5df43b9118074485a1f4a917b16d37bc068839d}