final switch to the typed icolib api

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

5 files changed, 14 insertions, 14 deletions

diff --git a/protocols/IcqOscarJ/src/iconlib.cpp b/protocols/IcqOscarJ/src/iconlib.cpp
index 7c93bae17a..1f08c42646 100644
--- a/protocols/IcqOscarJ/src/iconlib.cpp
+++ b/protocols/IcqOscarJ/src/iconlib.cpp
@@ -80,13 +80,13 @@ HANDLE IcqIconHandle_s::Handle()
 HICON IcqIconHandle_s::GetIcon(bool big)

 {

 	if (this)

-		return (HICON)CallService(MS_SKIN2_GETICONBYHANDLE, big, (LPARAM)hIcoLib);

+		return Skin_GetIconByHandle(hIcoLib, big);

 

 	return NULL;

 }

 

 void IcqIconHandle_s::ReleaseIcon(bool big)

 {

-	CallService(big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)szName);

+	Skin_ReleaseIcon(szName, big);

 }

 

diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 6e61f2bc0d..c7027a54ee 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -608,7 +608,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 				NetLog_Server("%s has removed Avatar.", strUID(dwUIN, szUID));

 

 				deleteSetting(hContact, "AvatarHash");

-				BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, (LPARAM)NULL);

+				BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);

 			}

 #ifdef _DEBUG

 			else

@@ -634,7 +634,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 					NetLog_Hash(this, "new", pAvatarHash, cbAvatarHash);

 #endif

 					setSettingBlob(hContact, "AvatarHash", pAvatarHash, cbAvatarHash);

-					BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, (LPARAM)NULL);

+					BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);

 				}

 				else

 				{ // the file was lost, request avatar again

@@ -737,7 +737,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 

 			setSettingBlob(hContact, "AvatarHash", pAvatarHash, cbAvatarHash);

 

-			BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, (LPARAM)NULL);

+			BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);

 

 			if (bAutoLoad)

 			{ // auto-load is on, so request the avatar now, otherwise we are done

@@ -759,7 +759,7 @@ void CIcqProto::handleAvatarContactHash(DWORD dwUIN, char *szUID, HANDLE hContac
 			NetLog_Server("%s has removed Avatar.", strUID(dwUIN, szUID));

 

 			deleteSetting(hContact, "AvatarHash");

-			BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, (LPARAM)NULL);

+			BroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);

 		}

 #ifdef _DEBUG

 		else

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 44c1881d14..83dea01ea9 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -413,7 +413,7 @@ static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_UTFCODEPAGE), LPGEN("System default codepage"), 0);

 			EnumSystemCodePagesA(FillCpCombo, CP_INSTALLED);

 			if(sCodePage == 0)

-				SendDlgItemMessage(hwndDlg, IDC_UTFCODEPAGE, CB_SETCURSEL, (WPARAM)0, 0);

+				SendDlgItemMessage(hwndDlg, IDC_UTFCODEPAGE, CB_SETCURSEL, 0, 0);

 			else

 			{

 				for (int i = 0; i < SendDlgItemMessage(hwndDlg, IDC_UTFCODEPAGE, CB_GETCOUNT, 0, 0); i++)

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index b2adc4831c..4afdeae7e4 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -940,12 +940,12 @@ static int GroupReserveIdsEnumProc(const char *szSetting,LPARAM lParam)
 		cgs.szModule = param->szModule;

 		cgs.szSetting = szSetting;

 		cgs.pValue = &dbv;

-		if (CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)NULL,(LPARAM)&cgs))

+		if (CallService(MS_DB_CONTACT_GETSETTINGSTATIC,0,(LPARAM)&cgs))

 		{ // we failed to read setting, try also utf8 - DB bug

 			dbv.type = DBVT_UTF8;

 			dbv.pszVal = val;

 			dbv.cchVal = MAX_PATH;

-			if (CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)NULL,(LPARAM)&cgs))

+			if (CallService(MS_DB_CONTACT_GETSETTINGSTATIC,0,(LPARAM)&cgs))

 				return 0; // we failed also, invalid setting

 		}

 		if (dbv.type != DBVT_ASCIIZ)

@@ -989,7 +989,7 @@ void CIcqProto::LoadServerIDs()
 	dbces.pfnEnumProc = &GroupReserveIdsEnumProc;

 	dbces.szModule = szModule;

 	dbces.lParam = (LPARAM)&param;

-	CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&dbces);

+	CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);

 

 	nGroups = nServerIDListCount - nStart;

 

@@ -1472,7 +1472,7 @@ void CIcqProto::removeGroupPathLinks(WORD wGroupID)
 	dbces.szModule = szModule;

 	dbces.lParam = (LPARAM)pars;

 

-	if (!CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&dbces))

+	if (!CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces))

 	{ // we found some links, remove them

 		char** list = (char**)pars[0];

 		while (list)

@@ -1838,7 +1838,7 @@ char* CIcqProto::getServListUniqueGroupName(const char *szGroupName, int bAlloce
 		dbces.szModule = szModule;

 		dbces.lParam = (LPARAM)pars;

 

-		CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&dbces);

+		CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);

 

 		if (pars[1])

 		{ // the groupname already exists, create another

diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index f5e5c937b3..20285b193f 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -169,7 +169,7 @@ static int GroupEnumIdsEnumProc(const char *szSetting,LPARAM lParam)
 		cgs.szModule=(char*)lParam;

 		cgs.szSetting=szSetting;

 		cgs.pValue=&dbv;

-		if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)NULL,(LPARAM)&cgs))

+		if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,0,(LPARAM)&cgs))

 			return 0; // this converts all string types to DBVT_ASCIIZ

 		if(dbv.type!=DBVT_ASCIIZ)

 		{ // it is not a cached server-group name

@@ -195,7 +195,7 @@ static void enumServerGroups(CIcqProto* ppro)
 	dbces.szModule = szModule;

 	dbces.lParam = (LPARAM)szModule;

 

-	CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&dbces);

+	CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);

 }

 

 static DWORD sendUploadGroup(CIcqProto* ppro, WORD wAction, WORD wGroupId, char* szItemName)