code cleanup

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

15 files changed, 32 insertions, 92 deletions

diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp
index c8a9a6c4fe..78250aaad1 100644
--- a/plugins/Alarms/src/alarms.cpp
+++ b/plugins/Alarms/src/alarms.cpp
@@ -43,9 +43,9 @@ PLUGININFOEX pluginInfo = {
 	{0x4dd7762b, 0xd612, 0x4f84, {0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d}}

 };

 

-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

-	hInst=hinstDLL;

+	hInst = hinstDLL;

 	return TRUE;

 }

 

diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/common.h
index 2bdfe841cb..149253dee7 100644
--- a/plugins/AssocMgr/src/common.h
+++ b/plugins/AssocMgr/src/common.h
@@ -54,3 +54,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "dde.h"

 #include "test.h"

 #include "resource.h"

+#include "version.h"

diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp
index 4af0e5c6e0..225ae3ea21 100644
--- a/plugins/AssocMgr/src/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "version.h"

 

 HINSTANCE hInst;

 static HANDLE hHookModulesLoaded;

diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp
index 1816375e16..d16afa4969 100644
--- a/plugins/AuthState/src/main.cpp
+++ b/plugins/AuthState/src/main.cpp
@@ -61,16 +61,12 @@ PLUGININFOEX pluginInfo = {
 	{0xdace7d41, 0xdfa9, 0x4772, {0x89, 0xae, 0xa5, 0x9a, 0x61, 0x53, 0xe6, 0xb2}}

 };

 

-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	g_hInst = hinstDLL;

 	return TRUE;

 }

 

-/* 236CBB9A-57D2-419D-B5CB-0DF5926E921C */

-#define MIID_AUTHSTATE {0x236cbb9a, 0x57d2, 0x419d, {0xb5, 0xcb, 0x0d, 0xf5, 0x92, 0x6e, 0x92, 0x1c}}

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

-

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

 {

 	return &pluginInfo;

diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp
index aeecf0e08d..1a96efb8fc 100644
--- a/plugins/AutoRun/src/main.cpp
+++ b/plugins/AutoRun/src/main.cpp
@@ -17,7 +17,7 @@ PLUGININFOEX pluginInfoEx = {
 	{0xeb0465e2, 0xceee, 0x11db, {0x83, 0xef, 0xc1, 0xbf, 0x55, 0xd8, 0x95, 0x93}}

 };

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp
index 9c8c162136..5ca7e0c6f8 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/src/AvatarHistory.cpp
@@ -72,7 +72,7 @@ PLUGININFOEX pluginInfo = {
 	{0xdbe8c990, 0x7aa0, 0x458d, {0xba, 0xb7, 0x33, 0xeb, 0x7, 0x23, 0x8e, 0x71}}
 };
 
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	hInst = hinstDLL;
 	return TRUE;
@@ -83,8 +83,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;
 }
 
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AVATAR_CHANGE_LOGGER, MIID_AVATAR_CHANGE_NOTIFIER, MIID_LAST };
-
 static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
 	switch(uMsg)
diff --git a/plugins/BasicHistory/BasicHistory.vcxproj b/plugins/BasicHistory/BasicHistory.vcxproj
index 77b2323d41..e1f87a412e 100644
--- a/plugins/BasicHistory/BasicHistory.vcxproj
+++ b/plugins/BasicHistory/BasicHistory.vcxproj
@@ -167,10 +167,6 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <None Include="docs\BasicHistory_langpack_polish.txt" />

-    <None Include="docs\BasicHistory_licence.txt" />

-    <None Include="docs\BasicHistory_readme.txt" />

-    <None Include="docs\BasicHistory_translate.txt" />

     <None Include="res\history.css" />

     <None Include="res\history.js" />

     <None Include="docs\ReadMe.txt" />

@@ -193,7 +189,6 @@
     <ClInclude Include="src\SearchContext.h" />

     <ClInclude Include="src\Searcher.h" />

     <ClInclude Include="src\stdafx.h" />

-    <ClInclude Include="src\targetver.h" />

     <ClInclude Include="src\TxtExport.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

@@ -201,7 +196,6 @@
     <ClCompile Include="src\BasicHistory.cpp" />

     <ClCompile Include="src\BinaryExport.cpp" />

     <ClCompile Include="src\DatExport.cpp" />

-    <ClCompile Include="src\dllmain.cpp" />

     <ClCompile Include="src\EventList.cpp" />

     <ClCompile Include="src\ExportManager.cpp" />

     <ClCompile Include="src\HistoryWindow.cpp" />

diff --git a/plugins/BasicHistory/BasicHistory.vcxproj.filters b/plugins/BasicHistory/BasicHistory.vcxproj.filters
index 97d4f09a88..a5795ea859 100644
--- a/plugins/BasicHistory/BasicHistory.vcxproj.filters
+++ b/plugins/BasicHistory/BasicHistory.vcxproj.filters
@@ -13,27 +13,12 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

     </Filter>

-    <Filter Include="Resource Files\Docs">

-      <UniqueIdentifier>{21b9175b-8a7e-4272-8524-2aa48728760e}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Source Files\zip">

       <UniqueIdentifier>{c8854079-e3d6-4f7c-82fc-bd494a11567f}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

   <ItemGroup>

     <None Include="docs\ReadMe.txt" />

-    <None Include="docs\BasicHistory_licence.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="docs\BasicHistory_readme.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="docs\BasicHistory_langpack_polish.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="docs\BasicHistory_translate.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

     <None Include="res\history.css">

       <Filter>Resource Files</Filter>

     </None>

@@ -45,9 +30,6 @@
     <ClInclude Include="src\stdafx.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\targetver.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -110,9 +92,6 @@
     <ClCompile Include="src\BasicHistory.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\dllmain.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\HistoryWindow.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/BasicHistory/res/version.rc b/plugins/BasicHistory/res/version.rc
index afa2d43620..cee33c8390 100644
--- a/plugins/BasicHistory/res/version.rc
+++ b/plugins/BasicHistory/res/version.rc
@@ -1,36 +1,33 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include <windows.h>

 #include "..\src\version.h"

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

- FILEFLAGS VS_FF_DEBUG

+ FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS VOS_NT_WINDOWS32

- FILETYPE VFT_DLL

- FILESUBTYPE VFT2_UNKNOWN

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Author", "Krzysztof Kral"

-			VALUE "CompanyName", "Krzysztof Kral"

             VALUE "FileDescription", __DESCRIPTION

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", __INTERNAL_NAME

+            VALUE "InternalName", __PLUGIN_NAME

             VALUE "LegalCopyright", __COPYRIGHT

-			VALUE "OriginalFilename", __FILENAME

+            VALUE "OriginalFilename", __FILENAME

             VALUE "ProductName", __PLUGIN_NAME

-            VALUE "ProductVersion", __VERSION_STRING

         END

     END

     BLOCK "VarFileInfo"

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index 1934c7d81d..fe7c4d9f68 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -17,13 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "stdafx.h"

-#include "version.h"

-#include "HistoryWindow.h"

-#include "resource.h"

-#include "Options.h"

 

-// {E25367A2-51AE-4044-BE28-131BC18B71A4}

-#define	MIID_BASICHISTORY { 0xe25367a2, 0x51ae, 0x4044, { 0xbe, 0x28, 0x13, 0x1b, 0xc1, 0x8b, 0x71, 0xa4 } }

+HINSTANCE hInst;

 

 #define MS_HISTORY_DELETEALLCONTACTHISTORY       "BasicHistory/DeleteAllContactHistory"

 #define MS_HISTORY_EXECUTE_TASK       "BasicHistory/ExecuteTask"

@@ -48,8 +43,7 @@ const IID IID_ITextDocument={0x8CC497C0, 0xA1DF, 0x11ce, {0x80, 0x98, 0x00, 0xAA
 

 #define MODULE "BasicHistory"

 

-PLUGININFOEX pluginInfo = 

-{

+PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -59,9 +53,16 @@ PLUGININFOEX pluginInfo =
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_BASICHISTORY

+	// {E25367A2-51AE-4044-BE28-131BC18B71A4}

+	{0xe25367a2, 0x51ae, 0x4044, {0xbe, 0x28, 0x13, 0x1b, 0xc1, 0x8b, 0x71, 0xa4}}

 };

 

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+{

+	hInst = hinstDLL;

+	return TRUE;

+}

+

 TIME_API tmi = {0};

 int hLangpack = 0;

 

diff --git a/plugins/BasicHistory/src/dllmain.cpp b/plugins/BasicHistory/src/dllmain.cpp
deleted file mode 100644
index ad89773ec8..0000000000
--- a/plugins/BasicHistory/src/dllmain.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.

-#include "stdafx.h"

-

-HINSTANCE hInst;

-

-BOOL APIENTRY DllMain( HMODULE hModule,

-                       DWORD  ul_reason_for_call,

-                       LPVOID lpReserved

-					 )

-{

-	hInst = hModule;

-	return TRUE;

-}

-

diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index d0d32d0d35..1be1d46674 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -5,8 +5,6 @@
 

 #pragma once

 

-#include "targetver.h"

-

 #ifndef _WIN64

 #define _USE_32BIT_TIME_T

 #endif

@@ -33,8 +31,7 @@
 #include <string>

 #include <fstream>

 

-#define MIRANDA_VER		0x0900

-#define MIRANDA_CUSTOM_LP

+#define MIRANDA_VER		0x0A00

 

 #include <newpluginapi.h>

 #include <m_langpack.h>

@@ -64,6 +61,11 @@
 #include "m_smileyadd.h"

 #include "m_metacontacts.h"

 

+#include "version.h"

+#include "HistoryWindow.h"

+#include "resource.h"

+#include "Options.h"

+

 #define HISTORY_HK_FIND 100

 #define HISTORY_HK_FINDNEXT 101

 #define HISTORY_HK_FINDPREV 102

diff --git a/plugins/BasicHistory/src/targetver.h b/plugins/BasicHistory/src/targetver.h
deleted file mode 100644
index 90e767bfce..0000000000
--- a/plugins/BasicHistory/src/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once

-

-// Including SDKDDKVer.h defines the highest available Windows platform.

-

-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and

-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.

-

-#include <SDKDDKVer.h>

diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h
index 21da8d9963..d2d290a8c5 100644
--- a/plugins/BasicHistory/src/version.h
+++ b/plugins/BasicHistory/src/version.h
@@ -17,4 +17,4 @@
 #define __AUTHOR					"Krzysztof Kral"

 #define __AUTHOREMAIL				"krzysztof.kral@gmail.com"

 #define __AUTHORWEB					"http://miranda-ng.org/"

-#define __COPYRIGHT					"Copyright (c) 2011-2012 Krzysztof Kral"

+#define __COPYRIGHT					"© 2011-2012 Krzysztof Kral"

diff --git a/plugins/ExternalAPI/m_avatarhist.h b/plugins/ExternalAPI/m_avatarhist.h
index 6f1e5c8ebd..7f19c1f420 100644
--- a/plugins/ExternalAPI/m_avatarhist.h
+++ b/plugins/ExternalAPI/m_avatarhist.h
@@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA.
 #ifndef __M_AVATARHISTORY_H__

 # define __M_AVATARHISTORY_H__

 

-

-#define MIID_AVATAR_CHANGE_LOGGER { 0x95e3f3d3, 0x9678, 0x4561, { 0x96, 0xf8, 0x95, 0x88, 0x33, 0x7b, 0x86, 0x68 } }

-#define MIID_AVATAR_CHANGE_NOTIFIER { 0x91af9298, 0x8570, 0x4063, { 0xbf, 0x2f, 0xca, 0x68, 0xd0, 0xe3, 0xb3, 0x6a } }

-

-

 #define EVENTTYPE_AVATAR_CHANGE 9003