diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-07-07 22:13:58 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-07-07 22:13:58 +0000 |
| commit | c90d55ec2adeb5864f9629116f735457f296009a (patch) | |
| tree | 4a7f750fe27f30bcbbf54801d85ec948f1745888 /plugins/CmdLine | |
| parent | 37690f6a83f2935292f28cdec8340c206a2f3aac (diff) | |
CmdLine:
adopted, MimCmd not adopted yet
git-svn-id: http://svn.miranda-ng.org/main/trunk@839 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CmdLine')
| -rw-r--r-- | plugins/CmdLine/CmdLine.cpp (renamed from plugins/CmdLine/CmdLine/CmdLine.cpp) | 17 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.html | 12 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.rc (renamed from plugins/CmdLine/CmdLine/CmdLine.rc) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.sln | 41 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.vcxproj | 204 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.vcxproj.filters | 80 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine/CmdLine.vcproj | 438 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine/mirandaMem.cpp | 28 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine/mirandaMem.h | 30 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/MimCmd.cpp (renamed from plugins/CmdLine/executable/MimCmd/MimCmd.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/MimCmd.vcproj (renamed from plugins/CmdLine/executable/MimCmd/MimCmd.vcproj) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/commands.cpp (renamed from plugins/CmdLine/executable/MimCmd/commands.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/commands.h (renamed from plugins/CmdLine/executable/MimCmd/commands.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/common.h (renamed from plugins/CmdLine/executable/MimCmd/common.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/langpack.cpp (renamed from plugins/CmdLine/executable/MimCmd/langpack.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/langpack.h (renamed from plugins/CmdLine/executable/MimCmd/langpack.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/resource.h (renamed from plugins/CmdLine/executable/MimCmd/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/version.rc (renamed from plugins/CmdLine/executable/MimCmd/version.rc) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/commonheaders.h (renamed from plugins/CmdLine/CmdLine/commonheaders.h) | 44 | ||||
| -rw-r--r-- | plugins/CmdLine/files_release.txt | 1 | ||||
| -rw-r--r-- | plugins/CmdLine/files_releasex64.txt | 1 | ||||
| -rw-r--r-- | plugins/CmdLine/files_source.txt | 5 | ||||
| -rw-r--r-- | plugins/CmdLine/hooked_events.cpp (renamed from plugins/CmdLine/CmdLine/hooked_events.cpp) | 28 | ||||
| -rw-r--r-- | plugins/CmdLine/hooked_events.h (renamed from plugins/CmdLine/CmdLine/hooked_events.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_data.cpp (renamed from plugins/CmdLine/CmdLine/mimcmd_data.cpp) | 2 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_data.h (renamed from plugins/CmdLine/CmdLine/mimcmd_data.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_handlers.cpp (renamed from plugins/CmdLine/CmdLine/mimcmd_handlers.cpp) | 2 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_handlers.h (renamed from plugins/CmdLine/CmdLine/mimcmd_handlers.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_ipc.cpp (renamed from plugins/CmdLine/CmdLine/mimcmd_ipc.cpp) | 2 | ||||
| -rw-r--r-- | plugins/CmdLine/mimcmd_ipc.h (renamed from plugins/CmdLine/CmdLine/mimcmd_ipc.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/pack source.bat | 8 | ||||
| -rw-r--r-- | plugins/CmdLine/pack symbols.bat | 12 | ||||
| -rw-r--r-- | plugins/CmdLine/pack x64.bat | 18 | ||||
| -rw-r--r-- | plugins/CmdLine/pack.bat | 18 | ||||
| -rw-r--r-- | plugins/CmdLine/resource.h (renamed from plugins/CmdLine/CmdLine/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/services.cpp (renamed from plugins/CmdLine/CmdLine/services.cpp) | 3 | ||||
| -rw-r--r-- | plugins/CmdLine/services.h (renamed from plugins/CmdLine/CmdLine/services.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/symbols_exclude.txt | 1 | ||||
| -rw-r--r-- | plugins/CmdLine/utils.cpp (renamed from plugins/CmdLine/CmdLine/utils.cpp) | 2 | ||||
| -rw-r--r-- | plugins/CmdLine/utils.h (renamed from plugins/CmdLine/CmdLine/utils.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/version.h (renamed from plugins/CmdLine/CmdLine/version.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/version.rc (renamed from plugins/CmdLine/CmdLine/version.rc) | 0 |
42 files changed, 307 insertions, 690 deletions
diff --git a/plugins/CmdLine/CmdLine/CmdLine.cpp b/plugins/CmdLine/CmdLine.cpp index 9847786a97..4d19c19ccc 100644 --- a/plugins/CmdLine/CmdLine/CmdLine.cpp +++ b/plugins/CmdLine/CmdLine.cpp @@ -19,12 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "commonheaders.h"
-#include "mimcmd_ipc.h"
char ModuleName[] = "CmdLine";
HINSTANCE hInstance;
-
-PLUGINLINK *pluginLink;
+int hLangpack;
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
@@ -35,12 +33,9 @@ PLUGININFOEX pluginInfo = { __AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
- 0, //unicode aware
- 0,
+ UNICODE_AWARE, //unicode aware
{0x2f1a117c, 0x3c1b, 0x4c01, {0x89, 0xea, 0x6d, 0x8f, 0xd8, 0x5a, 0x9b, 0x4c}} //{2f1a117c-3c1b-4c01-89ea-6d8fd85a9b4c}
- }; //not used
-
-OLD_MIRANDAPLUGININFO_SUPPORT;
+}; //not used
extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
{
@@ -54,9 +49,9 @@ extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces() return interfaces;
}
-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
+extern "C" int __declspec(dllexport) Load(void)
{
- pluginLink = link;
+ mir_getLP(&pluginInfo);
// InitServices();
if (InitServer())
@@ -66,8 +61,6 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) HookEvents();
- InitializeMirandaMemFunctions();
-
return 0;
}
diff --git a/plugins/CmdLine/CmdLine.html b/plugins/CmdLine/CmdLine.html deleted file mode 100644 index 31beec9f89..0000000000 --- a/plugins/CmdLine/CmdLine.html +++ /dev/null @@ -1,12 +0,0 @@ -<html>
- <head></head>
- <body>
- <center>
- <h1>CmdLine Test Page</h1>
-
- <p>CmdLine version 0.0.4.1
- </p>
- <p><a href="CmdLine.zip">CmdLine.zip</a></p>
- </center>
- </body>
-</html>
diff --git a/plugins/CmdLine/CmdLine/CmdLine.rc b/plugins/CmdLine/CmdLine.rc index 1b7522b7a4..1b7522b7a4 100644 --- a/plugins/CmdLine/CmdLine/CmdLine.rc +++ b/plugins/CmdLine/CmdLine.rc diff --git a/plugins/CmdLine/CmdLine.sln b/plugins/CmdLine/CmdLine.sln deleted file mode 100644 index da95391077..0000000000 --- a/plugins/CmdLine/CmdLine.sln +++ /dev/null @@ -1,41 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdLine", "CmdLine\CmdLine.vcproj", "{73BA9CA5-640D-4F30-A157-A73557A25F98}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "executable", "executable", "{F94BE703-4A5E-4864-B15D-C942212DAD05}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MimCmd", "executable\MimCmd\MimCmd.vcproj", "{1E3BB48A-FFBC-4A03-8C43-9124A484BE51}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Debug|Win32.ActiveCfg = Debug|Win32
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Debug|Win32.Build.0 = Debug|Win32
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Debug|x64.ActiveCfg = Debug|x64
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Debug|x64.Build.0 = Debug|x64
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Release|Win32.ActiveCfg = Release|Win32
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Release|Win32.Build.0 = Release|Win32
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Release|x64.ActiveCfg = Release|x64
- {73BA9CA5-640D-4F30-A157-A73557A25F98}.Release|x64.Build.0 = Release|x64
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Debug|Win32.ActiveCfg = Debug|Win32
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Debug|Win32.Build.0 = Debug|Win32
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Debug|x64.ActiveCfg = Debug|x64
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Debug|x64.Build.0 = Debug|x64
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Release|Win32.ActiveCfg = Release|Win32
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Release|Win32.Build.0 = Release|Win32
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Release|x64.ActiveCfg = Release|x64
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {1E3BB48A-FFBC-4A03-8C43-9124A484BE51} = {F94BE703-4A5E-4864-B15D-C942212DAD05}
- EndGlobalSection
-EndGlobal
diff --git a/plugins/CmdLine/CmdLine.vcxproj b/plugins/CmdLine/CmdLine.vcxproj new file mode 100644 index 0000000000..2981fd79b7 --- /dev/null +++ b/plugins/CmdLine/CmdLine.vcxproj @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{73BA9CA5-640D-4F30-A157-A73557A25F98}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <BaseAddress>0x2F0B0000</BaseAddress>
+ </Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ <BaseAddress>0x2F0B0000</BaseAddress>
+ </Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
+ <Optimization>Full</Optimization>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <BaseAddress>0x2F0B0000</BaseAddress>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ </Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
+ <Optimization>Full</Optimization>
+ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <BaseAddress>0x2F0B0000</BaseAddress>
+ <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+ </Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="CmdLine.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="hooked_events.cpp" />
+ <ClCompile Include="mimcmd_data.cpp" />
+ <ClCompile Include="mimcmd_handlers.cpp" />
+ <ClCompile Include="mimcmd_ipc.cpp" />
+ <ClCompile Include="services.cpp" />
+ <ClCompile Include="utils.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="commonheaders.h" />
+ <ClInclude Include="hooked_events.h" />
+ <ClInclude Include="mimcmd_data.h" />
+ <ClInclude Include="mimcmd_handlers.h" />
+ <ClInclude Include="mimcmd_ipc.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="services.h" />
+ <ClInclude Include="utils.h" />
+ <ClInclude Include="version.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="CmdLine.rc" />
+ <ResourceCompile Include="version.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="docs\CmdLine_readme.txt" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/plugins/CmdLine/CmdLine.vcxproj.filters b/plugins/CmdLine/CmdLine.vcxproj.filters new file mode 100644 index 0000000000..28af4c7c70 --- /dev/null +++ b/plugins/CmdLine/CmdLine.vcxproj.filters @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="CmdLine.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="hooked_events.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="mimcmd_data.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="mimcmd_handlers.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="mimcmd_ipc.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="services.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="commonheaders.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="hooked_events.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="mimcmd_data.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="mimcmd_handlers.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="mimcmd_ipc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="services.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="utils.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="CmdLine.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ <ResourceCompile Include="version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="docs\CmdLine_readme.txt" />
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/plugins/CmdLine/CmdLine/CmdLine.vcproj b/plugins/CmdLine/CmdLine/CmdLine.vcproj deleted file mode 100644 index 11c10635c9..0000000000 --- a/plugins/CmdLine/CmdLine/CmdLine.vcproj +++ /dev/null @@ -1,438 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="CmdLine"
- ProjectGUID="{73BA9CA5-640D-4F30-A157-A73557A25F98}"
- RootNamespace="CmdLine"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\..\cvs\test miranda\Plugins"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../include/"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../include/"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../include/"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress="0x2F0B0000"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../include/"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;CMDLINE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress="0x2F0B0000"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\CmdLine.cpp"
- >
- </File>
- <File
- RelativePath=".\hooked_events.cpp"
- >
- </File>
- <File
- RelativePath=".\mimcmd_data.cpp"
- >
- </File>
- <File
- RelativePath=".\mimcmd_handlers.cpp"
- >
- </File>
- <File
- RelativePath=".\mimcmd_ipc.cpp"
- >
- </File>
- <File
- RelativePath=".\mirandaMem.cpp"
- >
- </File>
- <File
- RelativePath=".\services.cpp"
- >
- </File>
- <File
- RelativePath=".\utils.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\commonheaders.h"
- >
- </File>
- <File
- RelativePath=".\hooked_events.h"
- >
- </File>
- <File
- RelativePath=".\mimcmd_data.h"
- >
- </File>
- <File
- RelativePath=".\mimcmd_handlers.h"
- >
- </File>
- <File
- RelativePath=".\mimcmd_ipc.h"
- >
- </File>
- <File
- RelativePath=".\mirandaMem.h"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\services.h"
- >
- </File>
- <File
- RelativePath=".\utils.h"
- >
- </File>
- <File
- RelativePath=".\version.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\CmdLine.rc"
- >
- </File>
- <File
- RelativePath=".\version.rc"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\docs\CmdLine_readme.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/plugins/CmdLine/CmdLine/mirandaMem.cpp b/plugins/CmdLine/CmdLine/mirandaMem.cpp deleted file mode 100644 index a945c4c1b1..0000000000 --- a/plugins/CmdLine/CmdLine/mirandaMem.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/*
-CmdLine plugin for Miranda IM
-
-Copyright © 2007 Cristian Libotean
-
-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 "mirandaMem.h"
-
-struct MM_INTERFACE mmi;
-
-void InitializeMirandaMemFunctions()
-{
- mir_getMMI(&mmi);
-}
\ No newline at end of file diff --git a/plugins/CmdLine/CmdLine/mirandaMem.h b/plugins/CmdLine/CmdLine/mirandaMem.h deleted file mode 100644 index 3468fcbc41..0000000000 --- a/plugins/CmdLine/CmdLine/mirandaMem.h +++ /dev/null @@ -1,30 +0,0 @@ -/*
-CmdLine plugin for Miranda IM
-
-Copyright © 2007 Cristian Libotean
-
-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.
-*/
-
-#ifndef M_CMDLINE_MIRANDA_MEM_H
-#define M_CMDLINE_MIRANDA_MEM_H
-
-#include "commonheaders.h"
-
-extern struct MM_INTERFACE mmi;
-
-void InitializeMirandaMemFunctions();
-
-#endif
\ No newline at end of file diff --git a/plugins/CmdLine/executable/MimCmd/MimCmd.cpp b/plugins/CmdLine/MimCmd/MimCmd.cpp index 2709d6c034..2709d6c034 100644 --- a/plugins/CmdLine/executable/MimCmd/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/MimCmd.cpp diff --git a/plugins/CmdLine/executable/MimCmd/MimCmd.vcproj b/plugins/CmdLine/MimCmd/MimCmd.vcproj index fb04bfb375..fb04bfb375 100644 --- a/plugins/CmdLine/executable/MimCmd/MimCmd.vcproj +++ b/plugins/CmdLine/MimCmd/MimCmd.vcproj diff --git a/plugins/CmdLine/executable/MimCmd/commands.cpp b/plugins/CmdLine/MimCmd/commands.cpp index b04b9ba7ba..b04b9ba7ba 100644 --- a/plugins/CmdLine/executable/MimCmd/commands.cpp +++ b/plugins/CmdLine/MimCmd/commands.cpp diff --git a/plugins/CmdLine/executable/MimCmd/commands.h b/plugins/CmdLine/MimCmd/commands.h index 04cc640f48..04cc640f48 100644 --- a/plugins/CmdLine/executable/MimCmd/commands.h +++ b/plugins/CmdLine/MimCmd/commands.h diff --git a/plugins/CmdLine/executable/MimCmd/common.h b/plugins/CmdLine/MimCmd/common.h index 8361cc24d4..8361cc24d4 100644 --- a/plugins/CmdLine/executable/MimCmd/common.h +++ b/plugins/CmdLine/MimCmd/common.h diff --git a/plugins/CmdLine/executable/MimCmd/langpack.cpp b/plugins/CmdLine/MimCmd/langpack.cpp index 096431f95b..096431f95b 100644 --- a/plugins/CmdLine/executable/MimCmd/langpack.cpp +++ b/plugins/CmdLine/MimCmd/langpack.cpp diff --git a/plugins/CmdLine/executable/MimCmd/langpack.h b/plugins/CmdLine/MimCmd/langpack.h index 15d6b301b5..15d6b301b5 100644 --- a/plugins/CmdLine/executable/MimCmd/langpack.h +++ b/plugins/CmdLine/MimCmd/langpack.h diff --git a/plugins/CmdLine/executable/MimCmd/resource.h b/plugins/CmdLine/MimCmd/resource.h index c3bc570152..c3bc570152 100644 --- a/plugins/CmdLine/executable/MimCmd/resource.h +++ b/plugins/CmdLine/MimCmd/resource.h diff --git a/plugins/CmdLine/executable/MimCmd/version.rc b/plugins/CmdLine/MimCmd/version.rc index 36d39c3d33..36d39c3d33 100644 --- a/plugins/CmdLine/executable/MimCmd/version.rc +++ b/plugins/CmdLine/MimCmd/version.rc diff --git a/plugins/CmdLine/CmdLine/commonheaders.h b/plugins/CmdLine/commonheaders.h index 8a04e27e9a..b7a332c9d6 100644 --- a/plugins/CmdLine/CmdLine/commonheaders.h +++ b/plugins/CmdLine/commonheaders.h @@ -21,9 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_CMDLINE_COMMONHEADERS_H
#define M_CMDLINE_COMMONHEADERS_H
-#ifndef MIRANDA_VER
-#define MIRANDA_VER 0x0800
-#endif
+#define MIRANDA_VER 0x0A00
+#define _CRT_SECURE_NO_WARNINGS
#define MIID_CMDLINE {0xcf8d9633, 0x7744, 0x4a5c, {0xb4, 0x8c, 0x2b, 0xd6, 0x36, 0xa4, 0x6c, 0xde}}
@@ -33,14 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <windows.h>
#include <time.h>
-#include "version.h"
-#include "utils.h"
-#include "mirandaMem.h"
-//#include "services.h"
-//#include "dlg_handlers.h"
-
-#include "resource.h"
-
#include "newpluginapi.h"
#include "m_database.h"
#include "m_system.h"
@@ -56,11 +47,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_message.h"
#include "m_ignore.h"
-#include "sdk/m_versioninfo.h"
-#include "sdk/m_statusplugins.h"
-#include "sdk//m_updater.h"
+#include "m_versioninfo.h"
+#include "m_statusplugins.h"
+#include "version.h"
+#include "utils.h"
+#include "resource.h"
#include "hooked_events.h"
+#include "utils.h"
+#include "mimcmd_ipc.h"
+#include "services.h"
+#include "mimcmd_handlers.h"
+#include "mimcmd_data.h"
extern char ModuleName[];
extern HINSTANCE hInstance;
@@ -73,24 +71,6 @@ extern int bWaitForUnload; #define ID_ICQ_EXIT 40001
-#define OLD_MIRANDAPLUGININFO_SUPPORT PLUGININFO oldPluginInfo = { \
- sizeof(PLUGININFO), \
- pluginInfo.shortName, \
- pluginInfo.version, \
- pluginInfo.description, \
- pluginInfo.author, \
- pluginInfo.authorEmail, \
- pluginInfo.copyright, \
- pluginInfo.homepage, \
- pluginInfo.flags, \
- pluginInfo.replacesDefaultModule \
-}; \
-\
-extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion) \
-{ \
- return &oldPluginInfo; \
-}
-
static __inline int mir_old_snprintf(char *buffer, size_t count, const char* fmt, ...) {
va_list va;
int len;
diff --git a/plugins/CmdLine/files_release.txt b/plugins/CmdLine/files_release.txt deleted file mode 100644 index 173a6a177d..0000000000 --- a/plugins/CmdLine/files_release.txt +++ /dev/null @@ -1 +0,0 @@ -executable\MimCmd\win32\Release\*.exe
diff --git a/plugins/CmdLine/files_releasex64.txt b/plugins/CmdLine/files_releasex64.txt deleted file mode 100644 index 19ce16953c..0000000000 --- a/plugins/CmdLine/files_releasex64.txt +++ /dev/null @@ -1 +0,0 @@ -executable\MimCmd\x64\Release\*.exe
diff --git a/plugins/CmdLine/files_source.txt b/plugins/CmdLine/files_source.txt deleted file mode 100644 index cfc893cd2a..0000000000 --- a/plugins/CmdLine/files_source.txt +++ /dev/null @@ -1,5 +0,0 @@ -CmdLine\*.*
-executable\*.*
-executable\MimCmd\*.*
-docs\*.*
-*.*
diff --git a/plugins/CmdLine/CmdLine/hooked_events.cpp b/plugins/CmdLine/hooked_events.cpp index a8a13c6420..6ccac9080a 100644 --- a/plugins/CmdLine/CmdLine/hooked_events.cpp +++ b/plugins/CmdLine/hooked_events.cpp @@ -18,9 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hooked_events.h"
-#include "mimcmd_ipc.h"
-#include "services.h"
+#include "commonheaders.h"
HANDLE hModulesLoaded;
HANDLE hOptionsInitialize;
@@ -32,17 +30,6 @@ int bShouldProcessAcks = FALSE; ACKDATA acks[50] = {0};
int cAcks = sizeof(acks) / sizeof(acks[0]);
-#define HOST "http://eblis.tla.ro/projects"
-
-#if defined(WIN64) || defined(_WIN64)
-#define CMDLINE_VERSION_URL HOST "/miranda/CmdLine/updater/x64/CmdLine.html"
-#define CMDLINE_UPDATE_URL HOST "/miranda/CmdLine/updater/x64/CmdLine.zip"
-#else
-#define CMDLINE_VERSION_URL HOST "/miranda/CmdLine/updater/CmdLine.html"
-#define CMDLINE_UPDATE_URL HOST "/miranda/CmdLine/updater/CmdLine.zip"
-#endif
-#define CMDLINE_VERSION_PREFIX "CmdLine version "
-
int HookEvents()
{
hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
@@ -65,19 +52,6 @@ int UnhookEvents() int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- char buffer[1024];
- Update update = {0};
- update.cbSize = sizeof(Update);
- update.szComponentName = __PLUGIN_DISPLAY_NAME;
- update.pbVersion = (BYTE *) CreateVersionString(VERSION, buffer);
- update.cpbVersion = (int) strlen((char *) update.pbVersion);
- update.szUpdateURL = UPDATER_AUTOREGISTER;
- update.szBetaVersionURL = CMDLINE_VERSION_URL;
- update.szBetaUpdateURL = CMDLINE_UPDATE_URL;
- update.pbBetaVersionPrefix = (BYTE *) CMDLINE_VERSION_PREFIX;
- update.cpbBetaVersionPrefix = (int) strlen(CMDLINE_VERSION_PREFIX);
- CallService(MS_UPDATE_REGISTER, 0, (LPARAM) &update);
-
StartServer();
return 0;
diff --git a/plugins/CmdLine/CmdLine/hooked_events.h b/plugins/CmdLine/hooked_events.h index 2498638400..2498638400 100644 --- a/plugins/CmdLine/CmdLine/hooked_events.h +++ b/plugins/CmdLine/hooked_events.h diff --git a/plugins/CmdLine/CmdLine/mimcmd_data.cpp b/plugins/CmdLine/mimcmd_data.cpp index bbf64278d3..95550ed778 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_data.cpp +++ b/plugins/CmdLine/mimcmd_data.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "mimcmd_data.h"
+#include "commonheaders.h"
TCommand mimCommands[] = {{MIMCMD_STATUS, "status", MIMCMD_HELP_STATUS},
{MIMCMD_AWAYMSG, "awaymsg", MIMCMD_HELP_AWAYMSG},
diff --git a/plugins/CmdLine/CmdLine/mimcmd_data.h b/plugins/CmdLine/mimcmd_data.h index d8570548f8..d8570548f8 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_data.h +++ b/plugins/CmdLine/mimcmd_data.h diff --git a/plugins/CmdLine/CmdLine/mimcmd_handlers.cpp b/plugins/CmdLine/mimcmd_handlers.cpp index 0f828f8e0e..9b2d89b696 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_handlers.cpp +++ b/plugins/CmdLine/mimcmd_handlers.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "mimcmd_handlers.h"
+#include "commonheaders.h"
#define STATE_UNKNOWN -1
#define STATE_OFF 0
diff --git a/plugins/CmdLine/CmdLine/mimcmd_handlers.h b/plugins/CmdLine/mimcmd_handlers.h index 3446445d58..3446445d58 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_handlers.h +++ b/plugins/CmdLine/mimcmd_handlers.h diff --git a/plugins/CmdLine/CmdLine/mimcmd_ipc.cpp b/plugins/CmdLine/mimcmd_ipc.cpp index bc7c2b4cbe..d16de2e7a8 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_ipc.cpp +++ b/plugins/CmdLine/mimcmd_ipc.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "mimcmd_ipc.h"
+#include "commonheaders.h"
HANDLE hsmCmdLine = NULL;
HANDLE hmClient = NULL;
diff --git a/plugins/CmdLine/CmdLine/mimcmd_ipc.h b/plugins/CmdLine/mimcmd_ipc.h index 3b845c030a..3b845c030a 100644 --- a/plugins/CmdLine/CmdLine/mimcmd_ipc.h +++ b/plugins/CmdLine/mimcmd_ipc.h diff --git a/plugins/CmdLine/pack source.bat b/plugins/CmdLine/pack source.bat deleted file mode 100644 index 555522e5e6..0000000000 --- a/plugins/CmdLine/pack source.bat +++ /dev/null @@ -1,8 +0,0 @@ -for /F "tokens=4-8* delims=. " %%i in (docs\CmdLine_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "CmdLine src %1.%2.%3.%4.zip" @files_source.txt -x*.zip -x*.ncb -x*.user
-exit
-
-error:
-echo "Error packing Bonsai"
diff --git a/plugins/CmdLine/pack symbols.bat b/plugins/CmdLine/pack symbols.bat deleted file mode 100644 index c765d34756..0000000000 --- a/plugins/CmdLine/pack symbols.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off
-if NOT EXIST "symbols\%1 - %3" (
- mkdir "symbols\%1 - %3"
-)
-xcopy "%1\win32\Release\*.pdb" "symbols\%1 - %3\win32\*" /EXCLUDE:symbols_exclude.txt /Y
-xcopy "%2\win32\Release\*.pdb" "symbols\%1 - %3\win32\*" /EXCLUDE:symbols_exclude.txt /Y
-
-xcopy "%1\x64\Release\*.pdb" "symbols\%1 - %3\x64\*" /EXCLUDE:symbols_exclude.txt /Y
-xcopy "%2\x64\Release\*.pdb" "symbols\%1 - %3\x64\*" /EXCLUDE:symbols_exclude.txt /Y
-
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -r -c2 "symbols - %1.zip" "symbols\*.*"
-rmdir "symbols\" /Q /S
\ No newline at end of file diff --git a/plugins/CmdLine/pack x64.bat b/plugins/CmdLine/pack x64.bat deleted file mode 100644 index e6a5812727..0000000000 --- a/plugins/CmdLine/pack x64.bat +++ /dev/null @@ -1,18 +0,0 @@ -if NOT EXIST "plugins" (
- mkdir "plugins"
-)
-
-xcopy "CmdLine\x64\Release\*.dll" "plugins\*"
-
-for /F "tokens=4-8* delims=. " %%i in (docs\CmdLine_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -a -c2 "CmdLine %1.%2.%3.%4 x64.zip" @files_releasex64.txt
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "CmdLine %1.%2.%3.%4 x64.zip" docs\*.* *.caca
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "CmdLine %1.%2.%3.%4 x64.zip" plugins\*.* *.caca
-rmdir "plugins\" /Q /S
-call "pack symbols.bat" CmdLine executable\MimCmd %1.%2.%3.%4
-exit
-
-error:
-echo "Error packing CmdLine"
diff --git a/plugins/CmdLine/pack.bat b/plugins/CmdLine/pack.bat deleted file mode 100644 index 38411bd994..0000000000 --- a/plugins/CmdLine/pack.bat +++ /dev/null @@ -1,18 +0,0 @@ -if NOT EXIST "plugins" (
- mkdir "plugins"
-)
-
-xcopy "CmdLine\win32\Release\*.dll" "plugins\*"
-
-for /F "tokens=4-8* delims=. " %%i in (docs\CmdLine_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -a -c2 "CmdLine %1.%2.%3.%4 x32.zip" @files_release.txt
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "CmdLine %1.%2.%3.%4 x32.zip" docs\*.* *.caca
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "CmdLine %1.%2.%3.%4 x32.zip" plugins\*.* *.caca
-rmdir "plugins\" /Q /S
-call "pack symbols.bat" CmdLine executable\MimCmd %1.%2.%3.%4
-exit
-
-error:
-echo "Error packing CmdLine"
diff --git a/plugins/CmdLine/CmdLine/resource.h b/plugins/CmdLine/resource.h index 0268ce4765..0268ce4765 100644 --- a/plugins/CmdLine/CmdLine/resource.h +++ b/plugins/CmdLine/resource.h diff --git a/plugins/CmdLine/CmdLine/services.cpp b/plugins/CmdLine/services.cpp index d5dd45fad8..9e006a0046 100644 --- a/plugins/CmdLine/CmdLine/services.cpp +++ b/plugins/CmdLine/services.cpp @@ -18,8 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "services.h"
-#include "mimcmd_ipc.h"
+#include "commonheaders.h"
int bWaitForUnload = 0;
diff --git a/plugins/CmdLine/CmdLine/services.h b/plugins/CmdLine/services.h index 07f6ffaeec..07f6ffaeec 100644 --- a/plugins/CmdLine/CmdLine/services.h +++ b/plugins/CmdLine/services.h diff --git a/plugins/CmdLine/symbols_exclude.txt b/plugins/CmdLine/symbols_exclude.txt deleted file mode 100644 index 361cf2448b..0000000000 --- a/plugins/CmdLine/symbols_exclude.txt +++ /dev/null @@ -1 +0,0 @@ -vc80.pdb
\ No newline at end of file diff --git a/plugins/CmdLine/CmdLine/utils.cpp b/plugins/CmdLine/utils.cpp index 241f6ecfe7..7d1136602f 100644 --- a/plugins/CmdLine/CmdLine/utils.cpp +++ b/plugins/CmdLine/utils.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "utils.h"
+#include "commonheaders.h"
int LogInit()
{
diff --git a/plugins/CmdLine/CmdLine/utils.h b/plugins/CmdLine/utils.h index 70bdb84fad..70bdb84fad 100644 --- a/plugins/CmdLine/CmdLine/utils.h +++ b/plugins/CmdLine/utils.h diff --git a/plugins/CmdLine/CmdLine/version.h b/plugins/CmdLine/version.h index 03656ae51d..03656ae51d 100644 --- a/plugins/CmdLine/CmdLine/version.h +++ b/plugins/CmdLine/version.h diff --git a/plugins/CmdLine/CmdLine/version.rc b/plugins/CmdLine/version.rc index 737644cfab..737644cfab 100644 --- a/plugins/CmdLine/CmdLine/version.rc +++ b/plugins/CmdLine/version.rc |