summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_clist.h12
-rw-r--r--include/m_clui.h24
-rw-r--r--include/m_database.h17
-rw-r--r--include/m_icq.h13
-rw-r--r--include/m_message.h34
-rw-r--r--include/m_netlib.h8
-rw-r--r--include/m_protocols.h34
-rw-r--r--include/m_protomod.h2
-rw-r--r--include/m_system_cpp.h8
-rw-r--r--include/m_utils.h2
-rw-r--r--include/win2k.h14
11 files changed, 84 insertions, 84 deletions
diff --git a/include/m_clist.h b/include/m_clist.h
index db6fcd3136..8890462108 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -88,7 +88,7 @@ extern int hLangpack;
typedef struct {
int cbSize; //size in bytes of this structure
union {
- char* pszName; //[TRANSLATED-BY-CORE] text of the menu item
+ char* pszName; //[TRANSLATED-BY-CORE] text of the menu item
TCHAR* ptszName; //Unicode text of the menu item
};
DWORD flags; //set of CMIF_* flags
@@ -248,8 +248,8 @@ sense to store all this information in memory, etc.
#define GCDNF_TCHAR 0 //will return char*, as usual
#endif
- //even if it's the one that should be displayed. v0.1.2.0+
- //v0.3.0.0+ if using GCDNF_NOMYHANDLE you must free your string
+//even if it's the one that should be displayed. v0.1.2.0+
+//v0.3.0.0+ if using GCDNF_NOMYHANDLE you must free your string
#define MS_CLIST_GETCONTACTDISPLAYNAME "CList/GetContactDisplayName"
// Invalidates the display name cache
@@ -465,8 +465,8 @@ typedef struct {
//lParam = pointer to CLISTGROUPCHANGE
typedef struct {
int cbSize; //size in bytes of this structure
- TCHAR* pszOldName; //old group name
- TCHAR* pszNewName; //new group name
+ TCHAR* pszOldName; //old group name
+ TCHAR* pszNewName; //new group name
} CLISTGROUPCHANGE;
#define ME_CLIST_GROUPCHANGE "CList/GroupChange"
@@ -615,7 +615,7 @@ typedef struct {
TCHAR *tszInfoTitle; // used if NIIF_INTERN_UNICODE is specified
};
union {
- char *szInfo; // only 256chars of it will be used
+ char *szInfo; // only 256chars of it will be used
TCHAR *tszInfo; // used if NIIF_INTERN_UNICODE is specified
};
DWORD dwInfoFlags; // see NIIF_* stuff
diff --git a/include/m_clui.h b/include/m_clui.h
index bd636dc407..903971ab52 100644
--- a/include/m_clui.h
+++ b/include/m_clui.h
@@ -128,23 +128,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CLUICAPS_FLAGS1 0
#define CLUIF_HIDEEMPTYGROUPS 1 //the clist has a checkbox in its options
- //to set this, which will be hidden if this flag is not set. It is
- //up to the CLUI to provide support for it, but it just seemed insane
- //to me to have hide offline and hide empty in different pages.
- //The setting is "CList"/"HideEmptyGroups", a byte. A complete list
- //reload is sent whenever the user changes it.
+ //to set this, which will be hidden if this flag is not set. It is
+ //up to the CLUI to provide support for it, but it just seemed insane
+ //to me to have hide offline and hide empty in different pages.
+ //The setting is "CList"/"HideEmptyGroups", a byte. A complete list
+ //reload is sent whenever the user changes it.
#define CLUIF_DISABLEGROUPS 2 //can show list without groups. Adds option
- //to change "CList"/"UseGroups", a byte.
+ //to change "CList"/"UseGroups", a byte.
#define CLUIF_HASONTOPOPTION 4 //the clui options page provides a way to
- //change "CList"/"OnTop", a byte. When it is changed the clui should
- //also set the topmost flag on the window using SetWindowPos().
+ //change "CList"/"OnTop", a byte. When it is changed the clui should
+ //also set the topmost flag on the window using SetWindowPos().
#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.
+ //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.
#define CLUICAPS_FLAGS2 1 //Returns info about extra icons
- //HIWORD is the first extra icon number, LOWORD is the extra icons count
+ //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
diff --git a/include/m_database.h b/include/m_database.h
index b16327effd..dcb067405a 100644
--- a/include/m_database.h
+++ b/include/m_database.h
@@ -505,18 +505,21 @@ typedef struct {
#define MS_DB_EVENT_GETTEXT "DB/Event/GetText"
__forceinline char* DbGetEventTextA(DBEVENTINFO* dbei, int codepage)
-{ DBEVENTGETTEXT temp = { dbei, DBVT_ASCIIZ, codepage };
- return (char*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
+{
+ DBEVENTGETTEXT temp = { dbei, DBVT_ASCIIZ, codepage };
+ return (char*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
__forceinline WCHAR* DbGetEventTextW(DBEVENTINFO* dbei, int codepage)
-{ DBEVENTGETTEXT temp = { dbei, DBVT_WCHAR, codepage };
- return (WCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
+{
+ DBEVENTGETTEXT temp = { dbei, DBVT_WCHAR, codepage };
+ return (WCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
__forceinline TCHAR* DbGetEventTextT(DBEVENTINFO* dbei, int codepage)
-{ DBEVENTGETTEXT temp = { dbei, DBVT_TCHAR, codepage };
- return (TCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
+{
+ DBEVENTGETTEXT temp = { dbei, DBVT_TCHAR, codepage };
+ return (TCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&temp);
}
/* DB/Event/GetIcon (0.7.0.1+)
@@ -547,7 +550,7 @@ Caller must free the result using mir_free
__forceinline TCHAR* DbGetEventStringT(DBEVENTINFO* dbei, const char* str)
{
- return (TCHAR*)CallService(MS_DB_EVENT_GETSTRINGT, (WPARAM)dbei, (LPARAM)str);
+ return (TCHAR*)CallService(MS_DB_EVENT_GETSTRINGT, (WPARAM)dbei, (LPARAM)str);
}
/* DB/Event/MarkRead
diff --git a/include/m_icq.h b/include/m_icq.h
index 18b00fe5eb..427b5769d3 100644
--- a/include/m_icq.h
+++ b/include/m_icq.h
@@ -207,20 +207,19 @@ typedef struct {
int flags; // combination of CSSF_*
int *status; // custom status id
union {
- char *pszName; // buffer for custom status name
- TCHAR *ptszName;
- WCHAR *pwszName;
+ char *pszName; // buffer for custom status name
+ TCHAR *ptszName;
+ WCHAR *pwszName;
};
union {
- char *pszMessage; // buffer for custom status message
- TCHAR *ptszMessage;
- WCHAR *pwszMessage;
+ char *pszMessage; // buffer for custom status message
+ TCHAR *ptszMessage;
+ WCHAR *pwszMessage;
};
WPARAM *wParam; // extra params, see flags
LPARAM *lParam;
} ICQ_CUSTOM_STATUS;
-
// Sets owner current custom status (obsolete)
//wParam = (int)N // custom status id (1-32)
//lParam = 0
diff --git a/include/m_message.h b/include/m_message.h
index c5a8a484ec..3dba79d16e 100644
--- a/include/m_message.h
+++ b/include/m_message.h
@@ -56,15 +56,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MSG_WINDOW_UFLAG_MSG_BOTH 0x00000004
typedef struct {
- int cbSize;
- HANDLE hContact;
- HWND hwndWindow; // top level window for the contact
- const char* szModule; // used to get plugin type (which means you could use local if needed)
- unsigned int uType; // see event types above
- unsigned int uFlags; // used to indicate message direction for all event types except custom
- void *local; // used to store pointer to custom data
- HWND hwndInput; // input area window for the contact (or NULL if there is none)
- HWND hwndLog; // log area window for the contact (or NULL if there is none)
+ int cbSize;
+ HANDLE hContact;
+ HWND hwndWindow; // top level window for the contact
+ const char* szModule; // used to get plugin type (which means you could use local if needed)
+ unsigned int uType; // see event types above
+ unsigned int uFlags; // used to indicate message direction for all event types except custom
+ void *local; // used to store pointer to custom data
+ HWND hwndInput; // input area window for the contact (or NULL if there is none)
+ HWND hwndLog; // log area window for the contact (or NULL if there is none)
} MessageWindowEventData;
#define MS_MSG_GETWINDOWAPI "MessageAPI/WindowAPI"
@@ -117,14 +117,14 @@ typedef struct {
#define MSG_WINDOWPOPUP_LOG 2
typedef struct {
- int cbSize;
- unsigned int uType; // see popup types above
- unsigned int uFlags; // used to indicate in which window the popup was requested
- HANDLE hContact;
- HWND hwnd; // window where the popup was requested
- HMENU hMenu; // The handle to the menu
- POINT pt; // The point, in screen coords
- int selection; // The menu control id or 0 if no one was selected
+ int cbSize;
+ unsigned int uType; // see popup types above
+ unsigned int uFlags; // used to indicate in which window the popup was requested
+ HANDLE hContact;
+ HWND hwnd; // window where the popup was requested
+ HMENU hMenu; // The handle to the menu
+ POINT pt; // The point, in screen coords
+ int selection; // The menu control id or 0 if no one was selected
} MessageWindowPopupData;
// status icons - HICONs will be automatically destroyed when removed or when miranda exits
diff --git a/include/m_netlib.h b/include/m_netlib.h
index cad9343aad..83b469e9c0 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -199,8 +199,8 @@ typedef struct {
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
- int validateSSL;
+ int enableUPnP; // 0.6.1+ only for NUF_INCOMING
+ int validateSSL;
} NETLIBUSERSETTINGS;
#define MS_NETLIB_GETUSERSETTINGS "Netlib/GetUserSettings"
@@ -742,7 +742,7 @@ typedef struct {
typedef struct
{
- int cbSize;
+ int cbSize;
const char *host; //Expected host name
int flags; //Reserved
} NETLIBSSL;
@@ -887,7 +887,7 @@ static __inline char* Netlib_NtlmCreateResponse2(HANDLE hProvider, char* szChall
// lParam: NETLIBUSER* - points to the protocol definition
typedef struct {
- NETLIBBUFFER* nlb; // pointer to the request buffer
+ NETLIBBUFFER* nlb; // pointer to the request buffer
int result; // amount of bytes really sent/received
}
NETLIBNOTIFY;
diff --git a/include/m_protocols.h b/include/m_protocols.h
index c7402c7d74..5cf76a7cfc 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -120,28 +120,28 @@ typedef struct tagPROTOFILETRANSFERSTATUS
HANDLE hContact;
DWORD flags; // one of PFTS_* constants
- union {
- char **pszFiles;
- TCHAR **ptszFiles;
- WCHAR **pwszFiles;
- };
+ union {
+ char **pszFiles;
+ TCHAR **ptszFiles;
+ WCHAR **pwszFiles;
+ };
- int totalFiles;
+ int totalFiles;
int currentFileNumber;
unsigned __int64 totalBytes;
unsigned __int64 totalProgress;
- union {
- char *szWorkingDir;
- TCHAR *tszWorkingDir;
- WCHAR *wszWorkingDir;
- };
-
- union {
- char *szCurrentFile;
- TCHAR *tszCurrentFile;
- WCHAR *wszCurrentFile;
- };
+ union {
+ char *szWorkingDir;
+ TCHAR *tszWorkingDir;
+ WCHAR *wszWorkingDir;
+ };
+
+ union {
+ char *szCurrentFile;
+ TCHAR *tszCurrentFile;
+ WCHAR *wszCurrentFile;
+ };
unsigned __int64 currentFileSize;
unsigned __int64 currentFileProgress;
diff --git a/include/m_protomod.h b/include/m_protomod.h
index 98b5485804..13dd93e5fb 100644
--- a/include/m_protomod.h
+++ b/include/m_protomod.h
@@ -69,7 +69,7 @@ __forceinline HANDLE CreateProtoServiceFunction(const char *szModule, const char
{
char str[MAXMODULELABELLENGTH];
_snprintf(str, sizeof(str), "%s%s", szModule, szService);
- str[MAXMODULELABELLENGTH-1] = 0;
+ str[MAXMODULELABELLENGTH-1] = 0;
return CreateServiceFunction(str, serviceProc);
}
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 2e71c4dcff..67b5a243d5 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -119,10 +119,10 @@ template<class T> struct LIST
__inline int getCount(void) const { return count; }
__inline T** getArray(void) const { return items; }
- __inline LIST(const LIST& x)
- { items = NULL;
- List_Copy((SortedList*)&x, (SortedList*)this, sizeof(T));
- }
+ __inline LIST(const LIST& x)
+ { items = NULL;
+ List_Copy((SortedList*)&x, (SortedList*)this, sizeof(T));
+ }
__inline LIST& operator = (const LIST& x)
{ destroy();
diff --git a/include/m_utils.h b/include/m_utils.h
index bfc5622c3a..60e407ffdb 100644
--- a/include/m_utils.h
+++ b/include/m_utils.h
@@ -421,7 +421,7 @@ __forceinline char* Utils_ReplaceVars(const char *szData) {
__forceinline TCHAR* Utils_ReplaceVarsT(const TCHAR *szData) {
REPLACEVARSDATA dat = {0};
dat.cbSize = sizeof(dat);
- dat.dwFlags = RVF_TCHAR;
+ dat.dwFlags = RVF_TCHAR;
return (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)szData, (LPARAM)&dat);
}
#ifdef _UNICODE
diff --git a/include/win2k.h b/include/win2k.h
index f1fe4d629d..8970828c0d 100644
--- a/include/win2k.h
+++ b/include/win2k.h
@@ -268,10 +268,10 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/
#define ETS_FOCUSED 5
#define ETS_READONLY 6
#define ETS_ASSIST 7
- #ifndef PBT_APMRESUMESUSPEND
- #define PBT_APMSUSPEND 0x0004
- #define PBT_APMRESUMESUSPEND 0x0007
- #endif
+ #ifndef PBT_APMRESUMESUSPEND
+ #define PBT_APMSUSPEND 0x0004
+ #define PBT_APMRESUMESUSPEND 0x0007
+ #endif
#define AW_HOR_POSITIVE 0x00000001
#define AW_VER_NEGATIVE 0x00000008
#define AW_HIDE 0x00010000
@@ -435,12 +435,10 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/
STDMETHOD_(ULONG, Release) (THIS) PURE;
// IDropTargetHelper
- STDMETHOD (DragEnter)(THIS_ HWND hwndTarget, IDataObject* pDataObject,
- POINT* ppt, DWORD dwEffect) PURE;
+ STDMETHOD (DragEnter)(THIS_ HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
STDMETHOD (DragLeave)(THIS) PURE;
STDMETHOD (DragOver)(THIS_ POINT* ppt, DWORD dwEffect) PURE;
- STDMETHOD (Drop)(THIS_ IDataObject* pDataObject, POINT* ppt,
- DWORD dwEffect) PURE;
+ STDMETHOD (Drop)(THIS_ IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
STDMETHOD (Show)(THIS_ BOOL fShow) PURE;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 16:51:45 +0000