modified: commonheaders.h

	new file:   gpg_wrapper.cpp
	new file:   gpg_wrapper.h
	modified:   init.cpp
	modified:   main.cpp
	new file:   messages.cpp
	modified:   new_gpg.vcproj
	modified:   utilities.cpp
	modified:   utilities.h

1 files changed, 115 insertions, 115 deletions

diff --git a/init.cpp b/init.cpp
index a36db70..5b07200 100644
--- a/init.cpp
+++ b/init.cpp
@@ -1,116 +1,116 @@
-// Copyright © 2010 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-
-HINSTANCE hInst;
-HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL;
-PLUGINLINK *pluginLink;
-static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);
-extern char *date();
-MM_INTERFACE mmi = {0};
-UTF8_INTERFACE  utfi = {0};
-
-
-#define MIID_GPG { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } }
-
-PLUGININFOEX pluginInfo={
-	sizeof(PLUGININFOEX),
-	0,
-	PLUGIN_MAKE_VERSION(0,0,0,1),
-	"new GPG encryption support plugin",
-	"sss",
-	"sss123next@list.ru",
-	"© 2010 sss",
-	"http://sss.chaoslab.ru/tracker/mim_plugs/",
-	1,		//unicode
-	0,		//doesn't replace anything built-in
+// Copyright © 2010 sss

+// 

+// This program is free software; you can redistribute it and/or

+// modify it under the terms of the GNU General Public License

+// as published by the Free Software Foundation; either version 2

+// of the License, or (at your option) any later version.

+// 

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+

+#include "commonheaders.h"

+

+

+HINSTANCE hInst;

+HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL;

+PLUGINLINK *pluginLink;

+static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);

+extern char *date();

+MM_INTERFACE mmi = {0};

+UTF8_INTERFACE  utfi = {0};

+

+

+#define MIID_GPG { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } }

+

+PLUGININFOEX pluginInfo={

+	sizeof(PLUGININFOEX),

+	0,

+	PLUGIN_MAKE_VERSION(0,0,0,1),

+	"new GPG encryption support plugin, used code from http://addons.miranda-im.org/details.php?action=viewfile&id=3485",

+	"sss",

+	"sss123next@list.ru",

+	"© 2010 sss",

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

+	1,		//unicode

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

 	MIID_GPG

-};
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
-{
-	hInst=hinstDLL;
-	return TRUE;
-}
-
-
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
-{
-	static char plugname[52];
-	strcpy(plugname, szModuleName" [");
-	strcat(plugname, date());
-	strcat(plugname, " ");
-	strcat(plugname, __TIME__);
-	strcat(plugname, "]");
-	pluginInfo.shortName = plugname;
-	return &pluginInfo;
-}
-
-static const MUUID interfaces[] = {MIID_GPG, MIID_LAST};
-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
-	return interfaces;
-}
-
-int LoadKey(WPARAM w, LPARAM l);
-int ToggleEncryption(WPARAM w, LPARAM l);
-
-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
-{
-	pluginLink=link;
-	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
-	mir_getMMI(&mmi);
-	mir_getUTFI(&utfi);
-	CreateServiceFunction("/LoadPubKey",LoadKey);
-	CreateServiceFunction("/ToggleEncryption",ToggleEncryption);	
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFF;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Load GPG public key";
-	mi.pszService="/LoadPubKey";
-	hLoadPubKey = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);
-	ZeroMemory(&mi,sizeof(mi));
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFe;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Toggle GPG encryption";
-	mi.pszService="/ToggleEncryption";
-	hToggleEncryption = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);
-	return 0;
-}
-
-
-static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
-{
-	int GpgOptInit(WPARAM wParam,LPARAM lParam);
-	int gpg_init();
-	int OnPreBuildContactMenu(WPARAM w, LPARAM l);
-	HookEvent(ME_OPT_INITIALISE, GpgOptInit);
-	hOnPreBuildContactMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu);
-	gpg_init();
-	return 0;
-}
-
-
-extern "C" int __declspec(dllexport) Unload(void)
-{
-	return 0;
-}
+};

+

+BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+{

+	hInst=hinstDLL;

+	return TRUE;

+}

+

+

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+{

+	static char plugname[52];

+	strcpy(plugname, szModuleName" [");

+	strcat(plugname, date());

+	strcat(plugname, " ");

+	strcat(plugname, __TIME__);

+	strcat(plugname, "]");

+	pluginInfo.shortName = plugname;

+	return &pluginInfo;

+}

+

+static const MUUID interfaces[] = {MIID_GPG, MIID_LAST};

+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

+{

+	return interfaces;

+}

+

+int LoadKey(WPARAM w, LPARAM l);

+int ToggleEncryption(WPARAM w, LPARAM l);

+

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

+{

+	pluginLink=link;

+	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

+	mir_getMMI(&mmi);

+	mir_getUTFI(&utfi);

+	CreateServiceFunction("/LoadPubKey",LoadKey);

+	CreateServiceFunction("/ToggleEncryption",ToggleEncryption);	

+	CLISTMENUITEM mi = {0};

+	mi.cbSize=sizeof(mi);

+	mi.position=-0x7FFFFFFF;

+	mi.flags=0;

+	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

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

+	mi.pszService="/LoadPubKey";

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

+	ZeroMemory(&mi,sizeof(mi));

+	mi.cbSize=sizeof(mi);

+	mi.position=-0x7FFFFFFe;

+	mi.flags=0;

+	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+	mi.pszName="Toggle GPG encryption";

+	mi.pszService="/ToggleEncryption";

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

+	return 0;

+}

+

+

+static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)

+{

+	void test();

+	int GpgOptInit(WPARAM wParam,LPARAM lParam);

+	int OnPreBuildContactMenu(WPARAM w, LPARAM l);

+	test();

+	HookEvent(ME_OPT_INITIALISE, GpgOptInit);

+	hOnPreBuildContactMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu);

+	return 0;

+}

+

+

+extern "C" int __declspec(dllexport) Unload(void)

+{

+	return 0;

+}