Restore prototype of DrawGlyphStringEx and add DrawShapedGlyphString

include/gdi.h

@@ -11380,7 +11380,7 @@ typedef struct _SHAPEDGLYPH {
  * \note Only available when support for UNICODE is enabled.
  *
  * \sa GetUCharsAndBreaks, GetShapedGlyphsComplex, SHAPEDGLYPH
- *      GetGlyphsExtentInfo, GetGlyphsPositionInfo, DrawGlyphStringEx
+ *      GetGlyphsExtentInfo, GetGlyphsPositionInfo, DrawShapedGlyphString
  */
 MG_EXPORT int GUIAPI GetShapedGlyphsBasic(LOGFONT* logfont,
         LanguageCode content_language, UCharScriptType writing_system,
@@ -11436,7 +11436,7 @@ MG_EXPORT int GUIAPI GetShapedGlyphsBasic(LOGFONT* logfont,
  * \note Only available when support for UNICODE is enabled.
  *
  * \sa GetUCharsAndBreaks, GetShapedGlyphsBasic, SHAPEDGLYPH
- *      GetGlyphsExtentInfo, GetGlyphsPositionInfo, DrawGlyphStringEx
+ *      GetGlyphsExtentInfo, GetGlyphsPositionInfo, DrawShapedGlyphString
  */
 MG_EXPORT int GUIAPI GetShapedGlyphsComplex(LOGFONT* logfont,
         LanguageCode content_language, UCharScriptType writing_system,
@@ -11520,7 +11520,7 @@ typedef struct _GLYPHEXTINFO {
  *      rotation be 90° for sideways glyphs.
  *
  * \sa GetUCharsAndBreaks, GetShapedGlyphsBasic, GetShapedGlyphsComplex,
- *     GetGlyphsPositionInfo, DrawGlyphStringEx, GLYPHEXTINFO, glyph_render_flags
+ *     GetGlyphsPositionInfo, DrawShapedGlyphString, GLYPHEXTINFO, glyph_render_flags
  */
 MG_EXPORT int GUIAPI GetGlyphsExtentInfo(LOGFONT* logfont,
         const SHAPEDGLYPH* glyphs, int nr_glyphs,
@@ -11624,7 +11624,7 @@ typedef struct _GLYPHPOS {
  *      the top-left corner of the resulting output line rectangle.
  *
  * \sa GetUCharsAndBreaks, GetShapedGlyphsBasic, GetShapedGlyphsComplex,
- *      GetGlyphsExtentInfo, DrawGlyphStringEx, GLYPHEXTINFO, glyph_render_flags
+ *      GetGlyphsExtentInfo, DrawShapedGlyphString, GLYPHEXTINFO, glyph_render_flags
  */
 MG_EXPORT int GUIAPI GetGlyphsPositionInfo(
         LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
@@ -11718,13 +11718,11 @@ MG_EXPORT int GUIAPI GetGlyphsExtentFromUChars(LOGFONT* logfont_upright,
         SIZE* line_size, Glyph32* glyphs, GLYPHEXTINFO* glyph_ext_info,
         GLYPHPOS* glyph_pos, LOGFONT** logfont_sideways);
 
-#endif /* _MGCHARSET_UNICODE */
-
 /*
- * \fn int GUIAPI DrawGlyphStringEx (HDC hdc,
+ * \fn int GUIAPI DrawShapedGlyphString (HDC hdc,
  *      LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
- *      const Glyph32* glyphs, size_t glyph_unit_size, int nr_glyphs,
- *      const GLYPHPOS* glyph_pos)
+ *      const SHAPEDGLYPH* glyphs, const GLYPHPOS* glyph_pos,
+ *      int nr_glyphs)
  * \brief Draw a glyph string at the specified positions and text orientations.
  *
  * This function draws a glyph string to the specific positions and
@@ -11750,10 +11748,43 @@ MG_EXPORT int GUIAPI GetGlyphsExtentFromUChars(LOGFONT* logfont_upright,
  *
  * \sa GetGlyphsExtentFromUChars
  */
+MG_EXPORT int GUIAPI DrawShapedGlyphString (HDC hdc,
+        LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
+        const SHAPEDGLYPH* glyphs, const GLYPHPOS* glyph_pos,
+        int nr_glyphs);
+
+#endif /* _MGCHARSET_UNICODE */
+
+/*
+ * \fn int GUIAPI DrawGlyphStringEx (HDC hdc,
+ *      LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
+ *      const Glyph32* glyphs, const GLYPHPOS* glyph_pos,
+ *      int nr_glyphs)
+ * \brief Draw a glyph string at the specified positions and text orientations.
+ *
+ * This function draws a glyph string to the specific positions and
+ * orientations on a DC \a hdc with the logfonts specified by
+ * \a logfont_upright and \a logfont_sideways.
+ *
+ * \param hdc The device context.
+ * \param logfont_upright The LOGFONT object used for upright glyphs.
+ * \param logfont_sideways The LOGFONT object used for sideways glyphs.
+ * \param glyphs The pointer to the glyph string
+ * \param glyph_pos The buffer holds the position information
+ *      of every glyph.
+ * \param nr_glyphs The number of the glyphs should be drawn.
+ *
+ * \return The number of glyphs really drawn.
+ *
+ * \note The positions contained in \a glyph_pos are always aligned to
+ *      the top-left corner of the output rectangle.
+ *
+ * \sa GetGlyphsExtentFromUChars
+ */
 MG_EXPORT int GUIAPI DrawGlyphStringEx (HDC hdc,
         LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
-        const Glyph32* glyphs, size_t glyph_unit_size,
-        const GLYPHPOS* glyph_pos, int nr_glyphs);
+        const Glyph32* glyphs, const GLYPHPOS* glyph_pos,
+        int nr_glyphs);
 
     /** @} end of glyph */
 /*

src/newgdi/glyph-unicode.c

@@ -4443,26 +4443,21 @@ error:
 
 int GUIAPI DrawGlyphStringEx(HDC hdc,
         LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
-        const Glyph32* glyphs, size_t gsize,
-        const GLYPHPOS* glyph_pos, int nr_glyphs)
+        const Glyph32* glyphs, const GLYPHPOS* glyph_pos,
+        int nr_glyphs)
 {
     int i;
     int n = 0;
     Uint32 old_ta;
-    const BYTE* glyph_item = (const BYTE*)glyphs;
     PLOGFONT old_lf;
 
     if (glyphs == NULL || glyph_pos == NULL || nr_glyphs <= 0)
         return 0;
 
-    if (gsize < sizeof(Glyph32))
-        gsize = sizeof(Glyph32);
-
     old_ta = SetTextAlign(hdc, TA_LEFT | TA_TOP | TA_UPDATECP);
     old_lf = GetCurFont(hdc);
 
     for (i = 0; i < nr_glyphs; i++) {
-        Glyph32 gv = *(const Glyph32*)glyph_item;
         if (glyph_pos[i].suppressed == 0 && glyph_pos[i].whitespace == 0) {
             if (glyph_pos[i].orientation == GLYPH_ORIENTATION_UPRIGHT) {
                 if (logfont_upright)
@@ -4477,13 +4472,11 @@ int GUIAPI DrawGlyphStringEx(HDC hdc,
                     goto error;
             }
 
-            DrawGlyph(hdc, glyph_pos[i].x, glyph_pos[i].y, gv,
+            DrawGlyph(hdc, glyph_pos[i].x, glyph_pos[i].y, glyphs[i],
                 NULL, NULL);
 
             n++;
         }
-
-        glyph_item += gsize;
     }
 
 error:

src/newgdi/shaped-glyph.c

@@ -90,5 +90,50 @@ int GUIAPI GetGlyphsPositionInfo(
     return 0;
 }
 
+int GUIAPI DrawShapedGlyphString(HDC hdc,
+        LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
+        const SHAPEDGLYPH* glyphs, const GLYPHPOS* glyph_pos,
+        int nr_glyphs)
+{
+    int i;
+    int n = 0;
+    Uint32 old_ta;
+    PLOGFONT old_lf;
+
+    if (glyphs == NULL || glyph_pos == NULL || nr_glyphs <= 0)
+        return 0;
+
+    old_ta = SetTextAlign(hdc, TA_LEFT | TA_TOP | TA_UPDATECP);
+    old_lf = GetCurFont(hdc);
+
+    for (i = 0; i < nr_glyphs; i++) {
+        if (glyph_pos[i].suppressed == 0 && glyph_pos[i].whitespace == 0) {
+            if (glyph_pos[i].orientation == GLYPH_ORIENTATION_UPRIGHT) {
+                if (logfont_upright)
+                    SelectFont(hdc, logfont_upright);
+                else
+                    goto error;
+            }
+            else {
+                if (logfont_sideways)
+                    SelectFont(hdc, logfont_sideways);
+                else
+                    goto error;
+            }
+
+            DrawGlyph(hdc, glyph_pos[i].x, glyph_pos[i].y, glyphs[i].gv,
+                NULL, NULL);
+
+            n++;
+        }
+    }
+
+error:
+    SelectFont(hdc, old_lf);
+    SetTextAlign(hdc, old_ta);
+
+    return n;
+}
+
 #endif /*  _MGCHARSET_UNICODE */