minor signature fixes

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

5 files changed, 82 insertions, 78 deletions

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index c981eea46c..a1d02df1b6 100755
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -139,10 +139,9 @@ void setSrmmIcon(HANDLE h)
 

 void RefreshContactListIcons() 

 {

-	HANDLE hContact;

 	extern HANDLE g_hCLIcon;

 	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);

-	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 	while (hContact) 

 	{

 		setClistIcon(hContact);

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 532d857092..68cdd23d8a 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -67,11 +67,11 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 	return interfaces;

 }

 

-int LoadKey(WPARAM w, LPARAM l);

-int ToggleEncryption(WPARAM w, LPARAM l);

-int SendKey(WPARAM w, LPARAM l);

-int ExportGpGKeys(WPARAM w, LPARAM l);

-int ImportGpGKeys(WPARAM w, LPARAM l);

+INT_PTR LoadKey(WPARAM w, LPARAM l);

+INT_PTR ToggleEncryption(WPARAM w, LPARAM l);

+INT_PTR SendKey(WPARAM w, LPARAM l);

+INT_PTR ExportGpGKeys(WPARAM w, LPARAM l);

+INT_PTR ImportGpGKeys(WPARAM w, LPARAM l);

 

 void init_vars()

 {

@@ -111,49 +111,54 @@ extern "C" int __declspec(dllexport) Load()
 	mir_getXI(&xi);	//TODO: check if we have access to api

 	mir_getLP(&pluginInfo);

 	init_vars();

-	CreateServiceFunction("/LoadPubKey",(MIRANDASERVICE)LoadKey);

-	CreateServiceFunction("/ToggleEncryption",(MIRANDASERVICE)ToggleEncryption);

-	CreateServiceFunction("/SendKey",(MIRANDASERVICE)SendKey);

-	CreateServiceFunction("/ExportGPGKeys",(MIRANDASERVICE)ExportGpGKeys);

-	CreateServiceFunction("/ImportGPGKeys",(MIRANDASERVICE)ImportGpGKeys);

+	CreateServiceFunction("/LoadPubKey",LoadKey);

+	CreateServiceFunction("/ToggleEncryption",ToggleEncryption);

+	CreateServiceFunction("/SendKey",SendKey);

+	CreateServiceFunction("/ExportGPGKeys",ExportGpGKeys);

+	CreateServiceFunction("/ImportGPGKeys",ImportGpGKeys);

+

 	CLISTMENUITEM mi = {0};

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

-	mi.flags=0;

+	mi.flags=CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.pszName="Load GPG public key";

+	mi.ptszName=LPGENT("Load GPG public key");

 	mi.pszService="/LoadPubKey";

 	hLoadPubKey = Menu_AddContactMenuItem(&mi);

+

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

-	mi.flags=0;

+	mi.flags=CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.pszName="Toggle GPG encryption";

+	mi.ptszName=LPGENT("Toggle GPG encryption");

 	mi.pszService="/ToggleEncryption";

 	hToggleEncryption = Menu_AddContactMenuItem(&mi);

+

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

-	mi.flags=0;

+	mi.flags=CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.pszName="Send public key";

+	mi.ptszName=LPGENT("Send public key");

 	mi.pszService="/SendKey";

 	hSendKey = Menu_AddContactMenuItem(&mi);

+

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

-	mi.flags=0;

+	mi.flags=CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.pszName="Export GPG Public keys from all users";

+	mi.ptszName=LPGENT("Export GPG Public keys from all users");

 	mi.pszService="/ExportGPGKeys";

 	hExportGpgKeys = Menu_AddMainMenuItem(&mi);

+

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

-	mi.flags=0;

+	mi.flags=CMIF_TCHAR;

 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	mi.pszName="Import GPG Public keys from all users";

+	mi.ptszName=LPGENT("Import GPG Public keys from all users");

 	mi.pszService="/ImportGPGKeys";

 	hImportGpgKeys = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index ed31d221ed..ebf7b8cdc5 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -27,7 +27,7 @@ int itemnum = 0;
 HWND hwndList_g = NULL;
 BOOL CheckStateStoreDB(HWND hwndDlg, int idCtrl, const char* szSetting);
 
-static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
+static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 {
 	HWND hwndList=GetDlgItem(hwndDlg, IDC_KEY_LIST);
 	hwndList_g = hwndList;
@@ -41,32 +41,32 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
     {
 		SetWindowPos(hwndDlg, 0, firstrun_rect.left, firstrun_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
-		SetWindowText(hwndDlg, TranslateW(_T("Set own key")));
+		SetWindowText(hwndDlg, TranslateT("Set own key"));
 		col.pszText = _T("Key ID");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 50;
 		ListView_InsertColumn(hwndList, 0, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Email"));
+		col.pszText = TranslateT("Email");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
 		ListView_InsertColumn(hwndList, 1, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Name"));
+		col.pszText = TranslateT("Name");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 250;
 		ListView_InsertColumn(hwndList, 2, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Creation date"));
+		col.pszText = TranslateT("Creation date");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
 		ListView_InsertColumn(hwndList, 3, &col);
 		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Key length"));
+		col.pszText = TranslateT("Key length");
 		col.mask = LVCF_TEXT | LVCF_WIDTH;
 		col.fmt = LVCFMT_LEFT;
 		col.cx = 30;
@@ -709,7 +709,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 
 void ShowFirstRunDialog();
 
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	TCHAR *tmp = NULL;
   switch (msg)
@@ -1171,7 +1171,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
   return FALSE;
 }
 
-static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	extern HANDLE new_key_hcnt;
 	extern boost::mutex new_key_hcnt_mutex;
@@ -1251,7 +1251,7 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
   }
   return FALSE;
 }
-static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   switch (msg)
   {
@@ -1571,7 +1571,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 int itemnum2 = 0;
 
-static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
+static INT_PTR CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 {
 	HWND hwndList=GetDlgItem(hwndDlg, IDC_EXISTING_KEY_LIST);
 	hwndList_g = hwndList;
@@ -1831,7 +1831,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 
   return FALSE;
 }
-static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   extern HANDLE new_key_hcnt;
   extern boost::mutex new_key_hcnt_mutex;
@@ -1925,7 +1925,7 @@ void ShowFirstRunDialog()
 {
 	if (hwndFirstRun == NULL)
 	{
-		hwndFirstRun = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIRST_RUN), NULL, (DLGPROC)DlgProcFirstRun);
+		hwndFirstRun = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIRST_RUN), NULL, DlgProcFirstRun);
 	}
 	SetForegroundWindow(hwndFirstRun);
 }
@@ -1935,14 +1935,14 @@ void ShowSetDirsDialog()
 {
 	if (hwndSetDirs == NULL)
 	{
-		hwndSetDirs = CreateDialog(hInst, MAKEINTRESOURCE(IDD_BIN_PATH), NULL, (DLGPROC)DlgProcGpgBinOpts);
+		hwndSetDirs = CreateDialog(hInst, MAKEINTRESOURCE(IDD_BIN_PATH), NULL, DlgProcGpgBinOpts);
 	}
 	SetForegroundWindow(hwndSetDirs);
 }
 
 void ShowNewKeyDialog()
 {
-	hwndNewKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NEW_KEY), NULL, (DLGPROC)DlgProcNewKeyDialog);
+	hwndNewKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NEW_KEY), NULL, DlgProcNewKeyDialog);
 	SetForegroundWindow(hwndNewKey);
 }
 
@@ -1950,7 +1950,7 @@ void ShowKeyGenDialog()
 {
 	if (hwndKeyGen == NULL)
 	{
-		hwndKeyGen = CreateDialog(hInst, MAKEINTRESOURCE(IDD_KEY_GEN), NULL, (DLGPROC)DlgProcKeyGenDialog);
+		hwndKeyGen = CreateDialog(hInst, MAKEINTRESOURCE(IDD_KEY_GEN), NULL, DlgProcKeyGenDialog);
 	}
 	SetForegroundWindow(hwndKeyGen);
 }
@@ -1959,14 +1959,14 @@ void ShowSelectExistingKeyDialog()
 {
 	if (hwndSelectExistingKey == NULL)
 	{
-		hwndSelectExistingKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_EXISTING_KEY), NULL, (DLGPROC)DlgProcLoadExistingKey);
+		hwndSelectExistingKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_EXISTING_KEY), NULL, DlgProcLoadExistingKey);
 	}
 	SetForegroundWindow(hwndSelectExistingKey);
 }
 
 void ShowImportKeyDialog()
 {
-	CreateDialog(hInst, MAKEINTRESOURCE(IDD_IMPORT_KEY), NULL, (DLGPROC)DlgProcImportKeyDialog);
+	CreateDialog(hInst, MAKEINTRESOURCE(IDD_IMPORT_KEY), NULL, DlgProcImportKeyDialog);
 }
 
 
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index 5dc673c024..07aad1f722 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -972,7 +972,7 @@ int HookSendMsg(WPARAM w, LPARAM l)
 }
 
 
-static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	char *inkeyid = NULL;
   switch (msg)
@@ -1067,5 +1067,5 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L
 void ShowLoadKeyPasswordWindow()
 {
 	extern HINSTANCE hInst;
-	DialogBox(hInst, MAKEINTRESOURCE(IDD_KEY_PASSWD), NULL, (DLGPROC)DlgProcKeyPassword);
+	DialogBox(hInst, MAKEINTRESOURCE(IDD_KEY_PASSWD), NULL, DlgProcKeyPassword);
 }
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 80cbbbc559..b4eee7d30e 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -18,10 +18,10 @@
 

 extern HINSTANCE hInst;

 

-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

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

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

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

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

 

 BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef)

 {

@@ -44,11 +44,11 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);

-	odp.pszTitle = szGPGModuleName;

-	odp.pszGroup = "Services";

-	odp.pszTab = "Main";

-	odp.flags=ODPF_BOLDGROUPS;

-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgOpts;

+	odp.ptszTitle = _T(szGPGModuleName);

+	odp.ptszGroup = LPGENT("Services");

+	odp.ptszTab = LPGENT("Main");

+	odp.flags=ODPF_BOLDGROUPS | ODPF_TCHAR;

+	odp.pfnDlgProc = DlgProcGpgOpts;

 	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

@@ -56,11 +56,11 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);

-	odp.pszTitle = szGPGModuleName;

-	odp.pszGroup = "Services";

-	odp.pszTab = "GnuPG Variables";

-	odp.flags=ODPF_BOLDGROUPS;

-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgBinOpts;

+	odp.ptszTitle = _T(szGPGModuleName);

+	odp.ptszGroup = LPGENT("Services");

+	odp.ptszTab = LPGENT("GnuPG Variables");

+	odp.flags=ODPF_BOLDGROUPS | ODPF_TCHAR;

+	odp.pfnDlgProc = DlgProcGpgBinOpts;

 	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

@@ -68,11 +68,11 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_MESSAGES);

-	odp.pszTitle = szGPGModuleName;

-	odp.pszGroup = "Services";

-	odp.pszTab = "Messages";

-	odp.flags=ODPF_BOLDGROUPS;

-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts;

+	odp.ptszTitle = _T(szGPGModuleName);

+	odp.ptszGroup = LPGENT("Services");

+	odp.ptszTab = LPGENT("Messages");

+	odp.flags=ODPF_BOLDGROUPS | ODPF_TCHAR;

+	odp.pfnDlgProc = DlgProcGpgMsgOpts;

 	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

@@ -80,11 +80,11 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);

-	odp.pszTitle = szGPGModuleName;

-	odp.pszGroup = "Services";

-	odp.pszTab = "Advanced";

-	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY;

-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts;

+	odp.ptszTitle = _T(szGPGModuleName);

+	odp.ptszGroup = LPGENT("Services");

+	odp.ptszTab = LPGENT("Advanced");

+	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY | ODPF_TCHAR;

+	odp.pfnDlgProc = DlgProcGpgAdvOpts;

 	Options_AddPage(wParam, &odp);

 

 	return 0;

@@ -97,7 +97,7 @@ HWND hwndList_p = NULL;
 HWND hwndCurKey_p = NULL;

 

 void ShowLoadPublicKeyDialog();

-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

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

 {

 	HWND hwndList=GetDlgItem(hwndDlg, IDC_USERLIST);

 	hwndList_p = hwndList;

@@ -113,31 +113,31 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
   case WM_INITDIALOG:

     {

 		TranslateDialogDefault(hwndDlg);

-		col.pszText = TranslateW(_T("Contact"));

+		col.pszText = TranslateT("Contact");

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 60;

 		ListView_InsertColumn(hwndList, 0, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = TranslateW(_T("Key ID"));

+		col.pszText = TranslateT("Key ID");

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 50;

 		ListView_InsertColumn(hwndList, 1, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = TranslateW(_T("Name"));

+		col.pszText = TranslateT("Name");

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 50;

 		ListView_InsertColumn(hwndList, 2, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = TranslateW(_T("Email"));

+		col.pszText = TranslateT("Email");

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 50;

 		ListView_InsertColumn(hwndList, 3, &col);

 		ZeroMemory(&col,sizeof(col));

-		col.pszText = TranslateW(_T("Protocol"));

+		col.pszText = TranslateT("Protocol");

 		col.mask = LVCF_TEXT | LVCF_WIDTH;

 		col.fmt = LVCFMT_LEFT;

 		col.cx = 60;

@@ -481,7 +481,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 }

 

 

-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

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

 {

 	TCHAR *tmp = NULL;

   switch (msg)

@@ -614,7 +614,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
   return FALSE;

 }

 

-static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

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

 {

   switch (msg)

   {

@@ -696,7 +696,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
   return FALSE;

 }

 

-static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

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

 {

   switch (msg)

   {

@@ -754,7 +754,7 @@ static BOOL CALLBACK editctrl_ctrl_a(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 	return ret;

 }

 

-static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)

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

 {

 	static HANDLE hContact = user_data[item_num+1];

 

@@ -786,10 +786,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_ENCRYPTION), 0);

 		}

 		if(isContactSecured(hcnt))

-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn off encryption")));

+			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateT("Turn off encryption"));

 		else

 		{

-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn on encryption")));

+			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateT("Turn on encryption"));

 			CheckDlgButton(hwndDlg, IDC_ENABLE_ENCRYPTION, 1);

 		}

 		if(hcnt)

@@ -1383,5 +1383,5 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 

 void ShowLoadPublicKeyDialog()

 {

-	DialogBox(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, (DLGPROC)DlgProcLoadPublicKey);

+	DialogBox(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, DlgProcLoadPublicKey);

 }