ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Make some functions static.

This commit is contained in:
Alexandre Julliard 2008-12-03 12:12:52 +01:00
parent 02bfacff5a
commit 1a882843bf
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/comdlg32/cdlg.h
View File

@ -182,12 +182,8 @@ extern UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST);
/* SHELL */ /* SHELL */
extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);
extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID);
extern BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR);
extern BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType);
extern BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType);
/* /*
* Internal Functions * Internal Functions
* Do NOT Export to other programs and dlls * Do NOT Export to other programs and dlls

8
dlls/comdlg32/cdlg32.c
View File

@ -52,7 +52,6 @@ UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST);
/* SHELL */ /* SHELL */
LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);
DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); DWORD (WINAPI *COMDLG32_SHFree)(LPVOID);
BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR);
/*********************************************************************** /***********************************************************************
@ -102,13 +101,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
GPA(COMDLG32_SHAlloc, SHELL32_hInstance, (LPCSTR)196L); GPA(COMDLG32_SHAlloc, SHELL32_hInstance, (LPCSTR)196L);
GPA(COMDLG32_SHFree, SHELL32_hInstance, (LPCSTR)195L); GPA(COMDLG32_SHFree, SHELL32_hInstance, (LPCSTR)195L);
/* for the first versions of shell32 SHGetFolderPathA is in SHFOLDER.DLL */
COMDLG32_SHGetFolderPathA = (void*)GetProcAddress(SHELL32_hInstance,"SHGetFolderPathA");
if (!COMDLG32_SHGetFolderPathA)
{
SHFOLDER_hInstance = LoadLibraryA("SHFOLDER.DLL");
GPA(COMDLG32_SHGetFolderPathA, SHFOLDER_hInstance,"SHGetFolderPathA");
}
/* for the first versions of shell32 SHGetFolderPathW is in SHFOLDER.DLL */ /* for the first versions of shell32 SHGetFolderPathW is in SHFOLDER.DLL */
COMDLG32_SHGetFolderPathW = (void*)GetProcAddress(SHELL32_hInstance,"SHGetFolderPathW"); COMDLG32_SHGetFolderPathW = (void*)GetProcAddress(SHELL32_hInstance,"SHGetFolderPathW");

10
dlls/comdlg32/filedlg.c
View File

@ -220,6 +220,8 @@ static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPWST
IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl);
static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl);
static UINT GetNumSelected( IDataObject *doSelected );
/* Shell memory allocation */ /* Shell memory allocation */
static void *MemAlloc(UINT size); static void *MemAlloc(UINT size);
@ -312,7 +314,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos)
* IN : The OPENFILENAMEA initialisation structure passed to * IN : The OPENFILENAMEA initialisation structure passed to
* GetOpenFileNameA win api function (see filedlg.c) * GetOpenFileNameA win api function (see filedlg.c)
*/ */
BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
{ {
BOOL ret; BOOL ret;
FileOpenDlgInfos fodInfos; FileOpenDlgInfos fodInfos;
@ -449,7 +451,7 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
* Call GetFileName95 with this structure and clean the memory. * Call GetFileName95 with this structure and clean the memory.
* *
*/ */
BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
{ {
BOOL ret; BOOL ret;
FileOpenDlgInfos fodInfos; FileOpenDlgInfos fodInfos;
@ -3291,7 +3293,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
* Return the number of selected items in the DataObject. * Return the number of selected items in the DataObject.
* *
*/ */
UINT GetNumSelected( IDataObject *doSelected ) static UINT GetNumSelected( IDataObject *doSelected )
{ {
UINT retVal = 0; UINT retVal = 0;
STGMEDIUM medium; STGMEDIUM medium;
@ -3430,7 +3432,7 @@ static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName)
/* /*
*/ */
BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl)
{ {
ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER; ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
HRESULT ret; HRESULT ret;

4
dlls/comdlg32/filedlgbrowser.h
View File

@ -148,10 +148,6 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner);
LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex); LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex);
UINT GetNumSelected(IDataObject *doSelected);
/* pidl handling */
BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl);
/* Functions used by the EDIT box */ /* Functions used by the EDIT box */
void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd);