Changeset 280 for trunk/include

Timestamp:

Jul 7, 1999, 9:57:37 AM (26 years ago)

Author:

phaller

Message:

Fix: various fixes for DDRAW + DSOUND

Location:

trunk/include/win

Files:

• d3d.h (modified) (5 diffs)
• ddraw.h (modified) (3 diffs)
• wine/dd_obj_base.h (modified) (2 diffs)

trunk/include/win/d3d.h

@@ -1 @@
-/* $Id: d3d.h,v 1.2 1999-06-26 11:43:11 achimha Exp $ */
+/* $Id: d3d.h,v 1.3 1999-07-07 07:57:36 phaller Exp $ */
 
 #ifndef __WINE_D3D_H
@@ -1284 +1284 @@
 #define ICOM_INTERFACE IDirect3DTexture
 #define IDirect3DTexture_METHODS \
-    ICOM_METHOD2(HRESULT,Initialize,     LPDIRECT3DDEVICE,lpDirect3DDevice, LPDIRECTDRAWSURFACE,) \
-    ICOM_METHOD2(HRESULT,GetHandle,      LPDIRECT3DDEVICE,lpDirect3DDevice, LPD3DTEXTUREHANDLE,) \
+    ICOM_METHOD2(HRESULT,Initialize,     LPDIRECT3DDEVICE,lpDirect3DDevice, LPDIRECTDRAWSURFACE, arg3) \
+    ICOM_METHOD2(HRESULT,GetHandle,      LPDIRECT3DDEVICE,lpDirect3DDevice, LPD3DTEXTUREHANDLE, arg3) \
     ICOM_METHOD2(HRESULT,PaletteChanged, DWORD,dwStart, DWORD,dwCount) \
     ICOM_METHOD1(HRESULT,Load,           LPDIRECT3DTEXTURE,lpD3DTexture) \
@@ -1346 +1346 @@
     ICOM_METHOD2(HRESULT,LightElements,      DWORD,dwElementCount, LPD3DLIGHTDATA,lpData) \
     ICOM_METHOD1(HRESULT,SetBackground,      D3DMATERIALHANDLE,hMat) \
-    ICOM_METHOD2(HRESULT,GetBackground,      LPD3DMATERIALHANDLE,, LPBOOL,) \
+    ICOM_METHOD2(HRESULT,GetBackground,      LPD3DMATERIALHANDLE,arg2, LPBOOL, arg3) \
     ICOM_METHOD1(HRESULT,SetBackgroundDepth, LPDIRECTDRAWSURFACE,lpDDSurface) \
     ICOM_METHOD2(HRESULT,GetBackgroundDepth, LPDIRECTDRAWSURFACE*,lplpDDSurface, LPBOOL,lpValid) \
@@ -1430 +1430 @@
     ICOM_METHOD1(HRESULT,GetExecuteData, LPD3DEXECUTEDATA,lpData) \
     ICOM_METHOD4(HRESULT,Validate,       LPDWORD,lpdwOffset, LPD3DVALIDATECALLBACK,lpFunc, LPVOID,lpUserArg, DWORD,dwReserved) \
-    ICOM_METHOD1(HRESULT,Optimize,       DWORD,)
+    ICOM_METHOD1(HRESULT,Optimize,       DWORD,arg2)
 #define IDirect3DExecuteBuffer_IMETHODS \
     IUnknown_IMETHODS \
@@ -1531 +1531 @@
     ICOM_METHOD2(HRESULT,SetRenderTarget,      LPDIRECTDRAWSURFACE,lpNewRenderTarget, DWORD,dwFlags) \
     ICOM_METHOD1(HRESULT,GetRenderTarget,      LPDIRECTDRAWSURFACE*,lplpRenderTarget) \
-    ICOM_METHOD3(HRESULT,Begin,                D3DPRIMITIVETYPE,, D3DVERTEXTYPE,, DWORD,) \
+    ICOM_METHOD3(HRESULT,Begin,                D3DPRIMITIVETYPE,arg2, D3DVERTEXTYPE,arg3, DWORD,arg4) \
     ICOM_METHOD5(HRESULT,BeginIndexed,         D3DPRIMITIVETYPE,d3dptPrimitiveType, D3DVERTEXTYPE,d3dvtVertexType, LPVOID,lpvVertices, DWORD,dwNumVertices, DWORD,dwFlags) \
     ICOM_METHOD1(HRESULT,Vertex,               LPVOID,lpVertexType) \

trunk/include/win/ddraw.h

@@ -1 @@
-/* $Id: ddraw.h,v 1.2 1999-06-26 11:43:12 achimha Exp $ */
+/* $Id: ddraw.h,v 1.3 1999-07-07 07:57:36 phaller Exp $ */
 
 #ifndef __WINE_DDRAW_H
@@ -1271 +1271 @@
     ICOM_METHOD3(HRESULT,GetAvailableVidMem, LPDDSCAPS2,lpDDCaps, LPDWORD,lpdwTotal, LPDWORD,lpdwFree)\
     /* Added with V */ \
-    ICOM_METHOD2(HRESULT,GetSurfaceFromDC,    HDC,, LPDIRECTDRAWSURFACE4*,) \
+    ICOM_METHOD2(HRESULT,GetSurfaceFromDC,    HDC,hDC, LPDIRECTDRAWSURFACE4*,lpSurface) \
     ICOM_METHOD (HRESULT,RestoreAllSurfaces) \
     ICOM_METHOD (HRESULT,TestCooperativeLevel) \
-    ICOM_METHOD2(HRESULT,GetDeviceIdentifier, LPDDDEVICEIDENTIFIER,, DWORD,)
+    ICOM_METHOD2(HRESULT,GetDeviceIdentifier, LPDDDEVICEIDENTIFIER, lpArg1, DWORD, dwArg2)
 #define IDirectDraw4_IMETHODS \
     IUnknown_IMETHODS \
@@ -1655 +1655 @@
     ICOM_METHOD2(HRESULT,SetSurfaceDesc, LPDDSURFACEDESC2,lpDDSD, DWORD,dwFlags) \
     /* added in v4 */ \
-    ICOM_METHOD4(HRESULT,SetPrivateData,       REFGUID,, LPVOID,, DWORD,, DWORD,) \
-    ICOM_METHOD3(HRESULT,GetPrivateData,       REFGUID,, LPVOID,, LPDWORD,) \
-    ICOM_METHOD1(HRESULT,FreePrivateData,      REFGUID,) \
-    ICOM_METHOD1(HRESULT,GetUniquenessValue,   LPDWORD,) \
+    ICOM_METHOD4(HRESULT,SetPrivateData,       REFGUID,arg1, LPVOID,arg2, DWORD,arg3, DWORD,arg4) \
+    ICOM_METHOD3(HRESULT,GetPrivateData,       REFGUID,arg1, LPVOID,arg2, LPDWORD,arg3) \
+    ICOM_METHOD1(HRESULT,FreePrivateData,      REFGUID,arg1) \
+    ICOM_METHOD1(HRESULT,GetUniquenessValue,   LPDWORD,arg1) \
     ICOM_METHOD (HRESULT,ChangeUniquenessValue)
 #define IDirectDrawSurface4_IMETHODS \

trunk/include/win/wine/dd_obj_base.h

@@ -1 @@
-/* $Id: dd_obj_base.h,v 1.1 1999-06-26 11:43:12 achimha Exp $ */
+/* $Id: dd_obj_base.h,v 1.2 1999-07-07 07:57:37 phaller Exp $ */
 /*
  * This file defines the macros and types necessary to define COM interfaces,
@@ -313 +313 @@
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me);
 
-#define ICOM_METHOD1(ret,xfn,ta,na) \
+#define ICOM_METHOD1(ret,xfn,ta,a) \
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me,ta a);
 
-#define ICOM_METHOD2(ret,xfn,ta,na,tb,nb) \
+#define ICOM_METHOD2(ret,xfn,ta,a,tb,b) \
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me,ta a,tb b);
 
-#define ICOM_METHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
+#define ICOM_METHOD3(ret,xfn,ta,a,tb,b,tc,c) \
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
 
-#define ICOM_METHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
+#define ICOM_METHOD4(ret,xfn,ta,a,tb,b,tc,c,td,d) \
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
 
-#define ICOM_METHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
+#define ICOM_METHOD5(ret,xfn,ta,a,tb,b,tc,c,td,d,te,e) \
     ret (CALLBACK *##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);