Evan Stade : gdiplus: Added GdipSetStringFormatLineAlign/ GdipGetStringFormatLineAlign.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Aug 15 04:34:19 CDT 2007


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

Author: Evan Stade <estade at gmail.com>
Date:   Tue Aug 14 19:01:15 2007 -0700

gdiplus: Added GdipSetStringFormatLineAlign/GdipGetStringFormatLineAlign.

---

 dlls/gdiplus/gdiplus.spec      |    4 ++--
 dlls/gdiplus/gdiplus_private.h |    1 +
 dlls/gdiplus/stringformat.c    |   22 ++++++++++++++++++++++
 include/gdiplusflat.h          |    2 ++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 7380ef5..a93e822 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -390,7 +390,7 @@
 @ stub GdipGetStringFormatDigitSubstitution
 @ stub GdipGetStringFormatFlags
 @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr)
-@ stub GdipGetStringFormatLineAlign
+@ stdcall GdipGetStringFormatLineAlign(ptr ptr)
 @ stub GdipGetStringFormatMeasurableCharacterRangeCount
 @ stub GdipGetStringFormatTabStopCount
 @ stub GdipGetStringFormatTabStops
@@ -589,7 +589,7 @@
 @ stub GdipSetStringFormatDigitSubstitution
 @ stub GdipSetStringFormatFlags
 @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long)
-@ stub GdipSetStringFormatLineAlign
+@ stdcall GdipSetStringFormatLineAlign(ptr long)
 @ stub GdipSetStringFormatMeasurableCharacterRanges
 @ stub GdipSetStringFormatTabStops
 @ stdcall GdipSetStringFormatTrimming(ptr long)
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index e8832e6..09ef83f 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -181,6 +181,7 @@ struct GpStringFormat{
     StringAlignment align;
     StringTrimming trimming;
     HotkeyPrefix hkprefix;
+    StringAlignment vertalign;
 };
 
 #endif
diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c
index 311c5ee..1be004d 100644
--- a/dlls/gdiplus/stringformat.c
+++ b/dlls/gdiplus/stringformat.c
@@ -66,6 +66,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format,
+    StringAlignment *align)
+{
+    if(!format || !align)
+        return InvalidParameter;
+
+    *align = format->vertalign;
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format,
     StringTrimming *trimming)
 {
@@ -99,6 +110,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format,
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format,
+    StringAlignment align)
+{
+    if(!format)
+        return InvalidParameter;
+
+    format->vertalign = align;
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format,
     StringTrimming trimming)
 {
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 0b5ac3b..640f0fc 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -253,9 +253,11 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
 GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
 GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);
 GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*);
+GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);
 GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);
 GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment);
 GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);
+GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment);
 GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming);
 
 #ifdef __cplusplus




More information about the wine-cvs mailing list