From a27079fe5c4a210664515c47767c00112c435d65 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 6 Dec 2017 14:15:09 +0300 Subject: convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744) --- plugins/SecureIM/src/commonheaders.cpp | 2 +- plugins/SecureIM/src/commonheaders.h | 2 +- plugins/SecureIM/src/crypt.h | 2 +- plugins/SecureIM/src/crypt_check.cpp | 2 +- plugins/SecureIM/src/crypt_dll.cpp | 2 +- plugins/SecureIM/src/crypt_icons.cpp | 2 +- plugins/SecureIM/src/crypt_lists.cpp | 2 +- plugins/SecureIM/src/crypt_misc.cpp | 2 +- plugins/SecureIM/src/crypt_popups.cpp | 2 +- plugins/SecureIM/src/cryptopp.h | 2 +- plugins/SecureIM/src/dbevent.cpp | 2 +- plugins/SecureIM/src/dbevent.h | 2 +- plugins/SecureIM/src/gettime.cpp | 2 +- plugins/SecureIM/src/gettime.h | 2 +- plugins/SecureIM/src/images.cpp | 2 +- plugins/SecureIM/src/images.h | 2 +- plugins/SecureIM/src/language.cpp | 2 +- plugins/SecureIM/src/language.h | 2 +- plugins/SecureIM/src/loadicons.cpp | 2 +- plugins/SecureIM/src/loadicons.h | 2 +- plugins/SecureIM/src/loadlib.cpp | 2 +- plugins/SecureIM/src/loadlib.h | 2 +- plugins/SecureIM/src/main.cpp | 2 +- plugins/SecureIM/src/mmi.cpp | 2 +- plugins/SecureIM/src/mmi.h | 2 +- plugins/SecureIM/src/options.cpp | 2 +- plugins/SecureIM/src/options.h | 2 +- plugins/SecureIM/src/popupOptions.cpp | 2 +- plugins/SecureIM/src/popupOptions.h | 2 +- plugins/SecureIM/src/resource.h | 2 +- plugins/SecureIM/src/secureim.h | 2 +- plugins/SecureIM/src/splitmsg.cpp | 2 +- plugins/SecureIM/src/splitmsg.h | 2 +- plugins/SecureIM/src/stdafx.cpp | 2 +- plugins/SecureIM/src/svcs_clist.cpp | 2 +- plugins/SecureIM/src/svcs_clist.h | 2 +- plugins/SecureIM/src/svcs_menu.cpp | 2 +- plugins/SecureIM/src/svcs_menu.h | 2 +- plugins/SecureIM/src/svcs_proto.cpp | 2 +- plugins/SecureIM/src/svcs_proto.h | 2 +- plugins/SecureIM/src/svcs_rsa.cpp | 2 +- plugins/SecureIM/src/svcs_rsa.h | 2 +- plugins/SecureIM/src/svcs_srmm.cpp | 2 +- plugins/SecureIM/src/svcs_srmm.h | 2 +- plugins/SecureIM/src/version.h | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp index 60f50be23d..0c46b53bdd 100644 --- a/plugins/SecureIM/src/commonheaders.cpp +++ b/plugins/SecureIM/src/commonheaders.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" HINSTANCE g_hInst, g_hIconInst; diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index b02ab46ec1..4afa278eee 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -1,4 +1,4 @@ -#define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #define NETLIB_LOG #define _CRT_SECURE_NO_WARNINGS diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index c858dc719d..79e2b677e6 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -1,4 +1,4 @@ -#ifndef __CRYPT_H__ +#ifndef __CRYPT_H__ #define __CRYPT_H__ #define KEYSIZE 256 diff --git a/plugins/SecureIM/src/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp index de43704449..82dbb7ad1c 100644 --- a/plugins/SecureIM/src/crypt_check.cpp +++ b/plugins/SecureIM/src/crypt_check.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" int getContactStatus(MCONTACT hContact) { diff --git a/plugins/SecureIM/src/crypt_dll.cpp b/plugins/SecureIM/src/crypt_dll.cpp index d86402fcbe..afa18459e0 100644 --- a/plugins/SecureIM/src/crypt_dll.cpp +++ b/plugins/SecureIM/src/crypt_dll.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" // generate KeyA pair and return public key LPSTR InitKeyA(pUinKey ptr, int features) diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp index 619c4f01a4..59e0059773 100644 --- a/plugins/SecureIM/src/crypt_icons.cpp +++ b/plugins/SecureIM/src/crypt_icons.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" struct ICON_CACHE { diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index b2eaaf31b1..bb97d160f0 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" LIST arProto(10, HandleKeySortT); LIST arClist(100, NumericKeySortT); diff --git a/plugins/SecureIM/src/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp index 3e658b0fd7..108e8958b9 100644 --- a/plugins/SecureIM/src/crypt_misc.cpp +++ b/plugins/SecureIM/src/crypt_misc.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" static void sttWaitForExchange(LPVOID param) { diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index 9d6a7d0bac..fbced3dd22 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" // type=0 key colors // type=1 session colors diff --git a/plugins/SecureIM/src/cryptopp.h b/plugins/SecureIM/src/cryptopp.h index 05b77020a1..089d101cd7 100644 --- a/plugins/SecureIM/src/cryptopp.h +++ b/plugins/SecureIM/src/cryptopp.h @@ -1,4 +1,4 @@ -#ifndef __CRYPTOPP_H__ +#ifndef __CRYPTOPP_H__ #define __CRYPTOPP_H__ #define CPP_FEATURES_UTF8 0x01 diff --git a/plugins/SecureIM/src/dbevent.cpp b/plugins/SecureIM/src/dbevent.cpp index a5936df191..495bc324e2 100644 --- a/plugins/SecureIM/src/dbevent.cpp +++ b/plugins/SecureIM/src/dbevent.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" void HistoryLog(MCONTACT hContact, LPCSTR szText) { diff --git a/plugins/SecureIM/src/dbevent.h b/plugins/SecureIM/src/dbevent.h index 167f6c49e7..e03ef9abbc 100644 --- a/plugins/SecureIM/src/dbevent.h +++ b/plugins/SecureIM/src/dbevent.h @@ -1,4 +1,4 @@ -#ifndef __DBEVENT_H__ +#ifndef __DBEVENT_H__ #define __DBEVENT_H__ void HistoryLog(MCONTACT, LPCSTR); diff --git a/plugins/SecureIM/src/gettime.cpp b/plugins/SecureIM/src/gettime.cpp index ae24200624..4da5fe98c8 100644 --- a/plugins/SecureIM/src/gettime.cpp +++ b/plugins/SecureIM/src/gettime.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" /* FILETIME unit is 100 nanoseconds */ diff --git a/plugins/SecureIM/src/gettime.h b/plugins/SecureIM/src/gettime.h index d321af1de5..05d2d1b96a 100644 --- a/plugins/SecureIM/src/gettime.h +++ b/plugins/SecureIM/src/gettime.h @@ -1,4 +1,4 @@ -#ifndef __GETTIME_H__ +#ifndef __GETTIME_H__ #define __GETTIME_H__ DWORD gettime(void); diff --git a/plugins/SecureIM/src/images.cpp b/plugins/SecureIM/src/images.cpp index 007f22881b..60a1af63d1 100644 --- a/plugins/SecureIM/src/images.cpp +++ b/plugins/SecureIM/src/images.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" void HalfBitmap32Alpha(HBITMAP hBitmap) { diff --git a/plugins/SecureIM/src/images.h b/plugins/SecureIM/src/images.h index f4b1ebf8e2..ea65b09893 100644 --- a/plugins/SecureIM/src/images.h +++ b/plugins/SecureIM/src/images.h @@ -1,4 +1,4 @@ -#ifndef __IMAGE_UTILS_H__ +#ifndef __IMAGE_UTILS_H__ #define __IMAGE_UTILS_H__ HICON BindOverlayIcon(HICON,HICON); diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp index d70d8d8f50..7ed3f5e5ab 100644 --- a/plugins/SecureIM/src/language.cpp +++ b/plugins/SecureIM/src/language.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" //Popup Messages LPCSTR sim001 = LPGEN("SecureIM established..."); diff --git a/plugins/SecureIM/src/language.h b/plugins/SecureIM/src/language.h index 6c2f00ce50..4c627efc2f 100644 --- a/plugins/SecureIM/src/language.h +++ b/plugins/SecureIM/src/language.h @@ -1,4 +1,4 @@ -#ifndef __LANGUAGE_H__ +#ifndef __LANGUAGE_H__ #define __LANGUAGE_H__ //Popup Messages diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp index 383caab5ad..756a235b4c 100644 --- a/plugins/SecureIM/src/loadicons.cpp +++ b/plugins/SecureIM/src/loadicons.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" struct { diff --git a/plugins/SecureIM/src/loadicons.h b/plugins/SecureIM/src/loadicons.h index b89e98effe..f5258a41a0 100644 --- a/plugins/SecureIM/src/loadicons.h +++ b/plugins/SecureIM/src/loadicons.h @@ -1,4 +1,4 @@ -#ifndef __LOADICONS_H__ +#ifndef __LOADICONS_H__ #define __LOADICONS_H__ HINSTANCE LoadIconsPack(const char*); diff --git a/plugins/SecureIM/src/loadlib.cpp b/plugins/SecureIM/src/loadlib.cpp index 8a4d24afac..c1c5cc483e 100644 --- a/plugins/SecureIM/src/loadlib.cpp +++ b/plugins/SecureIM/src/loadlib.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" CRYPTOPP_INFO cpp; diff --git a/plugins/SecureIM/src/loadlib.h b/plugins/SecureIM/src/loadlib.h index 425dbf5623..bed84c019d 100644 --- a/plugins/SecureIM/src/loadlib.h +++ b/plugins/SecureIM/src/loadlib.h @@ -1,4 +1,4 @@ -#ifndef __LOADLIB_H__ +#ifndef __LOADLIB_H__ #define __LOADLIB_H__ BOOL loadlib(void); diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 8c92247702..a56200fff4 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" CLIST_INTERFACE *pcli; int hLangpack = 0; diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 29de183501..d1608069b5 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" void *operator new(size_t sz) { diff --git a/plugins/SecureIM/src/mmi.h b/plugins/SecureIM/src/mmi.h index 47aff0055a..022de440de 100644 --- a/plugins/SecureIM/src/mmi.h +++ b/plugins/SecureIM/src/mmi.h @@ -1,4 +1,4 @@ -#ifndef __MMI_H__ +#ifndef __MMI_H__ #define __MMI_H__ char *m_wwstrcat(LPCSTR,LPCSTR); diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 830f37627f..3a5065d88f 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" #define PSKSIZE (4096+1) #define RSASIZE (4096+1) diff --git a/plugins/SecureIM/src/options.h b/plugins/SecureIM/src/options.h index 729ebf7782..b1f2b65b0e 100644 --- a/plugins/SecureIM/src/options.h +++ b/plugins/SecureIM/src/options.h @@ -1,4 +1,4 @@ -#ifndef __OPTIONS_H__ +#ifndef __OPTIONS_H__ #define __OPTIONS_H__ INT_PTR CALLBACK OptionsDlgProc(HWND,UINT,WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index 17c12fd3fa..9206d01681 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" INT_PTR CALLBACK PopOptionsDlgProc(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/SecureIM/src/popupOptions.h b/plugins/SecureIM/src/popupOptions.h index 28495dfae6..22d3453adc 100644 --- a/plugins/SecureIM/src/popupOptions.h +++ b/plugins/SecureIM/src/popupOptions.h @@ -1,4 +1,4 @@ -#ifndef __POPUP_OPTIONS__ +#ifndef __POPUP_OPTIONS__ #define __POPUP_OPTIONS__ INT_PTR CALLBACK PopOptionsDlgProc(HWND,UINT,WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/resource.h b/plugins/SecureIM/src/resource.h index b6fe6c7424..79f9a8ed5b 100644 --- a/plugins/SecureIM/src/resource.h +++ b/plugins/SecureIM/src/resource.h @@ -1,4 +1,4 @@ -//{{NO_DEPENDENCIES}} +//{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by resource.rc // diff --git a/plugins/SecureIM/src/secureim.h b/plugins/SecureIM/src/secureim.h index 96670ec357..8962a4a058 100644 --- a/plugins/SecureIM/src/secureim.h +++ b/plugins/SecureIM/src/secureim.h @@ -1,4 +1,4 @@ -#ifndef __SECURE_IM__ +#ifndef __SECURE_IM__ #define __SECURE_IM__ // режимы шифрования SecureIM diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index cdb6c9e1da..7388d55bb2 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" // разбивает сообщение szMsg на части длиной iLen, возвращает строку вида PARTzPARTzz LPSTR splitMsg(LPSTR szMsg, int iLen) diff --git a/plugins/SecureIM/src/splitmsg.h b/plugins/SecureIM/src/splitmsg.h index bbc751f653..09edc2e53f 100644 --- a/plugins/SecureIM/src/splitmsg.h +++ b/plugins/SecureIM/src/splitmsg.h @@ -1,4 +1,4 @@ -#ifndef __SPLITMSG_H__ +#ifndef __SPLITMSG_H__ #define __SPLITMSG_H__ LPSTR combineMessage(pUinKey,LPSTR); diff --git a/plugins/SecureIM/src/stdafx.cpp b/plugins/SecureIM/src/stdafx.cpp index b493fd18e2..dd87776a41 100644 --- a/plugins/SecureIM/src/stdafx.cpp +++ b/plugins/SecureIM/src/stdafx.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2012-17 Miranda NG project (https://miranda-ng.org) This program is free software; you can redistribute it and/or diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index ec6a36c7ec..c2c00b19ed 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam) { diff --git a/plugins/SecureIM/src/svcs_clist.h b/plugins/SecureIM/src/svcs_clist.h index 396d09d004..c9c6bcd68b 100644 --- a/plugins/SecureIM/src/svcs_clist.h +++ b/plugins/SecureIM/src/svcs_clist.h @@ -1,4 +1,4 @@ -#ifndef __SVCS_CLIST_H__ +#ifndef __SVCS_CLIST_H__ #define __SVCS_CLIST_H__ int __cdecl onContactSettingChanged(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_menu.cpp b/plugins/SecureIM/src/svcs_menu.cpp index cc4bae8daf..ac1b0f9c5f 100644 --- a/plugins/SecureIM/src/svcs_menu.cpp +++ b/plugins/SecureIM/src/svcs_menu.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" INT_PTR __cdecl Service_IsContactSecured(WPARAM wParam, LPARAM) { diff --git a/plugins/SecureIM/src/svcs_menu.h b/plugins/SecureIM/src/svcs_menu.h index 96813e89c3..7ec89add0c 100644 --- a/plugins/SecureIM/src/svcs_menu.h +++ b/plugins/SecureIM/src/svcs_menu.h @@ -1,4 +1,4 @@ -#ifndef __SVCS_MENU_H__ +#ifndef __SVCS_MENU_H__ #define __SVCS_MENU_H__ INT_PTR __cdecl Service_IsContactSecured(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index efc5a92ddf..cc763dbb25 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" // return SignID int getSecureSig(LPCSTR szMsg, LPSTR *szPlainMsg = nullptr) diff --git a/plugins/SecureIM/src/svcs_proto.h b/plugins/SecureIM/src/svcs_proto.h index 5acf7631a4..f679c12f9c 100644 --- a/plugins/SecureIM/src/svcs_proto.h +++ b/plugins/SecureIM/src/svcs_proto.h @@ -1,4 +1,4 @@ -#ifndef __SVCS_PROTO_H__ +#ifndef __SVCS_PROTO_H__ #define __SVCS_PROTO_H__ INT_PTR __cdecl onRecvMsg(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp index 13db77af1e..307cc38921 100644 --- a/plugins/SecureIM/src/svcs_rsa.cpp +++ b/plugins/SecureIM/src/svcs_rsa.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" pRSA_EXPORT mir_exp = nullptr; RSA_IMPORT imp = diff --git a/plugins/SecureIM/src/svcs_rsa.h b/plugins/SecureIM/src/svcs_rsa.h index c9c73df10d..f076d3bd8b 100644 --- a/plugins/SecureIM/src/svcs_rsa.h +++ b/plugins/SecureIM/src/svcs_rsa.h @@ -1,4 +1,4 @@ -#ifndef __SVCS_RSA_H__ +#ifndef __SVCS_RSA_H__ #define __SVCS_RSA_H__ extern pRSA_EXPORT mir_exp; diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp index 23fb71aeb6..aa131ad533 100644 --- a/plugins/SecureIM/src/svcs_srmm.cpp +++ b/plugins/SecureIM/src/svcs_srmm.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "commonheaders.h" int __cdecl onWindowEvent(WPARAM, LPARAM lParam) { diff --git a/plugins/SecureIM/src/svcs_srmm.h b/plugins/SecureIM/src/svcs_srmm.h index 0fcd5f2606..8de1d07b98 100644 --- a/plugins/SecureIM/src/svcs_srmm.h +++ b/plugins/SecureIM/src/svcs_srmm.h @@ -1,4 +1,4 @@ -#ifndef __SVCS_SRMM_H__ +#ifndef __SVCS_SRMM_H__ #define __SVCS_SRMM_H__ void InitSRMMIcons(); diff --git a/plugins/SecureIM/src/version.h b/plugins/SecureIM/src/version.h index 255dcd65c8..f23117aab2 100644 --- a/plugins/SecureIM/src/version.h +++ b/plugins/SecureIM/src/version.h @@ -1,4 +1,4 @@ -#define __MAJOR_VERSION 1 +#define __MAJOR_VERSION 1 #define __MINOR_VERSION 0 #define __RELEASE_NUM 12 #define __BUILD_NUM 4 -- cgit v1.2.3