Fix declarations.

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"
 

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;

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;

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;

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;

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;

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"
 

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)

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;