From 055d4460e17344248c7364afc5d19deeda39d644 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Jan 2014 12:32:05 +0000 Subject: copyright update for year 2014 git-svn-id: http://svn.miranda-ng.org/main/trunk@7438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/icolib/IcoLib.h | 10 +++++----- src/modules/icolib/extracticon.cpp | 5 +++-- src/modules/icolib/skin2icons.cpp | 17 +++++++++-------- src/modules/icolib/skin2opts.cpp | 5 +++-- 4 files changed, 20 insertions(+), 17 deletions(-) (limited to 'src/modules/icolib') diff --git a/src/modules/icolib/IcoLib.h b/src/modules/icolib/IcoLib.h index c8a4f5a556..d743e0e4fd 100644 --- a/src/modules/icolib/IcoLib.h +++ b/src/modules/icolib/IcoLib.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -11,7 +12,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. @@ -105,4 +106,3 @@ extern BOOL bNeedRebuild; extern int iconEventActive; extern HICON hIconBlank; extern HANDLE hIcons2ChangedEvent, hIconsChangedEvent; - diff --git a/src/modules/icolib/extracticon.cpp b/src/modules/icolib/extracticon.cpp index cd405a3f15..39113d2ef5 100644 --- a/src/modules/icolib/extracticon.cpp +++ b/src/modules/icolib/extracticon.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 1b8ee3def0..585e26ab60 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -30,8 +31,8 @@ HANDLE hIcons2ChangedEvent, hIconsChangedEvent; HICON hIconBlank = NULL; -static HANDLE - hIcoLib_AddNewIcon, hIcoLib_RemoveIcon, hIcoLib_GetIcon, hIcoLib_GetIcon2, +static HANDLE + hIcoLib_AddNewIcon, hIcoLib_RemoveIcon, hIcoLib_GetIcon, hIcoLib_GetIcon2, hIcoLib_GetIconHandle, hIcoLib_IsManaged, hIcoLib_AddRef, hIcoLib_ReleaseIcon; int iconEventActive = 0; @@ -189,7 +190,7 @@ static int InitializeBitmapInfoHeader(HBITMAP bitmap, BITMAPINFOHEADER* bi) return 0; // Success } -static int InternalGetDIBSizes(HBITMAP bitmap, int* InfoHeaderSize, int* ImageSize) +static int InternalGetDIBSizes(HBITMAP bitmap, int* InfoHeaderSize, int* ImageSize) { BITMAPINFOHEADER bi; @@ -239,7 +240,7 @@ static int GetIconData(HICON icon, BYTE** data, int* size) if ( !GetIconInfo(icon, &iconInfo)) return 1; // Failure - if (InternalGetDIBSizes(iconInfo.hbmMask, &MonoInfoSize, &MonoBitsSize) || + if (InternalGetDIBSizes(iconInfo.hbmMask, &MonoInfoSize, &MonoBitsSize) || InternalGetDIBSizes(iconInfo.hbmColor, &ColorInfoSize, &ColorBitsSize)) { DeleteObject(iconInfo.hbmColor); DeleteObject(iconInfo.hbmMask); @@ -250,7 +251,7 @@ static int GetIconData(HICON icon, BYTE** data, int* size) void* ColorInfo = mir_alloc(ColorInfoSize); void* ColorBits = mir_alloc(ColorBitsSize); - if (InternalGetDIB(iconInfo.hbmMask, 0, MonoInfo, MonoBits) || + if (InternalGetDIB(iconInfo.hbmMask, 0, MonoInfo, MonoBits) || InternalGetDIB(iconInfo.hbmColor, 0, ColorInfo, ColorBits)) { SAFE_FREE(&MonoInfo); SAFE_FREE(&MonoBits); diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index 81be4a0b8d..a761d7854c 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. -- cgit v1.2.3