Re: [PATCH 2/2] ieframe: Convert to integer without additional string buffer allocation

[Jacek Caban]

On 04/08/16 21:56, Nikolay Sivov wrote:
> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
> ---
>  dlls/ieframe/intshcut.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
> index 385b059..79458ac 100644
> --- a/dlls/ieframe/intshcut.c
> +++ b/dlls/ieframe/intshcut.c
> @@ -511,12 +511,11 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
>
> if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring) == S_OK)
>      {
> +        WCHAR *end;
>          int iconindex;
>          PROPSPEC ps;
>          PROPVARIANT pv;
> -        char *iconindexastring = co_strdupWtoA(iconindexstring);
> -        sscanf(iconindexastring, "%d", &iconindex);
> -        CoTaskMemFree(iconindexastring);
> +        iconindex = strtolW(iconindexstring, &end, 10);

If you don't need end value, you could pass NULL instead.

Thanks,
Jacek

[PATCH 2/2] ieframe: Convert to integer without additional string buffer allocation

[Nikolay Sivov]

On 11.04.2016 18:31, Jacek Caban wrote:
> On 04/08/16 21:56, Nikolay Sivov wrote:
> > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
> > ---
> >  dlls/ieframe/intshcut.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
> > index 385b059..79458ac 100644
> > --- a/dlls/ieframe/intshcut.c
> > +++ b/dlls/ieframe/intshcut.c
> > @@ -511,12 +511,11 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
> >
> > if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring) == S_OK)
> >      {
> > +        WCHAR *end;
> >          int iconindex;
> >          PROPSPEC ps;
> >          PROPVARIANT pv;
> > -        char *iconindexastring = co_strdupWtoA(iconindexstring);
> > -        sscanf(iconindexastring, "%d", &iconindex);
> > -        CoTaskMemFree(iconindexastring);
> > +        iconindex = strtolW(iconindexstring, &end, 10);
>
> If you don't need end value, you could pass NULL instead.

Makes sense, thanks.
> Thanks,
> Jacek