mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 09:25:06 +00:00
comdlg32: Constify some variables.
This commit is contained in:
parent
80d80c66af
commit
a855ba87da
|
@ -213,10 +213,10 @@ typedef struct
|
||||||
} CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT;
|
} CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT;
|
||||||
|
|
||||||
INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
||||||
UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd,
|
UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd,
|
||||||
LPCFn_ENUMSTRUCT e);
|
LPCFn_ENUMSTRUCT e);
|
||||||
INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *metrics,
|
INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *metrics,
|
||||||
UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3,
|
UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3,
|
||||||
HWND hDlg, BOOL iswin16);
|
HWND hDlg, BOOL iswin16);
|
||||||
void _dump_cf_flags(DWORD cflags);
|
void _dump_cf_flags(DWORD cflags);
|
||||||
|
|
||||||
|
@ -227,6 +227,6 @@ LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam);
|
||||||
LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
LPCHOOSEFONTW lpcf);
|
LPCHOOSEFONTW lpcf);
|
||||||
LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
LPCHOOSEFONTW lpcf);
|
const CHOOSEFONTW *lpcf);
|
||||||
|
|
||||||
#endif /* _WINE_DLL_CDLG_H */
|
#endif /* _WINE_DLL_CDLG_H */
|
||||||
|
|
|
@ -287,7 +287,7 @@ static const COLORREF textcolors[TEXT_COLORS]=
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* CFn_HookCallChk32 [internal]
|
* CFn_HookCallChk32 [internal]
|
||||||
*/
|
*/
|
||||||
static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf)
|
static BOOL CFn_HookCallChk32(const CHOOSEFONTW *lpcf)
|
||||||
{
|
{
|
||||||
if (lpcf)
|
if (lpcf)
|
||||||
if(lpcf->Flags & CF_ENABLEHOOK)
|
if(lpcf->Flags & CF_ENABLEHOOK)
|
||||||
|
@ -300,7 +300,7 @@ static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf)
|
||||||
* AddFontFamily [internal]
|
* AddFontFamily [internal]
|
||||||
*/
|
*/
|
||||||
INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
||||||
UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e)
|
UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
WORD w;
|
WORD w;
|
||||||
|
@ -403,7 +403,7 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf)
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* AddFontSizeToCombo3 [internal]
|
* AddFontSizeToCombo3 [internal]
|
||||||
*/
|
*/
|
||||||
static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf)
|
static int AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf)
|
||||||
{
|
{
|
||||||
int j;
|
int j;
|
||||||
WCHAR buffer[20];
|
WCHAR buffer[20];
|
||||||
|
@ -427,7 +427,7 @@ static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf)
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* SetFontSizesToCombo3 [internal]
|
* SetFontSizesToCombo3 [internal]
|
||||||
*/
|
*/
|
||||||
static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf)
|
static int SetFontSizesToCombo3(HWND hwnd, const CHOOSEFONTW *lpcf)
|
||||||
{
|
{
|
||||||
static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
|
static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
|
||||||
int i;
|
int i;
|
||||||
|
@ -440,7 +440,7 @@ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf)
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* CFn_GetDC [internal]
|
* CFn_GetDC [internal]
|
||||||
*/
|
*/
|
||||||
static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
|
static inline HDC CFn_GetDC(const CHOOSEFONTW *lpcf)
|
||||||
{
|
{
|
||||||
HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ?
|
HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ?
|
||||||
lpcf->hDC :
|
lpcf->hDC :
|
||||||
|
@ -452,7 +452,7 @@ static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* CFn_ReleaseDC [internal]
|
* CFn_ReleaseDC [internal]
|
||||||
*/
|
*/
|
||||||
static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc)
|
static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc)
|
||||||
{
|
{
|
||||||
if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
|
if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
|
||||||
ReleaseDC(0, hdc);
|
ReleaseDC(0, hdc);
|
||||||
|
@ -462,7 +462,7 @@ static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc)
|
||||||
* AddFontStyle [internal]
|
* AddFontStyle [internal]
|
||||||
*/
|
*/
|
||||||
INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
|
||||||
UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3,
|
UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3,
|
||||||
HWND hDlg, BOOL iswin16)
|
HWND hDlg, BOOL iswin16)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -1075,7 +1075,7 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
|
LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSEFONTW *lpcf)
|
||||||
{
|
{
|
||||||
WINDOWINFO info;
|
WINDOWINFO info;
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ static void FONT_Metrics16To32W( const TEXTMETRIC16 *pm16,
|
||||||
pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading;
|
pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
|
static void CFn_CHOOSEFONT16to32W(const CHOOSEFONT16 *chf16, LPCHOOSEFONTW chf32w)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
if (chf16->Flags & CF_ENABLETEMPLATE)
|
if (chf16->Flags & CF_ENABLETEMPLATE)
|
||||||
|
@ -106,7 +106,7 @@ static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* CFn_HookCallChk [internal]
|
* CFn_HookCallChk [internal]
|
||||||
*/
|
*/
|
||||||
static BOOL CFn_HookCallChk(LPCHOOSEFONT16 lpcf)
|
static BOOL CFn_HookCallChk(const CHOOSEFONT16 *lpcf)
|
||||||
{
|
{
|
||||||
if (lpcf)
|
if (lpcf)
|
||||||
if(lpcf->Flags & CF_ENABLEHOOK)
|
if(lpcf->Flags & CF_ENABLEHOOK)
|
||||||
|
|
Loading…
Reference in a new issue