Re: shdocvw(2/2): ignore VT_ERROR arguments to WebBrowser_Navigate2

[Michael Stefaniuc]

Juan Lang wrote:
> Combined with the first patch, I'm able to log in with Skype 2.6 beta.
>
> ChangeLog: ignore VT_ERROR arguments to WebBrowser_Navigate2
> Ignoring VT_ERROR just masks a previous error.

bye
	michael
> Index: dlls/shdocvw/webbrowser.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/shdocvw/webbrowser.c,v
> retrieving revision 1.65
> diff -u -r1.65 webbrowser.c
> --- dlls/shdocvw/webbrowser.c	25 Sep 2006 19:46:43 -0000	1.65
> +++ dlls/shdocvw/webbrowser.c	29 Sep 2006 00:55:46 -0000
> @@ -675,7 +675,7 @@
>      if(V_VT(URL) != VT_BSTR)
>          return E_INVALIDARG;
>
> -    if(PostData && V_VT(PostData) != VT_EMPTY) {
> +    if(PostData && V_VT(PostData) != VT_EMPTY && V_VT(PostData) != VT_ERROR) {
>          if(V_VT(PostData) != (VT_ARRAY | VT_UI1)
>             || V_ARRAY(PostData)->cDims != 1) {
>              WARN("Invalid PostData\n");
> @@ -686,7 +686,7 @@
>          post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements;
>      }
>
> -    if(Headers && V_VT(Headers) != VT_EMPTY) {
> +    if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) {
>          if(V_VT(Headers) != VT_BSTR)
>              return E_INVALIDARG;
>
> ------------------------------------------------------------------------

-- 
Michael Stefaniuc               Tel.: [phone]
Sr. Network Engineer            Fax.: [phone]
Red Hat GmbH                    Email: mstefani(a)redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart