[PATCH 4/6] d3drm: Fix spelling mistake in Set/GetDecalTransparentColor macros.

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I noticed that Microsoft's headers don't define these C interface
macros at all. Technically we should remove them from our headers (and
write obj->lpVtbl->Method(obj, param1, param2) in the code). However,
given that it's quite unlikely that anyone wants to compile a d3drm
application against our headers I don't think this needs to be a priorit
y.

This also means our tests (and implementation) won't compile against
Microsoft's headers, but this is also something that is nice to have
but not generally supported (e.g. Microsoft's d3d9ex C interfaces are
broken, so our d3d9ex tests only compile with our header).

Stefan

Am 2015-08-24 um 15:58 schrieb Aaryaman Vasishta:
> --- include/d3drmobj.h | 12 ++++++------ 1 file changed, 6 
> insertions(+), 6 deletions(-)
> 
> diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 
> 942c69a..28340fb 100644 --- a/include/d3drmobj.h +++ 
> b/include/d3drmobj.h @@ -3284,7 +3284,7 @@ 
> DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #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 @@ 
> DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #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 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2,
IDirect3DRMTexture)
> #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 @@ 
> DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture)
> #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 @@ 
> DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #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 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3,
> IDirect3DRMVisual) #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)
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJV3EhqAAoJEN0/YqbEcdMw2R8QAJMTA2LoM42LSV4mZUNH1oe/
TrErVK3o2VRiRlBlQL1CLrv6178p01GmIoRmlkXyYgrvmM7Z7mGIEFfhD7g4irVr
Cw1M6WnrTFyWgu0DfOw6qaYqknjLcGJTukQ97R1nd8wgQ0/dfDVmB8SWl7V6KWO9
F0UyY3P05B20hbeKhUouoxfhdEO0pkVDgvFffe9A5+01uP/uTzFFYWVhacmoY9nl
VYhyDFhCM+Fut/I8RhDzZfRA+VmvxRBTQyEdlH93GMhov4Tf50bSdu41pd3WZL6g
bf2WW/vIAhwsIpoSe6GUPEkqjq9hc4a5TXVyUZhStergGeEiy3USuSbXSRRbLc+w
yu/jLr/BLm/nVOicP/BmWVspEt1z9ksjfcVYdXgpQEoeS7NLn0gyihLn7lnbl2dv
pSVgfVLUMsWcO0IzlTruARHEelEZV9DFKnLkQpe1U1nKqw27M9J7L+bE5euWHj9L
ZSXjip4Yf9wSENVNqyeZK9I+kXpOs1i3TVquY9tvFgwjoXtj+F3ZyGCETRFXcPti
dCX0xmIl9M1jwxdJn9rSlVr8w0ZSuYZHGjsxGBZDFWPVMDUNql5HTD5Tbe47iTXg
8ZiB6qzrcuTdXS4DaQjVvKVmiv0lqvrKPaKWg7u2Q5wBlUr0ITXSfq5vam4uMHIf
C36Co9yOt+tapC7y73gU
=1Eea
-----END PGP SIGNATURE-----