From b3efceeb576c2a80e98ba2cfc953af0713abce10 Mon Sep 17 00:00:00 2001
From: "wishmaster51@gmail.com"
 <wishmaster51@gmail.com@c086bb3d-8645-0410-b8da-73a8550f86e7>
Date: Wed, 21 Mar 2012 12:26:56 +0000
Subject: -support for the custom langpacks -fixes for the Updater

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@236 c086bb3d-8645-0410-b8da-73a8550f86e7
---
 Plugins/spellchecker/commons.h            |  2 +-
 Plugins/spellchecker/spellchecker.cpp     | 14 ++++++++++----
 Plugins/spellchecker/spellchecker.vcxproj | 15 ++++++++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Plugins/spellchecker/commons.h b/Plugins/spellchecker/commons.h
index 336c97e..a07c421 100644
--- a/Plugins/spellchecker/commons.h
+++ b/Plugins/spellchecker/commons.h
@@ -43,6 +43,7 @@ using namespace std;
 
 // Miranda headers
 #define MIRANDA_VER 0x0900
+#define MIRANDA_CUSTOM_LP
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_system_cpp.h>
@@ -91,7 +92,6 @@ using namespace std;
 
 // Global Variables
 extern HINSTANCE hInst;
-extern PLUGINLINK *pluginLink;
 extern BOOL uinfoex_enabled;
 extern BOOL variables_enabled;
 
diff --git a/Plugins/spellchecker/spellchecker.cpp b/Plugins/spellchecker/spellchecker.cpp
index f77626f..79b8887 100644
--- a/Plugins/spellchecker/spellchecker.cpp
+++ b/Plugins/spellchecker/spellchecker.cpp
@@ -25,7 +25,13 @@ Boston, MA 02111-1307, USA.
 
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
-	"Spell Checker",
+#ifdef WIN64
+	"Spell Checker (x64)",
+#elif UNICODE
+	"Spell Checker (Unicode)"
+#else
+	"Spell Checker (Ansi)"
+#endif
 	PLUGIN_MAKE_VERSION(0,2,6,0),
 	"Spell checker for the message windows. Uses Hunspell to do the checking.",
 	"Ricardo Pescuma Domenecci, FREAK_THEMIGHTY",
@@ -68,6 +74,7 @@ PLUGINLINK *pluginLink;
 LIST_INTERFACE li;
 MM_INTERFACE mmi;
 UTF8_INTERFACE utfi;
+int hLangpack = 0;
 
 HANDLE hHooks[6];
 HANDLE hServices[3];
@@ -170,6 +177,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mir_getMMI(&mmi);
 	mir_getUTFI(&utfi);
 	mir_getLI(&li);
+	mir_getLP(&pluginInfo);
 
 	// hooks
 	hHooks[0] = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
@@ -211,20 +219,18 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		upd.szBetaChangelogURL = "http://pescuma.org/miranda/spellchecker#Changelog";
 		upd.pbBetaVersionPrefix = (BYTE *)"Spell Checker ";
 		upd.cpbBetaVersionPrefix = (int)strlen((char *)upd.pbBetaVersionPrefix);
+		upd.szUpdateURL = UPDATER_AUTOREGISTER;
 #ifdef WIN64
 		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellchecker64.%VERSION%.zip";
 //		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=";
-//		upd.szUpdateURL = "http://addons.miranda-im.org/download.php?dlfile=";
 		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (x64) ";
 #elif UNICODE
 		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellcheckerW.%VERSION%.zip";
 		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=3691";
-		upd.szUpdateURL = "http://addons.miranda-im.org/download.php?dlfile=3691";
 		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (Unicode) ";
 #else
 		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellchecker.%VERSION%.zip";
 		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=3690";
-		upd.szUpdateURL = "http://addons.miranda-im.org/download.php?dlfile=3690";
 		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (Ansi) ";
 #endif
 		upd.cpbVersionPrefix = (int)strlen((char *)upd.pbVersionPrefix);
diff --git a/Plugins/spellchecker/spellchecker.vcxproj b/Plugins/spellchecker/spellchecker.vcxproj
index cb0bdc3..7d646b2 100644
--- a/Plugins/spellchecker/spellchecker.vcxproj
+++ b/Plugins/spellchecker/spellchecker.vcxproj
@@ -165,6 +165,11 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">$(ProjectName)W</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">$(ProjectName)64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">$(ProjectName)64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)64</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
     <Midl>
@@ -242,8 +247,8 @@
       <MapFileName>.\Release64/spellchecker64.map</MapFileName>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)$(TargetName)64$(TargetExt)</OutputFile>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName)64.pdb</ProgramDatabaseFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -318,7 +323,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)$(TargetName)64$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName)64.pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
@@ -392,7 +397,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)$(TargetName)64$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName)64.pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
@@ -474,7 +479,7 @@
       <MapFileName>.\Release/spellchecker.map</MapFileName>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)$(TargetName)64$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName)64.pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
-- 
cgit v1.2.3