HCONTACT, part 3

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

4 files changed, 10 insertions, 10 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 562468c5e9..2c210c57a7 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1035,7 +1035,7 @@ retry:
 				{

 					struct gg_dcc7 *dcc7 = e->event.dcc7_new;

 					debugLogA("mainthread() (%x): Incoming direct connection.", this);

-					dcc7->contact = getcontact(dcc7->peer_uin, 0, 0, NULL);

+					dcc7->contact = (void*)getcontact(dcc7->peer_uin, 0, 0, NULL);

 

 					// Check if user is on the list and if it is my uin

 					if (!dcc7->contact || getDword(GG_KEY_UIN, -1) != dcc7->uin) {

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index 38a38bf22c..14d4f6bd62 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -381,7 +381,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							// Add file recv request

 							{

 								// Make new ggtransfer struct

-								local_dcc->contact = getcontact(local_dcc->peer_uin, 0, 0, NULL);

+								local_dcc->contact = (void*)getcontact(local_dcc->peer_uin, 0, 0, NULL);

 								TCHAR* filenameT = mir_utf8decodeT((char*)dcc->file_info.filename);

 

 								PROTORECVFILET pre = {0};

@@ -952,7 +952,7 @@ HANDLE GGPROTO::SendFile(HCONTACT hContact, const PROTOCHAR* szDescription, PROT
 		list_add(&watches, dcc7, 0);

 

 		// Store handle

-		dcc7->contact = hContact;

+		dcc7->contact = (void*)hContact;

 		dcc7->folder = _strdup(filename);

 		dcc7->tick = 0;

 		// Make folder name

@@ -1006,7 +1006,7 @@ HANDLE GGPROTO::SendFile(HCONTACT hContact, const PROTOCHAR* szDescription, PROT
 	if (dcc->fd != -1) list_add(&watches, dcc, 0);

 

 	// Store handle

-	dcc->contact = hContact;

+	dcc->contact = (void*)hContact;

 	dcc->folder = _strdup(filename);

 	dcc->tick = 0;

 	// Make folder name

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index b3ad11201c..1d8e211195 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -206,7 +206,7 @@ int GGPROTO::GetInfo(HCONTACT hContact, int infoType)
 #ifdef DEBUGMODE

 			debugLogA("GetInfo(): ForkThread 6 GGPROTO::cmdgetinfothread");

 #endif

-			ForkThread(&GGPROTO::cmdgetinfothread, hContact);

+			ForkThread(&GGPROTO::cmdgetinfothread, (void*)hContact);

 			return 1;

 		}

 

@@ -224,7 +224,7 @@ int GGPROTO::GetInfo(HCONTACT hContact, int infoType)
 #ifdef DEBUGMODE

 				debugLogA("GetInfo(): ForkThread 7 GGPROTO::cmdgetinfothread");

 #endif

-				ForkThread(&GGPROTO::cmdgetinfothread, hContact);

+				ForkThread(&GGPROTO::cmdgetinfothread, (void*)hContact);

 				return 1;

 			}

 			gg_LeaveCriticalSection(&sess_mutex, "GetInfo", 48, 2, "sess_mutex", 1);

@@ -238,7 +238,7 @@ int GGPROTO::GetInfo(HCONTACT hContact, int infoType)
 #ifdef DEBUGMODE

 			debugLogA("GetInfo(): ForkThread 8 GGPROTO::cmdgetinfothread");

 #endif

-			ForkThread(&GGPROTO::cmdgetinfothread, hContact);

+			ForkThread(&GGPROTO::cmdgetinfothread, (void*)hContact);

 			return 1;

 		}

 

@@ -255,7 +255,7 @@ int GGPROTO::GetInfo(HCONTACT hContact, int infoType)
 #ifdef DEBUGMODE

 				debugLogA("GetInfo(): ForkThread 9 GGPROTO::cmdgetinfothread");

 #endif

-				ForkThread(&GGPROTO::cmdgetinfothread, hContact);

+				ForkThread(&GGPROTO::cmdgetinfothread, (void*)hContact);

 				return 1;

 			}

 			gg_LeaveCriticalSection(&sess_mutex, "GetInfo", 49, 2, "sess_mutex", 1);

@@ -686,7 +686,7 @@ HANDLE GGPROTO::GetAwayMsg(HCONTACT hContact)
 #ifdef DEBUGMODE

 	debugLogA("GetAwayMsg(): ForkThread 17 GGPROTO::getawaymsgthread");

 #endif

-	ForkThread(&GGPROTO::getawaymsgthread, hContact);

+	ForkThread(&GGPROTO::getawaymsgthread, (void*)hContact);

 	return (HANDLE)1;

 }

 

diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp
index 8816eae8c3..6d4749f585 100644
--- a/protocols/Gadu-Gadu/src/oauth.cpp
+++ b/protocols/Gadu-Gadu/src/oauth.cpp
@@ -225,7 +225,7 @@ char *oauth_generate_nonce()
 	mir_snprintf(timestamp, sizeof(timestamp), "%ld", time(NULL)); 

 	CallService(MS_UTILS_GETRANDOM, (WPARAM)sizeof(randnum), (LPARAM)randnum);

 

-	int strSizeB = strlen(timestamp) + sizeof(randnum);

+	int strSizeB = int(strlen(timestamp) + sizeof(randnum));

 	ptrA str((char *)mir_calloc(strSizeB + 1));

 	strcpy(str, timestamp);

 	strncat(str, randnum, sizeof(randnum));