From 15382e81baef152b87cc6623c41dfec4c306a22b Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 7 Sep 2012 15:56:44 +0000 Subject: minor signature fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@1546 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/main.cpp | 8 ++++---- plugins/SecureIM/src/options.cpp | 44 ++++++++++++++++++++-------------------- plugins/SecureIM/src/options.h | 4 ++-- plugins/SecureIM/src/rtfconv.cpp | 4 ++-- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index f867591b3b..841a7764a0 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -96,7 +96,7 @@ extern "C" __declspec(dllexport) int __cdecl Load(void) // check for support TrueColor Icons BOOL bIsComCtl6 = FALSE; - HMODULE hComCtlDll = LoadLibrary("comctl32.dll"); + HMODULE hComCtlDll = LoadLibrary(_T("comctl32.dll")); if ( hComCtlDll ) { typedef HRESULT (CALLBACK *PFNDLLGETVERSION)(DLLVERSIONINFO*); PFNDLLGETVERSION pfnDllGetVersion = (PFNDLLGETVERSION) GetProcAddress(hComCtlDll,"DllGetVersion"); @@ -391,9 +391,9 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) { // hook message transport AddProtoServiceFunction(PSR_MESSAGE, onRecvMsg); - AddProtoServiceFunction(PSS_MESSAGE, (MIRANDASERVICE)onSendMsg); - AddProtoServiceFunction(PSS_MESSAGE"W", (MIRANDASERVICE)onSendMsgW); - AddProtoServiceFunction(PSS_FILE, (MIRANDASERVICE)onSendFile); + AddProtoServiceFunction(PSS_MESSAGE, onSendMsg); + AddProtoServiceFunction(PSS_MESSAGE"W", onSendMsgW); + AddProtoServiceFunction(PSS_FILE, onSendFile); #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("create Native/RSA menu"); diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index d6cc1a70d6..171fcc28cb 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -329,7 +329,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR if(ptr) { LPSTR buffer = (LPSTR)alloca(PSKSIZE+1); getContactName(ptr->hContact, buffer); - int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PSK),NULL,(DLGPROC)DlgProcSetPSK,(LPARAM)buffer); + int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PSK),NULL,DlgProcSetPSK,(LPARAM)buffer); if(res == IDOK) { setListViewPSK(hLV,idx,1); DBWriteContactSettingString(ptr->hContact,szModuleName,"tPSK",buffer); @@ -613,7 +613,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM } break; case IDC_RSA_EXPPRIV: { LPSTR passphrase = (LPSTR) alloca(RSASIZE); - int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,(DLGPROC)DlgProcSetPassphrase,(LPARAM)passphrase); + int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,DlgProcSetPassphrase,(LPARAM)passphrase); if ( res==IDOK ) { LPSTR priv = (LPSTR) alloca(RSASIZE); exp->rsa_export_keypair(CPP_MODE_RSA,priv,NULL,passphrase); @@ -627,7 +627,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM if ( !LoadImportRSAKeyDlg(hDlg,priv,1)) return TRUE; // LPSTR passphrase = (LPSTR) alloca(RSASIZE); - int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,(DLGPROC)DlgProcSetPassphrase,(LPARAM)passphrase); + int res = DialogBoxParam(g_hInst,MAKEINTRESOURCE(IDD_PASSPHRASE),NULL,DlgProcSetPassphrase,(LPARAM)passphrase); if ( res==IDOK ) { if ( !exp->rsa_import_keypair(CPP_MODE_RSA,priv,passphrase)) { msgbox(hDlg,sim113,szModuleName,MB_OK|MB_ICONEXCLAMATION); @@ -1026,7 +1026,7 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l } -BOOL CALLBACK DlgProcSetPSK(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { +INT_PTR CALLBACK DlgProcSetPSK(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { static char *buffer; switch(uMsg) { case WM_INITDIALOG: { @@ -1064,7 +1064,7 @@ BOOL CALLBACK DlgProcSetPSK(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { } -BOOL CALLBACK DlgProcSetPassphrase(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { +INT_PTR CALLBACK DlgProcSetPassphrase(HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { static LPSTR buffer; switch(uMsg) { case WM_INITDIALOG: { @@ -1208,8 +1208,8 @@ void RefreshProtoDlg(HWND hDlg) { ListView_SetCheckState(hLV,itemNum,proto[i].inspecting); } - SetDlgItemText(hDlg,IDC_SPLITON,"0"); - SetDlgItemText(hDlg,IDC_SPLITOFF,"0"); + SetDlgItemText(hDlg,IDC_SPLITON,_T("0")); + SetDlgItemText(hDlg,IDC_SPLITOFF,_T("0")); EnableWindow(GetDlgItem(hDlg,IDC_SPLITON), false); EnableWindow(GetDlgItem(hDlg,IDC_SPLITOFF), false); @@ -1364,8 +1364,8 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit) { void ResetGeneralDlg(HWND hDlg) { - SetDlgItemText(hDlg,IDC_KET,"10"); - SetDlgItemText(hDlg,IDC_OKT,"2"); + SetDlgItemText(hDlg,IDC_KET,_T("10")); + SetDlgItemText(hDlg,IDC_OKT,_T("2")); SendMessage(GetDlgItem(hDlg,IDC_SFT),BM_SETCHECK,BST_UNCHECKED,0L); SendMessage(GetDlgItem(hDlg,IDC_SOM),BM_SETCHECK,BST_UNCHECKED,0L); @@ -1801,8 +1801,8 @@ BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath) ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON; ofn.lpstrFile = KeyPath; - ofn.lpstrFilter = "ASC files\0*.asc\0All files (*.*)\0*.*\0"; - ofn.lpstrTitle = "Open Key File"; + ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0"); + ofn.lpstrTitle = _T("Open Key File"); if (!GetOpenFileName(&ofn)) return FALSE; return TRUE; @@ -1861,8 +1861,8 @@ LPSTR LoadKeys(LPCSTR file,BOOL priv) { BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) { - char szFile[MAX_PATH] = "rsa_pub.asc"; - if ( priv ) strcpy(szFile,"rsa_priv.asc"); + TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); + if ( priv ) _tcscpy(szFile,_T("rsa_priv.asc")); OPENFILENAME ofn; memset(&ofn, 0, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); @@ -1870,11 +1870,11 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON; ofn.lpstrFile = szFile; - ofn.lpstrFilter = "ASC files\0*.asc\0All files (*.*)\0*.*\0"; - ofn.lpstrTitle = (priv)?"Save Private Key File":"Save Public Key File"; + ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0"); + ofn.lpstrTitle = (priv)?_T("Save Private Key File"):_T("Save Public Key File"); if (!GetSaveFileName(&ofn)) return FALSE; - FILE *f=fopen(szFile,"wb"); + FILE *f=_tfopen(szFile,_T("wb")); if ( !f ) return FALSE; fwrite(key,strlen(key),1,f); fclose(f); @@ -1885,8 +1885,8 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) { - char szFile[MAX_PATH] = "rsa_pub.asc"; - if ( priv ) strcpy(szFile,"rsa_priv.asc"); + TCHAR szFile[MAX_PATH] = _T("rsa_pub.asc"); + if ( priv ) _tcscpy(szFile,_T("rsa_priv.asc")); OPENFILENAME ofn; memset(&ofn, 0, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); @@ -1894,11 +1894,11 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_CREATEPROMPT | OFN_OVERWRITEPROMPT | OFN_NOREADONLYRETURN; ofn.lpstrFile = szFile; - ofn.lpstrFilter = "ASC files\0*.asc\0All files (*.*)\0*.*\0"; - ofn.lpstrTitle = (priv)?"Load Private Key File":"Load Public Key File"; + ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0"); + ofn.lpstrTitle = (priv)?_T("Load Private Key File"):_T("Load Public Key File"); if (!GetOpenFileName(&ofn)) return FALSE; - FILE *f=fopen(szFile,"rb"); + FILE *f=_tfopen(szFile,_T("rb")); if ( !f ) return FALSE; fseek(f,0,SEEK_END); @@ -1917,7 +1917,7 @@ int onRegisterOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.cbSize = sizeof(odp); odp.hInstance = g_hInst; - odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONSTAB); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSTAB); odp.pszTitle = (char*)szModuleName; odp.pszGroup = LPGEN("Services"); odp.pfnDlgProc = OptionsDlgProc; diff --git a/plugins/SecureIM/src/options.h b/plugins/SecureIM/src/options.h index c87a0de34d..4af841d598 100644 --- a/plugins/SecureIM/src/options.h +++ b/plugins/SecureIM/src/options.h @@ -6,8 +6,8 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND,UINT,WPARAM,LPARAM); INT_PTR CALLBACK DlgProcOptionsProto(HWND,UINT,WPARAM,LPARAM); INT_PTR CALLBACK DlgProcOptionsPGP(HWND,UINT,WPARAM,LPARAM); INT_PTR CALLBACK DlgProcOptionsGPG(HWND,UINT,WPARAM,LPARAM); -BOOL CALLBACK DlgProcSetPSK(HWND,UINT,WPARAM,LPARAM); -BOOL CALLBACK DlgProcSetPassphrase(HWND,UINT,WPARAM,LPARAM); +INT_PTR CALLBACK DlgProcSetPSK(HWND,UINT,WPARAM,LPARAM); +INT_PTR CALLBACK DlgProcSetPassphrase(HWND,UINT,WPARAM,LPARAM); void ApplyGeneralSettings(HWND); void ApplyProtoSettings(HWND); void ApplyPGPSettings(HWND); diff --git a/plugins/SecureIM/src/rtfconv.cpp b/plugins/SecureIM/src/rtfconv.cpp index 994f541373..c046a61fbb 100644 --- a/plugins/SecureIM/src/rtfconv.cpp +++ b/plugins/SecureIM/src/rtfconv.cpp @@ -7,9 +7,9 @@ RTFCONVSTRING pRtfconvString = NULL; BOOL load_rtfconv () { - hRtfconv = LoadLibrary( "rtfconv.dll" ) ; + hRtfconv = LoadLibrary(_T("rtfconv.dll")) ; if ( hRtfconv == NULL ) { - hRtfconv = LoadLibrary( "plugins\\rtfconv.dll" ) ; + hRtfconv = LoadLibrary(_T("plugins\\rtfconv.dll")) ; if ( hRtfconv == NULL ) return FALSE; } -- cgit v1.2.3