From 71bdb2f1b65f1649dcd707eaf32d590eb253495c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 19:34:12 +0300 Subject: CLIST_INTERFACE::pfnGetFontSetting => Clist_GetFontSetting --- include/delphi/m_clistint.inc | 4 ++-- include/m_clistint.h | 3 ++- libs/win32/mir_app.lib | Bin 151356 -> 151606 bytes libs/win64/mir_app.lib | Bin 146770 -> 146996 bytes plugins/Clist_nicer/src/clcutils.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 2 +- src/core/stdclist/src/clcfonts.cpp | 4 ++-- src/core/stdclist/src/clcopts.cpp | 2 +- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcutils.cpp | 2 +- src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 13 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 5079e17b15..adade975fa 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -358,9 +358,9 @@ type pfnNotifyNewContact : procedure (hwnd:HWND; hContact:TMCONTACT); cdecl; pfnGetDefaultExStyle : function :dword; cdecl; pfnGetDefaultFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl; - pfnGetFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl; pfnLoadClcOptions : procedure (hwnd:HWND; var dat:TClcData; bFirst: int); cdecl; - pfnRecalculateGroupCheckboxes : procedure (hwnd:HWND; var dat:TClcData); cdecl; + blablablabla7 : procedure; cdecl; + blablablabla6 : procedure; cdecl; blablablabla5 : procedure; cdecl; blablablabla4 : procedure; cdecl; diff --git a/include/m_clistint.h b/include/m_clistint.h index 6a390bce28..61586e51c6 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -256,6 +256,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon) EXTERN_C MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon); EXTERN_C MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index); EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible); +EXTERN_C MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour); EXTERN_C MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd); EXTERN_C MIR_APP_DLL(void) Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem); EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void); @@ -368,8 +369,8 @@ struct CLIST_INTERFACE void (*pfnNotifyNewContact)(HWND hwnd, MCONTACT hContact); DWORD (*pfnGetDefaultExStyle)(void); void (*pfnGetDefaultFontSetting)(int i, LOGFONT *lf, COLORREF *colour); - void (*pfnGetFontSetting)(int i, LOGFONT *lf, COLORREF *colour); void (*pfnLoadClcOptions)(HWND hwnd, ClcData *dat, BOOL bFirst); + void (*blablablabla7)(); void (*blablablabla6)(); void (*blablablabla5)(); void (*blablablabla4)(); diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 537b06ff07..aea8002698 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 23071ff86c..15610a4d61 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 75f1c29c57..5822512dbe 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -567,7 +567,7 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) DeleteObject(dat->fontInfo[i].hFont); LOGFONT lf; - pcli->pfnGetFontSetting(i, &lf, &dat->fontInfo[i].colour); + Clist_GetFontSetting(i, &lf, &dat->fontInfo[i].colour); lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); dat->fontInfo[i].hFont = CreateFontIndirect(&lf); diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index a718231025..a0663c1270 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1885,7 +1885,7 @@ void FS_RegisterFonts() HDC hdc = GetDC(nullptr); for (int i = 0; i < _countof(clistFontDescr); i++) { LOGFONT lf; - pcli->pfnGetFontSetting(i, &lf, &fid.deffontsettings.colour); + Clist_GetFontSetting(i, &lf, &fid.deffontsettings.colour); lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); wcsncpy_s(fid.deffontsettings.szFace, lf.lfFaceName, _TRUNCATE); diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index d00c89df0a..c8f06365f1 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.cpp @@ -59,7 +59,7 @@ void RegisterCListFonts() HDC hdc = GetDC(nullptr); for (int i = 0; i < _countof(clistFontDescr); i++) { LOGFONT lf; - pcli->pfnGetFontSetting(i, &lf, &fontid.deffontsettings.colour); + Clist_GetFontSetting(i, &lf, &fontid.deffontsettings.colour); lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); wcsncpy_s(fontid.deffontsettings.szFace, lf.lfFaceName, _TRUNCATE); @@ -121,7 +121,7 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) DeleteObject(dat->fontInfo[i].hFont); LOGFONT lf; - pcli->pfnGetFontSetting(i, &lf, &dat->fontInfo[i].colour); + Clist_GetFontSetting(i, &lf, &dat->fontInfo[i].colour); lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); dat->fontInfo[i].hFont = CreateFontIndirect(&lf); diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 932e546e52..453a2b6267 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -124,7 +124,7 @@ static LONG CalcMinRowHeight() for (int i = 0; i < FONTID_LAST; i++) { LOGFONT lf; COLORREF color; - pcli->pfnGetFontSetting(i, &lf, &color); + Clist_GetFontSetting(i, &lf, &color); lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); HFONT hFont = CreateFontIndirect(&lf); hFont = (HFONT)SelectObject(hdc, hFont); diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index c777aa3e25..ebdd0b1dcf 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -93,7 +93,6 @@ int fnIsHiddenMode(struct ClcData *dat, int status); void fnHideInfoTip(HWND hwnd, struct ClcData *dat); void fnNotifyNewContact(HWND hwnd, MCONTACT hContact); void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour); -void fnGetFontSetting(int i, LOGFONT *lf, COLORREF *colour); void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst); void fnSetContactCheckboxes(ClcContact *cc, int checked); diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 8c13cfea77..e0ecf94e42 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -698,7 +698,7 @@ void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour) } } -void fnGetFontSetting(int i, LOGFONT *lf, COLORREF *colour) +MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour) { cli.pfnGetDefaultFontSetting(i, lf, colour); diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 0da53aa5bd..a4828244f5 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -112,7 +112,6 @@ void InitClistCore() cli.pfnNotifyNewContact = fnNotifyNewContact; cli.pfnGetDefaultExStyle = fnGetDefaultExStyle; cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting; - cli.pfnGetFontSetting = fnGetFontSetting; cli.pfnLoadClcOptions = fnLoadClcOptions; cli.pfnGetRowBottomY = fnGetRowBottomY; cli.pfnGetRowHeight = fnGetRowHeight; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 2812065996..9aae4506fa 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -560,3 +560,4 @@ Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 Clist_SetGroupChildCheckboxes @581 Clist_RecalculateGroupCheckboxes @582 +Clist_GetFontSetting @583 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index c0b4f1bd1a..69d4f4aa02 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -560,3 +560,4 @@ Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 Clist_SetGroupChildCheckboxes @581 Clist_RecalculateGroupCheckboxes @582 +Clist_GetFontSetting @583 -- cgit v1.2.3