Paul Vriens : mshtml/tests: Cast-qual warning fix.

Michael Stefaniuc mstefani at redhat.com
Fri Jan 12 19:01:54 CST 2007


Alexandre Julliard wrote:
> Module: wine
> Branch: master
> Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168
> URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a8e71c6ea37bd168
> 
> Author: Paul Vriens <paul.vriens.wine at gmail.com>
> Date:   Fri Jan 12 14:26:05 2007 +0100
> 
> mshtml/tests: Cast-qual warning fix.

This breaks compilation with older gcc versions. At least with gcc-3.1.1
used by Smatch.

dlls/mshtml/tests/htmldoc.c: In function `test_Load':
dlls/mshtml/tests/htmldoc.c:1806: invalid initializer
make[2]: *** [htmldoc.o] Error 1

> 
> ---
> 
>  dlls/mshtml/tests/htmldoc.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
> index ac26ca8..0815c01 100644
> --- a/dlls/mshtml/tests/htmldoc.c
> +++ b/dlls/mshtml/tests/htmldoc.c
> @@ -1803,11 +1803,12 @@ static void test_Load(IPersistMoniker *p
>  {
>      IBindCtx *bind;
>      HRESULT hres;
> +    static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM;
Making that 'static const WCHAR sz_html_clientsite_objectparam[]' fixes
the compilation error but renders the exercise moot.

>  
>      test_readyState((IUnknown*)persist);
>  
>      CreateBindCtx(0, &bind);
> -    IBindCtx_RegisterObjectParam(bind, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM,
> +    IBindCtx_RegisterObjectParam(bind, sz_html_clientsite_objectparam,
>                                   (IUnknown*)&ClientSite);
>  
>      SET_EXPECT(GetDisplayName);
> 
> 
> 

bye
	michael
-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
Sr. Network Engineer            Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani at redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart



More information about the wine-devel mailing list