Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
* Mark some functions as static.
* Fix a typo in My_VideoW.

svn path=/trunk/; revision=54068
This commit is contained in:
Amine Khaldi 2011-10-09 23:19:35 +00:00
parent 2cce447ebb
commit d38c1a938a
3 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/shell32/shellpath.cpp
View file

@ -72,7 +72,7 @@ static LPSTR PathGetExtensionA(LPCSTR lpszPath)
/************************************************************************* /*************************************************************************
* PathGetExtensionW [internal] * PathGetExtensionW [internal]
*/ */
LPWSTR PathGetExtensionW(LPCWSTR lpszPath) static LPWSTR PathGetExtensionW(LPCWSTR lpszPath)
{ {
TRACE("(%s)\n",debugstr_w(lpszPath)); TRACE("(%s)\n",debugstr_w(lpszPath));
@ -264,7 +264,7 @@ EXTERN_C 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,
@ -280,7 +280,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,
@ -407,7 +407,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;
@ -416,7 +416,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;
@ -435,7 +435,7 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath)
/************************************************************************* /*************************************************************************
* PathResolveA [SHELL32.51] * PathResolveA [SHELL32.51]
*/ */
BOOL WINAPI PathResolveA( static BOOL PathResolveA(
LPSTR lpszPath, LPSTR lpszPath,
LPCSTR *alpszPaths, LPCSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
@ -448,7 +448,7 @@ BOOL WINAPI PathResolveA(
/************************************************************************* /*************************************************************************
* PathResolveW [SHELL32] * PathResolveW [SHELL32]
*/ */
BOOL WINAPI PathResolveW( static BOOL PathResolveW(
LPWSTR lpszPath, LPWSTR lpszPath,
LPCWSTR *alpszPaths, LPCWSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
@ -474,7 +474,7 @@ BOOL WINAPI PathResolveAW(
/************************************************************************* /*************************************************************************
* PathProcessCommandA [SHELL32.653] * PathProcessCommandA [SHELL32.653]
*/ */
LONG WINAPI PathProcessCommandA ( static LONG PathProcessCommandA (
LPCSTR lpszPath, LPCSTR lpszPath,
LPSTR lpszBuff, LPSTR lpszBuff,
DWORD dwBuffSize, DWORD dwBuffSize,
@ -490,7 +490,7 @@ LONG WINAPI PathProcessCommandA (
/************************************************************************* /*************************************************************************
* PathProcessCommandW * PathProcessCommandW
*/ */
LONG WINAPI PathProcessCommandW ( static LONG PathProcessCommandW (
LPCWSTR lpszPath, LPCWSTR lpszPath,
LPWSTR lpszBuff, LPWSTR lpszBuff,
DWORD dwBuffSize, DWORD dwBuffSize,
@ -546,7 +546,7 @@ static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'};
static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'};
static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'};
static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'};
static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','\0'}; static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','s','\0'};
static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'};
static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'};
static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};

12
reactos/dll/win32/shell32/shellstring.cpp
View file

@ -120,7 +120,7 @@ EXTERN_C BOOL WINAPI StrRetToStrNAW(LPVOID dest, DWORD len, LPSTRRET src, const
* 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));
@ -128,7 +128,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));
@ -149,12 +149,12 @@ EXTERN_C 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);
@ -174,13 +174,13 @@ EXTERN_C BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, IN
/************************************************************************* /*************************************************************************
* 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);

3
reactos/dll/win32/shell32/undocshell.h
View file

@ -383,9 +383,6 @@ BOOL WINAPI PathYetAnotherMakeUniqueName(
LPCWSTR lpszShortName, LPCWSTR lpszShortName,
LPCWSTR lpszLongName); LPCWSTR lpszLongName);
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);