starting adopr MsgPopup.

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

13 files changed, 273 insertions, 381 deletions

diff --git a/plugins/!NotAdopted/MessagePopup/AggressiveOptimize.h b/plugins/!NotAdopted/MessagePopup/AggressiveOptimize.h
deleted file mode 100644
index c373fa70ad..0000000000
--- a/plugins/!NotAdopted/MessagePopup/AggressiveOptimize.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//////////////////////////////

-// Version 1.40 

-// October 22nd, 2002 - .NET (VC7, _MSC_VER=1300) support!

-// Version 1.30

-// Nov 24th, 2000

-// Version 1.20

-// Jun 9th, 2000

-// Version 1.10

-// Jan 23rd, 2000

-// Version 1.00

-// May 20th, 1999

-// Todd C. Wilson, Fresh Ground Software

-// (todd@nopcode.com)

-// This header file will kick in settings for Visual C++ 5 and 6 that will (usually)

-// result in smaller exe's.

-// The "trick" is to tell the compiler to not pad out the function calls; this is done

-// by not using the /O1 or /O2 option - if you do, you implicitly use /Gy, which pads

-// out each and every function call. In one single 500k dll, I managed to cut out 120k

-// by this alone!

-// The other two "tricks" are telling the Linker to merge all data-type segments together

-// in the exe file. The relocation, read-only (constants) data, and code section (.text)

-// sections can almost always be merged. Each section merged can save 4k in exe space,

-// since each section is padded out to 4k chunks. This is very noticeable with smaller

-// exes, since you could have only 700 bytes of data, 300 bytes of code, 94 bytes of

-// strings - padded out, this could be 12k of runtime, for 1094 bytes of stuff! For larger

-// programs, this is less overall, but can save at least 4k.

-// Note that if you're using MFC static or some other 3rd party libs, you may get poor

-// results with merging the readonly (.rdata) section - the exe may grow larger.

-// To use this feature, define _MERGE_RDATA_ in your project or before this header is used.

-// With Visual C++ 5, the program uses a file alignment of 512 bytes, which results

-// in a small exe. Under VC6, the program instead uses 4k, which is the same as the

-// section size. The reason (from what I understand) is that 4k is the chunk size of

-// the virtual memory manager, and that WinAlign (an end-user tuning tool for Win98)

-// will re-align the programs on this boundary. The problem with this is that all of

-// Microsoft's system exes and dlls are *NOT* tuned like this, and using 4k causes serious

-// exe bloat. This is very noticeable for smaller programs.

-// The "trick" for this is to use the undocumented FILEALIGN linker parm to change the

-// padding from 4k to 1/2k, which results in a much smaller exe - anywhere from 20%-75%

-// depending on the size. Note that this is the same as using /OPT:NOWIN98, which *is*

-// a previously documented switch, but was left out of the docs for some reason in VC6 and

-// all of the current MSDN's - see KB:Q235956 for more information.

-// Microsoft does say that using the 4k alignment will "speed up process loading",

-// but I've been unable to notice a difference, even on my P180, with a very large (4meg) exe.

-// Please note, however, that this will probably not change the size of the COMPRESSED

-// file (either in a .zip file or in an install archive), since this 4k is all zeroes and

-// gets compressed away.

-// Also, the /ALIGN:4096 switch will "magically" do the same thing, even though this is the

-// default setting for this switch. Apparently this sets the same values as the above two

-// switches do. We do not use this in this header, since it smacks of a bug and not a feature.

-// Thanks to Michael Geary <Mike@Geary.com> for some additional tips!

-//

-// Notes about using this header in .NET

-// First off, VC7 does not allow a lot of the linker command options in pragma's. There is no

-// honest or good reason why Microsoft decided to make this change, it just doesn't.

-// So that is why there are a lot of <1300 #if's in the header.

-// If you want to take full advantage of the VC7 linker options, you will need to do it on a 

-// PER PROJECT BASIS; you can no longer use a global header file like this to make it better.

-// Items I strongly suggest putting in all your VC7 project linker options command line settings:

-//			/ignore:4078	/RELEASE

-// Compiler options:

-//			/GL (Whole Program Optimization)

-// If you're making an .EXE and not a .DLL, consider adding in:

-//			/GA (Optimize for Windows Application)

-// Some items to consider using in your VC7 projects (not VC6):

-// Link-time Code Generation - whole code optimization. Put this in your exe/dll project link settings.

-//			/LTCG:NOSTATUS

-// The classic no-padding and no-bloat compiler C/C++ switch:

-//			/opt:nowin98

-//

-// (C++ command line options:  /GL /opt:nowin98  and /GA for .exe files)

-// (Link command line options: /ignore:4078 /RELEASE /LTCG:NOSTATUS)

-//

-// Now, notes on using these options in VC7 vs VC6.

-// VC6 consistently, for me, produces smaller code from C++ the exact same sources,

-// with or without this header. On average, VC6 produces 5% smaller binaries compared

-// to VC7 compiling the exact same project, *without* this header. With this header, VC6

-// will make a 13k file, while VC7 will make a 64k one. VC7 is just bloaty, pure and

-// simple - all that managed/unmanaged C++ runtimes, and the CLR stuff must be getting

-// in the way of code generation. However, template support is better, so there.

-// Both VC6 and VC7 show the same end kind of end result savings - larger binary output

-// will shave about 2% off, where as smaller projects (support DLL's, cpl's,

-// activex controls, ATL libs, etc) get the best result, since the padding is usually

-// more than the actual usable code. But again, VC7 does not compile down as small as VC6.

-//

-// The argument can be made that doing this is a waste of time, since the "zero bytes"

-// will be compressed out in a zip file or install archive. Not really - it doesn't matter

-// if the data is a string of zeroes or ones or 85858585 - it will still take room (20 bytes

-// in a zip file, 29 bytes if only *4* of them 4k bytes are not the same) and time to

-// compress that data and decompress it. Also, 20k of zeros is NOT 20k on disk - it's the

-// size of the cluster slop- for Fat32 systems, 20k can be 32k, NTFS could make it 24k if you're

-// just 1 byte over (round up). Most end users do not have the dual P4 Xeon systems with

-// two gigs of RDram and a Raid 0+1 of Western Digital 120meg Special Editions that all

-// worthy developers have (all six of us), so they will need any space and LOADING TIME

-// savings they will need; taking an extra 32k or more out of your end user's 64megs of

-// ram on Windows 98 is Not a Good Thing.

-//

-// Now, as a ADDED BONUS at NO EXTRA COST TO YOU! Under VC6, using the /merge:.text=.data

-// pragma will cause the output file to be un-disassembleable! (is that a word?) At least,

-// with the normal tools - WinDisam, DumpBin, and the like will not work. Try it - use the

-// header, compile release, and then use DUMPBIN /DISASM filename.exe - no code!

-// Thanks to Gëzim Pani <gpani@siu.edu> for discovering this gem - for a full writeup on

-// this issue and the ramifactions of it, visit www.nopcode.com for the Aggressive Optimize

-// article.

-

-#ifndef _AGGRESSIVEOPTIMIZE_H_

-#define _AGGRESSIVEOPTIMIZE_H_

-

-#pragma warning(disable:4711)

-

-#ifdef NDEBUG

-// /Og (global optimizations), /Os (favor small code), /Oy (no frame pointers)

-#pragma optimize("gsy",on)

-

-#if (_MSC_VER<1300)

-	#pragma comment(linker,"/RELEASE")

-#endif

-

-// Note that merging the .rdata section will result in LARGER exe's if you using

-// MFC (esp. static link). If this is desirable, define _MERGE_RDATA_ in your project.

-#ifdef _MERGE_RDATA_

-#pragma comment(linker,"/merge:.rdata=.data")

-#endif // _MERGE_RDATA_

-

-#pragma comment(linker,"/merge:.text=.data")

-#if (_MSC_VER<1300)

-	// In VC7, this causes problems with the relocation and data tables, so best to not merge them

-	#pragma comment(linker,"/merge:.reloc=.data")

-#endif

-

-// Merging sections with different attributes causes a linker warning, so

-// turn off the warning. From Michael Geary. Undocumented, as usual!

-#if (_MSC_VER<1300)

-	// In VC7, you will need to put this in your project settings

-	#pragma comment(linker,"/ignore:4078")

-#endif

-

-// With Visual C++ 5, you already get the 512-byte alignment, so you will only need

-// it for VC6, and maybe later.

-#if _MSC_VER >= 1000

-

-// Option #1: use /filealign

-// Totally undocumented! And if you set it lower than 512 bytes, the program crashes.

-// Either leave at 0x200 or 0x1000

-//#pragma comment(linker,"/FILEALIGN:0x200")

-

-// Option #2: use /opt:nowin98

-// See KB:Q235956 or the READMEVC.htm in your VC directory for info on this one.

-// This is our currently preferred option, since it is fully documented and unlikely

-// to break in service packs and updates.

-#if (_MSC_VER<1300)

-	// In VC7, you will need to put this in your project settings

-	#pragma comment(linker,"/opt:nowin98")

-#else

-

-// Option #3: use /align:4096

-// A side effect of using the default align value is that it turns on the above switch.

-// Does nothing under Vc7 that /opt:nowin98 doesn't already give you

-// #pragma comment(linker,"/ALIGN:512")

-#endif

-

-#endif // _MSC_VER >= 1000

-

-#endif // NDEBUG

-

-#endif //  _AGGRESSIVEOPTIMIZE_H_

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

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

-# ** DO NOT EDIT **

-

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

-

-CFG=MsgPopup - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

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

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

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

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MsgPopup - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "MsgPopup - Win32 Debug" (based on "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)" == "MsgPopup - 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 "MsgPopup_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MsgPopup_EXPORTS" /YX /FD /c

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

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

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

-# ADD RSC /l 0x809 /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

-# SUBTRACT LINK32 /map

-

-!ELSEIF  "$(CFG)" == "MsgPopup - 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 "MsgPopup_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 "MsgPopup_EXPORTS" /YX /FD /GZ /c

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

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

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

-# ADD RSC /l 0x809 /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 /out:"C:\PROGRA~1\MIRAND~2\PLUGINS\MsgPopup.DLL" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MsgPopup - Win32 Release"

-# Name "MsgPopup - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\options.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\options.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\resource.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

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

-# Begin Source File

-

-SOURCE=.\MsgPopup.rc

-# End Source File

-# End Group

-# End Target

-# End Project

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

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

-

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 1d1dd26ef7..712bcd8a8e 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -105,8 +105,8 @@ int BuddyPounceOptInit(WPARAM wParam, LPARAM lParam)
 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS);

-	odp.pszGroup = LPGENT("Plugins");

-	odp.pszTitle = LPGENT("Buddy Pounce");

+	odp.ptszGroup = LPGENT("Plugins");

+	odp.ptszTitle = LPGENT("Buddy Pounce");

 	odp.pfnDlgProc = BuddyPounceOptionsDlgProc;

 	Options_AddPage(wParam, &odp);

 	

diff --git a/plugins/MsgPopup/MsgPopup_11.vcxproj b/plugins/MsgPopup/MsgPopup_11.vcxproj
new file mode 100644
index 0000000000..dba3b5d928
--- /dev/null
+++ b/plugins/MsgPopup/MsgPopup_11.vcxproj
@@ -0,0 +1,195 @@
+<?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="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{1E702CF1-E52F-49F8-915A-FCBBCE554774}</ProjectGuid>

+    <ProjectName>MsgPopup</ProjectName>

+  </PropertyGroup>

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

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v110_xp</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v110_xp</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v110_xp</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v110_xp</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <Optimization>Disabled</Optimization>

+      <WarningLevel>Level3</WarningLevel>

+      <MinimalRebuild>true</MinimalRebuild>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

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

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

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

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

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <Optimization>Disabled</Optimization>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

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

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

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

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

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <Optimization>Full</Optimization>

+      <WarningLevel>Level3</WarningLevel>

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

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <SubSystem>Windows</SubSystem>

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

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

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <Optimization>Full</Optimization>

+      <WarningLevel>Level3</WarningLevel>

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

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <SubSystem>Windows</SubSystem>

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

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

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

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

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

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

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

+  </ItemGroup>

+  <ItemGroup>

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

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

+  </ItemGroup>

+  <ItemGroup>

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

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/MsgPopup/MsgPopup_11.vcxproj.filters b/plugins/MsgPopup/MsgPopup_11.vcxproj.filters
new file mode 100644
index 0000000000..20252c4830
--- /dev/null
+++ b/plugins/MsgPopup/MsgPopup_11.vcxproj.filters
@@ -0,0 +1,41 @@
+<?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>{f483e746-3653-4929-887e-f79771cb81d9}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{c09436c7-f2f3-4466-8985-3b1de6be34e0}</UniqueIdentifier>

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

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{dfa4551f-3ded-444a-8b03-f2a42739761e}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\common.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>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/!NotAdopted/MessagePopup/MsgPopup.txt b/plugins/MsgPopup/docs/MsgPopup.txt
index 5b99aed133..5b99aed133 100644
--- a/plugins/!NotAdopted/MessagePopup/MsgPopup.txt
+++ b/plugins/MsgPopup/docs/MsgPopup.txt
diff --git a/plugins/!NotAdopted/MessagePopup/MsgPopup.rc b/plugins/MsgPopup/res/MsgPopup.rc
index e9e1ca93bd..5b45a81bd2 100644
--- a/plugins/!NotAdopted/MessagePopup/MsgPopup.rc
+++ b/plugins/MsgPopup/res/MsgPopup.rc
@@ -5,7 +5,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "resource.h"

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

 #include "afxres.h"

 

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

@@ -82,12 +82,11 @@ END
 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

-    "resrc1.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

-    "#include ""resource.h""\r\n"

     "#include ""afxres.h""\r\n"

     "\0"

 END

diff --git a/plugins/!NotAdopted/MessagePopup/common.h b/plugins/MsgPopup/src/common.h
index 2af3d9d964..fbff74293b 100644
--- a/plugins/!NotAdopted/MessagePopup/common.h
+++ b/plugins/MsgPopup/src/common.h
@@ -19,18 +19,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 

 */

-#include"AggressiveOptimize.h"

-#include <windows.h>

-

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

 

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

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

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

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

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

-#include "../../SDK/headers_c/m_utils.h"

-#include "../../SDK/headers_c/m_popup.h"

+#include <windows.h>

+#include <tlhelp32.h>

+#include <dbghelp.h>

+

+#include "newpluginapi.h"

+#include "m_system.h"

+#include "m_database.h"

+#include "m_langpack.h"

+#include "m_clist.h"

+#include "m_options.h"

+#include "m_utils.h"

+#include "m_popup.h"

 

 #include "options.h"

 #include "resource.h"

@@ -49,15 +50,3 @@ extern MSGBOXOPTIONS options;
 extern MSGBOXOPTIONS optionsDefault;

 

 void LoadConfig();

-

-#ifdef __cplusplus

-extern "C" {

-#endif 

-

-int __declspec(dllexport) Load( PLUGINLINK *link );

-int __declspec(dllexport) Unload( void );

-__declspec(dllexport) PLUGININFO *MirandaPluginInfo( DWORD dwVersion );

-

-#ifdef __cplusplus

-}

-#endif /* __cplusplus */

diff --git a/plugins/!NotAdopted/MessagePopup/main.cpp b/plugins/MsgPopup/src/main.cpp
index aab581b57b..bed3764b52 100644
--- a/plugins/!NotAdopted/MessagePopup/main.cpp
+++ b/plugins/MsgPopup/src/main.cpp
@@ -20,15 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 #include "common.h"

-#include <tlhelp32.h>

-#include <dbghelp.h>

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

 

 HINSTANCE hInst;

-PLUGINLINK *pluginLink;

-

-HANDLE hHookedOpt;

-HANDLE hHookedInit;

+int hLangpack;

 

 MSGBOXOPTIONS optionsDefault =

 {

@@ -39,8 +33,8 @@ MSGBOXOPTIONS optionsDefault =
 };

 MSGBOXOPTIONS options;

 

-PLUGININFO pluginInfo={

-	sizeof( PLUGININFO ),

+PLUGININFOEX pluginInfo={

+	sizeof(PLUGININFOEX),

 	SERVICENAME,

 	PLUGIN_MAKE_VERSION( 0,0,0,1 ),

 	"This stuff will replace MessageBox'es [whose have only OK button] into Popups",

@@ -62,12 +56,10 @@ MSGBOXPROC prevMessageBoxA;
 

 void popupMessage(LPCSTR lpText, LPCSTR lpCaption, UINT uType)

 {

-	POPUPDATAEX ppd;	

+	POPUPDATAT ppd = {0};	

 	int iIcon;

 	int indx;

 

-	ZeroMemory(&ppd, sizeof(ppd));

-	

 	switch(uType & 0xF0)

 	{

 		case MB_ICONHAND:

@@ -95,7 +87,7 @@ void popupMessage(LPCSTR lpText, LPCSTR lpCaption, UINT uType)
 	ppd.lchIcon = (HICON)LoadImage(NULL, MAKEINTRESOURCE(iIcon), IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED);

 	lstrcpy(ppd.lpzContactName, lpCaption);

 	lstrcpy(ppd.lpzText, lpText);

-	CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)&ppd, 0);

+	PUAddPopUpT(&ppd);

 	if(options.Sound)

 		MessageBeep(uType);

 }

@@ -112,6 +104,7 @@ int WINAPI newMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType
 BOOL g_HookError = FALSE;

 BOOL g_HookError2 = FALSE;

 int g_mod = 0;

+

 void HookOnImport(HMODULE hModule, char *lpszImpModName, DWORD lpOrigFunc, DWORD lpNewFunc)

 {

 	ULONG ulSize;

@@ -207,18 +200,15 @@ int HookedInit(WPARAM wParam, LPARAM lParam)
 

 int HookedOptions(WPARAM wParam, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp;

-

-	ZeroMemory(&odp, sizeof(odp));

-

+	OPTIONSDIALOGPAGE odp = {0};

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS);

-	odp.pszTitle = Translate("MessagePopup");

-	odp.pszGroup = Translate("Popups");

-	odp.flags = ODPF_BOLDGROUPS;

+	odp.ptszTitle = LPGENT("MessagePopup");

+	odp.ptszGroup = LPGENT("Popups");

+	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.pfnDlgProc = OptionsDlgProc;

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

+	Options_AddPage(wParam, &odp);

 

 	return 0;

 }

@@ -240,33 +230,29 @@ void LoadConfig()
 	options.Sound = DBGetContactSettingByte(NULL, SERVICENAME, "Sound", (DWORD)optionsDefault.Sound);

 

 }

-int __declspec(dllexport) Load(PLUGINLINK *link)

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

 {

-	pluginLink=link;

-

-    hHookedInit = HookEvent(ME_SYSTEM_MODULESLOADED, HookedInit);

-    hHookedOpt = HookEvent(ME_OPT_INITIALISE, HookedOptions);

+	mir_getLP(&pluginInfo);

+	HookEvent(ME_SYSTEM_MODULESLOADED, HookedInit);

+    HookEvent(ME_OPT_INITIALISE, HookedOptions);

 

 	LoadConfig();

 

 	return 0;

 }

 

-int __declspec(dllexport) Unload(void)

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

 {

-    UnhookEvent(hHookedOpt);

-    UnhookEvent(hHookedInit);

-

 	return 0;

 }

 

-__declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)

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

 {

 	return &pluginInfo;

 }

 

-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/!NotAdopted/MessagePopup/options.cpp b/plugins/MsgPopup/src/options.cpp
index 28a7e8fd44..b5467dcbe5 100644
--- a/plugins/!NotAdopted/MessagePopup/options.cpp
+++ b/plugins/MsgPopup/src/options.cpp
@@ -36,7 +36,7 @@ static int __inline DBWriteContactSettingDwordDef(HANDLE hContact,const char *sz
 		return DBWriteContactSettingDword(hContact, szModule, szSetting, val);

 }

 

-BOOL CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

 	switch (message)

 	{

diff --git a/plugins/!NotAdopted/MessagePopup/options.h b/plugins/MsgPopup/src/options.h
index 4d139d814f..07f81f28d9 100644
--- a/plugins/!NotAdopted/MessagePopup/options.h
+++ b/plugins/MsgPopup/src/options.h
@@ -19,4 +19,4 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 

 */

-BOOL CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/!NotAdopted/MessagePopup/resource.h b/plugins/MsgPopup/src/resource.h
index 27e128723b..27e128723b 100644
--- a/plugins/!NotAdopted/MessagePopup/resource.h
+++ b/plugins/MsgPopup/src/resource.h