Commit Graph

33 Commits

Author SHA1 Message Date
Michael Stefaniuc 516dc52401 user32: Avoid using the comma operator.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-05 22:16:31 +02:00
Alexandre Julliard 5d282ec64d user32: Use height from font metrics for empty text runs in TabbedTextOut().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39051
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-10-08 13:22:39 +02:00
Zhiyi Zhang 11e3cf091d user32: Respect margins more in DrawTextExW().
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-06-04 16:26:14 +02:00
Zhiyi Zhang 5dfacee5cc user32: Return 1 in DrawTextEx() when calculated offset is 0.
The return value 0 in DrawTextEx() indicates failure.
Should the offset from the bottom of the drawn text to top of
the rectangle happens to be 0, return 1 instead. So that it doesn't
indicate failure incidentally.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-06-04 16:26:12 +02:00
Huw Davies c267bbb300 user32: Pass the modifiable string buffer directly to TEXT_NextLineW().
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-05-09 15:55:15 +02:00
Zhiyi Zhang 18df0bc05b user32: Use common cleanup code in DrawTextExW().
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-05-08 11:13:31 +02:00
Zhiyi Zhang 661528a119 user32: Use the heap_*() functions in text.c where possible.
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-05-08 11:13:29 +02:00
Michael Stefaniuc e8411d22d5 user32: Use the available ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-02 16:02:53 +02:00
Alistair Leslie-Hughes 84d0c4f0da user32: Don't crash in DrawTextEx when tab length is zero.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 21:28:09 +09:00
Andrew Eikum c465209cc1 user32: Use font default height if GetTextExtentPoint returns empty rectangle.
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-16 21:32:56 +09:00
Alex Henrie 5b53c0b88b user32: Avoid double initialization.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-06 21:59:08 +09:00
Henri Verbeet f25317a608 user32: Ensure at least one character is used in TEXT_WordBreak(). 2014-06-13 10:12:12 +02:00
Henri Verbeet ec66785f02 user32: Fix TEXT_WordBreak() when no characters fit. 2014-03-11 19:39:35 +01:00
Alexandre Julliard 209d1a86d2 user32: Delay creation of the 55AA pattern brush until it's needed. 2013-10-16 17:23:22 +02:00
Frédéric Delanoy 2dd332789b user32: Use BOOL type where appropriate. 2013-09-27 10:45:04 +02:00
Aric Stewart 4247e80a79 user32: Use Uniscribe ScriptBreak and the resulting Unicode Line Break algorithm to break lines for DT_WORDBREAK. 2013-09-13 11:17:00 +02:00
Andrew Talbot c78f8d7405 user32: Indentation fix. 2012-12-24 13:32:38 +01:00
André Hentschel 64e169d974 user32: Avoid memory leaks (coverity). 2012-10-30 19:14:17 +01:00
Akihiro Sagawa 70937bd8dd user32: Add support for legacy access keys. 2012-09-06 20:28:49 +02:00
Frédéric Delanoy 7e309601f3 dlls: Assorted spelling fixes. 2011-08-03 14:15:50 +02:00
André Hentschel b37051d28b user32: Remove dead assignment (clang). 2011-07-14 14:45:02 +02:00
Tim Hentenaar a415974b2e user32: GetTabbedTextExtent() returns non-zero value when nCount == 0. 2011-04-27 13:15:00 +02:00
Vincent Povirk d1099eb4d8 user32: Invert y in DrawTextEx in GM_COMPATIBLE mode if y increases up. 2009-09-28 12:37:20 +02:00
Ulrich Czekalla 209820c428 user32: Don't scale draw text margin params by character width units.
Values passed in DRAWTEXTPARAMS are already in average character width
units.
2009-02-03 12:39:59 +01:00
Michael Stefaniuc 4fc84eaf5a user32: HGDIOBJ is interchangeable with other handle types; no casts are needed. 2008-10-27 11:29:54 +01:00
Aric Stewart 48ad706c08 user32: DrawText handling of 0 counts with string, empty strings and -1 counts with empty string and NULL strings. 2008-10-14 13:41:57 +02:00
Aric Stewart 8b9ebc30c9 user32: In DrawTextW/A make sure to properly initialize the cbSize of DRAWTEXTPARAMS. 2008-10-14 13:41:56 +02:00
Nikolay Sivov 87bb1cbcdc user32: Correct termination of returning string in Text_Ellipsify. 2008-05-21 20:16:26 +02:00
Steven Edwards a725826ada user32: Remove some no longer needed wine 16bit headers. 2007-08-29 12:31:34 +02:00
Andrew Talbot 93c5779458 user32: Exclude unused headers. 2007-05-21 13:36:18 +02:00
Mikołaj Zalewski 521cba2bc7 user32: Fix TabbedTextOut.
The TEXT_TabbedTextOut didn't set correctly the text starting point
(x0) for left-aligned tabs and was ignoring the last tab. I've also
changed GetTextMetricsA to W as this should be slightly faster.
2007-05-03 14:36:20 +02:00
Marcin Grześkowiak b5ee7aee23 user32: Use charset of currently selected font in DrawTextExA. 2007-03-28 13:15:26 +02:00
Alexandre Julliard b8a2e3b8a4 user32: Renamed the user/ directory to user32. 2006-11-16 14:49:25 +01:00