Changeset 21356 for trunk/src/user32/text.c

Timestamp:

Feb 21, 2010, 5:33:53 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/user32/text.c (modified) (4 diffs)

trunk/src/user32/text.c

@@ -470 +470 @@
        ret = DrawTextExW( hdc, wstr, wcount, rect, flags, NULL );
        if (flags & DT_MODIFYSTRING)
-            WideCharToMultiByte( CP_ACP, 0, wstr, -1, str, count, NULL, NULL );
+            WideCharToMultiByte( CP_ACP, 0, wstr, -1, (LPSTR)str, count, NULL, NULL );
        HeapFree(GetProcessHeap(), 0, wstr);
    }
@@ -530 +530 @@
             slen = strlen((LPCSTR)lp);
         else
-            slen = strlen(MapSL(lp));
+            slen = strlen(MapSL((LPCSTR)lp));
     }
 
@@ -541 +541 @@
             GetTextExtentPoint32A(hdc, (LPCSTR)lp, slen, &s);
         else
-            GetTextExtentPoint32A(hdc, MapSL(lp), slen, &s);
+            GetTextExtentPoint32A(hdc, MapSL((LPCSTR)lp), slen, &s);
         if(cx == 0) cx = s.cx;
         if(cy == 0) cy = s.cy;
@@ -569 +569 @@
             TextOutA(memdc, 0, 0, (LPCSTR)lp, slen);
         else
-            TextOutA(memdc, 0, 0, MapSL(lp), slen);
+            TextOutA(memdc, 0, 0, MapSL((LPCSTR)lp), slen);
     }