From c3e5899634db828b42aca5ebd4ba6a9d4eb16da0 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 29 Jul 2012 21:39:22 +0000 Subject: x64 signature fix git-svn-id: http://svn.miranda-ng.org/main/trunk@1259 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/YAMN/browser/badconnect.cpp | 4 ++-- protocols/YAMN/browser/mailbrowser.cpp | 8 ++++---- protocols/YAMN/proto/pop3/pop3opt.cpp | 10 +++++----- protocols/YAMN/proto/pop3/pop3opt.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/protocols/YAMN/browser/badconnect.cpp b/protocols/YAMN/browser/badconnect.cpp index cb3de50c5d..38d73edc2f 100644 --- a/protocols/YAMN/browser/badconnect.cpp +++ b/protocols/YAMN/browser/badconnect.cpp @@ -89,7 +89,7 @@ LRESULT CALLBACK BadConnectPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPa return DefWindowProc(hWnd,msg,wParam,lParam); } -LRESULT CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) { switch(msg) { @@ -255,7 +255,7 @@ DWORD WINAPI BadConnection(LPVOID Param) __try { - hBadConnect=CreateDialogParam(YAMNVar.hInst,MAKEINTRESOURCE(IDD_DLGBADCONNECT),NULL,(DLGPROC)DlgProcYAMNBadConnection,(LPARAM)&MyParam); + hBadConnect=CreateDialogParam(YAMNVar.hInst,MAKEINTRESOURCE(IDD_DLGBADCONNECT),NULL,DlgProcYAMNBadConnection,(LPARAM)&MyParam); SendMessage(hBadConnect,WM_SETICON,ICON_BIG,(LPARAM)g_LoadIconEx(3)); SendMessage(hBadConnect,WM_SETICON,ICON_SMALL,(LPARAM)g_LoadIconEx(3)); diff --git a/protocols/YAMN/browser/mailbrowser.cpp b/protocols/YAMN/browser/mailbrowser.cpp index 02766e983c..67cf311919 100644 --- a/protocols/YAMN/browser/mailbrowser.cpp +++ b/protocols/YAMN/browser/mailbrowser.cpp @@ -149,7 +149,7 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam); //Dialog callback procedure for mail browser -BOOL CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam); +INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam); //MailBrowser thread function creates window if needed, tray icon and plays sound DWORD WINAPI MailBrowser(LPVOID Param); @@ -1669,7 +1669,7 @@ DWORD WINAPI ShowEmailThread(LPVOID Param){ } } else { CREADTEVIEWMESSAGEWINDOW: - MyParam.mail->MsgWindow = CreateDialogParamW(YAMNVar.hInst,MAKEINTRESOURCEW(IDD_DLGSHOWMESSAGE),NULL,(DLGPROC)DlgProcYAMNShowMessage,(LPARAM)&MyParam); + MyParam.mail->MsgWindow = CreateDialogParamW(YAMNVar.hInst,MAKEINTRESOURCEW(IDD_DLGSHOWMESSAGE),NULL,DlgProcYAMNShowMessage,(LPARAM)&MyParam); WindowList_Add(YAMNVar.MessageWnds,MyParam.mail->MsgWindow,NULL); MSG msg; while(GetMessage(&msg,NULL,0,0)) { @@ -1688,7 +1688,7 @@ CREADTEVIEWMESSAGEWINDOW: return 1; } -BOOL CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) { switch(msg) { @@ -2538,7 +2538,7 @@ DWORD WINAPI MailBrowser(LPVOID Param) WndFound=TRUE; if ((hMailBrowser==NULL) && ((MyParam.nflags & YAMN_ACC_MSG) || (MyParam.nflags & YAMN_ACC_ICO) || (MyParam.nnflags & YAMN_ACC_MSG))) { - hMailBrowser=CreateDialogParamW(YAMNVar.hInst,MAKEINTRESOURCEW(IDD_DLGVIEWMESSAGES),NULL,(DLGPROC)DlgProcYAMNMailBrowser,(LPARAM)&MyParam); + hMailBrowser=CreateDialogParamW(YAMNVar.hInst,MAKEINTRESOURCEW(IDD_DLGVIEWMESSAGES),NULL,DlgProcYAMNMailBrowser,(LPARAM)&MyParam); SendMessageW(hMailBrowser,WM_SETICON,(WPARAM)ICON_BIG,(LPARAM)g_LoadIconEx(2,true)); SendMessageW(hMailBrowser,WM_SETICON,(WPARAM)ICON_SMALL,(LPARAM)g_LoadIconEx(2)); MoveWindow(hMailBrowser,PosX,PosY,SizeX,SizeY,TRUE); diff --git a/protocols/YAMN/proto/pop3/pop3opt.cpp b/protocols/YAMN/proto/pop3/pop3opt.cpp index ded7a63c80..9d72d4a174 100644 --- a/protocols/YAMN/proto/pop3/pop3opt.cpp +++ b/protocols/YAMN/proto/pop3/pop3opt.cpp @@ -580,7 +580,7 @@ BOOL DlgSetItemTextW(HWND hDlg,WPARAM wParam,const WCHAR* str) return TRUE; } -BOOL CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) { static HPOP3ACCOUNT ActualAccount; switch(msg) @@ -849,7 +849,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara break; case IDC_BTNSTATUS: - DialogBoxParamW(pYAMNVar->hInst,MAKEINTRESOURCEW(IDD_CHOOSESTATUSMODES),hDlg,(DLGPROC)DlgProcPOP3AccStatusOpt,(LPARAM)NULL); + DialogBoxParamW(pYAMNVar->hInst,MAKEINTRESOURCEW(IDD_CHOOSESTATUSMODES),hDlg,DlgProcPOP3AccStatusOpt,NULL); break; case IDC_BTNADD: @@ -1379,9 +1379,9 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa TesterN.colorBack=GetSysColor(COLOR_BTNFACE); TesterN.colorText=GetSysColor(COLOR_WINDOWTEXT); } - Tester.PluginWindowProc=(WNDPROC)NULL; - TesterF.PluginWindowProc=(WNDPROC)NULL; - TesterN.PluginWindowProc=(WNDPROC)NULL; + Tester.PluginWindowProc=NULL; + TesterF.PluginWindowProc=NULL; + TesterN.PluginWindowProc=NULL; Tester.PluginData=NULL; TesterF.PluginData=NULL; TesterN.PluginData=NULL; diff --git a/protocols/YAMN/proto/pop3/pop3opt.h b/protocols/YAMN/proto/pop3/pop3opt.h index f3e1afa021..6a678284fa 100644 --- a/protocols/YAMN/proto/pop3/pop3opt.h +++ b/protocols/YAMN/proto/pop3/pop3opt.h @@ -18,7 +18,7 @@ BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam); INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); //Options dialog procedure -BOOL CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); //Options dialog procedure INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); -- cgit v1.2.3