Nikolay Sivov : shell32: PickIconDlg() is documented now.
Alexandre Julliard
julliard at winehq.org
Thu Sep 28 18:36:35 CDT 2017
Module: wine
Branch: master
Commit: 937ef127723c94ca1b3072089e00f3e2bce16e36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=937ef127723c94ca1b3072089e00f3e2bce16e36
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Sep 28 11:58:28 2017 +0300
shell32: PickIconDlg() is documented now.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/dialogs.c | 11 +++--------
dlls/shell32/shell32.spec | 2 +-
dlls/shell32/undocshell.h | 6 ------
include/shlobj.h | 2 ++
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 5d7e079..1a583f2 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -60,15 +60,10 @@ static void FillList (HWND, char *, BOOL) ;
* PickIconDlg [SHELL32.62]
*
*/
-INT WINAPI PickIconDlg(
- HWND hwndOwner,
- LPSTR lpstrFile,
- DWORD nMaxFile,
- LPDWORD lpdwIconIndex)
+INT WINAPI PickIconDlg(HWND hwndOwner, WCHAR *path, UINT path_len, INT *index)
{
- FIXME("(%p,%s,%08x,%p):stub.\n",
- hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex);
- return 0xffffffff;
+ FIXME("(%p,%s,%u,%p):stub.\n", hwndOwner, debugstr_w(path), path_len, index);
+ return 0xffffffff;
}
HRESULT WINAPI SHOpenWithDialog(HWND parent, const OPENASINFO *info)
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 6d2c61b..c38591c 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -57,7 +57,7 @@
59 stdcall -ordinal RestartDialog(long wstr long)
60 stdcall -noname ExitWindowsDialog(long)
61 stdcall -noname RunFileDlg(long long str str str long) RunFileDlgAW
- 62 stdcall -ordinal PickIconDlg(long ptr long ptr)
+ 62 stdcall -ordinal PickIconDlg(long wstr long ptr)
63 stdcall -ordinal GetFileNameFromBrowse(long ptr long str str str str) GetFileNameFromBrowseAW
64 stdcall -ordinal DriveType(long)
65 stdcall -noname InvalidateDriveType(long)
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 3f3372a..9b3d844 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -79,12 +79,6 @@ BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
* Shell Common Dialogs
*/
-BOOL WINAPI PickIconDlg(
- HWND hwndOwner,
- LPSTR lpstrFile,
- DWORD nMaxFile,
- LPDWORD lpdwIconIndex);
-
/* RunFileDlg flags */
#define RFF_NOBROWSE 0x01
#define RFF_NODEFAULT 0x02
diff --git a/include/shlobj.h b/include/shlobj.h
index 66596a3..09efc18 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1800,6 +1800,8 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT
LPFNDFMCALLBACK lpfn, UINT nKeys, const HKEY *ahkeys,
IContextMenu **ppcm);
+int WINAPI PickIconDlg(HWND owner, WCHAR *path, UINT path_len, int *index);
+
#include <poppack.h>
#ifdef __cplusplus
More information about the wine-cvs
mailing list