Author: akhaldi
Date: Tue Nov 24 10:40:22 2015
New Revision: 70082
URL:
http://svn.reactos.org/svn/reactos?rev=70082&view=rev
Log:
[PSDK] Update d3drmobj.h. CORE-10536
Modified:
trunk/reactos/include/psdk/d3drmobj.h
Modified: trunk/reactos/include/psdk/d3drmobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmobj.h?re…
==============================================================================
--- trunk/reactos/include/psdk/d3drmobj.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3drmobj.h [iso-8859-1] Tue Nov 24 10:40:22 2015
@@ -360,7 +360,7 @@
#undef GetClassName
#endif
#define INTERFACE IDirect3DRMDevice
-DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown)
+DECLARE_INTERFACE_(IDirect3DRMDevice,IDirect3DRMObject)
{
/*** IUnknown methods ***/
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
@@ -3284,7 +3284,7 @@
#define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b)
#define IDirect3DRMTexture_SetDecalScale(p,a) (p)->SetDecalScale(a)
#define IDirect3DRMTexture_SetDecalTransparency(p,a)
(p)->SetDecalTransparency(a)
-#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a)
(p)->SetDecalTransparentColor(a)
+#define IDirect3DRMTexture_SetDecalTransparentColor(p,a)
(p)->SetDecalTransparentColor(a)
#define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b)
#define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b)
#define IDirect3DRMTexture_GetImage(p) (p)->GetImage()
@@ -3292,7 +3292,7 @@
#define IDirect3DRMTexture_GetColors(p) (p)->GetColors()
#define IDirect3DRMTexture_GetDecalScale(p) (p)->GetDecalScale()
#define IDirect3DRMTexture_GetDecalTransparency(p)
(p)->GetDecalTransparency()
-#define IDirect3DRMTexture_GetDecalTransparencyColor(p)
(p)->GetDecalTransparencyColor()
+#define IDirect3DRMTexture_GetDecalTransparentColor(p)
(p)->GetDecalTransparentColor()
#endif
/*****************************************************************************
@@ -3404,7 +3404,7 @@
#define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b)
#define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->SetDecalScale(a)
#define IDirect3DRMTexture2_SetDecalTransparency(p,a)
(p)->SetDecalTransparency(a)
-#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a)
(p)->SetDecalTransparentColor(a)
+#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a)
(p)->SetDecalTransparentColor(a)
#define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b)
#define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b)
#define IDirect3DRMTexture2_GetImage(p) (p)->GetImage()
@@ -3412,7 +3412,7 @@
#define IDirect3DRMTexture2_GetColors(p) (p)->GetColors()
#define IDirect3DRMTexture2_GetDecalScale(p) (p)->GetDecalScale()
#define IDirect3DRMTexture2_GetDecalTransparency(p)
(p)->GetDecalTransparency()
-#define IDirect3DRMTexture2_GetDecalTransparencyColor(p)
(p)->GetDecalTransparencyColor()
+#define IDirect3DRMTexture2_GetDecalTransparentColor(p)
(p)->GetDecalTransparentColor()
/*** IDirect3DRMTexture2 methods ***/
#define IDirect3DRMTexture2_InitFromImage(p,a) (p)->InitFromImage(a)
#define IDirect3DRMTexture2_InitFromResource2(p,a,b,c)
(p)->InitFromResource2(a,b,c)
@@ -3494,7 +3494,7 @@
#define IDirect3DRMTexture3_SetDecalOrigin(p,a,b)
(p)->lpVtbl->SetDecalOrigin(p,a,b)
#define IDirect3DRMTexture3_SetDecalScale(p,a)
(p)->lpVtbl->SetDecalScale(p,a)
#define IDirect3DRMTexture3_SetDecalTransparency(p,a)
(p)->lpVtbl->SetDecalTransparency(p,a)
-#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a)
(p)->lpVtbl->SetDecalTransparentColor(p,a)
+#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a)
(p)->lpVtbl->SetDecalTransparentColor(p,a)
#define IDirect3DRMTexture3_GetDecalSize(p,a,b)
(p)->lpVtbl->GetDecalSize(p,a,b)
#define IDirect3DRMTexture3_GetDecalOrigin(p,a,b)
(p)->lpVtbl->GetDecalOrigin(p,a,b)
#define IDirect3DRMTexture3_GetImage(p)
(p)->lpVtbl->GetImage(p)
@@ -3502,7 +3502,7 @@
#define IDirect3DRMTexture3_GetColors(p)
(p)->lpVtbl->GetColors(p)
#define IDirect3DRMTexture3_GetDecalScale(p)
(p)->lpVtbl->GetDecalScale(p)
#define IDirect3DRMTexture3_GetDecalTransparency(p)
(p)->lpVtbl->GetDecalTransparency(p)
-#define IDirect3DRMTexture3_GetDecalTransparencyColor(p)
(p)->lpVtbl->GetDecalTransparencyColor(p)
+#define IDirect3DRMTexture3_GetDecalTransparentColor(p)
(p)->lpVtbl->GetDecalTransparentColor(p)
#define IDirect3DRMTexture3_InitFromImage(p,a)
(p)->lpVtbl->InitFromImage(p,a)
#define IDirect3DRMTexture3_InitFromResource2(p,a,b,c)
(p)->lpVtbl->InitFromResource2(p,a,b,c)
#define IDirect3DRMTexture3_GenerateMIPMap(p,a)
(p)->lpVtbl->GenerateMIPMap(p,a)