2009-04-04 Ozkan Sezer <sezeroz@gmail.com> * d3d.h: Fix method calling macros for IDirect3DTexture (wine git e169bb0a7f204ebe0f3053d824a1177bc1dedc65) and for IDirect3DViewport3_GetViewport (wine git 7c8fa9c24f5d6d4e22dec148ffecefc9a4262a27) git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@713 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog index 6753e6d..0174d4d 100644 --- a/mingw-w64-headers/direct-x/ChangeLog +++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -16,6 +16,10 @@ * d3d9types.h: Fix the D3DFMT_XXX constant declarations. (wine git d4ca34dd9bf98ea71226460092c7095847b97509) * d3d8types.h: Likewise. + * d3d.h: Fix method calling macros for IDirect3DTexture + (wine git e169bb0a7f204ebe0f3053d824a1177bc1dedc65) and + for IDirect3DViewport3_GetViewport (wine git + 7c8fa9c24f5d6d4e22dec148ffecefc9a4262a27) 2009-02-20 Kai Tietz <kai.tietz@onevision.com>
diff --git a/mingw-w64-headers/direct-x/include/d3d.h b/mingw-w64-headers/direct-x/include/d3d.h index 76237d7..7297755 100644 --- a/mingw-w64-headers/direct-x/include/d3d.h +++ b/mingw-w64-headers/direct-x/include/d3d.h
@@ -578,22 +578,22 @@ #define IDirect3DTexture_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DTexture_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->lpVtbl->GetHandle(p,a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->lpVtbl->PaletteChanged(p,a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->lpVtbl->Load(p,a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->lpVtbl->Unload(p,a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->lpVtbl->PaletteChanged(p,a,b) +#define IDirect3DTexture_Load(p,a) (p)->lpVtbl->Load(p,a) +#define IDirect3DTexture_Unload(p) (p)->lpVtbl->Unload(p) #else /*** IUnknown methods ***/ #define IDirect3DTexture_QueryInterface(p,a,b) (p)->QueryInterface(a,b) #define IDirect3DTexture_AddRef(p) (p)->AddRef() #define IDirect3DTexture_Release(p) (p)->Release() /*** IDirect3DTexture methods ***/ -#define IDirect3DTexture_Initialize(p,a,b,c) (p)->Initialize(a,b,c) -#define IDirect3DTexture_GetHandle(p,a,b,c) (p)->GetHandle(a,b,c) -#define IDirect3DTexture_PaletteChanged(p,a,b,c) (p)->PaletteChanged(a,b,c) -#define IDirect3DTexture_Load(p,a,b,c) (p)->Load(a,b,c) -#define IDirect3DTexture_Unload(p,a,b,c) (p)->Unload(a,b,c) +#define IDirect3DTexture_Initialize(p,a,b) (p)->Initialize(a,b) +#define IDirect3DTexture_GetHandle(p,a,b) (p)->GetHandle(a,b) +#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->PaletteChanged(a,b) +#define IDirect3DTexture_Load(p,a) (p)->Load(a) +#define IDirect3DTexture_Unload(p) (p)->Unload() #endif @@ -833,8 +833,8 @@ #define IDirect3DViewport3_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->lpVtbl->GetViewport2(p,a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->lpVtbl->SetViewport2(p,a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->lpVtbl->GetViewport2(p,a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->lpVtbl->SetViewport2(p,a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->lpVtbl->SetBackgroundDepth2(p,a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->lpVtbl->GetBackgroundDepth2(p,a,b) @@ -859,8 +859,8 @@ #define IDirect3DViewport3_DeleteLight(p,a) (p)->DeleteLight(a) #define IDirect3DViewport3_NextLight(p,a,b,c) (p)->NextLight(a,b,c) /*** IDirect3DViewport2 methods ***/ -#define IDirect3DViewport3_GetViewport3(p,a) (p)->GetViewport2(a) -#define IDirect3DViewport3_SetViewport3(p,a) (p)->SetViewport2(a) +#define IDirect3DViewport3_GetViewport2(p,a) (p)->GetViewport2(a) +#define IDirect3DViewport3_SetViewport2(p,a) (p)->SetViewport2(a) /*** IDirect3DViewport3 methods ***/ #define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->SetBackgroundDepth2(a) #define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->GetBackgroundDepth2(a,b)