Akihiro Sagawa : gdi32: Pass a proper code point from GetGlyphOutlineA to W version.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 79ab0c3375e0da711235152bbb65618c171e732f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79ab0c3375e0da711235152bbb...

Author: Akihiro Sagawa 
Date:   Wed May  4 19:58:16 2011 +0900

gdi32: Pass a proper code point from GetGlyphOutlineA to W version.

---

dlls/gdi32/font.c       |    1 +
 dlls/gdi32/tests/font.c |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 93b425a..6f5e479 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2521,6 +2521,7 @@ 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);
     }

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 900177e..da155e1 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -3247,14 +3247,12 @@ static void test_GetGlyphOutline(void)
         ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2);

ret = GetGlyphOutlineA(hdc, 0xcc8041, GGO_BITMAP, &gm, 0, NULL, &mat);
-        todo_wine
         ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0,
            "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2);

/* expected to ignore superfluous bytes (double-byte character) */
         ret = GetGlyphOutlineA(hdc, c[i].a, GGO_BITMAP, &gm, 0, NULL, &mat);
         ret2 = GetGlyphOutlineA(hdc, c[i].a | 0xdead0000, GGO_BITMAP, &gm2, 0, NULL, &mat);
-        todo_wine
         ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0,
            "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2);