rrrrrrrr

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

8 files changed, 13 insertions, 14 deletions

diff --git a/protocols/Xfire/src/iniupdater.cpp b/protocols/Xfire/src/iniupdater.cpp
index 08f5e85113..4ccf320b9b 100644
--- a/protocols/Xfire/src/iniupdater.cpp
+++ b/protocols/Xfire/src/iniupdater.cpp
@@ -9,7 +9,7 @@
 extern HANDLE XFireWorkingFolder;

 extern HANDLE XFireIconFolder;

 

-LRESULT CALLBACK DlgUpdateDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgUpdateDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 5219183de2..c1cb8b7f61 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1125,8 +1125,7 @@ extern "C" __declspec(dllexport) int  Load(void)
 	HookEvent(ME_OPT_INITIALISE, OptInit);

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnSystemModulesLoaded);

 

-	PROTOCOLDESCRIPTOR pd = {0};

-	pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;

+	PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };

 	pd.szName = protocolname;

 	pd.type = PROTOTYPE_PROTOCOL;

 	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);

diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index 3c37a72bed..c809a89856 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -114,7 +114,7 @@ static int enumSettingsProc(const char *szSetting,LPARAM lParam)
 }

 

 //damit die änderungen sofort sichtbar sind

-static LRESULT CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	char inipath[XFIRE_MAX_STATIC_STRING_LEN]="";

 	static BOOL inifound = FALSE;

@@ -346,7 +346,7 @@ static LRESULT CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-static LRESULT CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	char inipath[XFIRE_MAX_STATIC_STRING_LEN]="";

 	static BOOL inifound = FALSE;

@@ -572,7 +572,7 @@ static LRESULT CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-static LRESULT CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	char inipath[XFIRE_MAX_STATIC_STRING_LEN]="";

 	static BOOL inifound = FALSE;

@@ -679,7 +679,7 @@ static LRESULT CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-static LRESULT CALLBACK DlgProcOpts5(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts5(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	DBVARIANT dbv;

 

@@ -756,7 +756,7 @@ static LRESULT CALLBACK DlgProcOpts5(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-static LRESULT CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

@@ -1099,7 +1099,7 @@ static LRESULT CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-static LRESULT CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/protocols/Xfire/src/passworddialog.cpp b/protocols/Xfire/src/passworddialog.cpp
index 041b10c584..2754d91e94 100644
--- a/protocols/Xfire/src/passworddialog.cpp
+++ b/protocols/Xfire/src/passworddialog.cpp
@@ -6,7 +6,7 @@
 static char nick[255];

 BOOL usenick=FALSE;

 

-LRESULT CALLBACK DlgPWProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgPWProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	static char* pw[255];

 	switch (msg)

diff --git a/protocols/Xfire/src/pwd_dlg.cpp b/protocols/Xfire/src/pwd_dlg.cpp
index ee0ce90be0..97857e2aa5 100644
--- a/protocols/Xfire/src/pwd_dlg.cpp
+++ b/protocols/Xfire/src/pwd_dlg.cpp
@@ -5,7 +5,7 @@
 

 char password[256]="";

 

-LRESULT CALLBACK DlgPwProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgPwProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp
index 6dbcb061ea..8e9517a036 100644
--- a/protocols/Xfire/src/searching4games.cpp
+++ b/protocols/Xfire/src/searching4games.cpp
@@ -96,7 +96,7 @@ BOOL CheckPath(char*ppath,char*pathwildcard=NULL)
 	return FALSE;

 }

 

-LRESULT CALLBACK DlgSearchDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgSearchDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/protocols/Xfire/src/setnickname.cpp b/protocols/Xfire/src/setnickname.cpp
index f2224ec59a..f2e1863970 100644
--- a/protocols/Xfire/src/setnickname.cpp
+++ b/protocols/Xfire/src/setnickname.cpp
@@ -3,7 +3,7 @@
 #include "stdafx.h"

 #include "setnickname.h"

 

-LRESULT CALLBACK DlgNickProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgNickProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp
index 7de0221133..13b7548d75 100644
--- a/protocols/Xfire/src/userdetails.cpp
+++ b/protocols/Xfire/src/userdetails.cpp
@@ -179,7 +179,7 @@ void setGameInfo(HWND listbox,char *mbuf)
 	}

 }

 

-static LRESULT CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	static char path[XFIRE_MAX_STATIC_STRING_LEN]="";

 	static WCHAR wpath[256];