ported to miranda_ng

5 files changed, 23 insertions, 22 deletions

diff --git a/icons.cpp b/icons.cpp
index 58a24c9..c981eea 100755
--- a/icons.cpp
+++ b/icons.cpp
@@ -24,7 +24,7 @@ HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char*
   if(!size)

 	  size = 16;

 

-  sid.cbSize = SKINICONDESC_SIZE;

+  sid.cbSize = sizeof( SKINICONDESC );

   sid.ptszSection = section;

   sid.ptszDescription = desc;

   sid.flags = SIDF_TCHAR;

@@ -34,8 +34,8 @@ HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char*
   sid.iDefaultIndex = def_idx;

   sid.hDefaultIcon = icon;

   sid.cx = sid.cy = size;

-

-  hIcon = (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+  

+  hIcon =  Skin_AddIcon(&sid);

 

   return hIcon;

 }

diff --git a/init.cpp b/init.cpp
index d04c437..b87e76f 100755
--- a/init.cpp
+++ b/init.cpp
@@ -24,14 +24,12 @@ list <JabberAccount*> Accounts;
 

 HINSTANCE hInst;

 HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL, hExportGpgKeys = NULL, hImportGpgKeys = NULL;

-PLUGINLINK *pluginLink;

 IconExtraColumn g_IEC = {0};

 static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);

 extern char *date();

-MM_INTERFACE mmi = {0};

-UTF8_INTERFACE  utfi = {0};

 RECT key_from_keyserver_rect = {0}, firstrun_rect = {0}, new_key_rect = {0}, key_gen_rect = {0}, load_key_rect = {0}, import_key_rect = {0}, key_password_rect = {0}, load_existing_key_rect = {0};

 XML_API xi = {0};

+int hLangpack = 0;

 logtofile debuglog;

 bool gpg_valid = false, gpg_keyexist = false;

 std::map<HANDLE, contact_data> hcontact_data;

@@ -49,7 +47,6 @@ PLUGININFOEX pluginInfo={
 	"© 2010-2012 sss",

 	"http://sss.chaoslab.ru/tracker/mim_plugs/",

 	1,		//unicode

-	0,		//doesn't replace anything built-in

 	MIID_GPG

 };

 

@@ -116,13 +113,11 @@ void init_vars()
 	tabsrmm_used = isTabsrmmUsed();

 }

 

-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

+extern "C" int __declspec(dllexport) Load()

 {

-	pluginLink=link;

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

-	mir_getMMI(&mmi);

-	mir_getUTFI(&utfi);

 	mir_getXI(&xi);	//TODO: check if we have access to api

+	mir_getLP(&pluginInfo);

 	init_vars();

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

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

@@ -136,7 +131,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Load GPG public key";

 	mi.pszService="/LoadPubKey";

-	hLoadPubKey = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hLoadPubKey = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

@@ -144,7 +139,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Toggle GPG encryption";

 	mi.pszService="/ToggleEncryption";

-	hToggleEncryption = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hToggleEncryption = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

@@ -152,7 +147,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Send public key";

 	mi.pszService="/SendKey";

-	hSendKey = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hSendKey = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

@@ -160,7 +155,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

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

 	mi.pszService="/ExportGPGKeys";

-	hExportGpgKeys = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	hExportGpgKeys = Menu_AddMainMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

@@ -168,7 +163,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

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

 	mi.pszService="/ImportGPGKeys";

-	hImportGpgKeys = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	hImportGpgKeys = Menu_AddMainMenuItem(&mi);

 

 	return 0;

 }

diff --git a/messages.cpp b/messages.cpp
index 18b2378..f2e3c35 100755
--- a/messages.cpp
+++ b/messages.cpp
@@ -177,6 +177,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 					return 0;
 				}
+				//TODO: check gpg output for errors
 				_terminate = false;
 				while(out.find("public key decryption failed: bad passphrase") != string::npos)
 				{
@@ -240,6 +241,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
 						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 						return 0;
 					}
+					//TODO: check gpg output for errors
 				}
 				out.clear();
 				gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
@@ -263,6 +265,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, D
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
 				}
+				//TODO: check gpg output for errors
 				{
 					wstring tmp = tmp2;
 					tmp += _T("\\tmp\\");
@@ -434,6 +437,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 				}
 				if(result == pxNotFound)
 					return 1;
+				//TODO: check gpg output for errors
 				{
 					char *tmp = NULL;
 					string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
@@ -707,6 +711,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 		mir_free(msg);
 		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
 	}
+	//TODO: check gpg output for errors
 	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
 	{
 		out.clear();
@@ -736,6 +741,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 				mir_free(msg);
 				return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
 			}
+			//TODO: check gpg output for errors
 		}
 		else
 		{
diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj
index 0dad1bc..17f84a7 100755
--- a/new_gpg.vcxproj
+++ b/new_gpg.vcxproj
@@ -477,7 +477,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\Boost\include;X:\install\git\miranda\miranda_ng_svn\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -504,7 +504,7 @@
     <Link>

       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_51.lib</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>x:\temp\windows\libs\Boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>X:\install\git\miranda\miranda_ng_svn\bin10\lib;x:\temp\windows\libs\Boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AssemblyDebug>true</AssemblyDebug>

       <GenerateMapFile>true</GenerateMapFile>

diff --git a/options.cpp b/options.cpp
index 109d54c..a990003 100755
--- a/options.cpp
+++ b/options.cpp
@@ -49,7 +49,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pszTab = "Main";

 	odp.flags=ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgOpts;

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

 

@@ -61,7 +61,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pszTab = "GnuPG Variables";

 	odp.flags=ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgBinOpts;

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

 

@@ -73,7 +73,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pszTab = "Messages";

 	odp.flags=ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts;

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	ZeroMemory(&odp, sizeof(odp));

 

@@ -85,7 +85,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pszTab = "Advanced";

 	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY;

 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts;

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+	Options_AddPage(wParam, &odp);

 

 	return 0;

 }