1.9.4.6予定。jsmode と互換の関数群をあらかた実装

hmV8.src/hmJS/dllmain.cpp

@@ -0,0 +1,24 @@
+#include <windows.h>
+
+HMODULE hSelfDllModule = NULL;
+
+
+#pragma unmanaged
+BOOL APIENTRY DllMain(HMODULE hModule,
+	DWORD  ul_reason_for_call,
+	LPVOID lpReserved
+)
+{
+	switch (ul_reason_for_call)
+	{
+	case DLL_PROCESS_ATTACH:
+		hSelfDllModule = hModule;
+	case DLL_THREAD_ATTACH:
+	case DLL_THREAD_DETACH:
+	case DLL_PROCESS_DETACH:
+		break;
+	}
+	return TRUE;
+}
+
+#pragma managed

hmV8.src/hmJS/hmJS.vcxproj

@@ -156,6 +156,7 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="hidemaruexe_export.cpp" />
     <ClCompile Include="hmV8.cpp" />
     <ClCompile Include="string_converter.cpp" />

hmV8.src/hmJS/hmJS.vcxproj.filters

@@ -26,6 +26,9 @@
     <ClCompile Include="hmV8.cpp">
       <Filter>本体</Filter>
     </ClCompile>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>本体</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="hidemaruexe_export.h">

hmV8.src/hmJS/hmV8.cpp

@@ -16,6 +16,7 @@
 using namespace std;
 using namespace System;
 
+extern HMODULE hSelfDllModule;
 
 // 上の手動のBindDllHandleを自動で行う。秀丸8.66以上
 // １回だけ実行すれば良いわけではない。dllが読み込まれている間にもdll値が変わってしまうかもしれないため。(将来の実装では)
@@ -30,6 +31,24 @@ static bool BindDllHandle() {
 	return false;
 }
 
+bool isExpressionLoaded = false;
+static bool InitializeHandle() {
+	bool ret = BindDllHandle();
+	if (!isExpressionLoaded && hSelfDllModule) {
+		HRSRC res = FindResource(hSelfDllModule, TEXT("HMJSMODE"), TEXT("TEXT"));
+		if (res) {
+			char* expression = (char*)LoadResource(hSelfDllModule, res);
+			if (expression) {
+				String^ mng_expression = gcnew String(expression);
+				IV8StaticLib::SetJSModeExpression(mng_expression);
+				isExpressionLoaded = true;
+			}
+		}
+	}
+	return ret;
+}
+
+
 //------------------------------------------------------------------------------------
 MACRO_DLL intHM_t SetDebuggingPort(intHM_t port) {
 	IV8StaticLib::SetDebuggingPort((IntPtr)port);
@@ -67,59 +86,59 @@ MACRO_DLL const TCHAR * PopStrVar() {
 
 //------------------------------------------------------------------------------------
 MACRO_DLL intHM_t GetNumVar(const TCHAR *sz_var_name) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::GetNumVar(gcnew String(sz_var_name));
 }
 
 MACRO_DLL intHM_t SetNumVar(const TCHAR *sz_var_name, intHM_t value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetNumVar(gcnew String(sz_var_name), (IntPtr)value);
 }
 
 // 秀丸のキャッシュのため
 static wstring strvars;
 MACRO_DLL const TCHAR * GetStrVar(const TCHAR *sz_var_name) {
-	BindDllHandle();
+	InitializeHandle();
 
 	auto var = IV8StaticLib::GetStrVar(gcnew String(sz_var_name));
 	strvars = String_to_tstring(var->ToString());
 	return strvars.data();
 }
 
 MACRO_DLL intHM_t SetStrVar(const TCHAR *sz_var_name, const TCHAR *value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetStrVar(gcnew String(sz_var_name), gcnew String(value));
 }
 //------------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------------
 MACRO_DLL intHM_t GetNumItemOfList(const TCHAR *sz_arr_name, const intHM_t index) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::GetNumItemOfList(gcnew String(sz_arr_name), (IntPtr)index);
 }
 
 MACRO_DLL intHM_t SetNumItemOfList(const TCHAR *sz_arr_name, const intHM_t index, const intHM_t value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetNumItemOfList(gcnew String(sz_arr_name), (IntPtr)index, (IntPtr)value);
 }
 
 // 秀丸のキャッシュのため
 static wstring strvarsoflist;
 MACRO_DLL const TCHAR * GetStrItemOfList(const TCHAR *sz_arr_name, const intHM_t index) {
-	BindDllHandle();
+	InitializeHandle();
 
 	auto var = IV8StaticLib::GetStrItemOfList(gcnew String(sz_arr_name), (IntPtr)index);
 	strvarsoflist = String_to_tstring(var->ToString());
 	return strvarsoflist.data();
 }
 
 MACRO_DLL intHM_t SetStrItemOfList(const TCHAR *sz_arr_name, const intHM_t index, const TCHAR *value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetStrItemOfList(gcnew String(sz_arr_name), (IntPtr)index, gcnew String(value));
 }
@@ -129,13 +148,13 @@ MACRO_DLL intHM_t SetStrItemOfList(const TCHAR *sz_arr_name, const intHM_t index
 
 //------------------------------------------------------------------------------------
 MACRO_DLL intHM_t GetNumItemOfDict(const TCHAR *sz_arr_name, const TCHAR *key) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::GetNumItemOfDict(gcnew String(sz_arr_name), gcnew String(key));
 }
 
 MACRO_DLL intHM_t SetNumItemOfDict(const TCHAR *sz_arr_name, const TCHAR *key, const intHM_t value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetNumItemOfDict(gcnew String(sz_arr_name), gcnew String(key), (IntPtr)value);
 }
@@ -144,23 +163,23 @@ MACRO_DLL intHM_t SetNumItemOfDict(const TCHAR *sz_arr_name, const TCHAR *key, c
 
 static wstring strvarsofdict;
 MACRO_DLL const TCHAR * GetStrItemOfDict(const TCHAR *sz_arr_name, const TCHAR *key) {
-	BindDllHandle();
+	InitializeHandle();
 
 	auto var = IV8StaticLib::GetStrItemOfDict(gcnew String(sz_arr_name), gcnew String(key));
 	strvarsofdict = String_to_tstring(var->ToString());
 	return strvarsofdict.data();
 }
 
 MACRO_DLL intHM_t SetStrItemOfDict(const TCHAR *sz_arr_name, const TCHAR *key, const TCHAR *value) {
-	BindDllHandle();
+	InitializeHandle();
 
 	return (intHM_t)IV8StaticLib::SetStrItemOfDict(gcnew String(sz_arr_name), gcnew String(key), gcnew String(value));
 }
 //------------------------------------------------------------------------------------
 
 
 MACRO_DLL intHM_t DoString(const TCHAR *szexpression) {
-	BindDllHandle();
+	InitializeHandle();
 
 	// ここはよく間違えるのでここだけチェック。他は秀丸8.66以降ではほとんど利用しないので無視
 	if (Hidemaru_GetDllFuncCalledType) {
@@ -179,7 +198,7 @@ MACRO_DLL intHM_t DoString(const TCHAR *szexpression) {
 }
 
 MACRO_DLL intHM_t DoFile(const TCHAR *szfilename) {
-	BindDllHandle();
+	InitializeHandle();
 
 	// ここはよく間違えるのでここだけチェック。他は秀丸8.66以降ではほとんど利用しないので無視
 	if (Hidemaru_GetDllFuncCalledType) {
@@ -198,6 +217,7 @@ MACRO_DLL intHM_t DoFile(const TCHAR *szfilename) {
 }
 
 MACRO_DLL intHM_t DestroyScope() {
+	isExpressionLoaded = false;
 	return (intHM_t)IV8StaticLib::DestroyScope();
 }
 

hmV8.src/hmJS/hmV8StatlcLib.h

@@ -19,6 +19,8 @@ public ref class IV8StaticLib
 
 	static IntPtr BindDllHandle(IntPtr dll);
 
+	static void SetJSModeExpression(String^ str);
+
 	static void SetCodePage(IntPtr cp);
 
 	static IntPtr SetTmpVar(Object^ value);

hmV8.src/hmJSStaticLib/ClearScript/Properties/AssemblyInfo.cs

@@ -2,5 +2,5 @@
 using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.9.4.5")]
-[assembly: AssemblyFileVersion("1.9.4.5")]
+[assembly: AssemblyVersion("1.9.4.6")]
+[assembly: AssemblyFileVersion("1.9.4.6")]

hmV8.src/hmJSStaticLib/ClearScript/hmJSStaticLib/hmV8StaticLib.cs

@@ -36,6 +36,10 @@ public static IntPtr BindDllHandle(IntPtr dll)
     {
         return hmV8DynamicLib.BindDllHandle(dll);
     }
+    public static void SetJSModeExpression(String str)
+    {
+        hmV8DynamicLib.SetJSModeExpression(str);
+    }
 
     public static void SetCodePage(IntPtr cp)
     {
@@ -186,6 +190,13 @@ public static IntPtr BindDllHandle(IntPtr dll)
         return dll;
     }
 
+    static bool isJSModeLoaded = false;
+    static string strJSModeExpression = "";
+    public static void SetJSModeExpression(String str)
+    {
+        strJSModeExpression = str;
+    }
+
     // dllのloaddllタイプによって、渡されたcmd(=expression)に対して、「dllの番号,」or「」を当てはめる処理
     public static String ModifyFuncCallByDllType(String cmd)
     {
@@ -648,6 +659,12 @@ public static IntPtr DoString(String expression, String inAction = "DoString")
 
         try
         {
+            if (!isJSModeLoaded)
+            {
+                isJSModeLoaded = true;
+                engine.Evaluate(strJSModeExpression);
+            }
+
             // 文字列からソース生成
             engine.Evaluate(expression);
             return (IntPtr)1;
@@ -750,6 +767,7 @@ public static IntPtr DestroyScope()
 
         SetCodePage((IntPtr)default_codepage);
         iDllBindHandle = 0;
+        isJSModeLoaded = false;
         tmpVar = null;
         iDebuggingPort = 0;