From 52736b47431751e1a39c97cc2b55abcce4d6f59c Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Tue, 28 Jun 2005 19:19:07 +0000 Subject: [PATCH] Fix declarations. --- dlls/commdlg/cdlg16.h | 9 +++++ dlls/commdlg/colordlg.c | 6 +-- dlls/commdlg/colordlg16.c | 4 +- dlls/commdlg/filedlg.c | 6 +-- dlls/commdlg/filedlg16.c | 6 +-- dlls/commdlg/filedlg31.c | 4 +- dlls/commdlg/filedlgbrowser.c | 74 +++++++++++++++++++---------------- dlls/commdlg/filetitle.c | 1 + dlls/commdlg/finddlg.c | 4 +- dlls/commdlg/fontdlg.c | 6 +-- 10 files changed, 69 insertions(+), 51 deletions(-) diff --git a/dlls/commdlg/cdlg16.h b/dlls/commdlg/cdlg16.h index 76b05f54643..8f5be87617c 100644 --- a/dlls/commdlg/cdlg16.h +++ b/dlls/commdlg/cdlg16.h @@ -149,6 +149,15 @@ BOOL16 WINAPI GetSaveFileName16(SEGPTR ofn); BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print); HWND16 WINAPI ReplaceText16( SEGPTR find); BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16); +BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LONG lParam ); +BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); +BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); +INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ); +INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam); +BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam); +short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf); +BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam); +BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); #include "poppack.h" diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 9a2dfced031..f892cc20dba 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -203,7 +203,7 @@ int CC_RGBtoHSL(char c, int r, int g, int b) /*********************************************************************** * CC_DrawCurrentFocusRect [internal] */ -void CC_DrawCurrentFocusRect( LCCPRIV lpp ) +static void CC_DrawCurrentFocusRect( LCCPRIV lpp ) { if (lpp->hwndFocus) { @@ -216,7 +216,7 @@ void CC_DrawCurrentFocusRect( LCCPRIV lpp ) /*********************************************************************** * CC_DrawFocusRect [internal] */ -void CC_DrawFocusRect( LCCPRIV lpp, HWND hwnd, int x, int y, int rows, int cols) +static void CC_DrawFocusRect( LCCPRIV lpp, HWND hwnd, int x, int y, int rows, int cols) { RECT rect; int dx, dy; @@ -822,7 +822,7 @@ BOOL CC_HookCallChk( LPCHOOSECOLORW lpcc ) /*********************************************************************** * CC_WMInitDialog [internal] */ -LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) +static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) { int i, res; int r, g, b; diff --git a/dlls/commdlg/colordlg16.c b/dlls/commdlg/colordlg16.c index fea848821d7..03720cacbba 100644 --- a/dlls/commdlg/colordlg16.c +++ b/dlls/commdlg/colordlg16.c @@ -71,7 +71,7 @@ typedef struct CCPRIVATE /*********************************************************************** * CC_WMInitDialog16 [internal] */ -LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam ) +static LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam ) { int i, res; int r, g, b; @@ -190,7 +190,7 @@ LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam ) /*********************************************************************** * CC_WMCommand16 [internal] */ -LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) +static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) { int r, g, b, i, xx; UINT cokmsg; diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index b67e94172b6..2a4ec28e309 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -713,7 +713,7 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid 0, 0, rectChild.right, rectChild.bottom, SWP_NOACTIVATE); } -INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) { case WM_INITDIALOG: @@ -722,7 +722,7 @@ INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam return FALSE; } -HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) +static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) { LPCVOID template; HRSRC hRes; @@ -3527,7 +3527,7 @@ static BOOL CALLBACK FD32_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data) * * called from the common 16/32 code to call the appropriate hook */ -BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam, +static BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam, LPARAM lParam) { BOOL ret; diff --git a/dlls/commdlg/filedlg16.c b/dlls/commdlg/filedlg16.c index f3a9a31e4b4..45d1a276bd7 100644 --- a/dlls/commdlg/filedlg16.c +++ b/dlls/commdlg/filedlg16.c @@ -46,7 +46,7 @@ typedef struct tagFD16_PRIVATE * FD16_MapOfnStruct16 [internal] * map a 16 bits structure to an Unicode one */ -void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open) +static void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open) { OPENFILENAMEA ofnA; /* first convert to linear pointers */ @@ -85,7 +85,7 @@ void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open * by a 16 bits application * */ -BOOL FD16_GetTemplate(PFD31_DATA lfs) +static BOOL FD16_GetTemplate(PFD31_DATA lfs) { PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; LPOPENFILENAME16 ofn16 = priv->ofn16; @@ -183,7 +183,7 @@ static BOOL CALLBACK FD16_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data) * * called from the common 16/32 code to call the appropriate hook */ -BOOL CALLBACK FD16_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam, +static BOOL CALLBACK FD16_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam, LPARAM lParam) { PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; diff --git a/dlls/commdlg/filedlg31.c b/dlls/commdlg/filedlg31.c index 735e4252b65..cd485f32ed1 100644 --- a/dlls/commdlg/filedlg31.c +++ b/dlls/commdlg/filedlg31.c @@ -303,7 +303,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, * FD31_UpdateResult [internal] * update the displayed file name (with path) */ -void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr) +static void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr) { int lenstr2; LPOPENFILENAMEW ofnW = lfs->ofnW; @@ -341,7 +341,7 @@ void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr) * FD31_UpdateFileTitle [internal] * update the displayed file name (without path) */ -void FD31_UpdateFileTitle(PFD31_DATA lfs) +static void FD31_UpdateFileTitle(PFD31_DATA lfs) { LONG lRet; LPOPENFILENAMEW ofnW = lfs->ofnW; diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index 0287a6fa70d..529f314efc1 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -66,10 +66,7 @@ static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; * Local Prototypes */ -HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv); -#if 0 -LPITEMIDLIST GetSelectedPidl(IShellView *ppshv); -#endif +static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv); /************************************************************************** * External Prototypes @@ -223,7 +220,7 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) /*************************************************************************** * IShellBrowserImpl_QueryInterface */ -HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, REFIID riid, LPVOID *ppvObj) { @@ -263,7 +260,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, /************************************************************************** * IShellBrowser::AddRef */ -ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) +static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); @@ -276,7 +273,7 @@ ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) /************************************************************************** * IShellBrowserImpl_Release */ -ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) +static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); @@ -306,7 +303,7 @@ ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) * Note : We will never be window less in the File Open dialog * */ -HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface, +static HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface, HWND * phwnd) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; @@ -325,7 +322,7 @@ HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface, /************************************************************************** * IShellBrowserImpl_ContextSensitiveHelp */ -HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface, +static HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface, BOOL fEnterMode) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; @@ -348,7 +345,7 @@ HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface, * This function will override user specified flags and will always * use SBSP_DEFBROWSER and SBSP_DEFMODE. */ -HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT wFlags) { @@ -485,7 +482,7 @@ error: /************************************************************************** * IShellBrowserImpl_EnableModelessSB */ -HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface, BOOL fEnable) { @@ -500,7 +497,7 @@ HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface, /************************************************************************** * IShellBrowserImpl_GetControlWindow */ -HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface, UINT id, HWND *lphwnd) @@ -512,10 +509,11 @@ HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_GetViewStateStream */ -HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface, DWORD grfMode, LPSTREAM *ppStrm) @@ -527,10 +525,11 @@ HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_InsertMenusSB */ -HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) @@ -542,10 +541,11 @@ HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_OnViewWindowActive */ -HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface, IShellView *ppshv) { @@ -556,10 +556,11 @@ HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_QueryActiveShellView */ -HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface, IShellView **ppshv) { @@ -578,10 +579,11 @@ HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface, IShellView_AddRef(fodInfos->Shell.FOIShellView); return NOERROR; } + /************************************************************************** * IShellBrowserImpl_RemoveMenusSB */ -HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) { @@ -592,10 +594,11 @@ HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_SendControlMsg */ -HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, WPARAM wParam, @@ -620,10 +623,11 @@ HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface, if (pret) *pret = lres; return S_OK; } + /************************************************************************** * IShellBrowserImpl_SetMenuSB */ -HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) @@ -636,10 +640,11 @@ HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_SetStatusTextSB */ -HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR lpszStatusText) { @@ -650,10 +655,11 @@ HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_SetToolbarItems */ -HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface, LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) @@ -666,10 +672,11 @@ HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface, /* Feature not implemented */ return E_NOTIMPL; } + /************************************************************************** * IShellBrowserImpl_TranslateAcceleratorSB */ -HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface, LPMSG lpmsg, WORD wID) @@ -716,7 +723,7 @@ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl = /*************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_QueryInterface */ -HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface( +static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface( ICommDlgBrowser *iface, REFIID riid, LPVOID *ppvObj) @@ -731,7 +738,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface( /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_AddRef */ -ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface) +static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface) { _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); @@ -743,7 +750,7 @@ ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface) /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_Release */ -ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface) +static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface) { _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); @@ -751,12 +758,13 @@ ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface) return IShellBrowserImpl_Release(This); } + /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand * * Called when a user double-clicks in the view or presses the ENTER key */ -HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDlgBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDlgBrowser *iface, IShellView *ppshv) { LPITEMIDLIST pidl; @@ -799,7 +807,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDlgBrowse /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_OnStateChange */ -HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface, IShellView *ppshv, ULONG uChange) { @@ -838,7 +846,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser * /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_IncludeObject */ -HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, +static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, IShellView * ppshv, LPCITEMIDLIST pidl) { @@ -883,7 +891,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser * /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_OnSelChange */ -HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv) +static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv) { FileOpenDlgInfos *fodInfos; @@ -929,7 +937,7 @@ static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl = /*************************************************************************** * IShellBrowserImpl_IServiceProvider_QueryInterface */ -HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface( +static HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface( IServiceProvider *iface, REFIID riid, LPVOID *ppvObj) @@ -944,7 +952,7 @@ HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface( /************************************************************************** * IShellBrowserImpl_IServiceProvider_AddRef */ -ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface) +static ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface) { _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); @@ -956,7 +964,7 @@ ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface) /************************************************************************** * IShellBrowserImpl_IServiceProvider_Release */ -ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface) +static ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface) { _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); @@ -976,7 +984,7 @@ ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface * this is a hack! */ -HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService( +static HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService( IServiceProvider * iface, REFGUID guidService, REFIID riid, diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c index 6d2b9fe6c0b..c1601f93fbb 100644 --- a/dlls/commdlg/filetitle.c +++ b/dlls/commdlg/filetitle.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "commdlg.h" #include "cdlg.h" +#include "cdlg16.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c index 712b051ed36..61dacd97e1f 100644 --- a/dlls/commdlg/finddlg.c +++ b/dlls/commdlg/finddlg.c @@ -62,7 +62,7 @@ BOOL16 CALLBACK ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam, * by a 16 bits application * FIXME : no test was done for the user-provided template cases */ -BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) +static BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) { LPFINDREPLACE16 fr16 = lfr->fr16; @@ -150,7 +150,7 @@ BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) * * Free resources allocated */ -void FINDDLG_FreeResources(LFRPRIVATE lfr) +static void FINDDLG_FreeResources(LFRPRIVATE lfr) { /* free resources */ if (lfr->fr16->Flags & FR_ENABLETEMPLATEHANDLE) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 2593b4a8f84..401af2f3641 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -427,7 +427,7 @@ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf) /************************************************************************* * CFn_GetDC [internal] */ -inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) +static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) { HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? lpcf->hDC : @@ -439,7 +439,7 @@ inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) /************************************************************************* * CFn_ReleaseDC [internal] */ -inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc) +static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc) { if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC)) ReleaseDC(0, hdc); @@ -1021,7 +1021,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, return(FALSE); } -LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcfw) +static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcfw) { LPCHOOSEFONTA lpcfa; LPSTR lpszStyle;