Wine-Commits

wine-commits@list.winehq.org

October 2006

3 participants
1032 discussions

Francois Gouget : Fix rpcndr.h so it takes CONST_VTABLE into account.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 87045eb0c591bc336227cdbe08367146f9ed137d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87045eb0c591bc336227cdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:45:44 2006 +0200 Fix rpcndr.h so it takes CONST_VTABLE into account. Define CONST_VTABLE in the tests that need it. This fixes many Visual C++ warnings. --- dlls/mshtml/tests/htmldoc.c | 1 + dlls/ole32/tests/compobj.c | 1 + dlls/ole32/tests/marshal.c | 1 + dlls/shdocvw/tests/webbrowser.c | 1 + dlls/shell32/tests/shlfolder.c | 1 + dlls/urlmon/tests/misc.c | 1 + dlls/urlmon/tests/protocol.c | 1 + dlls/urlmon/tests/url.c | 1 + include/rpcndr.h | 7 +++++++ 9 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 483a874..bc8df91 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ba820b5..44f2fb0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 13d3d1b..1d8093a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -20,6 +20,7 @@ #define _WIN32_DCOM #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 161f608..a21d732 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7751514..a1610da 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> #define COBJMACROS +#define CONST_VTABLE #include "windef.h" #include "winbase.h" diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 14b3fa4..802eb4b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 443e200..341f4fb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 282c311..aa33013 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define COBJMACROS +#define CONST_VTABLE #include "windef.h" #include "winbase.h" diff --git a/include/rpcndr.h b/include/rpcndr.h index 780fa29..f4ca82a 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -30,6 +30,13 @@ #endif #include <basetsd.h> +#undef CONST_VTBL +#ifdef CONST_VTABLE +# define CONST_VTBL const +#else +# define CONST_VTBL +#endif + /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */

1 0

Francois Gouget : widl: Use CONST_VTBL to declare lpVtbl.
by Alexandre Julliard Oct. 2, 2006

Oct. 2, 2006

Module: wine Branch: master Commit: 4b2d7e9321b042d3db96080c0b7f911d6a267f17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b2d7e9321b042d3db96080… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:45:18 2006 +0200 widl: Use CONST_VTBL to declare lpVtbl. --- tools/widl/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 5415785..6d34ac2 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -847,7 +847,7 @@ static void write_com_interface(type_t * fprintf(header, " END_INTERFACE\n"); fprintf(header, "} %sVtbl;\n", iface->name); fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); + fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "\n"); fprintf(header, "#ifdef COBJMACROS\n"); @@ -932,7 +932,7 @@ void write_dispinterface(type_t *iface) fprintf(header, " END_INTERFACE\n"); fprintf(header, "} %sVtbl;\n", iface->name); fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); + fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "\n"); fprintf(header, "#ifdef COBJMACROS\n");

1 0

Jump to page: