Francois Gouget : shlwapi: Remove WINAPI on static functions where not needed.
Alexandre Julliard
julliard at winehq.org
Tue Nov 25 07:21:20 CST 2008
Module: wine
Branch: master
Commit: a3973e0c476290e4aabfc9801dcd61a9acd8a597
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3973e0c476290e4aabfc9801dcd61a9acd8a597
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Nov 24 17:22:44 2008 +0100
shlwapi: Remove WINAPI on static functions where not needed.
---
dlls/shlwapi/ordinal.c | 9 ++++-----
dlls/shlwapi/path.c | 8 ++++----
dlls/shlwapi/reg.c | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 495b444..68e934f 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -76,10 +76,9 @@ BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD);
*
* Internal implemetation of SHLWAPI_11.
*/
-static
-HANDLE WINAPI SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId,
- DWORD dwSrcProcId, DWORD dwAccess,
- DWORD dwOptions)
+static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId,
+ DWORD dwSrcProcId, DWORD dwAccess,
+ DWORD dwOptions)
{
HANDLE hDst, hSrc;
DWORD dwMyProcId = GetCurrentProcessId();
@@ -3546,7 +3545,7 @@ HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHC
}
/* INTERNAL: Map from HLS color space to RGB */
-static WORD WINAPI ConvertHue(int wHue, WORD wMid1, WORD wMid2)
+static WORD ConvertHue(int wHue, WORD wMid1, WORD wMid2)
{
wHue = wHue > 240 ? wHue - 240 : wHue < 0 ? wHue + 240 : wHue;
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index e06e027..5e95d5c 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -1156,7 +1156,7 @@ BOOL WINAPI PathFileExistsDefExtA(LPSTR lpszPath,DWORD dwWhich)
*
* Internal helper for SHLWAPI_PathFindOnPathExA/W.
*/
-static BOOL WINAPI SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich)
+static BOOL SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich)
{
static const WCHAR szSystem[] = { 'S','y','s','t','e','m','\0'};
static const WCHAR szPath[] = { 'P','A','T','H','\0'};
@@ -1792,7 +1792,7 @@ BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath, DWORD *dwAttr)
/*************************************************************************
* PathMatchSingleMaskA [internal]
*/
-static BOOL WINAPI PathMatchSingleMaskA(LPCSTR name, LPCSTR mask)
+static BOOL PathMatchSingleMaskA(LPCSTR name, LPCSTR mask)
{
while (*name && *mask && *mask!=';')
{
@@ -1826,7 +1826,7 @@ static BOOL WINAPI PathMatchSingleMaskA(LPCSTR name, LPCSTR mask)
/*************************************************************************
* PathMatchSingleMaskW [internal]
*/
-static BOOL WINAPI PathMatchSingleMaskW(LPCWSTR name, LPCWSTR mask)
+static BOOL PathMatchSingleMaskW(LPCWSTR name, LPCWSTR mask)
{
while (*name && *mask && *mask != ';')
{
@@ -2991,7 +2991,7 @@ UINT WINAPI PathGetCharTypeW(WCHAR ch)
*
* Internal helper for PathMakeSystemFolderW.
*/
-static BOOL WINAPI SHLWAPI_UseSystemForSystemFolders(void)
+static BOOL SHLWAPI_UseSystemForSystemFolders(void)
{
static BOOL bCheckedReg = FALSE;
static BOOL bUseSystemForSystemFolders = FALSE;
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 07384ea..70a5e14 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -66,7 +66,7 @@ HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY);
* Function: Return the proper registry key from the HUSKEY structure
* also allow special predefined values.
*/
-static HKEY WINAPI REG_GetHKEYFromHUSKEY(HUSKEY hUSKey, BOOL which)
+static HKEY REG_GetHKEYFromHUSKEY(HUSKEY hUSKey, BOOL which)
{
HKEY test = hUSKey;
LPSHUSKEY mihk = hUSKey;
More information about the wine-cvs
mailing list