optimizing includes

git-svn-id: http://svn.miranda-ng.org/main/trunk@5822 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 51 insertions, 129 deletions

diff --git a/protocols/MRA/Mra_10.vcxproj b/protocols/MRA/Mra_10.vcxproj
index ec5727dd76..a34bc7f39a 100644
--- a/protocols/MRA/Mra_10.vcxproj
+++ b/protocols/MRA/Mra_10.vcxproj
@@ -81,7 +81,7 @@
       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

@@ -108,7 +108,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

@@ -134,7 +134,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <ExceptionHandling>false</ExceptionHandling>

@@ -166,7 +166,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <ExceptionHandling>false</ExceptionHandling>

diff --git a/protocols/MRA/Mra_11.vcxproj b/protocols/MRA/Mra_11.vcxproj
index 8dfd707cfb..c26fefa5a5 100644
--- a/protocols/MRA/Mra_11.vcxproj
+++ b/protocols/MRA/Mra_11.vcxproj
@@ -85,8 +85,7 @@
       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <ExceptionHandling>false</ExceptionHandling>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

@@ -113,8 +112,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <ExceptionHandling>false</ExceptionHandling>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -139,10 +137,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <Link>

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

@@ -170,7 +167,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>src\sdk;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>

       <PrecompiledHeaderFile>Mra.h</PrecompiledHeaderFile>

       <ExceptionHandling>false</ExceptionHandling>

diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index 8905c233c8..961e8f1d3e 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID Reserved)
 

 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

 

-extern "C" MRA_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfoEx;

 }

@@ -73,7 +73,7 @@ static int mraProtoUninit(CMraProto *ppro)
 	return 0;

 }

 

-extern "C" MRA_API int Load(void)

+extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfoEx);

 

@@ -121,7 +121,7 @@ extern "C" MRA_API int Load(void)
 	return 0;

 }

 

-extern "C" MRA_API int Unload(void)

+extern "C" __declspec(dllexport) int Unload(void)

 {

 	DestroyXStatusIcons();

 	if (masMraSettings.hDLLXStatusIcons) {

diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index f2813b4470..d23224d6db 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -12,22 +12,30 @@
 

 //#define CRTDLL

 

-#include "resource.h"

-#include "..\xstatus_MRA\src\resource.h"

-#include <SystemHeaders.h>

-#include <Wincrypt.h>

-#include <Ntsecapi.h>

+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

+#define WINVER       0x0502

+#define _WIN32_WINNT 0x0502

+

+#include <windows.h>

 #include <Commdlg.h>

+#include <wincrypt.h>

+#include <shlwapi.h>

+#include <winsock2.h>

+#include <mswsock.h>

+#include <WS2tcpip.h>

+

+#pragma comment(lib,"Crypt32.lib")

+#pragma comment(lib,"shlwapi.lib")

+#pragma comment(lib,"ws2_32.lib")

+#pragma comment(lib,"mswsock.lib")

+

 #include <malloc.h>

 #include <stdio.h>

 #include <time.h>

-#include <DebugFunctions.h>

 #include <commctrl.h>

 #include <uxtheme.h>

-#include <SocketFunctions.h>

 

 #define bzero(pvDst, count) memset(pvDst, 0, count)

-#include <timefuncs.h>

 

 #include "../../plugins/zlib/src/zlib.h"

 

@@ -64,21 +72,24 @@
 #include <m_nudge.h>

 #include <m_proto_listeningto.h>

 

+#include "resource.h"

+#include "..\xstatus_MRA\src\resource.h"

 

-#include <MemoryFind.h>

-#include <MemoryFindByte.h>

-#include <MemoryCompare.h>

-#include <MemoryReplace.h>

-#include <BuffToLowerCase.h>

-#include <StrToNum.h>

-#include <StrToNum.h>

-#include <StrHexToNum.h>

-#include <InternetTime.h>

-#include <ListMT.h>

-#include <FIFOMT.h>

-#include <RC4.h>

-#include <SHA1.h>

-

+#include "Sdk/DebugFunctions.h"

+#include "Sdk/SocketFunctions.h"

+#include "Sdk/MemoryFind.h"

+#include "Sdk/MemoryFindByte.h"

+#include "Sdk/MemoryCompare.h"

+#include "Sdk/MemoryReplace.h"

+#include "Sdk/BuffToLowerCase.h"

+#include "Sdk/StrToNum.h"

+#include "Sdk/StrHexToNum.h"

+#include "Sdk/timefuncs.h"

+#include "Sdk/InternetTime.h"

+#include "Sdk/ListMT.h"

+#include "Sdk/FIFOMT.h"

+#include "Sdk/RC4.h"

+#include "Sdk/SHA1.h"

 

 // LPS

 typedef struct

@@ -149,15 +160,6 @@ extern GUI_DISPLAY_ITEM gdiExtraStatusIconsItems[];
 #include "MraMPop.h"

 #include "MraChat.h"

 

-

-#ifdef MRA_EXPORTS

-	#define MRA_API __declspec(dllexport)

-#else

-	#define MRA_API

-	// __declspec(dllimport)

-	#pragma comment(lib, "MRALib.lib")

-#endif

-

 /////////////////////////////////////////////////////////////////////////////////////////

 //	plugin options

 

diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp
index 6a0cf2a34d..6cb9a80b0d 100644
--- a/protocols/MRA/src/MraSelectEMail.cpp
+++ b/protocols/MRA/src/MraSelectEMail.cpp
@@ -1,6 +1,5 @@
 #include "Mra.h"

 #include "MraSelectEMail.h"

-#include "BuffToLowerCase.h"

 

 struct MraSelectEMailDlgData

 {

diff --git a/protocols/MRA/src/Sdk/DebugFunctions.h b/protocols/MRA/src/Sdk/DebugFunctions.h
index 6bd9df5b5a..dfc7ec3440 100644
--- a/protocols/MRA/src/Sdk/DebugFunctions.h
+++ b/protocols/MRA/src/Sdk/DebugFunctions.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  * SUCH DAMAGE.

  *

- */
+ */

 

 

 

diff --git a/protocols/MRA/src/Sdk/FIFOMT.h b/protocols/MRA/src/Sdk/FIFOMT.h
index acff96f500..7d4e41db6f 100644
--- a/protocols/MRA/src/Sdk/FIFOMT.h
+++ b/protocols/MRA/src/Sdk/FIFOMT.h
@@ -35,12 +35,8 @@
 #endif // _MSC_VER > 1000

 

 

-#include <ListMT.h>

-#include <InterlockedFunctions.h>

-

-

-

-

+#include "Sdk/ListMT.h"

+#include "Sdk/InterlockedFunctions.h"

 

 typedef LIST_MT				FIFO_MT, *PFIFO_MT, *LPFIFO_MT;

 typedef PCLIST_MT			PCFIFO_MT, LPCFIFO_MT;

@@ -51,11 +47,6 @@ typedef PCLIST_MT_ITEM		PCFIFO_MT_ITEM, LPCFIFO_MT_ITEM;
 typedef LIST_MT_ITERATOR	FIFO_MT_ITERATOR, *PFIFO_MT_ITERATOR, *LPFIFO_MT_ITERATOR;

 typedef PCLIST_MT_ITERATOR	PCFIFO_MT_ITERATOR, LPCFIFO_MT_ITERATOR;

 

-

-

-

-

-

 #define FifoMTInitialize(pcpmtFifoMT,dwSpinCount) ListMTInitialize(pcpmtFifoMT,dwSpinCount)

 #define FifoMTDestroy(pcpmtFifoMT) ListMTDestroy(pcpmtFifoMT)

 

diff --git a/protocols/MRA/src/Sdk/InternetTime.h b/protocols/MRA/src/Sdk/InternetTime.h
index c6abf16786..dae0ee0ce3 100644
--- a/protocols/MRA/src/Sdk/InternetTime.h
+++ b/protocols/MRA/src/Sdk/InternetTime.h
@@ -36,11 +36,9 @@
 #endif // _MSC_VER > 1000

 

 

-#include <StrToNum.h>

-#include <MemoryFind.h>

-#include <MemoryFindByte.h>

-

-

+#include "Sdk/StrToNum.h"

+#include "Sdk/MemoryFind.h"

+#include "Sdk/MemoryFindByte.h"

 

 typedef struct

 {

diff --git a/protocols/MRA/src/Sdk/ListMT.h b/protocols/MRA/src/Sdk/ListMT.h
index 38d9247488..d757a364e6 100644
--- a/protocols/MRA/src/Sdk/ListMT.h
+++ b/protocols/MRA/src/Sdk/ListMT.h
@@ -35,7 +35,7 @@
 #endif // _MSC_VER > 1000

 

 

-#include <InterlockedFunctions.h>

+#include "Sdk/InterlockedFunctions.h"

 

 #if defined(_MSC_VER)

 #if _MSC_VER >= 800

diff --git a/protocols/MRA/src/Sdk/SystemHeaders.h b/protocols/MRA/src/Sdk/SystemHeaders.h
deleted file mode 100644
index 6779342812..0000000000
--- a/protocols/MRA/src/Sdk/SystemHeaders.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*

- * Copyright (c) 2008 Rozhuk Ivan <rozhuk.im@gmail.com>

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- *

- */
-

-

-

-#if !defined(AFX_SYSTEMHEADERS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_)

-#define AFX_SYSTEMHEADERS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_

-

-

-#if _MSC_VER > 1000

-#pragma once

-#endif // _MSC_VER > 1000

-

-

-

-

-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

-#define WINVER       0x0502

-#define _WIN32_WINNT 0x0502

-#include <windows.h>

-#include <wincrypt.h>

-#include <shlwapi.h>

-#include <winsock2.h>

-#include <mswsock.h>

-#include <WS2tcpip.h>

-#include <PrSht.h>

-#include <Commdlg.h>

-//#include <strsafe.h>

-

-

-#pragma comment(lib,"Crypt32.lib")

-#pragma comment(lib,"shlwapi.lib")

-#pragma comment(lib,"ws2_32.lib")

-#pragma comment(lib,"mswsock.lib")

-// RunTmChk.lib Imagehlp.lib kernel32.lib Crypt32.lib shlwapi.lib ws2_32.lib mswsock.lib

-

-

-

-

-

-#endif // !defined(AFX_SYSTEMHEADERS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_)