MirLua: WinAPI module moved to external library

git-svn-id: http://svn.miranda-ng.org/main/trunk@16045 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 271 insertions, 75 deletions

diff --git a/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj b/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj
new file mode 100644
index 0000000000..86a81c3522
--- /dev/null
+++ b/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj
@@ -0,0 +1,36 @@
+<?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>

+    <ProjectReference Include="..\..\..\..\libs\liblua\liblua.vcxproj">

+      <Project>{bd291bf0-d804-4818-8311-de871e6bceaa}</Project>

+    </ProjectReference>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>WinAPI</ProjectName>

+    <ProjectGuid>{045bac91-34d1-4b43-b52b-566801be7f85}</ProjectGuid>

+  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">

+    <Import Project="$(ProjectDir)..\module.props" />

+  </ImportGroup>

+  <ItemDefinitionGroup>

+    <ClCompile>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\libs\liblua\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ClCompile>

+  </ItemDefinitionGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/MirLua/Modules/WinAPI/src/stdafx.cxx b/plugins/MirLua/Modules/WinAPI/src/stdafx.cxx
new file mode 100644
index 0000000000..1577c4e3bc
--- /dev/null
+++ b/plugins/MirLua/Modules/WinAPI/src/stdafx.cxx
@@ -0,0 +1 @@
+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/MirLua/Modules/WinAPI/src/stdafx.h b/plugins/MirLua/Modules/WinAPI/src/stdafx.h
new file mode 100644
index 0000000000..9b4664bd1f
--- /dev/null
+++ b/plugins/MirLua/Modules/WinAPI/src/stdafx.h
@@ -0,0 +1,69 @@
+/****h* Win32/luaw32.c [$Revision: 13 $]

+* NAME

+*  luaw32

+* COPYRIGHT

+*  (C) 2004-2007 Daniel Quintela.  All rights reserved.

+*  http://www.soongsoft.com mailto:dq@soongsoft.com

+*  (C) 2013 http://quik2dde.ru

+* LICENSE

+*  Permission is hereby granted, free of charge, to any person obtaining

+*  a copy of this software and associated documentation files (the

+*  "Software"), to deal in the Software without restriction, including

+*  without limitation the rights to use, copy, modify, merge, publish,

+*  distribute, sublicense, and/or sell copies of the Software, and to

+*  permit persons to whom the Software is furnished to do so, subject to

+*  the following conditions:

+*

+*  The above copyright notice and this permission notice shall be

+*  included in all copies or substantial portions of the Software.

+*

+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+*  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

+*  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+*  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+*  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+* FUNCTION

+*  Win32 functions & constants binding..

+* AUTHOR

+*  Daniel Quintela

+* CREATION DATE

+*  2004/08/16

+* MODIFICATION HISTORY

+*  $Id: luaw32.c 13 2007-04-15 13:39:04Z  $

+*

+*        When                Who                      What

+* -------------------  ----------------  ----------------------------------------

+* 2004-09-01 12:20:00  Danilo Tuler      GetTempPath added.

+* 2006-08-25 08:20:00  Denis Povshedny   QueryServiceConfig & StartService added.

+* 2007-04-15 10:31:00  Daniel Quintela   CreateMutex parameter list fixed.

+* 2013-10-27 00:00:15  www.quik2dde.ru   Linking with qlia.dll

+*

+* NOTES

+*

+***/

+#define LUA_WINAPI_LIB extern "C" int __declspec(dllexport)

+

+#include <lua.hpp>

+

+#include <windows.h>

+#include <stddef.h>

+#include <process.h>

+#include <direct.h>

+#include <tchar.h>

+#include <shlwapi.h>

+#include <shlobj.h>

+

+#include <time.h>

+

+#include <errno.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <sys/utime.h>

+

+

+#include <m_core.h>

+#include <m_utils.h>

+

+#define MYP2HCAST	(long)
\ No newline at end of file
diff --git a/plugins/MirLua/src/m_windows.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
index 8fec0f21c3..dbf564d210 100644
--- a/plugins/MirLua/src/m_windows.cpp
+++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
@@ -368,73 +368,6 @@ static int lua_DeleteRegValue(lua_State *L)
 	return 1;

 }

 

-

-

-/****h* Win32/luaw32.c [$Revision: 13 $]

-* NAME

-*  luaw32

-* COPYRIGHT

-*  (C) 2004-2007 Daniel Quintela.  All rights reserved.

-*  http://www.soongsoft.com mailto:dq@soongsoft.com

-*  (C) 2013 http://quik2dde.ru

-* LICENSE

-*  Permission is hereby granted, free of charge, to any person obtaining

-*  a copy of this software and associated documentation files (the

-*  "Software"), to deal in the Software without restriction, including

-*  without limitation the rights to use, copy, modify, merge, publish,

-*  distribute, sublicense, and/or sell copies of the Software, and to

-*  permit persons to whom the Software is furnished to do so, subject to

-*  the following conditions:

-*

-*  The above copyright notice and this permission notice shall be

-*  included in all copies or substantial portions of the Software.

-*

-*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-*  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

-*  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

-*  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

-*  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-* FUNCTION

-*  Win32 functions & constants binding..

-* AUTHOR

-*  Daniel Quintela

-* CREATION DATE

-*  2004/08/16

-* MODIFICATION HISTORY

-*  $Id: luaw32.c 13 2007-04-15 13:39:04Z  $

-*

-*        When                Who                      What

-* -------------------  ----------------  ----------------------------------------

-* 2004-09-01 12:20:00  Danilo Tuler      GetTempPath added.

-* 2006-08-25 08:20:00  Denis Povshedny   QueryServiceConfig & StartService added.

-* 2007-04-15 10:31:00  Daniel Quintela   CreateMutex parameter list fixed.

-* 2013-10-27 00:00:15  www.quik2dde.ru   Linking with qlia.dll

-*

-* NOTES

-*

-***/

-

-

-#include <windows.h>

-#include <stddef.h>

-#include <process.h>

-#include <direct.h>

-

-#undef Translate

-#include <shlwapi.h>

-#include <shlobj.h>

-

-#include <time.h>

-

-#include <errno.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <sys/utime.h>

-

-#define MYP2HCAST	(long)

-

 /* Registered functions */

 

 static int global_ShellOpen(lua_State *L) {

@@ -2209,7 +2142,7 @@ static luaL_Reg winApi[] =
 	{ NULL, NULL }

 };

 

-LUAMOD_API int luaopen_m_windows(lua_State *L)

+LUA_WINAPI_LIB luaopen_WinAPI(lua_State *L)

 {

 	luaL_newlib(L, winApi);

 	

diff --git a/plugins/MirLua/Modules/common.filters b/plugins/MirLua/Modules/common.filters
new file mode 100644
index 0000000000..1af5b5334c
--- /dev/null
+++ b/plugins/MirLua/Modules/common.filters
@@ -0,0 +1,32 @@
+<?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="*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClInclude Include="*.h;*.hpp">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ResourceCompile Include="*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="*.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/MirLua/Modules/common.props b/plugins/MirLua/Modules/common.props
new file mode 100644
index 0000000000..0e6422d781
--- /dev/null
+++ b/plugins/MirLua/Modules/common.props
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Label="UserMacros">

+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\..\..\bin10\lib</CommonLibDir>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\..\..\bin12\lib</CommonLibDir>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\..\..\bin14\lib</CommonLibDir>

+  </PropertyGroup>

+  <PropertyGroup>

+    <RootNamespace>$(ProjectName)</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+    <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>

+    <IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>

+    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ItemDefinitionGroup>

+    <ClCompile>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <IntrinsicFunctions>false</IntrinsicFunctions>

+      <WarningLevel>Level4</WarningLevel>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

+      <ExceptionHandling>false</ExceptionHandling>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(CommonLibDir)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <GenerateMapFile>false</GenerateMapFile>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

+  </ItemDefinitionGroup>

+

+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <WholeProgramOptimization>false</WholeProgramOptimization>

+      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+    </ClCompile>

+    <Link>

+      <LinkTimeCodeGeneration>

+      </LinkTimeCodeGeneration>

+    </Link>

+  </ItemDefinitionGroup>

+

+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <OmitFramePointers>true</OmitFramePointers>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <StringPooling>true</StringPooling>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+    </ClCompile>

+    <Link>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <AdditionalOptions Condition="'$(VisualStudioVersion)' == '10.0'">/PDBALTPATH:%_PDB%</AdditionalOptions>

+    </Link>

+  </ItemDefinitionGroup>

+

+  <ItemGroup>

+    <ClCompile Include="src\stdafx.cxx">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp" />

+    <ClCompile Include="src\*.c">

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClInclude Include="src\*.hpp" />

+    <ClInclude Include="src\*.h" />

+    <ResourceCompile Include="res\*.rc" />

+    <None Include="src\*.def" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+</Project>

diff --git a/plugins/MirLua/Modules/module.props b/plugins/MirLua/Modules/module.props
new file mode 100644
index 0000000000..59c3cc1d87
--- /dev/null
+++ b/plugins/MirLua/Modules/module.props
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ImportGroup Label="PropertySheets">

+  </ImportGroup>

+  <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>

+    <GenerateManifest>false</GenerateManifest>

+    <EmbedManifest>false</EmbedManifest>

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Scripts\</OutDir>

+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Scripts\</OutDir>

+  </PropertyGroup>

+  <Import Project="common.props"/>

+</Project>

diff --git a/plugins/MirLua/src/m_hotkeys.cpp b/plugins/MirLua/src/m_hotkeys.cpp
index a052f5beb1..030107ebb6 100644
--- a/plugins/MirLua/src/m_hotkeys.cpp
+++ b/plugins/MirLua/src/m_hotkeys.cpp
@@ -46,8 +46,7 @@ static int lua_Register(lua_State *L)
 

 	HOTKEYDESC hk;

 	MakeHotkey(L, hk);

-

-	INT_PTR res = ::CallService("CoreHotkeys/Register", (WPARAM)hScriptsLangpack, (LPARAM)&hk);

+	INT_PTR res = ::CallService("CoreHotkeys/Register", (WPARAM)hLangpack, (LPARAM)&hk);

 	lua_pushboolean(L, res);

 

 	return 1;

diff --git a/plugins/MirLua/src/mlua_module_loader.cpp b/plugins/MirLua/src/mlua_module_loader.cpp
index d48c600de1..426f7bd9e6 100644
--- a/plugins/MirLua/src/mlua_module_loader.cpp
+++ b/plugins/MirLua/src/mlua_module_loader.cpp
@@ -15,8 +15,8 @@ void CLuaModuleLoader::Load(const char *name, lua_CFunction loader)
 	lua_pushstring(L, name);

 	luaM_pcall(L, 1, 1);

 	lua_setfield(L, -2, name);

-	lua_pop(L, 1);
-	lua_pop(L, 1);
+	lua_pop(L, 1);

+	lua_pop(L, 1);

 }

 

 void CLuaModuleLoader::Preload(const char *name, lua_CFunction loader)

@@ -46,7 +46,6 @@ void CLuaModuleLoader::LoadModules()
 	Preload(MLUA_POPUP, luaopen_m_popup);

 	Preload(MLUA_TOPTOOLBAR, luaopen_m_toptoolbar);

 	Preload(MLUA_VARIABLES, luaopen_m_variables);

-	Preload(MLUA_WINDOWS, luaopen_m_windows);

 }

 

 void CLuaModuleLoader::Load(lua_State *L)

diff --git a/plugins/MirLua/src/stdafx.h b/plugins/MirLua/src/stdafx.h
index 9282c6a77a..109e91c1e4 100644
--- a/plugins/MirLua/src/stdafx.h
+++ b/plugins/MirLua/src/stdafx.h
@@ -100,8 +100,6 @@ LUAMOD_API int (luaopen_m_sounds)(lua_State *L);
 #define MLUA_VARIABLES	"m_variables"

 LUAMOD_API int (luaopen_m_variables)(lua_State *L);

 

-#define MLUA_WINDOWS	"m_windows"

-LUAMOD_API int (luaopen_m_windows)(lua_State *L);

 

 /* utils */