another part of small project fixes

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@224 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

2 files changed, 43 insertions, 42 deletions

diff --git a/Console/Console.c b/Console/Console.c
index 7a05aed..96e56fa 100644
--- a/Console/Console.c
+++ b/Console/Console.c
@@ -116,7 +116,7 @@ static HANDLE hMenu = NULL;
 

 static void LoadSettings();

 static void ShowConsole(int show);

-static int ShowHideConsole(WPARAM wParam, LPARAM lParam);

+static INT_PTR ShowHideConsole(WPARAM wParam, LPARAM lParam);

 static int Openfile(TCHAR *outputFile, int selection);

 

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

@@ -126,13 +126,13 @@ static HBITMAP BmpUp = NULL;
 static HBITMAP BmpDn = NULL;

 static HANDLE hTTBButt = 0;

 

-static int HideConsoleButt(WPARAM wParam,LPARAM lParam)

+static INT_PTR HideConsoleButt(WPARAM wParam,LPARAM lParam)

 {

 	ShowConsole(0);

 	return 0;

 }

 

-static int ShowConsoleButt(WPARAM wParam,LPARAM lParam)

+static INT_PTR ShowConsoleButt(WPARAM wParam,LPARAM lParam)

 {

 	ShowConsole(1);

 	return 0;

@@ -231,7 +231,7 @@ static void ShowConsole(int show)
 

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

 

-static int ShowHideConsole(WPARAM wParam, LPARAM lParam)

+static INT_PTR ShowHideConsole(WPARAM wParam, LPARAM lParam)

 {

 	if (hwndConsole)

 		ShowConsole(!IsWindowVisible(hwndConsole));

@@ -376,7 +376,7 @@ static LRESULT CALLBACK SubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa
 

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

 

-static BOOL CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM lParam)

+static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM lParam)

 {

 

 	LOGWIN *dat = (LOGWIN*)GetWindowLong(hwndDlg, GWLP_USERDATA);

@@ -489,7 +489,7 @@ static BOOL CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM l
 			while (str != NULL)

 			{

 				lvi.pszText = &str[0];

-				tmplen = len = _tcslen(lvi.pszText);

+				tmplen = len = (DWORD)_tcslen(lvi.pszText);

 

 				while(len > wraplen)

 				{

@@ -711,7 +711,7 @@ int ConsoleResize(HWND hwnd,LPARAM lParam,UTILRESIZECONTROL *urc)
 }

 

 

-static BOOL CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM lParam)

+static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM lParam)

 {

 	switch(message) {

 	case WM_INITDIALOG:

@@ -1065,8 +1065,8 @@ static int OnFastDump(WPARAM wParam,LPARAM lParam)
 	if ( pActive )

 	{

 		LOGMSG *logMsg = (LOGMSG*)lParam;

-		DWORD headlen = strlen(logMsg->pszHead);

-		DWORD msglen = strlen(logMsg->pszMsg);

+		DWORD headlen = (DWORD)strlen(logMsg->pszHead);

+		DWORD msglen = (DWORD)strlen(logMsg->pszMsg);

 		DWORD len = (headlen + msglen + 1) * sizeof(TCHAR) + sizeof(DUMPMSG);

 		DUMPMSG *dumpMsg = (DUMPMSG*)malloc( len );

 		TCHAR *str = dumpMsg->szMsg;

@@ -1151,7 +1151,7 @@ static void SaveSettings(HWND hwndDlg)
 }

 

 

-static BOOL CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch(msg) {

 		case WM_INITDIALOG:

diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj
index 83e9903..3c1b7f4 100644
--- a/Console/Console.vcxproj
+++ b/Console/Console.vcxproj
@@ -137,6 +137,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

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

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

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

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

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

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

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

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

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

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

   </PropertyGroup>

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

     <Midl>

@@ -177,6 +185,7 @@
       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalOptions>

       </AdditionalOptions>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -193,13 +202,9 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>.\Debug/Console.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

-      <ObjectFileName>.\Debug/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

       <BrowseInformation>true</BrowseInformation>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -212,16 +217,13 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <OutputFile>../../Bin/Debug/plugins/Console.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/Console.pdb</ProgramDatabaseFile>

       <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>.\Debug/Console.map</MapFileName>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Debug/Console.lib</ImportLibrary>

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

       <AdditionalOptions>

       </AdditionalOptions>

     </Link>

@@ -251,6 +253,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <CompileAs>Default</CompileAs>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -268,6 +271,8 @@
       </AdditionalOptions>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

@@ -285,18 +290,16 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>.\Release/Console.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

-      <ObjectFileName>.\Release/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

       <BrowseInformation>true</BrowseInformation>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <CompileAs>Default</CompileAs>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -304,16 +307,17 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <OutputFile>../../bin/release/plugins/Console.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ProgramDatabaseFile>.\Release/Console.pdb</ProgramDatabaseFile>

       <GenerateMapFile>true</GenerateMapFile>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Release/Console.lib</ImportLibrary>

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

       <AdditionalOptions>

       </AdditionalOptions>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

@@ -355,6 +359,7 @@
       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalOptions>

       </AdditionalOptions>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -371,13 +376,9 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>.\Debug/Console.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

-      <ObjectFileName>.\Debug/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

       <BrowseInformation>true</BrowseInformation>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -390,16 +391,13 @@
       <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <OutputFile>../../Bin/Debug Unicode/plugins/Console.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/Console.pdb</ProgramDatabaseFile>

       <GenerateMapFile>true</GenerateMapFile>

-      <MapFileName>.\Debug/Console.map</MapFileName>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Debug/Console.lib</ImportLibrary>

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

       <AdditionalOptions>

       </AdditionalOptions>

     </Link>

@@ -429,6 +427,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <CompileAs>Default</CompileAs>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -446,6 +445,8 @@
       </AdditionalOptions>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

@@ -467,15 +468,13 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>.\Release/Console.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

-      <ObjectFileName>.\Release/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

       <BrowseInformation>true</BrowseInformation>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <CompileAs>Default</CompileAs>

       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -484,14 +483,16 @@
     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ProgramDatabaseFile>.\Release/Console.pdb</ProgramDatabaseFile>

       <GenerateMapFile>true</GenerateMapFile>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Release/Console.lib</ImportLibrary>

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

       <AdditionalOptions>

       </AdditionalOptions>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>