[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg

Nikolay Sivov bunglehead at gmail.com
Sat Jan 13 14:41:23 CST 2018


On 1/13/2018 8:31 PM, Vijay Kiran Kamuju wrote:
> For bug #44270
> 
> Signed-off-by: Vijay Kiran Kamuju <infyquest at gmail.com>
> ---
>  dlls/shdocvw/shdocvw.spec   |  4 ++--
>  dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++
>  2 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec
> index 0d581b26d2fa..485d1608dbab 100644
> --- a/dlls/shdocvw/shdocvw.spec
> +++ b/dlls/shdocvw/shdocvw.spec
> @@ -113,8 +113,8 @@
>  @ stub DoAddToFavDlgW
>  @ stdcall DoFileDownload(wstr)
>  @ stub DoFileDownloadEx
> -@ stub DoOrganizeFavDlg
> -@ stub DoOrganizeFavDlgW
> +@ stdcall DoOrganizeFavDlg(long str)
> +@ stdcall DoOrganizeFavDlgW(long wstr)
>  @ stub DoPrivacyDlg
>  @ stub HlinkFrameNavigate
>  @ stub HlinkFrameNavigateNHL
> diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
> index 5d89f77e919f..151aac039f1d 100644
> --- a/dlls/shdocvw/shdocvw_main.c
> +++ b/dlls/shdocvw/shdocvw_main.c
> @@ -560,3 +560,30 @@ BOOL WINAPI DoFileDownload(LPWSTR filename)
>      FIXME("(%s) stub\n", debugstr_w(filename));
>      return FALSE;
>  }
> +
> +/******************************************************************
> + * DoOrganizeFavDlgW (SHDOCVW.@)
> + */
> +BOOL WINAPI DoOrganizeFavDlgW(HWND handle, LPCWSTR path)
> +{
> +    FIXME("(%p %s) stub\n", handle, debugstr_w(path));
> +    return FALSE;
> +}
> +
> +/******************************************************************
> + * DoOrganizeFavDlg (SHDOCVW.@)
> + */
> +BOOL WINAPI DoOrganizeFavDlg(HWND handle, LPCSTR path)

Did you check that it takes A-string? Please add a TRACE() too, and use
better names for arguments.

> +{
> +    LPWSTR pathW = NULL;
> +    DWORD res;

'res' should be BOOL.

> +
> +    if (pathW) {
> +        DWORD len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0);
> +        pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
> +        MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len);
> +    }

For consistency please use heap_alloc(). Also this block is never executed.

> +    res = DoOrganizeFavDlgW(handle, pathW);
> +    heap_free(pathW);
> +    return res;
> +}
> 

P.S. I see you're sending patches to wine-patches still, please use
wine-devel instead, wine-patches is not actively used anymore.




More information about the wine-devel mailing list