adaptation

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

5 files changed, 12 insertions, 12 deletions

diff --git a/plugins/!NotAdopted/Skype/debug.c b/plugins/!NotAdopted/Skype/debug.c
index a5d7067e8e..879f53b694 100644..100755
--- a/plugins/!NotAdopted/Skype/debug.c
+++ b/plugins/!NotAdopted/Skype/debug.c
@@ -45,7 +45,7 @@ void do_log(const char *pszFormat, ...) {
 	char *ct, *pNewBuf;

 	va_list ap;

 	time_t lt;

-	int iLen;

+	INT64 iLen;

 

 	if (!m_szLogBuf || !m_fpLogFile) return;

 	EnterCriticalSection(&m_WriteFileMutex);

diff --git a/plugins/!NotAdopted/Skype/skype.c b/plugins/!NotAdopted/Skype/skype.c
index d8c84f7342..1210b503c4 100755
--- a/plugins/!NotAdopted/Skype/skype.c
+++ b/plugins/!NotAdopted/Skype/skype.c
@@ -2464,7 +2464,7 @@ INT_PTR SkypeSetStatus(WPARAM wParam, LPARAM lParam)
    return iRet;

 }

 

-int __stdcall SendBroadcast( HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam )

+INT64 __stdcall SendBroadcast( HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam )

 {

 	ACKDATA ack = {0};

 	ack.cbSize = sizeof( ACKDATA );

diff --git a/plugins/!NotAdopted/Skype/skypeapi.c b/plugins/!NotAdopted/Skype/skypeapi.c
index c6b0cef91a..1b2b81e10d 100755
--- a/plugins/!NotAdopted/Skype/skypeapi.c
+++ b/plugins/!NotAdopted/Skype/skypeapi.c
@@ -413,7 +413,7 @@ char *SkypeRcv(char *what, DWORD maxwait) {
 char *SkypeRcvMsg(char *what, time_t st, HANDLE hContact, DWORD maxwait) {

     char *msg, msgid[32]={0}, *pMsg, *pCurMsg;

 	struct MsgQueue *ptr;

-	int iLenWhat = strlen(what);

+	INT64 iLenWhat = strlen(what);

 	DWORD dwWaitStat;

 	BOOL bIsError, bProcess;

 

@@ -929,7 +929,7 @@ INT_PTR SkypeOutCall(WPARAM wParam, LPARAM lParam) {
 		res=SkypeSend("SET %s STATUS FINISHED", dbv.pszVal);

 		forkthread(( pThreadFunc )SkypeOutCallErrorCheck, 0, _strdup(dbv.pszVal));

 		DBFreeVariant(&dbv);

-	} else if (!CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DIAL), NULL, DialDlgProc, (LPARAM)wParam)) return -1;

+	} else if (!CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DIAL), NULL, (DLGPROC)DialDlgProc, (LPARAM)wParam)) return -1;

 	return res;

 }

 

@@ -965,7 +965,7 @@ INT_PTR SkypeHoldCall(WPARAM wParam, LPARAM lParam) {
 INT_PTR SkypeAnswerCall(WPARAM wParam, LPARAM lParam) {

 

 	LOG(("SkypeAnswerCall started"));

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CALLSTAT), NULL, CallstatDlgProc, (LPARAM)((CLISTEVENT*)lParam)->hContact);

+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CALLSTAT), NULL, (DLGPROC)CallstatDlgProc, (LPARAM)((CLISTEVENT*)lParam)->hContact);

 	return 0;

 }

 /* SkypeSetNick

@@ -1337,9 +1337,9 @@ void TranslateMirandaRelativePathToAbsolute(LPCSTR cszPath, LPSTR szAbsolutePath
 	TRACEA(szAbsolutePath);

 }

 

-static int my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFORMATION *pi)

+static INT64 my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFORMATION *pi)

 {

-	int i, iLen=0;

+	INT64 i, iLen=0;

 	char *CommandLine;

 	STARTUPINFOA si={0};

 	BOOL bRet;

@@ -1356,7 +1356,7 @@ static int my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFOR
 	bRet = CreateProcessA( cmdname,CommandLine,NULL,NULL,FALSE,0,NULL,NULL,&si,pi);

 	free(CommandLine);

 	if (!bRet) return -1;

-	return (DWORD)pi->hProcess;

+	return (INT64)pi->hProcess;

 }

 

 static int _ConnectToSkypeAPI(char *path, int iStart) {

@@ -1529,7 +1529,7 @@ static int _ConnectToSkypeAPI(char *path, int iStart) {
 							case 4:

 								if(!DBGetContactSettingString(NULL,SKYPE_PROTONAME,"datapath",&dbv)) 

 								{

-									int paramSize;

+									INT64 paramSize;

 									TranslateMirandaRelativePathToAbsolute(dbv.pszVal, szAbsolutePath, TRUE);

 									paramSize = strlen(SkypeOptions[i]) + strlen(szAbsolutePath);

 									pFree = args[j] = malloc(paramSize + 1);

diff --git a/plugins/!NotAdopted/Skype/skypesvc.c b/plugins/!NotAdopted/Skype/skypesvc.c
index c6d02e6d3a..bada953bbf 100644..100755
--- a/plugins/!NotAdopted/Skype/skypesvc.c
+++ b/plugins/!NotAdopted/Skype/skypesvc.c
@@ -173,9 +173,9 @@ INT_PTR SkypeLoadIcon(WPARAM wParam,LPARAM lParam)
 

 	switch(wParam&0xFFFF) {

 		case PLI_PROTOCOL: id=IDI_SKYPE; break; // IDI_MAIN is the main icon for the protocol

-		default: return (int)(HICON)NULL;	

+		default: return NULL;	

 	}

-	return (int)LoadImage(hInst,MAKEINTRESOURCE(id),IMAGE_ICON,GetSystemMetrics(wParam&PLIF_SMALL?SM_CXSMICON:SM_CXICON),GetSystemMetrics(wParam&PLIF_SMALL?SM_CYSMICON:SM_CYICON),0);

+	return (INT_PTR)LoadImage(hInst,MAKEINTRESOURCE(id),IMAGE_ICON,GetSystemMetrics(wParam&PLIF_SMALL?SM_CXSMICON:SM_CXICON),GetSystemMetrics(wParam&PLIF_SMALL?SM_CYSMICON:SM_CYICON),0);

 }

 

 INT_PTR SkypeGetAvatar(WPARAM wParam,LPARAM lParam)

diff --git a/plugins/!NotAdopted/Skype/utf8.c b/plugins/!NotAdopted/Skype/utf8.c
index 8ae746e871..063e973444 100644..100755
--- a/plugins/!NotAdopted/Skype/utf8.c
+++ b/plugins/!NotAdopted/Skype/utf8.c
@@ -131,7 +131,7 @@ wchar_t *make_unicode_string(const unsigned char *utf8)
 int utf8_encode(const char *from, char **to)

 {

    wchar_t *unicode;

-   int wchars, err;

+   INT64 wchars, err;

 

    wchars = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, from, strlen(from), NULL, 0);