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

shell32: Make some functions static.

This commit is contained in:
Alexandre Julliard 2008-12-03 12:09:38 +01:00
parent 366fcaf1a7
commit 1abff5afef
10 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shell32/dialogs.c
View File

@ -79,7 +79,7 @@ BOOL WINAPI PickIconDlg(
* SEE ALSO * SEE ALSO
* RunFileDlgAW * RunFileDlgAW
*/ */
void WINAPI RunFileDlgW( static void RunFileDlgW(
HWND hwndOwner, HWND hwndOwner,
HICON hIcon, HICON hIcon,
LPCWSTR lpstrDirectory, LPCWSTR lpstrDirectory,
@ -440,7 +440,7 @@ static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault)
* SEE ALSO * SEE ALSO
* RunFileDlgAW * RunFileDlgAW
*/ */
void WINAPI RunFileDlgA( static void RunFileDlgA(
HWND hwndOwner, HWND hwndOwner,
HICON hIcon, HICON hIcon,
LPCSTR lpstrDirectory, LPCSTR lpstrDirectory,

4
dlls/shell32/iconcache.c
View File

@ -632,7 +632,7 @@ HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf
* Shell_GetCachedImageIndex [SHELL32.72] * Shell_GetCachedImageIndex [SHELL32.72]
* *
*/ */
INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc)
{ {
INT ret, len; INT ret, len;
LPWSTR szTemp; LPWSTR szTemp;
@ -650,7 +650,7 @@ INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD
return ret; return ret;
} }
INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) static INT Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc)
{ {
WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc); WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc);

9
dlls/shell32/pidl.c
View File

@ -1322,7 +1322,14 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI
* *
************************************************************************* *************************************************************************
*/ */
LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size)
/* Basic PIDL constructor. Allocates size + 5 bytes, where:
* - two bytes are SHITEMID.cb
* - one byte is PIDLDATA.type
* - two bytes are the NULL PIDL terminator
* Sets type of the returned PIDL to type.
*/
static LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size)
{ {
LPITEMIDLIST pidlOut = NULL; LPITEMIDLIST pidlOut = NULL;

8
dlls/shell32/pidl.h
View File

@ -223,14 +223,6 @@ BOOL _ILIsEmpty (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl)
* simple pidls * simple pidls
*/ */
/* Basic PIDL constructor. Allocates size + 5 bytes, where:
* - two bytes are SHITEMID.cb
* - one byte is PIDLDATA.type
* - two bytes are the NULL PIDL terminator
* Sets type of the returned PIDL to type.
*/
LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size);
/* Creates a PIDL with guid format and type type, which must be one of PT_GUID, /* Creates a PIDL with guid format and type type, which must be one of PT_GUID,
* PT_SHELLEXT, or PT_YAGUID. * PT_SHELLEXT, or PT_YAGUID.
*/ */

4
dlls/shell32/shell32_main.h
View File

@ -156,7 +156,6 @@ void FreeChangeNotifications(void);
#define ASK_CANT_TRASH_ITEM 10 #define ASK_CANT_TRASH_ITEM 10
#define ASK_OVERWRITE_FOLDER 11 #define ASK_OVERWRITE_FOLDER 11
BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pwszDir, BOOL bShowUI);
BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir);
/* 16-bit functions */ /* 16-bit functions */
@ -222,9 +221,6 @@ typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait
BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc);
UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args);
extern WCHAR swShell32Name[MAX_PATH]; extern WCHAR swShell32Name[MAX_PATH];
BOOL UNIXFS_is_rooted_at_desktop(void); BOOL UNIXFS_is_rooted_at_desktop(void);

18
dlls/shell32/shellpath.c
View File

@ -483,7 +483,7 @@ BOOL WINAPI IsLFNDriveAW(LPCVOID lpszPath)
/************************************************************************* /*************************************************************************
* PathMakeUniqueNameA [internal] * PathMakeUniqueNameA [internal]
*/ */
BOOL WINAPI PathMakeUniqueNameA( static BOOL PathMakeUniqueNameA(
LPSTR lpszBuffer, LPSTR lpszBuffer,
DWORD dwBuffSize, DWORD dwBuffSize,
LPCSTR lpszShortName, LPCSTR lpszShortName,
@ -499,7 +499,7 @@ BOOL WINAPI PathMakeUniqueNameA(
/************************************************************************* /*************************************************************************
* PathMakeUniqueNameW [internal] * PathMakeUniqueNameW [internal]
*/ */
BOOL WINAPI PathMakeUniqueNameW( static BOOL PathMakeUniqueNameW(
LPWSTR lpszBuffer, LPWSTR lpszBuffer,
DWORD dwBuffSize, DWORD dwBuffSize,
LPCWSTR lpszShortName, LPCWSTR lpszShortName,
@ -636,7 +636,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW )
/************************************************************************* /*************************************************************************
* PathQualifyA [SHELL32] * PathQualifyA [SHELL32]
*/ */
BOOL WINAPI PathQualifyA(LPCSTR pszPath) static BOOL PathQualifyA(LPCSTR pszPath)
{ {
FIXME("%s\n",pszPath); FIXME("%s\n",pszPath);
return 0; return 0;
@ -645,7 +645,7 @@ BOOL WINAPI PathQualifyA(LPCSTR pszPath)
/************************************************************************* /*************************************************************************
* PathQualifyW [SHELL32] * PathQualifyW [SHELL32]
*/ */
BOOL WINAPI PathQualifyW(LPCWSTR pszPath) static BOOL PathQualifyW(LPCWSTR pszPath)
{ {
FIXME("%s\n",debugstr_w(pszPath)); FIXME("%s\n",debugstr_w(pszPath));
return 0; return 0;
@ -661,7 +661,7 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath)
return PathQualifyA(pszPath); return PathQualifyA(pszPath);
} }
BOOL WINAPI PathResolveA( static BOOL PathResolveA(
LPSTR lpszPath, LPSTR lpszPath,
LPCSTR *alpszPaths, LPCSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
@ -671,7 +671,7 @@ BOOL WINAPI PathResolveA(
return 0; return 0;
} }
BOOL WINAPI PathResolveW( static BOOL PathResolveW(
LPWSTR lpszPath, LPWSTR lpszPath,
LPCWSTR *alpszPaths, LPCWSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
@ -695,9 +695,9 @@ BOOL WINAPI PathResolveAW(
} }
/************************************************************************* /*************************************************************************
* PathProcessCommandA [SHELL32.653] * PathProcessCommandA
*/ */
LONG WINAPI PathProcessCommandA ( static LONG PathProcessCommandA (
LPCSTR lpszPath, LPCSTR lpszPath,
LPSTR lpszBuff, LPSTR lpszBuff,
DWORD dwBuffSize, DWORD dwBuffSize,
@ -713,7 +713,7 @@ LONG WINAPI PathProcessCommandA (
/************************************************************************* /*************************************************************************
* PathProcessCommandW * PathProcessCommandW
*/ */
LONG WINAPI PathProcessCommandW ( static LONG PathProcessCommandW (
LPCWSTR lpszPath, LPCWSTR lpszPath,
LPWSTR lpszBuff, LPWSTR lpszBuff,
DWORD dwBuffSize, DWORD dwBuffSize,

12
dlls/shell32/shellstring.c
View File

@ -140,7 +140,7 @@ BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIS
* StrToOleStr [SHELL32.163] * StrToOleStr [SHELL32.163]
* *
*/ */
int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString) static int StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
{ {
TRACE("(%p, %p %s)\n", TRACE("(%p, %p %s)\n",
lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString)); lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
@ -148,7 +148,7 @@ int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH); return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH);
} }
int WINAPI StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString) static int StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
{ {
TRACE("(%p, %p %s)\n", TRACE("(%p, %p %s)\n",
lpWideCharStr, lpWString, debugstr_w(lpWString)); lpWideCharStr, lpWString, debugstr_w(lpWString));
@ -169,12 +169,12 @@ BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
* lpMulti, nMulti, nWide [IN] * lpMulti, nMulti, nWide [IN]
* lpWide [OUT] * lpWide [OUT]
*/ */
BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr) static BOOL StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
{ {
TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr); TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_an(lpStrA,nStr), nStr);
return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide); return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
} }
BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr) static BOOL StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
{ {
TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr); TRACE("(%p, %x, %s, %x)\n", lpWide, nWide, debugstr_wn(lpStrW, nStr), nStr);
@ -194,13 +194,13 @@ BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr)
/************************************************************************* /*************************************************************************
* OleStrToStrN [SHELL32.78] * OleStrToStrN [SHELL32.78]
*/ */
BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle) static BOOL OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
{ {
TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle); TRACE("(%p, %x, %s, %x)\n", lpStr, nStr, debugstr_wn(lpOle,nOle), nOle);
return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL); return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
} }
BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
{ {
TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle); TRACE("(%p, %x, %s, %x)\n", lpwStr, nwStr, debugstr_wn(lpOle,nOle), nOle);

2
dlls/shell32/shlexec.c
View File

@ -534,7 +534,7 @@ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpOperation, LPWSTR key, LPW
* command (it'll be used afterwards for more information * command (it'll be used afterwards for more information
* on the operation) * on the operation)
*/ */
UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args) LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args)
{ {
static const WCHAR wWindows[] = {'w','i','n','d','o','w','s',0}; static const WCHAR wWindows[] = {'w','i','n','d','o','w','s',0};

2
dlls/shell32/shlfileop.c
View File

@ -346,7 +346,7 @@ HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status)
* Asks for confirmation when bShowUI is true and deletes the directory and * Asks for confirmation when bShowUI is true and deletes the directory and
* all its subdirectories and files if necessary. * all its subdirectories and files if necessary.
*/ */
BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) static BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI)
{ {
BOOL ret = TRUE; BOOL ret = TRUE;
HANDLE hFind; HANDLE hFind;

4
dlls/shell32/undocshell.h
View File

@ -412,12 +412,8 @@ BOOL WINAPI PathMakeUniqueNameAW(
LPCVOID lpszPathName); LPCVOID lpszPathName);
BOOL WINAPI PathQualifyA(LPCSTR path);
BOOL WINAPI PathQualifyW(LPCWSTR path);
#define PathQualify WINELIB_NAME_AW(PathQualify)
BOOL WINAPI PathQualifyAW(LPCVOID path); BOOL WINAPI PathQualifyAW(LPCVOID path);
BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags); BOOL WINAPI PathResolveAW(LPVOID lpszPath, LPCVOID *alpszPaths, DWORD dwFlags);
VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath); VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int nIDDlgItem, LPCVOID lpszPath);