another part of small project fixes

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

4 files changed, 26 insertions, 28 deletions

diff --git a/ContactsPlus/contacts.vcxproj b/ContactsPlus/contacts.vcxproj
index ce44fb6..fe1c4c4 100644
--- a/ContactsPlus/contacts.vcxproj
+++ b/ContactsPlus/contacts.vcxproj
@@ -69,8 +69,8 @@
   </PropertyGroup>

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

     <LinkIncremental>false</LinkIncremental>

-    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

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

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

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

   </PropertyGroup>

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

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

@@ -78,8 +78,8 @@
     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

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

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

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

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

@@ -96,6 +96,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -120,25 +121,25 @@
       <AdditionalDependencies>comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <Optimization>MaxSpeed</Optimization>

+      <Optimization>Full</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

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

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

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

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

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

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

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -152,16 +153,18 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\contacts.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>false</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

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

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

       <AdditionalOptions> /ALIGN:4096  /ignore:4108</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

@@ -198,6 +201,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -211,10 +215,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

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

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

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <Midl>

@@ -229,15 +229,13 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\contacts.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <OutputFile>.\Debug\contacts.dll</OutputFile>

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

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

diff --git a/ContactsPlus/receive.cpp b/ContactsPlus/receive.cpp
index 16c63e6..24caf66 100644
--- a/ContactsPlus/receive.cpp
+++ b/ContactsPlus/receive.cpp
@@ -228,7 +228,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 

         for (int nItem = 0; ; nItem++)

         { // Nick

-          int strsize = strlennull(pcBlob);

+          int strsize = (int)strlennull(pcBlob);

           TReceivedItem* pItem = wndData->AddReceivedItem();

 

           if (dbe.flags & DBEF_UTF)

@@ -237,7 +237,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
             pItem->mcaNick = ansi_to_tchar(pcBlob);

           pcBlob += strsize + 1;

           // UIN

-          strsize = strlennull(pcBlob);

+          strsize = (int)strlennull(pcBlob);

           pItem->mcaUIN = null_strdup(pcBlob);

           pcBlob += strsize + 1;

           // add to listview

diff --git a/ContactsPlus/send.cpp b/ContactsPlus/send.cpp
index 58007cb..1382b62 100644
--- a/ContactsPlus/send.cpp
+++ b/ContactsPlus/send.cpp
@@ -489,7 +489,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
         else

           maSend[i].mcaNick = (unsigned char*)null_strdup((char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ackData->aContacts[i], 0));

         maSend[i].mcaUIN = GetContactUID(ackData->aContacts[i], FALSE);

-        dbei.cbBlob += strlennull(maSend[i].mcaUIN) + strlennull((char*)maSend[i].mcaNick) + 2;

+        dbei.cbBlob += (DWORD)strlennull(maSend[i].mcaUIN) + (DWORD)strlennull((char*)maSend[i].mcaNick) + 2;

       }

       dbei.pBlob = (PBYTE)_alloca(dbei.cbBlob);

       for (i=0, pBlob=(char*)dbei.pBlob; i < ackData->nContacts; i++) 

diff --git a/ContactsPlus/utils.cpp b/ContactsPlus/utils.cpp
index 864e3bb..a86cdff 100644
--- a/ContactsPlus/utils.cpp
+++ b/ContactsPlus/utils.cpp
@@ -512,7 +512,7 @@ TCHAR* __fastcall SRCTranslateT(const char* src, const WCHAR* unibuf)
     int wchars, err;

 

     wchars = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src,

-      strlennull(src), NULL, 0);

+      (int)strlennull(src), NULL, 0);

 

     if (wchars == 0) return NULL; // Failure

 

@@ -523,7 +523,7 @@ TCHAR* __fastcall SRCTranslateT(const char* src, const WCHAR* unibuf)
     unicode[wchars] = 0;

 

     err = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src,

-      strlennull(src), unicode, wchars);

+      (int)strlennull(src), unicode, wchars);

     if (err != wchars) return NULL; // Failure

 

     return (TCHAR*)TranslateW(unicode);

@@ -738,7 +738,7 @@ static int utf8_decode(const unsigned char *from, char **to)
   if (bHasCP_UTF8)

   {

     WCHAR *wszTemp = NULL;

-    int inlen = strlennull((char*)from);

+    int inlen = (int)strlennull((char*)from);

 

     wszTemp = (WCHAR *)_alloca(sizeof(WCHAR) * (inlen + 1));

 

@@ -813,14 +813,14 @@ TCHAR* ansi_to_tchar(const char* src, int codepage)
     WCHAR *unicode;

     int wchars, err;

 

-    wchars = MultiByteToWideChar(codepage, MB_PRECOMPOSED, src, strlennull(src), NULL, 0);

+    wchars = MultiByteToWideChar(codepage, MB_PRECOMPOSED, src, (int)strlennull(src), NULL, 0);

 

     if (wchars == 0) return NULL; // Failure

 

     unicode = (WCHAR*)malloc((wchars + 1) * sizeof(WCHAR));

     unicode[wchars] = 0;

 

-    err = MultiByteToWideChar(codepage, MB_PRECOMPOSED, src, strlennull(src), unicode, wchars);

+    err = MultiByteToWideChar(codepage, MB_PRECOMPOSED, src, (int)strlennull(src), unicode, wchars);

     if (err != wchars)

     {

       SAFE_FREE((void**)&unicode);