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/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 +++++----- 9 files changed, 38 insertions(+), 40 deletions(-) (limited to 'src/core/stdchat') 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); -- cgit v1.2.3