CVS: winex/include wingdi.h, 1.13, 1.14 wtypes.h, 1.5, 1.6 wtypes.idl, 1.3, 1.4

Subject: winex/include wingdi.h,1.13,1.14 wtypes.h,1.5,1.6 wtypes.idl,1.3,1.4Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv16012/include

Modified Files:
	wingdi.h wtypes.h wtypes.idl 
Log Message:
Define TEXTMETRIC in wtypes.idl.


Index: wingdi.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wingdi.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- wingdi.h	28 Mar 2007 14:32:12 -0000	1.13
+++ wingdi.h	14 Dec 2007 20:23:56 -0000	1.14
@@ -742,6 +742,9 @@
 #define FF_SCRIPT           0x40
 #define FF_DECORATIVE       0x50
 
+#ifndef _TEXTMETRIC_DEFINED
+#define _TEXTMETRIC_DEFINED
+
 typedef struct
 {
     LONG      tmHeight;
@@ -793,6 +796,7 @@
 DECL_WINELIB_TYPE_AW(TEXTMETRIC)
 DECL_WINELIB_TYPE_AW(PTEXTMETRIC)
 DECL_WINELIB_TYPE_AW(LPTEXTMETRIC)
+#endif /* _TEXTMETRIC_DEFINED */
 
 
 typedef struct tagPANOSE

Index: wtypes.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wtypes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wtypes.h	14 Dec 2007 20:23:46 -0000	1.5
+++ wtypes.h	14 Dec 2007 20:23:56 -0000	1.6
@@ -47,6 +47,7 @@
 typedef void *HTASK;
 typedef void *HKEY;
 typedef double DATE;
+typedef LONG_PTR LRESULT;
 typedef LONG HRESULT;
 typedef DWORD LCID;
 typedef unsigned __int64 DWORDLONG;
@@ -178,6 +179,57 @@
 typedef struct _FILETIME *PFILETIME;
 typedef struct _FILETIME *LPFILETIME;
 #endif
+#ifndef _TEXTMETRIC_DEFINED
+#define _TEXTMETRIC_DEFINED
+typedef struct tagTEXTMETRICA {
+    LONG tmHeight;
+    LONG tmAscent;
+    LONG tmDescent;
+    LONG tmInternalLeading;
+    LONG tmExternalLeading;
+    LONG tmAveCharWidth;
+    LONG tmMaxCharWidth;
+    LONG tmWeight;
+    LONG tmOverhang;
+    LONG tmDigitizedAspectX;
+    LONG tmDigitizedAspectY;
+    BYTE tmFirstChar;
+    BYTE tmLastChar;
+    BYTE tmDefaultChar;
+    BYTE tmBreakChar;
+    BYTE tmItalic;
+    BYTE tmUnderlined;
+    BYTE tmStruckOut;
+    BYTE tmPitchAndFamily;
+    BYTE tmCharSet;
+} TEXTMETRICA;
+typedef struct tagTEXTMETRICA *LPTEXTMETRICA;
+typedef struct tagTEXTMETRICA *PTEXTMETRICA;
+typedef struct tagTEXTMETRICW {
+    LONG tmHeight;
+    LONG tmAscent;
+    LONG tmDescent;
+    LONG tmInternalLeading;
+    LONG tmExternalLeading;
+    LONG tmAveCharWidth;
+    LONG tmMaxCharWidth;
+    LONG tmWeight;
+    LONG tmOverhang;
+    LONG tmDigitizedAspectX;
+    LONG tmDigitizedAspectY;
+    WCHAR tmFirstChar;
+    WCHAR tmLastChar;
+    WCHAR tmDefaultChar;
+    WCHAR tmBreakChar;
+    BYTE tmItalic;
+    BYTE tmUnderlined;
+    BYTE tmStruckOut;
+    BYTE tmPitchAndFamily;
+    BYTE tmCharSet;
+} TEXTMETRICW;
+typedef struct tagTEXTMETRICW *LPTEXTMETRICW;
+typedef struct tagTEXTMETRICW *PTEXTMETRICW;
+#endif
 typedef WCHAR OLECHAR;
 typedef OLECHAR *LPOLESTR;
 typedef const OLECHAR *LPCOLESTR;

Index: wtypes.idl
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wtypes.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wtypes.idl	18 Jan 2005 19:45:14 -0000	1.3
+++ wtypes.idl	14 Dec 2007 20:23:56 -0000	1.4
@@ -64,6 +64,7 @@
 DECLARE_HANDLE(HKEY);
 
 typedef double DATE;
+typedef LONG_PTR LRESULT;
 typedef LONG HRESULT;
 typedef DWORD LCID;
 
@@ -199,6 +200,57 @@
 } FILETIME, *PFILETIME, *LPFILETIME;
 cpp_quote("#endif")
 
+cpp_quote("#ifndef _TEXTMETRIC_DEFINED")
+cpp_quote("#define _TEXTMETRIC_DEFINED")
+typedef struct tagTEXTMETRICA
+{
+    LONG      tmHeight;
+    LONG      tmAscent;
+    LONG      tmDescent;
+    LONG      tmInternalLeading;
+    LONG      tmExternalLeading;
+    LONG      tmAveCharWidth;
+    LONG      tmMaxCharWidth;
+    LONG      tmWeight;
+    LONG      tmOverhang;
+    LONG      tmDigitizedAspectX;
+    LONG      tmDigitizedAspectY;
+    BYTE      tmFirstChar;
+    BYTE      tmLastChar;
+    BYTE      tmDefaultChar;
+    BYTE      tmBreakChar;
+    BYTE      tmItalic;
+    BYTE      tmUnderlined;
+    BYTE      tmStruckOut;
+    BYTE      tmPitchAndFamily;
+    BYTE      tmCharSet;
+} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
+
+typedef struct tagTEXTMETRICW
+{
+    LONG      tmHeight;
+    LONG      tmAscent;
+    LONG      tmDescent;
+    LONG      tmInternalLeading;
+    LONG      tmExternalLeading;
+    LONG      tmAveCharWidth;
+    LONG      tmMaxCharWidth;
+    LONG      tmWeight;
+    LONG      tmOverhang;
+    LONG      tmDigitizedAspectX;
+    LONG      tmDigitizedAspectY;
+    WCHAR     tmFirstChar;
+    WCHAR     tmLastChar;
+    WCHAR     tmDefaultChar;
+    WCHAR     tmBreakChar;
+    BYTE      tmItalic;
+    BYTE      tmUnderlined;
+    BYTE      tmStruckOut;
+    BYTE      tmPitchAndFamily;
+    BYTE      tmCharSet;
+} TEXTMETRICW, *LPTEXTMETRICW, *PTEXTMETRICW;
+cpp_quote("#endif")
+
 /******************** BASIC COM/OLE TYPES ********************/
 
 typedef WCHAR OLECHAR;