From b93e076795f7998aef8a63f7602998cdc6632a80 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Feb 2013 12:15:06 +0000 Subject: core: copyright update to year 2013 git-svn-id: http://svn.miranda-ng.org/main/trunk@3549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/commonheaders.h | 7 +-- src/core/memory.cpp | 2 +- src/core/miranda.cpp | 2 +- src/core/miranda.h | 2 +- src/core/modules.cpp | 2 +- src/core/modules.h | 2 +- src/core/stdafx.cpp | 3 +- src/core/stdauth/auth.cpp | 3 +- src/core/stdauth/authdialogs.cpp | 2 +- src/core/stdauth/commonheaders.h | 5 +- src/core/stdauth/main.cpp | 2 +- src/core/stdautoaway/autoaway.cpp | 9 ++-- src/core/stdautoaway/commonheaders.h | 5 +- src/core/stdautoaway/main.cpp | 2 +- src/core/stdaway/awaymsg.cpp | 2 +- src/core/stdaway/commonheaders.h | 5 +- src/core/stdaway/main.cpp | 2 +- src/core/stdaway/sendmsg.cpp | 2 +- src/core/stdchat/src/chat.h | 35 ++++++-------- src/core/stdchat/src/manager.cpp | 11 +++-- src/core/stdchat/src/message.cpp | 2 +- src/core/stdchat/src/richutil.cpp | 2 +- src/core/stdchat/src/richutil.h | 2 +- src/core/stdchat/src/services.cpp | 11 +++-- src/core/stdchat/src/stdafx.cpp | 2 +- src/core/stdchat/src/tools.cpp | 3 +- src/core/stdchat/src/window.cpp | 10 ++-- src/core/stdclist/src/clc.h | 2 +- src/core/stdclist/src/clcfonts.cpp | 2 +- src/core/stdclist/src/clcopts.cpp | 2 +- src/core/stdclist/src/clcpaint.cpp | 7 +-- src/core/stdclist/src/clistmenus.cpp | 3 +- src/core/stdclist/src/clistopts.cpp | 2 +- src/core/stdclist/src/cluiopts.cpp | 25 +++++----- src/core/stdclist/src/commonheaders.h | 3 +- src/core/stdclist/src/init.cpp | 2 +- src/core/stdclist/src/stdafx.cpp | 2 +- src/core/stdemail/commonheaders.h | 5 +- src/core/stdemail/email.cpp | 2 +- src/core/stdemail/main.cpp | 2 +- src/core/stdfile/commonheaders.h | 5 +- src/core/stdfile/file.cpp | 2 +- src/core/stdfile/file.h | 2 +- src/core/stdfile/fileexistsdlg.cpp | 2 +- src/core/stdfile/fileopts.cpp | 2 +- src/core/stdfile/filerecvdlg.cpp | 19 ++++---- src/core/stdfile/filesenddlg.cpp | 11 +++-- src/core/stdfile/filexferdlg.cpp | 51 +++++++++++---------- src/core/stdfile/ftmanager.cpp | 9 ++-- src/core/stdfile/main.cpp | 2 +- src/core/stdhelp/about.cpp | 3 +- src/core/stdhelp/commonheaders.h | 5 +- src/core/stdhelp/help.cpp | 5 +- src/core/stdhelp/main.cpp | 2 +- src/core/stdidle/commonheaders.h | 5 +- src/core/stdidle/idle.cpp | 66 +++++++++++++-------------- src/core/stdidle/main.cpp | 2 +- src/core/stdmsg/src/cmdlist.cpp | 28 ++++++------ src/core/stdmsg/src/cmdlist.h | 16 ++++--- src/core/stdmsg/src/commonheaders.h | 5 +- src/core/stdmsg/src/globals.cpp | 25 +++++----- src/core/stdmsg/src/globals.h | 6 ++- src/core/stdmsg/src/msgdialog.cpp | 83 +++++++++++++++++----------------- src/core/stdmsg/src/msglog.cpp | 40 ++++++++-------- src/core/stdmsg/src/msgoptions.cpp | 8 ++-- src/core/stdmsg/src/msgs.cpp | 34 +++++++------- src/core/stdmsg/src/msgs.h | 6 ++- src/core/stdmsg/src/msgtimedout.cpp | 16 +++---- src/core/stdmsg/src/richutil.cpp | 60 ++++++++++++------------ src/core/stdmsg/src/richutil.h | 6 ++- src/core/stdmsg/src/srmm.cpp | 3 +- src/core/stdmsg/src/statusicon.cpp | 8 ++-- src/core/stdmsg/src/stdafx.cpp | 3 +- src/core/stduihist/commonheaders.h | 5 +- src/core/stduihist/history.cpp | 11 +++-- src/core/stduihist/main.cpp | 2 +- src/core/stdurl/commonheaders.h | 5 +- src/core/stdurl/main.cpp | 2 +- src/core/stdurl/url.cpp | 2 +- src/core/stdurl/url.h | 2 +- src/core/stdurl/urldialogs.cpp | 2 +- src/core/stduserinfo/commonheaders.h | 5 +- src/core/stduserinfo/contactinfo.cpp | 2 +- src/core/stduserinfo/main.cpp | 2 +- src/core/stduserinfo/stdinfo.cpp | 2 +- src/core/stduserinfo/userinfo.cpp | 2 +- src/core/stduseronline/commonheaders.h | 5 +- src/core/stduseronline/main.cpp | 2 +- src/core/stduseronline/useronline.cpp | 15 +++--- 89 files changed, 400 insertions(+), 402 deletions(-) (limited to 'src/core') diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index f691cf8c26..85d7e47fd8 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define _ALPHA_BASE_ 1 // defined for CVS builds #define _ALPHA_FUSE_ 1 // defined for fuse powered core diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 3cab040efe..b043bd450d 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index 780283b48f..4bb1678ecc 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/miranda.h b/src/core/miranda.h index b89eeb3011..fcb308dbc8 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/modules.cpp b/src/core/modules.cpp index 179faf5531..d06858a6c9 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/modules.h b/src/core/modules.h index a2e5429d5f..9339d7add1 100644 --- a/src/core/modules.h +++ b/src/core/modules.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdafx.cpp b/src/core/stdafx.cpp index b985a910cd..838b101bd3 100644 --- a/src/core/stdafx.cpp +++ b/src/core/stdafx.cpp @@ -1,5 +1,6 @@ /* -Copyright (C) 2012 Miranda NG team (http://miranda-ng.org) + +Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index 07cb8f4b94..2edd847743 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #define MS_AUTH_SHOWREQUEST "Auth/ShowRequest" diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index 242d0a07a2..3f498cce22 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h index f6f9aebff7..205a18193b 100644 --- a/src/core/stdauth/commonheaders.h +++ b/src/core/stdauth/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdauth/main.cpp b/src/core/stdauth/main.cpp index a0d800ccae..48ddab2a8e 100644 --- a/src/core/stdauth/main.cpp +++ b/src/core/stdauth/main.cpp @@ -2,7 +2,7 @@ Standard Send/Recv Auth plugin for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdautoaway/autoaway.cpp b/src/core/stdautoaway/autoaway.cpp index 921267cd9c..385ab03699 100644 --- a/src/core/stdautoaway/autoaway.cpp +++ b/src/core/stdautoaway/autoaway.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #define AA_MODULE "AutoAway" @@ -91,7 +92,7 @@ static int AutoAwayEvent(WPARAM, LPARAM lParam) else continue; } - if (currentstatus >= ID_STATUS_ONLINE && currentstatus != ID_STATUS_INVISIBLE) { + if (currentstatus >= ID_STATUS_ONLINE && currentstatus != ID_STATUS_INVISIBLE) { if ((lParam & IDF_ISIDLE) && (currentstatus == ID_STATUS_ONLINE || currentstatus == ID_STATUS_FREECHAT)) { db_set_b(NULL, AA_MODULE, pa->szModuleName, 1); Proto_SetStatus(pa->szModuleName, status); diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h index 9ba6ae38cf..d813cb1c7d 100644 --- a/src/core/stdautoaway/commonheaders.h +++ b/src/core/stdautoaway/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdautoaway/main.cpp b/src/core/stdautoaway/main.cpp index b4bf3a5fd6..05933f2753 100644 --- a/src/core/stdautoaway/main.cpp +++ b/src/core/stdautoaway/main.cpp @@ -2,7 +2,7 @@ Standard auto away module for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index af06a8c4f7..dc1e2441db 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h index 9ba6ae38cf..d813cb1c7d 100644 --- a/src/core/stdaway/commonheaders.h +++ b/src/core/stdaway/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdaway/main.cpp b/src/core/stdaway/main.cpp index ec8ed4b101..210c8d7971 100644 --- a/src/core/stdaway/main.cpp +++ b/src/core/stdaway/main.cpp @@ -2,7 +2,7 @@ Standard away message processing module for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp index 9f6558fee5..e422707372 100644 --- a/src/core/stdaway/sendmsg.cpp +++ b/src/core/stdaway/sendmsg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h index f8130358aa..85fe43e19e 100644 --- a/src/core/stdchat/src/chat.h +++ b/src/core/stdchat/src/chat.h @@ -21,11 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CHAT_H_ #define _CHAT_H_ -#define MIRANDA_VER 0x0A00 - -//#pragma warning( disable : 4786 ) // limitation in MSVC's debugger. -//#pragma warning( disable : 4996 ) // limitation in MSVC's debugger. - #define WIN32_LEAN_AND_MEAN #define _WIN32_WINNT 0x0501 #define _WIN32_IE 0x0501 @@ -263,7 +258,7 @@ typedef struct SESSION_INFO_TYPE // I hate m3x, Unicode, IRC, chats etc... char* pszID; // ugly fix for returning static ANSI strings in GC_INFO char* pszName; // just to fix a bug quickly, should die after porting IRC to Unicode - + int iType; int iFG; int iBG; @@ -322,20 +317,20 @@ struct CREOleCallback : public IRichEditOleCallback IStorage *pictStg; int nextStgId; - STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * lplpObj); - STDMETHOD_(ULONG,AddRef) (THIS); - STDMETHOD_(ULONG,Release) (THIS); - - STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode); - STDMETHOD(GetNewStorage) (LPSTORAGE FAR * lplpstg); - STDMETHOD(GetInPlaceContext) (LPOLEINPLACEFRAME FAR * lplpFrame, LPOLEINPLACEUIWINDOW FAR * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo); - STDMETHOD(ShowContainerUI) (BOOL fShow); - STDMETHOD(QueryInsertObject) (LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp); - STDMETHOD(DeleteObject) (LPOLEOBJECT lpoleobj); - STDMETHOD(QueryAcceptData) (LPDATAOBJECT lpdataobj, CLIPFORMAT FAR * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict); - STDMETHOD(GetClipboardData) (CHARRANGE FAR * lpchrg, DWORD reco, LPDATAOBJECT FAR * lplpdataobj); - STDMETHOD(GetDragDropEffect) (BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); - STDMETHOD(GetContextMenu) (WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE FAR * lpchrg, HMENU FAR * lphmenu) ; + STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * lplpObj); + STDMETHOD_(ULONG,AddRef) (THIS); + STDMETHOD_(ULONG,Release) (THIS); + + STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode); + STDMETHOD(GetNewStorage) (LPSTORAGE FAR * lplpstg); + STDMETHOD(GetInPlaceContext) (LPOLEINPLACEFRAME FAR * lplpFrame, LPOLEINPLACEUIWINDOW FAR * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo); + STDMETHOD(ShowContainerUI) (BOOL fShow); + STDMETHOD(QueryInsertObject) (LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp); + STDMETHOD(DeleteObject) (LPOLEOBJECT lpoleobj); + STDMETHOD(QueryAcceptData) (LPDATAOBJECT lpdataobj, CLIPFORMAT FAR * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict); + STDMETHOD(GetClipboardData) (CHARRANGE FAR * lpchrg, DWORD reco, LPDATAOBJECT FAR * lplpdataobj); + STDMETHOD(GetDragDropEffect) (BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); + STDMETHOD(GetContextMenu) (WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE FAR * lpchrg, HMENU FAR * lphmenu) ; }; struct GlobalLogSettings_t { diff --git a/src/core/stdchat/src/manager.cpp b/src/core/stdchat/src/manager.cpp index e423f3853b..8e8ae5dfeb 100644 --- a/src/core/stdchat/src/manager.cpp +++ b/src/core/stdchat/src/manager.cpp @@ -1,8 +1,8 @@ /* Chat module plugin for Miranda IM -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -19,6 +19,7 @@ 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. */ + #include "chat.h" extern TCHAR* pszActiveWndID ; @@ -138,7 +139,7 @@ int SM_RemoveSession(const TCHAR* pszID, const char* pszModule, BOOL removeConta DBWriteContactSettingString(pTemp->hContact, pTemp->pszModule, "Topic", ""); DBWriteContactSettingString(pTemp->hContact, pTemp->pszModule, "StatusBar", ""); DBDeleteContactSetting(pTemp->hContact, "CList", "StatusMsg"); - + if (removeContact) CallService(MS_DB_CONTACT_DELETE, (WPARAM)pTemp->hContact, 0); } @@ -150,7 +151,7 @@ int SM_RemoveSession(const TCHAR* pszID, const char* pszModule, BOOL removeConta mir_free( pTemp->ptszTopic ); mir_free( pTemp->pszID ); mir_free( pTemp->pszName ); - + // delete commands pCurComm = pTemp->lpCommands; while (pCurComm != NULL) @@ -790,7 +791,7 @@ BOOL SM_RemoveAll (void) mir_free( m_WndList->ptszTopic ); mir_free( m_WndList->pszID ); mir_free( m_WndList->pszName ); - + while (m_WndList->lpCommands != NULL) { COMMAND_INFO *pNext = m_WndList->lpCommands->next; mir_free(m_WndList->lpCommands->lpCommand); diff --git a/src/core/stdchat/src/message.cpp b/src/core/stdchat/src/message.cpp index ce76bfc6f5..f7659fe154 100644 --- a/src/core/stdchat/src/message.cpp +++ b/src/core/stdchat/src/message.cpp @@ -2,7 +2,7 @@ Chat module plugin for Miranda IM Copyright (C) 2003 Jörgen Persson -Copyright 2003-2009 Miranda ICQ/IM project, +Copyright 2003-2009 Miranda IM project, This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdchat/src/richutil.cpp b/src/core/stdchat/src/richutil.cpp index 1c5143b17c..a6b3d5971a 100644 --- a/src/core/stdchat/src/richutil.cpp +++ b/src/core/stdchat/src/richutil.cpp @@ -1,7 +1,7 @@ /* SRMM -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright 2000-2005 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/richutil.h b/src/core/stdchat/src/richutil.h index dff6a53915..9a69f8f809 100644 --- a/src/core/stdchat/src/richutil.h +++ b/src/core/stdchat/src/richutil.h @@ -1,7 +1,7 @@ /* SRMM -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright 2000-2005 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index 247b71b3c9..98167b2306 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -1,8 +1,8 @@ /* Chat module plugin for Miranda IM -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -19,6 +19,7 @@ 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. */ + #include "chat.h" #include "m_fontservice.h" @@ -56,7 +57,7 @@ static HANDLE hEventJoinChat = NULL, hEventLeaveChat = NULL; -#ifdef _WIN64 +#ifdef _WIN64 #define SIZEOF_STRUCT_GCREGISTER_V1 40 #define SIZEOF_STRUCT_GCWINDOW_V1 48 @@ -297,7 +298,7 @@ static INT_PTR Service_GetInfo(WPARAM wParam,LPARAM lParam) if ( gci->Flags & ID ) gci->pszID = ( TCHAR* )si->pszID; if ( gci->Flags & NAME ) gci->pszName = ( TCHAR* )si->pszName; } - + LeaveCriticalSection(&cs); return 0; } @@ -397,7 +398,7 @@ static INT_PTR Service_NewChat(WPARAM wParam, LPARAM lParam) si->pszID = mir_strdup( gcw->pszID ); si->pszName = mir_strdup( gcw->pszName ); } - + if ( mi->bColor ) { si->iFG = 4; si->bFGSet = TRUE; diff --git a/src/core/stdchat/src/stdafx.cpp b/src/core/stdchat/src/stdafx.cpp index c732eca816..61be01dd37 100644 --- a/src/core/stdchat/src/stdafx.cpp +++ b/src/core/stdchat/src/stdafx.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index de899836b1..2d3c185859 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -1,7 +1,7 @@ /* Chat module plugin for Miranda IM -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -19,6 +19,7 @@ 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. */ + #include "chat.h" extern HICON hIcons[30]; diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index fc95cbf9f2..c844be5d40 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1,8 +1,8 @@ /* Chat module plugin for Miranda IM -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -399,7 +399,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, gt.cb = iLen+99; gt.flags = GT_DEFAULT; gt.codepage = 1200; - + SendMessage(hwnd, EM_GETTEXTEX, (WPARAM)>, (LPARAM)pszText); while ( start >0 && pszText[start-1] != ' ' && pszText[start-1] != 13 && pszText[start-1] != VK_TAB) start--; @@ -1171,7 +1171,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) SESSION_INFO* si; si = (SESSION_INFO*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); - + switch (uMsg) { case WM_INITDIALOG: { @@ -1899,7 +1899,7 @@ END_REMOVETAB: TextOut(dis->hDC, dis->rcItem.left+x_offset, dis->rcItem.top, ui->pszNick, lstrlen(ui->pszNick)); SelectObject(dis->hDC, hOldFont); - if (si->pAccPropServicesForNickList) + if (si->pAccPropServicesForNickList) { wchar_t *nick = mir_t2u(ui->pszNick); si->pAccPropServicesForNickList->SetHwndPropStr(GetDlgItem(hwndDlg,IDC_LIST), OBJID_CLIENT, dis->itemID+1, PROPID_ACC_NAME, nick); diff --git a/src/core/stdclist/src/clc.h b/src/core/stdclist/src/clc.h index d089a213da..39f357d4c9 100644 --- a/src/core/stdclist/src/clc.h +++ b/src/core/stdclist/src/clc.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index 6a2f3062dc..1996b7b895 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 4cbd20a0b7..2f29d8570a 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index a090bc91d4..2927fa22d4 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" extern HIMAGELIST himlCListClc; @@ -113,7 +114,7 @@ static int GetGeneralisedStatus(void) int thisStatus = pcli->clcProto[i].dwStatus; if (thisStatus == ID_STATUS_INVISIBLE) return ID_STATUS_INVISIBLE; - + int thisOnlineness = GetStatusOnlineness(thisStatus); if (thisOnlineness > statusOnlineness) { status = thisStatus; diff --git a/src/core/stdclist/src/clistmenus.cpp b/src/core/stdclist/src/clistmenus.cpp index f172c53b71..9d736873b4 100644 --- a/src/core/stdclist/src/clistmenus.cpp +++ b/src/core/stdclist/src/clistmenus.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" INT_PTR CloseAction(WPARAM wParam,LPARAM lParam) diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index aced950d8e..f0c54cd3e8 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 539ed0e937..3a4bf267de 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" extern BOOL(WINAPI * MySetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD); @@ -85,7 +86,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L EnableWindow(GetDlgItem(hwndDlg, IDC_TRANSPARENT), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_DROPSHADOW), FALSE); } - else + else CheckDlgButton(hwndDlg, IDC_TRANSPARENT, DBGetContactSettingByte(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); @@ -185,10 +186,10 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } pcli->pfnLoadCluiGlobalOpts(); - SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, + SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - if (IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) + if (IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) { // Window must be hidden to dynamically remove the taskbar button. // See http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_int/shell_int_programming/taskbar.asp @@ -200,21 +201,21 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_APPWINDOW | WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE); SetWindowPlacement(pcli->hwndContactList, &p); } - else + else SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_TOOLWINDOW | WS_EX_APPWINDOW); - if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) + if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) { HWND hProgMan = FindWindow(_T("Progman"), NULL); if (hProgMan) SetParent(pcli->hwndContactList, hProgMan); } - else + else SetParent(pcli->hwndContactList, NULL); - if (IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)) + if (IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)) { - int style = GetWindowLongPtr(pcli->hwndContactList, GWL_STYLE) | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + int style = GetWindowLongPtr(pcli->hwndContactList, GWL_STYLE) | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; SetWindowLongPtr(pcli->hwndContactList, GWL_STYLE, style); } else @@ -233,7 +234,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if (IsIconic(pcli->hwndContactList) && !IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) ShowWindow(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY) ? SW_HIDE : SW_SHOW); - if (IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) + if (IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) { SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); if (MySetLayeredWindowAttributes) @@ -241,7 +242,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L (BYTE) DBGetContactSettingByte(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA); } - else + else SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED); SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h index 9fabdc2520..e21c8c91a6 100644 --- a/src/core/stdclist/src/commonheaders.h +++ b/src/core/stdclist/src/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define _CRT_SECURE_NO_WARNINGS -#define MIRANDA_VER 0x0A00 #define _WIN32_WINNT 0x0600 #define _WIN32_IE 0x0501 diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index c6749dfdf0..6f7f69a575 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/stdafx.cpp b/src/core/stdclist/src/stdafx.cpp index b985a910cd..270c270550 100644 --- a/src/core/stdclist/src/stdafx.cpp +++ b/src/core/stdclist/src/stdafx.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h index 9ba6ae38cf..d813cb1c7d 100644 --- a/src/core/stdemail/commonheaders.h +++ b/src/core/stdemail/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 30d054c417..d744e71f51 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdemail/main.cpp b/src/core/stdemail/main.cpp index 211bf4f4f5..50cf0b86c1 100644 --- a/src/core/stdemail/main.cpp +++ b/src/core/stdemail/main.cpp @@ -2,7 +2,7 @@ Standard e-mail urls launcher for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h index 2f6e994b0e..e6f2ff7f7d 100644 --- a/src/core/stdfile/commonheaders.h +++ b/src/core/stdfile/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index baa7aaeb2f..a29b71bc33 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdfile/file.h b/src/core/stdfile/file.h index d814e99ab4..95e2eb4818 100644 --- a/src/core/stdfile/file.h +++ b/src/core/stdfile/file.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdfile/fileexistsdlg.cpp b/src/core/stdfile/fileexistsdlg.cpp index 5a66611237..4efb73ebfb 100644 --- a/src/core/stdfile/fileexistsdlg.cpp +++ b/src/core/stdfile/fileexistsdlg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp index 827257215e..5e9a465d63 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/fileopts.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index 6492530004..ac082ac140 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #include "file.h" @@ -45,13 +46,13 @@ static void GetLowestExistingDirName(const TCHAR *szTestDir, TCHAR *szExistingDi if (szExistingDir[0] == '\0') GetCurrentDirectory(cchExistingDir, szExistingDir); } -static const TCHAR InvalidFilenameChars[] = _T("\\/:*?\"<>|"); +static const TCHAR InvalidFilenameChars[] = _T("\\/:*?\"<>|"); void RemoveInvalidFilenameChars(TCHAR *tszString) { size_t i; if (tszString) { for (i = _tcscspn(tszString, InvalidFilenameChars); tszString[i]; i+=_tcscspn(tszString+i+1, InvalidFilenameChars)+1) - if (tszString[i] >= 0) + if (tszString[i] >= 0) tszString[i] = _T('_'); } } @@ -62,7 +63,7 @@ void RemoveInvalidPathChars(TCHAR *tszString) size_t i; if (tszString) { for (i = _tcscspn(tszString, InvalidPathChars); tszString[i]; i+=_tcscspn(tszString+i+1, InvalidPathChars)+1) - if (tszString[i] >= 0) + if (tszString[i] >= 0) tszString[i] = _T('_'); } } @@ -103,11 +104,11 @@ int BrowseForFolder(HWND hwnd, TCHAR *szPath) return pidlResult != NULL; } -static REPLACEVARSARRAY sttVarsToReplace[] = +static REPLACEVARSARRAY sttVarsToReplace[] = { - { (TCHAR*)"///", (TCHAR*)"//" }, - { (TCHAR*)"//", (TCHAR*)"/" }, - { (TCHAR*)"()", (TCHAR*)"" }, + { (TCHAR*)"///", (TCHAR*)"//" }, + { (TCHAR*)"//", (TCHAR*)"/" }, + { (TCHAR*)"()", (TCHAR*)"" }, { NULL, NULL } }; diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp index 5c1419c683..4523c63b36 100644 --- a/src/core/stdfile/filesenddlg.cpp +++ b/src/core/stdfile/filesenddlg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #include #include @@ -112,7 +113,7 @@ static void FilenameToFileList(HWND hwndDlg, struct FileDlgData* dat, const TCHA CopyMemory(dat->files[nTemp], buf, (fileOffset-1)*sizeof(TCHAR)); dat->files[nTemp][fileOffset-1] = '\\'; _tcscpy(dat->files[nTemp] + fileOffset - (buf[fileOffset-2] == '\\'?1:0), pBuf); - + // Move pointers to next file... pBuf += cbFileNameLen + 1; nTemp++; @@ -284,7 +285,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l DestroyIcon(hIcon); } } } } return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam); - + case M_FILECHOOSEDONE: if (lParam != 0) { FilenameToFileList(hwndDlg, dat, (TCHAR*)lParam); @@ -347,7 +348,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (dat) FreeFileDlgData(dat); - + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_MSG), GWLP_WNDPROC, (LONG_PTR)OldSendEditProc); return TRUE; } diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp index 474c49f7df..bcb51e6a62 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/filexferdlg.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #include #include "file.h" @@ -92,7 +93,7 @@ void FillSendData(FileDlgData* dat, DBEVENTINFO& dbei) lstrcpyA((char*)dbei.pBlob+sizeof(DWORD)+lstrlenA(szFileNames)+1, szMsg); mir_free(szFileNames), mir_free(szMsg); - + } static void __cdecl RunVirusScannerThread(struct virusscanthreadstartinfo *info) @@ -102,14 +103,14 @@ static void __cdecl RunVirusScannerThread(struct virusscanthreadstartinfo *info) DBVARIANT dbv; TCHAR szCmdLine[768]; - if ( !DBGetContactSettingTString(NULL, "SRFile", "ScanCmdLine", &dbv)) + if ( !DBGetContactSettingTString(NULL, "SRFile", "ScanCmdLine", &dbv)) { - if (dbv.ptszVal[0]) + if (dbv.ptszVal[0]) { TCHAR *pszReplace; si.cb = sizeof(si); pszReplace = _tcsstr(dbv.ptszVal, _T("%f")); - if (pszReplace) + if (pszReplace) { if (info->szFile[_tcslen(info->szFile) - 1] == '\\') info->szFile[_tcslen(info->szFile) - 1] = '\0'; @@ -146,19 +147,19 @@ static void SetFilenameControls(HWND hwndDlg, struct FileDlgData *dat, PROTOFILE if (dat->hIcon) DestroyIcon(dat->hIcon); dat->hIcon = NULL; if (fn && (fts->totalFiles > 1)) { - mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s (%d %s %d)"), - pcli->pfnGetContactDisplayName(fts->hContact, 0), + mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s (%d %s %d)"), + pcli->pfnGetContactDisplayName(fts->hContact, 0), fn, fts->currentFileNumber+1, TranslateT("of"), fts->totalFiles); SHGetFileInfo(fn, FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES|SHGFI_ICON|SHGFI_SMALLICON); dat->hIcon = shfi.hIcon; - } + } else if (fn) { mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s"), pcli->pfnGetContactDisplayName(fts->hContact, 0), fn); SHGetFileInfo(fn, FILE_ATTRIBUTE_NORMAL, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES|SHGFI_ICON|SHGFI_SMALLICON); dat->hIcon = shfi.hIcon; - } + } else { lstrcpyn(msg, pcli->pfnGetContactDisplayName(fts->hContact, 0), SIZEOF(msg)); HICON hIcon = LoadSkinIcon(SKINICON_OTHER_DOWNARROW); @@ -167,7 +168,7 @@ static void SetFilenameControls(HWND hwndDlg, struct FileDlgData *dat, PROTOFILE } mir_free(fnbuf); - + SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)dat->hIcon); SetDlgItemText(hwndDlg, IDC_CONTACTNAME, msg); } @@ -281,7 +282,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dat->hIcon = NULL; - SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, + SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedProtoIcon(GetContactProto(dat->hContact), ID_STATUS_ONLINE)); SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Contact menu"), 0); SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONSETASFLATBTN, TRUE, 0); @@ -292,7 +293,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BM_SETIMAGE, IMAGE_ICON, (LPARAM)dat->hIconFolder); SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Open folder"), 0); SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BUTTONSETASFLATBTN, TRUE, 0); - + Button_SetIcon_IcoLib(hwndDlg, IDCANCEL, SKINICON_OTHER_DELETE, LPGEN("Cancel")); SetDlgItemText(hwndDlg, IDC_CONTACTNAME, pcli->pfnGetContactDisplayName(dat->hContact, 0)); @@ -349,7 +350,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact)) break; - switch (LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: case IDCANCEL: @@ -374,7 +375,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } case IDC_OPENFOLDER: - if (dat) + if (dat) { TCHAR *path = dat->transferStatus.tszWorkingDir; if ( !path || !path[0]) @@ -545,7 +546,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case ACKRESULT_FILERESUME: { UpdateProtoFileTransferStatus(&dat->transferStatus, (PROTOFILETRANSFERSTATUS*)ack->lParam); - PROTOFILETRANSFERSTATUS *fts = &dat->transferStatus; + PROTOFILETRANSFERSTATUS *fts = &dat->transferStatus; SetFilenameControls(hwndDlg, dat, fts); int res = _taccess(fts->tszCurrentFile, 0); @@ -582,7 +583,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if ( !dat->send) { if (dat->files == NULL) dat->files = (TCHAR**)mir_calloc((fts->totalFiles + 1) * sizeof(TCHAR*)); - if (fts->currentFileNumber < fts->totalFiles && dat->files[fts->currentFileNumber] == NULL) + if (fts->currentFileNumber < fts->totalFiles && dat->files[fts->currentFileNumber] == NULL) dat->files[fts->currentFileNumber] = PFTS_StringToTchar(fts->flags, fts->tszCurrentFile); } @@ -630,10 +631,10 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if ( !dat->send) SetOpenFileButtonStyle(GetDlgItem(hwndDlg, IDC_OPENFILE), 1); SetDlgItemText(hwndDlg, IDCANCEL, TranslateT("Close")); - if (dat->hNotifyEvent) + if (dat->hNotifyEvent) UnhookEvent(dat->hNotifyEvent); dat->hNotifyEvent = NULL; - + if (ack->result == ACKRESULT_DENIED) { dat->fs = NULL; /* protocol will free structure */ @@ -657,12 +658,12 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (dbei.pBlob) mir_free(dbei.pBlob); dat->files = NULL; //protocol library frees this - + } else { - SetFtStatus(hwndDlg, + SetFtStatus(hwndDlg, (dat->transferStatus.totalFiles == 1) ? LPGENT("Transfer completed, open file.") : - LPGENT("Transfer completed, open folder."), + LPGENT("Transfer completed, open folder."), FTS_OPEN); int useScanner = DBGetContactSettingByte(NULL, "SRFile", "UseScanner", VIRUSSCAN_DISABLE); @@ -686,14 +687,14 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SetFtStatus(hwndDlg, LPGENT("Scanning for viruses..."), FTS_TEXT); if (vstsi) forkthread((void (*)(void*))RunVirusScannerThread, 0, vstsi); - } + } else dat->fs = NULL; /* protocol will free structure */ dat->transferStatus.currentFileNumber = dat->transferStatus.totalFiles; } // else dat->send - + } // else ack->result - + PostMessage(GetParent(hwndDlg), WM_FT_COMPLETED, ack->result, (LPARAM)hwndDlg); break; } diff --git a/src/core/stdfile/ftmanager.cpp b/src/core/stdfile/ftmanager.cpp index 216798ded7..deb1bd3ef7 100644 --- a/src/core/stdfile/ftmanager.cpp +++ b/src/core/stdfile/ftmanager.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #include "file.h" @@ -455,7 +456,7 @@ static INT_PTR CALLBACK FtMgrDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if ( !prg.run) pTaskbarInterface->SetProgressValue(hwnd, 1, 1); } - else if (prg.run) + else if (prg.run) pTaskbarInterface->SetProgressState(hwnd, TBPF_NORMAL); else if (prg.init || prg.scan) pTaskbarInterface->SetProgressState(hwnd, TBPF_INDETERMINATE); @@ -465,7 +466,7 @@ static INT_PTR CALLBACK FtMgrDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } if (prg.run) - pTaskbarInterface->SetProgressValue(hwnd, prg.totalProgress, prg.totalBytes); + pTaskbarInterface->SetProgressValue(hwnd, prg.totalProgress, prg.totalBytes); } break; } diff --git a/src/core/stdfile/main.cpp b/src/core/stdfile/main.cpp index 84d93121c1..842dc93577 100644 --- a/src/core/stdfile/main.cpp +++ b/src/core/stdfile/main.cpp @@ -2,7 +2,7 @@ Standard file transfers' plugin for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdhelp/about.cpp b/src/core/stdhelp/about.cpp index e78912344c..47226db9d0 100644 --- a/src/core/stdhelp/about.cpp +++ b/src/core/stdhelp/about.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #define STR_VERSION_FORMAT "%s%S" diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h index c62e8b3aaa..1341e88f4f 100644 --- a/src/core/stdhelp/commonheaders.h +++ b/src/core/stdhelp/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdhelp/help.cpp b/src/core/stdhelp/help.cpp index 9f7970cd95..86ce15e997 100644 --- a/src/core/stdhelp/help.cpp +++ b/src/core/stdhelp/help.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/src/core/stdhelp/main.cpp b/src/core/stdhelp/main.cpp index d3c4c96ab6..8f2b6da362 100644 --- a/src/core/stdhelp/main.cpp +++ b/src/core/stdhelp/main.cpp @@ -2,7 +2,7 @@ Standard Help/About plugin for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h index 39e74a5dc8..0c73cf27d7 100644 --- a/src/core/stdidle/commonheaders.h +++ b/src/core/stdidle/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdidle/idle.cpp b/src/core/stdidle/idle.cpp index 66dd315b80..fc547c8b92 100644 --- a/src/core/stdidle/idle.cpp +++ b/src/core/stdidle/idle.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -84,23 +84,23 @@ typedef enum _WTS_CONNECTSTATE_CLASS { } WTS_CONNECTSTATE_CLASS; typedef enum _WTS_INFO_CLASS { - WTSInitialProgram, - WTSApplicationName, - WTSWorkingDirectory, - WTSOEMId, - WTSSessionId, - WTSUserName, - WTSWinStationName, - WTSDomainName, - WTSConnectState, - WTSClientBuildNumber, - WTSClientName, - WTSClientDirectory, - WTSClientProductId, - WTSClientHardwareId, - WTSClientAddress, - WTSClientDisplay, - WTSClientProtocolType, + WTSInitialProgram, + WTSApplicationName, + WTSWorkingDirectory, + WTSOEMId, + WTSSessionId, + WTSUserName, + WTSWinStationName, + WTSDomainName, + WTSConnectState, + WTSClientBuildNumber, + WTSClientName, + WTSClientDirectory, + WTSClientProductId, + WTSClientHardwareId, + WTSClientAddress, + WTSClientDisplay, + WTSClientProtocolType, } WTS_INFO_CLASS; #endif @@ -118,7 +118,7 @@ BOOL InitWTSAPI() if (hDll) { _WTSFreeMemory = (VOID (WINAPI *)(PVOID))GetProcAddress(hDll, "WTSFreeMemory"); _WTSQuerySessionInformation = (BOOL (WINAPI *)(HANDLE, DWORD, WTS_INFO_CLASS, PVOID, DWORD*))GetProcAddress(hDll, "WTSQuerySessionInformationW"); - + if (_WTSFreeMemory && _WTSQuerySessionInformation) return 1; } return 0; @@ -206,12 +206,12 @@ static int IdleObject_IsUserIdle(IdleObject * obj) CallService(MS_SYSTEM_GETIDLE, 0, (LPARAM)&dwTick); return GetTickCount() - dwTick > (obj->minutes * 60 * 1000); } - + if (MyGetLastInputInfo != NULL) { LASTINPUTINFO ii; ZeroMemory(&ii, sizeof(ii)); ii.cbSize = sizeof(ii); - if (MyGetLastInputInfo(&ii)) + if (MyGetLastInputInfo(&ii)) return GetTickCount() - ii.dwTime > (obj->minutes * 60 * 1000); } else { @@ -250,7 +250,7 @@ static bool IsScreenSaverRunning(void) return rc != 0; } -bool IsFullScreen(void) +bool IsFullScreen(void) { RECT rcScreen = {0}; @@ -270,7 +270,7 @@ bool IsFullScreen(void) // check foregroundwindow HWND hWnd = GetForegroundWindow(); - if (hWnd && hWnd != hWndDesktop && hWnd != hWndShell) + if (hWnd && hWnd != hWndDesktop && hWnd != hWndShell) { TCHAR tszClassName[128] = _T(""); GetClassName(hWnd, tszClassName, SIZEOF(tszClassName)); @@ -282,8 +282,8 @@ bool IsFullScreen(void) GetClientRect(hWnd, &rect); ClientToScreen(hWnd, (LPPOINT)&rect); ClientToScreen(hWnd, (LPPOINT)&rect.right); - - if (EqualRect(&rect, &rectw) && IntersectRect(&recti, &rect, &rcScreen) && + + if (EqualRect(&rect, &rectw) && IntersectRect(&recti, &rect, &rcScreen) && EqualRect(&recti, &rcScreen)) return true; } @@ -298,19 +298,19 @@ static void IdleObject_Tick(IdleObject * obj) int idleType = 0, flags = 0; if (obj->useridlecheck && IdleObject_IsUserIdle(obj)) { - idleType = 1; idle = true; + idleType = 1; idle = true; } else if (IdleObject_IdleCheckSaver(obj) && IsScreenSaverRunning()) { - idleType = 2; idle = true; + idleType = 2; idle = true; } else if (IdleObject_IdleCheckFullScr(obj) && IsFullScreen()) { - idleType = 5; idle = true; + idleType = 5; idle = true; } else if (IdleObject_IdleCheckWorkstation(obj) && IsWorkstationLocked()) { - idleType = 3; idle = true; + idleType = 3; idle = true; } else if (IdleObject_IdleCheckTerminal(obj) && IsTerminalDisconnected()) { - idleType = 4; idle = true; + idleType = 4; idle = true; } if (IdleObject_IsPrivacy(obj)) @@ -476,9 +476,9 @@ static INT_PTR IdleGetInfo(WPARAM, LPARAM lParam) static int IdleModernOptInit(WPARAM wParam, LPARAM) { - static const int iBoldControls[] = + static const int iBoldControls[] = { - IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, + IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, MODERNOPT_CTRL_LAST }; diff --git a/src/core/stdidle/main.cpp b/src/core/stdidle/main.cpp index 2db8f102d1..9906dedd38 100644 --- a/src/core/stdidle/main.cpp +++ b/src/core/stdidle/main.cpp @@ -2,7 +2,7 @@ Standard idle state module for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 91d082fc74..f394a30e57 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,12 +18,13 @@ 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. */ + #include "commonheaders.h" int tcmdlist_append(SortedList *list, TCHAR *data) { TCmdList *new_list; - + if (!data) return list->realCount - 1; @@ -42,12 +44,12 @@ int tcmdlist_append(SortedList *list, TCHAR *data) return list->realCount - 1; } -void tcmdlist_free(SortedList *list) +void tcmdlist_free(SortedList *list) { int i; TCmdList** n = (TCmdList**)list->items; - for (i = 0; i < list->realCount; ++i) + for (i = 0; i < list->realCount; ++i) { mir_free(n[i]->szCmd); mir_free(n[i]); @@ -66,10 +68,10 @@ static VOID CALLBACK MsgTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi { int i, ntl = 0; TMsgQueue **tmlst = NULL; - + EnterCriticalSection(&csMsgQueue); - for (i = 0; i < msgQueue.realCount; ++i) + for (i = 0; i < msgQueue.realCount; ++i) { TMsgQueue *item = (TMsgQueue*)msgQueue.items[i]; if (dwTime - item->ts > g_dat->msgTimeout) @@ -83,7 +85,7 @@ static VOID CALLBACK MsgTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi } LeaveCriticalSection(&csMsgQueue); - for (i = 0; i < ntl; ++i) + for (i = 0; i < ntl; ++i) MessageFailureProcess(tmlst[i], LPGEN("The message send timed out.")); } @@ -108,10 +110,10 @@ void msgQueue_processack(HANDLE hContact, HANDLE id, BOOL success, const char* s { int i; TMsgQueue* item = NULL;; - + EnterCriticalSection(&csMsgQueue); - for (i = 0; i < msgQueue.realCount; ++i) + for (i = 0; i < msgQueue.realCount; ++i) { item = (TMsgQueue*)msgQueue.items[i]; if (item->hContact == hContact && item->id == id) @@ -128,7 +130,7 @@ void msgQueue_processack(HANDLE hContact, HANDLE id, BOOL success, const char* s item = NULL; } LeaveCriticalSection(&csMsgQueue); - + if (item) { if (success) @@ -149,10 +151,10 @@ void msgQueue_init(void) void msgQueue_destroy(void) { int i; - + EnterCriticalSection(&csMsgQueue); - for (i = 0; i < msgQueue.realCount; ++i) + for (i = 0; i < msgQueue.realCount; ++i) { TMsgQueue* item = (TMsgQueue*)msgQueue.items[i]; mir_free(item->szMsg); diff --git a/src/core/stdmsg/src/cmdlist.h b/src/core/stdmsg/src/cmdlist.h index add3d4987b..5311ebd13c 100644 --- a/src/core/stdmsg/src/cmdlist.h +++ b/src/core/stdmsg/src/cmdlist.h @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,30 +18,31 @@ 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. */ + #ifndef SRMM_CMDLIST_H #define SRMM_CMDLIST_H -typedef struct _TCmdList +typedef struct _TCmdList { TCHAR *szCmd; -} +} TCmdList; int tcmdlist_append(SortedList *list, TCHAR *data); void tcmdlist_free(SortedList *list); -__inline TCHAR* tcmdlist_getitem(SortedList *list, int ind) +__inline TCHAR* tcmdlist_getitem(SortedList *list, int ind) { return ((TCmdList*)list->items[ind])->szCmd; } -typedef struct _TMsgQueue +typedef struct _TMsgQueue { HANDLE id; HANDLE hContact; TCHAR* szMsg; HANDLE hDbEvent; unsigned ts; -} +} TMsgQueue; void msgQueue_add(HANDLE hContact, HANDLE id, const TCHAR* szMsg, HANDLE hDbEvent); diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h index 5ab3a6985d..31e72d7ff1 100644 --- a/src/core/stdmsg/src/commonheaders.h +++ b/src/core/stdmsg/src/commonheaders.h @@ -1,5 +1,6 @@ /* -Copyright 2000-2012 Miranda IM project, + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -18,8 +19,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define MIRANDA_VER 0x0A00 - #define _WIN32_WINNT 0x0501 #define _WIN32_IE 0x0501 diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 52e69a8860..6d32aedc08 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2012 Miranda /IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" struct GlobalMessageData *g_dat; @@ -26,7 +28,7 @@ static int dbaddedevent(WPARAM wParam, LPARAM lParam); static int ackevent(WPARAM wParam, LPARAM lParam); static int AvatarChanged(WPARAM wParam, LPARAM lParam); -IconItem iconList[] = +IconItem iconList[] = { { LPGEN("Incoming message (10x10)"), "INCOMING", IDI_INCOMING, 10 }, { LPGEN("Outgoing message (10x10)"), "OUTGOING", IDI_OUTGOING, 10 }, @@ -42,7 +44,7 @@ static int IconsChanged(WPARAM wParam, LPARAM lParam) { FreeMsgLogIcons(); LoadMsgLogIcons(); - + return 0; } @@ -64,7 +66,7 @@ void FreeGlobals() int i; mir_free(g_dat); - for (i=0; i < SIZEOF(g_hooks); ++i) + for (i=0; i < SIZEOF(g_hooks); ++i) if (g_hooks[i]) UnhookEvent(g_hooks[i]); } @@ -100,9 +102,9 @@ void ReloadGlobals() g_dat->flags |= SMF_HIDENAMES; if (db_get_b(NULL, SRMMMOD, SRMSGSET_CHARCOUNT, SRMSGDEFSET_CHARCOUNT)) g_dat->flags |= SMF_SHOWREADCHAR; - if (db_get_b(NULL, SRMMMOD, SRMSGSET_SENDONENTER, SRMSGDEFSET_SENDONENTER)) + if (db_get_b(NULL, SRMMMOD, SRMSGSET_SENDONENTER, SRMSGDEFSET_SENDONENTER)) g_dat->flags |= SMF_SENDONENTER; - if (db_get_b(NULL, SRMMMOD, SRMSGSET_SENDONDBLENTER, SRMSGDEFSET_SENDONDBLENTER)) + if (db_get_b(NULL, SRMMMOD, SRMSGSET_SENDONDBLENTER, SRMSGDEFSET_SENDONDBLENTER)) g_dat->flags |= SMF_SENDONDBLENTER; if (db_get_b(NULL, SRMMMOD, SRMSGSET_AUTOCLOSE, SRMSGDEFSET_AUTOCLOSE)) g_dat->flags |= SMF_AUTOCLOSE; @@ -125,7 +127,7 @@ void ReloadGlobals() static int dbaddedevent(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; - if (hContact) + if (hContact) { HWND h = WindowList_Find(g_dat->hMessageWindowList, hContact); if (h) SendMessage(h, HM_DBEVENTADDED, (WPARAM)hContact, lParam); @@ -136,13 +138,13 @@ static int dbaddedevent(WPARAM wParam, LPARAM lParam) static int ackevent(WPARAM wParam, LPARAM lParam) { ACKDATA *pAck = (ACKDATA *)lParam; - + if (!pAck) return 0; - if (pAck->type == ACKTYPE_MESSAGE) + if (pAck->type == ACKTYPE_MESSAGE) { msgQueue_processack(pAck->hContact, pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam); - if (pAck->result == ACKRESULT_SUCCESS) + if (pAck->result == ACKRESULT_SUCCESS) SkinPlaySound("SendMsg"); } return 0; @@ -155,4 +157,3 @@ int AvatarChanged(WPARAM wParam, LPARAM lParam) if (h) SendMessage(h, HM_AVATARACK, wParam, lParam); return 0; } - diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index 05ae138f7d..03574f1ed3 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -1,6 +1,7 @@ /* -Copyright 2000-2012 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #ifndef SRMM_GLOBALS_H #define SRMM_GLOBALS_H diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 22bd5b46e8..dcb83e9f35 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1,5 +1,6 @@ /* -Copyright 2000-2012 Miranda IM project, + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -168,7 +169,7 @@ static void AddToFileList(TCHAR ***pppFiles,int *totalCount,const TCHAR* szFilen if ( !_tcscmp(fd.cFileName,_T(".")) || !_tcscmp(fd.cFileName,_T(".."))) continue; mir_sntprintf(szPath, SIZEOF(szPath), _T("%s\\%s"), szFilename, fd.cFileName); AddToFileList(pppFiles,totalCount,szPath); - } + } while( FindNextFile( hFind,&fd )); FindClose( hFind ); } } } @@ -187,7 +188,7 @@ static void UpdateReadChars(HWND hwndDlg, HWND hwndStatus) mir_sntprintf(buf, SIZEOF(buf), _T("%d"), len); SendMessage(hwndStatus, SB_SETTEXT, 1, (LPARAM) buf); - } + } } static void ShowTime(struct SrmmWindowData *dat) @@ -197,13 +198,13 @@ static void ShowTime(struct SrmmWindowData *dat) GetSystemTime(&st); if (dat->wMinute != st.wMinute) { TCHAR buf[32]; - unsigned i = (g_dat->flags & SMF_SHOWREADCHAR) ? 2 : 1; + unsigned i = (g_dat->flags & SMF_SHOWREADCHAR) ? 2 : 1; tmi.printDateTime(dat->hTimeZone, _T("t"), buf, SIZEOF(buf), 0); SendMessage(dat->hwndStatus, SB_SETTEXT, i, (LPARAM) buf); dat->wMinute = st.wMinute; } - } + } } static void SetupStatusBar(HWND hwndDlg, struct SrmmWindowData *dat) @@ -216,11 +217,11 @@ static void SetupStatusBar(HWND hwndDlg, struct SrmmWindowData *dat) cx = rc.right - rc.left; if (dat->hTimeZone) { - if (g_dat->flags & SMF_SHOWREADCHAR) + if (g_dat->flags & SMF_SHOWREADCHAR) statwidths[i++] = cx - SB_TIME_WIDTH - SB_CHAR_WIDTH - icons_width; statwidths[i++] = cx - SB_TIME_WIDTH - icons_width; } - else if (g_dat->flags & SMF_SHOWREADCHAR) + else if (g_dat->flags & SMF_SHOWREADCHAR) statwidths[i++] = cx - SB_CHAR_WIDTH - icons_width; statwidths[i++] = cx - icons_width; @@ -314,7 +315,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar case WM_KEYDOWN: if (wParam == VK_RETURN) { - if ( !(GetKeyState(VK_SHIFT) & 0x8000) && + if ( !(GetKeyState(VK_SHIFT) & 0x8000) && ((GetKeyState(VK_CONTROL) & 0x8000) != 0) != ((g_dat->flags & SMF_SENDONENTER) != 0)) { PostMessage(GetParent(hwnd), WM_COMMAND, IDOK, 0); return 0; @@ -330,7 +331,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar } } } - else dat->lastEnterTime = 0; + else dat->lastEnterTime = 0; if (((wParam == VK_INSERT && (GetKeyState(VK_SHIFT) & 0x8000)) || (wParam == 'V' && (GetKeyState(VK_CONTROL) & 0x8000))) && !(GetKeyState(VK_MENU) & 0x8000)) { // ctrl-v (paste clean text) @@ -338,7 +339,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar return 0; } - if (wParam == VK_UP && (GetKeyState(VK_CONTROL) & 0x8000) && + if (wParam == VK_UP && (GetKeyState(VK_CONTROL) & 0x8000) && ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) { if (pdat->cmdList->realCount) { if (pdat->cmdListInd < 0) { @@ -353,8 +354,8 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar UpdateReadChars(GetParent(hwnd), pdat->hwndStatus); return 0; } - - if (wParam == VK_DOWN && (GetKeyState(VK_CONTROL) & 0x8000) && + + if (wParam == VK_DOWN && (GetKeyState(VK_CONTROL) & 0x8000) && ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) { if (pdat->cmdList->realCount && pdat->cmdListInd >= 0) { if (pdat->cmdListInd < (pdat->cmdList->realCount - 1)) @@ -362,7 +363,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar else { pdat->cmdListInd = -1; SetEditorText(hwnd, tcmdlist_getitem(pdat->cmdList, pdat->cmdList->realCount - 1)); - } + } } EnableWindow(GetDlgItem(GetParent(hwnd), IDOK), GetWindowTextLength(hwnd) != 0); @@ -386,7 +387,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar } break; - case WM_CONTEXTMENU: + case WM_CONTEXTMENU: { HMENU hMenu; CHARRANGE sel; @@ -410,7 +411,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar EnableMenuItem(mwpd.hMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(mwpd.hMenu, IDM_DELETE, MF_BYCOMMAND | MF_GRAYED); } - if ( !SendMessage(hwnd, EM_CANUNDO, 0, 0)) + if ( !SendMessage(hwnd, EM_CANUNDO, 0, 0)) EnableMenuItem(mwpd.hMenu, IDM_UNDO, MF_BYCOMMAND | MF_GRAYED); if ( !SendMessage(hwnd, EM_CANREDO, 0, 0)) @@ -820,7 +821,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP else CallService(MS_DB_EVENT_GET, (WPARAM) dat->hDbEventFirst, (LPARAM) & dbei); firstTime = dbei.timestamp - 60 * DBGetContactSettingWord(NULL, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME); - for (;;) + for (;;) { if (dat->hDbEventFirst == NULL) hPrevEvent = (HANDLE) CallService(MS_DB_EVENT_FINDLAST, (WPARAM) dat->hContact, 0); @@ -835,8 +836,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->hDbEventFirst = hPrevEvent; } break; - } - } + } + } } { @@ -845,7 +846,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.cbSize = sizeof(dbei); hdbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDLAST, (WPARAM) dat->hContact, 0); - if (hdbEvent) + if (hdbEvent) { do { ZeroMemory(&dbei, sizeof(dbei)); @@ -858,7 +859,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } } while (hdbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDPREV, (WPARAM) hdbEvent, 0)); - } + } } SendMessage(hwndDlg, DM_OPTIONSAPPLIED, 1, 0); @@ -1094,9 +1095,9 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { // avatar stuff dat->avatarPic = NULL; dat->limitAvatarH = 0; - if (CallProtoService(dat->szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_AVATARS) + if (CallProtoService(dat->szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_AVATARS) { - dat->limitAvatarH = db_get_b(NULL, SRMMMOD, SRMSGSET_LIMITAVHEIGHT, SRMSGDEFSET_LIMITAVHEIGHT) ? + dat->limitAvatarH = db_get_b(NULL, SRMMMOD, SRMSGSET_LIMITAVHEIGHT, SRMSGDEFSET_LIMITAVHEIGHT) ? DBGetContactSettingDword(NULL, SRMMMOD, SRMSGSET_AVHEIGHT, SRMSGDEFSET_AVHEIGHT) : 0; } if ( !wParam) SendMessage(hwndDlg, DM_GETAVATAR, 0, 0); @@ -1105,7 +1106,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { HFONT hFont; LOGFONT lf; - CHARFORMAT cf = {0}; + CHARFORMAT cf = {0}; hFont = (HFONT) SendDlgItemMessage(hwndDlg, IDC_MESSAGE, WM_GETFONT, 0, 0); if (hFont != NULL && hFont != (HFONT) SendDlgItemMessage(hwndDlg, IDOK, WM_GETFONT, 0, 0)) DeleteObject(hFont); @@ -1169,7 +1170,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case CNFT_DWORD: mir_sntprintf(buf, SIZEOF(buf), _T("%u"), ci.dVal); break; - } + } } } if (buf[0]) @@ -1190,7 +1191,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } // log - if ((dat->wStatus != dat->wOldStatus || lParam != 0) && + if ((dat->wStatus != dat->wOldStatus || lParam != 0) && db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH)) { DBEVENTINFO dbei; TCHAR buffer[200]; @@ -1408,7 +1409,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if ((dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && !(dbei.flags & DBEF_SENT)) { if (GetForegroundWindow() == hwndDlg) SkinPlaySound("RecvMsgActive"); - else + else SkinPlaySound("RecvMsgInactive"); } if (( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && dat->hwndStatus && !(dbei.flags & DBEF_SENT)) { @@ -1434,7 +1435,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else SetTimer(hwndDlg, TIMERID_FLASHWND, TIMEOUT_FLASHWND, NULL); } - } + } } break; @@ -1488,8 +1489,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP Skin_ReleaseIcon(hIcon); } dat->showTyping = 1; - } - } + } + } } break; @@ -1530,7 +1531,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP Skin_ReleaseIcon(hIcon); return TRUE; - } + } } } else if (dis->CtlID == IDC_AVATAR && dat->avatarPic && (g_dat->flags & SMF_AVATAR)) { @@ -1547,7 +1548,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP HBITMAP hbmMem = (HBITMAP)SelectObject(hdcMem, dat->avatarPic); SetStretchBltMode(dis->hDC, HALFTONE); - StretchBlt(dis->hDC, 1, 1, dat->avatarWidth-2, dat->avatarHeight-2, hdcMem, 0, 0, + StretchBlt(dis->hDC, 1, 1, dat->avatarWidth-2, dat->avatarHeight-2, hdcMem, 0, 0, bminfo.bmWidth, bminfo.bmHeight, SRCCOPY); SelectObject(hdcMem,hbmMem); @@ -1651,7 +1652,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF); - } + } } break; } @@ -1667,7 +1668,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (nm->pt.x >= rc.left) CheckIconClick(dat->hContact, dat->hwndStatus, nm->pt, rc, 2, ((LPNMHDR) lParam)->code == NM_RCLICK ? MBCF_RIGHTBUTTON : 0); return TRUE; - } + } } switch (((LPNMHDR) lParam)->idFrom) { @@ -1731,7 +1732,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DestroyMenu(hMenu); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; - } + } } break; @@ -1770,7 +1771,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP memmove(tr.lpstrText + 7, tr.lpstrText, (tr.chrg.cpMax - tr.chrg.cpMin + 1) * sizeof(TCHAR)); memcpy(tr.lpstrText, _T("mailto:"), 7 * sizeof(TCHAR)); } - if (((ENLINK *) lParam)->msg == WM_RBUTTONDOWN) + if (((ENLINK *) lParam)->msg == WM_RBUTTONDOWN) { HMENU hMenu, hSubMenu; POINT pt; @@ -1809,9 +1810,9 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE)); } break; - } - } - } + } + } + } } break; @@ -1827,15 +1828,15 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if ( !dat) return 0; NotifyLocalWinEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_CLOSING); //save string from the editor - if(dat->hContact) + if(dat->hContact) { TCHAR* msg; int len = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_MESSAGE)) + 1; msg = (TCHAR*)alloca(sizeof(TCHAR) * len); GetDlgItemText(hwndDlg, IDC_MESSAGE, msg, len); - if (msg[0]) + if (msg[0]) DBWriteContactSettingTString(dat->hContact, SRMSGMOD, DBSAVEDMSG, msg); - else + else DBDeleteContactSetting(dat->hContact, SRMSGMOD, DBSAVEDMSG); } KillTimer(hwndDlg, TIMERID_TYPE); diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 89647cd226..96941ff722 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" extern IconItem iconList[]; @@ -76,7 +78,7 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA return 0; lineLen = (int)_tcslen(line) * 9 + 8; - if (*cbBufferEnd + lineLen > *cbBufferAlloced) + if (*cbBufferEnd + lineLen > *cbBufferAlloced) { cbBufferAlloced[0] += (lineLen + 1024 - lineLen % 1024); *buffer = (char *) mir_realloc(*buffer, *cbBufferAlloced); @@ -86,9 +88,9 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA strcpy(d, "{\\uc1 "); d += 6; - for (; *line; line++, textCharsCount++) + for (; *line; line++, textCharsCount++) { - if (*line == '\r' && line[1] == '\n') + if (*line == '\r' && line[1] == '\n') { memcpy(d, "\\par ", 5); line++; @@ -98,12 +100,12 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA memcpy(d, "\\par ", 5); d += 5; } - else if (*line == '\t') + else if (*line == '\t') { memcpy(d, "\\tab ", 5); d += 5; } - else if (*line == '\\' || *line == '{' || *line == '}') + else if (*line == '\\' || *line == '{' || *line == '}') { *d++ = '\\'; *d++ = (char) *line; @@ -342,12 +344,12 @@ static char *CreateRTFFromDbEvent(struct SrmmWindowData *dat, HANDLE hContact, H CopyMemory(buffer + bufferEnd, pLogIconBmpBits[i], logIconBmpSize[i]); bufferEnd += logIconBmpSize[i]; } - if (g_dat->flags & SMF_SHOWTIME) + if (g_dat->flags & SMF_SHOWTIME) { - const TCHAR* szFormat; + const TCHAR* szFormat; TCHAR str[64]; - - if (g_dat->flags & SMF_SHOWSECS) + + if (g_dat->flags & SMF_SHOWSECS) szFormat = g_dat->flags & SMF_SHOWDATE ? _T("d s") : _T("s"); else szFormat = g_dat->flags & SMF_SHOWDATE ? _T("d t") : _T("t"); @@ -386,7 +388,7 @@ static char *CreateRTFFromDbEvent(struct SrmmWindowData *dat, HANDLE hContact, H switch (dbei.eventType) { default: case EVENTTYPE_MESSAGE: - { + { TCHAR* msg = DbGetEventTextT( &dbei, CP_ACP ); AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, " %s ", SetToStyle(dbei.flags & DBEF_SENT ? MSGFONTID_MYMSG : MSGFONTID_YOURMSG)); AppendToBufferWithRTF(&buffer, &bufferEnd, &bufferAlloced, msg); @@ -460,10 +462,10 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG { struct LogStreamData *dat = (struct LogStreamData *) dwCookie; - if (dat->buffer == NULL) + if (dat->buffer == NULL) { dat->bufferOffset = 0; - switch (dat->stage) + switch (dat->stage) { case STREAMSTAGE_HEADER: dat->buffer = CreateRTFHeader(dat->dlgDat); @@ -471,9 +473,9 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG break; case STREAMSTAGE_EVENTS: - if (dat->eventsToInsert) + if (dat->eventsToInsert) { - do + do { dat->buffer = CreateRTFFromDbEvent(dat->dlgDat, dat->hContact, dat->hDbEvent, dat); if (dat->buffer) @@ -482,7 +484,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG if (--dat->eventsToInsert == 0) break; } while (dat->buffer == NULL && dat->hDbEvent); - if (dat->buffer) + if (dat->buffer) { dat->isEmpty = 0; break; @@ -503,7 +505,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG *pcb = min(cb, dat->bufferLen - dat->bufferOffset); CopyMemory(pbBuff, dat->buffer + dat->bufferOffset, *pcb); dat->bufferOffset += *pcb; - if (dat->bufferOffset == dat->bufferLen) + if (dat->bufferOffset == dat->bufferLen) { mir_free(dat->buffer); dat->buffer = NULL; @@ -546,7 +548,7 @@ void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend) if (!bottomScroll) SendMessage(hwndLog, EM_GETSCROLLPOS, 0, (LPARAM) & scrollPos); } - if (fAppend) + if (fAppend) { sel.cpMin = sel.cpMax = -1; SendMessage(hwndLog, EM_EXSETSEL, 0, (LPARAM) & sel); diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index a0bcb29172..5d729ed3a9 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -1,5 +1,6 @@ /* -Copyright 2000-2010 Miranda IM project, + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" #include "m_fontservice.h" @@ -32,7 +34,7 @@ struct FontOptionsList BYTE defStyle; char defSize; } -static const fontOptionsList[] = +static const fontOptionsList[] = { { LPGENT("Outgoing messages"), RGB(106, 106, 106), _T("Arial"), 0, -12}, { LPGENT("Incoming messages"), RGB(0, 0, 0), _T("Arial"), 0, -12}, @@ -648,7 +650,7 @@ void InitOptions(void) void UnloadOptions(void) { int i; - for (i=0; i < SIZEOF(oHooks); ++i) + for (i=0; i < SIZEOF(oHooks); ++i) if (oHooks[i]) UnhookEvent(oHooks[i]); } diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 66dbc0b8e0..249a60c6ca 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -1,5 +1,6 @@ /* -Copyright 2000-2012 Miranda IM project, + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" #include "statusicon.h" @@ -62,7 +64,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1); /* does a window for the contact exist? */ hwnd = WindowList_Find(g_dat->hMessageWindowList, (HANDLE) wParam); - if (hwnd) + if (hwnd) { if (!db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS)) { @@ -75,7 +77,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) { if (GetForegroundWindow() == hwnd) SkinPlaySound("RecvMsgActive"); - else + else SkinPlaySound("RecvMsgInactive"); } return 0; @@ -120,9 +122,9 @@ INT_PTR SendMessageCmd(HANDLE hContact, char* msg, int isWchar) if (!szProto || (!CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)) return 1; - if (hwnd = WindowList_Find(g_dat->hMessageWindowList, hContact)) + if (hwnd = WindowList_Find(g_dat->hMessageWindowList, hContact)) { - if (msg) + if (msg) { HWND hEdit; hEdit = GetDlgItem(hwnd, IDC_MESSAGE); @@ -136,7 +138,7 @@ INT_PTR SendMessageCmd(HANDLE hContact, char* msg, int isWchar) SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); SetForegroundWindow(hwnd); } - else + else { struct NewMessageWindowLParam newData = { 0 }; newData.hContact = hContact; @@ -259,22 +261,22 @@ static void RestoreUnreadMessageAlerts(void) cle.ptszTooltip = toolTip; hContact = db_find_first(); - while (hContact) + while (hContact) { hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDFIRSTUNREAD, (WPARAM) hContact, 0); - while (hDbEvent) + while (hDbEvent) { autoPopup = 0; dbei.cbBlob = 0; CallService(MS_DB_EVENT_GET, (WPARAM) hDbEvent, (LPARAM) & dbei); - if (!(dbei.flags & (DBEF_SENT | DBEF_READ)) && ( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) + if (!(dbei.flags & (DBEF_SENT | DBEF_READ)) && ( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) { windowAlreadyExists = WindowList_Find(g_dat->hMessageWindowList, hContact) != NULL; if (windowAlreadyExists) continue; { char *szProto = GetContactProto(hContact); - if (szProto && (g_dat->openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) + if (szProto && (g_dat->openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) { autoPopup = 1; } @@ -286,7 +288,7 @@ static void RestoreUnreadMessageAlerts(void) newData.noActivate = db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS); CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSG), NULL, DlgProcMessage, (LPARAM) & newData); } - else + else { cle.hContact = hContact; cle.hDbEvent = hDbEvent; @@ -341,8 +343,8 @@ int SplitmsgShutdown(void) DestroyCursor(hCurSplitNS); DestroyCursor(hCurHyperlinkHand); DestroyCursor(hCurSplitWE); - - for (i=0; i < SIZEOF(hHooks); ++i) + + for (i=0; i < SIZEOF(hHooks); ++i) if (hHooks[i]) UnhookEvent(hHooks[i]); @@ -424,7 +426,7 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam) int LoadSendRecvMessageModule(void) { if (LoadLibraryA("riched20.dll") == NULL) { - if (IDYES != + if (IDYES != MessageBox(0, TranslateT ("Miranda could not load the built-in message module, riched20.dll is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), @@ -457,13 +459,13 @@ int LoadSendRecvMessageModule(void) hHookWinEvt = CreateHookableEvent(ME_MSG_WINDOWEVENT); hHookWinPopup = CreateHookableEvent(ME_MSG_WINDOWPOPUP); - + SkinAddNewSoundEx("RecvMsgActive", LPGEN("Instant messages"), LPGEN("Incoming (Focused Window)")); SkinAddNewSoundEx("RecvMsgInactive", LPGEN("Instant messages"), LPGEN("Incoming (Unfocused Window)")); SkinAddNewSoundEx("AlertMsg", LPGEN("Instant messages"), LPGEN("Incoming (New Session)")); SkinAddNewSoundEx("SendMsg", LPGEN("Instant messages"), LPGEN("Outgoing")); SkinAddNewSoundEx("SendError", LPGEN("Instant messages"), LPGEN("Message send error")); - + hCurSplitNS = LoadCursor(NULL, IDC_SIZENS); hCurSplitWE = LoadCursor(NULL, IDC_SIZEWE); hCurHyperlinkHand = LoadCursor(NULL, IDC_HAND); diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 4a02e67a32..1403172b2a 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -1,6 +1,7 @@ /* -Copyright 2000-2012 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #ifndef SRMM_MSGS_H #define SRMM_MSGS_H diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index b956faaf2a..86585c511a 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -33,7 +34,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar { TMsgQueue *item = (TMsgQueue*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); - switch (msg) + switch (msg) { case WM_INITDIALOG: { @@ -47,7 +48,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if (!param->szMsg || !param->szMsg[0]) SetDlgItemText(hwndDlg, IDC_ERRORTEXT, TranslateT("An unknown error has occured.")); - else + else { TCHAR* ptszError = (TCHAR*)CallService(MS_LANGPACK_PCHARTOTCHAR, 0, (LPARAM)param->szMsg); SetDlgItemText(hwndDlg, IDC_ERRORTEXT, ptszError); @@ -58,8 +59,8 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar GetWindowRect(hwndDlg, &rc); GetWindowRect(GetParent(hwndDlg), &rcParent); - SetWindowPos(hwndDlg, 0, (rcParent.left + rcParent.right - (rc.right - rc.left)) / 2, - (rcParent.top + rcParent.bottom - (rc.bottom - rc.top)) / 2, + SetWindowPos(hwndDlg, 0, (rcParent.left + rcParent.right - (rc.right - rc.left)) / 2, + (rcParent.top + rcParent.bottom - (rc.bottom - rc.top)) / 2, 0, 0, SWP_NOZORDER | SWP_NOSIZE); } return TRUE; @@ -91,7 +92,7 @@ void MessageFailureProcess(TMsgQueue *item, const char* err) ErrorDlgParam param = { err, item }; CallService(MS_DB_EVENT_DELETE, (WPARAM)item->hContact, (LPARAM)item->hDbEvent); - + hwnd = WindowList_Find(g_dat->hMessageWindowList, (HANDLE)item->hContact); if (hwnd == NULL) { @@ -104,4 +105,3 @@ void MessageFailureProcess(TMsgQueue *item, const char* err) SkinPlaySound("SendError"); CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSGSENDERROR), hwnd, ErrorDlgProc, (LPARAM) ¶m); } - diff --git a/src/core/stdmsg/src/richutil.cpp b/src/core/stdmsg/src/richutil.cpp index 7f77c98fa8..c863395cd0 100644 --- a/src/core/stdmsg/src/richutil.cpp +++ b/src/core/stdmsg/src/richutil.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" #include "richutil.h" @@ -25,12 +27,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. RichUtil_Load(); Before the application exits, call: RichUtil_Unload(); - + Then to use the library (it draws the xp border around it), you need - to make sure you control has the WS_EX_CLIENTEDGE flag. Then you just + to make sure you control has the WS_EX_CLIENTEDGE flag. Then you just subclass it with: RichUtil_SubClass(hwndEdit); - + If no xptheme is present, the window isn't subclassed the SubClass function just returns. And if WS_EX_CLIENTEDGE isn't present, the subclass does nothing. Otherwise it removes the border and draws it by itself. @@ -38,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static SortedList sListInt; -static int RichUtil_CmpVal(void *p1, void *p2) +static int RichUtil_CmpVal(void *p1, void *p2) { TRichUtil *tp1 = (TRichUtil*)p1; TRichUtil *tp2 = (TRichUtil*)p2; @@ -61,7 +63,7 @@ static CRITICAL_SECTION csRich; static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); static void RichUtil_ClearUglyBorder(TRichUtil *ru); -void RichUtil_Load(void) +void RichUtil_Load(void) { sListInt.increment = 10; sListInt.sortFunc = RichUtil_CmpVal; @@ -79,20 +81,20 @@ void RichUtil_Load(void) MyDrawThemeParentBackground = (HRESULT (WINAPI *)(HWND, HDC, RECT*))GetProcAddress(mTheme, "DrawThemeParentBackground"); MyIsThemeBackgroundPartiallyTransparent = (BOOL (WINAPI *)(HANDLE, int, int))GetProcAddress(mTheme, "IsThemeBackgroundPartiallyTransparent"); - if (!MyOpenThemeData || - !MyCloseThemeData || - !MyIsThemeActive || - !MyDrawThemeBackground || - !MyGetThemeBackgroundContentRect || - !MyDrawThemeParentBackground || - !MyIsThemeBackgroundPartiallyTransparent) + if (!MyOpenThemeData || + !MyCloseThemeData || + !MyIsThemeActive || + !MyDrawThemeBackground || + !MyGetThemeBackgroundContentRect || + !MyDrawThemeParentBackground || + !MyIsThemeBackgroundPartiallyTransparent) { FreeLibrary(mTheme); mTheme = NULL; } } -void RichUtil_Unload(void) +void RichUtil_Unload(void) { List_Destroy(&sListInt); DeleteCriticalSection(&csRich); @@ -100,14 +102,14 @@ void RichUtil_Unload(void) FreeLibrary(mTheme); } -int RichUtil_SubClass(HWND hwndEdit) +int RichUtil_SubClass(HWND hwndEdit) { - if (IsWindow(hwndEdit)) + if (IsWindow(hwndEdit)) { int idx; TRichUtil *ru = (TRichUtil*)mir_calloc(sizeof(TRichUtil)); - + ru->hwnd = hwndEdit; ru->hasUglyBorder = 0; @@ -133,7 +135,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (ru == NULL) return 0; - switch(msg) + switch(msg) { case WM_CHAR: { @@ -145,7 +147,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } break; } - + case WM_THEMECHANGED: case WM_STYLECHANGED: { @@ -156,10 +158,10 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_NCPAINT: { LRESULT ret = CallWindowProc(ru->origProc, hwnd, msg, wParam, lParam); - if (ru->hasUglyBorder && MyIsThemeActive()) + if (ru->hasUglyBorder && MyIsThemeActive()) { HANDLE hTheme = MyOpenThemeData(ru->hwnd, L"EDIT"); - if (hTheme) + if (hTheme) { RECT rcBorder; RECT rcClient; @@ -184,7 +186,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM nState = ETS_DISABLED; else if (style & ES_READONLY) nState = ETS_READONLY; - else + else nState = ETS_NORMAL; MyDrawThemeBackground(hTheme, hdc, EP_EDITTEXT, nState, &rcBorder, NULL); @@ -199,17 +201,17 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM { LRESULT ret = CallWindowProc(ru->origProc, hwnd, msg, wParam, lParam); NCCALCSIZE_PARAMS *ncsParam = (NCCALCSIZE_PARAMS*)lParam; - - if (ru->hasUglyBorder && MyIsThemeActive()) + + if (ru->hasUglyBorder && MyIsThemeActive()) { HANDLE hTheme = MyOpenThemeData(hwnd, L"EDIT"); - if (hTheme) + if (hTheme) { - RECT rcClient ={0}; + RECT rcClient ={0}; HDC hdc = GetDC(GetParent(hwnd)); - if (MyGetThemeBackgroundContentRect(hTheme, hdc, EP_EDITTEXT, ETS_NORMAL, &ncsParam->rgrc[0], &rcClient) == S_OK) + if (MyGetThemeBackgroundContentRect(hTheme, hdc, EP_EDITTEXT, ETS_NORMAL, &ncsParam->rgrc[0], &rcClient) == S_OK) { ru->rect.left = rcClient.left-ncsParam->rgrc[0].left; ru->rect.top = rcClient.top-ncsParam->rgrc[0].top; @@ -239,7 +241,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM { LRESULT ret = CallWindowProc(ru->origProc, hwnd, msg, wParam, lParam); - if (IsWindow(hwnd)) + if (IsWindow(hwnd)) { if ((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)ru->origProc); diff --git a/src/core/stdmsg/src/richutil.h b/src/core/stdmsg/src/richutil.h index 68e9f37c5b..ff90e14691 100644 --- a/src/core/stdmsg/src/richutil.h +++ b/src/core/stdmsg/src/richutil.h @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #ifndef SRMM_RICHUTIL_H #define SRMM_RICHUTIL_H diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index 731231fad7..e1b6bc6ab5 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -1,5 +1,6 @@ /* -Copyright 2000-2012 Miranda IM project, + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 0cb5a2b96e..59fe583c5e 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -1,6 +1,7 @@ /* -Copyright 2000-2010 Miranda IM project, -all portions of this codebase are copyrighted to the people + +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -17,6 +18,7 @@ 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. */ + #include "commonheaders.h" #include "statusicon.h" @@ -170,7 +172,7 @@ void CheckIconClick(HANDLE hContact, HWND hwndFrom, POINT pt, RECT r, int gap, i sprintf(buff, "SRMMStatusIconFlags%d", current->sid.dwId); flags = db_get_b(hContact, current->sid.szModule, buff, current->sid.flags); if (!(flags & MBF_HIDDEN)) iconNum--; - if(iconNum >= 0) + if(iconNum >= 0) current = current->next; } diff --git a/src/core/stdmsg/src/stdafx.cpp b/src/core/stdmsg/src/stdafx.cpp index b985a910cd..838b101bd3 100644 --- a/src/core/stdmsg/src/stdafx.cpp +++ b/src/core/stdmsg/src/stdafx.cpp @@ -1,5 +1,6 @@ /* -Copyright (C) 2012 Miranda NG team (http://miranda-ng.org) + +Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h index c62e8b3aaa..1341e88f4f 100644 --- a/src/core/stduihist/commonheaders.h +++ b/src/core/stduihist/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp index e0567f2dcc..dcb8e6e401 100644 --- a/src/core/stduihist/history.cpp +++ b/src/core/stduihist/history.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #define SUMMARY 0 @@ -140,7 +141,7 @@ typedef struct { static void FillHistoryThread(void* param) { Thread_SetName("HistoryWindow::FillHistoryThread"); - + TCHAR str[200], eventText[256], strdatetime[64]; HANDLE hDbEvent; DBEVENTINFO dbei; @@ -346,7 +347,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_LIST, LBN_SELCHANGE), 0); break; } } } - + mir_free(dbei.pBlob); break; } @@ -365,7 +366,7 @@ static INT_PTR CALLBACK DlgProcHistoryFind(HWND hwndDlg, UINT msg, WPARAM wParam case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK://find Next - { + { TCHAR str[128]; HWND hwndParent = (HWND)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); GetDlgItemText(hwndDlg, IDC_FINDWHAT, str, SIZEOF(str)); diff --git a/src/core/stduihist/main.cpp b/src/core/stduihist/main.cpp index 8c68f49529..5b8893e4d5 100644 --- a/src/core/stduihist/main.cpp +++ b/src/core/stduihist/main.cpp @@ -2,7 +2,7 @@ Standard ugly history viewer for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index f6f9aebff7..205a18193b 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stdurl/main.cpp b/src/core/stdurl/main.cpp index fa2cbb0474..2889278111 100644 --- a/src/core/stdurl/main.cpp +++ b/src/core/stdurl/main.cpp @@ -2,7 +2,7 @@ Standard URL plugin for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index 0b1f8c8714..9f97c4288e 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdurl/url.h b/src/core/stdurl/url.h index 98cbee51fe..dcdbf8e487 100644 --- a/src/core/stdurl/url.h +++ b/src/core/stdurl/url.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index a13b969647..863d58be63 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h index 32d9ce8432..2bdd458b01 100644 --- a/src/core/stduserinfo/commonheaders.h +++ b/src/core/stduserinfo/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/contactinfo.cpp index 82a40ad899..993d8de838 100644 --- a/src/core/stduserinfo/contactinfo.cpp +++ b/src/core/stduserinfo/contactinfo.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/main.cpp index 60e983c796..0f6ab9de42 100644 --- a/src/core/stduserinfo/main.cpp +++ b/src/core/stduserinfo/main.cpp @@ -2,7 +2,7 @@ Standard User Info plugin for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index 986e2d4057..41f394cbba 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index c8b435e4ed..edee081064 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h index 9ba6ae38cf..d813cb1c7d 100644 --- a/src/core/stduseronline/commonheaders.h +++ b/src/core/stduseronline/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stduseronline/main.cpp b/src/core/stduseronline/main.cpp index 783a0c7d65..7dcf6c09f4 100644 --- a/src/core/stduseronline/main.cpp +++ b/src/core/stduseronline/main.cpp @@ -2,7 +2,7 @@ Standard user online monitor for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan 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 diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp index b37138d0bc..390be3051a 100644 --- a/src/core/stduseronline/useronline.cpp +++ b/src/core/stduseronline/useronline.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" static int uniqueEventId = 0; @@ -34,16 +35,16 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; if ((HANDLE)wParam == NULL || strcmp(cws->szSetting, "Status")) return 0; - + int newStatus = cws->value.wVal; int oldStatus = DBGetContactSettingWord((HANDLE)wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); DBWriteContactSettingWord((HANDLE)wParam, "UserOnline", "OldStatus", (WORD)newStatus); if (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE)) return 0; if (DBGetContactSettingByte((HANDLE)wParam, "CList", "Hidden", 0)) return 0; if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) { - // Remove the event from the queue if it exists since they are now offline + // Remove the event from the queue if it exists since they are now offline int lastEvent = (int)DBGetContactSettingDword((HANDLE)wParam, "UserOnline", "LastEvent", 0); - + if (lastEvent) { CallService(MS_CLIST_REMOVEEVENT, wParam, (LPARAM)lastEvent); DBWriteContactSettingDword((HANDLE)wParam, "UserOnline", "LastEvent", 0); @@ -54,7 +55,7 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) { DWORD ticked = db_get_dw(NULL, "UserOnline", cws->szModule, GetTickCount()); // only play the sound (or show event) if this event happens at least 10 secs after the proto went from offline - if (GetTickCount() - ticked > (1000*10)) { + if (GetTickCount() - ticked > (1000*10)) { CLISTEVENT cle; TCHAR tooltip[256]; -- cgit v1.2.3