[ros-diffs] [akhaldi] 54068: [SHELL32] * Mark some functions as static. * Fix a typo in My_VideoW.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Sun Oct 9 23:19:35 UTC 2011
Author: akhaldi
Date: Sun Oct 9 23:19:35 2011
New Revision: 54068
URL: http://svn.reactos.org/svn/reactos?rev=54068&view=rev
Log:
[SHELL32]
* Mark some functions as static.
* Fix a typo in My_VideoW.
Modified:
trunk/reactos/dll/win32/shell32/shellpath.cpp
trunk/reactos/dll/win32/shell32/shellstring.cpp
trunk/reactos/dll/win32/shell32/undocshell.h
Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpath.cpp?rev=54068&r1=54067&r2=54068&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Sun Oct 9 23:19:35 2011
@@ -72,7 +72,7 @@
/*************************************************************************
* PathGetExtensionW [internal]
*/
-LPWSTR PathGetExtensionW(LPCWSTR lpszPath)
+static LPWSTR PathGetExtensionW(LPCWSTR lpszPath)
{
TRACE("(%s)\n",debugstr_w(lpszPath));
@@ -264,7 +264,7 @@
/*************************************************************************
* PathMakeUniqueNameA [internal]
*/
-BOOL WINAPI PathMakeUniqueNameA(
+static BOOL PathMakeUniqueNameA(
LPSTR lpszBuffer,
DWORD dwBuffSize,
LPCSTR lpszShortName,
@@ -280,7 +280,7 @@
/*************************************************************************
* PathMakeUniqueNameW [internal]
*/
-BOOL WINAPI PathMakeUniqueNameW(
+static BOOL PathMakeUniqueNameW(
LPWSTR lpszBuffer,
DWORD dwBuffSize,
LPCWSTR lpszShortName,
@@ -407,7 +407,7 @@
/*************************************************************************
* PathQualifyA [SHELL32]
*/
-BOOL WINAPI PathQualifyA(LPCSTR pszPath)
+static BOOL PathQualifyA(LPCSTR pszPath)
{
FIXME("%s\n",pszPath);
return 0;
@@ -416,7 +416,7 @@
/*************************************************************************
* PathQualifyW [SHELL32]
*/
-BOOL WINAPI PathQualifyW(LPCWSTR pszPath)
+static BOOL PathQualifyW(LPCWSTR pszPath)
{
FIXME("%s\n",debugstr_w(pszPath));
return 0;
@@ -435,7 +435,7 @@
/*************************************************************************
* PathResolveA [SHELL32.51]
*/
-BOOL WINAPI PathResolveA(
+static BOOL PathResolveA(
LPSTR lpszPath,
LPCSTR *alpszPaths,
DWORD dwFlags)
@@ -448,7 +448,7 @@
/*************************************************************************
* PathResolveW [SHELL32]
*/
-BOOL WINAPI PathResolveW(
+static BOOL PathResolveW(
LPWSTR lpszPath,
LPCWSTR *alpszPaths,
DWORD dwFlags)
@@ -474,7 +474,7 @@
/*************************************************************************
* PathProcessCommandA [SHELL32.653]
*/
-LONG WINAPI PathProcessCommandA (
+static LONG PathProcessCommandA (
LPCSTR lpszPath,
LPSTR lpszBuff,
DWORD dwBuffSize,
@@ -490,7 +490,7 @@
/*************************************************************************
* PathProcessCommandW
*/
-LONG WINAPI PathProcessCommandW (
+static LONG PathProcessCommandW (
LPCWSTR lpszPath,
LPWSTR lpszBuff,
DWORD dwBuffSize,
@@ -546,7 +546,7 @@
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_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 PersonalW[] = {'P','e','r','s','o','n','a','l','\0'};
static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};
Modified: trunk/reactos/dll/win32/shell32/shellstring.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellstring.cpp?rev=54068&r1=54067&r2=54068&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellstring.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellstring.cpp [iso-8859-1] Sun Oct 9 23:19:35 2011
@@ -120,7 +120,7 @@
* StrToOleStr [SHELL32.163]
*
*/
-int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
+static int StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
{
TRACE("(%p, %p %s)\n",
lpWideCharStr, lpMultiByteString, debugstr_a(lpMultiByteString));
@@ -128,7 +128,7 @@
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",
lpWideCharStr, lpWString, debugstr_w(lpWString));
@@ -149,12 +149,12 @@
* lpMulti, nMulti, nWide [IN]
* 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);
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);
@@ -174,13 +174,13 @@
/*************************************************************************
* 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);
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);
Modified: trunk/reactos/dll/win32/shell32/undocshell.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshell.h?rev=54068&r1=54067&r2=54068&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Sun Oct 9 23:19:35 2011
@@ -383,9 +383,6 @@
LPCWSTR lpszShortName,
LPCWSTR lpszLongName);
-BOOL WINAPI PathQualifyA(LPCSTR path);
-BOOL WINAPI PathQualifyW(LPCWSTR path);
-#define PathQualify WINELIB_NAME_AW(PathQualify)
BOOL WINAPI PathQualifyAW(LPCVOID path);
More information about the Ros-diffs
mailing list