Commit aad81e5c authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

shell32: Make AboutDlgProc() and SHELL_execute() static.

parent bce5f731
...@@ -911,8 +911,8 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) ...@@ -911,8 +911,8 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
/************************************************************************* /*************************************************************************
* AboutDlgProc (internal) * AboutDlgProc (internal)
*/ */
INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
LPARAM lParam ) LPARAM lParam )
{ {
HWND hWndCtl; HWND hWndCtl;
......
...@@ -68,7 +68,6 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len); ...@@ -68,7 +68,6 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes); 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 ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len);
DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR 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) ...@@ -190,10 +189,6 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
return *target; 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]; extern WCHAR swShell32Name[MAX_PATH];
......
...@@ -59,6 +59,9 @@ static const WCHAR wszEmpty[] = {0}; ...@@ -59,6 +59,9 @@ static const WCHAR wszEmpty[] = {0};
#define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY) #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] * SHELL_ArgifyW [Internal]
...@@ -1465,7 +1468,7 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) ...@@ -1465,7 +1468,7 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd )
/************************************************************************* /*************************************************************************
* SHELL_execute [Internal] * 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 wSpace[] = {' ',0};
static const WCHAR wWww[] = {'w','w','w',0}; static const WCHAR wWww[] = {'w','w','w',0};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment