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

[Michael Stefaniuc]

Alexandre Julliard wrote:
> Module: wine
> Branch: master
> Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168
> URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a8...
>
> Author: Paul Vriens 
> 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

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

[Paul Vriens]

Michael Stefaniuc wrote:
> Alexandre Julliard wrote:
> > Module: wine
> > Branch: master
> > Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168
> > URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a8...
> >
> > Author: Paul Vriens 
> > 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

Hi,

does the attached patch fix this? If 
yes, I'll produce patches for mshtml, 
crypt32 and secur32 which all suffer the 
same issue.

Cheers,

Paul.

diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 0815c01..99a15cc 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -1803,7 +1803,9 @@ static void test_Load(IPersistMoniker *persist)
 {
     IBindCtx *bind;
     HRESULT hres;
-    static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM;
+    static WCHAR sz_html_clientsite_objectparam[MAX_PATH];
+
+    lstrcpyW(sz_html_clientsite_objectparam, SZ_HTML_CLIENTSITE_OBJECTPARAM);

test_readyState((IUnknown*)persist);

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

[Michael Stefaniuc]

Paul Vriens wrote:
> Michael Stefaniuc wrote:
> > Alexandre Julliard wrote:
> > > Module: wine
> > > Branch: master
> > > Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168
> > > URL:   
> > > http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a8...
> > >
> > > Author: Paul Vriens 
> > > 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
>
> Hi,
>
> does the attached patch fix this? If yes, I'll produce patches for

Sure, that works as well.

bye
    michael
> mshtml, crypt32 and secur32 which all suffer the same issue.
>
> Cheers,
>
> Paul.
>
> diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
> index 0815c01..99a15cc 100644
> --- a/dlls/mshtml/tests/htmldoc.c
> +++ b/dlls/mshtml/tests/htmldoc.c
> @@ -1803,7 +1803,9 @@ static void test_Load(IPersistMoniker *persist)
>  {
>      IBindCtx *bind;
>      HRESULT hres;
> - static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM;
> -
>
> static WCHAR sz_html_clientsite_objectparam[MAX_PATH];
> -
> -
>
> lstrcpyW(sz_html_clientsite_objectparam, SZ_HTML_CLIENTSITE_OBJECTPARAM);
>
> test_readyState((IUnknown*)persist);