user32: avoid shadowing a parameter (2/2)
Austin English
austinenglish at gmail.com
Wed Mar 9 03:08:28 CST 2011
--
-Austin
-------------- next part --------------
diff --git a/dlls/user32/text.c b/dlls/user32/text.c
index e34877f..f977889 100644
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -961,7 +961,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (!(flags & DT_CALCRECT))
{
- const WCHAR *str = line;
+ const WCHAR *str2 = line;
int xseg = x;
while (len)
{
@@ -970,9 +970,9 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if ((flags & DT_EXPANDTABS))
{
const WCHAR *p;
- p = str; while (p < str+len && *p != TAB) p++;
- len_seg = p - str;
- if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size))
+ p = str2; while (p < str2+len && *p != TAB) p++;
+ len_seg = p - str2;
+ if (len_seg != len && !GetTextExtentPointW(hdc, str2, len_seg, &size))
return 0;
}
else
@@ -981,17 +981,17 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
if (!ExtTextOutW( hdc, xseg, y,
((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) |
((flags & DT_RTLREADING) ? ETO_RTLREADING : 0),
- rect, str, len_seg, NULL )) return 0;
+ rect, str2, len_seg, NULL )) return 0;
if (prefix_offset != -1 && prefix_offset < len_seg)
{
- TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect);
+ TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str2, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect);
}
len -= len_seg;
- str += len_seg;
+ str2 += len_seg;
if (len)
{
- assert ((flags & DT_EXPANDTABS) && *str == TAB);
- len--; str++;
+ assert ((flags & DT_EXPANDTABS) && *str2 == TAB);
+ len--; str2++;
xseg += ((size.cx/tabwidth)+1)*tabwidth;
if (prefix_offset != -1)
{
More information about the wine-patches
mailing list