Francois Gouget : shell32: Make AboutDlgProc() and SHELL_execute() static.
Alexandre Julliard
julliard at winehq.org
Fri May 15 07:47:03 CDT 2009
Module: wine
Branch: master
Commit: aad81e5cea1f3806cb44156388575443a1a328c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad81e5cea1f3806cb44156388575443a1a328c4
Author: Francois Gouget <fgouget at free.fr>
Date: Fri May 15 02:15:17 2009 +0200
shell32: Make AboutDlgProc() and SHELL_execute() static.
---
dlls/shell32/shell32_main.c | 4 ++--
dlls/shell32/shell32_main.h | 5 -----
dlls/shell32/shlexec.c | 5 ++++-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 5706d50..6a4848f 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -911,8 +911,8 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
/*************************************************************************
* AboutDlgProc (internal)
*/
-INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
- LPARAM lParam )
+static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
+ LPARAM lParam )
{
HWND hWndCtl;
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index eea2e18..86652a1 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -68,7 +68,6 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes);
-INT_PTR CALLBACK AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len);
DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len);
@@ -190,10 +189,6 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
return *target;
}
-typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
- const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out);
-
-BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc);
extern WCHAR swShell32Name[MAX_PATH];
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 201791f..1a12e51 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -59,6 +59,9 @@ static const WCHAR wszEmpty[] = {0};
#define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY)
+typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
+ const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out);
+
/***********************************************************************
* SHELL_ArgifyW [Internal]
@@ -1465,7 +1468,7 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd )
/*************************************************************************
* SHELL_execute [Internal]
*/
-BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
+static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
{
static const WCHAR wSpace[] = {' ',0};
static const WCHAR wWww[] = {'w','w','w',0};
More information about the wine-cvs
mailing list