diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-14 15:51:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-14 15:51:34 +0000 |
| commit | e58823d961a630eb62e60d2ccb443761ba5f1704 (patch) | |
| tree | 62d071be480d57af2a53f154a1468abe0b9449ff /include | |
| parent | 721aea0764451e985d575236205808bbef298244 (diff) | |
- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.
- massive cleanup of the menu-related code
git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
52 files changed, 539 insertions, 523 deletions
diff --git a/include/m_acc.h b/include/m_acc.h index 9e88087c07..0881098274 100644 --- a/include/m_acc.h +++ b/include/m_acc.h @@ -1,4 +1,4 @@ -/*
+/*
Copyright (C) 2006 Ricardo Pescuma Domenecci, Nightwish
This is free software; you can redistribute it and/or
@@ -14,7 +14,7 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public
License along with this file; see the file license.txt. If
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+Boston, MA 02111-1307, USA.
*/
diff --git a/include/m_addcontact.h b/include/m_addcontact.h index 00bf86c682..e6c0573821 100644 --- a/include/m_addcontact.h +++ b/include/m_addcontact.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -26,18 +26,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct{
int handleType; //one of the HANDLE_ constants
- HANDLE handle; //hDbEvent if acs.handleType==HANDLE_EVENT, hContact if acs.handleType==HANDLE_CONTACT, ignored if acs.handleType==HANDLE_SEARCHRESULT
- const char *szProto; //ignored if acs.handleType!=HANDLE_SEARCHRESULT
- PROTOSEARCHRESULT *psr; //ignored if acs.handleType!=HANDLE_SEARCHRESULT
+ HANDLE handle; //hDbEvent if acs.handleType == HANDLE_EVENT, hContact if acs.handleType == HANDLE_CONTACT, ignored if acs.handleType == HANDLE_SEARCHRESULT
+ const char *szProto; //ignored if acs.handleType != HANDLE_SEARCHRESULT
+ PROTOSEARCHRESULT *psr; //ignored if acs.handleType != HANDLE_SEARCHRESULT
}ADDCONTACTSTRUCT;
/*
Description: Open the add contact dialog, see notes
-
+
wParam=[ (WPARAM)hWndParent ]
lParam=(LPARAM)(ADDCONTACTSTRUCT*)&acs
- Notes:
+ Notes:
During 0.3.0.0 development (circa 2003/06/08)
@@ -47,10 +47,10 @@ typedef struct{ if you pass a structure that is bigger than PROTOSEARCHRESULT
then do not use pointers in the newly defined area because
they will not be copied.
-
- passing wParam==NULL will result in a dialog that is created modeless
- Before the circa, a modal dialog was *always* created and
+ passing wParam == NULL will result in a dialog that is created modeless
+
+ Before the circa, a modal dialog was *always* created and
strings within PROTOSEARCHRESULT were not copied.
*/
diff --git a/include/m_awaymsg.h b/include/m_awaymsg.h index 363b12c395..5b2eb974ee 100644 --- a/include/m_awaymsg.h +++ b/include/m_awaymsg.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_button.h b/include/m_button.h index 3021c57f61..293d30c893 100644 --- a/include/m_button.h +++ b/include/m_button.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -31,32 +31,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Sets whether a dropdown arrow is used
// wParam = TRUE/FALSE turns arrow on or off
// lParam = not used
-// Usage: SendMessage(hwndbutton,BUTTONSETARROW,1,0);
+// Usage: SendMessage(hwndbutton, BUTTONSETARROW, 1, 0);
// Only works on MButtonClass buttons
#define BUTTONSETARROW (WM_USER+1)
// Sets whether the button is a default button
// wParam = TRUE/FALSE default on/off
// lParam = not used
-// Usage: SendMessage(hwndbutton,BUTTONSETDEFAULT,1,0);
+// Usage: SendMessage(hwndbutton, BUTTONSETDEFAULT, 1, 0);
// Only works on MButtonClass buttons
#define BUTTONSETDEFAULT (WM_USER+2)
// Sets the button as a push button
// wParam = lParam = not used
-// Usage: SendMessage(hwndbutton,BUTTONSETASPUSHBTN,0,0);
+// Usage: SendMessage(hwndbutton, BUTTONSETASPUSHBTN, 0, 0);
// Only works on MButtonClass buttons
#define BUTTONSETASPUSHBTN (WM_USER+3)
// Sets the button type as a flat button without borders v0.3.3+
-// Usage: SendMessage(hwndbutton,BUTTONSETASFLATBTN,0,0);
+// Usage: SendMessage(hwndbutton, BUTTONSETASFLATBTN, 0, 0);
// Only works on MButtonClass buttons
#define BUTTONSETASFLATBTN (WM_USER+4)
// Sets a tooltip for the button v0.3.3+
// wParam = (WPARAM)(char *)szTip
// lParam = not used
-// Usage: SendMessage(hwndButton,BUTTONADDTOOLTIP,(WPARAM)"My Tip",BATF_* flags);
+// Usage: SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)"My Tip", BATF_* flags);
#define BATF_UNICODE 1
#if defined( _UNICODE )
#define BATF_TCHAR BATF_UNICODE
diff --git a/include/m_clc.h b/include/m_clc.h index 36a16e898b..e2b6cd036a 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -190,8 +190,8 @@ typedef struct { #define CLM_SETTEXTCOLOR (CLM_FIRST+52) //wParam=FONTID_, lParam=COLORREF
//DO NOT USE IT EXTERNALLY CAN BE NOT SUPPORTED BY CLIST
-#define CLM_SETWIDEEXTRAIMAGE (CLM_FIRST+60) //wParam=hItem, lParam=MAKELPARAM(iColumn (0 based),iImage). iImage=0xFFFF is a blank
-#define CLM_GETWIDEEXTRAIMAGE (CLM_FIRST+61) //wParam=hItem, lParam=MAKELPARAM(iColumn (0 based),0), returns iImage or 0xFF
+#define CLM_SETWIDEEXTRAIMAGE (CLM_FIRST+60) //wParam=hItem, lParam=MAKELPARAM(iColumn (0 based), iImage). iImage=0xFFFF is a blank
+#define CLM_GETWIDEEXTRAIMAGE (CLM_FIRST+61) //wParam=hItem, lParam=MAKELPARAM(iColumn (0 based), 0), returns iImage or 0xFF
#define CLM_GETWIDEEXTRAIMAGELIST (CLM_FIRST+62) //returns HWIDEIMAGELIST
//notifications (most are omitted because the control processes everything)
@@ -208,16 +208,16 @@ typedef struct { #define CLN_FIRST (0U-100U)
#define CLN_EXPANDED (CLN_FIRST-0) //hItem=hGroup, action=CLE_*
#define CLN_LISTREBUILT (CLN_FIRST-1)
-#define CLN_ITEMCHECKED (CLN_FIRST-2) //todo //hItem,action,flags valid
-#define CLN_DRAGGING (CLN_FIRST-3) //hItem,pt,flags valid. only sent when cursor outside window, return nonzero if processed
-#define CLN_DROPPED (CLN_FIRST-4) //hItem,pt,flags valid. only sent when cursor outside window, return nonzero if processed
+#define CLN_ITEMCHECKED (CLN_FIRST-2) //todo //hItem, action, flags valid
+#define CLN_DRAGGING (CLN_FIRST-3) //hItem, pt, flags valid. only sent when cursor outside window, return nonzero if processed
+#define CLN_DROPPED (CLN_FIRST-4) //hItem, pt, flags valid. only sent when cursor outside window, return nonzero if processed
#define CLN_LISTSIZECHANGE (CLN_FIRST-5) //pt.y valid. the vertical height of the visible items in the list has changed.
#define CLN_OPTIONSCHANGED (CLN_FIRST-6) //nothing valid. If you set some extended options they have been overwritten and should be re-set
-#define CLN_DRAGSTOP (CLN_FIRST-7) //hItem,flags valid. sent when cursor goes back in to the window having been outside, return nonzero if processed
-#define CLN_NEWCONTACT (CLN_FIRST-8) //hItem,flags valid. sent when a new contact is added without a full list rebuild
-#define CLN_CONTACTMOVED (CLN_FIRST-9) //hItem,flags valid. sent when contact is moved without a full list rebuild
-#define CLN_CHECKCHANGED (CLN_FIRST-10) //hItem,flags valid. sent when any check mark is changed, but only for one change if there are many
-//NM_CLICK //hItem,iColumn,pt,flags valid
+#define CLN_DRAGSTOP (CLN_FIRST-7) //hItem, flags valid. sent when cursor goes back in to the window having been outside, return nonzero if processed
+#define CLN_NEWCONTACT (CLN_FIRST-8) //hItem, flags valid. sent when a new contact is added without a full list rebuild
+#define CLN_CONTACTMOVED (CLN_FIRST-9) //hItem, flags valid. sent when contact is moved without a full list rebuild
+#define CLN_CHECKCHANGED (CLN_FIRST-10) //hItem, flags valid. sent when any check mark is changed, but only for one change if there are many
+//NM_CLICK //hItem, iColumn, pt, flags valid
//NM_KEYDOWN //NMKEY structure, only sent when key is not already processed, return nonzero to prevent further processing
//an infotip for an item should be shown now
@@ -266,7 +266,7 @@ typedef struct { //wParam=newTime
//lParam=0
//Returns 0 on success or nonzero on failure
-//The value of this setting is applied to all current CLC windows, and saved
+//The value of this setting is applied to all current CLC windows, and saved
//to be applied to all future windows, including after restarts.
//newTime is in ms.
//The default is 750ms.
diff --git a/include/m_clist.h b/include/m_clist.h index 334e7d986c..2417932122 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "statusmodes.h"
+extern int hLangpack;
+
#if defined _STATIC
typedef struct _tagIntMenuItem* HGENMENU;
#else
@@ -106,12 +108,14 @@ typedef struct { int popupPosition; //position of the popup menu on the root menu. Ignored
//if pszPopupName is NULL or the popup menu already
//existed
- DWORD hotKey; //keyboard accelerator, same as lParam of WM_HOTKEY,0 for none
+ DWORD hotKey; //keyboard accelerator, same as lParam of WM_HOTKEY, 0 for none
char *pszContactOwner; //contact menus only. The protocol module that owns
//the contacts to which this menu item applies. NULL if it
//applies to all contacts. If it applies to multiple but not all
//protocols, add multiple menu items or use ME_CLIST_PREBUILDCONTACTMENU
-} CLISTMENUITEM;
+ int hLangpack; //plugin's hLangpack (added automatically)
+}
+ CLISTMENUITEM;
#define HGENMENU_ROOT (( HGENMENU )-1)
@@ -139,7 +143,10 @@ typedef struct { #define CMIF_ROOTPOPUP 128 //root item for new popup(save return id for childs)
#define CMIF_CHILDPOPUP 256 //child for rootpopup menu
-#define MS_CLIST_ADDMAINMENUITEM "CList/AddMainMenuItem"
+__inline static HGENMENU Menu_AddMainMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddMainMenuItem", 0, (LPARAM)mi);
+}
//add a new item to the user contact menus
//identical to clist/addmainmenuitem except when item is selected the service
@@ -149,11 +156,21 @@ typedef struct { //If ctrl is held down when right clicking, the menu position numbers will be
//displayed in brackets after the menu item text. This only works in debug
//builds.
-#define MS_CLIST_ADDCONTACTMENUITEM "CList/AddContactMenuItem"
-#define MS_CLIST_ADDSTATUSMENUITEM "CList/AddStatusMenuItem"
-//adds a protocol menu item v0.9+
-#define MS_CLIST_ADDPROTOMENUITEM "CList/AddProtoMenuItem"
+__inline static HGENMENU Menu_AddContactMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddContactMenuItem", 0, (LPARAM)mi);
+}
+
+__inline static HGENMENU Menu_AddStatusMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddStatusMenuItem", 0, (LPARAM)mi);
+}
+
+__inline static HGENMENU Menu_AddProtoMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddProtoMenuItem", 0, (LPARAM)mi);
+}
//modify an existing menu item v0.1.0.1+
//wParam=(WPARAM)(HANDLE)hMenuItem
@@ -363,7 +380,7 @@ typedef struct { //processes a menu selection from a menu v0.1.1.0+
-//wParam=MAKEWPARAM(LOWORD(wParam from WM_COMMAND),flags)
+//wParam=MAKEWPARAM(LOWORD(wParam from WM_COMMAND), flags)
//lParam=(LPARAM)(HANDLE)hContact
//returns TRUE if it processed the command, FALSE otherwise
//hContact is the currently selected contact. It it not used if this is a main
@@ -478,7 +495,7 @@ typedef struct { //changes the flags for a group v0.1.2.1+
//wParam=(WPARAM)(HANDLE)hGroup
-//lParam=MAKELPARAM(flags,flagsMask)
+//lParam=MAKELPARAM(flags, flagsMask)
//returns 0 on success, nonzero on failure
//Only the flags given in flagsMask are altered.
//CLUI is called on changes to GROUPF_HIDEOFFLINE.
diff --git a/include/m_clistint.h b/include/m_clistint.h index 1e88b13148..8f58397b8e 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define HCONTACT_ISGROUP 0x80000000
#define HCONTACT_ISINFO 0xFFFF0000
#define IsHContactGroup(h) (((UINT_PTR)(h)^HCONTACT_ISGROUP)<(HCONTACT_ISGROUP^HCONTACT_ISINFO))
-#define IsHContactInfo(h) (((UINT_PTR)(h)&HCONTACT_ISINFO)==HCONTACT_ISINFO)
-#define IsHContactContact(h) (((UINT_PTR)(h)&HCONTACT_ISGROUP)==0)
+#define IsHContactInfo(h) (((UINT_PTR)(h)&HCONTACT_ISINFO) == HCONTACT_ISINFO)
+#define IsHContactContact(h) (((UINT_PTR)(h)&HCONTACT_ISGROUP) == 0)
#define MAXEXTRACOLUMNS 16
#define MAX_TIP_SIZE 2048
@@ -89,7 +89,7 @@ typedef struct struct ClcGroup
{
ContactList cl;
- int expanded,hideOffline,groupId;
+ int expanded, hideOffline, groupId;
struct ClcGroup *parent;
int scanIndex;
int totalMembers;
@@ -98,7 +98,7 @@ struct ClcGroup struct ClcFontInfo
{
HFONT hFont;
- int fontHeight,changed;
+ int fontHeight, changed;
COLORREF colour;
};
@@ -155,8 +155,8 @@ typedef struct _menuProto #define CLCDEFAULT_SELBKCOLOUR GetSysColor(COLOR_HIGHLIGHT)
#define CLCDEFAULT_TEXTCOLOUR GetSysColor(COLOR_WINDOWTEXT)
#define CLCDEFAULT_SELTEXTCOLOUR GetSysColor(COLOR_HIGHLIGHTTEXT)
-#define CLCDEFAULT_HOTTEXTCOLOUR (IsWinVer98Plus()?RGB(0,0,255):GetSysColor(COLOR_HOTLIGHT))
-#define CLCDEFAULT_QUICKSEARCHCOLOUR RGB(255,255,0)
+#define CLCDEFAULT_HOTTEXTCOLOUR (IsWinVer98Plus()?RGB(0, 0, 255):GetSysColor(COLOR_HOTLIGHT))
+#define CLCDEFAULT_QUICKSEARCHCOLOUR RGB(255, 255, 0)
#define CLCDEFAULT_LEFTMARGIN 0
#define CLCDEFAULT_GAMMACORRECT 1
#define CLCDEFAULT_SHOWIDLE 1
@@ -232,7 +232,7 @@ typedef struct void ( *pfnFreeGroup )( struct ClcGroup *group );
int ( *pfnAddInfoItemToGroup )(struct ClcGroup *group, int flags, const TCHAR *pszText);
- int ( *pfnAddItemToGroup )( struct ClcGroup *group,int iAboveItem );
+ int ( *pfnAddItemToGroup )( struct ClcGroup *group, int iAboveItem );
int ( *pfnAddContactToGroup )( struct ClcData *dat, struct ClcGroup *group, HANDLE hContact );
void ( *pfnAddContactToTree )( HWND hwnd, struct ClcData *dat, HANDLE hContact, int updateTotalCount, int checkHideOffline);
void ( *pfnDeleteItemFromTree )( HWND hwnd, HANDLE hItem );
@@ -312,7 +312,7 @@ typedef struct void ( *pfnCluiProtocolStatusChanged )( int status, const char* szProto );
void ( *pfnDrawMenuItem )( LPDRAWITEMSTRUCT, HICON, HICON );
void ( *pfnLoadCluiGlobalOpts )( void );
- BOOL ( *pfnInvalidateRect )( HWND hwnd, CONST RECT* lpRect,BOOL bErase );
+ BOOL ( *pfnInvalidateRect )( HWND hwnd, CONST RECT* lpRect, BOOL bErase );
void ( *pfnOnCreateClc )( void );
/* contact.c */
diff --git a/include/m_clui.h b/include/m_clui.h index c811feedc4..c02d8ed26c 100644 --- a/include/m_clui.h +++ b/include/m_clui.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -141,14 +141,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CLUIF_HASAUTOHIDEOPTION 8 //the clui options page provides a way to
//change the list auto hide options. It should read and write the
//byte "CList"/"AutoHide" and the word "CList"/"HideTime". No other
- //action is needed.
+ //action is needed.
#define CLUICAPS_FLAGS2 1 //Returns info about extra icons
//HIWORD is the first extra icon number, LOWORD is the extra icons count
//LPARAMS for CLUICAPS_FLAGS2
#define CLUIF2_PLUGININFO 1 //returns pointer to plugininfo
-#define CLUIF2_CLISTTYPE 2 // the genaration of list in chronologic
+#define CLUIF2_CLISTTYPE 2 // the genaration of list in chronologic
// modern layered return 0x07 (assuming classic, mw, meta, nicer1, modern1, nicer++, modernLayered)
// +0x0100 for unicode
#define CLUIF2_EXTRACOLUMNCOUNT 3 // return max number of extra icon available to be set in main window
@@ -158,13 +158,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //a contact is being dragged outside the main window v0.1.2.0+
//wParam=(WPARAM)(HANDLE)hContact
-//lParam=MAKELPARAM(screenX,screenY)
+//lParam=MAKELPARAM(screenX, screenY)
//return nonzero to make the cursor a 'can drop here', or zero for 'no'
#define ME_CLUI_CONTACTDRAGGING "CLUI/ContactDragging"
//a contact has just been dropped outside the main window v0.1.2.0+
//wParam=(WPARAM)(HANDLE)hContact
-//lParam=MAKELPARAM(screenX,screenY)
+//lParam=MAKELPARAM(screenX, screenY)
//return nonzero if your hook processed this, so no other hooks get it
#define ME_CLUI_CONTACTDROPPED "CLUI/ContactDropped"
diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h index dbed148cea..844d2f5e16 100644 --- a/include/m_cluiframes.h +++ b/include/m_cluiframes.h @@ -1,5 +1,5 @@ /*
-Miranda ICQ: the free icq client for MS Windows
+Miranda ICQ: the free icq client for MS Windows
Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede
This program is free software; you can redistribute it and/or
@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#if !defined(M_GENMENU_H)
+#include "m_genmenu.h"
+#endif
+
//Extra columns type.
//column arranged in this way
//
@@ -55,7 +59,7 @@ typedef struct //See above for supported columns
#define MS_CLIST_EXTRA_SET_ICON "CListFrames/SetIconForExraColumn"
-//Adding icon to extra image list.
+//Adding icon to extra image list.
//Call this in ME_CLIST_EXTRA_LIST_REBUILD event
//
//wparam=hIcon
@@ -110,7 +114,7 @@ typedef struct tagCLISTFrame { #define F_NOBORDER 16 //Dont apply WS_BORDER style for window
#define F_SHOWTBTIP 32 //Show titlebar tooltip
#define F_CANBEVERTICAL 64 //frames can be vertical
-#define F_CANNOTBEHORIZONTAL 128 //frames can NOT be horizontal F_CANBEVERTICAL have to be set
+#define F_CANNOTBEHORIZONTAL 128 //frames can NOT be horizontal F_CANBEVERTICAL have to be set
#define F_NO_SUBCONTAINER 1024 //Support skining no subcontainer needed
#define F_SKINNED 2048 // skinned frame (for owned subframe only)
#define F_UNICODE 32768 //Use unicode text
@@ -125,11 +129,11 @@ typedef struct tagCLISTFrame { #define alBottom 0x00000002
#define alClient 0x00000004 //only one alClient frame
-// since 0.7.0.20
+// since 0.7.0.20
#define alLeft 0x00000011 // frame is vertical
#define alRight 0x00000012
-#define alVertFrameMask 0x00000010
+#define alVertFrameMask 0x00000010
#define FU_TBREDRAW 1 //redraw titlebar
#define FU_FMREDRAW 2 //redraw Frame
@@ -194,14 +198,14 @@ typedef struct tagCLISTFrame { //wParam=lParam=0
//returns 0 on success, -1 on failure
#define MS_CLIST_FRAMES_HIDEALLFRAMESTB "CListFrames/HideALLFramesTB"
-
+
//////////////////////////////////////////////////////////////////////////
//shows the frame if it is hidden,
//hides the frame if it is shown
//wParam = FrameId
//lParam = Frame number (can be shown in profile in CLUIFrames key)
//returns 0 on success, -1 on failure
-//note that Frame number will be taken only if wParam == 0
+//note that Frame number will be taken only if wParam == 0
#define MS_CLIST_FRAMES_SHFRAME "CListFrames/SHFrame"
//////////////////////////////////////////////////////////////////////////
@@ -210,7 +214,7 @@ typedef struct tagCLISTFrame { //wParam=FrameId
//lParam = Frame number (can be shown in profile in CLUIFrames key)
//returns 0 on success, -1 on failure
-//note that Frame number will be taken only if wParam == 0
+//note that Frame number will be taken only if wParam == 0
#define MS_CLIST_FRAMES_SHFRAMETITLEBAR "CListFrame/SHFrameTitleBar"
//////////////////////////////////////////////////////////////////////////
@@ -219,7 +223,7 @@ typedef struct tagCLISTFrame { //wParam=FrameId
//lParam = Frame number (can be shown in profile in CLUIFrames key)
//returns 0 on success, -1 on failure
-//note that Frame number will be taken only if wParam == 0
+//note that Frame number will be taken only if wParam == 0
#define MS_CLIST_FRAMES_ULFRAME "CListFrame/ULFrame"
//////////////////////////////////////////////////////////////////////////
@@ -228,7 +232,7 @@ typedef struct tagCLISTFrame { //wParam=FrameId
//lParam = Frame number (can be shown in profile in CLUIFrames key)
//returns 0 on success, -1 on failure
-//note that Frame number will be taken only if wParam == 0
+//note that Frame number will be taken only if wParam == 0
#define MS_CLIST_FRAMES_UCOLLFRAME "CListFrame/UCOLLFrame"
//////////////////////////////////////////////////////////////////////////
@@ -236,7 +240,7 @@ typedef struct tagCLISTFrame { //wparam=frameid
//lParam = Frame number (can be shown in profile in CLUIFrames key)
//returns 0 on success, -1 on failure
-//note that Frame number will be taken only if wParam == 0
+//note that Frame number will be taken only if wParam == 0
#define MS_CLIST_FRAMES_SETUNBORDER "CListFrame/SetUnBorder"
//////////////////////////////////////////////////////////////////////////
@@ -278,7 +282,11 @@ typedef struct tagCLISTFrame { //returns a handle to the new item
//popupposition=frameid
//contactowner=advanced parameter
-#define MS_CLIST_ADDCONTEXTFRAMEMENUITEM "CList/AddContextFrameMenuItem"
+
+__inline static HGENMENU Menu_AddContextFrameMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddContextFrameMenuItem", 0, (LPARAM)mi);
+}
//////////////////////////////////////////////////////////////////////////
//remove a item from context frame menu
@@ -296,14 +304,14 @@ typedef struct tagCLISTFrame { //////////////////////////////////////////////////////////////////////////
// the frame menu is about to be built
-// wparam=frameid
+// wparam=frameid
// lparam=
// -1 for build from titlebar,
// use
-// MS_CLIST_ADDCONTEXTFRAMEMENUITEM
+// MS_CLIST_ADDCONTEXTFRAMEMENUITEM
// MS_CLIST_REMOVECONTEXTFRAMEMENUITEM
//
-// >0 for build in main menu,
+// >0 for build in main menu,
// must be popupname=lparam to place your items in right popup of main menu.
// use
// MS_CLIST_ADDMAINMENUITEM
@@ -315,4 +323,3 @@ typedef struct tagCLISTFrame { //needed by cluiframes module to add frames menu to main menu.
//it just calls NotifyEventHooks(hPreBuildFrameMenuEvent,wParam,lParam);
#define MS_CLIST_FRAMEMENUNOTIFY "CList/ContextFrameMenuNotify"
-
diff --git a/include/m_contactdir.h b/include/m_contactdir.h index 805fa27d64..ac7fcb0ed7 100644 --- a/include/m_contactdir.h +++ b/include/m_contactdir.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2005 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -24,25 +24,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_CONTACTDIR_H__
#define M_CONTACTDIR_H__ 1
-/* Contactdir module was created on 2005/05/17, 0.4.0.1
+/* Contactdir module was created on 2005/05/17, 0.4.0.1
-- How you use this module as a protocol --
-
+
On Load() Register your protocol with the setting name that stores unique IDs, example:
-
+
if ( ContactDir_SupportExists() ) g_Atom=ContactDir_Register("ICQ", "UIN");
-
+
This will register your protocol and walk the database looking for all contacts on PROTOCOL_NAME which have
- a "UIN" setting and store it in memory (converting to a string as needed) You of course have to
+ a "UIN" setting and store it in memory (converting to a string as needed) You of course have to
provide fallback if the services don't exist, it's an idea to keep existing code for that.
-
+
-
-
- When you add a new contact via MS_DB_CONTACT_ADD, you must register it with your protocol atom too, via
+
+ When you add a new contact via MS_DB_CONTACT_ADD, you must register it with your protocol atom too, via
ContactDir_AddContact(atom, "UIN #", hContact) and when it is deleted ContactDir_RemoveContact(atom, "UIN #")
-
+
-
-
+
To find a contact, use ContactDir_Lookup(atom, "ICQ #") which will return the hContact.
*/
@@ -128,7 +128,7 @@ static HANDLE ContactDir_Register(char * szProto, char * szSetting) return cd.atom;
}
-static __inline HANDLE ContactDir_Lookup(HANDLE atom, char * szID)
+static __inline HANDLE ContactDir_Lookup(HANDLE atom, char * szID)
{
CONTACTDIRECTORYLOOKUP f;
f.cbSize=sizeof(f);
@@ -142,7 +142,7 @@ static __inline HANDLE ContactDir_Lookup(HANDLE atom, char * szID) static __inline void ContactDir_AddContact(HANDLE atom, char * szID, HANDLE hContact)
{
CONTACTDIRECTORYLOOKUP c = {0};
- c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP);
+ c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP);
c.atom=atom;
c.szID=szID;
c.hContact=hContact;
@@ -152,7 +152,7 @@ static __inline void ContactDir_AddContact(HANDLE atom, char * szID, HANDLE hCon static __inline void ContactDir_RemoveContact(HANDLE atom, char * szID)
{
CONTACTDIRECTORYLOOKUP c = {0};
- c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP);
+ c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP);
c.atom=atom;
c.szID=szID;
c.hContact=NULL;
diff --git a/include/m_contacts.h b/include/m_contacts.h index 5b3e9980cc..549c9d589e 100644 --- a/include/m_contacts.h +++ b/include/m_contacts.h @@ -46,8 +46,8 @@ typedef struct { #define CNF_PHONE 9 // returns phone (string)
#define CNF_HOMEPAGE 10 // returns homepage (string)
#define CNF_ABOUT 11 // returns about info (string)
-#define CNF_GENDER 12 // returns gender (byte,'M','F' character)
-#define CNF_AGE 13 // returns age (byte, 0==unspecified)
+#define CNF_GENDER 12 // returns gender (byte, 'M', 'F' character)
+#define CNF_AGE 13 // returns age (byte, 0 == unspecified)
#define CNF_FIRSTLAST 14 // returns first name + last name (string)
#define CNF_UNIQUEID 15 // returns uniqueid, protocol username (must check type for type of return)
#define CNF_FAX 18 // returns fax (string)
diff --git a/include/m_database.h b/include/m_database.h index bf83d31d0e..2675b5e148 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -178,7 +178,7 @@ setting would be successfully read (which was a bug because the pValue was often garbage and maybe not even NULL terminated)
To test for existing but 'deleted' settings, the return value will
-be 2, and pValue->type==DBVT_DELETED, at this point pValue is undefined.
+be 2, and pValue->type == DBVT_DELETED, at this point pValue is undefined.
*/
typedef struct {
const char *szModule; // pointer to name of the module that wrote the
@@ -287,7 +287,7 @@ Use db/modules/enum to get a complete list of module names szSetting is only guaranteed to be valid for the duration of the callback. If
you want to keep it for longer you must allocation your own storage.
*/
-typedef int (*DBSETTINGENUMPROC)(const char *szSetting,LPARAM lParam);
+typedef int (*DBSETTINGENUMPROC)(const char *szSetting, LPARAM lParam);
typedef struct {
DBSETTINGENUMPROC pfnEnumProc;
LPARAM lParam; //passed direct to pfnEnumProc
@@ -516,17 +516,17 @@ typedef struct { __inline static char* DbGetEventTextA( DBEVENTINFO* dbei, int codepage )
{ DBEVENTGETTEXT temp = { dbei, DBVT_ASCIIZ, codepage };
- return (char*)CallService(MS_DB_EVENT_GETTEXT,0,(LPARAM)&temp);
+ return (char*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
__inline static WCHAR* DbGetEventTextW( DBEVENTINFO* dbei, int codepage )
{ DBEVENTGETTEXT temp = { dbei, DBVT_WCHAR, codepage };
- return (WCHAR*)CallService(MS_DB_EVENT_GETTEXT,0,(LPARAM)&temp);
+ return (WCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
__inline static TCHAR* DbGetEventTextT( DBEVENTINFO* dbei, int codepage )
{ DBEVENTGETTEXT temp = { dbei, DBVT_TCHAR, codepage };
- return (TCHAR*)CallService(MS_DB_EVENT_GETTEXT,0,(LPARAM)&temp);
+ return (TCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
/* DB/Event/GetIcon (0.7.0.1+)
@@ -749,11 +749,11 @@ Writing to the database while module names are being enumerated will cause unpredictable results in the enumeration, but the write will work.
szModuleName is only guaranteed to be valid for the duration of the callback.
If you want to keep it for longer you must allocation your own storage.
-**BUG**: Prior to 0.1.2.0 dbmep was called as (lParam)(szMod,ofsMod,lParam).
+**BUG**: Prior to 0.1.2.0 dbmep was called as (lParam)(szMod, ofsMod, lParam).
This means that the lParam parameter to dbmep was useless, and explains the
slightly odd 'wParam=lParam' in the definition.
*/
-typedef int (*DBMODULEENUMPROC)(const char *szModuleName,DWORD ofsModuleName,LPARAM lParam);
+typedef int (*DBMODULEENUMPROC)(const char *szModuleName, DWORD ofsModuleName, LPARAM lParam);
#define MS_DB_MODULES_ENUM "DB/Modules/Enum"
/* DB/Module/Delete 0.8.0+
@@ -860,34 +860,34 @@ Disables a setting saving to the database. #ifndef DB_NOHELPERFUNCTIONS
-#define db_byte_get(a,b,c,d) DBGetContactSettingByte(a,b,c,d)
-#define db_word_get(a,b,c,d) DBGetContactSettingWord(a,b,c,d)
-#define db_dword_get(a,b,c,d) DBGetContactSettingDword(a,b,c,d)
-#define db_get(a,b,c,d) DBGetContactSetting(a,b,c,d)
+#define db_byte_get(a, b, c, d) DBGetContactSettingByte(a, b, c, d)
+#define db_word_get(a, b, c, d) DBGetContactSettingWord(a, b, c, d)
+#define db_dword_get(a, b, c, d) DBGetContactSettingDword(a, b, c, d)
+#define db_get(a, b, c, d) DBGetContactSetting(a, b, c, d)
-#define db_byte_set(a,b,c,d) DBWriteContactSettingByte(a,b,c,d)
-#define db_word_set(a,b,c,d) DBWriteContactSettingWord(a,b,c,d)
-#define db_dword_set(a,b,c,d) DBWriteContactSettingDword(a,b,c,d)
-#define db_string_set(a,b,c,d) DBWriteContactSettingString(a,b,c,d)
+#define db_byte_set(a, b, c, d) DBWriteContactSettingByte(a, b, c, d)
+#define db_word_set(a, b, c, d) DBWriteContactSettingWord(a, b, c, d)
+#define db_dword_set(a, b, c, d) DBWriteContactSettingDword(a, b, c, d)
+#define db_string_set(a, b, c, d) DBWriteContactSettingString(a, b, c, d)
-#define db_unset(a,b,c) DBDeleteContactSetting(a,b,c);
+#define db_unset(a, b, c) DBDeleteContactSetting(a, b, c);
#ifdef _DEBUG
- #define DBGetContactSettingByte(a,b,c,d) DBGetContactSettingByte_Helper(a,b,c,d,__FILE__,__LINE__)
- #define DBGetContactSettingWord(a,b,c,d) DBGetContactSettingWord_Helper(a,b,c,d,__FILE__,__LINE__)
- #define DBGetContactSettingDword(a,b,c,d) DBGetContactSettingDword_Helper(a,b,c,d,__FILE__,__LINE__)
- #define DBGetContactSetting(a,b,c,d) DBGetContactSetting_Helper(a,b,c,d,__FILE__,__LINE__)
- #define DBGetContactSettingString(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,__FILE__,__LINE__,DBVT_ASCIIZ)
- #define DBGetContactSettingWString(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,__FILE__,__LINE__,DBVT_WCHAR)
- #define DBGetContactSettingUTF8String(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,__FILE__,__LINE__,DBVT_UTF8)
+ #define DBGetContactSettingByte(a, b, c, d) DBGetContactSettingByte_Helper(a, b, c, d, __FILE__, __LINE__)
+ #define DBGetContactSettingWord(a, b, c, d) DBGetContactSettingWord_Helper(a, b, c, d, __FILE__, __LINE__)
+ #define DBGetContactSettingDword(a, b, c, d) DBGetContactSettingDword_Helper(a, b, c, d, __FILE__, __LINE__)
+ #define DBGetContactSetting(a, b, c, d) DBGetContactSetting_Helper(a, b, c, d, __FILE__, __LINE__)
+ #define DBGetContactSettingString(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, __FILE__, __LINE__, DBVT_ASCIIZ)
+ #define DBGetContactSettingWString(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, __FILE__, __LINE__, DBVT_WCHAR)
+ #define DBGetContactSettingUTF8String(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, __FILE__, __LINE__, DBVT_UTF8)
#else
- #define DBGetContactSettingByte(a,b,c,d) DBGetContactSettingByte_Helper(a,b,c,d)
- #define DBGetContactSettingWord(a,b,c,d) DBGetContactSettingWord_Helper(a,b,c,d)
- #define DBGetContactSettingDword(a,b,c,d) DBGetContactSettingDword_Helper(a,b,c,d)
- #define DBGetContactSetting(a,b,c,d) DBGetContactSetting_Helper(a,b,c,d)
- #define DBGetContactSettingString(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,DBVT_ASCIIZ)
- #define DBGetContactSettingWString(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,DBVT_WCHAR)
- #define DBGetContactSettingUTF8String(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,DBVT_UTF8)
+ #define DBGetContactSettingByte(a, b, c, d) DBGetContactSettingByte_Helper(a, b, c, d)
+ #define DBGetContactSettingWord(a, b, c, d) DBGetContactSettingWord_Helper(a, b, c, d)
+ #define DBGetContactSettingDword(a, b, c, d) DBGetContactSettingDword_Helper(a, b, c, d)
+ #define DBGetContactSetting(a, b, c, d) DBGetContactSetting_Helper(a, b, c, d)
+ #define DBGetContactSettingString(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, DBVT_ASCIIZ)
+ #define DBGetContactSettingWString(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, DBVT_WCHAR)
+ #define DBGetContactSettingUTF8String(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, DBVT_UTF8)
#endif
#ifdef _UNICODE
@@ -896,15 +896,15 @@ Disables a setting saving to the database. #define DBGetContactSettingTString DBGetContactSettingString
#endif
-#define db_msg_dbg(s) MessageBoxA(0,(s),"",0);
+#define db_msg_dbg(s) MessageBoxA(0, (s), "", 0);
/* Deprecated & bizarre aliases */
#define DBGetContactSettingStringUtf DBGetContactSettingUTF8String
#define DBWriteContactSettingStringUtf DBWriteContactSettingUTF8String
#ifdef _DEBUG
- #define DBGetContactSettingW(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,__FILE__,__LINE__,0)
+ #define DBGetContactSettingW(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, __FILE__, __LINE__, 0)
#else
- #define DBGetContactSettingW(a,b,c,d) DBGetContactSettingString_Helper(a,b,c,d,0)
+ #define DBGetContactSettingW(a, b, c, d) DBGetContactSettingString_Helper(a, b, c, d, 0)
#endif
#ifdef _DEBUG
@@ -913,7 +913,7 @@ Disables a setting saving to the database. __inline static int DBGetContactSettingByte_Helper(HANDLE hContact, const char *szModule, const char *szSetting, int errorValue
#ifdef _DEBUG
- ,const char *szFile, const int nLine
+ , const char *szFile, const int nLine
#endif
)
{
@@ -923,12 +923,12 @@ __inline static int DBGetContactSettingByte_Helper(HANDLE hContact, const char * cgs.szModule=szModule;
cgs.szSetting=szSetting;
cgs.pValue=&dbv;
- if(CallService(MS_DB_CONTACT_GETSETTING,(WPARAM)hContact,(LPARAM)&cgs))
+ if(CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs))
return errorValue;
#ifdef _DEBUG
- if(dbv.type!=DBVT_BYTE) {
+ if(dbv.type != DBVT_BYTE) {
char buf[128];
- _snprintf(buf,sizeof(buf),"%s:%d for %s/%s not a byte, return: %d",szFile,nLine,szModule,szSetting,dbv.type);
+ _snprintf(buf, sizeof(buf), "%s:%d for %s/%s not a byte, return: %d", szFile, nLine, szModule, szSetting, dbv.type);
buf[sizeof(buf)-1]=0;
db_msg_dbg(buf);
}
@@ -936,9 +936,9 @@ __inline static int DBGetContactSettingByte_Helper(HANDLE hContact, const char * return dbv.bVal;
}
-__inline static int DBGetContactSettingWord_Helper(HANDLE hContact,const char *szModule,const char *szSetting,int errorValue
+__inline static int DBGetContactSettingWord_Helper(HANDLE hContact, const char *szModule, const char *szSetting, int errorValue
#ifdef _DEBUG
- ,const char *szFile, const int nLine
+ , const char *szFile, const int nLine
#endif
)
{
@@ -948,12 +948,12 @@ __inline static int DBGetContactSettingWord_Helper(HANDLE hContact,const char *s cgs.szModule=szModule;
cgs.szSetting=szSetting;
cgs.pValue=&dbv;
- if(CallService(MS_DB_CONTACT_GETSETTING,(WPARAM)hContact,(LPARAM)&cgs))
+ if(CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs))
return errorValue;
#ifdef _DEBUG
- if(dbv.type!=DBVT_WORD) {
+ if(dbv.type != DBVT_WORD) {
char buf[128];
- _snprintf(buf,sizeof(buf),"%s:%d for %s/%s not a word, return: %d",szFile,nLine,szModule,szSetting,dbv.type);
+ _snprintf(buf, sizeof(buf), "%s:%d for %s/%s not a word, return: %d", szFile, nLine, szModule, szSetting, dbv.type);
buf[sizeof(buf)-1]=0;
db_msg_dbg(buf);
}
@@ -961,9 +961,9 @@ __inline static int DBGetContactSettingWord_Helper(HANDLE hContact,const char *s return dbv.wVal;
}
-__inline static DWORD DBGetContactSettingDword_Helper(HANDLE hContact,const char *szModule, const char *szSetting, DWORD errorValue
+__inline static DWORD DBGetContactSettingDword_Helper(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue
#ifdef _DEBUG
- ,const char *szFile, const int nLine
+ , const char *szFile, const int nLine
#endif
)
{
@@ -973,12 +973,12 @@ __inline static DWORD DBGetContactSettingDword_Helper(HANDLE hContact,const char cgs.szModule=szModule;
cgs.szSetting=szSetting;
cgs.pValue=&dbv;
- if(CallService(MS_DB_CONTACT_GETSETTING,(WPARAM)hContact,(LPARAM)&cgs))
+ if(CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs))
return errorValue;
#ifdef _DEBUG
- if(dbv.type!=DBVT_DWORD) {
+ if(dbv.type != DBVT_DWORD) {
char buf[128];
- _snprintf(buf,sizeof(buf),"%s:%d for %s/%s not a dword, return: %d",szFile,nLine,szModule,szSetting,dbv.type);
+ _snprintf(buf, sizeof(buf), "%s:%d for %s/%s not a dword, return: %d", szFile, nLine, szModule, szSetting, dbv.type);
buf[sizeof(buf)-1]=0;
db_msg_dbg(buf);
}
@@ -986,9 +986,9 @@ __inline static DWORD DBGetContactSettingDword_Helper(HANDLE hContact,const char return dbv.dVal;
}
-__inline static INT_PTR DBGetContactSetting_Helper(HANDLE hContact,const char *szModule,const char *szSetting,DBVARIANT *dbv
+__inline static INT_PTR DBGetContactSetting_Helper(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv
#if defined(_DEBUG)
- ,const char *szFile, const int nLine
+ , const char *szFile, const int nLine
#endif
)
{
@@ -998,18 +998,18 @@ __inline static INT_PTR DBGetContactSetting_Helper(HANDLE hContact,const char *s cgs.szSetting=szSetting;
cgs.pValue=dbv;
- rc=CallService(MS_DB_CONTACT_GETSETTING,(WPARAM)hContact,(LPARAM)&cgs);
+ rc=CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs);
#if defined(_DEBUG) && defined(DBCHECKSETTINGS)
if (rc != 0) {
char buf[128];
- _snprintf(buf,sizeof(buf),"%s:%d failed to fetch %s/%s",szFile,nLine,szModule,szSetting);
+ _snprintf(buf, sizeof(buf), "%s:%d failed to fetch %s/%s", szFile, nLine, szModule, szSetting);
db_msg_dbg(buf);
}
#endif
return rc;
}
-__inline static INT_PTR DBGetContactSettingString_Helper(HANDLE hContact,const char *szModule,const char *szSetting,DBVARIANT *dbv,
+__inline static INT_PTR DBGetContactSettingString_Helper(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv,
#if defined(_DEBUG)
const char *szFile, const int nLine,
#endif
@@ -1022,11 +1022,11 @@ __inline static INT_PTR DBGetContactSettingString_Helper(HANDLE hContact,const c cgs.pValue=dbv;
dbv->type=(BYTE)nType;
- rc=CallService(MS_DB_CONTACT_GETSETTING_STR,(WPARAM)hContact,(LPARAM)&cgs);
+ rc=CallService(MS_DB_CONTACT_GETSETTING_STR, (WPARAM)hContact, (LPARAM)&cgs);
#if defined(_DEBUG) && defined(DBCHECKSETTINGS)
if (rc != 0) {
char buf[128];
- _snprintf(buf,sizeof(buf),"%s:%d failed to fetch %s/%s",szFile,nLine,szModule,szSetting);
+ _snprintf(buf, sizeof(buf), "%s:%d failed to fetch %s/%s", szFile, nLine, szModule, szSetting);
db_msg_dbg(buf);
}
#endif
@@ -1035,15 +1035,15 @@ __inline static INT_PTR DBGetContactSettingString_Helper(HANDLE hContact,const c __inline static INT_PTR DBFreeVariant(DBVARIANT *dbv)
{
- return CallService(MS_DB_CONTACT_FREEVARIANT,0,(LPARAM)dbv);
+ return CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)dbv);
}
-__inline static char *DBGetString(HANDLE hContact,const char *szModule,const char *szSetting)
+__inline static char *DBGetString(HANDLE hContact, const char *szModule, const char *szSetting)
{
char *str=NULL;
DBVARIANT dbv={0};
- DBGetContactSettingString(hContact,szModule,szSetting,&dbv);
- if(dbv.type==DBVT_ASCIIZ)
+ DBGetContactSettingString(hContact, szModule, szSetting, &dbv);
+ if(dbv.type == DBVT_ASCIIZ)
str=mir_strdup(dbv.pszVal);
DBFreeVariant(&dbv);
return str;
@@ -1051,12 +1051,12 @@ __inline static char *DBGetString(HANDLE hContact,const char *szModule,const cha #define DBGetStringA DBGetString
-__inline static wchar_t *DBGetStringW(HANDLE hContact,const char *szModule,const char *szSetting)
+__inline static wchar_t *DBGetStringW(HANDLE hContact, const char *szModule, const char *szSetting)
{
wchar_t *str=NULL;
DBVARIANT dbv={0};
- DBGetContactSettingWString(hContact,szModule,szSetting,&dbv);
- if(dbv.type==DBVT_WCHAR)
+ DBGetContactSettingWString(hContact, szModule, szSetting, &dbv);
+ if(dbv.type == DBVT_WCHAR)
str=mir_wstrdup(dbv.pwszVal);
DBFreeVariant(&dbv);
return str;
@@ -1068,15 +1068,15 @@ __inline static wchar_t *DBGetStringW(HANDLE hContact,const char *szModule,const #define DBGetStringT DBGetString
#endif
-__inline static INT_PTR DBDeleteContactSetting(HANDLE hContact,const char *szModule,const char *szSetting)
+__inline static INT_PTR DBDeleteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting)
{
DBCONTACTGETSETTING cgs;
cgs.szModule=szModule;
cgs.szSetting=szSetting;
- return CallService(MS_DB_CONTACT_DELETESETTING,(WPARAM)hContact,(LPARAM)&cgs);
+ return CallService(MS_DB_CONTACT_DELETESETTING, (WPARAM)hContact, (LPARAM)&cgs);
}
-__inline static INT_PTR DBWriteContactSettingByte(HANDLE hContact,const char *szModule,const char *szSetting,BYTE val)
+__inline static INT_PTR DBWriteContactSettingByte(HANDLE hContact, const char *szModule, const char *szSetting, BYTE val)
{
DBCONTACTWRITESETTING cws;
@@ -1084,10 +1084,10 @@ __inline static INT_PTR DBWriteContactSettingByte(HANDLE hContact,const char *sz cws.szSetting=szSetting;
cws.value.type=DBVT_BYTE;
cws.value.bVal=val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
-__inline static INT_PTR DBWriteContactSettingWord(HANDLE hContact,const char *szModule,const char *szSetting,WORD val)
+__inline static INT_PTR DBWriteContactSettingWord(HANDLE hContact, const char *szModule, const char *szSetting, WORD val)
{
DBCONTACTWRITESETTING cws;
@@ -1095,10 +1095,10 @@ __inline static INT_PTR DBWriteContactSettingWord(HANDLE hContact,const char *sz cws.szSetting=szSetting;
cws.value.type=DBVT_WORD;
cws.value.wVal=val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
-__inline static INT_PTR DBWriteContactSettingDword(HANDLE hContact,const char *szModule,const char *szSetting,DWORD val)
+__inline static INT_PTR DBWriteContactSettingDword(HANDLE hContact, const char *szModule, const char *szSetting, DWORD val)
{
DBCONTACTWRITESETTING cws;
@@ -1106,10 +1106,10 @@ __inline static INT_PTR DBWriteContactSettingDword(HANDLE hContact,const char *s cws.szSetting=szSetting;
cws.value.type=DBVT_DWORD;
cws.value.dVal=val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
-__inline static INT_PTR DBWriteContactSettingString(HANDLE hContact,const char *szModule,const char *szSetting,const char *val)
+__inline static INT_PTR DBWriteContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const char *val)
{
DBCONTACTWRITESETTING cws;
@@ -1117,10 +1117,10 @@ __inline static INT_PTR DBWriteContactSettingString(HANDLE hContact,const char * cws.szSetting=szSetting;
cws.value.type=DBVT_ASCIIZ;
cws.value.pszVal=(char*)val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
-__inline static INT_PTR DBWriteContactSettingWString(HANDLE hContact,const char *szModule,const char *szSetting,const WCHAR *val)
+__inline static INT_PTR DBWriteContactSettingWString(HANDLE hContact, const char *szModule, const char *szSetting, const WCHAR *val)
{
DBCONTACTWRITESETTING cws;
@@ -1128,7 +1128,7 @@ __inline static INT_PTR DBWriteContactSettingWString(HANDLE hContact,const char cws.szSetting=szSetting;
cws.value.type=DBVT_WCHAR;
cws.value.pwszVal=(WCHAR*)val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
#ifdef _UNICODE
@@ -1137,7 +1137,7 @@ __inline static INT_PTR DBWriteContactSettingWString(HANDLE hContact,const char #define DBWriteContactSettingTString DBWriteContactSettingString
#endif
-__inline static INT_PTR DBWriteContactSettingUTF8String(HANDLE hContact,const char *szModule,const char *szSetting,const char *val)
+__inline static INT_PTR DBWriteContactSettingUTF8String(HANDLE hContact, const char *szModule, const char *szSetting, const char *val)
{
DBCONTACTWRITESETTING cws;
@@ -1145,10 +1145,10 @@ __inline static INT_PTR DBWriteContactSettingUTF8String(HANDLE hContact,const ch cws.szSetting=szSetting;
cws.value.type=DBVT_UTF8;
cws.value.pszVal=(char*)val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
-__inline static INT_PTR DBWriteContactSettingBlob(HANDLE hContact,const char *szModule,const char *szSetting,void *val,unsigned len)
+__inline static INT_PTR DBWriteContactSettingBlob(HANDLE hContact, const char *szModule, const char *szSetting, void *val, unsigned len)
{
DBCONTACTWRITESETTING cws;
@@ -1157,7 +1157,7 @@ __inline static INT_PTR DBWriteContactSettingBlob(HANDLE hContact,const char *sz cws.value.type=DBVT_BLOB;
cws.value.cpbVal = (WORD)len;
cws.value.pbVal=(unsigned char*)val;
- return CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws);
+ return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
}
/* inlined range tolerate versions */
@@ -1168,9 +1168,9 @@ __inline static BYTE DBGetContactSettingRangedByte(HANDLE hContact, const char * if (bVal < minValue || bVal > maxValue) {
#ifdef _DEBUG
char szBuf[MAX_PATH];
- _snprintf(szBuf,sizeof(szBuf),"(%s:%s) not in range of %d..%d",szModule,szSetting,minValue,maxValue);
+ _snprintf(szBuf, sizeof(szBuf), "(%s:%s) not in range of %d..%d", szModule, szSetting, minValue, maxValue);
szBuf[sizeof(szBuf)-1]=0;
- MessageBoxA(0,szBuf,"DBGetContactSettingRangedByte failed",MB_ICONERROR);
+ MessageBoxA(0, szBuf, "DBGetContactSettingRangedByte failed", MB_ICONERROR);
#endif
return errorValue;
}
@@ -1183,9 +1183,9 @@ __inline static WORD DBGetContactSettingRangedWord(HANDLE hContact, const char * if (wVal < minValue || wVal > maxValue) {
#ifdef _DEBUG
char szBuf[MAX_PATH];
- _snprintf(szBuf,sizeof(szBuf),"(%s:%s) not in range of %d..%d",szModule,szSetting,minValue,maxValue);
+ _snprintf(szBuf, sizeof(szBuf), "(%s:%s) not in range of %d..%d", szModule, szSetting, minValue, maxValue);
szBuf[sizeof(szBuf)-1]=0;
- MessageBoxA(0,szBuf,"DBGetContactSettingRangedWord failed",MB_ICONERROR);
+ MessageBoxA(0, szBuf, "DBGetContactSettingRangedWord failed", MB_ICONERROR);
#endif
return errorValue;
}
@@ -1198,9 +1198,9 @@ __inline static DWORD DBGetContactSettingRangedDword(HANDLE hContact, const char if (dVal < minValue || dVal > maxValue) {
#ifdef _DEBUG
char szBuf[MAX_PATH];
- _snprintf(szBuf,sizeof(szBuf),"(%s:%s) not in range of %d..%d",szModule,szSetting,minValue,maxValue);
+ _snprintf(szBuf, sizeof(szBuf), "(%s:%s) not in range of %d..%d", szModule, szSetting, minValue, maxValue);
szBuf[sizeof(szBuf)-1]=0;
- MessageBoxA(0,szBuf,"DBGetContactSettingRangedDword failed",MB_ICONERROR);
+ MessageBoxA(0, szBuf, "DBGetContactSettingRangedDword failed", MB_ICONERROR);
#endif
return errorValue;
}
diff --git a/include/m_email.h b/include/m_email.h index db963a877f..5ff1962328 100644 --- a/include/m_email.h +++ b/include/m_email.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_errors.h b/include/m_errors.h index c19e76dfe7..86b053ec7d 100644 --- a/include/m_errors.h +++ b/include/m_errors.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_file.h b/include/m_file.h index 73cd51d5a5..44c9ff1c27 100644 --- a/include/m_file.h +++ b/include/m_file.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_findadd.h b/include/m_findadd.h index 2ea19815f0..ed0cd60ec8 100644 --- a/include/m_findadd.h +++ b/include/m_findadd.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@ open. wParam=lParam=0
returns 0 always
*/
-#define MS_FINDADD_FINDADD "FindAdd/FindAddCommand"
+#define MS_FINDADD_FINDADD "FindAdd/FindAddCommand"
#endif // M_FINDADD_H__
diff --git a/include/m_freeimage.h b/include/m_freeimage.h index 17e471a820..251408aa50 100644 --- a/include/m_freeimage.h +++ b/include/m_freeimage.h @@ -60,10 +60,10 @@ #else
#if defined(_WIN32) || defined(__WIN32__)
#define DLL_CALLCONV __stdcall
- // The following ifdef block is the standard way of creating macros which make exporting
+ // The following ifdef block is the standard way of creating macros which make exporting
// from a DLL simpler. All files within this DLL are compiled with the FREEIMAGE_EXPORTS
// symbol defined on the command line. this symbol should not be defined on any project
- // that uses this DLL. This way any other project whose source files include this file see
+ // that uses this DLL. This way any other project whose source files include this file see
// DLL_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported.
#ifdef FREEIMAGE_EXPORTS
@@ -71,7 +71,7 @@ #else
#define DLL_API __declspec(dllimport)
#endif // FREEIMAGE_EXPORTS
- #else
+ #else
// try the gcc visibility support (see http://gcc.gnu.org/wiki/Visibility)
#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#ifndef GCC_HASCLASSVISIBILITY
@@ -83,7 +83,7 @@ #define DLL_API __attribute__ ((visibility("default")))
#else
#define DLL_API
- #endif
+ #endif
#endif // WIN32 / !WIN32
#endif // FREEIMAGE_LIB
@@ -207,20 +207,20 @@ typedef struct tagRGBTRIPLE { typedef struct tagBITMAPINFOHEADER{
DWORD biSize;
- LONG biWidth;
- LONG biHeight;
- WORD biPlanes;
+ LONG biWidth;
+ LONG biHeight;
+ WORD biPlanes;
WORD biBitCount;
- DWORD biCompression;
- DWORD biSizeImage;
- LONG biXPelsPerMeter;
- LONG biYPelsPerMeter;
- DWORD biClrUsed;
+ DWORD biCompression;
+ DWORD biSizeImage;
+ LONG biXPelsPerMeter;
+ LONG biYPelsPerMeter;
+ DWORD biClrUsed;
DWORD biClrImportant;
-} BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+} BITMAPINFOHEADER, *PBITMAPINFOHEADER;
-typedef struct tagBITMAPINFO {
- BITMAPINFOHEADER bmiHeader;
+typedef struct tagBITMAPINFO {
+ BITMAPINFOHEADER bmiHeader;
RGBQUAD bmiColors[1];
} BITMAPINFO, *PBITMAPINFO;
@@ -234,7 +234,7 @@ typedef struct tagBITMAPINFO { #pragma pack(1)
#endif // WIN32
-/** 48-bit RGB
+/** 48-bit RGB
*/
typedef struct tagFIRGB16 {
WORD red;
@@ -370,7 +370,7 @@ typedef struct tagFICOMPLEX { #define FIICC_DEFAULT 0x00
#define FIICC_COLOR_IS_CMYK 0x01
-FI_STRUCT (FIICCPROFILE) {
+FI_STRUCT (FIICCPROFILE) {
WORD flags; // info flag
DWORD size; // profile's size measured in bytes
void *data; // points to a block of contiguous memory containing the profile
@@ -493,7 +493,7 @@ FI_ENUM(FREE_IMAGE_TMO) { FITMO_FATTAL02 = 2 // Gradient domain high dynamic range compression (R. Fattal, 2002)
};
-/** Upsampling / downsampling filters.
+/** Upsampling / downsampling filters.
Constants used in FreeImage_Rescale.
*/
FI_ENUM(FREE_IMAGE_FILTER) {
@@ -529,21 +529,21 @@ FI_ENUM(FREE_IMAGE_COLOR_CHANNEL) { Note: RATIONALs are the ratio of two 32-bit integer values.
*/
FI_ENUM(FREE_IMAGE_MDTYPE) {
- FIDT_NOTYPE = 0, // placeholder
- FIDT_BYTE = 1, // 8-bit unsigned integer
- FIDT_ASCII = 2, // 8-bit bytes w/ last byte null
- FIDT_SHORT = 3, // 16-bit unsigned integer
- FIDT_LONG = 4, // 32-bit unsigned integer
- FIDT_RATIONAL = 5, // 64-bit unsigned fraction
- FIDT_SBYTE = 6, // 8-bit signed integer
- FIDT_UNDEFINED = 7, // 8-bit untyped data
- FIDT_SSHORT = 8, // 16-bit signed integer
- FIDT_SLONG = 9, // 32-bit signed integer
- FIDT_SRATIONAL = 10, // 64-bit signed fraction
- FIDT_FLOAT = 11, // 32-bit IEEE floating point
- FIDT_DOUBLE = 12, // 64-bit IEEE floating point
- FIDT_IFD = 13, // 32-bit unsigned integer (offset)
- FIDT_PALETTE = 14 // 32-bit RGBQUAD
+ FIDT_NOTYPE = 0, // placeholder
+ FIDT_BYTE = 1, // 8-bit unsigned integer
+ FIDT_ASCII = 2, // 8-bit bytes w/ last byte null
+ FIDT_SHORT = 3, // 16-bit unsigned integer
+ FIDT_LONG = 4, // 32-bit unsigned integer
+ FIDT_RATIONAL = 5, // 64-bit unsigned fraction
+ FIDT_SBYTE = 6, // 8-bit signed integer
+ FIDT_UNDEFINED = 7, // 8-bit untyped data
+ FIDT_SSHORT = 8, // 16-bit signed integer
+ FIDT_SLONG = 9, // 32-bit signed integer
+ FIDT_SRATIONAL = 10, // 64-bit signed fraction
+ FIDT_FLOAT = 11, // 32-bit IEEE floating point
+ FIDT_DOUBLE = 12, // 64-bit IEEE floating point
+ FIDT_IFD = 13, // 32-bit unsigned integer (offset)
+ FIDT_PALETTE = 14 // 32-bit RGBQUAD
};
/**
@@ -690,9 +690,9 @@ typedef void (DLL_CALLCONV *FI_InitProc)(Plugin *plugin, int format_id); #define JPEG_QUALITYAVERAGE 0x0400 // save with average quality (25:1)
#define JPEG_QUALITYBAD 0x0800 // save with bad quality (10:1)
#define JPEG_PROGRESSIVE 0x2000 // save as a progressive-JPEG (use | to combine with other save flags)
-#define JPEG_SUBSAMPLING_411 0x1000 // save with high 4x1 chroma subsampling (4:1:1)
+#define JPEG_SUBSAMPLING_411 0x1000 // save with high 4x1 chroma subsampling (4:1:1)
#define JPEG_SUBSAMPLING_420 0x4000 // save with medium 2x2 medium chroma subsampling (4:2:0) - default value
-#define JPEG_SUBSAMPLING_422 0x8000 // save with low 2x1 chroma subsampling (4:2:2)
+#define JPEG_SUBSAMPLING_422 0x8000 // save with low 2x1 chroma subsampling (4:2:2)
#define JPEG_SUBSAMPLING_444 0x10000 // save with no chroma subsampling (4:4:4)
#define KOALA_DEFAULT 0
#define LBM_DEFAULT 0
@@ -763,9 +763,9 @@ DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); // Message output functions -------------------------------------------------
typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg);
-typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg);
+typedef void (DLL_CALLCONV *FreeImage_OutputMessageFunctionStdCall)(FREE_IMAGE_FORMAT fif, const char *msg);
-DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf);
+DLL_API void DLL_CALLCONV FreeImage_SetOutputMessageStdCall(FreeImage_OutputMessageFunctionStdCall omf);
DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf);
DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...);
diff --git a/include/m_fuse.h b/include/m_fuse.h index 8a2ff8169f..7df4d1e89b 100644 --- a/include/m_fuse.h +++ b/include/m_fuse.h @@ -4,8 +4,8 @@ #define CALLSERVICE_NOTFOUND ((int)0x80000000)
#define MAXMODULELABELLENGTH 64
-typedef int (*MIRANDAHOOK)(WPARAM,LPARAM);
-typedef INT_PTR (*MIRANDASERVICE)(WPARAM,LPARAM);
+typedef int (*MIRANDAHOOK)(WPARAM, LPARAM);
+typedef INT_PTR (*MIRANDASERVICE)(WPARAM, LPARAM);
#define FUSE_INIT 0 // core started, Param=**FUSE_LINK
#define FUSE_DEINIT 1 // core stopped
@@ -16,16 +16,16 @@ typedef struct { int cbSize;
HANDLE (*CreateHookableEvent)(const char *);
int (*DestroyHookableEvent)(HANDLE);
- int (*NotifyEventHooks)(HANDLE,WPARAM,LPARAM);
- HANDLE (*HookEvent)(const char *,MIRANDAHOOK);
- HANDLE (*HookEventMessage)(const char *,HWND,UINT);
+ int (*NotifyEventHooks)(HANDLE, WPARAM, LPARAM);
+ HANDLE (*HookEvent)(const char *, MIRANDAHOOK);
+ HANDLE (*HookEventMessage)(const char *, HWND, UINT);
int (*UnhookEvent)(HANDLE);
- HANDLE (*CreateServiceFunction)(const char *,MIRANDASERVICE);
- HANDLE (*CreateTransientServiceFunction)(const char *,MIRANDASERVICE);
+ HANDLE (*CreateServiceFunction)(const char *, MIRANDASERVICE);
+ HANDLE (*CreateTransientServiceFunction)(const char *, MIRANDASERVICE);
int (*DestroyServiceFunction)(HANDLE);
- int (*CallService)(const char *,WPARAM,LPARAM);
+ int (*CallService)(const char *, WPARAM, LPARAM);
int (*ServiceExists)(const char *); //v0.1.0.1+
- int (*CallServiceSync)(const char*,WPARAM,LPARAM); //v0.1.2.2+
+ int (*CallServiceSync)(const char*, WPARAM, LPARAM); //v0.1.2.2+
} FUSE_LINK;
#endif
diff --git a/include/m_genmenu.h b/include/m_genmenu.h index cea3107730..c0d20fc9f1 100644 --- a/include/m_genmenu.h +++ b/include/m_genmenu.h @@ -5,6 +5,8 @@ #include <m_clist.h>
#endif
+extern int hLangpack;
+
/*
Main features:
1) Independet from clist,may be used in any module.
@@ -96,6 +98,13 @@ plugin may add different menu items with some service. */
// SubGroup MENU
+
+// Group MENU
+typedef struct{
+int wParam;
+int lParam;
+}GroupMenuParam,*lpGroupMenuParam;
+
//remove a item from SubGroup menu
//wParam=hMenuItem returned by MS_CLIST_ADDSubGroupMENUITEM
//lParam=0
@@ -110,22 +119,18 @@ plugin may add different menu items with some service. //add a new item to the SubGroup menus
//wParam=lpGroupMenuParam, params to call when exec menuitem
//lParam=(LPARAM)(CLISTMENUITEM*)&mi
-#define MS_CLIST_ADDSUBGROUPMENUITEM "CList/AddSubGroupMenuItem"
+
+__inline static HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddSubGroupMenuItem", (WPARAM)gmp, (LPARAM)mi);
+}
//the SubGroup menu is about to be built
//wParam=lParam=0
#define ME_CLIST_PREBUILDSUBGROUPMENU "CList/PreBuildSubGroupMenu"
-// SubGroup MENU
-
-// Group MENU
-typedef struct{
-int wParam;
-int lParam;
-}GroupMenuParam,*lpGroupMenuParam;
-
//remove a item from Group menu
-//wParam=hMenuItem returned by MS_CLIST_ADDGroupMENUITEM
+//wParam=hMenuItem returned by MS_CLIST_ADDGROUPMENUITEM
//lParam=0
//returns 0 on success, nonzero on failure
#define MS_CLIST_REMOVEGROUPMENUITEM "CList/RemoveGroupMenuItem"
@@ -138,7 +143,11 @@ int lParam; //add a new item to the Group menus
//wParam=lpGroupMenuParam, params to call when exec menuitem
//lParam=(LPARAM)(CLISTMENUITEM*)&mi
-#define MS_CLIST_ADDGROUPMENUITEM "CList/AddGroupMenuItem"
+
+__inline static HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddGroupMenuItem", (WPARAM)gmp, (LPARAM)mi);
+}
//the Group menu is about to be built
//wParam=lParam=0
@@ -162,7 +171,11 @@ int lParam; //add a new item to the tray menus
//wParam=0
//lParam=(LPARAM)(CLISTMENUITEM*)&mi
-#define MS_CLIST_ADDTRAYMENUITEM "CList/AddTrayMenuItem"
+
+__inline static HGENMENU Menu_AddTrayMenuItem(CLISTMENUITEM *mi)
+{ mi->hLangpack = hLangpack;
+ return (HGENMENU)CallService("CList/AddTrayMenuItem", 0, (LPARAM)mi);
+}
//the tray menu is about to be built
//wParam=lParam=0
@@ -174,11 +187,6 @@ int lParam; //wParam=lParam=0
#define ME_CLIST_PREBUILDSTATUSMENU "CList/PreBuildStatusMenu"
-//add a new item to the status menu
-//wParam=0
-//lParam=(LPARAM)(CLISTMENUITEM*)&mi
-#define MS_CLIST_ADDSTATUSMENUITEM "CList/AddStatusMenuItem"
-
//remove a item from main menu
//wParam=hMenuItem returned by MS_CLIST_ADDMAINMENUITEM
//lParam=0
diff --git a/include/m_help.h b/include/m_help.h index 15b404c2e4..70de3e2936 100644 --- a/include/m_help.h +++ b/include/m_help.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // wParam = 0
// lParam = (char *)url;
-// Sends the bug report url in lParam. Is usually called from
-// the Help/Report Bug menu.
+// Sends the bug report url in lParam. Is usually called from
+// the Help/Report Bug menu.
#define ME_HELP_BUGREPORT "Help/ReportBug"
#endif // M_HELP_H__
diff --git a/include/m_history.h b/include/m_history.h index d4f1b9ec15..cf6b85cf70 100644 --- a/include/m_history.h +++ b/include/m_history.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // wParam=(WPARAM)(HANDLE)hContact
// lParam=0
//hContact can be NULL to show system messages
-#define MS_HISTORY_SHOWCONTACTHISTORY "History/ShowContactHistory"
+#define MS_HISTORY_SHOWCONTACTHISTORY "History/ShowContactHistory"
#endif // M_HISTORY_H__
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index d8484e5c2e..5522f49bc9 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -57,7 +57,7 @@ typedef struct /* use this macro to defile hotkey codes like this:
hkd.DefHotkey = HOTKEYCODE(HOTKEYF_SHIFT|HOTKEYF_EXT, 'A');
*/
-#define HOTKEYCODE(mod,vk) (MAKEWORD((vk),(mod)))
+#define HOTKEYCODE(mod, vk) (MAKEWORD((vk), (mod)))
/* CoreHotkeys/Register service
Registers new hotkey
diff --git a/include/m_icolib.h b/include/m_icolib.h index a5e97db2e9..f9056b2a58 100644 --- a/include/m_icolib.h +++ b/include/m_icolib.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_icq.h b/include/m_icq.h index 91e1b9237a..eb585715c3 100644 --- a/include/m_icq.h +++ b/include/m_icq.h @@ -1,33 +1,27 @@ // ---------------------------------------------------------------------------80
// ICQ plugin for Miranda Instant Messenger
// ________________________________________
-//
+//
// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
// Copyright © 2001-2002 Jon Keating, Richard Hughes
// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
// Copyright © 2004-2010 Joe Kucera
-//
+//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//
// -----------------------------------------------------------------------------
-//
-// File name : $URL: http://miranda.googlecode.com/svn/trunk/miranda/include/m_icq.h $
-// Revision : $Revision: 11723 $
-// Last change on : $Date: 2010-05-09 14:55:59 +0300 (Ð’Ñ, 09 май 2010) $
-// Last change by : $Author: borkra $
-//
// DESCRIPTION:
//
// Public headers for ICQ protocol plug-in
@@ -106,7 +100,7 @@ typedef struct { //"<sms_message><source>MTN</source><destination_UIN>[UIN of recipient, ie this account]</destination_UIN><sender>[sending phone number, without +]</sender><senders_network>[contains one space, because I sent from ICQ]</senders_network><text>[body of the message]</text><time>Fri, 16 Nov 2001 03:12:33 GMT</time></sms_message>"
#define ICQACKTYPE_SMS 1001
#define ICQEVENTTYPE_SMS 2001 //database event type
-#define MS_ICQ_SENDSMS "/SendSMS"
+#define MS_ICQ_SENDSMS "/SendSMS"
//e-mail express
//db event added to NULL contact
@@ -229,7 +223,7 @@ typedef struct { // Sets owner current custom status (obsolete)
//wParam = (int)N // custom status id (1-32)
-//lParam = 0
+//lParam = 0
//return = N (id of status set) or 0 (failed - probably bad params)
#define PS_ICQ_SETCUSTOMSTATUS "/SetXStatus"
@@ -261,7 +255,7 @@ typedef struct { // Request Custom status details (messages) for specified contact
//wParam = hContact // request custom status details for this contact
-//lParam = 0
+//lParam = 0
//return = (int)dwSequence // if successful it is sequence for ICQACKTYPE_XSTATUS_RESPONSE
// 0 failed to request (e.g. auto-request enabled)
// -1 delayed (rate control) - sequence unknown
@@ -272,7 +266,7 @@ typedef struct { //lParam = hIcon // HANDLE to clist extra icon set as custom status
#define ME_ICQ_CUSTOMSTATUS_EXTRAICON_CHANGED "/XStatusExtraIconChanged"
-// Called when a contact changes its custom status
+// Called when a contact changes its custom status
// wParam = hContact
// lParam = 0
#define ME_ICQ_CUSTOMSTATUS_CHANGED "/XStatusChanged"
diff --git a/include/m_idle.h b/include/m_idle.h index 97a6a203bb..57394c9cc9 100644 --- a/include/m_idle.h +++ b/include/m_idle.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2005 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* The idle module checks how long the user has been idle, it can be at the Miranda level
or the OS level - the user has optional two settings, one for "short" idle and another
for "long" idle. Thie module will generate long/short events based on these user preferences
-and other information too. If you are unsure which idle mode to report for, report it
+and other information too. If you are unsure which idle mode to report for, report it
for short idle.*/
#define IDF_ISIDLE 0x1 // idle has become active (if not set, inactive)
@@ -63,7 +63,7 @@ typedef struct { /*
wParam; 0
lParam: &MIRANDA_IDLE_INFO
- Affect: Return information about current idle settings, like short/long idle time in mins
+ Affect: Return information about current idle settings, like short/long idle time in mins
and if the user wants that info kept private, etc
Returns: zero on success, non zero on failure
Version: 0.3.4 (2004/09/16)
diff --git a/include/m_ignore.h b/include/m_ignore.h index 312d0f70e8..9dd861bf3e 100644 --- a/include/m_ignore.h +++ b/include/m_ignore.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_imgsrvc.h b/include/m_imgsrvc.h index 55f4ebe8b3..e1627754f3 100644 --- a/include/m_imgsrvc.h +++ b/include/m_imgsrvc.h @@ -1,8 +1,8 @@ /*
Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2012 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -----------------------------------------------------------------------
Miranda Image services plugin / API definitions
-Provides various services for image loading, saving and manipulations.
+Provides various services for image loading, saving and manipulations.
This module is based on the freeimage library, copyrighted by the FreeImage
Project members.
@@ -82,9 +82,9 @@ typedef struct _tagFI_interface { FIBITMAP *(DLL_CALLCONV *FI__AllocateT)(FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0));
FIBITMAP *(DLL_CALLCONV *FI_Clone)(FIBITMAP *dib);
void (DLL_CALLCONV *FI_Unload)(FIBITMAP *dib);
-
+
// Load / Save routines -----------------------------------------------------
-
+
FIBITMAP *(DLL_CALLCONV *FI_Load)(FREE_IMAGE_FORMAT fif, const char *filename, int flags FI_DEFAULT(0));
FIBITMAP *(DLL_CALLCONV *FI_LoadU)(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags FI_DEFAULT(0));
FIBITMAP *(DLL_CALLCONV *FI_LoadFromHandle)(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0));
@@ -356,7 +356,7 @@ typedef struct _tagFI_interface { /*
* image services
- *
+ *
* only basic functionality is wrapped around Miranda services, because otherwise we would get a huge
* load of services with complex parameter marshalling requirements.
*/
@@ -376,21 +376,21 @@ typedef struct _tagFI_interface { // the interface is populated during the _DllMain() handler, so you can assume it is ready when Miranda
// calls the Load() handler of your plugin and you can return 1 in your Load() to disable your plugin when
// it depends on the freeimage interface and the freeimage plugin is missing
-//
+//
// example:
-//
+//
// FI_INTERFACE *fii = NULL;
-//
+//
// result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fii);
-//
+//
// if(result != S_OK)
// failed, in this case, fei will be NULL and your plugin will crash when using the interface,
-// so ALWAYS check it
+// so ALWAYS check it
#define MS_IMG_GETINTERFACE "IMG/GetInterface"
-#define IMGL_RETURNDIB 1 // will NOT return a HBITMAP but a FIBITMAP * instead (useful, if you
+#define IMGL_RETURNDIB 1 // will NOT return a HBITMAP but a FIBITMAP * instead (useful, if you
// want to do further image manipulations before converting to a Win32 bitmap
// caller MUST then free the FIBITMAP * using fii->FI_Unload() or MS_IMG_UNLOAD (see below)
@@ -474,7 +474,7 @@ typedef struct _tagIMGSRVC_INFO { */
#define RESIZEBITMAP_STRETCH 0 // Distort bitmap to size in (max_width, max_height)
-#define RESIZEBITMAP_KEEP_PROPORTIONS 1 // Keep bitmap proportions (probabily only one of the
+#define RESIZEBITMAP_KEEP_PROPORTIONS 1 // Keep bitmap proportions (probabily only one of the
// max_width/max_height will be respected, and the other will be
// smaller)
#define RESIZEBITMAP_CROP 2 // Keep bitmap proportions but crop it to fix exactly in (max_width, max_height)
@@ -506,10 +506,10 @@ typedef struct { /*
* format conversion helpers
- *
+ *
* these helper macros allow converting HBITMAP to FIBITMAP * format and vice vera. In any case,
* the caller is responsible for freeing or deleting the original object.
- * These macros wrap around the FI_CreateHBITMAPFromDib() and FI_CreateDIBFromHBITMAP() interface
+ * These macros wrap around the FI_CreateHBITMAPFromDib() and FI_CreateDIBFromHBITMAP() interface
* functions.
*/
diff --git a/include/m_jabber.h b/include/m_jabber.h index b19a656521..d660528b60 100644 --- a/include/m_jabber.h +++ b/include/m_jabber.h @@ -20,11 +20,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-File name : $URL: https://miranda.svn.sourceforge.net/svnroot/miranda/trunk/miranda/include/m_jabber.h $
-Revision : $Revision: 9996 $
-Last change on : $Date: 2009-11-15 13:27:32 +0200 $
-Last change by : $Author: dchervov $
-
*/
#ifndef M_JABBER_H__
diff --git a/include/m_keybindings.h b/include/m_keybindings.h index 80f6ed1e2b..faac722791 100644 --- a/include/m_keybindings.h +++ b/include/m_keybindings.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_langpack.h b/include/m_langpack.h index da15c63ea0..e601b58c49 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -46,21 +46,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int hLangpack;
__inline static char* Translate(const char* str)
-{ return (char*)CallService(MS_LANGPACK_TRANSLATESTRING,hLangpack,(LPARAM)(str));
+{ return (char*)CallService(MS_LANGPACK_TRANSLATESTRING, hLangpack, (LPARAM)(str));
}
__inline static WCHAR* TranslateW(const WCHAR* str)
-{ return (WCHAR*)CallService(MS_LANGPACK_TRANSLATESTRING,hLangpack+LANG_UNICODE,(LPARAM)(str));
+{ return (WCHAR*)CallService(MS_LANGPACK_TRANSLATESTRING, hLangpack+LANG_UNICODE, (LPARAM)(str));
}
#else
__inline static char* Translate(const char* str)
-{ return (char*)CallService(MS_LANGPACK_TRANSLATESTRING,0,(LPARAM)(str));
+{ return (char*)CallService(MS_LANGPACK_TRANSLATESTRING, 0, (LPARAM)(str));
}
__inline static WCHAR* TranslateW(const WCHAR* str)
-{ return (WCHAR*)CallService(MS_LANGPACK_TRANSLATESTRING,LANG_UNICODE,(LPARAM)(str));
+{ return (WCHAR*)CallService(MS_LANGPACK_TRANSLATESTRING, LANG_UNICODE, (LPARAM)(str));
}
#endif
@@ -114,7 +114,7 @@ __inline static INT_PTR TranslateDialogDefault(HWND hwndDlg) lptd.flags=hLangpack;
lptd.hwndDlg=hwndDlg;
lptd.ignoreControls=NULL;
- return CallService(MS_LANGPACK_TRANSLATEDIALOG,0,(LPARAM)&lptd);
+ return CallService(MS_LANGPACK_TRANSLATEDIALOG, 0, (LPARAM)&lptd);
}
#else
@@ -126,7 +126,7 @@ __inline static INT_PTR TranslateDialogDefault(HWND hwndDlg) lptd.flags=0;
lptd.hwndDlg=hwndDlg;
lptd.ignoreControls=NULL;
- return CallService(MS_LANGPACK_TRANSLATEDIALOG,0,(LPARAM)&lptd);
+ return CallService(MS_LANGPACK_TRANSLATEDIALOG, 0, (LPARAM)&lptd);
}
#endif
diff --git a/include/m_message.h b/include/m_message.h index 4b6a7933c0..4c503704ea 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //returns immediately, just after the dialog is shown
//szText is the text to put in the edit box of the window (but not send)
//szText=NULL will not use any text
-//szText!=NULL is only supported on v0.1.2.0+
+//szText != NULL is only supported on v0.1.2.0+
#define MS_MSG_SENDMESSAGE "SRMsg/SendCommand"
#define MS_MSG_SENDMESSAGEW "SRMsg/SendCommandW"
@@ -71,7 +71,7 @@ typedef struct { //wparam=0
//lparam=0
//Returns a dword with the current message api version
-//Current version is 0,0,0,4
+//Current version is 0, 0, 0, 4
#define MS_MSG_GETWINDOWCLASS "MessageAPI/WindowClass"
//wparam=(char*)szBuf
diff --git a/include/m_netlib.h b/include/m_netlib.h index 8a810a32f7..689d352ea9 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -55,10 +55,10 @@ typedef struct NETLIBOPENCONNECTION_tag NETLIBOPENCONNECTION; //of the netlib options page.
//See notes below this function for the behaviour of HTTP gateways
//Errors: ERROR_INVALID_PARAMETER, ERROR_OUTOFMEMORY, ERROR_DUP_NAME
-typedef int (*NETLIBHTTPGATEWAYINITPROC)(HANDLE hConn,NETLIBOPENCONNECTION *nloc,NETLIBHTTPREQUEST *nlhr);
-typedef int (*NETLIBHTTPGATEWAYBEGINPROC)(HANDLE hConn,NETLIBOPENCONNECTION *nloc);
-typedef int (*NETLIBHTTPGATEWAYWRAPSENDPROC)(HANDLE hConn,PBYTE buf,int len,int flags,MIRANDASERVICE pfnNetlibSend);
-typedef PBYTE (*NETLIBHTTPGATEWAYUNWRAPRECVPROC)(NETLIBHTTPREQUEST *nlhr,PBYTE buf,int len,int *outBufLen,void *(*NetlibRealloc)(void*,size_t));
+typedef int (*NETLIBHTTPGATEWAYINITPROC)(HANDLE hConn, NETLIBOPENCONNECTION *nloc, NETLIBHTTPREQUEST *nlhr);
+typedef int (*NETLIBHTTPGATEWAYBEGINPROC)(HANDLE hConn, NETLIBOPENCONNECTION *nloc);
+typedef int (*NETLIBHTTPGATEWAYWRAPSENDPROC)(HANDLE hConn, PBYTE buf, int len, int flags, MIRANDASERVICE pfnNetlibSend);
+typedef PBYTE (*NETLIBHTTPGATEWAYUNWRAPRECVPROC)(NETLIBHTTPREQUEST *nlhr, PBYTE buf, int len, int *outBufLen, void *(*NetlibRealloc)(void*, size_t));
typedef struct {
int cbSize;
char *szSettingsModule; //used for db settings and log
@@ -150,7 +150,7 @@ MSG_NOHTTPGATEWAYWRAP. nlu.pfnHttpGatewayWrapSend should return the a number of the same type as MS_NETLIB_SEND, ie the number of bytes sent or
SOCKET_ERROR. The number of wrapping bytes should be subtracted so that the
return value appears as if the proxy wasn't there.
-pfnNetlibSend() is identical to CallService(MS_NETLIB_SEND,...) but it's
+pfnNetlibSend() is identical to CallService(MS_NETLIB_SEND, ...) but it's
quicker to call using this pointer than to do the CallService() lookup again.
Whenever an HTTP reply is received inside MS_NETLIB_RECV the headers and data
@@ -196,7 +196,7 @@ typedef struct { int useProxyAuthNtlm; // 1 or 0, only used by HTTP, HTTPS
int dnsThroughProxy; // 1 or 0
int specifyIncomingPorts; // 1 or 0
- char *szIncomingPorts; // can be NULL. Of form "1024-1050,1060-1070,2000"
+ char *szIncomingPorts; // can be NULL. Of form "1024-1050, 1060-1070, 2000"
int specifyOutgoingPorts; // 0.3.3a+
char *szOutgoingPorts; // 0.3.3a+
int enableUPnP; // 0.6.1+ only for NUF_INCOMING
@@ -224,7 +224,7 @@ typedef struct { //socket will be closed.
//Errors: ERROR_INVALID_PARAMETER
#define MS_NETLIB_CLOSEHANDLE "Netlib/CloseHandle"
-__inline static INT_PTR Netlib_CloseHandle(HANDLE h) {return CallService(MS_NETLIB_CLOSEHANDLE,(WPARAM)h,0);}
+__inline static INT_PTR Netlib_CloseHandle(HANDLE h) {return CallService(MS_NETLIB_CLOSEHANDLE, (WPARAM)h, 0);}
//Open a port and wait for connections on it
//wParam=(WPARAM)(HANDLE)hUser
@@ -248,7 +248,7 @@ __inline static INT_PTR Netlib_CloseHandle(HANDLE h) {return CallService(MS_NETL // for such conditions.
//
// passing wPort != 0 is for people who need to open a set port for
-// daemon activities, usually passing wPort==0 is what you want and
+// daemon activities, usually passing wPort == 0 is what you want and
// will result in a free port given by the TCP/IP socket layer and/or
// seeded from the user selected port ranges.
//
@@ -260,8 +260,8 @@ it shouldnt matter */ #define NETLIBBIND_SIZEOF_V1 16 // sizeof(NETLIBBIND) prior to 0.3.4+ (2004/08/05)
#define NETLIBBIND_SIZEOF_V2 20 // sizeof(NETLIBBIND) prior to 0.6+ (2006/07/03)
-typedef void (*NETLIBNEWCONNECTIONPROC_V2)(HANDLE hNewConnection,DWORD dwRemoteIP, void * pExtra);
-typedef void (*NETLIBNEWCONNECTIONPROC)(HANDLE hNewConnection,DWORD dwRemoteIP);
+typedef void (*NETLIBNEWCONNECTIONPROC_V2)(HANDLE hNewConnection, DWORD dwRemoteIP, void * pExtra);
+typedef void (*NETLIBNEWCONNECTIONPROC)(HANDLE hNewConnection, DWORD dwRemoteIP);
/* This is NETLIBBIND prior to 2004/08/05+, DONT use this anymore unless you want to work
with older cores, pExtra isnt available on older cores and never will be - for a period of time, the ABI
for this service was broken and older NETLIBBINDs were not supported, if NULL is returned and the
@@ -364,7 +364,7 @@ typedef struct { DWORD flags;
char *szHttpPostUrl;
char *szHttpGetUrl;
- int firstGetSequence,firstPostSequence;
+ int firstGetSequence, firstPostSequence;
int combinePackets;
} NETLIBHTTPPROXYINFO;
#define MS_NETLIB_SETHTTPPROXYINFO "Netlib/SetHttpProxyInfo"
@@ -384,7 +384,7 @@ typedef struct { //wParam=0
//lParam=(LPARAM)(const char *)pszString
//Returns a char* containing the new string. This must be freed with
-//HeapFree(GetProcessHeap(),0,pszReturnString) when you're done with it.
+//HeapFree(GetProcessHeap(), 0, pszReturnString) when you're done with it.
//Returns NULL on error.
//Errors: ERROR_INVALID_PARAMETER, ERROR_OUTOFMEMORY
#define MS_NETLIB_URLENCODE "Netlib/UrlEncode"
@@ -575,10 +575,10 @@ struct NETLIBHTTPREQUEST_tag { //szValue=NULL.
//In the return value headers, headerCount, pData, dataLength, resultCode and
//szResultDescr are all valid.
-//In the return value pData[dataLength]==0 always, as an extra safeguard
+//In the return value pData[dataLength] == 0 always, as an extra safeguard
//against programming slips.
//Note that the function can succeed (ie not return NULL) yet result in an HTTP
-//error code. You should check that resultCode==2xx before proceeding.
+//error code. You should check that resultCode == 2xx before proceeding.
//Errors: ERROR_INVALID_PARAMETER, ERROR_OUTOFMEMORY, anything from the above
// list of functions
#define MS_NETLIB_HTTPTRANSACTION "Netlib/HttpTransaction"
@@ -605,9 +605,9 @@ typedef struct { int flags;
} NETLIBBUFFER;
#define MS_NETLIB_SEND "Netlib/Send"
-static __inline INT_PTR Netlib_Send(HANDLE hConn,const char *buf,int len,int flags) {
- NETLIBBUFFER nlb={(char*)buf,len,flags};
- return CallService(MS_NETLIB_SEND,(WPARAM)hConn,(LPARAM)&nlb);
+static __inline INT_PTR Netlib_Send(HANDLE hConn, const char *buf, int len, int flags) {
+ NETLIBBUFFER nlb={(char*)buf, len, flags};
+ return CallService(MS_NETLIB_SEND, (WPARAM)hConn, (LPARAM)&nlb);
}
//Receive data over a connection
@@ -632,9 +632,9 @@ static __inline INT_PTR Netlib_Send(HANDLE hConn,const char *buf,int len,int fla // nlu.pfnHttpGatewayUnwrapRecv, socket(), connect(),
// MS_NETLIB_SENDHTTPREQUEST
#define MS_NETLIB_RECV "Netlib/Recv"
-static __inline INT_PTR Netlib_Recv(HANDLE hConn,char *buf,int len,int flags) {
- NETLIBBUFFER nlb={buf,len,flags};
- return CallService(MS_NETLIB_RECV,(WPARAM)hConn,(LPARAM)&nlb);
+static __inline INT_PTR Netlib_Recv(HANDLE hConn, char *buf, int len, int flags) {
+ NETLIBBUFFER nlb={buf, len, flags};
+ return CallService(MS_NETLIB_RECV, (WPARAM)hConn, (LPARAM)&nlb);
}
//Determine the status of one or more connections
@@ -676,7 +676,7 @@ typedef struct { //lParam=(LPARAM)0
//Returns 0
#define MS_NETLIB_SHUTDOWN "Netlib/Shutdown"
-__inline static void Netlib_Shutdown(HANDLE h) {CallService(MS_NETLIB_SHUTDOWN,(WPARAM)h,0);}
+__inline static void Netlib_Shutdown(HANDLE h) {CallService(MS_NETLIB_SHUTDOWN, (WPARAM)h, 0);}
//Create a packet receiver
//wParam=(WPARAM)(HANDLE)hConnection
@@ -776,7 +776,7 @@ static INT_PTR Netlib_Logf(HANDLE hUser, const char *fmt, ...) __try
{
- va_start(va,fmt);
+ va_start(va, fmt);
mir_vsntprintf(szText, sizeof(szText), fmt, va);
va_end(va);
return CallService(MS_NETLIB_LOGW, (WPARAM)hUser, (LPARAM)szText);
diff --git a/include/m_plugins.h b/include/m_plugins.h index c47d29e75b..402da041d7 100644 --- a/include/m_plugins.h +++ b/include/m_plugins.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2012 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ typedef struct PLUGIN_DB_ENUM { //this is primarily for use by the core's module initialiser, but could also
//be used by modules that are doing naughty things that are very
//feature-dependent
-#define MS_PLUGINS_GETDISABLEDEFAULTARRAY "Plugins/GetDisableDefaultArray"
+#define MS_PLUGINS_GETDISABLEDEFAULTARRAY "Plugins/GetDisableDefaultArray"
#endif // M_PLUGINS_H__
diff --git a/include/m_png.h b/include/m_png.h index 75f1170fc8..b1c4a6976f 100644 --- a/include/m_png.h +++ b/include/m_png.h @@ -23,11 +23,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-File name : $Source: /cvsroot/miranda/miranda/include/m_png.h,v $
-Revision : $Revision: 2876 $
-Last change on : $Date: 2006-05-17 00:56:03 +0300 (Ср, 17 май 2006) $
-Last change by : $Author: rainwater $
-
*/
/* Image/Dib2Png
diff --git a/include/m_popup.h b/include/m_popup.h index 62d64ea73d..afac6c1696 100644 --- a/include/m_popup.h +++ b/include/m_popup.h @@ -1,10 +1,10 @@ /*
-===============================================================================
+ == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == =
PopUp plugin
Plugin Name: PopUp
Plugin authors: Luca Santarelli aka hrk (hrk@users.sourceforge.net)
Victor Pavlychko aka zazoo (nullbie@gmail.com)
-===============================================================================
+ == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == =
The purpose of this plugin is to give developers a common "platform/interface"
to show PopUps. It is born from the source code of NewStatusNotify, another
plugin I've made.
@@ -12,7 +12,7 @@ plugin I've made. Remember that users *must* have this plugin enabled, or they won't get any
popup. Write this in the requirements, do whatever you wish ;-)... but tell
them!
-===============================================================================
+ == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == == =
*/
#ifndef M_POPUP_H
@@ -125,17 +125,17 @@ You may pass additional creation flags via lParam: #define MS_POPUP_ADDPOPUP "PopUp/AddPopUp"
static INT_PTR __inline PUAddPopUp(POPUPDATA* ppdp) {
- return CallService(MS_POPUP_ADDPOPUP, (WPARAM)ppdp,0);
+ return CallService(MS_POPUP_ADDPOPUP, (WPARAM)ppdp, 0);
}
#define MS_POPUP_ADDPOPUPEX "PopUp/AddPopUpEx"
static INT_PTR __inline PUAddPopUpEx(POPUPDATAEX* ppdp) {
- return CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)ppdp,0);
+ return CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)ppdp, 0);
}
#define MS_POPUP_ADDPOPUPW "PopUp/AddPopUpW"
static INT_PTR __inline PUAddPopUpW(POPUPDATAW* ppdp) {
- return CallService(MS_POPUP_ADDPOPUPW, (WPARAM)ppdp,0);
+ return CallService(MS_POPUP_ADDPOPUPW, (WPARAM)ppdp, 0);
}
#if defined(_UNICODE) || defined(UNICODE)
@@ -157,7 +157,7 @@ Returns: the HANDLE of the contact. Can return NULL, meaning it's the main conta */
#define MS_POPUP_GETCONTACT "PopUp/GetContact"
static HANDLE __inline PUGetContact(HWND hPopUpWindow) {
- return (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hPopUpWindow,0);
+ return (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hPopUpWindow, 0);
}
/* PopUp/GetPluginData
@@ -179,7 +179,7 @@ and it will work. Just look at the example I've written above (PopUpDlgProc). #define MS_POPUP_GETPLUGINDATA "PopUp/GetPluginData"
static void __inline * PUGetPluginData(HWND hPopUpWindow) {
long * uselessPointer = NULL;
- return (void*)CallService(MS_POPUP_GETPLUGINDATA,(WPARAM)hPopUpWindow,(LPARAM)uselessPointer);
+ return (void*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hPopUpWindow, (LPARAM)uselessPointer);
}
/* PopUp/IsSecondLineShown
@@ -192,7 +192,7 @@ Returns: 0 if the user has chosen not to have the second line, 1 if he choose to */
#define MS_POPUP_ISSECONDLINESHOWN "PopUp/IsSecondLineShown"
static BOOL __inline PUIsSecondLineShown() {
- return (BOOL)CallService(MS_POPUP_ISSECONDLINESHOWN,0,0);
+ return (BOOL)CallService(MS_POPUP_ISSECONDLINESHOWN, 0, 0);
}
/* PopUp/Query
@@ -226,7 +226,7 @@ lParam = 0 */
#define UM_DESTROYPOPUP (WM_USER + 0x0201)
static int __inline PUDeletePopUp(HWND hWndPopUp) {
- return (int)SendMessage(hWndPopUp, UM_DESTROYPOPUP,0,0);
+ return (int)SendMessage(hWndPopUp, UM_DESTROYPOPUP, 0, 0);
}
/* UM_INITPOPUP
@@ -333,11 +333,11 @@ Returns: 0 if the popup was shown, -1 in case of failure. #define MS_POPUP_SHOWMESSAGEW "PopUp/ShowMessageW"
static int __inline PUShowMessage(char *lpzText, DWORD kind) {
- return (int)CallService(MS_POPUP_SHOWMESSAGE, (WPARAM)lpzText,(LPARAM)kind);
+ return (int)CallService(MS_POPUP_SHOWMESSAGE, (WPARAM)lpzText, (LPARAM)kind);
}
static int __inline PUShowMessageW(wchar_t *lpwzText, DWORD kind) {
- return (int)CallService(MS_POPUP_SHOWMESSAGEW, (WPARAM)lpwzText,(LPARAM)kind);
+ return (int)CallService(MS_POPUP_SHOWMESSAGEW, (WPARAM)lpwzText, (LPARAM)kind);
}
#ifdef _UNICODE
diff --git a/include/m_protocols.h b/include/m_protocols.h index 887ab4e1e4..8ee54722c2 100644 --- a/include/m_protocols.h +++ b/include/m_protocols.h @@ -98,7 +98,7 @@ typedef struct { // long to be delivered". If no error message is specified, lParam must be NULL.
// Right now only explanations from ACKTYPE_MESSAGE is shown.
-//when type==ACKTYPE_FILE && (result==ACKRESULT_DATA || result==ACKRESULT_FILERESUME),
+//when type == ACKTYPE_FILE && (result == ACKRESULT_DATA || result == ACKRESULT_FILERESUME),
//lParam points to this
#define FNAMECHAR TCHAR
@@ -114,7 +114,7 @@ typedef struct { #define PFTS_TCHAR 0
#endif
-typedef struct tagPROTOFILETRANSFERSTATUS
+typedef struct tagPROTOFILETRANSFERSTATUS
{
size_t cbSize;
HANDLE hContact;
@@ -146,7 +146,7 @@ typedef struct tagPROTOFILETRANSFERSTATUS unsigned __int64 currentFileSize;
unsigned __int64 currentFileProgress;
unsigned __int64 currentFileTime; //as seconds since 1970
-}
+}
PROTOFILETRANSFERSTATUS;
//Enumerate the currently running protocols
@@ -161,7 +161,7 @@ PROTOFILETRANSFERSTATUS; //program's lifetime. Do not use this list in the global context, copy protocols
//names otherwise.
//IMPORTANT NOTE #2: in version 0.8 this service is mapped to the MS_PROTO_ENUMACCOUNTS
-//service to provide the compatibility with old plugins (first three members of
+//service to provide the compatibility with old plugins (first three members of
//PROTOACCOUNT are equal to the old PROTOCOLDESCRIPTOR format). If you declare the
//MIRANDA_VER macro with value greater or equal to 0x800, use MS_PROTO_ENUMPROTOS
//service instead to obtain the list of running protocols instead of accounts.
@@ -267,7 +267,7 @@ typedef struct { //lParam=(LPARAM)(int)typing state
#define ME_PROTO_CONTACTISTYPING "Proto/ContactIsTypingEvent"
-// -------------- accounts support --------------------- 0.8.0+
+// -------------- accounts support --------------------- 0.8.0+
typedef struct tagACCOUNT
{
@@ -323,7 +323,7 @@ __inline static PROTOACCOUNT* ProtoGetAccount( const char* accName ) //displays the Account Manager
//wParam=0
//lParam=0
-#define MS_PROTO_SHOWACCMGR "Protos/ShowAccountManager"
+#define MS_PROTO_SHOWACCMGR "Protos/ShowAccountManager"
//determines if an account is enabled or not
//wParam = 0
diff --git a/include/m_protoint.h b/include/m_protoint.h index b069f2dcf2..0eac0f0015 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_PROTOINT_H__
#define M_PROTOINT_H__ 1
-typedef enum
+typedef enum
{
EV_PROTO_ONLOAD,
EV_PROTO_ONREADYTOEXIT,
diff --git a/include/m_protomod.h b/include/m_protomod.h index bae8146373..ee28bf232d 100644 --- a/include/m_protomod.h +++ b/include/m_protomod.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -65,12 +65,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //If they are called with CallContactService() (PSS_ and PSR_ services) then
//they are called with lParam=(CCSDATA*)&ccs and wParam an opaque internal
//reference that should be passed unchanged to MS_PROTO_CHAIN*.
-__inline static HANDLE CreateProtoServiceFunction(const char *szModule,const char *szService,MIRANDASERVICE serviceProc)
+__inline static HANDLE CreateProtoServiceFunction(const char *szModule, const char *szService, MIRANDASERVICE serviceProc)
{
char str[MAXMODULELABELLENGTH];
_snprintf(str, sizeof(str), "%s%s", szModule, szService);
str[MAXMODULELABELLENGTH-1] = 0;
- return CreateServiceFunction(str,serviceProc);
+ return CreateServiceFunction(str, serviceProc);
}
//Call the next service in the chain for this send operation
@@ -81,7 +81,7 @@ __inline static HANDLE CreateProtoServiceFunction(const char *szModule,const cha //called with. wParam must remain untouched but lParam is a CCSDATA structure
//that can be copied and modified if needed.
//Typically, the last line of any chaining protocol function is
-//return CallService(MS_PROTO_CHAINSEND,wParam,lParam);
+//return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
#define MS_PROTO_CHAINSEND "Proto/ChainSend"
//Call the next service in the chain for this receive operation
@@ -106,14 +106,14 @@ __inline static HANDLE CreateProtoServiceFunction(const char *szModule,const cha //Thread safety: me_proto_ack is completely thread safe since 0.1.2.0
//See the notes in core/modules.h under NotifyEventHooks()
#define MS_PROTO_BROADCASTACK "Proto/BroadcastAck"
-__inline static INT_PTR ProtoBroadcastAck(const char *szModule,HANDLE hContact,int type,int result,HANDLE hProcess,LPARAM lParam)
+__inline static INT_PTR ProtoBroadcastAck(const char *szModule, HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam)
{
ACKDATA ack={0};
ack.cbSize=sizeof(ACKDATA);
ack.szModule=szModule; ack.hContact=hContact;
ack.type=type; ack.result=result;
ack.hProcess=hProcess; ack.lParam=lParam;
- return CallService(MS_PROTO_BROADCASTACK,0,(LPARAM)&ack);
+ return CallService(MS_PROTO_BROADCASTACK, 0, (LPARAM)&ack);
}
/* -- Added during 0.3.4 (2004/09/27) development! -----
diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 5f997b593c..3eb934b532 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -36,9 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ******************************************
Only new style protocols (Miranda 0.9+) with m_iVersion set to 2 or higher
-support Unicode services documented below, all other support only ANSI.
+support Unicode services documented below, all other support only ANSI.
-For all other that do not support Unicode services, Miranda core will
+For all other that do not support Unicode services, Miranda core will
convert Unicode to ANSI and call the appropriate service.
*/
@@ -412,7 +412,7 @@ typedef struct { #define PS_ADDTOLIST "/AddToList"
//Adds a contact to the contact list given an auth, added or contacts event
-//wParam=MAKEWPARAM(flags,iContact)
+//wParam=MAKEWPARAM(flags, iContact)
//lParam=(LPARAM)(HANDLE)hDbEvent
//Returns a HANDLE to the new contact, or NULL on failure
//hDbEvent must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED
@@ -457,7 +457,7 @@ typedef struct { #define FILERESUME_SKIP 4
typedef struct {
int action; //a FILERESUME_ flag
- const FNAMECHAR *szFilename; //full path. Only valid if action==FILERESUME_RENAME
+ const FNAMECHAR *szFilename; //full path. Only valid if action == FILERESUME_RENAME
} PROTOFILERESUME;
#define PS_FILERESUME "/FileResume"
#define PS_FILERESUMEW "/FileResumeW"
@@ -490,7 +490,7 @@ typedef struct { // Asks protocol for the status message for a status
// wParam=(WORD) 0 for current status or a status id
// lParam=SGMA_xxx
-// Returns status msg or NULL if there is none. The protocol have to handle only the current
+// Returns status msg or NULL if there is none. The protocol have to handle only the current
// status. Handling messages for other statuses is optional.
// Remember to mir_free the return value
@@ -595,7 +595,7 @@ typedef struct { #define PSS_URL "/SendUrl"
//Send a set of contacts
-//wParam=MAKEWPARAM(flags,nContacts)
+//wParam=MAKEWPARAM(flags, nContacts)
//lParam=(LPARAM)(HANDLE*)hContactsList
//returns a hProcess corresponding to the one in the ack event, NULL on
//failure.
diff --git a/include/m_skin.h b/include/m_skin.h index 1b6880b210..b36620311a 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -31,9 +31,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //returns NULL if id is invalid, but will always succeed for a valid id
#define MS_SKIN_LOADICON "Skin/Icons/Load"
//nice function to wrap this:
-__inline static HICON LoadSkinnedIcon(int id) {return (HICON)CallService(MS_SKIN_LOADICON,id,0);}
-__inline static HANDLE LoadSkinnedIconHandle(int id) {return (HANDLE)CallService(MS_SKIN_LOADICON,id,1);}
-__inline static HICON LoadSkinnedIconBig(int id) {return (HICON)CallService(MS_SKIN_LOADICON,id,2);}
+__inline static HICON LoadSkinnedIcon(int id) {return (HICON)CallService(MS_SKIN_LOADICON, id, 0);}
+__inline static HANDLE LoadSkinnedIconHandle(int id) {return (HANDLE)CallService(MS_SKIN_LOADICON, id, 1);}
+__inline static HICON LoadSkinnedIconBig(int id) {return (HICON)CallService(MS_SKIN_LOADICON, id, 2);}
//event icons
#define SKINICON_EVENT_MESSAGE 100
@@ -109,8 +109,8 @@ __inline static HICON LoadSkinnedIconBig(int id) {return (HICON)CallService(MS_S #define MS_SKIN_LOADPROTOICON "Skin/Icons/LoadProto"
#define MS_SKIN_LOADPROTOICONBIG "Skin/Icons/LoadProtoBig"
//nice function to wrap this:
-__inline static HICON LoadSkinnedProtoIcon(const char *szProto,int status) {return (HICON)CallService(MS_SKIN_LOADPROTOICON,(WPARAM)szProto,status);}
-__inline static HICON LoadSkinnedProtoIconBig(const char *szProto,int status) {return (HICON)CallService(MS_SKIN_LOADPROTOICONBIG,(WPARAM)szProto,status);}
+__inline static HICON LoadSkinnedProtoIcon(const char *szProto, int status) {return (HICON)CallService(MS_SKIN_LOADPROTOICON, (WPARAM)szProto, status);}
+__inline static HICON LoadSkinnedProtoIconBig(const char *szProto, int status) {return (HICON)CallService(MS_SKIN_LOADPROTOICONBIG, (WPARAM)szProto, status);}
//add a new sound so it has a default and can be changed in the options dialog
//wParam=0
@@ -157,10 +157,10 @@ typedef struct { #define MS_SKIN_ADDNEWSOUND "Skin/Sounds/AddNew"
// inline only works after 0.3.4+ (2004/10/*)
-__inline static INT_PTR SkinAddNewSoundEx(const char *name,const char *section,const char *description)
+__inline static INT_PTR SkinAddNewSoundEx(const char *name, const char *section, const char *description)
{
SKINSOUNDDESCEX ssd;
- ZeroMemory(&ssd,sizeof(ssd));
+ ZeroMemory(&ssd, sizeof(ssd));
ssd.cbSize=sizeof(ssd);
ssd.pszName=name;
ssd.pszSection=section;
@@ -168,10 +168,10 @@ __inline static INT_PTR SkinAddNewSoundEx(const char *name,const char *section,c return CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);
}
-__inline static INT_PTR SkinAddNewSound(const char *name,const char *description,const char *defaultFile)
+__inline static INT_PTR SkinAddNewSound(const char *name, const char *description, const char *defaultFile)
{
SKINSOUNDDESC ssd;
- ZeroMemory(&ssd,sizeof(ssd));
+ ZeroMemory(&ssd, sizeof(ssd));
ssd.cbSize=sizeof(ssd);
ssd.pszName=name;
ssd.pszDescription=description;
@@ -180,7 +180,7 @@ __inline static INT_PTR SkinAddNewSound(const char *name,const char *description }
// 0.9.0+
-__inline static INT_PTR SkinAddNewSoundExT(const char *name,const TCHAR *section,const TCHAR *description)
+__inline static INT_PTR SkinAddNewSoundExT(const char *name, const TCHAR *section, const TCHAR *description)
{
SKINSOUNDDESCEX ssd = { 0 };
ssd.cbSize=sizeof(ssd);
@@ -191,7 +191,7 @@ __inline static INT_PTR SkinAddNewSoundExT(const char *name,const TCHAR *section return CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);
}
-__inline static INT_PTR SkinAddNewSoundT(const char *name,const TCHAR *description,const TCHAR *defaultFile)
+__inline static INT_PTR SkinAddNewSoundT(const char *name, const TCHAR *description, const TCHAR *defaultFile)
{
SKINSOUNDDESCEX ssd = { 0 };
ssd.cbSize=sizeof(ssd);
@@ -208,7 +208,7 @@ __inline static INT_PTR SkinAddNewSoundT(const char *name,const TCHAR *descripti //pszName should have been added with Skin/Sounds/AddNew, but if not the
//function will not fail, it will play the Windows default sound instead.
#define MS_SKIN_PLAYSOUND "Skin/Sounds/Play"
-__inline static INT_PTR SkinPlaySound(const char *name) {return CallService(MS_SKIN_PLAYSOUND,0,(LPARAM)name);}
+__inline static INT_PTR SkinPlaySound(const char *name) {return CallService(MS_SKIN_PLAYSOUND, 0, (LPARAM)name);}
//sent when the icons DLL has been changed in the options dialog, and everyone
//should re-make their image lists
diff --git a/include/m_ssl.h b/include/m_ssl.h index cba88e13c8..097847dfd5 100644 --- a/include/m_ssl.h +++ b/include/m_ssl.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ typedef struct extern SSL_API si;
/*
-a service to obtain the SSL API
+a service to obtain the SSL API
wParam = 0;
lParam = (LPARAM)(SSL_API*).
diff --git a/include/m_system.h b/include/m_system.h index 63a2002743..1b2ed6f11f 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -93,7 +93,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //wParam=(WPARAM)(HANDLE)hObject
//lParam=(LPARAM)(const char*)pszService
//returns 0 on success or nonzero on failure
-//Causes pszService to be CallService()d (wParam=hObject,lParam=0) from the
+//Causes pszService to be CallService()d (wParam=hObject, lParam=0) from the
//main thread whenever hObject is signalled.
//The Miranda message loop has a MsgWaitForMultipleObjects() call in it to
//implement this feature. See the documentation for that function for
@@ -172,19 +172,19 @@ __forceinline INT_PTR mir_getMMI( struct MM_INTERFACE* dest ) extern struct MM_INTERFACE mmi;
#define mir_alloc(n) mmi.mmi_malloc(n)
#define mir_free(ptr) mmi.mmi_free(ptr)
- #define mir_realloc(ptr,size) mmi.mmi_realloc(ptr,size)
+ #define mir_realloc(ptr, size) mmi.mmi_realloc(ptr, size)
#define mir_calloc(n) mmi.mmi_calloc(n)
#define mir_strdup(str) mmi.mmi_strdup(str)
#define mir_wstrdup(str) mmi.mmi_wstrdup(str)
#define mir_snprintf mmi.mir_snprintf
- #define mir_sntprintf mmi.mir_sntprintf
+ #define mir_sntprintf mmi.mir_sntprintf
#define mir_vsnprintf mmi.mir_vsnprintf
#define mir_vsntprintf mmi.mir_vsntprintf
- #define mir_a2u_cp(src,cp) mmi.mir_a2u_cp(src,cp)
+ #define mir_a2u_cp(src, cp) mmi.mir_a2u_cp(src, cp)
#define mir_a2u(src) mmi.mir_a2u(src)
- #define mir_u2a_cp(src,cp) mmi.mir_u2a_cp(src,cp)
+ #define mir_u2a_cp(src, cp) mmi.mir_u2a_cp(src, cp)
#define mir_u2a(src) mmi.mir_u2a(src)
#else
char* mir_strdup(const char *src);
@@ -212,9 +212,9 @@ wParam=0, lParam = (LPARAM)LIST_INTERFACE* typedef int ( *FSortFunc )( void*, void* );
-// Assumes first 32 bit value of the data is the numeric key
+// Assumes first 32 bit value of the data is the numeric key
// and uses it to perform sort/search operations, this results
-// in much better performance as no compare function calls needed
+// in much better performance as no compare function calls needed
// Incredibly useful for Hash Tables
#define NumericKeySort (FSortFunc)(void*) -1
#define HandleKeySort (FSortFunc)(void*) -2
@@ -293,7 +293,7 @@ struct UTF8_INTERFACE // the input buffer remains unchanged
wchar_t* ( *utf8_decodeW )( const char* str );
- // returns the predicted length of the utf-8 string
+ // returns the predicted length of the utf-8 string
int ( *utf8_lenW )( const wchar_t* src );
};
@@ -307,11 +307,11 @@ __forceinline INT_PTR mir_getUTFI( struct UTF8_INTERFACE* dest ) extern struct UTF8_INTERFACE utfi;
-#define mir_utf8decode(A,B) utfi.utf8_decode(A,B)
-#define mir_utf8decodecp(A,B,C) utfi.utf8_decodecp(A,B,C)
+#define mir_utf8decode(A, B) utfi.utf8_decode(A, B)
+#define mir_utf8decodecp(A, B, C) utfi.utf8_decodecp(A, B, C)
#define mir_utf8decodeW(A) utfi.utf8_decodeW(A)
#define mir_utf8encode(A) utfi.utf8_encode(A)
-#define mir_utf8encodecp(A,B) utfi.utf8_encodecp(A,B)
+#define mir_utf8encodecp(A, B) utfi.utf8_encodecp(A, B)
#define mir_utf8encodeW(A) utfi.utf8_encodeW(A)
#define mir_utf8lenW(A) utfi.utf8_lenW(A)
@@ -385,10 +385,10 @@ __forceinline char* mir_utf8decodeA(const char* src) int run=1;
for (;run;)
{
- Beep(4391,500);
- SleepEx(1500,TRUE);
+ Beep(4391, 500);
+ SleepEx(1500, TRUE);
if (Miranda_Terminated()) {
- Beep(5000,150); run=0;
+ Beep(5000, 150); run=0;
} //if
} //for
}
@@ -577,7 +577,7 @@ __inline static INT_PTR Miranda_Terminated(void) #else
__inline static INT_PTR Miranda_Terminated(void)
{
- return CallService(MS_SYSTEM_TERMINATED,0,0);
+ return CallService(MS_SYSTEM_TERMINATED, 0, 0);
}
#endif
diff --git a/include/m_timezones.h b/include/m_timezones.h index 35a5651696..335cce00f2 100644 --- a/include/m_timezones.h +++ b/include/m_timezones.h @@ -77,7 +77,7 @@ typedef struct extern TIME_API tmi;
/*
-a service to obtain the Time API
+a service to obtain the Time API
wParam = 0;
lParam = (LPARAM)(TIME_API*).
diff --git a/include/m_url.h b/include/m_url.h index e943fb6c01..1ca41eac5b 100644 --- a/include/m_url.h +++ b/include/m_url.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_userinfo.h b/include/m_userinfo.h index a30243e8ea..bb11722b1c 100644 --- a/include/m_userinfo.h +++ b/include/m_userinfo.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/m_utils.h b/include/m_utils.h index 7ea24f528e..4d5ee302a7 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -70,7 +70,7 @@ typedef struct { SIZE dlgOriginalSize; //size of dialog client area in template
SIZE dlgNewSize; //current size of dialog client area
} UTILRESIZECONTROL;
-typedef int (*DIALOGRESIZERPROC)(HWND hwndDlg,LPARAM lParam,UTILRESIZECONTROL *urc);
+typedef int (*DIALOGRESIZERPROC)(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc);
typedef struct {
int cbSize;
HWND hwndDlg;
@@ -130,18 +130,18 @@ typedef struct { HANDLE hContact;
} WINDOWLISTENTRY;
#define MS_UTILS_ADDTOWINDOWLIST "Utils/AddToWindowList"
-__inline static INT_PTR WindowList_Add(HANDLE hList,HWND hwnd,HANDLE hContact) {
+__inline static INT_PTR WindowList_Add(HANDLE hList, HWND hwnd, HANDLE hContact) {
WINDOWLISTENTRY wle;
wle.hList=hList; wle.hwnd=hwnd; wle.hContact=hContact;
- return CallService(MS_UTILS_ADDTOWINDOWLIST,0,(LPARAM)&wle);
+ return CallService(MS_UTILS_ADDTOWINDOWLIST, 0, (LPARAM)&wle);
}
//removes a window from the specified window list v0.1.0.1+
//wParam=(WPARAM)(HANDLE)hList
//lParam=(LPARAM)(HWND)hwnd
//returns 0 on success, nonzero on failure
#define MS_UTILS_REMOVEFROMWINDOWLIST "Utils/RemoveFromWindowList"
-__inline static INT_PTR WindowList_Remove(HANDLE hList,HWND hwnd) {
- return CallService(MS_UTILS_REMOVEFROMWINDOWLIST,(WPARAM)hList,(LPARAM)hwnd);
+__inline static INT_PTR WindowList_Remove(HANDLE hList, HWND hwnd) {
+ return CallService(MS_UTILS_REMOVEFROMWINDOWLIST, (WPARAM)hList, (LPARAM)hwnd);
}
//finds a window given the hContact v0.1.0.1+
@@ -149,8 +149,8 @@ __inline static INT_PTR WindowList_Remove(HANDLE hList,HWND hwnd) { //lParam=(WPARAM)(HANDLE)hContact
//returns the window handle on success, or NULL on failure
#define MS_UTILS_FINDWINDOWINLIST "Utils/FindWindowInList"
-__inline static HWND WindowList_Find(HANDLE hList,HANDLE hContact) {
- return (HWND)CallService(MS_UTILS_FINDWINDOWINLIST,(WPARAM)hList,(LPARAM)hContact);
+__inline static HWND WindowList_Find(HANDLE hList, HANDLE hContact) {
+ return (HWND)CallService(MS_UTILS_FINDWINDOWINLIST, (WPARAM)hList, (LPARAM)hContact);
}
//broadcasts a message to all windows in a list v0.1.0.1+
@@ -159,10 +159,10 @@ __inline static HWND WindowList_Find(HANDLE hList,HANDLE hContact) { //returns 0 on success, nonzero on failure
//Only msg.message, msg.wParam and msg.lParam are used
#define MS_UTILS_BROADCASTTOWINDOWLIST "Utils/BroadcastToWindowList"
-__inline static INT_PTR WindowList_Broadcast(HANDLE hList,UINT message,WPARAM wParam,LPARAM lParam) {
+__inline static INT_PTR WindowList_Broadcast(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) {
MSG msg;
msg.message=message; msg.wParam=wParam; msg.lParam=lParam;
- return CallService(MS_UTILS_BROADCASTTOWINDOWLIST,(WPARAM)hList,(LPARAM)&msg);
+ return CallService(MS_UTILS_BROADCASTTOWINDOWLIST, (WPARAM)hList, (LPARAM)&msg);
}
/*
@@ -178,10 +178,10 @@ __inline static INT_PTR WindowList_Broadcast(HANDLE hList,UINT message,WPARAM wP */
#define MS_UTILS_BROADCASTTOWINDOWLIST_ASYNC "Utils/BroadcastToWindowListAsync"
-__inline static INT_PTR WindowList_BroadcastAsync(HANDLE hList,UINT message,WPARAM wParam,LPARAM lParam) {
+__inline static INT_PTR WindowList_BroadcastAsync(HANDLE hList, UINT message, WPARAM wParam, LPARAM lParam) {
MSG msg;
msg.message=message; msg.wParam=wParam; msg.lParam=lParam;
- return CallService(MS_UTILS_BROADCASTTOWINDOWLIST_ASYNC,(WPARAM)hList,(LPARAM)&msg);
+ return CallService(MS_UTILS_BROADCASTTOWINDOWLIST_ASYNC, (WPARAM)hList, (LPARAM)&msg);
}
/***************************** Hyperlink windows ********************************/
@@ -213,10 +213,10 @@ typedef struct { const char *szNamePrefix; //text to prefix on "x", "width", etc, to form setting names
} SAVEWINDOWPOS;
#define MS_UTILS_SAVEWINDOWPOSITION "Utils/SaveWindowPos"
-__inline static INT_PTR Utils_SaveWindowPosition(HWND hwnd,HANDLE hContact,const char *szModule,const char *szNamePrefix) {
+__inline static INT_PTR Utils_SaveWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) {
SAVEWINDOWPOS swp;
swp.hwnd=hwnd; swp.hContact=hContact; swp.szModule=szModule; swp.szNamePrefix=szNamePrefix;
- return CallService(MS_UTILS_SAVEWINDOWPOSITION,0,(LPARAM)&swp);
+ return CallService(MS_UTILS_SAVEWINDOWPOSITION, 0, (LPARAM)&swp);
}
//restores the position of a window from the database v0.1.1.0+
@@ -232,18 +232,18 @@ __inline static INT_PTR Utils_SaveWindowPosition(HWND hwnd,HANDLE hContact,const #define RWPF_NOACTIVATE 4 //show but don't activate v0.3.3.0+
#define RWPF_HIDDEN 8 //make it hidden
#define MS_UTILS_RESTOREWINDOWPOSITION "Utils/RestoreWindowPos"
-__inline static INT_PTR Utils_RestoreWindowPositionEx(HWND hwnd,int flags,HANDLE hContact,const char *szModule,const char *szNamePrefix) {
+__inline static INT_PTR Utils_RestoreWindowPositionEx(HWND hwnd, int flags, HANDLE hContact, const char *szModule, const char *szNamePrefix) {
SAVEWINDOWPOS swp;
swp.hwnd=hwnd; swp.hContact=hContact; swp.szModule=szModule; swp.szNamePrefix=szNamePrefix;
- return CallService(MS_UTILS_RESTOREWINDOWPOSITION,flags,(LPARAM)&swp);
+ return CallService(MS_UTILS_RESTOREWINDOWPOSITION, flags, (LPARAM)&swp);
}
-__inline static INT_PTR Utils_RestoreWindowPosition(HWND hwnd,HANDLE hContact,const char *szModule,const char *szNamePrefix) {
+__inline static INT_PTR Utils_RestoreWindowPosition(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) {
return Utils_RestoreWindowPositionEx(hwnd, 0, hContact, szModule, szNamePrefix);
}
-__inline static INT_PTR Utils_RestoreWindowPositionNoSize(HWND hwnd,HANDLE hContact,const char *szModule,const char *szNamePrefix) {
+__inline static INT_PTR Utils_RestoreWindowPositionNoSize(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) {
return Utils_RestoreWindowPositionEx(hwnd, RWPF_NOSIZE, hContact, szModule, szNamePrefix);
}
-__inline static INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd,HANDLE hContact,const char *szModule,const char *szNamePrefix) {
+__inline static INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd, HANDLE hContact, const char *szModule, const char *szNamePrefix) {
return Utils_RestoreWindowPositionEx(hwnd, RWPF_NOMOVE, hContact, szModule, szNamePrefix);
}
@@ -253,7 +253,7 @@ __inline static INT_PTR Utils_RestoreWindowPositionNoMove(HWND hwnd,HANDLE hCont //returns <0 on error, 0 if not changed the rect, 1 if changed the rect
#define MS_UTILS_ASSERTINSIDESCREEN "Utils/AssertInsideScreen"
__inline static INT_PTR Utils_AssertInsideScreen(RECT *rc) {
- return CallService(MS_UTILS_ASSERTINSIDESCREEN,(WPARAM)rc,0);
+ return CallService(MS_UTILS_ASSERTINSIDESCREEN, (WPARAM)rc, 0);
}
/************************ Colour Picker Control (0.1.2.1+) **********************/
@@ -474,7 +474,7 @@ typedef struct { mir_sha1_long_t H[5];
mir_sha1_long_t W[80];
int lenW;
- mir_sha1_long_t sizeHi,sizeLo;
+ mir_sha1_long_t sizeHi, sizeLo;
} mir_sha1_ctx;
struct SHA1_INTERFACE
diff --git a/include/m_xml.h b/include/m_xml.h index 7ce8f6efa2..0ad119d326 100644 --- a/include/m_xml.h +++ b/include/m_xml.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -92,7 +92,7 @@ typedef struct void ( *setClear )( HXML, int i, LPCTSTR lpszValue );
int ( *getElementCount )( HXML );
int ( *getElement )( HXML, XML_ELEMENT_POS n, XML_ELEMENT_TYPE *type, HXML *child, LPCTSTR *value, LPCTSTR *name, LPCTSTR *openTag, LPCTSTR *closeTag );
- // With getElement() it's possible to enumerate all the different contents (attribute,child,text, clear) of the current node. The order is reflecting the order of the original file/string. NOTE: 0 <= i < getElementCount().
+ // With getElement() it's possible to enumerate all the different contents (attribute, child, text, clear) of the current node. The order is reflecting the order of the original file/string. NOTE: 0 <= i < getElementCount().
// type, child, value, name, openTag, closeTag will be filled on return, depending on type:
// for XML_ELEM_TYPE_CHILD, child is valid;
// for XML_ELEM_TYPE_ATTRIBUTE, name and value are valid;
@@ -119,7 +119,7 @@ typedef struct extern XML_API xi;
/*
-a service to obtain the XML API
+a service to obtain the XML API
wParam = 0;
lParam = (LPARAM)(XML_API*).
diff --git a/include/msapi/vsstyle.h b/include/msapi/vsstyle.h index b65e223b51..bcd4dcbf56 100644 --- a/include/msapi/vsstyle.h +++ b/include/msapi/vsstyle.h @@ -15,7 +15,7 @@ //
-// AEROWIZARDSTYLE class parts and states
+// AEROWIZARDSTYLE class parts and states
//
#define VSCLASS_AEROWIZARDSTYLE L"AEROWIZARDSTYLE"
#define VSCLASS_AEROWIZARD L"AEROWIZARD"
@@ -45,7 +45,7 @@ enum CONTENTAREASTATES { //
-// BUTTONSTYLE class parts and states
+// BUTTONSTYLE class parts and states
//
#define VSCLASS_BUTTONSTYLE L"BUTTONSTYLE"
#define VSCLASS_BUTTON L"BUTTON"
@@ -129,7 +129,7 @@ enum COMMANDLINKGLYPHSTATES { //
-// COMBOBOXSTYLE class parts and states
+// COMBOBOXSTYLE class parts and states
//
#define VSCLASS_COMBOBOXSTYLE L"COMBOBOXSTYLE"
#define VSCLASS_COMBOBOX L"COMBOBOX"
@@ -198,7 +198,7 @@ enum CUEBANNERSTATES { //
-// COMMUNICATIONSSTYLE class parts and states
+// COMMUNICATIONSSTYLE class parts and states
//
#define VSCLASS_COMMUNICATIONSSTYLE L"COMMUNICATIONSSTYLE"
#define VSCLASS_COMMUNICATIONS L"COMMUNICATIONS"
@@ -217,7 +217,7 @@ enum TABSTATES { //
-// CONTROLPANELSTYLE class parts and states
+// CONTROLPANELSTYLE class parts and states
//
#define VSCLASS_CONTROLPANELSTYLE L"CONTROLPANELSTYLE"
#define VSCLASS_CONTROLPANEL L"CONTROLPANEL"
@@ -275,7 +275,7 @@ enum SECTIONTITLELINKSTATES { //
-// DATEPICKERSTYLE class parts and states
+// DATEPICKERSTYLE class parts and states
//
#define VSCLASS_DATEPICKERSTYLE L"DATEPICKERSTYLE"
#define VSCLASS_DATEPICKER L"DATEPICKER"
@@ -310,7 +310,7 @@ enum SHOWCALENDARBUTTONRIGHTSTATES { //
-// DRAGDROPSTYLE class parts and states
+// DRAGDROPSTYLE class parts and states
//
#define VSCLASS_DRAGDROPSTYLE L"DRAGDROPSTYLE"
#define VSCLASS_DRAGDROP L"DRAGDROP"
@@ -360,7 +360,7 @@ enum NONESTATES { //
-// EDITSTYLE class parts and states
+// EDITSTYLE class parts and states
//
#define VSCLASS_EDITSTYLE L"EDITSTYLE"
#define VSCLASS_EDIT L"EDIT"
@@ -436,7 +436,7 @@ enum EDITBORDER_HVSCROLLSTATES { //
-// EXPLORERBARSTYLE class parts and states
+// EXPLORERBARSTYLE class parts and states
//
#define VSCLASS_EXPLORERBARSTYLE L"EXPLORERBARSTYLE"
#define VSCLASS_EXPLORERBAR L"EXPLORERBAR"
@@ -505,7 +505,7 @@ enum SPECIALGROUPEXPANDSTATES { //
-// FLYOUTSTYLE class parts and states
+// FLYOUTSTYLE class parts and states
//
#define VSCLASS_FLYOUTSTYLE L"FLYOUTSTYLE"
#define VSCLASS_FLYOUT L"FLYOUT"
@@ -547,7 +547,7 @@ enum LINKHEADERSTATES { //
-// HEADERSTYLE class parts and states
+// HEADERSTYLE class parts and states
//
#define VSCLASS_HEADERSTYLE L"HEADERSTYLE"
#define VSCLASS_HEADER L"HEADER"
@@ -620,7 +620,7 @@ enum HEADEROVERFLOWSTATES { //
-// LISTBOXSTYLE class parts and states
+// LISTBOXSTYLE class parts and states
//
#define VSCLASS_LISTBOXSTYLE L"LISTBOXSTYLE"
#define VSCLASS_LISTBOX L"LISTBOX"
@@ -672,7 +672,7 @@ enum ITEMSTATES { //
-// LISTVIEWSTYLE class parts and states
+// LISTVIEWSTYLE class parts and states
//
#define VSCLASS_LISTVIEWSTYLE L"LISTVIEWSTYLE"
#define VSCLASS_LISTVIEW L"LISTVIEW"
@@ -753,7 +753,7 @@ enum COLLAPSEBUTTONSTATES { //
-// MENUSTYLE class parts and states
+// MENUSTYLE class parts and states
//
#define VSCLASS_MENUSTYLE L"MENUSTYLE"
#define VSCLASS_MENU L"MENU"
@@ -844,7 +844,7 @@ enum SYSTEMRESTORESTATES { //
-// NAVIGATION class parts and states
+// NAVIGATION class parts and states
//
#define VSCLASS_NAVIGATION L"NAVIGATION"
@@ -877,7 +877,7 @@ enum NAV_MENUBUTTONSTATES { //
-// PROGRESSSTYLE class parts and states
+// PROGRESSSTYLE class parts and states
//
#define VSCLASS_PROGRESSSTYLE L"PROGRESSSTYLE"
#define VSCLASS_PROGRESS L"PROGRESS"
@@ -925,7 +925,7 @@ enum FILLVERTSTATES { //
-// REBARSTYLE class parts and states
+// REBARSTYLE class parts and states
//
#define VSCLASS_REBARSTYLE L"REBARSTYLE"
#define VSCLASS_REBAR L"REBAR"
@@ -969,7 +969,7 @@ enum SPLITTERVERTSTATES { //
-// SCROLLBARSTYLE class parts and states
+// SCROLLBARSTYLE class parts and states
//
#define VSCLASS_SCROLLBARSTYLE L"SCROLLBARSTYLE"
#define VSCLASS_SCROLLBAR L"SCROLLBAR"
@@ -1033,7 +1033,7 @@ enum SIZEBOXSTATES { //
-// SPINSTYLE class parts and states
+// SPINSTYLE class parts and states
//
#define VSCLASS_SPINSTYLE L"SPINSTYLE"
#define VSCLASS_SPIN L"SPIN"
@@ -1077,7 +1077,7 @@ enum DOWNHORZSTATES { //
-// STATUSSTYLE class parts and states
+// STATUSSTYLE class parts and states
//
#define VSCLASS_STATUSSTYLE L"STATUSSTYLE"
#define VSCLASS_STATUS L"STATUS"
@@ -1092,7 +1092,7 @@ enum STATUSPARTS { //
-// TABSTYLE class parts and states
+// TABSTYLE class parts and states
//
#define VSCLASS_TABSTYLE L"TABSTYLE"
#define VSCLASS_TAB L"TAB"
@@ -1179,7 +1179,7 @@ enum TOPTABITEMBOTHEDGESTATES { //
-// TASKDIALOGSTYLE class parts and states
+// TASKDIALOGSTYLE class parts and states
//
#define VSCLASS_TASKDIALOGSTYLE L"TASKDIALOGSTYLE"
#define VSCLASS_TASKDIALOG L"TASKDIALOG"
@@ -1225,7 +1225,7 @@ enum EXPANDOBUTTONSTATES { //
-// TEXTSTYLE class parts and states
+// TEXTSTYLE class parts and states
//
#define VSCLASS_TEXTSTYLE L"TEXTSTYLE"
@@ -1255,7 +1255,7 @@ enum CONTROLLABELSTATES { //
-// TOOLBARSTYLE class parts and states
+// TOOLBARSTYLE class parts and states
//
#define VSCLASS_TOOLBARSTYLE L"TOOLBARSTYLE"
#define VSCLASS_TOOLBAR L"TOOLBAR"
@@ -1285,7 +1285,7 @@ enum TOOLBARSTYLESTATES { //
-// TOOLTIPSTYLE class parts and states
+// TOOLTIPSTYLE class parts and states
//
#define VSCLASS_TOOLTIPSTYLE L"TOOLTIPSTYLE"
#define VSCLASS_TOOLTIP L"TOOLTIP"
@@ -1335,7 +1335,7 @@ enum WRENCHSTATES { //
-// TRACKBARSTYLE class parts and states
+// TRACKBARSTYLE class parts and states
//
#define VSCLASS_TRACKBARSTYLE L"TRACKBARSTYLE"
#define VSCLASS_TRACKBAR L"TRACKBAR"
@@ -1425,7 +1425,7 @@ enum TICSVERTSTATES { //
-// TREEVIEWSTYLE class parts and states
+// TREEVIEWSTYLE class parts and states
//
#define VSCLASS_TREEVIEWSTYLE L"TREEVIEWSTYLE"
#define VSCLASS_TREEVIEW L"TREEVIEW"
@@ -1460,7 +1460,7 @@ enum HOTGLYPHSTATES { //
-// WINDOWSTYLE class parts and states
+// WINDOWSTYLE class parts and states
//
#define VSCLASS_WINDOWSTYLE L"WINDOWSTYLE"
#define VSCLASS_WINDOW L"WINDOW"
diff --git a/include/msapi/vssym32.h b/include/msapi/vssym32.h index ea3d3cbc9f..ae1c05c405 100644 --- a/include/msapi/vssym32.h +++ b/include/msapi/vssym32.h @@ -442,7 +442,7 @@ enum GLYPHFONTSIZINGTYPE { //
-// LINK class parts and states
+// LINK class parts and states
//
#define VSCLASS_LINK L"LINK"
@@ -457,7 +457,7 @@ enum HYPERLINKSTATES { //
-// EMPTYMARKUP class parts and states
+// EMPTYMARKUP class parts and states
//
#define VSCLASS_EMPTYMARKUP L"EMPTYMARKUP"
@@ -472,7 +472,7 @@ enum MARKUPTEXTSTATES { //
-// STATIC class parts and states
+// STATIC class parts and states
//
#define VSCLASS_STATIC L"STATIC"
@@ -482,7 +482,7 @@ enum STATICPARTS { //
-// PAGE class parts and states
+// PAGE class parts and states
//
#define VSCLASS_PAGE L"PAGE"
@@ -495,7 +495,7 @@ enum PAGEPARTS { //
-// MONTHCAL class parts and states
+// MONTHCAL class parts and states
//
#define VSCLASS_MONTHCAL L"MONTHCAL"
@@ -563,7 +563,7 @@ enum NAVPREVSTATES { //
-// CLOCK class parts and states
+// CLOCK class parts and states
//
#define VSCLASS_CLOCK L"CLOCK"
@@ -579,7 +579,7 @@ enum CLOCKSTATES { //
-// TRAYNOTIFY class parts and states
+// TRAYNOTIFY class parts and states
//
#define VSCLASS_TRAYNOTIFY L"TRAYNOTIFY"
@@ -590,7 +590,7 @@ enum TRAYNOTIFYPARTS { //
-// TASKBAR class parts and states
+// TASKBAR class parts and states
//
#define VSCLASS_TASKBAR L"TASKBAR"
@@ -607,7 +607,7 @@ enum TASKBARPARTS { //
-// TASKBAND class parts and states
+// TASKBAND class parts and states
//
#define VSCLASS_TASKBAND L"TASKBAND"
@@ -619,7 +619,7 @@ enum TASKBANDPARTS { //
-// STARTPANEL class parts and states
+// STARTPANEL class parts and states
//
#define VSCLASS_STARTPANEL L"STARTPANEL"
@@ -689,7 +689,7 @@ enum LOGOFFBUTTONSSTATES { //
-// MENUBAND class parts and states
+// MENUBAND class parts and states
//
#define VSCLASS_MENUBAND L"MENUBAND"
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index edf35b99b2..d81fd6f4cd 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_plugins.h"
-#define PLUGIN_MAKE_VERSION(a,b,c,d) (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
+#define PLUGIN_MAKE_VERSION(a, b, c, d) (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
#define MAXMODULELABELLENGTH 64
#if defined( _UNICODE )
@@ -148,15 +148,15 @@ typedef struct { #define ME_SYSTEM_MODULEUNLOAD "Miranda/System/UnloadModule"
#ifndef MODULES_H_
- typedef int (*MIRANDAHOOK)(WPARAM,LPARAM);
- typedef int (*MIRANDAHOOKPARAM)(WPARAM,LPARAM,LPARAM);
- typedef int (*MIRANDAHOOKOBJ)(void*,WPARAM,LPARAM);
- typedef int (*MIRANDAHOOKOBJPARAM)(void*,WPARAM,LPARAM,LPARAM);
+ typedef int (*MIRANDAHOOK)(WPARAM, LPARAM);
+ typedef int (*MIRANDAHOOKPARAM)(WPARAM, LPARAM, LPARAM);
+ typedef int (*MIRANDAHOOKOBJ)(void*, WPARAM, LPARAM);
+ typedef int (*MIRANDAHOOKOBJPARAM)(void*, WPARAM, LPARAM, LPARAM);
- typedef INT_PTR (*MIRANDASERVICE)(WPARAM,LPARAM);
- typedef INT_PTR (*MIRANDASERVICEPARAM)(WPARAM,LPARAM,LPARAM);
- typedef INT_PTR (*MIRANDASERVICEOBJ)(void*,WPARAM,LPARAM);
- typedef INT_PTR (*MIRANDASERVICEOBJPARAM)(void*,WPARAM,LPARAM,LPARAM);
+ typedef INT_PTR (*MIRANDASERVICE)(WPARAM, LPARAM);
+ typedef INT_PTR (*MIRANDASERVICEPARAM)(WPARAM, LPARAM, LPARAM);
+ typedef INT_PTR (*MIRANDASERVICEOBJ)(void*, WPARAM, LPARAM);
+ typedef INT_PTR (*MIRANDASERVICEOBJPARAM)(void*, WPARAM, LPARAM, LPARAM);
#ifdef _WIN64
#define CALLSERVICE_NOTFOUND ((INT_PTR)0x8000000000000000)
@@ -170,27 +170,27 @@ typedef struct { typedef struct tagPLUGINLINK {
HANDLE (*CreateHookableEvent)(const char *);
int (*DestroyHookableEvent)(HANDLE);
- int (*NotifyEventHooks)(HANDLE,WPARAM,LPARAM);
- HANDLE (*HookEvent)(const char *,MIRANDAHOOK);
- HANDLE (*HookEventMessage)(const char *,HWND,UINT);
+ int (*NotifyEventHooks)(HANDLE, WPARAM, LPARAM);
+ HANDLE (*HookEvent)(const char *, MIRANDAHOOK);
+ HANDLE (*HookEventMessage)(const char *, HWND, UINT);
int (*UnhookEvent)(HANDLE);
- HANDLE (*CreateServiceFunction)(const char *,MIRANDASERVICE);
- HANDLE (*CreateTransientServiceFunction)(const char *,MIRANDASERVICE);
+ HANDLE (*CreateServiceFunction)(const char *, MIRANDASERVICE);
+ HANDLE (*CreateTransientServiceFunction)(const char *, MIRANDASERVICE);
int (*DestroyServiceFunction)(HANDLE);
- INT_PTR (*CallService)(const char *,WPARAM,LPARAM);
+ INT_PTR (*CallService)(const char *, WPARAM, LPARAM);
int (*ServiceExists)(const char *); //v0.1.0.1+
- INT_PTR (*CallServiceSync)(const char *,WPARAM,LPARAM); //v0.3.3+
+ INT_PTR (*CallServiceSync)(const char *, WPARAM, LPARAM); //v0.3.3+
int (*CallFunctionAsync) (void (__stdcall *)(void *), void *); //v0.3.4+
int (*SetHookDefaultForHookableEvent) (HANDLE, MIRANDAHOOK); // v0.3.4 (2004/09/15)
- HANDLE (*CreateServiceFunctionParam)(const char *,MIRANDASERVICEPARAM,LPARAM); // v0.7+ (2007/04/24)
- int (*NotifyEventHooksDirect)(HANDLE,WPARAM,LPARAM); // v0.7+
+ HANDLE (*CreateServiceFunctionParam)(const char *, MIRANDASERVICEPARAM, LPARAM); // v0.7+ (2007/04/24)
+ int (*NotifyEventHooksDirect)(HANDLE, WPARAM, LPARAM); // v0.7+
INT_PTR (*CallProtoService)(const char *, const char *, WPARAM, LPARAM );
INT_PTR (*CallContactService)( HANDLE, const char *, WPARAM, LPARAM );
- HANDLE (*HookEventParam)(const char *,MIRANDAHOOKPARAM,LPARAM);
- HANDLE (*HookEventObj)(const char *,MIRANDAHOOKOBJ, void* );
+ HANDLE (*HookEventParam)(const char *, MIRANDAHOOKPARAM, LPARAM);
+ HANDLE (*HookEventObj)(const char *, MIRANDAHOOKOBJ, void* );
HANDLE (*HookEventObjParam)(const char *, MIRANDAHOOKOBJPARAM, void*, LPARAM);
- HANDLE (*CreateServiceFunctionObj)(const char *,MIRANDASERVICEOBJ,void*);
- HANDLE (*CreateServiceFunctionObjParam)(const char *,MIRANDASERVICEOBJPARAM,void*,LPARAM);
+ HANDLE (*CreateServiceFunctionObj)(const char *, MIRANDASERVICEOBJ, void*);
+ HANDLE (*CreateServiceFunctionObjParam)(const char *, MIRANDASERVICEOBJPARAM, void*, LPARAM);
void (*KillObjectServices)(void *);
void (*KillObjectEventHooks)(void *);
} PLUGINLINK;
@@ -201,27 +201,27 @@ typedef struct tagPLUGINLINK { extern PLUGINLINK *pluginLink;
#define CreateHookableEvent(a) pluginLink->CreateHookableEvent(a)
#define DestroyHookableEvent(a) pluginLink->DestroyHookableEvent(a)
- #define NotifyEventHooks(a,b,c) pluginLink->NotifyEventHooks(a,b,c)
- #define HookEventMessage(a,b,c) pluginLink->HookEventMessage(a,b,c)
- #define HookEvent(a,b) pluginLink->HookEvent(a,b)
+ #define NotifyEventHooks(a, b, c) pluginLink->NotifyEventHooks(a, b, c)
+ #define HookEventMessage(a, b, c) pluginLink->HookEventMessage(a, b, c)
+ #define HookEvent(a, b) pluginLink->HookEvent(a, b)
#define UnhookEvent(a) pluginLink->UnhookEvent(a)
- #define CreateServiceFunction(a,b) pluginLink->CreateServiceFunction(a,b)
- #define CreateTransientServiceFunction(a,b) pluginLink->CreateTransientServiceFunction(a,b)
+ #define CreateServiceFunction(a, b) pluginLink->CreateServiceFunction(a, b)
+ #define CreateTransientServiceFunction(a, b) pluginLink->CreateTransientServiceFunction(a, b)
#define DestroyServiceFunction(a) pluginLink->DestroyServiceFunction(a)
- #define CallService(a,b,c) pluginLink->CallService(a,b,c)
+ #define CallService(a, b, c) pluginLink->CallService(a, b, c)
#define ServiceExists(a) pluginLink->ServiceExists(a)
- #define CallServiceSync(a,b,c) pluginLink->CallServiceSync(a,b,c)
- #define CallFunctionAsync(a,b) pluginLink->CallFunctionAsync(a,b)
- #define SetHookDefaultForHookableEvent(a,b) pluginLink->SetHookDefaultForHookableEvent(a,b)
- #define CreateServiceFunctionParam(a,b,c) pluginLink->CreateServiceFunctionParam(a,b,c)
- #define NotifyEventHooksDirect(a,b,c) pluginLink->NotifyEventHooksDirect(a,b,c)
- #define CallProtoService(a,b,c,d) pluginLink->CallProtoService(a,b,c,d)
- #define CallContactService(a,b,c,d) pluginLink->CallContactService(a,b,c,d)
- #define HookEventParam(a,b,c) pluginLink->HookEventParam(a,b,c)
- #define HookEventObj(a,b,c) pluginLink->HookEventObj(a,b,c)
- #define HookEventObjParam(a,b,c,d) pluginLink->HookEventObjParam(a,b,c,d)
- #define CreateServiceFunctionObj(a,b,c) pluginLink->CreateServiceFunctionObj(a,b,c)
- #define CreateServiceFunctionObjParam(a,b,c,d) pluginLink->CreateServiceFunctionObjParam(a,b,c,d)
+ #define CallServiceSync(a, b, c) pluginLink->CallServiceSync(a, b, c)
+ #define CallFunctionAsync(a, b) pluginLink->CallFunctionAsync(a, b)
+ #define SetHookDefaultForHookableEvent(a, b) pluginLink->SetHookDefaultForHookableEvent(a, b)
+ #define CreateServiceFunctionParam(a, b, c) pluginLink->CreateServiceFunctionParam(a, b, c)
+ #define NotifyEventHooksDirect(a, b, c) pluginLink->NotifyEventHooksDirect(a, b, c)
+ #define CallProtoService(a, b, c, d) pluginLink->CallProtoService(a, b, c, d)
+ #define CallContactService(a, b, c, d) pluginLink->CallContactService(a, b, c, d)
+ #define HookEventParam(a, b, c) pluginLink->HookEventParam(a, b, c)
+ #define HookEventObj(a, b, c) pluginLink->HookEventObj(a, b, c)
+ #define HookEventObjParam(a, b, c, d) pluginLink->HookEventObjParam(a, b, c, d)
+ #define CreateServiceFunctionObj(a, b, c) pluginLink->CreateServiceFunctionObj(a, b, c)
+ #define CreateServiceFunctionObjParam(a, b, c, d) pluginLink->CreateServiceFunctionObjParam(a, b, c, d)
#define KillObjectServices(a) pluginLink->KillObjectServices(a)
#define KillObjectEventHooks(a) pluginLink->KillObjectEventHooks(a)
#endif
diff --git a/include/statusmodes.h b/include/statusmodes.h index da973ab79c..2120f2d979 100644 --- a/include/statusmodes.h +++ b/include/statusmodes.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2008 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/include/win2k.h b/include/win2k.h index 37df1d8f12..d71504dc2b 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -41,15 +41,15 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ //These macros use the above order, not release order.
#define WinVerMajor() LOBYTE(LOWORD(GetVersion()))
#define WinVerMinor() HIBYTE(LOWORD(GetVersion()))
-#define IsWinVerNT() ((GetVersion()&0x80000000)==0)
+#define IsWinVerNT() ((GetVersion()&0x80000000) == 0)
// IsWinVerNT4Plus() is buggy, Windows 98 is 4.10.1998
#define IsWinVerNT4Plus() (WinVerMajor()>=5 || WinVerMinor()>0 || IsWinVerNT())
-#define IsWinVer98Plus() (LOWORD(GetVersion())!=4)
+#define IsWinVer98Plus() (LOWORD(GetVersion()) != 4)
#define IsWinVerMEPlus() (WinVerMajor()>=5 || WinVerMinor()>10)
#define IsWinVer2000Plus() (WinVerMajor()>=5 && IsWinVerNT())
-#define IsWinVerXPPlus() (WinVerMajor()>=5 && LOWORD(GetVersion())!=5)
+#define IsWinVerXPPlus() (WinVerMajor()>=5 && LOWORD(GetVersion()) != 5)
#define IsWinVerVistaPlus() (WinVerMajor()>=6)
-#define IsWinVer7Plus() (WinVerMajor()>6 || (WinVerMajor()==6 && WinVerMinor()>=1))
+#define IsWinVer7Plus() (WinVerMajor()>6 || (WinVerMajor() == 6 && WinVerMinor()>=1))
// put stuff that's not apart of any SDKs but is used nonetheless
@@ -59,7 +59,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #define MENUITEMINFO_V4_SIZE sizeof(MENUITEMINFO)
#else
//mii was extended for NT5/Win98, so need the old length for some stuff
-#define MENUITEMINFO_V4_SIZE (offsetof(MENUITEMINFO,cch)+sizeof((*((MENUITEMINFO*)0)).cch))
+#define MENUITEMINFO_V4_SIZE (offsetof(MENUITEMINFO, cch)+sizeof((*((MENUITEMINFO*)0)).cch))
#endif
#if _MSC_VER >= 1300
@@ -96,9 +96,9 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #define DTBG_OMITCONTENT 0x00000008 // don't draw content area of part
#define DTBG_COMPUTINGREGION 0x00000010 // TRUE if calling to compute region
#define DTBG_MIRRORDC 0x00000020 // assume the hdc is mirrorred and
- // flip images as appropriate (currently
+ // flip images as appropriate (currently
// only supported for bgtype=imagefile)
- #define DTBG_NOMIRROR 0x00000040 // don't mirror the output, overrides everything else
+ #define DTBG_NOMIRROR 0x00000040 // don't mirror the output, overrides everything else
typedef struct _DTBGOPTS
{
@@ -123,7 +123,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #define DTT_CALLBACK (1UL << 12) // pfnDrawTextCallback has been specified
#define DTT_COMPOSITED (1UL << 13) // Draws text with antialiased alpha (needs a DIB section)
- typedef
+ typedef
int
(WINAPI *DTT_CALLBACK_PROC)
(
@@ -151,7 +151,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ int iGlowSize; // Glow radious around text
DTT_CALLBACK_PROC pfnDrawTextCallback; // Callback for DrawText
LPARAM lParam; // Parameter for callback
- } DTTOPTS, *PDTTOPTS;
+ } DTTOPTS, *PDTTOPTS;
#define WTNCA_NODRAWCAPTION 0x00000001 // don't draw the window caption
#define WTNCA_NODRAWICON 0x00000002 // don't draw the system icon
@@ -181,7 +181,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #ifdef __cplusplus
extern "C" {
#endif
- WINGDIAPI BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
+ WINGDIAPI BOOL WINAPI AlphaBlend(HDC, int, int, int, int, HDC, int, int, int, int, BLENDFUNCTION);
#ifdef __cplusplus
}
#endif
@@ -192,7 +192,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ (((int)((LPBYTE)(&((structname*)0)->member) - ((LPBYTE)((structname*)0)))) + sizeof(((structname*)0)->member))
#endif
#ifndef OPENFILENAME_SIZE_VERSION_400
- #define OPENFILENAME_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName)
+ #define OPENFILENAME_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAME, lpTemplateName)
#endif
#ifndef NOTIFYICONDATAA_V1_SIZE
#define NOTIFYICONDATAA_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATAA, szTip[64])
@@ -201,7 +201,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #define NOTIFYICONDATA_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATA, szTip[64])
#endif
#ifndef OPENFILENAMEW_SIZE_VERSION_400
- #define OPENFILENAMEW_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAMEW,lpTemplateName)
+ #define OPENFILENAMEW_SIZE_VERSION_400 CDSIZEOF_STRUCT(OPENFILENAMEW, lpTemplateName)
#endif
#ifndef NOTIFYICONDATAW_V1_SIZE
#define NOTIFYICONDATAW_V1_SIZE CDSIZEOF_STRUCT(NOTIFYICONDATAW, szTip[64])
@@ -255,7 +255,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ #define CBS_CHECKEDNORMAL 5
#define CBS_CHECKEDHOT 6
#define CFM_WEIGHT 0x00400000
- #define CFM_UNDERLINETYPE 0x00800000
+ #define CFM_UNDERLINETYPE 0x00800000
#define CFM_BACKCOLOR 0x04000000
#define CFU_UNDERLINE 1
#define CFU_UNDERLINEWORD 2
@@ -499,7 +499,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ typedef
enum TBPFLAG
- {
+ {
TBPF_NOPROGRESS = 0,
TBPF_INDETERMINATE = 0x1,
TBPF_NORMAL = 0x2,
@@ -508,7 +508,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ } TBPFLAG;
typedef struct THUMBBUTTON *LPTHUMBBUTTON;
-
+
static const GUID IID_ITaskbarList3 = { 0xea1afb91, 0x9e28, 0x4b86, { 0x90, 0xE9, 0x9e, 0x9f, 0x8a, 0x5e, 0xef, 0xaf } };
#ifdef INTERFACE
@@ -533,7 +533,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/ // ITaskbarList3 members
STDMETHOD (SetProgressValue) (THIS_ HWND hwnd, ULONGLONG ullCompleted, ULONGLONG ullTotal) PURE;
STDMETHOD (SetProgressState) (THIS_ HWND hwnd, TBPFLAG tbpFlags) PURE;
- STDMETHOD (RegisterTab) (THIS_ HWND hwndTab,HWND hwndMDI) PURE;
+ STDMETHOD (RegisterTab) (THIS_ HWND hwndTab, HWND hwndMDI) PURE;
STDMETHOD (UnregisterTab) (THIS_ HWND hwndTab) PURE;
STDMETHOD (SetTabOrder) (THIS_ HWND hwndTab, HWND hwndInsertBefore) PURE;
STDMETHOD (SetTabActive) (THIS_ HWND hwndTab, HWND hwndMDI, DWORD dwReserved) PURE;
|