x64 compilation for Country flags.h

changed project settings for Updater to unicode

git-svn-id: http://svn.miranda-ng.org/main/trunk@439 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 13 insertions, 13 deletions

diff --git a/plugins/CountryFlags/countrylistext.c b/plugins/CountryFlags/countrylistext.c
index 6f234c7533..95f692b30b 100644
--- a/plugins/CountryFlags/countrylistext.c
+++ b/plugins/CountryFlags/countrylistext.c
@@ -273,7 +273,7 @@ static struct CountryListEntry countries[]={
 	{263 ,"Zimbabwe"},

 };

 

-static int ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)

 {

 	int i;

 	UNREFERENCED_PARAMETER(lParam);

@@ -283,7 +283,7 @@ static int ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)
 	return (int)(char*)NULL;

 }

 

-static int ServiceGetCountryList(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceGetCountryList(WPARAM wParam,LPARAM lParam)

 {

 	if ((int*)wParam==NULL || (void*)lParam==NULL) return 1;

 	*(int*)wParam=SIZEOF(countries);

diff --git a/plugins/CountryFlags/extraimg.c b/plugins/CountryFlags/extraimg.c
index 1fec5f0b5f..8484da05d1 100644
--- a/plugins/CountryFlags/extraimg.c
+++ b/plugins/CountryFlags/extraimg.c
@@ -35,7 +35,7 @@ static HANDLE hHookModulesLoaded;
 

 /************************* Services *******************************/

 

-static int ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)

 {

 	int countryNumber=0xFFFF;

 	char *pszProto;

@@ -276,7 +276,7 @@ static int StatusIconsChanged(WPARAM wParam,LPARAM lParam)
 

 #define M_ENABLE_SUBCTLS  (WM_APP+1)

 

-static int CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)

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

 {

 	UNREFERENCED_PARAMETER(wParam);

 	switch(msg) {

diff --git a/plugins/CountryFlags/flags.h b/plugins/CountryFlags/flags.h
index 79ec67d426..c91876bd97 100644
--- a/plugins/CountryFlags/flags.h
+++ b/plugins/CountryFlags/flags.h
@@ -69,7 +69,7 @@ void InitIcons(void);
 void UninitIcons(void);

 

 /* ip2country.c */

-int ServiceIpToCountry(WPARAM wParam,LPARAM lParam);

+INT_PTR ServiceIpToCountry(WPARAM wParam,LPARAM lParam);

 void InitIpToCountry(void);

 void UninitIpToCountry(void);

 

diff --git a/plugins/CountryFlags/icons.c b/plugins/CountryFlags/icons.c
index 4558fbd5ca..46bf2a9391 100644
--- a/plugins/CountryFlags/icons.c
+++ b/plugins/CountryFlags/icons.c
@@ -165,7 +165,7 @@ int FASTCALL CountryNumberToIndex(int countryNumber)
 

 /************************* Services *******************************/

 

-static int ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam)

 {

 	/* return handle */

 	if ((BOOL)lParam) {

@@ -176,7 +176,7 @@ static int ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam)
 	return (int)LoadFlagIcon(wParam);

 }

 

-static int ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)

+static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)

 {

 	HICON hUpperIcon,hLowerIcon;

 	ICONINFO icoi;

diff --git a/plugins/CountryFlags/ip2country.c b/plugins/CountryFlags/ip2country.c
index b892fabb83..12f3406a11 100644
--- a/plugins/CountryFlags/ip2country.c
+++ b/plugins/CountryFlags/ip2country.c
@@ -98,7 +98,7 @@ static void LeaveRecordCache(void)
 /************************* Services *******************************/

 

 

-int ServiceIpToCountry(WPARAM wParam,LPARAM lParam)

+INT_PTR ServiceIpToCountry(WPARAM wParam,LPARAM lParam)

 {

 	BYTE *data;

 	DWORD dwFrom,dwTo;

diff --git a/plugins/CountryFlags/utils.c b/plugins/CountryFlags/utils.c
index 0614927a1a..b55e52e5cf 100644
--- a/plugins/CountryFlags/utils.c
+++ b/plugins/CountryFlags/utils.c
@@ -36,7 +36,7 @@ static struct BufferedCallData *callList;
 static int nCallListCount;

 

 // always gets called in main message loop

-static void CALLBACK BufferedProcTimer(HWND hwnd,UINT msg,UINT idTimer,DWORD currentTick)

+static void CALLBACK BufferedProcTimer(HWND hwnd,UINT msg,UINT_PTR idTimer,DWORD currentTick)

 {

 	int i;

 	struct BufferedCallData *buf;

diff --git a/plugins/Updater/updater_10.vcxproj b/plugins/Updater/updater_10.vcxproj
index 2a827c8544..dda0236ddc 100644
--- a/plugins/Updater/updater_10.vcxproj
+++ b/plugins/Updater/updater_10.vcxproj
@@ -25,21 +25,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">