Merging popup APIs (patch by Merlin)

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@511 4f64403b-2f21-0410-a795-97e2b3489a10

4 files changed, 36 insertions, 26 deletions

diff --git a/metacontacts/MetaContacts_9.vcproj b/metacontacts/MetaContacts_9.vcproj
index 02e4182..f72867a 100644
--- a/metacontacts/MetaContacts_9.vcproj
+++ b/metacontacts/MetaContacts_9.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>

+<?xml version="1.0" encoding="windows-1251"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="9.00"

@@ -141,7 +141,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -343,7 +343,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"

 				StringPooling="true"

 				ExceptionHandling="0"

-				RuntimeLibrary="0"

+				RuntimeLibrary="2"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

 				FloatingPointModel="2"

@@ -374,7 +374,6 @@
 				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				GenerateManifest="false"

 				ProgramDatabaseFile=".\Release/MetaContacts.pdb"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

diff --git a/tipper/tipper_9.vcproj b/tipper/tipper_9.vcproj
index 4a475f7..296e2ee 100644
--- a/tipper/tipper_9.vcproj
+++ b/tipper/tipper_9.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="tipper"

 	ProjectGUID="{2C818919-A38F-44FF-BD91-A6A204AC592A}"

 	RootNamespace="tipper"

@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -67,7 +67,8 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

+				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -122,7 +123,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -144,8 +145,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

 				LinkIncremental="2"

+				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -203,7 +205,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -228,7 +230,8 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

+				GenerateManifest="false"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -293,7 +296,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -317,8 +320,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

 				LinkIncremental="1"

+				GenerateManifest="false"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -376,7 +380,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -399,7 +403,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

+				OutputFile="c:\Miranda IM\plugins\tipper.dll"

+				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -455,7 +461,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -478,8 +484,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

 				LinkIncremental="2"

+				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -538,7 +545,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -564,7 +571,8 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

+				GenerateManifest="false"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -628,7 +636,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;..\..\..\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIPPER_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -654,7 +662,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

-				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				AdditionalDependencies="comctl32.lib wsock32.lib"

 				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"

 				GenerateDebugInformation="true"

 				GenerateMapFile="true"

diff --git a/yapp/docs/m_yapp.h b/yapp/docs/m_yapp.h
index 2fdd106..25b5e45 100644
--- a/yapp/docs/m_yapp.h
+++ b/yapp/docs/m_yapp.h
@@ -403,7 +403,7 @@ static int __inline PUChange(HWND hWndPopUp, POPUPDATAEX *newData) {
 

 #define MS_POPUP_CHANGEW "PopUp/ChangeW"

 static int __inline PUChangeW(HWND hWndPopUp, POPUPDATAW *newData) {

-	return (int)CallService(MS_POPUP_CHANGE, (WPARAM)hWndPopUp, (LPARAM)newData);

+	return (int)CallService(MS_POPUP_CHANGEW, (WPARAM)hWndPopUp, (LPARAM)newData);

 }

 

 #if defined(_UNICODE) || defined(UNICODE)

diff --git a/yapp/popups2_9.vcproj b/yapp/popups2_9.vcproj
index 9596133..876d06e 100644
--- a/yapp/popups2_9.vcproj
+++ b/yapp/popups2_9.vcproj
@@ -97,7 +97,7 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

-			OutputDirectory="$(SolutionDir)\$(ConfigurationName)64"

+			OutputDirectory="$(ConfigurationName)64"

 			IntermediateDirectory="$(ConfigurationName)64"

 			ConfigurationType="2"

 			CharacterSet="1"

@@ -144,6 +144,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="comctl32.lib"

+				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"

 				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -262,7 +263,7 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="$(SolutionDir)\$(ConfigurationName)64"

+			OutputDirectory="$(ConfigurationName)64"

 			IntermediateDirectory="$(ConfigurationName)64"

 			ConfigurationType="2"

 			CharacterSet="1"

@@ -315,6 +316,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="comctl32.lib"

+				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"

 				LinkIncremental="1"

 				IgnoreDefaultLibraryNames=""

 				GenerateDebugInformation="true"

@@ -428,7 +430,7 @@
 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|x64"

-			OutputDirectory="$(SolutionDir)\$(ConfigurationName)64"

+			OutputDirectory="$(ConfigurationName)64"

 			IntermediateDirectory="$(ConfigurationName)64"

 			ConfigurationType="2"

 			CharacterSet="1"

@@ -476,6 +478,7 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib"

+				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"

 				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -594,7 +597,7 @@
 		</Configuration>

 		<Configuration

 			Name="Release Unicode|x64"

-			OutputDirectory="$(SolutionDir)\$(ConfigurationName)64"

+			OutputDirectory="$(ConfigurationName)64"

 			IntermediateDirectory="$(ConfigurationName)64"

 			ConfigurationType="2"

 			CharacterSet="1"