More correct naming of constant
Bill Medland
billmedland at mercuryspeed.com
Tue Nov 30 13:47:56 CST 2004
Bill Medland (billmedland at mercuryspeed.com)
If the buffer is no longer static the names should reflect that.
Also minimise the use of the constant.
Index: wine/dlls/user/text.c
===================================================================
RCS file: /home/wine/wine/dlls/user/text.c,v
retrieving revision 1.50
diff -u -r1.50 text.c
--- wine/dlls/user/text.c 30 Nov 2004 17:21:16 -0000 1.50
+++ wine/dlls/user/text.c 30 Nov 2004 20:41:26 -0000
@@ -838,7 +838,7 @@
* 3 more than a null-terminated string). If this is not so then increase
* the allowance in DrawTextExA.
*/
-#define MAX_STATIC_BUFFER 1024
+#define MAX_BUFFER 1024
INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
{
@@ -846,7 +846,7 @@
const WCHAR *strPtr;
WCHAR *retstr, *p_retstr;
size_t size_retstr;
- WCHAR line[MAX_STATIC_BUFFER];
+ WCHAR line[MAX_BUFFER];
int len, lh, count=i_count;
TEXTMETRICW tm;
int lmargin = 0, rmargin = 0;
@@ -911,7 +911,7 @@
do
{
- len = MAX_STATIC_BUFFER;
+ len = sizeof(line)/sizeof(line[0]);
last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom;
strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip);
More information about the wine-patches
mailing list