From 76ed2835cd503ea69a4363bd5b6ce9f9784dd3ea Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 26 Jul 2005 20:10:51 +0000 Subject: [PATCH] Make CONST_VTABLE the default in the Wine source. --- dlls/d3dxof/d3dxof_private.h | 2 -- dlls/ddraw/clipper.c | 2 -- dlls/ddraw/ddraw_hal.c | 2 -- dlls/ddraw/ddraw_main.c | 2 -- dlls/ddraw/ddraw_thunks.c | 2 -- dlls/ddraw/ddraw_user.c | 2 -- dlls/ddraw/device_opengl.c | 2 -- dlls/ddraw/direct3d_opengl.c | 2 -- dlls/ddraw/executebuffer.c | 2 -- dlls/ddraw/light.c | 2 -- dlls/ddraw/material.c | 2 -- dlls/ddraw/palette_hal.c | 2 -- dlls/ddraw/palette_main.c | 2 -- dlls/ddraw/surface_dib.c | 2 -- dlls/ddraw/surface_fakezbuffer.c | 2 -- dlls/ddraw/surface_gamma.c | 2 -- dlls/ddraw/surface_hal.c | 2 -- dlls/ddraw/surface_main.c | 2 -- dlls/ddraw/surface_thunks.c | 2 -- dlls/ddraw/surface_user.c | 2 -- dlls/ddraw/texture.c | 2 -- dlls/ddraw/vertexbuffer.c | 2 -- dlls/ddraw/viewport.c | 2 -- include/objbase.h | 4 ++++ 24 files changed, 4 insertions(+), 46 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 5c55a4fe449..c28a89761b6 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -24,8 +24,6 @@ #ifndef __D3DXOF_PRIVATE_INCLUDED__ #define __D3DXOF_PRIVATE_INCLUDED__ -#define CONST_VTABLE - #include #include "windef.h" diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index ca610ce5120..eac48b3cce6 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -24,8 +24,6 @@ #include #include -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/ddraw_hal.c b/dlls/ddraw/ddraw_hal.c index 4d455fe10e0..a5dc6678d7e 100644 --- a/dlls/ddraw/ddraw_hal.c +++ b/dlls/ddraw/ddraw_hal.c @@ -23,8 +23,6 @@ #include #include -#define CONST_VTABLE - #include "wine/debug.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/ddraw/ddraw_main.c b/dlls/ddraw/ddraw_main.c index 57c7e330cc2..fb5043a36c4 100644 --- a/dlls/ddraw/ddraw_main.c +++ b/dlls/ddraw/ddraw_main.c @@ -56,8 +56,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "winerror.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index f10af08d373..ebb5389b3dc 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -17,8 +17,6 @@ */ #include -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/ddraw_user.c b/dlls/ddraw/ddraw_user.c index 44f19aef247..e1e18a9911b 100644 --- a/dlls/ddraw/ddraw_user.c +++ b/dlls/ddraw/ddraw_user.c @@ -26,8 +26,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c index 7aa8de67a8a..cdced47ea89 100644 --- a/dlls/ddraw/device_opengl.c +++ b/dlls/ddraw/device_opengl.c @@ -30,8 +30,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/direct3d_opengl.c b/dlls/ddraw/direct3d_opengl.c index 57c7c7bf71f..1f69bc2cbcc 100644 --- a/dlls/ddraw/direct3d_opengl.c +++ b/dlls/ddraw/direct3d_opengl.c @@ -31,8 +31,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 7785bf116f9..705328935d7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -27,8 +27,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 7a8fb820a54..846948516bd 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -25,8 +25,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index ab58bba6a42..e462319fb44 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -25,8 +25,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/palette_hal.c b/dlls/ddraw/palette_hal.c index 54de447ef92..ab80c422592 100644 --- a/dlls/ddraw/palette_hal.c +++ b/dlls/ddraw/palette_hal.c @@ -24,8 +24,6 @@ #include #include -#define CONST_VTABLE - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/palette_main.c b/dlls/ddraw/palette_main.c index 9f7767c26bc..f78b5e237d3 100644 --- a/dlls/ddraw/palette_main.c +++ b/dlls/ddraw/palette_main.c @@ -25,8 +25,6 @@ #include #include -#define CONST_VTABLE - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/surface_dib.c b/dlls/ddraw/surface_dib.c index dcc11d43f10..62f5c8373c3 100644 --- a/dlls/ddraw/surface_dib.c +++ b/dlls/ddraw/surface_dib.c @@ -28,8 +28,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "winerror.h" #include "wine/debug.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/surface_fakezbuffer.c b/dlls/ddraw/surface_fakezbuffer.c index d6e59842803..12ba712f585 100644 --- a/dlls/ddraw/surface_fakezbuffer.c +++ b/dlls/ddraw/surface_fakezbuffer.c @@ -31,8 +31,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/surface_gamma.c b/dlls/ddraw/surface_gamma.c index 66c0ca68f85..b8bf2a2006d 100644 --- a/dlls/ddraw/surface_gamma.c +++ b/dlls/ddraw/surface_gamma.c @@ -23,8 +23,6 @@ #include #include -#define CONST_VTABLE - #include "wine/debug.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/surface_hal.c b/dlls/ddraw/surface_hal.c index cd2cb0b68c4..1d4140af1a5 100644 --- a/dlls/ddraw/surface_hal.c +++ b/dlls/ddraw/surface_hal.c @@ -25,8 +25,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "wine/debug.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/surface_main.c b/dlls/ddraw/surface_main.c index e2e03f9801c..39566c433ea 100644 --- a/dlls/ddraw/surface_main.c +++ b/dlls/ddraw/surface_main.c @@ -24,8 +24,6 @@ #include #define COBJMACROS -#define CONST_VTABLE - #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index e0b33b547bd..50909335e43 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -19,8 +19,6 @@ #include "config.h" #include -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/ddraw/surface_user.c b/dlls/ddraw/surface_user.c index a690511e7e4..d2b6970c80c 100644 --- a/dlls/ddraw/surface_user.c +++ b/dlls/ddraw/surface_user.c @@ -23,8 +23,6 @@ #include #include -#define CONST_VTABLE - #include "winerror.h" #include "wine/debug.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index bba72ebedc3..65573c68f75 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -26,8 +26,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 1081815033f..ba626e5bb6b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -21,8 +21,6 @@ #include "config.h" #include -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 2f68ce3a6b5..24335e1bdd1 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -25,8 +25,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define CONST_VTABLE - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/include/objbase.h b/include/objbase.h index 6347610c697..fb2b99a1f3d 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -246,6 +246,10 @@ #define interface struct +#ifdef __WINESRC__ +#define CONST_VTABLE +#endif + #ifdef CONST_VTABLE #undef CONST_VTBL #define CONST_VTBL const