strong typization - better typization

3 files changed, 12 insertions, 11 deletions

diff --git a/plugins/Weather/src/stdafx.h b/plugins/Weather/src/stdafx.h
index 73a3eb9a60..677cca67d1 100644
--- a/plugins/Weather/src/stdafx.h
+++ b/plugins/Weather/src/stdafx.h
@@ -357,7 +357,8 @@ extern unsigned status, old_status;
 

 extern MWindowList hDataWindowList, hWindowList;

 

-extern HANDLE hNetlibUser, hNetlibHttp, hHookWeatherUpdated, hHookWeatherError, hTBButton, hUpdateMutex;

+extern HNETLIBUSER hNetlibUser;

+extern HANDLE hNetlibHttp, hHookWeatherUpdated, hHookWeatherError, hTBButton, hUpdateMutex;

 extern UINT_PTR timerId;

 

 extern HGENMENU hMwinMenu;

diff --git a/plugins/Weather/src/weather_http.cpp b/plugins/Weather/src/weather_http.cpp
index 82b9707d80..5fdf2cb22f 100644
--- a/plugins/Weather/src/weather_http.cpp
+++ b/plugins/Weather/src/weather_http.cpp
@@ -25,7 +25,8 @@ from the web using netlib
 

 #include "stdafx.h"

 

-HANDLE hNetlibUser, hNetlibHttp;

+HNETLIBUSER hNetlibUser;

+HANDLE hNetlibHttp;

 

 static int findHeader(const NETLIBHTTPREQUEST *nlhrReply, const char *hdr)

 {

@@ -152,12 +153,11 @@ int InternetDownloadFile(char *szUrl, char *cookie, char *userAgent, wchar_t **s
 // initialize netlib support for weather protocol

 void NetlibInit(void)

 {

-	NETLIBUSER nlu = { 0 };

-	nlu.cbSize = sizeof(nlu);

+	NETLIBUSER nlu = {};

 	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;

 	nlu.szSettingsModule = WEATHERPROTONAME;

 	nlu.ptszDescriptiveName = TranslateT("Weather HTTP connections");

-	hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

+	hNetlibUser = Netlib_RegisterUser(&nlu);

 }

 

 void NetlibHttpDisconnect(void)

diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index 578bec0a8d..5331c2be74 100644
--- a/plugins/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
@@ -44,10 +44,10 @@ int UpdateWeather(MCONTACT hContact)
 	dbv.pszVal = "";

 

 	// log to netlib log for debug purpose

-	Netlib_LogfT(hNetlibUser, L"************************************************************************");

+	Netlib_LogfW(hNetlibUser, L"************************************************************************");

 	int dbres = db_get_ws(hContact, WEATHERPROTONAME, "Nick", &dbv);

 

-	Netlib_LogfT(hNetlibUser, L"<-- Start update for station -->");

+	Netlib_LogfW(hNetlibUser, L"<-- Start update for station -->");

 

 	// download the info and parse it

 	// result are stored in database

@@ -65,8 +65,8 @@ int UpdateWeather(MCONTACT hContact)
 			mir_free(tszError);

 		}

 		// log to netlib

-		Netlib_LogfT(hNetlibUser, L"Error! Update cannot continue... Start to free memory");

-		Netlib_LogfT(hNetlibUser, L"<-- Error occurs while updating station: %s -->", dbv.ptszVal);

+		Netlib_LogfW(hNetlibUser, L"Error! Update cannot continue... Start to free memory");

+		Netlib_LogfW(hNetlibUser, L"<-- Error occurs while updating station: %s -->", dbv.ptszVal);

 		if (!dbres) db_free(&dbv);

 		return 1;

 	}

@@ -203,8 +203,8 @@ int UpdateWeather(MCONTACT hContact)
 		NotifyEventHooks(hHookWeatherUpdated, hContact, (LPARAM)Ch);

 	}

 

-	Netlib_LogfT(hNetlibUser, L"Update Completed - Start to free memory");

-	Netlib_LogfT(hNetlibUser, L"<-- Update successful for station -->");

+	Netlib_LogfW(hNetlibUser, L"Update Completed - Start to free memory");

+	Netlib_LogfW(hNetlibUser, L"<-- Update successful for station -->");

 

 	// Update frame data

 	UpdateMwinData(hContact);