-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Changelog: - some cleanups and fixes on d3d8 and d3d9 headers (patch) - d3d9.dl codel (in tgz), mostly stubs because d3d9 will use wined3dcore Regards, Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (GNU/Linux) iD8DBQE+/v04p7NA3AmQTU4RAmEJAJ9P/v+Jzo6n2ewjNBfgg2Con4XuqQCgl+wX Drs2ylI7yHmdlog+czfTi9Q= =Wyg+ -----END PGP SIGNATURE-----
? dplay8.h
Index: d3d8.h
===================================================================
RCS file: /home/wine/wine/include/d3d8.h,v
retrieving revision 1.8
diff -u -r1.8 d3d8.h
--- d3d8.h 13 Apr 2003 01:02:52 -0000 1.8
+++ d3d8.h 29 Jun 2003 14:46:03 -0000
@@ -19,6 +19,10 @@
#ifndef __WINE_D3D8_H
#define __WINE_D3D8_H
+#ifndef DIRECT3D_VERSION
+#define DIRECT3D_VERSION 0x0800
+#endif
+
#include "objbase.h"
#include "d3d8types.h"
Index: d3d9.h
===================================================================
RCS file: /home/wine/wine/include/d3d9.h,v
retrieving revision 1.2
diff -u -r1.2 d3d9.h
--- d3d9.h 24 Jun 2003 19:26:51 -0000 1.2
+++ d3d9.h 29 Jun 2003 14:46:07 -0000
@@ -502,10 +502,10 @@
#endif
/*****************************************************************************
- * IDirect3DSurface9 interface
+ * IDirect3DResource9 interface
*/
-#define INTERFACE IDirect3DSurface9
-#define IDirect3DSurface9_METHODS \
+#define INTERFACE IDirect3DResource9
+#define IDirect3DResource9_METHODS \
IUnknown_METHODS \
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \
STDMETHOD(SetPrivateData)(THIS_ REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) PURE; \
@@ -514,14 +514,39 @@
STDMETHOD_(DWORD, SetPriority)(THIS_ DWORD PriorityNew) PURE; \
STDMETHOD_(DWORD, GetPriority)(THIS) PURE; \
STDMETHOD_(void, PreLoad)(THIS) PURE; \
- STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE; \
+ STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE;
+ICOM_DEFINE(IDirect3DResource9,IUnknown)
+#undef INTERFACE
+
+#ifdef COBJMACROS
+/*** IUnknown methods ***/
+#define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DResource9_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DResource9_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DResource9 methods ***/
+#define IDirect3DResource9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a)
+#define IDirect3DResource9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
+#define IDirect3DResource9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
+#define IDirect3DResource9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
+#define IDirect3DResource9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a)
+#define IDirect3DResource9_GetPriority(p) (p)->lpVtbl->GetPriority(p)
+#define IDirect3DResource9_PreLoad(p) (p)->lpVtbl->PreLoad(p)
+#define IDirect3DResource9_GetType(p) (p)->lpVtbl->GetType(p)
+#endif
+
+/*****************************************************************************
+ * IDirect3DSurface9 interface
+ */
+#define INTERFACE IDirect3DSurface9
+#define IDirect3DSurface9_METHODS \
+ IDirect3DResource9_METHODS \
STDMETHOD(GetContainer)(THIS_ REFIID riid, void** ppContainer) PURE; \
STDMETHOD(GetDesc)(THIS_ D3DSURFACE_DESC* pDesc) PURE; \
STDMETHOD(LockRect)(THIS_ D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) PURE; \
STDMETHOD(UnlockRect)(THIS) PURE; \
STDMETHOD(GetDC)(THIS_ HDC* phdc) PURE; \
STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE;
-ICOM_DEFINE(IDirect3DSurface9,IUnknown)
+ICOM_DEFINE(IDirect3DSurface9,IDirect3DRessource9)
#undef INTERFACE
#ifdef COBJMACROS
@@ -529,7 +554,7 @@
#define IDirect3DSurface9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IDirect3DSurface9_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IDirect3DSurface9_Release(p) (p)->lpVtbl->Release(p)
-/*** IDirect3DSurface9 methods ***/
+/*** IDirect3DSurface9 methods: IDirect3DResource9 ***/
#define IDirect3DSurface9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a)
#define IDirect3DSurface9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
#define IDirect3DSurface9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
@@ -538,6 +563,7 @@
#define IDirect3DSurface9_GetPriority(p) (p)->lpVtbl->GetPriority(p)
#define IDirect3DSurface9_PreLoad(p) (p)->lpVtbl->PreLoad(p)
#define IDirect3DSurface9_GetType(p) (p)->lpVtbl->GetType(p)
+/*** IDirect3DSurface9 methods ***/
#define IDirect3DSurface9_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b)
#define IDirect3DSurface9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a)
#define IDirect3DSurface9_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c)
@@ -547,39 +573,6 @@
#endif
/*****************************************************************************
- * IDirect3DResource9 interface
- */
-#define INTERFACE IDirect3DResource9
-#define IDirect3DResource9_METHODS \
- IUnknown_METHODS \
- STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \
- STDMETHOD(SetPrivateData)(THIS_ REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) PURE; \
- STDMETHOD(GetPrivateData)(THIS_ REFGUID refguid, void* pData, DWORD* pSizeOfData) PURE; \
- STDMETHOD(FreePrivateData)(THIS_ REFGUID refguid) PURE; \
- STDMETHOD_(DWORD, SetPriority)(THIS_ DWORD PriorityNew) PURE; \
- STDMETHOD_(DWORD, GetPriority)(THIS) PURE; \
- STDMETHOD_(void, PreLoad)(THIS) PURE; \
- STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE;
-ICOM_DEFINE(IDirect3DResource9,IUnknown)
-#undef INTERFACE
-
-#ifdef COBJMACROS
-/*** IUnknown methods ***/
-#define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirect3DResource9_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDirect3DResource9_Release(p) (p)->lpVtbl->Release(p)
-/*** IDirect3DResource9 methods ***/
-#define IDirect3DResource9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a)
-#define IDirect3DResource9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
-#define IDirect3DResource9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
-#define IDirect3DResource9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
-#define IDirect3DResource9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a)
-#define IDirect3DResource9_GetPriority(p) (p)->lpVtbl->GetPriority(p)
-#define IDirect3DResource9_PreLoad(p) (p)->lpVtbl->PreLoad(p)
-#define IDirect3DResource9_GetType(p) (p)->lpVtbl->GetType(p)
-#endif
-
-/*****************************************************************************
* IDirect3DVertexBuffer9 interface
*/
#define INTERFACE IDirect3DVertexBuffer9
@@ -773,10 +766,10 @@
#define INTERFACE IDirect3DVolumeTexture9
#define IDirect3DVolumeTexture9_METHODS \
IDirect3DBaseTexture9_METHODS \
- STDMETHOD(GetLevelDesc)(THIS_ UINT Level, D3DVOLUME_DESC *pDesc) PURE;
- STDMETHOD(GetVolumeLevel)(THIS_ UINT Level, IDirect3DVolume9** ppVolumeLevel) PURE;
- STDMETHOD(LockBox)(THIS_ UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE;
- STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE;
+ STDMETHOD(GetLevelDesc)(THIS_ UINT Level, D3DVOLUME_DESC *pDesc) PURE; \
+ STDMETHOD(GetVolumeLevel)(THIS_ UINT Level, IDirect3DVolume9** ppVolumeLevel) PURE; \
+ STDMETHOD(LockBox)(THIS_ UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; \
+ STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE; \
STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE;
ICOM_DEFINE(IDirect3DVolumeTexture9,IDirect3DBaseTexture9)
#undef INTERFACE
Index: d3d9types.h
===================================================================
RCS file: /home/wine/wine/include/d3d9types.h,v
retrieving revision 1.2
diff -u -r1.2 d3d9types.h
--- d3d9types.h 24 Jun 2003 19:26:51 -0000 1.2
+++ d3d9types.h 29 Jun 2003 14:46:10 -0000
@@ -200,7 +200,7 @@
#define MAXD3DDECLUSAGE D3DDECLUSAGE_SAMPLE
#define MAXD3DDECLUSAGEINDEX 15
-#define MAXD3DDECLLENGTH 64 /* does not include "end" marker vertex element */
+#define MAXD3DDECLLENGTH 64
typedef enum _D3DDECLMETHOD {
D3DDECLMETHOD_DEFAULT = 0,
@@ -1131,8 +1131,10 @@
typedef struct _D3DADAPTER_IDENTIFIER9 {
char Driver[MAX_DEVICE_IDENTIFIER_STRING];
char Description[MAX_DEVICE_IDENTIFIER_STRING];
- char DeviceName[32]; /* Device name for GDI (ex. \\.\DISPLAY1) */
- LARGE_INTEGER DriverVersion;
+ char DeviceName[32];
+ DWORD DriverVersionLowPart;
+ DWORD DriverVersionHighPart;
+
DWORD VendorId;
DWORD DeviceId;
DWORD SubSysId;
@@ -1352,5 +1354,5 @@
D3DQUERYTYPE_OCCLUSION = 9
} D3DQUERYTYPE;
-
#endif /* __WINE_D3D9TYPES_H */
+
Attachment:
dx62.d3d9dll.2.tgz
Description: application/tgz
