Evan Stade : gdiplus: Added string format constructor.

[Alexandre Julliard]

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

Author: Evan Stade 
Date:   Tue Aug 14 18:59:48 2007 -0700

gdiplus: Added string format constructor.

---

dlls/gdiplus/Makefile.in       |    3 +-
 dlls/gdiplus/gdiplus.spec      |    2 +-
 dlls/gdiplus/gdiplus_private.h |    5 ++++
 dlls/gdiplus/stringformat.c    |   45 ++++++++++++++++++++++++++++++++++++++++
 include/gdiplusflat.h          |    2 +
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index a826644..e47592b 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -18,7 +18,8 @@ C_SRCS = \
    imageattributes.c \
    matrix.c \
    pathiterator.c \
-	pen.c
+	pen.c \
+	stringformat.c

@MAKE_DLL_RULES@

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index b4c0c36..f1e7c03 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -130,7 +130,7 @@
 @ stub GdipCreateRegionRgnData
 @ stdcall GdipCreateSolidFill(long ptr)
 @ stdcall GdipCreateStreamOnFile(ptr long ptr)
-@ stub GdipCreateStringFormat
+@ stdcall GdipCreateStringFormat(long long ptr)
 @ stub GdipCreateTexture2
 @ stub GdipCreateTexture2I
 @ stub GdipCreateTexture
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 5be21b1..bb73b47 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -174,4 +174,9 @@ struct GpFont{
     LOGFONTW lfw;
 };

+struct GpStringFormat{
+    INT attr;
+    LANGID lang;
+};
+
 #endif
diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c
new file mode 100644
index 0000000..0836a3b
--- /dev/null
+++ b/dlls/gdiplus/stringformat.c
@@ -0,0 +1,45 @@
+/*
+ *
+ * Copyright (C) 2007 Google (Evan Stade)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winnls.h"
+
+#include "objbase.h"
+
+#include "gdiplus.h"
+#include "gdiplus_private.h"
+
+GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang,
+    GpStringFormat **format)
+{
+    if(!format)
+        return InvalidParameter;
+
+    *format = GdipAlloc(sizeof(GpStringFormat));
+    if(!*format)   return OutOfMemory;
+
+    (*format)->attr = attr;
+    (*format)->lang = lang;
+
+    return Ok;
+}
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index ed11b4a..6fe0104 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -244,6 +244,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**)
 GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);
 GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);

+GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
+
 #ifdef __cplusplus
 }
 #endif