From 46879a24aa0e45ec0ea1ddf27f28ce68edd5e561 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Sun, 27 Nov 2011 22:52:32 +0000 Subject: another part of small project fixes git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@224 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- ContactsPlus/contacts.vcxproj | 38 ++++++++++++++++++-------------------- ContactsPlus/receive.cpp | 4 ++-- ContactsPlus/send.cpp | 2 +- ContactsPlus/utils.cpp | 10 +++++----- 4 files changed, 26 insertions(+), 28 deletions(-) (limited to 'ContactsPlus') 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 @@ false - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ @@ -78,8 +78,8 @@ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true @@ -96,6 +96,7 @@ Use contacts.h Size + true true @@ -120,25 +121,25 @@ comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true true + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration - MultiThreadedDLL + MultiThreaded OnlyExplicitInline true true - MaxSpeed + Full true Level3 ../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\contacts.pch + WIN32;NDEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) Use contacts.h - .\Release\ - .\Release\ + Size + true true @@ -152,16 +153,18 @@ true - .\Release\contacts.bsc true true false Console - .\Release\contacts.lib + $(IntDir)$(TargetName).lib /ALIGN:4096 /ignore:4108 comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true + true + UseLinkTimeCodeGeneration @@ -198,6 +201,7 @@ true Console odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(IntDir)$(TargetName).lib @@ -211,10 +215,6 @@ ProgramDatabase ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\contacts.pch - .\Debug\ - .\Debug\ EnableFastChecks @@ -229,15 +229,13 @@ true - .\Debug\contacts.bsc true true true Console - .\Debug\contacts.dll - .\Debug\contacts.lib + $(IntDir)$(TargetName).lib odbc32.lib;odbccp32.lib;%(AdditionalDependencies) 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); -- cgit v1.2.3