From b00398f339de138916202ad625af923512c72efa Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 28 Jun 2012 06:29:49 +0000
Subject: WhoUseMyFiles added, FileAsMessage - few fixrs

git-svn-id: http://svn.miranda-ng.org/main/trunk@664 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FileAsMessage/dialog.cpp       |  5 +---
 plugins/FileAsMessage/fileecho.vcxproj | 20 ++++++++++++----
 plugins/FileAsMessage/main.cpp         |  5 ++--
 plugins/FileAsMessage/main.h           | 42 +++++++++++++++++++---------------
 4 files changed, 42 insertions(+), 30 deletions(-)

(limited to 'plugins/FileAsMessage')

diff --git a/plugins/FileAsMessage/dialog.cpp b/plugins/FileAsMessage/dialog.cpp
index eb76e24c15..8ed9a6d967 100644
--- a/plugins/FileAsMessage/dialog.cpp
+++ b/plugins/FileAsMessage/dialog.cpp
@@ -2,8 +2,6 @@
 #include"dialog.h"
 #include"resource.h"
 
-#include "m_Snapping_windows.h"
-
 #include"crc32.cpp"
 
 char *szFEMode[] =
@@ -1140,8 +1138,7 @@ LRESULT CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 	struct FILEECHO *dat;
 
 	dat = (struct FILEECHO*)GetWindowLong(hDlg, GWL_USERDATA);
-	CallSnappingWindowProc(hDlg,uMsg,wParam,lParam);
-    switch( uMsg )
+	switch( uMsg )
 	{
 		case WM_INITDIALOG:
 		{
diff --git a/plugins/FileAsMessage/fileecho.vcxproj b/plugins/FileAsMessage/fileecho.vcxproj
index eb02d240e8..96831799da 100644
--- a/plugins/FileAsMessage/fileecho.vcxproj
+++ b/plugins/FileAsMessage/fileecho.vcxproj
@@ -89,6 +89,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -111,7 +112,9 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0419</Culture>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,6 +130,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -147,7 +151,9 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0419</Culture>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -161,6 +167,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -181,7 +188,9 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0419</Culture>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -195,6 +204,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -213,7 +223,9 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0419</Culture>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/FileAsMessage/main.cpp b/plugins/FileAsMessage/main.cpp
index a1a9aaba3f..782e97edc3 100644
--- a/plugins/FileAsMessage/main.cpp
+++ b/plugins/FileAsMessage/main.cpp
@@ -2,15 +2,14 @@
 #include "dialog.h"
 #include "resource.h"
 
-#include "IcoLib.h"
 
 #include <stdio.h>
 #include <time.h>
 
 PLUGINLINK *pluginLink;
-PLUGININFO pluginInfo =
+PLUGININFOEX pluginInfo =
 {
-	sizeof( PLUGININFO ),
+	sizeof( PLUGININFOEX ),
 	SERVICE_TITLE,
 	PLUGIN_MAKE_VERSION( 0,0,2,4 ),
 	"file tranfer by using the messaging services - as plain text",
diff --git a/plugins/FileAsMessage/main.h b/plugins/FileAsMessage/main.h
index 66de382a63..9437a87a98 100644
--- a/plugins/FileAsMessage/main.h
+++ b/plugins/FileAsMessage/main.h
@@ -1,27 +1,31 @@
 //#include "AggressiveOptimize.h"
 
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+
 #define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <stdio.h>
 
-#include "../../include/newpluginapi.h"
-#include "../../include/m_system.h"
-#include "../../include/m_database.h"
-#include "../../include/m_protomod.h"
-#include "../../include/m_protosvc.h"
-#include "../../include/m_langpack.h"
-#include "../../include/m_clist.h"
-#include "../../include/m_options.h"
-#include "../../include/m_clui.h"
-#include "../../include/m_clc.h"
-#include "../../include/m_utils.h"
-#include "../../include/m_skin.h"
-#include "../../include/m_popup.h"
-#include "../../include/m_message.h"
-#include "../../include/m_button.h"
-#include "../../include/m_netlib.h"
-#include "../../include/m_file.h"
-#include "../../include/win2k.h"
+#include "newpluginapi.h"
+#include "m_system.h"
+#include "m_database.h"
+#include "m_protomod.h"
+#include "m_protosvc.h"
+#include "m_langpack.h"
+#include "m_clist.h"
+#include "m_options.h"
+#include "m_clui.h"
+#include "m_clc.h"
+#include "m_utils.h"
+#include "m_skin.h"
+#include "m_popup.h"
+#include "m_icolib.h"
+#include "m_message.h"
+#include "m_button.h"
+#include "m_netlib.h"
+#include "m_file.h"
+#include "win2k.h"
 
 #define ARRAY_SIZE(n)	(sizeof(n)/sizeof(n[0]))
 
@@ -53,7 +57,7 @@ extern "C" {
 #endif 
 int __declspec(dllexport) Load( PLUGINLINK *link );
 int __declspec(dllexport) Unload( void );
-    __declspec(dllexport) PLUGININFO *MirandaPluginInfo( DWORD dwVersion );
+    __declspec(dllexport) PLUGININFOEX *MirandaPluginInfo( DWORD dwVersion );
 #ifdef __cplusplus
 }
 #endif 
-- 
cgit v1.2.3