summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Clist_modern')
-rw-r--r--plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp60
-rw-r--r--plugins/Clist_modern/src/CLUIFrames/cluiframes.h2
-rw-r--r--plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp2
-rw-r--r--plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp44
-rw-r--r--plugins/Clist_modern/src/hdr/modern_clc.h4
-rw-r--r--plugins/Clist_modern/src/hdr/modern_commonheaders.h4
-rw-r--r--plugins/Clist_modern/src/hdr/modern_commonprototypes.h38
-rw-r--r--plugins/Clist_modern/src/hdr/modern_skinengine.h2
-rw-r--r--plugins/Clist_modern/src/hdr/modern_static_clui.h6
-rw-r--r--plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h88
-rw-r--r--plugins/Clist_modern/src/modern_aniavatars.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp25
-rw-r--r--plugins/Clist_modern/src/modern_clcmsgs.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_clistmenus.cpp4
-rw-r--r--plugins/Clist_modern/src/modern_clistmod.cpp20
-rw-r--r--plugins/Clist_modern/src/modern_clistsettings.cpp10
-rw-r--r--plugins/Clist_modern/src/modern_clisttray.cpp18
-rw-r--r--plugins/Clist_modern/src/modern_clui.cpp26
-rw-r--r--plugins/Clist_modern/src/modern_cluiservices.cpp4
-rw-r--r--plugins/Clist_modern/src/modern_contact.cpp6
-rw-r--r--plugins/Clist_modern/src/modern_docking.cpp4
-rw-r--r--plugins/Clist_modern/src/modern_gettextasync.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_keyboard.cpp4
-rw-r--r--plugins/Clist_modern/src/modern_skinengine.cpp10
-rw-r--r--plugins/Clist_modern/src/modern_statusbar.cpp4
25 files changed, 192 insertions, 199 deletions
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 935dca24d4..3b2ed38cb0 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -52,7 +52,7 @@ enum {
enum { eUnknownId = -1 };
-static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam);
+static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam);
static int CLUIFrameResizeFloatingFrame( int framepos );
static HWND CreateSubContainerWindow( HWND parent,int x,int y,int width,int height );
static BOOL CLUIFramesFitInSize();
@@ -979,7 +979,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGEN
return 0;
}
-static int ModifyMItem(WPARAM wParam,LPARAM lParam)
+static int ModifyMItem(WPARAM wParam, LPARAM lParam)
{
if ((int)wParam == -1 ) return 0; // FIXME
@@ -987,7 +987,7 @@ static int ModifyMItem(WPARAM wParam,LPARAM lParam)
};
-static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam)
+static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam, LPARAM lParam)
{
/* HOOK */
if (MirandaExiting()) return 0;
@@ -1038,7 +1038,7 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam)
return 0;
}
-static int CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam)
+static int CLUIFramesModifyMainMenuItems(WPARAM wParam, LPARAM lParam)
{
//hiword(wParam) = frameid,loword(wParam) = flag
if (_fCluiFramesModuleNotStarted) return -1;
@@ -1092,7 +1092,7 @@ static int CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam)
}
-static INT_PTR _us_DoGetFrameOptions(WPARAM wParam,LPARAM lParam)
+static INT_PTR _us_DoGetFrameOptions(WPARAM wParam, LPARAM lParam)
{
INT_PTR retval;
BOOL bUnicodeText = (LOWORD(wParam) & FO_UNICODETEXT) != 0;
@@ -1182,7 +1182,7 @@ static int UpdateTBToolTip(int framepos)
}
//hiword(wParam) = frameid,loword(wParam) = flag
-static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam)
+static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam)
{
int retval; // value to be returned
BOOL bUnicodeText = (LOWORD(wParam) & FO_UNICODETEXT) != 0;
@@ -1351,7 +1351,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam)
}
//wparam = lparam = 0
-static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam)
+static int _us_DoShowAllFrames(WPARAM wParam, LPARAM lParam)
{
int i;
@@ -1364,7 +1364,7 @@ static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam)
}
//wparam = lparam = 0
-static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam)
+static int _us_DoShowTitles(WPARAM wParam, LPARAM lParam)
{
int i;
@@ -1377,7 +1377,7 @@ static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam)
}
//wparam = lparam = 0
-static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam)
+static int _us_DoHideTitles(WPARAM wParam, LPARAM lParam)
{
int i;
@@ -1390,7 +1390,7 @@ static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam)
}
//wparam = frameid
-static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted)
return -1;
@@ -1418,7 +1418,7 @@ static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam)
}
//wparam = frameid
-static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam)
+static int _us_DoShowHideFrameTitle(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted)
return -1;
@@ -1433,7 +1433,7 @@ static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam)
//wparam = frameid
//lparam = -1 up ,1 down
-static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoMoveFrame(WPARAM wParam, LPARAM lParam)
{
int i,curpos,curalign,v,tmpval;
@@ -1488,19 +1488,19 @@ static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam)
return 0;
}
-static int _us_DoMoveFrameUp(WPARAM wParam,LPARAM lParam)
+static int _us_DoMoveFrameUp(WPARAM wParam, LPARAM lParam)
{
return CLUIFrames_MoveFrame(wParam,(LPARAM)+1);
}
-static int _us_DoMoveFrameDown(WPARAM wParam,LPARAM lParam)
+static int _us_DoMoveFrameDown(WPARAM wParam, LPARAM lParam)
{
return CLUIFrames_MoveFrame(wParam,(LPARAM)-1);
}
//wparam = frameid
//lparam = alignment
-static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam)
+static int _us_DoSetFrameAlign(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
@@ -1509,21 +1509,21 @@ static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam)
return 0;
}
-static int _us_DoAlignFrameTop(WPARAM wParam,LPARAM lParam)
+static int _us_DoAlignFrameTop(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
return CLUIFrames_SetFrameAlign(wParam,alTop);
}
-static int _us_DoAlignFrameBottom(WPARAM wParam,LPARAM lParam)
+static int _us_DoAlignFrameBottom(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
return CLUIFrames_SetFrameAlign(wParam,alBottom);
}
-static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam)
+static int _us_DoAlignFrameClient(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
@@ -1531,7 +1531,7 @@ static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam)
}
//wparam = frameid
-static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoLockFrame(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
@@ -1545,7 +1545,7 @@ static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam)
}
//wparam = frameid
-static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam)
+static int _us_DoSetFrameBorder(WPARAM wParam, LPARAM lParam)
{
RECT rc;
int oldflags;
@@ -1571,7 +1571,7 @@ static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam)
}
//wparam = frameid
-static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam)
{
int FrameId;
@@ -1776,7 +1776,7 @@ static HFONT CLUILoadTitleBarFont()
//wparam = (CLISTFrame*)clfrm
-static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoAddFrame(WPARAM wParam, LPARAM lParam)
{
int style,retval;
//char * CustomName = NULL;
@@ -1947,7 +1947,7 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam)
return retval;
}
-static int _us_DoRemoveFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoRemoveFrame(WPARAM wParam, LPARAM lParam)
{
int pos;
if (_fCluiFramesModuleNotStarted) return -1;
@@ -2369,7 +2369,7 @@ int CLUIFrames_ApplyNewSizes(int mode)
return 0;
}
-static int _us_DoUpdateFrame(WPARAM wParam,LPARAM lParam)
+static int _us_DoUpdateFrame(WPARAM wParam, LPARAM lParam)
{
if (_fCluiFramesModuleNotStarted) return -1;
if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0;}
@@ -2538,7 +2538,7 @@ int CheckFramesPos(RECT *wr)
return 0;
}
-int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam)
+int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam)
{
RECT nRect;
int tick;
@@ -2639,7 +2639,7 @@ int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam)
return 0;
}
-int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam)
+int OnFrameTitleBarBackgroundChange(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting()) return 0;
{
@@ -3389,7 +3389,7 @@ static int CLUIFrameResizeFloatingFrame(int framepos)
return 0;
};
-static int CLUIFrameOnMainMenuBuild(WPARAM wParam,LPARAM lParam)
+static int CLUIFrameOnMainMenuBuild(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting()) return 0;
CLUIFramesLoadMainMenu();
@@ -3668,7 +3668,7 @@ static HWND CreateContainerWindow(HWND parent,int x,int y,int width,int height)
};
-static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam)
+static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam)
{
HWND hwndtmp,hwndtooltiptmp;
@@ -3785,7 +3785,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam)
return 0;
}
-int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam)
+int CLUIFrameOnModulesLoad(WPARAM wParam, LPARAM lParam)
{
/* HOOK */
CLUIFramesLoadMainMenu();
@@ -3793,7 +3793,7 @@ int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam)
return 0;
}
-int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam)
+int CLUIFrameOnModulesUnload(WPARAM wParam, LPARAM lParam)
{
g_CluiData.bSTATE = STATE_PREPEARETOEXIT;
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h
index 4e9f831250..d437c8ae03 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
int LoadCLUIFramesModule(void);
int UnLoadCLUIFramesModule(void);
int CLUIFramesGetMinHeight();
-int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam);
+int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam);
int CLUIFrames_GetTotalHeight();
typedef struct tagProtocolData {
diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
index 46b17483e0..d500d29286 100644
--- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
@@ -89,7 +89,7 @@ static INT_PTR ContextFrameMenuNotify(WPARAM wParam, LPARAM lParam)
return 0;
}
-static INT_PTR BuildContextFrameMenu(WPARAM wParam,LPARAM lParam)
+static INT_PTR BuildContextFrameMenu(WPARAM wParam, LPARAM lParam)
{
ListParam param = { 0 };
param.MenuObjectHandle = hFrameMenuObject;
diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index 5773392e1a..a09df84b28 100644
--- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -57,14 +57,14 @@ typedef struct
wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM
return 0 on success.
*/
-static INT_PTR RemoveGroupMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR RemoveGroupMenuItem(WPARAM wParam, LPARAM lParam)
{
CallService(MO_REMOVEMENUITEM,wParam,0);
return 0;
}
-INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam)
+INT_PTR BuildGroupMenu(WPARAM wParam, LPARAM lParam)
{
ListParam param = { 0 };
param.MenuObjectHandle = hGroupMenuObject;
@@ -82,7 +82,7 @@ INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam)
return (INT_PTR)hMenu;
}
-static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam)
{
TMO_MenuItem tmi;
CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;
@@ -114,12 +114,12 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)
return (INT_PTR)op.Handle;
}
-int GroupMenuCheckService(WPARAM wParam,LPARAM lParam) {
+int GroupMenuCheckService(WPARAM wParam, LPARAM lParam) {
//not used
return 0;
};
-INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) {
+INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam) {
MENUITEMINFO *mii = (MENUITEMINFO* )wParam;
if (mii == NULL)
@@ -146,7 +146,7 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) {
//called with:
//wparam - ownerdata
//lparam - lparam from winproc
-INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam)
+INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam)
{
if (wParam != 0) {
lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
@@ -160,7 +160,7 @@ INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam)
return 1;
}
-INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam,LPARAM lParam)
+INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam, LPARAM lParam)
{
lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)lParam;
if (mmep != NULL) {
@@ -171,7 +171,7 @@ INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)
+INT_PTR HideGroupsHelper(WPARAM wParam, LPARAM lParam)
{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS);
db_set_b(NULL,"CList","HideEmptyGroups",(BYTE)newVal);
@@ -179,7 +179,7 @@ INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)
+INT_PTR UseGroupsHelper(WPARAM wParam, LPARAM lParam)
{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
db_set_b(NULL,"CList","UseGroups",(BYTE)newVal);
@@ -187,7 +187,7 @@ INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR HideOfflineRootHelper(WPARAM wParam,LPARAM lParam)
+INT_PTR HideOfflineRootHelper(WPARAM wParam, LPARAM lParam)
{
SendMessage(
(HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0),
@@ -197,7 +197,7 @@ INT_PTR HideOfflineRootHelper(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR CreateGroupHelper(WPARAM wParam,LPARAM lParam)
+INT_PTR CreateGroupHelper(WPARAM wParam, LPARAM lParam)
{
SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETHIDEEMPTYGROUPS, 0, 0);
SendMessage((HWND)CallService(MS_CLUI_GETHWNDTREE, 0, 0), CLM_SETUSEGROUPS, 1, 0);
@@ -205,7 +205,7 @@ INT_PTR CreateGroupHelper(WPARAM wParam,LPARAM lParam)
return 0;
};
-static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)
+static int OnBuildGroupMenu(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting()) return 0;
@@ -226,7 +226,7 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)
static IconItem iconItem = { "New Group", "NewGroup", IDI_NEWGROUP2 };
-int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam)
+int static OnIconLibIconChanged(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting()) return 0;
@@ -371,13 +371,13 @@ int Param1,Param2;
wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM
return 0 on success.
*/
-static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam, LPARAM lParam)
{
CallService(MO_REMOVEMENUITEM,wParam,0);
return 0;
}
-static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam)
+static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM lParam)
{
BOOL gray1 = FALSE;
BOOL gray2 = FALSE;
@@ -404,7 +404,7 @@ static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR BuildSubGroupMenu(WPARAM wParam,LPARAM lParam)
+INT_PTR BuildSubGroupMenu(WPARAM wParam, LPARAM lParam)
{
ListParam param = { 0 };
param.MenuObjectHandle = hSubGroupMenuObject;
@@ -430,7 +430,7 @@ HMENU cliBuildGroupPopupMenu(ClcGroup *group)
return (HMENU)CallService(MS_CLIST_MENUBUILDSUBGROUP,(WPARAM)group,0);
}
-static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam)
{
TMO_MenuItem tmi;
CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;
@@ -462,7 +462,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
return (INT_PTR)op.Handle;
}
-INT_PTR SubGroupMenuCheckService(WPARAM wParam,LPARAM lParam)
+INT_PTR SubGroupMenuCheckService(WPARAM wParam, LPARAM lParam)
{
TCheckProcParam * CParam = (TCheckProcParam*)wParam;
if (CParam) {
@@ -473,7 +473,7 @@ INT_PTR SubGroupMenuCheckService(WPARAM wParam,LPARAM lParam)
return 1;
}
-INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam)
+INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM lParam)
{
MENUITEMINFO *mii = (MENUITEMINFO* )wParam;
if (mii == NULL)
@@ -485,7 +485,7 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam)
//called with:
//wparam - ownerdata
//lparam - lparam from winproc
-INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam)
+INT_PTR SubGroupMenuExecService(WPARAM wParam, LPARAM lParam)
{
if (wParam != 0) {
lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
@@ -499,7 +499,7 @@ INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam)
return 1;
}
-INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam)
+INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam, LPARAM lParam)
{
lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam;
if (mmep != NULL){
@@ -512,7 +512,7 @@ INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam)
//wparam menu handle to pass to clc.c
//lparam WM_COMMAND HWND
-INT_PTR GroupMenuExecProxy(WPARAM wParam,LPARAM lParam)
+INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam)
{
SendMessage(lParam?(HWND)lParam:(HWND)pcli->hwndContactTree,WM_COMMAND,wParam,0);
return 0;
diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index 5cffd61852..c9cc59fd75 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -413,7 +413,7 @@ void cli_SortCLC(HWND hwnd,ClcData *dat,int useInsertionSort);
int GetNewSelection(ClcGroup *group,int selection, int direction);
//clcmsgs.c
-LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);
+LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam, LPARAM lParam);
//clcutils.c
void cliRecalcScrollBar(HWND hwnd,ClcData *dat);
@@ -428,7 +428,7 @@ void LoadCLCOptions(HWND hwnd,ClcData *dat);
void CLCPaint_cliPaintClc(HWND hwnd,ClcData *dat,HDC hdc,RECT *rcPaint);
//clcopts.c
-int ClcOptInit(WPARAM wParam,LPARAM lParam);
+int ClcOptInit(WPARAM wParam, LPARAM lParam);
DWORD GetDefaultExStyle(void);
void GetFontSetting(int i,LOGFONT *lf,COLORREF *colour,BYTE *effect, COLORREF *eColour1,COLORREF *eColour2);
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 320010f101..3e1f3bfec6 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -62,8 +62,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TRACET(str)
#endif
-#define SERVICE(serviceproc) static INT_PTR serviceproc(WPARAM wParam,LPARAM lParam)
-#define EVENTHOOK(eventhookproc) static int eventhookproc(WPARAM wParam,LPARAM lParam)
+#define SERVICE(serviceproc) static INT_PTR serviceproc(WPARAM wParam, LPARAM lParam)
+#define EVENTHOOK(eventhookproc) static int eventhookproc(WPARAM wParam, LPARAM lParam)
#define CLINTERFACE static
#include <windows.h>
diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index e6998c3a95..4d2c7d4cb7 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -102,7 +102,7 @@ HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName, char * sz
void CLUI_UpdateAeroGlass();
void CLUI_ChangeWindowMode();
BOOL CLUI_CheckOwnedByClui(HWND hwnd);
-INT_PTR CLUI_GetConnectingIconService(WPARAM wParam,LPARAM lParam);
+INT_PTR CLUI_GetConnectingIconService(WPARAM wParam, LPARAM lParam);
int CLUI_HideBehindEdge();
int CLUI_IconsChanged(WPARAM,LPARAM);
int CLUI_IsInMainWindow(HWND hwnd);
@@ -118,7 +118,7 @@ void CLUI_UpdateLayeredMode();
UINT_PTR CLUI_SafeSetTimer(HWND hwnd, int ID, int Timeout, TIMERPROC proc);
/* CLUIServices */
-int CLUIUnreadEmailCountChanged(WPARAM wParam,LPARAM lParam);
+int CLUIUnreadEmailCountChanged(WPARAM wParam, LPARAM lParam);
/* GDIPlus */
BOOL GDIPlus_AlphaBlend(HDC hdcDest,int nXOriginDest,int nYOriginDest,int nWidthDest,int nHeightDest,HDC hdcSrc,int nXOriginSrc,int nYOriginSrc,int nWidthSrc,int nHeightSrc, BLENDFUNCTION * blendFunction);
@@ -165,7 +165,7 @@ int ske_ReCreateBackImage(BOOL Erase,RECT *w);
int ske_RedrawCompleteWindow();
bool ske_ResetTextEffect(HDC);
bool ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);
-INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);
+INT_PTR ske_Service_DrawGlyph(WPARAM wParam, LPARAM lParam);
BOOL ske_SetRectOpaque(HDC memdc,RECT *fr, BOOL force = FALSE );
BOOL ske_SetRgnOpaque(HDC memdc,HRGN hrgn, BOOL force = FALSE );
BOOL ske_TextOut(HDC hdc, int x, int y, LPCTSTR lpString, int nCount);
@@ -182,12 +182,12 @@ __forceinline BOOL ske_DrawTextA(HDC hdc, char *lpString, int nCount, RECT *lpRe
/* CLUIFrames.c PROXIED */
int CLUIFrames_ActivateSubContainers(BOOL wParam);
-int CLUIFrames_OnClistResize_mod(WPARAM wParam,LPARAM lParam);
+int CLUIFrames_OnClistResize_mod(WPARAM wParam, LPARAM lParam);
int CLUIFrames_OnMoving( HWND, RECT *);
int CLUIFrames_OnShowHide( HWND hwnd, int mode );
int CLUIFrames_SetLayeredMode( BOOL fLayeredMode, HWND hwnd );
int CLUIFrames_SetParentForContainers( HWND parent );
-int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam);
+int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam);
FRAMEWND * FindFrameByItsHWND(HWND FrameHwnd); //cluiframes.c
@@ -199,7 +199,7 @@ int SetAlpha(BYTE Alpha);
/* others TODO: move above */
-int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam);
+int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam);
void DrawBackGround(HWND hwnd,HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColour, DWORD backgroundBmpUse );
HRESULT BackgroundsLoadModule();
int BackgroundsUnloadModule();
@@ -215,7 +215,7 @@ DWORD mod_CalcHash(const char * a); /
HICON cliGetIconFromStatusMode(MCONTACT hContact, const char *szProto,int status); //clistmod.c
HICON GetMainStatusOverlay(int STATUS); //clc.c
int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szStatus, ClcData *dat); //clcitems.c
-int BgStatusBarChange(WPARAM wParam,LPARAM lParam); //clcopts.c
+int BgStatusBarChange(WPARAM wParam, LPARAM lParam); //clcopts.c
int ClcDoProtoAck(MCONTACT wParam, ACKDATA *ack); //clc.c
int ModernSkinButtonDeleteAll(); //modernbutton.c
int GetContactCachedStatus(MCONTACT hContact); //clistsettings.c
@@ -226,10 +226,10 @@ int InitCustomMenus(void); //
int InitFramesMenus(void); //framesmenus.c
int LoadMoveToGroup(); //movetogroup.c
int LoadStatusBarData(); //modern_statusbar.c
-int MenuModulesLoaded(WPARAM wParam,LPARAM lParam); //clistmenu.c
-int MenuModulesShutdown(WPARAM wParam,LPARAM lParam); //clistmenu.c
-int MenuProcessCommand(WPARAM wParam,LPARAM lParam); //clistmenu.c
-int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam); //cluiframes.c
+int MenuModulesLoaded(WPARAM wParam, LPARAM lParam); //clistmenu.c
+int MenuModulesShutdown(WPARAM wParam, LPARAM lParam); //clistmenu.c
+int MenuProcessCommand(WPARAM wParam, LPARAM lParam); //clistmenu.c
+int OnFrameTitleBarBackgroundChange(WPARAM wParam, LPARAM lParam); //cluiframes.c
int QueueAllFramesUpdating (BYTE); //cluiframes.c
int RecursiveDeleteMenu(HMENU hMenu); //clistmenus.c
int ModernSkinButtonRedrawAll(HDC hdc); //modern_button.c
@@ -238,10 +238,10 @@ int RestoreAllContactData(ClcData *dat); //c
int SkinSelector_DeleteMask(MODERNMASK *mm); //mod_skin_selector.c
int StoreAllContactData(ClcData *dat); //cache_func.c
-INT_PTR ToggleHideOffline(WPARAM wParam,LPARAM lParam); //contact.c
-INT_PTR ToggleGroups(WPARAM wParam,LPARAM lParam); //contact.c
-INT_PTR SetUseGroups(WPARAM wParam,LPARAM lParam); //contact.c
-INT_PTR ToggleSounds(WPARAM wParam,LPARAM lParam); //contact.c
+INT_PTR ToggleHideOffline(WPARAM wParam, LPARAM lParam); //contact.c
+INT_PTR ToggleGroups(WPARAM wParam, LPARAM lParam); //contact.c
+INT_PTR SetUseGroups(WPARAM wParam, LPARAM lParam); //contact.c
+INT_PTR ToggleSounds(WPARAM wParam, LPARAM lParam); //contact.c
void ClcOptionsChanged(); //clc.c
void Docking_GetMonitorRectFromWindow(HWND hWnd,RECT *rc); //Docking.c
void DrawAvatarImageWithGDIp(HDC hDestDC,int x, int y, DWORD width, DWORD height, HBITMAP hbmp, int x1, int y1, DWORD width1, DWORD height1,DWORD flag,BYTE alpha); //gdiplus.cpp
@@ -290,23 +290,23 @@ void cli_FreeContact( ClcContact* );
void cli_FreeGroup( ClcGroup* );
char* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact);
void cli_ChangeContactIcon(MCONTACT hContact,int iIcon,int add);
-LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);
+LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam, LPARAM lParam);
struct CListEvent* cliCreateEvent( void );
struct CListEvent* cli_AddEvent(CLISTEVENT *cle);
LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-int cliShowHide(WPARAM wParam,LPARAM lParam);
+int cliShowHide(WPARAM wParam, LPARAM lParam);
BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );
int cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2);
int cliFindItem(HWND hwnd, ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
int cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);
-int cliTrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam);
+int cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);
void cliCluiProtocolStatusChanged(int status,const char * proto);
HMENU cliBuildGroupPopupMenu(ClcGroup *group);
void cliInvalidateDisplayNameCacheEntry(MCONTACT hContact);
void cliCheckCacheItem(ClcCacheEntry *pdnce);
void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
void CLUI_cli_LoadCluiGlobalOpts(void);
-INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam);
+INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);
BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );
ClcContact* cliCreateClcContact( void );
diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
index 7811be127c..f920ba6072 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h
@@ -139,7 +139,7 @@ private:
int ske_UnloadSkin(SKINOBJECTSLIST * Skin);
int ske_AddDescriptorToSkinObjectList (SKINOBJECTDESCRIPTOR *lpDescr, SKINOBJECTSLIST* Skin);
-INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);
+INT_PTR ske_Service_DrawGlyph(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index c57e9b408d..b381ba1d55 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -58,14 +58,14 @@ int ClcUnloadModule();
int ClcGetShortData(ClcData* pData, struct SHORTDATA *pShortData);
int ClcEnterDragToScroll(HWND hwnd, int Y);
-int CListMod_ContactListShutdownProc(WPARAM wParam,LPARAM lParam);
+int CListMod_ContactListShutdownProc(WPARAM wParam, LPARAM lParam);
int CListMod_HideWindow(HWND hwndContactList, int mode);
int CListSettings_GetCopyFromCache(ClcCacheEntry *pDest, DWORD flag);
int CListSettings_SetToCache(ClcCacheEntry *pSrc, DWORD flag);
int CLUIServices_LoadModule(void);
-INT_PTR CLUIServices_SortList(WPARAM wParam,LPARAM lParam);
+INT_PTR CLUIServices_SortList(WPARAM wParam, LPARAM lParam);
void Docking_GetMonitorRectFromWindow(HWND hWnd,RECT *rc);
@@ -100,7 +100,7 @@ int CLUI_SizingOnBorder(POINT pt, int size);
int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam);
int CLUI_TestCursorOnBorders();
-static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam,LPARAM lParam);
+static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam, LPARAM lParam);
static int CLUI_SmoothAlphaThreadTransition(HWND hwnd);
/* structs */
diff --git a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
index 7bfd947ced..fdcbe3192b 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
@@ -4,28 +4,28 @@
// TO BE INCLUDED ONLY TO modern_cluiframes.cpp
//////////////////////////////////////////////////////////////////////////
-static int _us_DoSetFramePaintProc(WPARAM wParam,LPARAM lParam);
-static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoRemoveFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam);
-static INT_PTR _us_DoGetFrameOptions(WPARAM wParam,LPARAM lParam);
-static int _us_DoUpdateFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam);
-static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam);
-static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam);
-static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam);
-static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam);
-static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam);
-static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam);
-static int _us_DoMoveFrameUp(WPARAM wParam,LPARAM lParam);
-static int _us_DoMoveFrameDown(WPARAM wParam,LPARAM lParam);
-static int _us_DoAlignFrameTop(WPARAM wParam,LPARAM lParam);
-static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam);
-static int _us_DoAlignFrameBottom(WPARAM wParam,LPARAM lParam);
-static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam);
+static int _us_DoSetFramePaintProc(WPARAM wParam, LPARAM lParam);
+static int _us_DoAddFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoRemoveFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam);
+static INT_PTR _us_DoGetFrameOptions(WPARAM wParam, LPARAM lParam);
+static int _us_DoUpdateFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoShowHideFrameTitle(WPARAM wParam, LPARAM lParam);
+static int _us_DoShowTitles(WPARAM wParam, LPARAM lParam);
+static int _us_DoHideTitles(WPARAM wParam, LPARAM lParam);
+static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoShowAllFrames(WPARAM wParam, LPARAM lParam);
+static int _us_DoLockFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoSetFrameBorder(WPARAM wParam, LPARAM lParam);
+static int _us_DoSetFrameAlign(WPARAM wParam, LPARAM lParam);
+static int _us_DoMoveFrame(WPARAM wParam, LPARAM lParam);
+static int _us_DoMoveFrameUp(WPARAM wParam, LPARAM lParam);
+static int _us_DoMoveFrameDown(WPARAM wParam, LPARAM lParam);
+static int _us_DoAlignFrameTop(WPARAM wParam, LPARAM lParam);
+static int _us_DoAlignFrameClient(WPARAM wParam, LPARAM lParam);
+static int _us_DoAlignFrameBottom(WPARAM wParam, LPARAM lParam);
+static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam);
enum {
CFM_FIRST_MGS= WM_USER + 0x2FF,
@@ -92,70 +92,70 @@ BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND hwnd, UINT msg, WPARAM wParam, LP
return TRUE;
}
-static INT_PTR CLUIFrames_SetFramePaintProc(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_SetFramePaintProc(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEPAINTPROC, wParam,lParam) : 0; }
-static INT_PTR CLUIFrames_AddFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_AddFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ADDFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_RemoveFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_RemoveFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_REMOVEFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_SetFrameOptions(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_SetFrameOptions(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_GetFrameOptions(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_GetFrameOptions(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_UpdateFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_UpdateFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_UPDATEFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_ShowHideFrameTitle(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_ShowHideFrameTitle(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_ShowTitles(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_ShowTitles(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWTITLES, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_HideTitles(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_HideTitles(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_HIDETITLES, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_ShowHideFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_ShowHideFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_ShowAllFrames(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_ShowAllFrames(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWALL, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_LockFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_LockFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_LOCKFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_CollapseFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_CollapseFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_SetFrameBorder(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_SetFrameBorder(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_SetFrameAlign(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_SetFrameAlign(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_MoveFrame(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_MoveFrame(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAME, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_MoveFrameUp(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_MoveFrameUp(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_MoveFrameDown(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_MoveFrameDown(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_AlignFrameTop(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_AlignFrameTop(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_AlignFrameClient(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_AlignFrameClient(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_AlignFrameBottom(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_AlignFrameBottom(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam) : 0; }
-static INT_PTR CLUIFrames_SetFrameFloat(WPARAM wParam,LPARAM lParam)
+static INT_PTR CLUIFrames_SetFrameFloat(WPARAM wParam, LPARAM lParam)
{ return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam) : 0; }
static void CreateCluiFramesServices()
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 03bd11a014..249a67f0ab 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -170,7 +170,7 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
/// IMPLEMENTATION
-int _AniAva_OnModulesUnload(WPARAM wParam,LPARAM lParam)
+int _AniAva_OnModulesUnload(WPARAM wParam, LPARAM lParam)
{
SetEvent(s_hExitEvent);
return 0;
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index ac75da25a4..74817ffe3f 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "m_modernopt.h"
-int ModernOptInit(WPARAM wParam,LPARAM lParam);
-int ModernSkinOptInit(WPARAM wParam,LPARAM lParam);
+int ModernOptInit(WPARAM wParam, LPARAM lParam);
+int ModernSkinOptInit(WPARAM wParam, LPARAM lParam);
/*
* Private module variables
@@ -57,9 +57,9 @@ static ClcContact *hitcontact = NULL;
HANDLE hSkinFolder;
TCHAR SkinsFolder[MAX_PATH];
-static int clcHookSmileyAddOptionsChanged(WPARAM wParam,LPARAM lParam);
+static int clcHookSmileyAddOptionsChanged(WPARAM wParam, LPARAM lParam);
static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam);
-static int clcHookBkgndConfigChanged(WPARAM wParam,LPARAM lParam);
+static int clcHookBkgndConfigChanged(WPARAM wParam, LPARAM lParam);
static int clcProceedDragToScroll(HWND hwnd, int Y);
static int clcExitDragToScroll();
@@ -152,7 +152,7 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
return 0;
}
-static int clcHookSmileyAddOptionsChanged(WPARAM wParam,LPARAM lParam)
+static int clcHookSmileyAddOptionsChanged(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting()) return 0;
pcli->pfnClcBroadcast( CLM_AUTOREBUILD, 0, 0);
@@ -194,7 +194,7 @@ static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam)
return 0;
}
-static int clcHookSettingChanged(WPARAM wParam,LPARAM lParam)
+static int clcHookSettingChanged(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting())
return 0;
@@ -267,7 +267,7 @@ static int clcHookSettingChanged(WPARAM wParam,LPARAM lParam)
return 0;
}
-static int clcHookDbEventAdded(WPARAM wParam,LPARAM lParam)
+static int clcHookDbEventAdded(WPARAM wParam, LPARAM lParam)
{
g_CluiData.t_now = time(NULL);
if (wParam && lParam) {
@@ -283,7 +283,7 @@ static int clcHookDbEventAdded(WPARAM wParam,LPARAM lParam)
return 0;
}
-static int clcHookBkgndConfigChanged(WPARAM wParam,LPARAM lParam)
+static int clcHookBkgndConfigChanged(WPARAM wParam, LPARAM lParam)
{
pcli->pfnClcOptionsChanged();
return 0;
@@ -1650,21 +1650,20 @@ static LRESULT clcOnIntmApparentModeChanged(ClcData *dat, HWND hwnd, UINT msg, W
return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnIntmStatusMsgChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmStatusMsgChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM hContact, LPARAM lParam)
{
ClcContact *contact;
- MCONTACT hContact = wParam;
if (hContact == NULL || IsHContactInfo(hContact) || IsHContactGroup(hContact))
- return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
+ return corecli.pfnContactListControlWndProc(hwnd, msg, hContact, lParam);
if (!FindItem(hwnd,dat,hContact,&contact,NULL,NULL,FALSE))
- return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
+ return corecli.pfnContactListControlWndProc(hwnd, msg, hContact, lParam);
if (contact)//!IsBadWritePtr(contact, sizeof(ClcContact)))
{
Cache_GetText(dat,contact,1);
cliRecalcScrollBar(hwnd,dat);
PostMessage(hwnd,INTM_INVALIDATE, 0, 0);
}
- return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
+ return corecli.pfnContactListControlWndProc(hwnd, msg, hContact, lParam);
}
static LRESULT clcOnIntmNotOnListChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index d048f249a5..910776628d 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//processing of all the CLM_ messages incoming
-LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
ClcGroup *group;
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index c93d4982cb..24f14b2b03 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -33,7 +33,7 @@ int UnloadFavoriteContactMenu();
#pragma hdrstop
-INT_PTR CloseAction(WPARAM wParam,LPARAM lParam)
+INT_PTR CloseAction(WPARAM wParam, LPARAM lParam)
{
int k;
g_CluiData.bSTATE = STATE_PREPEARETOEXIT; // workaround for avatar service and other wich destroys service on OK_TOEXIT
@@ -92,7 +92,7 @@ static IconItem iconList[] =
{ LPGEN("Contact rate High"), "Rate4", IDI_FAVORITE_3 }
};
-static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam)
+static int FAV_OnContactMenuBuild(WPARAM wParam, LPARAM lParam)
{
BYTE bContactRate = db_get_b(wParam, "CList", "Rate", 0);
if ( bContactRate > SIZEOF(rates)-1)
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 943fde598e..89fea99c57 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -34,17 +34,17 @@ int OnLoadLangpack(WPARAM, LPARAM);
int CListMod_HideWindow(HWND hwndContactList, int mode);
void GroupMenus_Init(void);
-int AddMainMenuItem(WPARAM wParam,LPARAM lParam);
-int AddContactMenuItem(WPARAM wParam,LPARAM lParam);
+int AddMainMenuItem(WPARAM wParam, LPARAM lParam);
+int AddContactMenuItem(WPARAM wParam, LPARAM lParam);
void UninitCListEvents(void);
-int ContactAdded(WPARAM wParam,LPARAM lParam);
-int GetContactDisplayName(WPARAM wParam,LPARAM lParam);
-int CListOptInit(WPARAM wParam,LPARAM lParam);
-int SkinOptInit(WPARAM wParam,LPARAM lParam);
-int ModernSkinOptInit(WPARAM wParam,LPARAM lParam);
+int ContactAdded(WPARAM wParam, LPARAM lParam);
+int GetContactDisplayName(WPARAM wParam, LPARAM lParam);
+int CListOptInit(WPARAM wParam, LPARAM lParam);
+int SkinOptInit(WPARAM wParam, LPARAM lParam);
+int ModernSkinOptInit(WPARAM wParam, LPARAM lParam);
int EventsProcessContactDoubleClick(MCONTACT hContact);
-INT_PTR TrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam);
+INT_PTR TrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);
void InitTrayMenus(void);
void UninitTrayMenu();
@@ -140,7 +140,7 @@ void UnLoadContactListModule() //unhooks noncritical events
UninitCustomMenus();
}
-int CListMod_ContactListShutdownProc(WPARAM wParam,LPARAM lParam)
+int CListMod_ContactListShutdownProc(WPARAM wParam, LPARAM lParam)
{
FreeDisplayNameCache();
return 0;
@@ -342,7 +342,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY)
BYTE g_bCalledFromShowHide = 0;
-int cliShowHide(WPARAM wParam,LPARAM lParam)
+int cliShowHide(WPARAM wParam, LPARAM lParam)
{
BOOL bShow = FALSE;
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 97b18e1b7b..5db5e9857f 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -414,19 +414,17 @@ int GetContactCachedStatus(MCONTACT hContact)
return pdnce___GetStatus( cacheEntry );
}
-int ContactAdded(WPARAM wParam,LPARAM lParam)
+int ContactAdded(WPARAM hContact, LPARAM lParam)
{
if (!MirandaExiting()) {
- MCONTACT hContact = wParam;
cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode((char*)GetContactCachedProtocol(hContact),ID_STATUS_OFFLINE,hContact),1); ///by FYR
pcli->pfnSortContacts();
}
return 0;
}
-int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
+int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
{
- MCONTACT hContact = wParam;
if (MirandaExiting() || !pcli || !clistCache || hContact == NULL)
return 0;
@@ -467,7 +465,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
if ((db_get_w(NULL,"CList","SecondLineType",0) == TEXT_STATUS_MESSAGE || db_get_w(NULL,"CList","ThirdLineType",0) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_cache_cszProto)
amRequestAwayMsg(hContact);
- pcli->pfnClcBroadcast(INTM_STATUSCHANGED, wParam, 0);
+ pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hContact, 0);
cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact), 0); //by FYR
pcli->pfnSortContacts();
}
@@ -494,7 +492,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
else if (!strcmp(cws->szSetting,"Hidden")) {
InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
- char *szProto = GetContactProto(wParam);
+ char *szProto = GetContactProto(hContact);
cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode(szProto,
szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE), hContact),1); //by FYR
}
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index 33be64eb1e..8a24bab33f 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_commonprototypes.h"
#include "hdr/modern_statusbar.h"
-int cliShowHide(WPARAM wParam,LPARAM lParam);
+int cliShowHide(WPARAM wParam, LPARAM lParam);
int g_mutex_bOnTrayRightClick = 0;
BOOL g_bMultiConnectionMode = FALSE;
@@ -286,7 +286,7 @@ static VOID CALLBACK TrayIconAutoHideTimer(HWND hwnd,UINT message,UINT_PTR idEve
SetProcessWorkingSetSize(GetCurrentProcess(),-1,-1);
}
-int cliTrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam)
+int cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam)
{
if ( db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT)) {
if (GetActiveWindow() != pcli->hwndContactList && GetWindow(GetParent(GetActiveWindow()),GW_OWNER) != pcli->hwndContactList) {
@@ -309,7 +309,7 @@ void DestroyTrayMenu(HMENU hMenu)
DestroyMenu(hMenu);
}
-INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
{
MSG *msg = (MSG*)wParam;
switch(msg->message) {
@@ -399,13 +399,13 @@ wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM
return 0 on success.
*/
-static INT_PTR RemoveTrayMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR RemoveTrayMenuItem(WPARAM wParam, LPARAM lParam)
{
CallService(MO_REMOVEMENUITEM,wParam,0);
return 0;
}
-static INT_PTR BuildTrayMenu(WPARAM wParam,LPARAM lParam)
+static INT_PTR BuildTrayMenu(WPARAM wParam, LPARAM lParam)
{
HMENU hMenu = CreatePopupMenu();
int tick = GetTickCount();
@@ -420,7 +420,7 @@ static INT_PTR BuildTrayMenu(WPARAM wParam,LPARAM lParam)
return (INT_PTR)hMenu;
}
-static INT_PTR AddTrayMenuItem(WPARAM wParam,LPARAM lParam)
+static INT_PTR AddTrayMenuItem(WPARAM wParam, LPARAM lParam)
{
CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;
@@ -445,7 +445,7 @@ static INT_PTR AddTrayMenuItem(WPARAM wParam,LPARAM lParam)
return (INT_PTR)op.Handle;
}
-INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam)
+INT_PTR TrayMenuonAddService(WPARAM wParam, LPARAM lParam)
{
MENUITEMINFO *mii = (MENUITEMINFO* )wParam;
if (mii == NULL)
@@ -474,7 +474,7 @@ INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam)
//called with:
//wparam - ownerdata
//lparam - lparam from winproc
-INT_PTR TrayMenuExecService(WPARAM wParam,LPARAM lParam)
+INT_PTR TrayMenuExecService(WPARAM wParam, LPARAM lParam)
{
if (wParam != 0) {
lpTrayMenuExecParam mmep = (lpTrayMenuExecParam)wParam;
@@ -487,7 +487,7 @@ INT_PTR TrayMenuExecService(WPARAM wParam,LPARAM lParam)
return(1);
}
-INT_PTR FreeOwnerDataTrayMenu(WPARAM wParam,LPARAM lParam)
+INT_PTR FreeOwnerDataTrayMenu(WPARAM wParam, LPARAM lParam)
{
lpTrayMenuExecParam mmep = (lpTrayMenuExecParam)lParam;
if (mmep != NULL) {
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 0887cff8b8..23c823c238 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -144,7 +144,7 @@ void CLUI::cliOnCreateClc(void)
m_pCLUI->CreateCluiFrames();
}
-int CLUI::OnEvent_ModulesLoaded(WPARAM wParam,LPARAM lParam)
+int CLUI::OnEvent_ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
g_CluiData.bMetaAvail = ServiceExists(MS_MC_GETDEFAULTCONTACT) ? TRUE : FALSE;
setlocale(LC_ALL, ""); //fix for case insensitive comparing
@@ -167,7 +167,7 @@ int CLUI::OnEvent_ModulesLoaded(WPARAM wParam,LPARAM lParam)
return 0;
}
-int CLUI::OnEvent_FontReload(WPARAM wParam,LPARAM lParam)
+int CLUI::OnEvent_FontReload(WPARAM wParam, LPARAM lParam)
{
pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, wParam, lParam);
@@ -218,7 +218,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam)
return 0;
}
-INT_PTR CLUI::Service_ShowMainMenu(WPARAM wParam,LPARAM lParam)
+INT_PTR CLUI::Service_ShowMainMenu(WPARAM wParam, LPARAM lParam)
{
HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);
@@ -228,7 +228,7 @@ INT_PTR CLUI::Service_ShowMainMenu(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR CLUI::Service_ShowStatusMenu(WPARAM wParam,LPARAM lParam)
+INT_PTR CLUI::Service_ShowStatusMenu(WPARAM wParam, LPARAM lParam)
{
HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);
@@ -238,23 +238,19 @@ INT_PTR CLUI::Service_ShowStatusMenu(WPARAM wParam,LPARAM lParam)
return 0;
}
-INT_PTR CLUI::Service_Menu_ShowContactAvatar(WPARAM wParam,LPARAM lParam)
+INT_PTR CLUI::Service_Menu_ShowContactAvatar(WPARAM hContact, LPARAM lParam)
{
- MCONTACT hContact = wParam;
-
db_set_b(hContact, "CList", "HideContactAvatar", 0);
- pcli->pfnClcBroadcast( INTM_AVATARCHANGED,wParam,0);
+ pcli->pfnClcBroadcast( INTM_AVATARCHANGED, hContact, 0);
return 0;
}
-INT_PTR CLUI::Service_Menu_HideContactAvatar(WPARAM wParam,LPARAM lParam)
+INT_PTR CLUI::Service_Menu_HideContactAvatar(WPARAM hContact, LPARAM lParam)
{
- MCONTACT hContact = wParam;
-
db_set_b(hContact, "CList", "HideContactAvatar", 1);
- pcli->pfnClcBroadcast( INTM_AVATARCHANGED,wParam,0);
+ pcli->pfnClcBroadcast( INTM_AVATARCHANGED, hContact, 0);
return 0;
}
@@ -1010,7 +1006,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
return LoadSmallIcon(g_hInst, -IDI_ICQC1-idx);
}
-INT_PTR CLUI_GetConnectingIconService(WPARAM wParam,LPARAM lParam)
+INT_PTR CLUI_GetConnectingIconService(WPARAM wParam, LPARAM lParam)
{
HICON hIcon = NULL;
@@ -1036,7 +1032,7 @@ INT_PTR CLUI_GetConnectingIconService(WPARAM wParam,LPARAM lParam)
return NULL;
}
-static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam,LPARAM lParam)
+static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam, LPARAM lParam)
{
int status = (int)wParam;
char *szProto = (char*)lParam;
@@ -1295,7 +1291,7 @@ int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam)
return ClcGetShortData(dat,(struct SHORTDATA *)lParam);
}
-int CLUI_IconsChanged(WPARAM wParam,LPARAM lParam)
+int CLUI_IconsChanged(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting())
return 0;
diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index 69b5e6b247..84a56f3f6c 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
INT_PTR CListTray_GetGlobalStatus(WPARAM wparam,LPARAM lparam);
-int CLUIUnreadEmailCountChanged(WPARAM wParam,LPARAM lParam)
+int CLUIUnreadEmailCountChanged(WPARAM wParam, LPARAM lParam)
{
CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, 0 ,0);
return 0;
@@ -40,7 +40,7 @@ void cliCluiProtocolStatusChanged(int status,const char * proto)
pcli->pfnTrayIconUpdateBase(proto);
}
-static INT_PTR MetaSupportCheck(WPARAM wParam,LPARAM lParam)
+static INT_PTR MetaSupportCheck(WPARAM wParam, LPARAM lParam)
{
return 1;
}
diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 9607ed864b..db1fe14218 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -163,12 +163,12 @@ int cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2)
#undef SAFESTRING
-INT_PTR ToggleHideOffline(WPARAM wParam,LPARAM lParam)
+INT_PTR ToggleHideOffline(WPARAM wParam, LPARAM lParam)
{
return pcli->pfnSetHideOffline((WPARAM)-1,0);
}
-INT_PTR ToggleGroups(WPARAM wParam,LPARAM lParam)
+INT_PTR ToggleGroups(WPARAM wParam, LPARAM lParam)
{
db_set_b(NULL, "CList", "UseGroups",
(BYTE) !db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT));
@@ -189,7 +189,7 @@ INT_PTR SetUseGroups(WPARAM wParam, LPARAM lParam)
return 0;
}
-INT_PTR ToggleSounds(WPARAM wParam,LPARAM lParam)
+INT_PTR ToggleSounds(WPARAM wParam, LPARAM lParam)
{
db_set_b(NULL, "Skin", "UseSound",
(BYTE) !db_get_b(NULL, "Skin", "UseSound", SETTING_ENABLESOUNDS_DEFAULT ));
diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp
index 6b02a383d7..32aac83df5 100644
--- a/plugins/Clist_modern/src/modern_docking.cpp
+++ b/plugins/Clist_modern/src/modern_docking.cpp
@@ -94,12 +94,12 @@ static void Docking_AdjustPosition(HWND hwnd,RECT *rcDisplay,RECT *rc)
*rc = abd.rc;
}
-int Docking_IsDocked(WPARAM wParam,LPARAM lParam)
+int Docking_IsDocked(WPARAM wParam, LPARAM lParam)
{
return g_CluiData.fDocked;
}
-int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam)
+int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)
{
APPBARDATA abd;
static int draggingTitle;
diff --git a/plugins/Clist_modern/src/modern_gettextasync.cpp b/plugins/Clist_modern/src/modern_gettextasync.cpp
index 32ab8042f8..316152c19e 100644
--- a/plugins/Clist_modern/src/modern_gettextasync.cpp
+++ b/plugins/Clist_modern/src/modern_gettextasync.cpp
@@ -164,7 +164,7 @@ void gtaRenewText(MCONTACT hContact)
gtaAddRequest(NULL,NULL, hContact);
}
-int gtaOnModulesUnload(WPARAM wParam,LPARAM lParam)
+int gtaOnModulesUnload(WPARAM wParam, LPARAM lParam)
{
SetEvent(hgtaWakeupEvent);
return 0;
diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp
index 4cc0cb54f2..e6fd5d1f0e 100644
--- a/plugins/Clist_modern/src/modern_keyboard.cpp
+++ b/plugins/Clist_modern/src/modern_keyboard.cpp
@@ -27,13 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
int InitSkinHotKeys(void);
-INT_PTR hkCloseMiranda(WPARAM wParam,LPARAM lParam)
+INT_PTR hkCloseMiranda(WPARAM wParam, LPARAM lParam)
{
CallService("CloseAction", 0, 0);
return 0;
}
-INT_PTR hkRestoreStatus(WPARAM wParam,LPARAM lParam)
+INT_PTR hkRestoreStatus(WPARAM wParam, LPARAM lParam)
{
int nStatus = db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE);
CallService(MS_CLIST_SETSTATUSMODE, nStatus, 0);
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 62eae4b80a..4336a30413 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -77,8 +77,8 @@ static LISTMODERNMASK *MainModernMaskList = NULL;
/* Private module procedures */
static BOOL ske_GetMaskBit(BYTE *line, int x);
-static INT_PTR ske_Service_AlphaTextOut(WPARAM wParam,LPARAM lParam);
-static INT_PTR ske_Service_DrawIconEx(WPARAM wParam,LPARAM lParam);
+static INT_PTR ske_Service_AlphaTextOut(WPARAM wParam, LPARAM lParam);
+static INT_PTR ske_Service_DrawIconEx(WPARAM wParam, LPARAM lParam);
static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format, DWORD ARGBcolor);
static void ske_AddParseTextGlyphObject(char * szGlyphTextID,char * szDefineString,SKINOBJECTSLIST *Skin);
@@ -1550,7 +1550,7 @@ LPSKINOBJECTDESCRIPTOR ske_FindObjectByName(const char * szName, BYTE objType, S
// lParam - possible direct pointer to modern mask
//////////////////////////////////////////////////////////////////////////
-INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam)
+INT_PTR ske_Service_DrawGlyph(WPARAM wParam, LPARAM lParam)
{
LPSKINDRAWREQUEST preq;
LPSKINOBJECTDESCRIPTOR pgl;
@@ -2313,7 +2313,7 @@ BOOL ske_TextOut(HDC hdc, int x, int y, LPCTSTR lpString, int nCount)
return 1;
}
-static INT_PTR ske_Service_AlphaTextOut(WPARAM wParam,LPARAM lParam)
+static INT_PTR ske_Service_AlphaTextOut(WPARAM wParam, LPARAM lParam)
{
if (!wParam) return 0;
@@ -2904,7 +2904,7 @@ BOOL ske_ImageList_DrawEx( HIMAGELIST himl,int i,HDC hdcDst,int x,int y,int dx,i
return TRUE;
}
-static INT_PTR ske_Service_DrawIconEx(WPARAM wParam,LPARAM lParam)
+static INT_PTR ske_Service_DrawIconEx(WPARAM wParam, LPARAM lParam)
{
DrawIconFixParam *p = (DrawIconFixParam*)wParam;
if (!p)
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 13d81b69cc..f8dabf6331 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -126,7 +126,7 @@ int LoadStatusBarData()
return 1;
}
-int BgStatusBarChange(WPARAM wParam,LPARAM lParam)
+int BgStatusBarChange(WPARAM wParam, LPARAM lParam)
{
if (MirandaExiting())
return 0;
@@ -612,7 +612,7 @@ static BOOL _ModernStatus_OnExtraIconClick(int protoIndex)
}
#define TOOLTIP_TOLERANCE 5
-LRESULT CALLBACK ModernStatusProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT CALLBACK ModernStatusProc(HWND hwnd,UINT msg,WPARAM wParam, LPARAM lParam)
{
static POINT ptToolTipShow = {0};
switch (msg) {