shell32: Declare some functions static
Andrew Talbot
Andrew.Talbot at talbotville.com
Tue Jan 30 15:15:13 CST 2007
Changelog:
shell32: Declare some functions static.
diff -urN a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
--- a/dlls/shell32/dialogs.c 2006-10-09 12:06:01.000000000 +0100
+++ b/dlls/shell32/dialogs.c 2007-01-30 20:08:40.000000000 +0000
@@ -52,8 +52,8 @@
typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ;
WINE_DEFAULT_DEBUG_CHANNEL(shell);
-INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ;
-void FillList (HWND, char *) ;
+static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ;
+static void FillList (HWND, char *) ;
/*************************************************************************
@@ -116,7 +116,7 @@
}
/* Dialog procedure for RunFileDlg */
-INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
int ic ;
char *psz, szMsg[256] ;
@@ -235,7 +235,7 @@
}
/* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */
-void FillList (HWND hCb, char *pszLatest)
+static void FillList (HWND hCb, char *pszLatest)
{
HKEY hkey ;
/* char szDbgMsg[256] = "" ; */
diff -urN a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
--- a/dlls/shell32/iconcache.c 2006-05-23 13:48:39.000000000 +0100
+++ b/dlls/shell32/iconcache.c 2007-01-30 20:12:40.000000000 +0000
@@ -620,7 +620,7 @@
* Shell_GetCachedImageIndex [SHELL32.72]
*
*/
-INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc)
+static INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc)
{
INT ret, len;
LPWSTR szTemp;
@@ -638,7 +638,7 @@
return ret;
}
-INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc)
+static INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc)
{
WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc);
diff -urN a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
--- a/dlls/shell32/shellole.c 2007-01-16 18:36:49.000000000 +0000
+++ b/dlls/shell32/shellole.c 2007-01-30 20:15:20.000000000 +0000
@@ -55,7 +55,7 @@
* Default ClassFactory types
*/
typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
-IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst);
+static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst);
/* this table contains all CLSID's of shell32 objects */
static const struct {
@@ -397,7 +397,7 @@
* IDefClF_fnConstructor
*/
-IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst)
+static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst)
{
IDefClFImpl* lpclf;
diff -urN a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
--- a/dlls/shell32/shellstring.c 2006-10-09 12:06:01.000000000 +0100
+++ b/dlls/shell32/shellstring.c 2007-01-30 20:18:18.000000000 +0000
@@ -142,7 +142,7 @@
* StrToOleStr [SHELL32.163]
*
*/
-int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
+static int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
{
TRACE("(%p, %p %s)\n",
lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
@@ -150,7 +150,7 @@
return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH);
}
-int WINAPI StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
+static int WINAPI StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
{
TRACE("(%p, %p %s)\n",
lpWideCharStr, lpWString, debugstr_w(lpWString));
@@ -171,12 +171,12 @@
* lpMulti, nMulti, nWide [IN]
* lpWide [OUT]
*/
-BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
+static BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
{
TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
}
-BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
+static BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
{
TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr);
@@ -196,13 +196,13 @@
/*************************************************************************
* OleStrToStrN [SHELL32.78]
*/
-BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
+static BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
{
TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
}
-BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
+static BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
{
TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);
diff -urN a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
--- a/dlls/shell32/shfldr_fs.c 2006-11-28 17:52:29.000000000 +0000
+++ b/dlls/shell32/shfldr_fs.c 2007-01-30 20:18:51.000000000 +0000
@@ -1158,7 +1158,7 @@
* Builds a list of paths like the one used in SHFileOperation from a table of
* PIDLs relative to the given base folder
*/
-WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls)
+static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls)
{
WCHAR *wszPathsList;
WCHAR *wszListPos;
diff -urN a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
--- a/dlls/shell32/shlexec.c 2007-01-18 18:11:15.000000000 +0000
+++ b/dlls/shell32/shlexec.c 2007-01-30 20:53:25.000000000 +0000
@@ -314,7 +314,7 @@
return hr;
}
-HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize)
+static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize)
{
STRRET strret;
IShellFolder* desktop;
diff -urN a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
--- a/dlls/shell32/shlfileop.c 2006-12-11 17:28:38.000000000 +0000
+++ b/dlls/shell32/shlfileop.c 2007-01-30 20:27:17.000000000 +0000
@@ -662,7 +662,7 @@
* otherwise the ASCII strings are copied into it and the buffer is increased
* to point to the location after the final 0 termination char.
*/
-DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
+static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
{
DWORD size = 0, aSize = 0;
LPCSTR aString = (LPCSTR)*pWToFrom;
diff -urN a/dlls/shell32/trash.c b/dlls/shell32/trash.c
--- a/dlls/shell32/trash.c 2006-11-13 17:34:38.000000000 +0000
+++ b/dlls/shell32/trash.c 2007-01-30 20:28:02.000000000 +0000
@@ -254,7 +254,7 @@
return NULL;
}
-void remove_trashinfo_file(const char *info_dir, const char *base_name)
+static void remove_trashinfo_file(const char *info_dir, const char *base_name)
{
char *filename_buffer;
@@ -386,7 +386,7 @@
SHFree(element->filename);
}
-HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data)
+static HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data)
{
LPSTR path = NULL;
XDG_PARSED_FILE *parsed = NULL;
@@ -480,7 +480,7 @@
return ret;
}
-INT CALLBACK free_item_callback(void *item, void *lParam)
+static INT CALLBACK free_item_callback(void *item, void *lParam)
{
SHFree(item);
return TRUE;
More information about the wine-patches
mailing list