strong typization - better typization

4 files changed, 6 insertions, 6 deletions

diff --git a/protocols/WhatsApp/src/WASocketConnection.cpp b/protocols/WhatsApp/src/WASocketConnection.cpp
index 03ebf84ea7..78957b21c6 100644
--- a/protocols/WhatsApp/src/WASocketConnection.cpp
+++ b/protocols/WhatsApp/src/WASocketConnection.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"

 #include "WASocketConnection.h"

 

-HANDLE g_hNetlibUser = NULL;

+HNETLIBUSER g_hNetlibUser = NULL;

 

-void WASocketConnection::initNetwork(HANDLE hNetlibUser) throw (WAException)

+void WASocketConnection::initNetwork(HNETLIBUSER hNetlibUser) throw (WAException)

 {

 	g_hNetlibUser = hNetlibUser;

 }

diff --git a/protocols/WhatsApp/src/WASocketConnection.h b/protocols/WhatsApp/src/WASocketConnection.h
index 8770582ce7..23beac6ef2 100644
--- a/protocols/WhatsApp/src/WASocketConnection.h
+++ b/protocols/WhatsApp/src/WASocketConnection.h
@@ -28,7 +28,7 @@ public:
 	

 	virtual void log(const char *prefix, const char *str);

 

-	static void initNetwork(HANDLE hNetlibUser) throw (WAException);

+	static void initNetwork(HNETLIBUSER hNetlibUser) throw (WAException);

 	static void quitNetwork();

 };

 

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 05954b7809..69b91de842 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -35,11 +35,11 @@ WhatsAppProto::WhatsAppProto(const char *proto_name, const wchar_t *username)
 	wchar_t descr[512];

 	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);

 

-	NETLIBUSER nlu = { sizeof(nlu) };

+	NETLIBUSER nlu = {};

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

 	nlu.szSettingsModule = m_szModuleName;

 	nlu.ptszDescriptiveName = descr;

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

+	m_hNetlibUser = Netlib_RegisterUser(&nlu);

 	if (m_hNetlibUser == NULL) {

 		wchar_t error[200];

 		mir_snwprintf(error, TranslateT("Unable to initialize Netlib for %s."), m_tszUserName);

diff --git a/protocols/WhatsApp/src/stdafx.h b/protocols/WhatsApp/src/stdafx.h
index 6fd6adbc8b..0472849de9 100644
--- a/protocols/WhatsApp/src/stdafx.h
+++ b/protocols/WhatsApp/src/stdafx.h
@@ -88,4 +88,4 @@ Copyright © 2013-14 Uli Hecht
 extern HINSTANCE g_hInstance;

 extern std::string g_strUserAgent;

 extern DWORD g_mirandaVersion;

-extern HANDLE g_hNetlibUser;

+extern HNETLIBUSER g_hNetlibUser;