fixes for some perversions

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

3 files changed, 3 insertions, 12 deletions

diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
index a829c80d65..2f0b51349e 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
@@ -17,8 +17,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

-#define _DECL_DLLMAIN

-

 #include "Common.h"

 #include "Misc.h"

 #include "VersionNo.h"

@@ -100,7 +98,7 @@ PLUGININFO oldPluginInfo = {
 	pluginInfo.replacesDefaultModule

 };

 

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

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

 {

 	g_hInstance = hinstDLL;

 	return TRUE;

diff --git a/plugins/NewAwaySysMod/AwaySys.cpp b/plugins/NewAwaySysMod/AwaySys.cpp
index c810368ebf..aaaa8f8118 100644
--- a/plugins/NewAwaySysMod/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/AwaySys.cpp
@@ -29,7 +29,6 @@
   was no point in rewriting it all.

 */

 

-#define _DECL_DLLMAIN

 #include "Common.h"

 #include "m_genmenu.h"

 #include "m_idle.h"

@@ -139,12 +138,10 @@ PLUGININFO oldPluginInfo = {
 	pluginInfo.replacesDefaultModule

 };

 

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

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

 {

 	g_hInstance = hinstDLL;

-// have to call _CRT_INIT here, and redefine DLL entry point to MyDllMain because of

-// msvcr71.dll's __CppXcptFilter function dependency, which is not present in msvcrt.dll

-	return _CRT_INIT(hinstDLL, fdwReason, lpvReserved);

+	return TRUE;

 }

 

 static const MUUID interfaces[] = {MIID_SRAWAY, MIID_LAST}; // TODO: add MIID_WHOISREADING here if there'll be any some time in future..

diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
index dae8bee0ba..42e16eddea 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
@@ -73,8 +73,6 @@
       </AssemblyDebug>

       <GenerateMapFile>true</GenerateMapFile>

       <MapExports>true</MapExports>

-      <EntryPointSymbol>MyDllMain</EntryPointSymbol>

-      <BaseAddress>0x325A0000</BaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

@@ -118,8 +116,6 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EntryPointSymbol>MyDllMain</EntryPointSymbol>

-      <BaseAddress>0x325A0000</BaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

       <OptimizeReferences>true</OptimizeReferences>