COMMDLG: fix declarations
Mike McCormack
mike at codeweavers.com
Tue Jun 28 04:47:13 CDT 2005
ChangeLog:
* fix declarations
-------------- next part --------------
Index: dlls/commdlg/cdlg16.h
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/cdlg16.h,v
retrieving revision 1.1
diff -u -p -r1.1 cdlg16.h
--- dlls/commdlg/cdlg16.h 12 Dec 2003 06:09:13 -0000 1.1
+++ dlls/commdlg/cdlg16.h 28 Jun 2005 09:49:06 -0000
@@ -149,6 +149,15 @@ BOOL16 WINAPI GetSaveFileName16(SEGPTR
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"
Index: dlls/commdlg/colordlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/colordlg.c,v
retrieving revision 1.51
diff -u -p -r1.51 colordlg.c
--- dlls/commdlg/colordlg.c 23 Mar 2005 13:15:20 -0000 1.51
+++ dlls/commdlg/colordlg.c 28 Jun 2005 09:49:06 -0000
@@ -203,7 +203,7 @@ int CC_RGBtoHSL(char c, int r, int g, in
/***********************************************************************
* 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 lp
/***********************************************************************
* 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;
Index: dlls/commdlg/colordlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/colordlg16.c,v
retrieving revision 1.9
diff -u -p -r1.9 colordlg16.c
--- dlls/commdlg/colordlg16.c 23 Mar 2005 13:15:20 -0000 1.9
+++ dlls/commdlg/colordlg16.c 28 Jun 2005 09:49:07 -0000
@@ -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, WPARA
/***********************************************************************
* 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;
Index: dlls/commdlg/filedlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v
retrieving revision 1.108
diff -u -p -r1.108 filedlg.c
--- dlls/commdlg/filedlg.c 7 Jun 2005 20:03:30 -0000 1.108
+++ dlls/commdlg/filedlg.c 28 Jun 2005 09:49:07 -0000
@@ -712,7 +712,7 @@ static void ArrangeCtrlPositions(HWND hw
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:
@@ -721,7 +721,7 @@ INT_PTR CALLBACK FileOpenDlgProcUserTemp
return FALSE;
}
-HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
+static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
{
LPCVOID template;
HRSRC hRes;
@@ -3500,7 +3500,7 @@ static BOOL CALLBACK FD32_Init(LPARAM lP
*
* 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;
Index: dlls/commdlg/filedlg16.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg16.c,v
retrieving revision 1.16
diff -u -p -r1.16 filedlg16.c
--- dlls/commdlg/filedlg16.c 10 Feb 2005 17:10:01 -0000 1.16
+++ dlls/commdlg/filedlg16.c 28 Jun 2005 09:49:07 -0000
@@ -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(LPOPENFILENAME1
* 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 lP
*
* 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;
Index: dlls/commdlg/filedlg31.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg31.c,v
retrieving revision 1.5
diff -u -p -r1.5 filedlg31.c
--- dlls/commdlg/filedlg31.c 3 Feb 2005 19:39:26 -0000 1.5
+++ dlls/commdlg/filedlg31.c 28 Jun 2005 09:49:07 -0000
@@ -303,7 +303,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM w
* 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, W
* 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;
Index: dlls/commdlg/filedlgbrowser.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlgbrowser.c,v
retrieving revision 1.54
diff -u -p -r1.54 filedlgbrowser.c
--- dlls/commdlg/filedlgbrowser.c 7 Jun 2005 20:03:30 -0000 1.54
+++ dlls/commdlg/filedlgbrowser.c 28 Jun 2005 09:49:07 -0000
@@ -66,10 +66,7 @@ static const IServiceProviderVtbl IShell
* 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_Constr
/***************************************************************************
* 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_QueryIn
/**************************************************************************
* 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(IS
/**************************************************************************
* 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(I
* 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_GetWind
/**************************************************************************
* 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_Context
* 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_EnableM
/**************************************************************************
* 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_GetCont
/* 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_GetView
/* 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_InsertM
/* 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_OnViewW
/* 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_QueryAc
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_RemoveM
/* 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_SendCon
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_SetMenu
/* 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_SetStat
/* 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_SetTool
/* 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 IShellBro
/***************************************************************************
* 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_ICommDl
/**************************************************************************
* 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_ICommDlgB
/**************************************************************************
* 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_ICommDlgB
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_ICommDl
/**************************************************************************
* 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_ICommDl
/**************************************************************************
* 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_ICommDl
/**************************************************************************
* 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 IShellB
/***************************************************************************
* 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_IServic
/**************************************************************************
* 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_IServiceP
/**************************************************************************
* 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_IServiceP
* this is a hack!
*/
-HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService(
+static HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService(
IServiceProvider * iface,
REFGUID guidService,
REFIID riid,
Index: dlls/commdlg/filetitle.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filetitle.c,v
retrieving revision 1.16
diff -u -p -r1.16 filetitle.c
--- dlls/commdlg/filetitle.c 12 Mar 2004 01:52:11 -0000 1.16
+++ dlls/commdlg/filetitle.c 28 Jun 2005 09:49:07 -0000
@@ -31,6 +31,7 @@
#include "winuser.h"
#include "commdlg.h"
#include "cdlg.h"
+#include "cdlg16.h"
#include "wine/unicode.h"
#include "wine/debug.h"
Index: dlls/commdlg/finddlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/finddlg.c,v
retrieving revision 1.31
diff -u -p -r1.31 finddlg.c
--- dlls/commdlg/finddlg.c 15 Feb 2005 21:51:07 -0000 1.31
+++ dlls/commdlg/finddlg.c 28 Jun 2005 09:49:07 -0000
@@ -62,7 +62,7 @@ BOOL16 CALLBACK ReplaceTextDlgProc16(HWN
* 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(LFRPRIVAT
*
* Free resources allocated
*/
-void FINDDLG_FreeResources(LFRPRIVATE lfr)
+static void FINDDLG_FreeResources(LFRPRIVATE lfr)
{
/* free resources */
if (lfr->fr16->Flags & FR_ENABLETEMPLATEHANDLE)
Index: dlls/commdlg/fontdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/fontdlg.c,v
retrieving revision 1.78
diff -u -p -r1.78 fontdlg.c
--- dlls/commdlg/fontdlg.c 13 May 2005 17:50:26 -0000 1.78
+++ dlls/commdlg/fontdlg.c 28 Jun 2005 09:49:08 -0000
@@ -427,7 +427,7 @@ static int SetFontSizesToCombo3(HWND hwn
/*************************************************************************
* 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
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;
More information about the wine-patches
mailing list