[PATCH 2/4] d3drm: Fix IDirect3DRMDevicei macros

Christian Costa titan.costa at wanadoo.fr
Tue Jan 12 04:29:58 CST 2010


---

 0 files changed, 0 insertions(+), 0 deletions(-)
-------------- next part --------------
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 86cac7e..c7c61eb 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -326,80 +326,80 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown)
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
-#define IDirect3DRMObject_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirect3DRMObject_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirect3DRMObject_Release(p)                   (p)->lpVtbl->Release(p)
+#define IDirect3DRMDevice_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DRMDevice_AddRef(p)                    (p)->lpVtbl->AddRef(p)
+#define IDirect3DRMDevice_Release(p)                   (p)->lpVtbl->Release(p)
 /*** IDirect3DRMObject methods ***/
-#define IDirect3DRMObject_Clone(p,a,b,c)               (p)->lpVtbl->Clone(p,a,b,c)
-#define IDirect3DRMObject_AddDestroyCallback(p,a,b)    (p)->lpVtbl->AddDestroyCallback(p,a,b)
-#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
-#define IDirect3DRMObject_SetAppData(p,a)              (p)->lpVtbl->SetAppData(p,a)
-#define IDirect3DRMObject_GetAppData(p)                (p)->lpVtbl->GetAppData(p)
-#define IDirect3DRMObject_SetName(p,a)                 (p)->lpVtbl->SetName(p,a)
-#define IDirect3DRMObject_GetName(p,a,b)               (p)->lpVtbl->GetName(p,a,b)
-#define IDirect3DRMObject_GetClassName(p,a,b)          (p)->lpVtbl->GetClassName(p,a,b)
+#define IDirect3DRMDevice_Clone(p,a,b,c)               (p)->lpVtbl->Clone(p,a,b,c)
+#define IDirect3DRMDevice_AddDestroyCallback(p,a,b)    (p)->lpVtbl->AddDestroyCallback(p,a,b)
+#define IDirect3DRMDevice_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
+#define IDirect3DRMDevice_SetAppData(p,a)              (p)->lpVtbl->SetAppData(p,a)
+#define IDirect3DRMDevice_GetAppData(p)                (p)->lpVtbl->GetAppData(p)
+#define IDirect3DRMDevice_SetName(p,a)                 (p)->lpVtbl->SetName(p,a)
+#define IDirect3DRMDevice_GetName(p,a,b)               (p)->lpVtbl->GetName(p,a,b)
+#define IDirect3DRMDevice_GetClassName(p,a,b)          (p)->lpVtbl->GetClassName(p,a,b)
 /*** IDirect3DRMDevice methods ***/
-#define IDirect3DRMObject_Init(p,a,b)                  (p)->lpVtbl->Init(p,a,b)
-#define IDirect3DRMObject_InitFromD3D(p,a,b)           (p)->lpVtbl->InitFromD3D(p,a,b)
-#define IDirect3DRMObject_InitFromClipper(p,a,b,c,d)   (p)->lpVtbl->InitFromClipper(p,a,b,c,d)
-#define IDirect3DRMObject_Update(p)                    (p)->lpVtbl->Update(p)
-#define IDirect3DRMObject_AddUpdateCallback(p,a,b)     (p)->lpVtbl->AddUpdateCallback(p,a,b)
-#define IDirect3DRMObject_DeleteUpdateCallback(p,a,b)  (p)->lpVtbl->DeleteUpdateCallback(p,a,b,c)
-#define IDirect3DRMObject_SetBufferCount(p,a)          (p)->lpVtbl->SetBufferCount(p,a)
-#define IDirect3DRMObject_GetBufferCount(p)            (p)->lpVtbl->GetBufferCount(p)
-#define IDirect3DRMObject_SetDither(p,a)               (p)->lpVtbl->SetDither(p,a)
-#define IDirect3DRMObject_SetShades(p,a)               (p)->lpVtbl->SetShades(p,a)
-#define IDirect3DRMObject_SetQuality(p,a)              (p)->lpVtbl->SetQuality(p,a)
-#define IDirect3DRMObject_SetTextureQuality(p,a)       (p)->lpVtbl->SetTextureQuality(p,a)
-#define IDirect3DRMObject_GetViewports(p,a)            (p)->lpVtbl->GetViewports(p,a)
-#define IDirect3DRMObject_GetDither(p)                 (p)->lpVtbl->GetDither(p)
-#define IDirect3DRMObject_GetShades(p)                 (p)->lpVtbl->GetShades(p)
-#define IDirect3DRMObject_GetHeight(p)                 (p)->lpVtbl->GetHeight(p)
-#define IDirect3DRMObject_GetWidth(p)                  (p)->lpVtbl->GetWidth(p)
-#define IDirect3DRMObject_GetTrianglesDrawn(p)         (p)->lpVtbl->GetTrianglesDrawn(p)
-#define IDirect3DRMObject_GetWireframeOptions(p)       (p)->lpVtbl->GetWireframeOptions(p)
-#define IDirect3DRMObject_GetQuality(p)                (p)->lpVtbl->GetQuality(p)
-#define IDirect3DRMObject_GetColorModel(p)             (p)->lpVtbl->GetColorModel(p)
-#define IDirect3DRMObject_GetTextureQuality(p)         (p)->lpVtbl->GetTextureQuality(p)
-#define IDirect3DRMObject_GetDirect3DDevice(p,a)       (p)->lpVtbl->GetDirect3DDevice(p,a)
+#define IDirect3DRMDevice_Init(p,a,b)                  (p)->lpVtbl->Init(p,a,b)
+#define IDirect3DRMDevice_InitFromD3D(p,a,b)           (p)->lpVtbl->InitFromD3D(p,a,b)
+#define IDirect3DRMDevice_InitFromClipper(p,a,b,c,d)   (p)->lpVtbl->InitFromClipper(p,a,b,c,d)
+#define IDirect3DRMDevice_Update(p)                    (p)->lpVtbl->Update(p)
+#define IDirect3DRMDevice_AddUpdateCallback(p,a,b)     (p)->lpVtbl->AddUpdateCallback(p,a,b)
+#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b)  (p)->lpVtbl->DeleteUpdateCallback(p,a,b,c)
+#define IDirect3DRMDevice_SetBufferCount(p,a)          (p)->lpVtbl->SetBufferCount(p,a)
+#define IDirect3DRMDevice_GetBufferCount(p)            (p)->lpVtbl->GetBufferCount(p)
+#define IDirect3DRMDevice_SetDither(p,a)               (p)->lpVtbl->SetDither(p,a)
+#define IDirect3DRMDevice_SetShades(p,a)               (p)->lpVtbl->SetShades(p,a)
+#define IDirect3DRMDevice_SetQuality(p,a)              (p)->lpVtbl->SetQuality(p,a)
+#define IDirect3DRMDevice_SetTextureQuality(p,a)       (p)->lpVtbl->SetTextureQuality(p,a)
+#define IDirect3DRMDevice_GetViewports(p,a)            (p)->lpVtbl->GetViewports(p,a)
+#define IDirect3DRMDevice_GetDither(p)                 (p)->lpVtbl->GetDither(p)
+#define IDirect3DRMDevice_GetShades(p)                 (p)->lpVtbl->GetShades(p)
+#define IDirect3DRMDevice_GetHeight(p)                 (p)->lpVtbl->GetHeight(p)
+#define IDirect3DRMDevice_GetWidth(p)                  (p)->lpVtbl->GetWidth(p)
+#define IDirect3DRMDevice_GetTrianglesDrawn(p)         (p)->lpVtbl->GetTrianglesDrawn(p)
+#define IDirect3DRMDevice_GetWireframeOptions(p)       (p)->lpVtbl->GetWireframeOptions(p)
+#define IDirect3DRMDevice_GetQuality(p)                (p)->lpVtbl->GetQuality(p)
+#define IDirect3DRMDevice_GetColorModel(p)             (p)->lpVtbl->GetColorModel(p)
+#define IDirect3DRMDevice_GetTextureQuality(p)         (p)->lpVtbl->GetTextureQuality(p)
+#define IDirect3DRMDevice_GetDirect3DDevice(p,a)       (p)->lpVtbl->GetDirect3DDevice(p,a)
 #else
 /*** IUnknown methods ***/
-#define IDirect3DRMObject_QueryInterface(p,a,b)        (p)->QueryInterface(a,b)
-#define IDirect3DRMObject_AddRef(p)                    (p)->AddRef()
-#define IDirect3DRMObject_Release(p)                   (p)->Release()
+#define IDirect3DRMDevice_QueryInterface(p,a,b)        (p)->QueryInterface(a,b)
+#define IDirect3DRMDevice_AddRef(p)                    (p)->AddRef()
+#define IDirect3DRMDevice_Release(p)                   (p)->Release()
 /*** IDirect3DRMObject methods ***/
-#define IDirect3DRMObject_Clone(p,a,b,c)               (p)->Clone(a,b,c)
-#define IDirect3DRMObject_AddDestroyCallback(p,a,b)    (p)->AddDestroyCallback(a,b)
-#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)
-#define IDirect3DRMObject_SetAppData(p,a)              (p)->SetAppData(a)
-#define IDirect3DRMObject_GetAppData(p)                (p)->GetAppData()
-#define IDirect3DRMObject_SetName(p,a)                 (p)->SetName(a)
-#define IDirect3DRMObject_GetName(p,a,b)               (p)->GetName(a,b)
-#define IDirect3DRMObject_GetClassName(p,a,b)          (p)->GetClassName(a,b)
+#define IDirect3DRMDevice_Clone(p,a,b,c)               (p)->Clone(a,b,c)
+#define IDirect3DRMDevice_AddDestroyCallback(p,a,b)    (p)->AddDestroyCallback(a,b)
+#define IDirect3DRMDevice_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)
+#define IDirect3DRMDevice_SetAppData(p,a)              (p)->SetAppData(a)
+#define IDirect3DRMDevice_GetAppData(p)                (p)->GetAppData()
+#define IDirect3DRMDevice_SetName(p,a)                 (p)->SetName(a)
+#define IDirect3DRMDevice_GetName(p,a,b)               (p)->GetName(a,b)
+#define IDirect3DRMDevice_GetClassName(p,a,b)          (p)->GetClassName(a,b)
 /*** IDirect3DRMDevice methods ***/
-#define IDirect3DRMObject_Init(p,a,b)                  (p)->Init(p,a,b)
-#define IDirect3DRMObject_InitFromD3D(p,a,b)           (p)->InitFromD3D(p,a,b)
-#define IDirect3DRMObject_InitFromClipper(p,a,b,c,d)   (p)->InitFromClipper(p,a,b,c,d)
-#define IDirect3DRMObject_Update(p)                    (p)->Update(p)
-#define IDirect3DRMObject_AddUpdateCallback(p,a,b)     (p)->AddUpdateCallback(p,a,b)
-#define IDirect3DRMObject_DeleteUpdateCallback(p,a,b)  (p)->DeleteUpdateCallback(p,a,b,c)
-#define IDirect3DRMObject_SetBufferCount(p,a)          (p)->SetBufferCount(p,a)
-#define IDirect3DRMObject_GetBufferCount(p)            (p)->GetBufferCount(p)
-#define IDirect3DRMObject_SetDither(p,a)               (p)->SetDither(p,a)
-#define IDirect3DRMObject_SetShades(p,a)               (p)->SetShades(p,a)
-#define IDirect3DRMObject_SetQuality(p,a)              (p)->SetQuality(p,a)
-#define IDirect3DRMObject_SetTextureQuality(p,a)       (p)->SetTextureQuality(p,a)
-#define IDirect3DRMObject_GetViewports(p,a)            (p)->GetViewports(p,a)
-#define IDirect3DRMObject_GetDither(p)                 (p)->GetDither(p)
-#define IDirect3DRMObject_GetShades(p)                 (p)->GetShades(p)
-#define IDirect3DRMObject_GetHeight(p)                 (p)->GetHeight(p)
-#define IDirect3DRMObject_GetWidth(p)                  (p)->GetWidth(p)
-#define IDirect3DRMObject_GetTrianglesDrawn(p)         (p)->GetTrianglesDrawn(p)
-#define IDirect3DRMObject_GetWireframeOptions(p)       (p)->GetWireframeOptions(p)
-#define IDirect3DRMObject_GetQuality(p)                (p)->GetQuality(p)
-#define IDirect3DRMObject_GetColorModel(p)             (p)->GetColorModel(p)
-#define IDirect3DRMObject_GetTextureQuality(p)         (p)->GetTextureQuality(p)
-#define IDirect3DRMObject_GetDirect3DDevice(p,a)       (p)->GetDirect3DDevice(p,a)
+#define IDirect3DRMDevice_Init(p,a,b)                  (p)->Init(p,a,b)
+#define IDirect3DRMDevice_InitFromD3D(p,a,b)           (p)->InitFromD3D(p,a,b)
+#define IDirect3DRMDevice_InitFromClipper(p,a,b,c,d)   (p)->InitFromClipper(p,a,b,c,d)
+#define IDirect3DRMDevice_Update(p)                    (p)->Update(p)
+#define IDirect3DRMDevice_AddUpdateCallback(p,a,b)     (p)->AddUpdateCallback(p,a,b)
+#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b)  (p)->DeleteUpdateCallback(p,a,b,c)
+#define IDirect3DRMDevice_SetBufferCount(p,a)          (p)->SetBufferCount(p,a)
+#define IDirect3DRMDevice_GetBufferCount(p)            (p)->GetBufferCount(p)
+#define IDirect3DRMDevice_SetDither(p,a)               (p)->SetDither(p,a)
+#define IDirect3DRMDevice_SetShades(p,a)               (p)->SetShades(p,a)
+#define IDirect3DRMDevice_SetQuality(p,a)              (p)->SetQuality(p,a)
+#define IDirect3DRMDevice_SetTextureQuality(p,a)       (p)->SetTextureQuality(p,a)
+#define IDirect3DRMDevice_GetViewports(p,a)            (p)->GetViewports(p,a)
+#define IDirect3DRMDevice_GetDither(p)                 (p)->GetDither(p)
+#define IDirect3DRMDevice_GetShades(p)                 (p)->GetShades(p)
+#define IDirect3DRMDevice_GetHeight(p)                 (p)->GetHeight(p)
+#define IDirect3DRMDevice_GetWidth(p)                  (p)->GetWidth(p)
+#define IDirect3DRMDevice_GetTrianglesDrawn(p)         (p)->GetTrianglesDrawn(p)
+#define IDirect3DRMDevice_GetWireframeOptions(p)       (p)->GetWireframeOptions(p)
+#define IDirect3DRMDevice_GetQuality(p)                (p)->GetQuality(p)
+#define IDirect3DRMDevice_GetColorModel(p)             (p)->GetColorModel(p)
+#define IDirect3DRMDevice_GetTextureQuality(p)         (p)->GetTextureQuality(p)
+#define IDirect3DRMDevice_GetDirect3DDevice(p,a)       (p)->GetDirect3DDevice(p,a)
 #endif
 
 #ifdef __cplusplus


More information about the wine-patches mailing list