x64 portability

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

3 files changed, 11 insertions, 14 deletions

diff --git a/worldtime_protocol/time_display.cpp b/worldtime_protocol/time_display.cpp
index 348085e..2e179ee 100644
--- a/worldtime_protocol/time_display.cpp
+++ b/worldtime_protocol/time_display.cpp
@@ -77,10 +77,10 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				RECT br = r, lr = r;

 				br.bottom -= (r.bottom - r.top) / 4;

 				oldFont = (HFONT)SelectObject(hdc, hBigFont);

-				DrawText(hdc, wd->time_buff, strlen(wd->time_buff), &br, DT_SINGLELINE | DT_VCENTER | DT_CENTER);

+				DrawText(hdc, wd->time_buff, (int)strlen(wd->time_buff), &br, DT_SINGLELINE | DT_VCENTER | DT_CENTER);

 				SelectObject(hdc, hNormalFont);

 				lr.top = (r.bottom - r.top) * 3 / 4;

-				DrawText(hdc, wd->date_buff, strlen(wd->date_buff), &lr, DT_SINGLELINE | DT_VCENTER | DT_CENTER);			

+				DrawText(hdc, wd->date_buff, (int)strlen(wd->date_buff), &lr, DT_SINGLELINE | DT_VCENTER | DT_CENTER);			

 				SelectObject(hdc, oldFont);

 			}

 

diff --git a/worldtime_protocol/worldtimeproto.cpp b/worldtime_protocol/worldtimeproto.cpp
index 6a1cad4..b185b9c 100644
--- a/worldtime_protocol/worldtimeproto.cpp
+++ b/worldtime_protocol/worldtimeproto.cpp
@@ -10,7 +10,7 @@ HANDLE hMenuEdit;
 int previousMode,

 	mcStatus = ID_STATUS_OFFLINE;

 

-UINT id_timer = 0;

+UINT_PTR id_timer = 0;

 

 // protocol related services

 INT_PTR GetCaps(WPARAM wParam,LPARAM lParam)

@@ -386,7 +386,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
 

 		update.szComponentName = pluginInfo.shortName;

 		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);

-		update.cpbVersion = strlen((char *)update.pbVersion);

+		update.cpbVersion = (int)strlen((char *)update.pbVersion);

 

 		update.szUpdateURL = UPDATER_AUTOREGISTER;

 		

@@ -398,7 +398,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
 		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_worldtimeproto.html";

 		update.pbBetaVersionPrefix = (BYTE *)"World Time Protocol version ";

 		

-		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

+		update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);

 

 		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

 	}

diff --git a/worldtime_protocol/worldtimeproto.dsp b/worldtime_protocol/worldtimeproto.dsp
index 3355c6c..d30ca7f 100644
--- a/worldtime_protocol/worldtimeproto.dsp
+++ b/worldtime_protocol/worldtimeproto.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 1

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

+# ADD CPP /nologo /MD /W3 /GX- /O1 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /FR /FD /c

+# SUBTRACT CPP /YX /Yc /Yu

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

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

 # ADD BASE RSC /l 0xc09 /d "NDEBUG"

@@ -53,8 +54,8 @@ BSC32=bscmake.exe
 # 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 wsock32.lib user32.lib gdi32.lib ws2_32.lib shell32.lib comdlg32.lib Advapi32.lib /nologo /base:"0x22080000" /dll /machine:I386 /out:"../../bin/release/plugins/worldtimeproto.dll"

-# SUBTRACT LINK32 /nodefaultlib

+# ADD LINK32 wsock32.lib user32.lib gdi32.lib ws2_32.lib shell32.lib comdlg32.lib Advapi32.lib /nologo /base:"0x22080000" /dll /machine:I386 /out:"../../bin/release/plugins/worldtimeproto.dll" /filealign:512

+# SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "worldtimeproto - Win32 Debug"

 

@@ -70,7 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 1

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WORLDTIMEPROTO_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c

+# SUBTRACT CPP /YX /Yc /Yu

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

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

 # ADD BASE RSC /l 0xc09 /d "_DEBUG"

@@ -101,11 +103,6 @@ SOURCE=.\resource.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\StdAfx.cpp

-# ADD CPP /Yc"stdafx.h"

-# End Source File

-# Begin Source File

-

 SOURCE=.\time_convert.cpp

 # End Source File

 # Begin Source File