* adopted

* compilable version

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

16 files changed, 293 insertions, 248 deletions

diff --git a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsp b/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsp
deleted file mode 100644
index 6f4a4e3dcf..0000000000
--- a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsp
+++ /dev/null
@@ -1,146 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MagneticWindows" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** NICHT BEARBEITEN **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=MagneticWindows - Win32 Debug

-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE

-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl

-!MESSAGE 

-!MESSAGE NMAKE /f "MagneticWindows.mak".

-!MESSAGE 

-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben

-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:

-!MESSAGE 

-!MESSAGE NMAKE /f "MagneticWindows.mak" CFG="MagneticWindows - Win32 Debug"

-!MESSAGE 

-!MESSAGE Für die Konfiguration stehen zur Auswahl:

-!MESSAGE 

-!MESSAGE "MagneticWindows - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "MagneticWindows - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "MagneticWindows - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAGNETICWINDOWS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /GB /Zp4 /MT /W4 /GR- /GX /O2 /Oy- /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAGNETICWINDOWS_EXPORTS" /FR /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x407 /d "NDEBUG"

-# ADD RSC /l 0x407 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-

-!ELSEIF  "$(CFG)" == "MagneticWindows - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAGNETICWINDOWS_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAGNETICWINDOWS_EXPORTS" /FR /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x407 /d "_DEBUG"

-# ADD RSC /l 0x407 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MagneticWindows - Win32 Release"

-# Name "MagneticWindows - Win32 Debug"

-# Begin Group "Quellcodedateien"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\MagneticWindows.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MagneticWindowsCore.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.rc

-# End Source File

-# Begin Source File

-

-SOURCE=.\SnapToListService.cpp

-# End Source File

-# End Group

-# Begin Group "Header-Dateien"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\m_MagneticWindows.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MagneticWindowsCore.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\SnapToListService.h

-# End Source File

-# End Group

-# Begin Group "Ressourcendateien"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsw b/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsw
deleted file mode 100644
index 36019647d8..0000000000
--- a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!

-

-###############################################################################

-

-Project: "MagneticWindows"=".\MagneticWindows.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/plugins/!NotAdopted/MagneticWindows/m_MagneticWindows.h b/plugins/ExternalAPI/m_MagneticWindows.h
index e011c773fd..e011c773fd 100644
--- a/plugins/!NotAdopted/MagneticWindows/m_MagneticWindows.h
+++ b/plugins/ExternalAPI/m_MagneticWindows.h
diff --git a/plugins/MagneticWindows/MagneticWindows_10.vcxproj b/plugins/MagneticWindows/MagneticWindows_10.vcxproj
new file mode 100644
index 0000000000..6e91f33f2a
--- /dev/null
+++ b/plugins/MagneticWindows/MagneticWindows_10.vcxproj
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{7DC23E4E-2448-4811-AABD-F5D069F6E74A}</ProjectGuid>

+    <Keyword>Win32Proj</Keyword>

+    <RootNamespace>MagneticWindows</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>false</LinkIncremental>

+    <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>false</LinkIncremental>

+    <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <PrecompiledHeader>Create</PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

+      <StringPooling>false</StringPooling>

+      <ExceptionHandling>false</ExceptionHandling>

+      <FunctionLevelLinking>

+      </FunctionLevelLinking>

+      <DisableSpecificWarnings>

+      </DisableSpecificWarnings>

+      <PrecompiledHeaderFile>MagneticWindowsCore.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <BaseAddress>

+      </BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+    </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <Optimization>MaxSpeed</Optimization>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAGNETICWINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PrecompiledHeaderFile>MagneticWindowsCore.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+    </Link>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="src\MagneticWindows.cpp" />

+    <ClCompile Include="src\MagneticWindowsCore.cpp" />

+    <ClCompile Include="src\Options.cpp" />

+    <ClCompile Include="src\SnapToListService.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\MagneticWindowsCore.h" />

+    <ClInclude Include="src\Options.h" />

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

+    <ClInclude Include="src\SnapToListService.h" />

+    <ClInclude Include="src\Version.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Options.rc" />

+    <ResourceCompile Include="res\Version.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/MagneticWindows/MagneticWindows_10.vcxproj.filters b/plugins/MagneticWindows/MagneticWindows_10.vcxproj.filters
new file mode 100644
index 0000000000..83ec0caf55
--- /dev/null
+++ b/plugins/MagneticWindows/MagneticWindows_10.vcxproj.filters
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <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>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="src\MagneticWindows.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\MagneticWindowsCore.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\SnapToListService.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\MagneticWindowsCore.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\SnapToListService.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Options.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/!NotAdopted/MagneticWindows/Options.rc b/plugins/MagneticWindows/res/Options.rc
index 5968a21cb7..079050ae36 100644
--- a/plugins/!NotAdopted/MagneticWindows/Options.rc
+++ b/plugins/MagneticWindows/res/Options.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

diff --git a/plugins/MagneticWindows/res/Version.rc b/plugins/MagneticWindows/res/Version.rc
new file mode 100644
index 0000000000..f4dbfc80e2
--- /dev/null
+++ b/plugins/MagneticWindows/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

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

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\Version.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.cpp b/plugins/MagneticWindows/src/MagneticWindows.cpp
index 153289166f..80501cc80e 100644
--- a/plugins/!NotAdopted/MagneticWindows/MagneticWindows.cpp
+++ b/plugins/MagneticWindows/src/MagneticWindows.cpp
@@ -17,26 +17,25 @@
 // Variables

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

 

-PLUGININFO pluginInfo = {

-	sizeof(PLUGININFO),

-	"Magnetic Windows",

-	PLUGIN_MAKE_VERSION(0,0,3,2),

-	"Makes the main contactlist and the chat windows snapping to the desktop border and to each other.",

-	"Michael Kunz",

-	"Michael.Kunz@s2005.TU-Cemnitz.de",

-	"(c) 2006 Michael Kunz",

-	"http://addons.miranda-im.org/details.php?action=viewfile&id=2871",

-	0,

-	0

+PLUGININFOEX pluginInfo = {

+	sizeof(PLUGININFOEX),

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	// {08C01613-24C8-486F-BDAE-2C3DDCAF9347}

+	{0x8c01613, 0x24c8, 0x486f, { 0xbd, 0xae, 0x2c, 0x3d, 0xdc, 0xaf, 0x93, 0x47 }} 

 };

 

-PLUGINLINK * pluginLink;

 

 HANDLE hLoadedHook, hShootDownHook,	hAddService, hRemService, hWindowEventHook;

 

 HINSTANCE hInst;

-//char ModuleName[256];

-char ModuleName[] = "MagneticWindows";

+int hLangpack;

 

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

 // Plugin Functions

@@ -124,14 +123,14 @@ int SnapPluginShootDown(WPARAM wParam, LPARAM lParam) {
 // Exportet Functions

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

 

-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)

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

 {

 	return &pluginInfo;

 }

 

-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

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

 {

-	pluginLink = link;

+	mir_getLP(&pluginInfo);

 	

 	hLoadedHook = HookEvent(ME_SYSTEM_MODULESLOADED, SnapPluginStart);

 	hShootDownHook = HookEvent(ME_SYSTEM_PRESHUTDOWN, SnapPluginShootDown);

@@ -154,31 +153,9 @@ extern "C" int __declspec(dllexport) Unload(void)
 ///////////////////////////////////////////////////////////////////////////////////////////////////

 

 

-extern "C" bool APIENTRY DllMain( HMODULE hModule,

-                       DWORD  ul_reason_for_call,

-                       LPVOID lpReserved

-					 )

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

 {

-	hInst = hModule;

+	hInst = hinstDLL;

 	

-

-/*	char * Temp;

-	char * l,i;

-

-	Temp = (char*) malloc(2048);

-	GetModuleFileName(hModule, Temp, 2048);

-

-	l = Temp;

-	i = Temp;

-

-	while (i != 0) {

-		if ((*i) == '\') l = i + 1;

-		i++;

-	}

-

-	memcpy(ModuleName, l, i-l);

-	free(Temp);

-	*/

-

-    return true;

+    return TRUE;

 }

diff --git a/plugins/!NotAdopted/MagneticWindows/MagneticWindowsCore.cpp b/plugins/MagneticWindows/src/MagneticWindowsCore.cpp
index 044dcc098e..5af05dcd76 100644
--- a/plugins/!NotAdopted/MagneticWindows/MagneticWindowsCore.cpp
+++ b/plugins/MagneticWindows/src/MagneticWindowsCore.cpp
@@ -402,7 +402,7 @@ bool WindowOpen(HWND hWnd) {
 	PDockingWindow i;

 

 	if ((hWnd != 0) && (FindDockingWindow(hWnd) == NULL)) {

-		i = (PDockingWindow)malloc(sizeof(TDockingWindow));

+		i = (PDockingWindow)mir_alloc(sizeof(TDockingWindow));

 		i->Next = Globals.WindowList;	

 		i->hWnd = hWnd;

 		Globals.WindowList = i;

@@ -444,7 +444,7 @@ bool WindowClose(HWND hWnd) {
 			SetWindowLongA(hWnd, GWL_WNDPROC, (LONG) (i->OldWindowProc));

 		}

 		

-		free(i);

+		mir_free(i);

 

 		return true;

 	}

@@ -458,7 +458,7 @@ bool WindowCloseAll() {
 		l = i;

 		WindowClose(i->hWnd);

 		i = i->Next;

-		free(l);

+		mir_free(l);

 	}

 	return true;

 }
\ No newline at end of file
diff --git a/plugins/!NotAdopted/MagneticWindows/MagneticWindowsCore.h b/plugins/MagneticWindows/src/MagneticWindowsCore.h
index 63d9b6a5e3..c0d6938a7f 100644
--- a/plugins/!NotAdopted/MagneticWindows/MagneticWindowsCore.h
+++ b/plugins/MagneticWindows/src/MagneticWindowsCore.h
@@ -1,20 +1,23 @@
 #include <windows.h>

 #include <commctrl.h>

 #include <stdio.h>

-#include "../include/newpluginapi.h"

-#include "../include/m_clist.h"

-#include "../include/m_clui.h"

-#include "../include/m_message.h"

-#include "../include/m_system.h"

-#include "../include/m_options.h"

-#include "../include/m_plugins.h"

-#include "../include/m_database.h"

-#include "../include/m_langpack.h"

-#include "m_MagneticWindows.h"

+

+#include <newpluginapi.h>

+#include <m_clist.h>

+#include <m_clui.h>

+#include <m_message.h>

+#include <m_system.h>

+#include <m_options.h>

+// #include "../include/m_plugins.h"

+#include <m_database.h>

+#include <m_langpack.h>

+#include <m_MagneticWindows.h>

+

 #include "SnapToListService.h"

 #include "Options.h"

-#include "resource.h"

 

+#include "resource.h"

+#include "Version.h"

 

 typedef 

 	struct TDockingWindow {

@@ -37,8 +40,8 @@ typedef
 

 

 

+#define MODULE_NAME "MagneticWindows"

 extern HINSTANCE hInst;

-extern char ModuleName [];

 

 bool WindowOpen(HWND);

 bool WindowClose(HWND);

diff --git a/plugins/!NotAdopted/MagneticWindows/Options.cpp b/plugins/MagneticWindows/src/Options.cpp
index 163c39f34c..d070f40d56 100644
--- a/plugins/!NotAdopted/MagneticWindows/Options.cpp
+++ b/plugins/MagneticWindows/src/Options.cpp
@@ -10,7 +10,7 @@ TOptions Options = {
 

 int CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 

-	char str[64];

+	TCHAR str[64];

 

 	switch (msg) {

 		case WM_INITDIALOG: {

@@ -20,7 +20,7 @@ int CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			SendDlgItemMessage(hwndDlg, IDC_SLIDER_SNAPWIDTH, TBM_SETRANGE, FALSE, MAKELONG(1,32));

 			SendDlgItemMessage(hwndDlg, IDC_SLIDER_SNAPWIDTH, TBM_SETPOS, TRUE, Options.SnapWidth);

 			

-			wsprintf(str, Translate("%d pix"), Options.SnapWidth);

+			wsprintf(str, TranslateT("%d pix"), Options.SnapWidth);

 			SetDlgItemText(hwndDlg, IDC_TXT_SNAPWIDTH, str);

 			

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SLIDER_SNAPWIDTH), Options.DoSnap);

@@ -31,7 +31,7 @@ int CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			break;		

 		}

 		case WM_HSCROLL: {		

-			_snprintf(str, 64, Translate("%d pix"), SendDlgItemMessage(hwndDlg, IDC_SLIDER_SNAPWIDTH, TBM_GETPOS, 0, 0));

+			mir_snwprintf(str, 64, TranslateT("%d pix"), SendDlgItemMessage(hwndDlg, IDC_SLIDER_SNAPWIDTH, TBM_GETPOS, 0, 0));

 			SetDlgItemText(hwndDlg, IDC_TXT_SNAPWIDTH, str);

 

 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -76,9 +76,9 @@ int CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 							Options.SnapWidth = SendDlgItemMessage(hwndDlg, IDC_SLIDER_SNAPWIDTH, TBM_GETPOS, 0, 0);

 							Options.ScriverWorkAround = (IsDlgButtonChecked(hwndDlg, IDC_CHK_SCRIVERWORKAROUND) == TRUE);

 

-							DBWriteContactSettingByte(NULL, ModuleName, "DoSnap", Options.DoSnap);

-							DBWriteContactSettingByte(NULL, ModuleName, "SnapWidth", Options.SnapWidth);

-							DBWriteContactSettingByte(NULL, ModuleName, "ScriverWorkAround", Options.ScriverWorkAround);

+							db_set_b(NULL, MODULE_NAME, "DoSnap", Options.DoSnap);

+							db_set_b(NULL, MODULE_NAME, "SnapWidth", Options.SnapWidth);

+							db_set_b(NULL, MODULE_NAME, "ScriverWorkAround", Options.ScriverWorkAround);

 							

 							break;

 						} 

@@ -97,17 +97,17 @@ int CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 }

 

-int InitOptions(WPARAM wParam, LPARAM lParam) {

+int InitOptions(WPARAM wParam, LPARAM) {

 	OPTIONSDIALOGPAGE Opt = { 0 };

 

 	Opt.cbSize = sizeof(Opt);

 //	Opt.position = 0;

-	Opt.pszTitle = "Magnetic Windows";

-	Opt.pfnDlgProc = &OptionsDlgProc;

-	Opt.pszTemplate = (char *) MAKEINTRESOURCE(IDD_OPT_MAGNETICWINDOWS);

+	Opt.pfnDlgProc = OptionsDlgProc;

+	Opt.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAGNETICWINDOWS);

 	Opt.hInstance = hInst;

 //	Opt.hIcon = 0;

-	Opt.pszGroup = "Customize";

+	Opt.pszGroup = LPGEN("Customize");

+	Opt.pszTitle = LPGEN("Magnetic Windows");

 //	Opt.groupPosition = 0;

 //	Opt.hGroupIcon = 0;

 	Opt.flags = ODPF_BOLDGROUPS;

@@ -116,13 +116,13 @@ int InitOptions(WPARAM wParam, LPARAM lParam) {
 //	Opt.expertOnlyControls = NULL;

 //	Opt.nExpertOnlyControls = 0;

 

-	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)(&Opt));

+	Options_AddPage(wParam, &Opt);

 	

 	return 0;

 }

 

 void LoadOptions() {

-	Options.DoSnap = DBGetContactSettingByte(NULL, ModuleName, "DoSnap", TRUE);

-	Options.SnapWidth = DBGetContactSettingByte(NULL, ModuleName, "SnapWidth", cDefaultSnapWidth);

-	Options.ScriverWorkAround = DBGetContactSettingByte(NULL, ModuleName, "ScriverWorkAround", FALSE);

+	Options.DoSnap = db_get_b(NULL, MODULE_NAME, "DoSnap", TRUE);

+	Options.SnapWidth = db_get_b(NULL, MODULE_NAME, "SnapWidth", cDefaultSnapWidth);

+	Options.ScriverWorkAround = db_get_b(NULL, MODULE_NAME, "ScriverWorkAround", FALSE);

 }
\ No newline at end of file
diff --git a/plugins/!NotAdopted/MagneticWindows/Options.h b/plugins/MagneticWindows/src/Options.h
index ebb5458d4a..ebb5458d4a 100644
--- a/plugins/!NotAdopted/MagneticWindows/Options.h
+++ b/plugins/MagneticWindows/src/Options.h
diff --git a/plugins/!NotAdopted/MagneticWindows/SnapToListService.cpp b/plugins/MagneticWindows/src/SnapToListService.cpp
index 5fc9f66268..5fc9f66268 100644
--- a/plugins/!NotAdopted/MagneticWindows/SnapToListService.cpp
+++ b/plugins/MagneticWindows/src/SnapToListService.cpp
diff --git a/plugins/!NotAdopted/MagneticWindows/SnapToListService.h b/plugins/MagneticWindows/src/SnapToListService.h
index 27db7246cd..27db7246cd 100644
--- a/plugins/!NotAdopted/MagneticWindows/SnapToListService.h
+++ b/plugins/MagneticWindows/src/SnapToListService.h
diff --git a/plugins/MagneticWindows/src/Version.h b/plugins/MagneticWindows/src/Version.h
new file mode 100644
index 0000000000..681fda66a6
--- /dev/null
+++ b/plugins/MagneticWindows/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				3

+#define __BUILD_NUM					2

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Magnetic Windows"

+#define __FILENAME					"MagneticWindows.dll"

+#define __DESCRIPTION 				"Makes the main contactlist and the chat windows snapping to the desktop border and to each other."

+#define __AUTHOR					"Michael Kunz"

+#define __AUTHOREMAIL				"Michael.Kunz@s2005.TU-Cemnitz.de"

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

+#define __COPYRIGHT					"© 2006 Michael Kunz"

diff --git a/plugins/!NotAdopted/MagneticWindows/resource.h b/plugins/MagneticWindows/src/resource.h
index a651a69a50..a651a69a50 100644
--- a/plugins/!NotAdopted/MagneticWindows/resource.h
+++ b/plugins/MagneticWindows/src/resource.h