Alexandre Julliard : comdlg32:
Moved prototypes to the header file and fixed declaration of
FileOpenDlgInfosStr .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 30 13:40:55 CST 2006
Module: wine
Branch: master
Commit: 6367330fe819e513a9c958fd2224c448eca73aed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6367330fe819e513a9c958fd2224c448eca73aed
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Nov 30 15:15:46 2006 +0100
comdlg32: Moved prototypes to the header file and fixed declaration of FileOpenDlgInfosStr.
---
dlls/comdlg32/filedlg.c | 4 ++--
dlls/comdlg32/filedlgbrowser.c | 13 -------------
dlls/comdlg32/filedlgbrowser.h | 11 +++++++++++
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 68887d2..4d1eb84 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -221,7 +221,7 @@ static void FILEDLG95_LOOKIN_Clean(HW
static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName);
IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl);
-LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
+static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
/* Shell memory allocation */
static void *MemAlloc(UINT size);
@@ -3391,7 +3391,7 @@ LPITEMIDLIST GetParentPidl(LPITEMIDLIST
* returns the pidl of the file name relative to folder
* NULL if an error occurred
*/
-LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName)
+static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName)
{
LPITEMIDLIST pidl = NULL;
ULONG ulEaten;
diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
index 8f33418..2ff2c81 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -78,19 +78,6 @@ static const IServiceProviderVtbl IShell
static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
-/**************************************************************************
-* External Prototypes
-*/
-extern const char *FileOpenDlgInfosStr;
-
-extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
-extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl);
-extern LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName);
-
-extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
-extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
-
-
/*
* Helper functions
*/
diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h
index 1725c45..2342d3d 100644
--- a/dlls/comdlg32/filedlgbrowser.h
+++ b/dlls/comdlg32/filedlgbrowser.h
@@ -156,4 +156,15 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LP
/* Functions used by the EDIT box */
void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd);
+/**************************************************************************
+* External Prototypes
+*/
+extern const char FileOpenDlgInfosStr[];
+
+extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
+extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl);
+
+extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
+extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
+
#endif /*SHBROWSER_H*/
More information about the wine-cvs
mailing list