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/modules/icolib/IcoLib.h | 2 +- src/modules/icolib/extracticon.cpp | 13 +++++++------ src/modules/icolib/skin2icons.cpp | 2 +- src/modules/icolib/skin2opts.cpp | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/modules/icolib') diff --git a/src/modules/icolib/IcoLib.h b/src/modules/icolib/IcoLib.h index ec93d2af62..c8a4f5a556 100644 --- a/src/modules/icolib/IcoLib.h +++ b/src/modules/icolib/IcoLib.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/modules/icolib/extracticon.cpp b/src/modules/icolib/extracticon.cpp index e5906045a1..cd405a3f15 100644 --- a/src/modules/icolib/extracticon.cpp +++ b/src/modules/icolib/extracticon.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 "..\..\core\commonheaders.h" #ifdef _ASSERT @@ -73,7 +74,7 @@ void* _GetResourceTable(IMAGE_DOS_HEADER* pDosHeader) if (pPE->FileHeader.SizeOfOptionalHeader < 2) return NULL; - // The DataDirectory is an array of 16 structures. + // The DataDirectory is an array of 16 structures. // Each array entry has a predefined meaning for what it refers to. switch (pPE->OptionalHeader.Magic) @@ -108,7 +109,7 @@ IMAGE_RESOURCE_DIRECTORY_ENTRY* _FindResourceBase(void* prt, int resType, int* p if (i == count) return NULL; - pDir = (IMAGE_RESOURCE_DIRECTORY*)((LPBYTE)prt + + pDir = (IMAGE_RESOURCE_DIRECTORY*)((LPBYTE)prt + (pRes[i].OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)); count = pDir->NumberOfIdEntries + pDir->NumberOfNamedEntries; @@ -147,7 +148,7 @@ void* _FindResource(IMAGE_DOS_HEADER* pDosHeader, void* prt, int resIndex, int r IMAGE_RESOURCE_DIRECTORY* pDir; pDir = (IMAGE_RESOURCE_DIRECTORY*)((LPBYTE)prt + (pRes[index].OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)); pRes = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(pDir+1); - index = 0; + index = 0; } if (pRes[index].OffsetToData & IMAGE_RESOURCE_DATA_IS_DIRECTORY) @@ -268,7 +269,7 @@ UINT _ExtractIconEx(LPCTSTR lpszFile, int iconIndex, int cxIcon, int cyIcon, HIC res = _ExtractFromICO(lpszFile, iconIndex, cxIcon, cyIcon, phicon, flags); break; - case MAGIC_ICON: + case MAGIC_ICON: if ((magic[1] == MAGIC_ICO1 || magic[1] == MAGIC_CUR) && magic[2] >= 1) res = _ExtractFromICO(lpszFile, iconIndex, cxIcon, cyIcon, phicon, flags); diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 58137e74d2..9570709115 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.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/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index f6e697aac4..e18382844d 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.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. -- cgit v1.2.3