Re: [PATCH 07/11] wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.

[Sebastian Lackner]

On 17.05.2016 19:16, Jacek Caban wrote:
> Also use correct encoding.
>
> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> ---
>  dlls/wininet/internet.c | 33 +++++++++++++++++++--------------
>  1 file changed, 19 insertions(+), 14 deletions(-)
>
> 0007-wininet-Removed-maximum-URL-length-assumption-from-ge.diff
>
> diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
> index 371c3d0..78bea7c 100644
> --- a/dlls/wininet/internet.c
> +++ b/dlls/wininet/internet.c
> @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
>      return res == ERROR_SUCCESS;
>  }
>
> -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen )
> +static WCHAR *get_proxy_autoconfig_url(void)
>  {
>  #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
>
> CFDictionaryRef settings = CFNetworkCopySystemProxySettings();
> +    WCHAR *ret = NULL;
> +    SIZE_T len;
>      const void *ref;
> -    BOOL ret = FALSE;
>
> if (!settings) return FALSE;
>
> @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen )
>          CFRelease( settings );
>          return FALSE;

You forgot to replace FALSE -> NULL at a couple of places in this patch.

[PATCH 07/11] wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.

[Jacek Caban]

On 05/18/16 23:00, Sebastian Lackner wrote:
> On 17.05.2016 19:16, Jacek Caban wrote:
> > Also use correct encoding.
> >
> > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> > ---
> >  dlls/wininet/internet.c | 33 +++++++++++++++++++--------------
> >  1 file changed, 19 insertions(+), 14 deletions(-)
> >
> > 0007-wininet-Removed-maximum-URL-length-assumption-from-ge.diff
> >
> > diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
> > index 371c3d0..78bea7c 100644
> > --- a/dlls/wininet/internet.c
> > +++ b/dlls/wininet/internet.c
> > @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
> >      return res == ERROR_SUCCESS;
> >  }
> >
> > -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen )
> > +static WCHAR *get_proxy_autoconfig_url(void)
> >  {
> >  #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
> >
> > CFDictionaryRef settings = CFNetworkCopySystemProxySettings();
> > +    WCHAR *ret = NULL;
> > +    SIZE_T len;
> >      const void *ref;
> > -    BOOL ret = FALSE;
> >
> > if (!settings) return FALSE;
> >
> > @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen )
> >          CFRelease( settings );
> >          return FALSE;
> > You forgot to replace FALSE -> NULL at a couple of places in this patch.

Good catch, thanks. I will send a fix.

Thanks,
Jacek