[1/2] gdi32: defines for CreateFontIndirectEx (try3)

[Nikolay Sivov]

Changelog:
    - defines for CreateFontIndirectEx
    - corrections of existing defines (BYTE -> CHAR for fields)

---
 include/wingdi.h |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/include/wingdi.h b/include/wingdi.h
index 14c307d..02e9e10 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -573,8 +573,8 @@ DECL_WINELIB_TYPE_AW(LPLOGFONT)
 typedef struct
 {
   LOGFONTA elfLogFont;
-  BYTE       elfFullName[LF_FULLFACESIZE];
-  BYTE       elfStyle[LF_FACESIZE];
+  CHAR       elfFullName[LF_FULLFACESIZE];
+  CHAR       elfStyle[LF_FACESIZE];
 } ENUMLOGFONTA, *LPENUMLOGFONTA;
 
 typedef struct
@@ -590,9 +590,9 @@ DECL_WINELIB_TYPE_AW(LPENUMLOGFONT)
 typedef struct
 {
   LOGFONTA elfLogFont;
-  BYTE       elfFullName[LF_FULLFACESIZE];
-  BYTE       elfStyle[LF_FACESIZE];
-  BYTE       elfScript[LF_FACESIZE];
+  CHAR       elfFullName[LF_FULLFACESIZE];
+  CHAR       elfStyle[LF_FACESIZE];
+  CHAR       elfScript[LF_FACESIZE];
 } ENUMLOGFONTEXA,*LPENUMLOGFONTEXA;
 
 typedef struct
@@ -606,6 +606,30 @@ typedef struct
 DECL_WINELIB_TYPE_AW(ENUMLOGFONTEX)
 DECL_WINELIB_TYPE_AW(LPENUMLOGFONTEX)
 
+#define MM_MAX_NUMAXES    16
+
+typedef struct
+{
+  DWORD      dvReserved;
+  DWORD      dvNumAxes;
+  LONG       dvValues[MM_MAX_NUMAXES];
+} DESIGNVECTOR, *PDESIGNVECTOR;
+
+typedef struct
+{
+  ENUMLOGFONTEXA    elfEnumLogfontEx;
+  DESIGNVECTOR      elfDesignVector;
+} ENUMLOGFONTEXDVA, *PENUMLOGFONTEXDVA;
+
+typedef struct
+{
+  ENUMLOGFONTEXW    elfEnumLogfontEx;
+  DESIGNVECTOR      elfDesignVector;
+} ENUMLOGFONTEXDVW, *PENUMLOGFONTEXDVW;
+
+DECL_WINELIB_TYPE_AW(ENUMLOGFONTEXDV)
+DECL_WINELIB_TYPE_AW(PENUMLOGFONTEXDV)
+
 /*
  * The FONTSIGNATURE tells which Unicode ranges and which code pages
  * have glyphs in a font.
@@ -3342,6 +3366,9 @@ WINGDIAPI HFONT       WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,DWORD,D
 WINGDIAPI HFONT       WINAPI CreateFontIndirectA(const LOGFONTA*);
 WINGDIAPI HFONT       WINAPI CreateFontIndirectW(const LOGFONTW*);
 #define                      CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect)
+WINGDIAPI HFONT       WINAPI CreateFontIndirectExA(const ENUMLOGFONTEXDVA*);
+WINGDIAPI HFONT       WINAPI CreateFontIndirectExW(const ENUMLOGFONTEXDVW*);
+#define                      CreateFontIndirectEx WINELIB_NAME_AW(CreateFontIndirectEx)
 WINGDIAPI HPALETTE    WINAPI CreateHalftonePalette(HDC);
 WINGDIAPI HBRUSH      WINAPI CreateHatchBrush(INT,COLORREF);
 WINGDIAPI HDC         WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
-- 
1.4.4.4