summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/m_clistint.h3
-rw-r--r--libs/win32/mir_app.libbin152584 -> 152828 bytes
-rw-r--r--libs/win64/mir_app.libbin147898 -> 148124 bytes
-rw-r--r--plugins/Clist_blind/src/clcpaint.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_clcpaint.cpp2
-rw-r--r--plugins/Clist_nicer/src/clcpaint.cpp2
-rw-r--r--src/core/stdclist/src/clcpaint.cpp2
-rw-r--r--src/mir_app/src/clc.h1
-rw-r--r--src/mir_app/src/clcutils.cpp4
-rw-r--r--src/mir_app/src/clistcore.cpp1
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
13 files changed, 11 insertions, 10 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 3e90a263f7..304c3ccc27 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -352,7 +352,7 @@ type
pfnBeginRenameSelection : procedure (hwnd:HWND; var dat:TClcData); cdecl;
pfnCalcEipPosition : procedure (var dat:TClcData; var contact:TClcContact; var group:TClcGroup; var result:TPOINT); cdecl;
pfnGetDropTargetInformation : function (hwnd:HWND; var dat:TClcData; pt:TPOINT):int; cdecl;
- pfnClcStatusToPf2 : function (status:int):int; cdecl;
+ blablablabla12 : procedure; cdecl;
blablablabla11 : procedure; cdecl;
blablablabla10 : procedure; cdecl;
blablablabla9 : procedure; cdecl;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 91c321eef5..ce55efb849 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -253,6 +253,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lP
EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);
EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);
+EXTERN_C MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status);
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);
@@ -367,7 +368,7 @@ struct CLIST_INTERFACE
void (*pfnBeginRenameSelection)(HWND hwnd, ClcData *dat);
void (*pfnCalcEipPosition)(ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);
int (*pfnGetDropTargetInformation)(HWND hwnd, ClcData *dat, POINT pt);
- int (*pfnClcStatusToPf2)(int status);
+ void (*blablablabla12)();
void (*blablablabla11)();
void (*blablablabla10)();
void (*blablablabla9)();
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 89bcba0808..59cfd96df3 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 10e21318f8..cdf56b01b8 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp
index f8992a8f96..26bc796c49 100644
--- a/plugins/Clist_blind/src/clcpaint.cpp
+++ b/plugins/Clist_blind/src/clcpaint.cpp
@@ -152,7 +152,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
// yes I know about GetSysColorBrush()
COLORREF tmpbkcolour = style & CLS_CONTACTLIST ? (dat->bUseWindowsColours ? GetSysColor(COLOR_3DFACE) : dat->bkColour) : dat->bkColour;
- if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(status) || style & WS_DISABLED)
+ if (dat->greyoutFlags & Clist_ClcStatusToPf2(status) || style & WS_DISABLED)
grey = 1;
else if (GetFocus() != hwnd && dat->greyoutFlags & GREYF_UNFOCUS)
grey = 1;
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index c3208bfd1e..6f33458f9d 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -1517,7 +1517,7 @@ int CLCPaint::_DetermineDrawMode(HWND hWnd, ClcData *dat)
LONG lStyle = GetWindowLongPtr(hWnd, GWL_STYLE);
int nStatus = _GetGeneralisedStatus();
- if ((lStyle & WS_DISABLED) || (dat->greyoutFlags & pcli->pfnClcStatusToPf2(nStatus)) || ((dat->greyoutFlags & GREYF_UNFOCUS) && (GetFocus() != hWnd)))
+ if ((lStyle & WS_DISABLED) || (dat->greyoutFlags & Clist_ClcStatusToPf2(nStatus)) || ((dat->greyoutFlags & GREYF_UNFOCUS) && (GetFocus() != hWnd)))
paintMode |= DM_GRAY;
if (lStyle&CLS_GREYALTERNATE)
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index b95a9d2a19..a2476af09e 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -1295,7 +1295,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint)
g_center = db_get_b(NULL, "CLCExt", "EXBK_CenterGroupnames", 0) && !dat->bisEmbedded;
g_ignoreselforgroups = db_get_b(NULL, "CLC", "IgnoreSelforGroups", 0);
- if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(my_status) || style & WS_DISABLED)
+ if (dat->greyoutFlags & Clist_ClcStatusToPf2(my_status) || style & WS_DISABLED)
grey = 1;
else if (GetFocus() != hwnd && dat->greyoutFlags & GREYF_UNFOCUS)
grey = 1;
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index e95fca2fa7..03a927d63d 100644
--- a/src/core/stdclist/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
@@ -153,7 +153,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
dat->rowHeight = minHeight;
int grey;
- if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(status) || style & WS_DISABLED)
+ if (dat->greyoutFlags & Clist_ClcStatusToPf2(status) || style & WS_DISABLED)
grey = 1;
else if (GetFocus() != hwnd && dat->greyoutFlags & GREYF_UNFOCUS)
grey = 1;
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 66d574496c..79c4213627 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -88,7 +88,6 @@ void fnDeleteFromContactList(HWND hwnd, struct ClcData *dat);
void fnBeginRenameSelection(HWND hwnd, struct ClcData *dat);
void fnCalcEipPosition(struct ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);
int fnGetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt);
-int fnClcStatusToPf2(int status);
void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour);
void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 02fe60392c..155b3c7588 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -613,7 +613,7 @@ int fnGetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt)
return DROPTARGET_ONCONTACT;
}
-int fnClcStatusToPf2(int status)
+MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status)
{
switch(status) {
case ID_STATUS_ONLINE: return PF2_ONLINE;
@@ -632,7 +632,7 @@ int fnClcStatusToPf2(int status)
MIR_APP_DLL(int) Clist_IsHiddenMode(ClcData *dat, int status)
{
- return dat->offlineModes & cli.pfnClcStatusToPf2(status);
+ return dat->offlineModes & Clist_ClcStatusToPf2(status);
}
MIR_APP_DLL(void) Clist_HideInfoTip(ClcData *dat)
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index a54dc5bf21..42648aea79 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -105,7 +105,6 @@ void InitClistCore()
cli.pfnBeginRenameSelection = fnBeginRenameSelection;
cli.pfnCalcEipPosition = fnCalcEipPosition;
cli.pfnGetDropTargetInformation = fnGetDropTargetInformation;
- cli.pfnClcStatusToPf2 = fnClcStatusToPf2;
cli.pfnIsVisibleContact = fnIsVisibleContact;
cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 5044329303..2c91557298 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -565,3 +565,4 @@ Clist_GetDefaultExStyle @584
Clist_NotifyNewContact @585
Clist_HideInfoTip @586
Clist_IsHiddenMode @587
+Clist_ClcStatusToPf2 @588
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 204cefa262..9b43a20b1f 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -565,3 +565,4 @@ Clist_GetDefaultExStyle @584
Clist_NotifyNewContact @585
Clist_HideInfoTip @586
Clist_IsHiddenMode @587
+Clist_ClcStatusToPf2 @588
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 19:05:07 +0000