wininet HTTP_HttpSendRequestW problem -- with correct attachment
Joris Huizer
jorishuizer at planet.nl
Wed Mar 9 13:58:07 CST 2005
Robert Shearman wrote:
> Joris Huizer wrote:
>
>> Hello,
>>
>> Previous mail had the wrong file attached -- sorry for that
>> I tried - as some sort experiment - to install java, but this fails; I
>> decided to look into it and found some check in HTTP_HttpSendRequestW
>> (wininet) is missing (patch attached to get the installer past that,
>> probably not correct) I don't know what error code to set, so I didn't
>> set any; after finishing a download the installer stops;
>> I conclude at least something really is not going correct here ;) If
>> it's just this program... no problem; but probably something really is
>> not correct somewhere there;
>
>
>
> The patch was ok, but it did not fix the source of the problem. We
> shouldn't be adding a field if it doesn't have a value.
> Can you try the attached patch and let me know if it solves the same
> problem your previous patch did?
>
> Rob
>
>
> ------------------------------------------------------------------------
>
> Index: dlls/wininet/http.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/wininet/http.c,v
> retrieving revision 1.95
> diff -u -p -r1.95 http.c
> --- dlls/wininet/http.c 2 Feb 2005 09:56:35 -0000 1.95
> +++ dlls/wininet/http.c 9 Mar 2005 19:01:18 -0000
> @@ -2163,6 +2163,7 @@ LPWSTR * HTTP_InterpretHttpHeader(LPCWST
> if (!pszColon)
> {
> HTTP_FreeTokens(pTokenPair);
> + WARN("No ':' in line: %s\n", debugstr_w(buffer));
> return NULL;
> }
>
> @@ -2190,6 +2191,15 @@ LPWSTR * HTTP_InterpretHttpHeader(LPCWST
> strip_spaces(pTokenPair[1]);
>
> TRACE("field(%s) Value(%s)\n", debugstr_w(pTokenPair[0]), debugstr_w(pTokenPair[1]));
> +
> + if (!*pTokenPair[0] || !*pTokenPair[1])
> + {
> + HTTP_FreeTokens(pTokenPair);
> + WARN("Either no field or no value: field(%s) Value(%s)\n",
> + debugstr_w(pTokenPair[0]), debugstr_w(pTokenPair[1]));
> + return NULL;
> + }
> +
> return pTokenPair;
> }
>
No, that one didn't help (attached a new log of a crash after applying
this patch, with traces)
regards,
Joris
-------------- next part --------------
A non-text attachment was scrubbed...
Name: wininet
Type: application/octet-stream
Size: 21626 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-devel/attachments/20050309/45893c87/wininet.obj
More information about the wine-devel
mailing list