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/stdidle/commonheaders.h | 5 +-- src/core/stdidle/idle.cpp | 66 ++++++++++++++++++++-------------------- src/core/stdidle/main.cpp | 2 +- 3 files changed, 35 insertions(+), 38 deletions(-) (limited to 'src/core/stdidle') 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 -- cgit v1.2.3