Implemented GetGlyphOutline16.

diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index bf97ff96ff04148f740069aaaa68e046c1e3f4c8..eaa654235c75e86380f4f3309e17cd97cbce2a98 100644 (file)
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -1923,19 +1923,6 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar,
 }
 
 
-/***********************************************************************
- *           GetGlyphOutline    (GDI.309)
- */
-DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat,
-                                LPGLYPHMETRICS16 lpgm, DWORD cbBuffer,
-                                LPVOID lpBuffer, const MAT2 *lpmat2 )
-{
-    FIXME("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
-         hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
-    return ~0UL; /* failure */
-}
-
-
 /***********************************************************************
  *           GetGlyphOutlineA    (GDI32.@)
  */

diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c
index 6e40079a377f5be7c3f4b2de928c60d8a688aa8e..1a478df0305d62b6c2f76a59a870b30d9834f2d1 100644 (file)
--- a/dlls/gdi/gdi16.c
+++ b/dlls/gdi/gdi16.c
@@ -1718,6 +1718,27 @@ BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
 }
 
 
+/***********************************************************************
+ *           GetGlyphOutline    (GDI.309)
+ */
+DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat,
+                                LPGLYPHMETRICS16 lpgm, DWORD cbBuffer,
+                                LPVOID lpBuffer, const MAT2 *lpmat2 )
+{
+    DWORD ret;
+    GLYPHMETRICS gm32;
+
+    ret = GetGlyphOutlineA( HDC_32(hdc), uChar, fuFormat, &gm32, cbBuffer, lpBuffer, lpmat2);
+    lpgm->gmBlackBoxX = gm32.gmBlackBoxX;
+    lpgm->gmBlackBoxY = gm32.gmBlackBoxY;
+    lpgm->gmptGlyphOrigin.x = gm32.gmptGlyphOrigin.x;
+    lpgm->gmptGlyphOrigin.y = gm32.gmptGlyphOrigin.y;
+    lpgm->gmCellIncX = gm32.gmCellIncX;
+    lpgm->gmCellIncY = gm32.gmCellIncY;
+    return ret;
+}
+
+
 /***********************************************************************
  *           CreateScalableFontResource   (GDI.310)
  */