Fix declarations.

This commit is contained in:
Mike McCormack 2005-06-28 19:19:07 +00:00 committed by Alexandre Julliard
parent 9bda749b78
commit 52736b4743
10 changed files with 69 additions and 51 deletions

View File

@ -149,6 +149,15 @@ BOOL16 WINAPI GetSaveFileName16(SEGPTR ofn);
BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print); BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print);
HWND16 WINAPI ReplaceText16( SEGPTR find); HWND16 WINAPI ReplaceText16( SEGPTR find);
BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16); 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" #include "poppack.h"

View File

@ -203,7 +203,7 @@ int CC_RGBtoHSL(char c, int r, int g, int b)
/*********************************************************************** /***********************************************************************
* CC_DrawCurrentFocusRect [internal] * CC_DrawCurrentFocusRect [internal]
*/ */
void CC_DrawCurrentFocusRect( LCCPRIV lpp ) static void CC_DrawCurrentFocusRect( LCCPRIV lpp )
{ {
if (lpp->hwndFocus) if (lpp->hwndFocus)
{ {
@ -216,7 +216,7 @@ void CC_DrawCurrentFocusRect( LCCPRIV lpp )
/*********************************************************************** /***********************************************************************
* CC_DrawFocusRect [internal] * 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; RECT rect;
int dx, dy; int dx, dy;
@ -822,7 +822,7 @@ BOOL CC_HookCallChk( LPCHOOSECOLORW lpcc )
/*********************************************************************** /***********************************************************************
* CC_WMInitDialog [internal] * 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 i, res;
int r, g, b; int r, g, b;

View File

@ -71,7 +71,7 @@ typedef struct CCPRIVATE
/*********************************************************************** /***********************************************************************
* CC_WMInitDialog16 [internal] * 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 i, res;
int r, g, b; int r, g, b;
@ -190,7 +190,7 @@ LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam )
/*********************************************************************** /***********************************************************************
* CC_WMCommand16 [internal] * 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; int r, g, b, i, xx;
UINT cokmsg; UINT cokmsg;

View File

@ -713,7 +713,7 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
0, 0, rectChild.right, rectChild.bottom, SWP_NOACTIVATE); 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) { switch(uMsg) {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -722,7 +722,7 @@ INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam
return FALSE; return FALSE;
} }
HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
{ {
LPCVOID template; LPCVOID template;
HRSRC hRes; 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 * 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) LPARAM lParam)
{ {
BOOL ret; BOOL ret;

View File

@ -46,7 +46,7 @@ typedef struct tagFD16_PRIVATE
* FD16_MapOfnStruct16 [internal] * FD16_MapOfnStruct16 [internal]
* map a 16 bits structure to an Unicode one * 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; OPENFILENAMEA ofnA;
/* first convert to linear pointers */ /* first convert to linear pointers */
@ -85,7 +85,7 @@ void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open
* by a 16 bits application * 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; PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
LPOPENFILENAME16 ofn16 = priv->ofn16; 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 * 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) LPARAM lParam)
{ {
PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;

View File

@ -303,7 +303,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
* FD31_UpdateResult [internal] * FD31_UpdateResult [internal]
* update the displayed file name (with path) * 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; int lenstr2;
LPOPENFILENAMEW ofnW = lfs->ofnW; LPOPENFILENAMEW ofnW = lfs->ofnW;
@ -341,7 +341,7 @@ void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr)
* FD31_UpdateFileTitle [internal] * FD31_UpdateFileTitle [internal]
* update the displayed file name (without path) * update the displayed file name (without path)
*/ */
void FD31_UpdateFileTitle(PFD31_DATA lfs) static void FD31_UpdateFileTitle(PFD31_DATA lfs)
{ {
LONG lRet; LONG lRet;
LPOPENFILENAMEW ofnW = lfs->ofnW; LPOPENFILENAMEW ofnW = lfs->ofnW;

View File

@ -66,10 +66,7 @@ static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl;
* Local Prototypes * Local Prototypes
*/ */
HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv); static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
#if 0
LPITEMIDLIST GetSelectedPidl(IShellView *ppshv);
#endif
/************************************************************************** /**************************************************************************
* External Prototypes * External Prototypes
@ -223,7 +220,7 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner)
/*************************************************************************** /***************************************************************************
* IShellBrowserImpl_QueryInterface * IShellBrowserImpl_QueryInterface
*/ */
HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
@ -263,7 +260,7 @@ HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
/************************************************************************** /**************************************************************************
* IShellBrowser::AddRef * IShellBrowser::AddRef
*/ */
ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
{ {
IShellBrowserImpl *This = (IShellBrowserImpl *)iface; IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
@ -276,7 +273,7 @@ ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_Release * IShellBrowserImpl_Release
*/ */
ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
{ {
IShellBrowserImpl *This = (IShellBrowserImpl *)iface; IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); 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 * 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) HWND * phwnd)
{ {
IShellBrowserImpl *This = (IShellBrowserImpl *)iface; IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
@ -325,7 +322,7 @@ HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ContextSensitiveHelp * IShellBrowserImpl_ContextSensitiveHelp
*/ */
HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface, static HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
BOOL fEnterMode) BOOL fEnterMode)
{ {
IShellBrowserImpl *This = (IShellBrowserImpl *)iface; IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
@ -348,7 +345,7 @@ HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
* This function will override user specified flags and will always * This function will override user specified flags and will always
* use SBSP_DEFBROWSER and SBSP_DEFMODE. * use SBSP_DEFBROWSER and SBSP_DEFMODE.
*/ */
HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
LPCITEMIDLIST pidl, LPCITEMIDLIST pidl,
UINT wFlags) UINT wFlags)
{ {
@ -485,7 +482,7 @@ error:
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_EnableModelessSB * IShellBrowserImpl_EnableModelessSB
*/ */
HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,
BOOL fEnable) BOOL fEnable)
{ {
@ -500,7 +497,7 @@ HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_GetControlWindow * IShellBrowserImpl_GetControlWindow
*/ */
HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,
UINT id, UINT id,
HWND *lphwnd) HWND *lphwnd)
@ -512,10 +509,11 @@ HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_GetViewStateStream * IShellBrowserImpl_GetViewStateStream
*/ */
HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
DWORD grfMode, DWORD grfMode,
LPSTREAM *ppStrm) LPSTREAM *ppStrm)
@ -527,10 +525,11 @@ HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_InsertMenusSB * IShellBrowserImpl_InsertMenusSB
*/ */
HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
HMENU hmenuShared, HMENU hmenuShared,
LPOLEMENUGROUPWIDTHS lpMenuWidths) LPOLEMENUGROUPWIDTHS lpMenuWidths)
@ -542,10 +541,11 @@ HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_OnViewWindowActive * IShellBrowserImpl_OnViewWindowActive
*/ */
HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
IShellView *ppshv) IShellView *ppshv)
{ {
@ -556,10 +556,11 @@ HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_QueryActiveShellView * IShellBrowserImpl_QueryActiveShellView
*/ */
HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
IShellView **ppshv) IShellView **ppshv)
{ {
@ -578,10 +579,11 @@ HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
IShellView_AddRef(fodInfos->Shell.FOIShellView); IShellView_AddRef(fodInfos->Shell.FOIShellView);
return NOERROR; return NOERROR;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_RemoveMenusSB * IShellBrowserImpl_RemoveMenusSB
*/ */
HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
HMENU hmenuShared) HMENU hmenuShared)
{ {
@ -592,10 +594,11 @@ HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_SendControlMsg * IShellBrowserImpl_SendControlMsg
*/ */
HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
UINT id, UINT id,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -620,10 +623,11 @@ HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
if (pret) *pret = lres; if (pret) *pret = lres;
return S_OK; return S_OK;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_SetMenuSB * IShellBrowserImpl_SetMenuSB
*/ */
HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
HMENU hmenuShared, HMENU hmenuShared,
HOLEMENU holemenuReserved, HOLEMENU holemenuReserved,
HWND hwndActiveObject) HWND hwndActiveObject)
@ -636,10 +640,11 @@ HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_SetStatusTextSB * IShellBrowserImpl_SetStatusTextSB
*/ */
HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
LPCOLESTR lpszStatusText) LPCOLESTR lpszStatusText)
{ {
@ -650,10 +655,11 @@ HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_SetToolbarItems * IShellBrowserImpl_SetToolbarItems
*/ */
HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
LPTBBUTTON lpButtons, LPTBBUTTON lpButtons,
UINT nButtons, UINT nButtons,
UINT uFlags) UINT uFlags)
@ -666,10 +672,11 @@ HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
/* Feature not implemented */ /* Feature not implemented */
return E_NOTIMPL; return E_NOTIMPL;
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_TranslateAcceleratorSB * IShellBrowserImpl_TranslateAcceleratorSB
*/ */
HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
LPMSG lpmsg, LPMSG lpmsg,
WORD wID) WORD wID)
@ -716,7 +723,7 @@ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl =
/*************************************************************************** /***************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_QueryInterface * IShellBrowserImpl_ICommDlgBrowser_QueryInterface
*/ */
HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface( static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(
ICommDlgBrowser *iface, ICommDlgBrowser *iface,
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
@ -731,7 +738,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_AddRef * IShellBrowserImpl_ICommDlgBrowser_AddRef
*/ */
ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface) static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface)
{ {
_ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface);
@ -743,7 +750,7 @@ ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface)
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_Release * IShellBrowserImpl_ICommDlgBrowser_Release
*/ */
ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface) static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface)
{ {
_ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface);
@ -751,12 +758,13 @@ ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface)
return IShellBrowserImpl_Release(This); return IShellBrowserImpl_Release(This);
} }
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand * IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand
* *
* Called when a user double-clicks in the view or presses the ENTER key * 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) IShellView *ppshv)
{ {
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
@ -799,7 +807,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDlgBrowse
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_OnStateChange * IShellBrowserImpl_ICommDlgBrowser_OnStateChange
*/ */
HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface,
IShellView *ppshv, IShellView *ppshv,
ULONG uChange) ULONG uChange)
{ {
@ -838,7 +846,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_IncludeObject * IShellBrowserImpl_ICommDlgBrowser_IncludeObject
*/ */
HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface,
IShellView * ppshv, IShellView * ppshv,
LPCITEMIDLIST pidl) LPCITEMIDLIST pidl)
{ {
@ -883,7 +891,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_OnSelChange * IShellBrowserImpl_ICommDlgBrowser_OnSelChange
*/ */
HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv) static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv)
{ {
FileOpenDlgInfos *fodInfos; FileOpenDlgInfos *fodInfos;
@ -929,7 +937,7 @@ static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl =
/*************************************************************************** /***************************************************************************
* IShellBrowserImpl_IServiceProvider_QueryInterface * IShellBrowserImpl_IServiceProvider_QueryInterface
*/ */
HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface( static HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface(
IServiceProvider *iface, IServiceProvider *iface,
REFIID riid, REFIID riid,
LPVOID *ppvObj) LPVOID *ppvObj)
@ -944,7 +952,7 @@ HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface(
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_IServiceProvider_AddRef * IShellBrowserImpl_IServiceProvider_AddRef
*/ */
ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface) static ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface)
{ {
_ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
@ -956,7 +964,7 @@ ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface)
/************************************************************************** /**************************************************************************
* IShellBrowserImpl_IServiceProvider_Release * IShellBrowserImpl_IServiceProvider_Release
*/ */
ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface) static ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface)
{ {
_ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
@ -976,7 +984,7 @@ ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface
* this is a hack! * this is a hack!
*/ */
HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService( static HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService(
IServiceProvider * iface, IServiceProvider * iface,
REFGUID guidService, REFGUID guidService,
REFIID riid, REFIID riid,

View File

@ -31,6 +31,7 @@
#include "winuser.h" #include "winuser.h"
#include "commdlg.h" #include "commdlg.h"
#include "cdlg.h" #include "cdlg.h"
#include "cdlg16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"

View File

@ -62,7 +62,7 @@ BOOL16 CALLBACK ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
* by a 16 bits application * by a 16 bits application
* FIXME : no test was done for the user-provided template cases * 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; LPFINDREPLACE16 fr16 = lfr->fr16;
@ -150,7 +150,7 @@ BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr)
* *
* Free resources allocated * Free resources allocated
*/ */
void FINDDLG_FreeResources(LFRPRIVATE lfr) static void FINDDLG_FreeResources(LFRPRIVATE lfr)
{ {
/* free resources */ /* free resources */
if (lfr->fr16->Flags & FR_ENABLETEMPLATEHANDLE) if (lfr->fr16->Flags & FR_ENABLETEMPLATEHANDLE)

View File

@ -427,7 +427,7 @@ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf)
/************************************************************************* /*************************************************************************
* CFn_GetDC [internal] * CFn_GetDC [internal]
*/ */
inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
{ {
HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ?
lpcf->hDC : lpcf->hDC :
@ -439,7 +439,7 @@ inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
/************************************************************************* /*************************************************************************
* CFn_ReleaseDC [internal] * 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)) if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
ReleaseDC(0, hdc); ReleaseDC(0, hdc);
@ -1021,7 +1021,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
return(FALSE); 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; LPCHOOSEFONTA lpcfa;
LPSTR lpszStyle; LPSTR lpszStyle;