Alex Henrie : gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity).

Alexandre Julliard julliard at winehq.org
Fri Jun 1 18:19:54 CDT 2018


Module: wine
Branch: master
Commit: e3648c7a61a459dbe142b4e12281c1a47c1905d1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e3648c7a61a459dbe142b4e12281c1a47c1905d1

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Thu May 31 23:03:35 2018 -0600

gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity).

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdi32/font.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 17b160d..41ec07d 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2823,6 +2823,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat,
         UINT cp;
         int len;
         char mbchs[2];
+        WCHAR wChar;
 
         cp = GdiGetCodePage(hdc);
         if (IsDBCSLeadByteEx(cp, uChar >> 8)) {
@@ -2833,8 +2834,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat,
             len = 1;
             mbchs[0] = (uChar & 0xff);
         }
-        uChar = 0;
-        MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1);
+        wChar = 0;
+        MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1);
+        uChar = wChar;
     }
 
     return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer,




More information about the wine-cvs mailing list