From: Alex Villacís Lasso <a_villacis@palosanto.com>
Date: Mon, 21 Feb 2005 20:43:59 +0000 (+0000)
Subject: Implemented GetGlyphOutline16.
X-Git-Tag: wine-20050310~293
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=2eacfecd2504abcf6362766ba76bb4cfbc01e99e;p=wine%2Feterwine.git

Implemented GetGlyphOutline16.
---

diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index bf97ff96ff..eaa654235c 100644
--- 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 6e40079a37..1a478df030 100644
--- 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)
  */