d3d8 header patch.

[Yong Chi]

Try number 2.. -p


--- "Dimitrie O. Paun" <dpaun at rogers.com> wrote:
> On September 25, 2002 09:13 am, Yong Chi wrote:
> > I gave a .txt extension this time to make sure
> that the attachment got
> > treated as a text file. =)
> 
> Excellent. But you didn't send it in the right
> format. Do
> 
> cvs diff -u include/d3d8.h
> 
> You should add
> diff -u
> to your .cvsrc file.
> 
> -- 
> Dimi.
> 



__________________________________________________
Do you Yahoo!?
New DSL Internet Access from SBC & Yahoo!
http://sbc.yahoo.com
-------------- next part --------------
Index: include/d3d8.h
===================================================================
RCS file: /home/wine/wine/include/d3d8.h,v
retrieving revision 1.1
diff -u -u -r1.1 d3d8.h
--- include/d3d8.h	12 Sep 2002 22:25:16 -0000	1.1
+++ include/d3d8.h	25 Sep 2002 15:36:49 -0000
@@ -99,6 +99,9 @@
 DEFINE_GUID(IID_IDIRECT3DVOLUMETEXTURE8,0X4B8AAAFA,0X140F,0X42BA,0X91,0X31,0X59,0X7E,0XAF,0XAA,0X2E,0XAD);
 typedef struct IDirect3DVolumeTexture8 IDirect3DVolumeTexture8, *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLUMETEXTURE8;
 
+DEFINE_GUID(IID_IDIRECT3DXFONT,0X89FAD6A5,0X24D,0X49AF,0X8F,0XE7,0XF5,0X11,0X23,0XB8,0X5E,0X25);
+typedef struct IDirect3DXFont IDirect3DXFont, *LPDIRECT3DXFONT, *PDIRECT3DXFONT;
+
 /*****************************************************************************
  * IDirect3D8 interface
  */
@@ -724,5 +727,42 @@
 #define IDirect3DVolumeTexture8_LockBox(p,a,b,c,d)           ICOM_CALL4(LockBox,p,a,b,c,d)
 #define IDirect3DVolumeTexture8_UnlockBox(p,a)               ICOM_CALL1(UnlockBox,p,a)
 #define IDirect3DVolumeTexture8_AddDirtyBox(p,a)             ICOM_CALL1(AddDirtyBox,p,a)
+
+
+/*****************************************************************************
+ * IDirect3DXFont interface
+ */
+#define ICOM_INTERFACE IDirect3DXFont
+#define IDirect3DXFont_METHODS \
+    /*** IDirect3DXFont methods ***/ \
+    ICOM_METHOD(HRESULT, Begin) \
+    ICOM_METHOD5(INT, DrawTextA, LPCSTR, pString, INT, Count, LPRECT, pRect, DWORD, Format, D3DCOLOR, Color) \
+    ICOM_METHOD(HRESULT, End) \
+    ICOM_METHOD1(HRESULT, GetDevice, LPDIRECT3DDEVICE8*, ppDevice) \
+    ICOM_METHOD1(HRESULT, GetLogFont, LOGFONTA*, pLogFont) \
+    ICOM_METHOD(HRESULT, OnLostDevice) \
+    ICOM_METHOD(HRESULT, OnResetDevice) 
+
+    /*** IDirect3DXFont methods ***/
+#define IDirect3DXFont_IMETHODS \
+    IUnknown_IMETHODS \
+    IDirect3DXFont_METHODS
+ICOM_DEFINE(IDirect3DXFont,IUnknown)
+#undef ICOM_INTERFACE
+
+/*** IUnknown methods ***/
+#define IDirect3DXFont_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
+#define IDirect3DXFont_AddRef(p)                    ICOM_CALL (AddRef,p)
+#define IDirect3DXFont_Release(p)                   ICOM_CALL (Release,p)
+
+/*** IDirect3DXFont methods ***/
+#define IDirect3DXFont_Begin(p)                     ICOM_CALL(Begin,p)
+#define IDirect3DXFont_DrawTextA(p,a,b,c,d,e)       ICOM_CALL5(DrawText,p,a,b,c,d,e)
+#define IDirect3DXFont_End(p)			    ICOM_CALL(End,p)
+#define IDirect3DXFont_GetDevice(p,a)		    ICOM_CALL1(GetDevice,p,a)
+#define IDirect3DXFont_GetLogFont(p,a)		    ICOM_CALL1(GetLogFont,p,a)
+#define IDirect3DXFont_OnLostDevice(p)		    ICOM_CALL(OnLostDevice,p)
+#define IDirect3DXFont_OnResetDevice(p)		    ICOM_CALL(OnResetDevice,p)
+
 
 #endif /* __WINE_D3D8_H */