inc: winapi: Fix DirectX headers

Previously they didn't compile (at least not all of them); also it seems
like several declarations were missing.

(cherry picked from commit 9e36366)

Author: dkl

changelog.txt

@@ -11,6 +11,7 @@ Version 1.02.1
 - 1.02.0 regression: OpenGL binding: glGetString() and some others use ZString Ptr instead of GLubyte Ptr again
 - 1.02.0 regression: Windows API binding: REFIID and some other REF* types were missing
 - bindings: Various previously untranslated (or wrongly translated) #defines in SDL2, X11, crt/pthread, Windows API
+- Windows API binding: DirectX headers missed some declarations and some didn't compile
 
 
 Version 1.02.0

inc/win/d3d9.bi

@@ -39,6 +39,18 @@ const D3DADAPTER_DEFAULT = 0
 const _FACD3D = &h876
 #define MAKE_D3DHRESULT(code) MAKE_HRESULT(1, _FACD3D, code)
 #define MAKE_D3DSTATUS(code) MAKE_HRESULT(0, _FACD3D, code)
+#define D3D_OK S_OK
+#define D3DERR_WRONGTEXTUREFORMAT MAKE_D3DHRESULT(2072)
+#define D3DERR_UNSUPPORTEDCOLOROPERATION MAKE_D3DHRESULT(2073)
+#define D3DERR_UNSUPPORTEDCOLORARG MAKE_D3DHRESULT(2074)
+#define D3DERR_UNSUPPORTEDALPHAOPERATION MAKE_D3DHRESULT(2075)
+#define D3DERR_UNSUPPORTEDALPHAARG MAKE_D3DHRESULT(2076)
+#define D3DERR_TOOMANYOPERATIONS MAKE_D3DHRESULT(2077)
+#define D3DERR_CONFLICTINGTEXTUREFILTER MAKE_D3DHRESULT(2078)
+#define D3DERR_UNSUPPORTEDFACTORVALUE MAKE_D3DHRESULT(2079)
+#define D3DERR_CONFLICTINGRENDERSTATE MAKE_D3DHRESULT(2081)
+#define D3DERR_UNSUPPORTEDTEXTUREFILTER MAKE_D3DHRESULT(2082)
+#define D3DERR_CONFLICTINGTEXTUREPALETTE MAKE_D3DHRESULT(2086)
 #define D3DERR_DRIVERINTERNALERROR MAKE_D3DHRESULT(2087)
 #define D3DERR_NOTFOUND MAKE_D3DHRESULT(2150)
 #define D3DERR_MOREDATA MAKE_D3DHRESULT(2151)

inc/win/d3d9caps.bi

@@ -13,19 +13,62 @@ const D3DCURSORCAPS_LOWRES = 2
 #define D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES __MSABI_LONG(&h00000010)
 #define D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH __MSABI_LONG(&h00000020)
 #define D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET __MSABI_LONG(&h00000040)
+const D3DDEVCAPS_EXECUTESYSTEMMEMORY = &h0000010
+const D3DDEVCAPS_EXECUTEVIDEOMEMORY = &h0000020
+const D3DDEVCAPS_TLVERTEXSYSTEMMEMORY = &h0000040
+const D3DDEVCAPS_TLVERTEXVIDEOMEMORY = &h0000080
+const D3DDEVCAPS_TEXTURESYSTEMMEMORY = &h0000100
+const D3DDEVCAPS_TEXTUREVIDEOMEMORY = &h0000200
+const D3DDEVCAPS_DRAWPRIMTLVERTEX = &h0000400
+const D3DDEVCAPS_CANRENDERAFTERFLIP = &h0000800
+const D3DDEVCAPS_TEXTURENONLOCALVIDMEM = &h0001000
+const D3DDEVCAPS_DRAWPRIMITIVES2 = &h0002000
+const D3DDEVCAPS_SEPARATETEXTUREMEMORIES = &h0004000
+const D3DDEVCAPS_DRAWPRIMITIVES2EX = &h0008000
+const D3DDEVCAPS_HWTRANSFORMANDLIGHT = &h0010000
+const D3DDEVCAPS_CANBLTSYSTONONLOCAL = &h0020000
+const D3DDEVCAPS_HWRASTERIZATION = &h0080000
 const D3DDEVCAPS_PUREDEVICE = &h0100000
 const D3DDEVCAPS_QUINTICRTPATCHES = &h0200000
 const D3DDEVCAPS_RTPATCHES = &h0400000
 const D3DDEVCAPS_RTPATCHHANDLEZERO = &h0800000
 const D3DDEVCAPS_NPATCHES = &h1000000
+const D3DFVFCAPS_TEXCOORDCOUNTMASK = &h00FFFF
+const D3DFVFCAPS_DONOTSTRIPELEMENTS = &h080000
 const D3DFVFCAPS_PSIZE = &h100000
 const D3DLINECAPS_TEXTURE = &h01
 const D3DLINECAPS_ZTEST = &h02
 const D3DLINECAPS_BLEND = &h04
 const D3DLINECAPS_ALPHACMP = &h08
 const D3DLINECAPS_FOG = &h10
 const D3DLINECAPS_ANTIALIAS = &h20
+const D3DPBLENDCAPS_ZERO = &h00000001
+const D3DPBLENDCAPS_ONE = &h00000002
+const D3DPBLENDCAPS_SRCCOLOR = &h00000004
+const D3DPBLENDCAPS_INVSRCCOLOR = &h00000008
+const D3DPBLENDCAPS_SRCALPHA = &h00000010
+const D3DPBLENDCAPS_INVSRCALPHA = &h00000020
+const D3DPBLENDCAPS_DESTALPHA = &h00000040
+const D3DPBLENDCAPS_INVDESTALPHA = &h00000080
+const D3DPBLENDCAPS_DESTCOLOR = &h00000100
+const D3DPBLENDCAPS_INVDESTCOLOR = &h00000200
+const D3DPBLENDCAPS_SRCALPHASAT = &h00000400
+const D3DPBLENDCAPS_BOTHSRCALPHA = &h00000800
+const D3DPBLENDCAPS_BOTHINVSRCALPHA = &h00001000
 const D3DPBLENDCAPS_BLENDFACTOR = &h00002000
+const D3DPCMPCAPS_NEVER = &h01
+const D3DPCMPCAPS_LESS = &h02
+const D3DPCMPCAPS_EQUAL = &h04
+const D3DPCMPCAPS_LESSEQUAL = &h08
+const D3DPCMPCAPS_GREATER = &h10
+const D3DPCMPCAPS_NOTEQUAL = &h20
+const D3DPCMPCAPS_GREATEREQUAL = &h40
+const D3DPCMPCAPS_ALWAYS = &h80
+#define D3DPMISCCAPS_MASKZ __MSABI_LONG(&h00000002)
+#define D3DPMISCCAPS_LINEPATTERNREP __MSABI_LONG(&h00000004)
+#define D3DPMISCCAPS_CULLNONE __MSABI_LONG(&h00000010)
+#define D3DPMISCCAPS_CULLCW __MSABI_LONG(&h00000020)
+#define D3DPMISCCAPS_CULLCCW __MSABI_LONG(&h00000040)
 #define D3DPMISCCAPS_COLORWRITEENABLE __MSABI_LONG(&h00000080)
 #define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS __MSABI_LONG(&h00000100)
 #define D3DPMISCCAPS_CLIPTLVERTS __MSABI_LONG(&h00000200)
@@ -39,6 +82,20 @@ const D3DPBLENDCAPS_BLENDFACTOR = &h00002000
 #define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS __MSABI_LONG(&h00040000)
 #define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING __MSABI_LONG(&h00080000)
 #define D3DPMISCCAPS_FOGVERTEXCLAMPED __MSABI_LONG(&h00100000)
+#define D3DPRASTERCAPS_DITHER __MSABI_LONG(&h00000001)
+#define D3DPRASTERCAPS_PAT __MSABI_LONG(&h00000008)
+#define D3DPRASTERCAPS_ZTEST __MSABI_LONG(&h00000010)
+#define D3DPRASTERCAPS_FOGVERTEX __MSABI_LONG(&h00000080)
+#define D3DPRASTERCAPS_FOGTABLE __MSABI_LONG(&h00000100)
+#define D3DPRASTERCAPS_ANTIALIASEDGES __MSABI_LONG(&h00001000)
+#define D3DPRASTERCAPS_MIPMAPLODBIAS __MSABI_LONG(&h00002000)
+#define D3DPRASTERCAPS_ZBIAS __MSABI_LONG(&h00004000)
+#define D3DPRASTERCAPS_ZBUFFERLESSHSR __MSABI_LONG(&h00008000)
+#define D3DPRASTERCAPS_FOGRANGE __MSABI_LONG(&h00010000)
+#define D3DPRASTERCAPS_ANISOTROPY __MSABI_LONG(&h00020000)
+#define D3DPRASTERCAPS_WBUFFER __MSABI_LONG(&h00040000)
+#define D3DPRASTERCAPS_WFOG __MSABI_LONG(&h00100000)
+#define D3DPRASTERCAPS_ZFOG __MSABI_LONG(&h00200000)
 #define D3DPRASTERCAPS_COLORPERSPECTIVE __MSABI_LONG(&h00400000)
 #define D3DPRASTERCAPS_SCISSORTEST __MSABI_LONG(&h01000000)
 #define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS __MSABI_LONG(&h02000000)
@@ -50,21 +107,84 @@ const D3DPRESENT_INTERVAL_TWO = &h00000002
 const D3DPRESENT_INTERVAL_THREE = &h00000004
 const D3DPRESENT_INTERVAL_FOUR = &h00000008
 const D3DPRESENT_INTERVAL_IMMEDIATE = &h80000000
+const D3DPSHADECAPS_COLORGOURAUDRGB = &h00008
+const D3DPSHADECAPS_SPECULARGOURAUDRGB = &h00200
+const D3DPSHADECAPS_ALPHAGOURAUDBLEND = &h04000
+const D3DPSHADECAPS_FOGGOURAUD = &h80000
+const D3DPTADDRESSCAPS_WRAP = &h01
+const D3DPTADDRESSCAPS_MIRROR = &h02
+const D3DPTADDRESSCAPS_CLAMP = &h04
+const D3DPTADDRESSCAPS_BORDER = &h08
+const D3DPTADDRESSCAPS_INDEPENDENTUV = &h10
 const D3DPTADDRESSCAPS_MIRRORONCE = &h20
+#define D3DPTEXTURECAPS_PERSPECTIVE __MSABI_LONG(&h00000001)
+#define D3DPTEXTURECAPS_POW2 __MSABI_LONG(&h00000002)
+#define D3DPTEXTURECAPS_ALPHA __MSABI_LONG(&h00000004)
+#define D3DPTEXTURECAPS_SQUAREONLY __MSABI_LONG(&h00000020)
+#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE __MSABI_LONG(&h00000040)
+#define D3DPTEXTURECAPS_ALPHAPALETTE __MSABI_LONG(&h00000080)
+#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL __MSABI_LONG(&h00000100)
+#define D3DPTEXTURECAPS_PROJECTED __MSABI_LONG(&h00000400)
+#define D3DPTEXTURECAPS_CUBEMAP __MSABI_LONG(&h00000800)
 #define D3DPTEXTURECAPS_VOLUMEMAP __MSABI_LONG(&h00002000)
 #define D3DPTEXTURECAPS_MIPMAP __MSABI_LONG(&h00004000)
 #define D3DPTEXTURECAPS_MIPVOLUMEMAP __MSABI_LONG(&h00008000)
 #define D3DPTEXTURECAPS_MIPCUBEMAP __MSABI_LONG(&h00010000)
 #define D3DPTEXTURECAPS_CUBEMAP_POW2 __MSABI_LONG(&h00020000)
 #define D3DPTEXTURECAPS_VOLUMEMAP_POW2 __MSABI_LONG(&h00040000)
 #define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV __MSABI_LONG(&h00200000)
+const D3DPTFILTERCAPS_MINFPOINT = &h00000100
+const D3DPTFILTERCAPS_MINFLINEAR = &h00000200
+const D3DPTFILTERCAPS_MINFANISOTROPIC = &h00000400
 const D3DPTFILTERCAPS_MINFPYRAMIDALQUAD = &h00000800
 const D3DPTFILTERCAPS_MINFGAUSSIANQUAD = &h00001000
+const D3DPTFILTERCAPS_MIPFPOINT = &h00010000
+const D3DPTFILTERCAPS_MIPFLINEAR = &h00020000
+const D3DPTFILTERCAPS_MAGFPOINT = &h01000000
+const D3DPTFILTERCAPS_MAGFLINEAR = &h02000000
+const D3DPTFILTERCAPS_MAGFANISOTROPIC = &h04000000
 const D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD = &h08000000
 const D3DPTFILTERCAPS_MAGFGAUSSIANQUAD = &h10000000
+const D3DSTENCILCAPS_KEEP = &h01
+const D3DSTENCILCAPS_ZERO = &h02
+const D3DSTENCILCAPS_REPLACE = &h04
+const D3DSTENCILCAPS_INCRSAT = &h08
+const D3DSTENCILCAPS_DECRSAT = &h10
+const D3DSTENCILCAPS_INVERT = &h20
+const D3DSTENCILCAPS_INCR = &h40
+const D3DSTENCILCAPS_DECR = &h80
 const D3DSTENCILCAPS_TWOSIDED = &h100
+const D3DTEXOPCAPS_DISABLE = &h0000001
+const D3DTEXOPCAPS_SELECTARG1 = &h0000002
+const D3DTEXOPCAPS_SELECTARG2 = &h0000004
+const D3DTEXOPCAPS_MODULATE = &h0000008
+const D3DTEXOPCAPS_MODULATE2X = &h0000010
+const D3DTEXOPCAPS_MODULATE4X = &h0000020
+const D3DTEXOPCAPS_ADD = &h0000040
+const D3DTEXOPCAPS_ADDSIGNED = &h0000080
+const D3DTEXOPCAPS_ADDSIGNED2X = &h0000100
+const D3DTEXOPCAPS_SUBTRACT = &h0000200
+const D3DTEXOPCAPS_ADDSMOOTH = &h0000400
+const D3DTEXOPCAPS_BLENDDIFFUSEALPHA = &h0000800
+const D3DTEXOPCAPS_BLENDTEXTUREALPHA = &h0001000
+const D3DTEXOPCAPS_BLENDFACTORALPHA = &h0002000
+const D3DTEXOPCAPS_BLENDTEXTUREALPHAPM = &h0004000
+const D3DTEXOPCAPS_BLENDCURRENTALPHA = &h0008000
+const D3DTEXOPCAPS_PREMODULATE = &h0010000
+const D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR = &h0020000
+const D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA = &h0040000
+const D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR = &h0080000
+const D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA = &h0100000
+const D3DTEXOPCAPS_BUMPENVMAP = &h0200000
+const D3DTEXOPCAPS_BUMPENVMAPLUMINANCE = &h0400000
+const D3DTEXOPCAPS_DOTPRODUCT3 = &h0800000
 const D3DTEXOPCAPS_MULTIPLYADD = &h1000000
 const D3DTEXOPCAPS_LERP = &h2000000
+#define D3DVTXPCAPS_TEXGEN __MSABI_LONG(&h00000001)
+#define D3DVTXPCAPS_MATERIALSOURCE7 __MSABI_LONG(&h00000002)
+#define D3DVTXPCAPS_DIRECTIONALLIGHTS __MSABI_LONG(&h00000008)
+#define D3DVTXPCAPS_POSITIONALLIGHTS __MSABI_LONG(&h00000010)
+#define D3DVTXPCAPS_LOCALVIEWER __MSABI_LONG(&h00000020)
 #define D3DVTXPCAPS_TWEENING __MSABI_LONG(&h00000040)
 #define D3DVTXPCAPS_TEXGEN_SPHEREMAP __MSABI_LONG(&h00000100)
 #define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER __MSABI_LONG(&h00000200)

inc/win/d3d9types.bi

@@ -3,6 +3,9 @@
 #pragma once
 
 #define __WINE_D3D9TYPES_H
+#define D3DCLEAR_TARGET __MSABI_LONG(&h00000001)
+#define D3DCLEAR_ZBUFFER __MSABI_LONG(&h00000002)
+#define D3DCLEAR_STENCIL __MSABI_LONG(&h00000004)
 #define D3DCOLOR_ARGB(a, r, g, b) cast(D3DCOLOR, (((((a) and &hff) shl 24) or (((r) and &hff) shl 16)) or (((g) and &hff) shl 8)) or ((b) and &hff))
 #define D3DCOLOR_COLORVALUE(r, g, b, a) D3DCOLOR_RGBA(cast(DWORD, (r) * 255.f), cast(DWORD, (g) * 255.f), cast(DWORD, (b) * 255.f), cast(DWORD, (a) * 255.f))
 #define D3DCOLOR_RGBA(r, g, b, a) D3DCOLOR_ARGB(a, r, g, b)
@@ -22,12 +25,32 @@
 #define D3DCS_PLANE4 __MSABI_LONG(&h400)
 #define D3DCS_PLANE5 __MSABI_LONG(&h800)
 #define D3DCS_ALL __MSABI_LONG(&hFFF)
+const D3DFVF_TEXTUREFORMAT1 = 3
+const D3DFVF_TEXTUREFORMAT2 = 0
+const D3DFVF_TEXTUREFORMAT3 = 1
+const D3DFVF_TEXTUREFORMAT4 = 2
+#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 shl ((CoordIndex * 2) + 16))
+#define D3DFVF_TEXCOORDSIZE2(CoordIndex) D3DFVF_TEXTUREFORMAT2
+#define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 shl ((CoordIndex * 2) + 16))
+#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 shl ((CoordIndex * 2) + 16))
 const D3DLOCK_READONLY = &h0010
 const D3DLOCK_NOSYSLOCK = &h0800
 const D3DLOCK_NOOVERWRITE = &h1000
 const D3DLOCK_DISCARD = &h2000
 const D3DLOCK_DONOTWAIT = &h4000
 const D3DLOCK_NO_DIRTY_UPDATE = &h8000
+const D3DMAXUSERCLIPPLANES = 32
+const D3DCLIPPLANE0 = 1 shl 0
+const D3DCLIPPLANE1 = 1 shl 1
+const D3DCLIPPLANE2 = 1 shl 2
+const D3DCLIPPLANE3 = 1 shl 3
+const D3DCLIPPLANE4 = 1 shl 4
+const D3DCLIPPLANE5 = 1 shl 5
+#define D3DRENDERSTATE_WRAPBIAS __MSABI_LONG(128u)
+const D3DTSS_TCI_PASSTHRU = &h00000
+const D3DTSS_TCI_CAMERASPACENORMAL = &h10000
+const D3DTSS_TCI_CAMERASPACEPOSITION = &h20000
+const D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR = &h30000
 const D3DTSS_TCI_SPHEREMAP = &h40000
 #define D3DTS_WORLD D3DTS_WORLDMATRIX(0)
 #define D3DTS_WORLD1 D3DTS_WORLDMATRIX(1)
@@ -52,18 +75,57 @@ const D3DTSS_TCI_SPHEREMAP = &h40000
 #define D3DUSAGE_QUERY_SRGBWRITE __MSABI_LONG(&h00040000)
 #define D3DUSAGE_QUERY_VERTEXTEXTURE __MSABI_LONG(&h00100000)
 #define D3DUSAGE_QUERY_WRAPANDMIP __MSABI_LONG(&h00200000)
+const D3DWRAP_U = 1
+const D3DWRAP_V = 2
 const D3DWRAP_W = 4
+const D3DWRAPCOORD_0 = 1
+const D3DWRAPCOORD_1 = 2
+const D3DWRAPCOORD_2 = 4
+const D3DWRAPCOORD_3 = 8
 const MAX_DEVICE_IDENTIFIER_STRING = 512
+const D3DFVF_RESERVED0 = &h0001
+const D3DFVF_POSITION_MASK = &h400E
+const D3DFVF_XYZ = &h0002
+const D3DFVF_XYZRHW = &h0004
+const D3DFVF_XYZB1 = &h0006
+const D3DFVF_XYZB2 = &h0008
+const D3DFVF_XYZB3 = &h000a
+const D3DFVF_XYZB4 = &h000c
+const D3DFVF_XYZB5 = &h000e
 const D3DFVF_XYZW = &h4002
+const D3DFVF_NORMAL = &h0010
 const D3DFVF_PSIZE = &h0020
+const D3DFVF_DIFFUSE = &h0040
+const D3DFVF_SPECULAR = &h0080
+const D3DFVF_TEXCOUNT_MASK = &h0f00
+const D3DFVF_TEXCOUNT_SHIFT = 8
+const D3DFVF_TEX0 = &h0000
+const D3DFVF_TEX1 = &h0100
+const D3DFVF_TEX2 = &h0200
+const D3DFVF_TEX3 = &h0300
+const D3DFVF_TEX4 = &h0400
+const D3DFVF_TEX5 = &h0500
+const D3DFVF_TEX6 = &h0600
+const D3DFVF_TEX7 = &h0700
+const D3DFVF_TEX8 = &h0800
 const D3DFVF_LASTBETA_UBYTE4 = &h1000
 const D3DFVF_LASTBETA_D3DCOLOR = &h8000
+const D3DFVF_RESERVED2 = &h6000
+const D3DTA_SELECTMASK = &h0000000f
+const D3DTA_DIFFUSE = &h00000000
+const D3DTA_CURRENT = &h00000001
+const D3DTA_TEXTURE = &h00000002
+const D3DTA_TFACTOR = &h00000003
+const D3DTA_SPECULAR = &h00000004
 const D3DTA_TEMP = &h00000005
 const D3DTA_CONSTANT = &h00000006
+const D3DTA_COMPLEMENT = &h00000010
+const D3DTA_ALPHAREPLICATE = &h00000020
 #define D3DCOLORWRITEENABLE_RED (__MSABI_LONG(1) shl 0)
 #define D3DCOLORWRITEENABLE_GREEN (__MSABI_LONG(1) shl 1)
 #define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1) shl 2)
 #define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1) shl 3)
+const D3DPV_DONOTCOPYDATA = 1 shl 0
 const D3DSTREAMSOURCE_INDEXEDDATA = 1 shl 30
 const D3DSTREAMSOURCE_INSTANCEDATA = 2 shl 30
 const D3D_MAX_SIMULTANEOUS_RENDERTARGETS = 4
@@ -193,6 +255,7 @@ const D3DGETDATA_FLUSH = 1 shl 0
 #define D3DVSD_STREAM_TESS() (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAM) or D3DVSD_STREAMTESSMASK)
 #define D3DVSD_TESSNORMAL(RegisterIn, RegisterOut) (((D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) or ((RegisterIn) shl D3DVSD_VERTEXREGINSHIFT)) or (&h02 shl D3DVSD_DATATYPESHIFT)) or (RegisterOut))
 #define D3DVSD_TESSUV(Register) (((D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) or &h10000000) or (&h01 shl D3DVSD_DATATYPESHIFT)) or (Register))
+const D3DDP_MAXTEXCOORD = 8
 const D3DSI_OPCODE_MASK = &h0000FFFF
 const D3DSI_INSTLENGTH_MASK = &h0F000000
 const D3DSI_INSTLENGTH_SHIFT = 24

inc/win/d3drm.bi

@@ -5,7 +5,6 @@
 #inclib "d3drm"
 
 #include once "ddraw.bi"
-#include once "d3drmobj.bi"
 
 extern "Windows"
 
@@ -14,6 +13,12 @@ type IDirect3DRM as IDirect3DRM_
 type LPDIRECT3DRM as IDirect3DRM ptr
 type LPLPDIRECT3DRM as IDirect3DRM ptr ptr
 
+end extern
+
+#include once "d3drmobj.bi"
+
+extern "Windows"
+
 extern CLSID_CDirect3DRM as const GUID
 extern IID_IDirect3DRM as const GUID
 extern IID_IDirect3DRM2 as const GUID

inc/win/d3drmobj.bi

@@ -9,7 +9,6 @@
 extern "Windows"
 
 #define __D3DRMOBJ_H__
-#define VIRTUAL
 extern CLSID_CDirect3DRMDevice as const GUID
 extern CLSID_CDirect3DRMViewport as const GUID
 extern CLSID_CDirect3DRMFrame as const GUID

inc/win/dmplugin.bi

@@ -41,17 +41,21 @@ type LPDIRECTMUSICTRACK as IDirectMusicTrack ptr
 type LPDIRECTMUSICTRACK8 as IDirectMusicTrack8 ptr
 type LPDIRECTMUSICTOOL as IDirectMusicTool ptr
 type LPDIRECTMUSICTOOL8 as IDirectMusicTool8 ptr
+type IDirectMusicPerformance as IDirectMusicPerformance_
 type LPDIRECTMUSICPERFORMANCE as IDirectMusicPerformance ptr
 type LPDIRECTMUSICPERFORMANCE8 as IDirectMusicPerformance8 ptr
+type IDirectMusicSegment as IDirectMusicSegment_
 type LPDIRECTMUSICSEGMENT as IDirectMusicSegment ptr
 type LPDIRECTMUSICSEGMENT8 as IDirectMusicSegment8 ptr
+type IDirectMusicSegmentState as IDirectMusicSegmentState_
 type LPDIRECTMUSICSEGMENTSTATE as IDirectMusicSegmentState ptr
 type LPDIRECTMUSICSEGMENTSTATE8 as IDirectMusicSegmentState8 ptr
+type IDirectMusicGraph as IDirectMusicGraph_
 type LPDIRECTMUSICGRAPH as IDirectMusicGraph ptr
 type IDirectMusicGraph8 as IDirectMusicGraph
 type LPDIRECTMUSICGRAPH8 as IDirectMusicGraph ptr
-type DMUS_PMSG_ as _DMUS_PMSG
-type MUSIC_TIME_ as LONG
+type DMUS_PMSG as _DMUS_PMSG
+type MUSIC_TIME as LONG
 const DMUS_TRACK_PARAMF_CLOCK = &h1
 type DMUS_TRACKF_FLAGS as enumDMUS_TRACKF_FLAGS
 
@@ -72,7 +76,7 @@ end enum
 
 type IDirectMusicToolVtbl as IDirectMusicToolVtbl_
 
-type IDirectMusicTool_
+type IDirectMusicTool
 	lpVtbl as IDirectMusicToolVtbl ptr
 end type
 
@@ -128,7 +132,7 @@ end type
 #define IDirectMusicTool8_Clone(p, a) (p)->lpVtbl->Clone(p, a)
 type IDirectMusicTrackVtbl as IDirectMusicTrackVtbl_
 
-type IDirectMusicTrack_
+type IDirectMusicTrack
 	lpVtbl as IDirectMusicTrackVtbl ptr
 end type