提交: 81592854ffbe85605746675762b6d0f867feb957 - ScriptEngine (git)

Commit MetaInfo

• 修訂: 81592854ffbe85605746675762b6d0f867feb957 (tree)
• 時間: 2021-04-14 23:08:26
• 作者: majiponi <majiponi@yaho...>
• Commiter: majiponi

Log Message

Now you can save project via -o switch.

Change Summary

• modified: aus.vcxproj
• modified: aus.vcxproj.filters
• add: command.cpp
• add: command.h
• modified: core.cpp
• modified: parser.cpp
• modified: parser.h
• modified: ui.cpp
• modified: ui.h

差異

--- a/aus.vcxproj
+++ b/aus.vcxproj
@@ -161,6 +161,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="apihook.h" />
+    <ClInclude Include="command.h" />
     <ClInclude Include="core.h" />
     <ClInclude Include="parser.h" />
     <ClInclude Include="filter.h" />
@@ -170,6 +171,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="apihook.cpp" />
+    <ClCompile Include="command.cpp" />
     <ClCompile Include="core.cpp" />
     <ClCompile Include="parser.cpp" />
     <ClCompile Include="stdafx.cpp">

--- a/aus.vcxproj.filters
+++ b/aus.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClInclude Include="parser.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="command.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -53,6 +56,9 @@
     <ClCompile Include="parser.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="command.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="aus.def">

--- /dev/null
+++ b/command.cpp
@@ -0,0 +1,125 @@
+#include "stdafx.h"
+#include <commdlg.h>
+#include <algorithm>
+#include <typeinfo>
+
+#include "apihook.h"
+#include "ui.h"
+
+namespace
+{
+	HWND getExeditWindow();
+
+	union{
+		int scene_no;
+		struct{ unsigned int cx, cy, fps, freq; }* videoinfo;
+		const char* path;
+		bool transparent;
+	} dlgdata;
+}
+
+namespace AviUtlCommand
+{
+	void CreateProject(size_t cx, size_t cy, size_t fps, size_t freq)
+	{
+		HMODULE ex = GetModuleHandleA("exedit.auf");
+		if(!ex)	return;
+
+		std::remove_pointer<decltype(dlgdata.videoinfo)>::type data{ cx, cy, fps, freq };
+		dlgdata.videoinfo = &data;
+
+		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
+				proc(nullptr, WM_COMMAND, IDOK, 0);
+				return IDOK;
+			}), ex };
+		IATModifier hook2{ "user32.dll", "GetDlgItemInt", static_cast<decltype(GetDlgItemInt)*>([](HWND, int id, BOOL*, BOOL) -> UINT {
+				if(id == 171)	return dlgdata.videoinfo->cx;
+				if(id == 172)	return dlgdata.videoinfo->cy;
+				return dlgdata.videoinfo->freq;
+			}), ex };
+		IATModifier hook3{ "user32.dll", "GetDlgItemTextA", static_cast<decltype(GetDlgItemTextA)*>([](HWND, int, char* buf, int nmax) -> UINT {
+				return sprintf_s(buf, nmax, "%d", dlgdata.videoinfo->fps);
+			}), ex };
+
+		SendMessageA(getExeditWindow(), WM_COMMAND, 1030, 0xFFFFFFFF);
+	}
+
+	void OpenExoFile(const char* path)
+	{
+		dlgdata.path = path;
+		IATModifier hook3{ "comdlg32.dll", "GetOpenFileNameA", static_cast<decltype(GetOpenFileNameA)*>([](LPOPENFILENAMEA pofn) -> BOOL {
+				strcpy_s(pofn->lpstrFile, pofn->nMaxFile, dlgdata.path);
+				return TRUE;
+			}), GetModuleHandleA(nullptr) };
+
+		SendMessageA(getExeditWindow(), WM_COMMAND, 1037, 0xFFFFFFFF);
+	}
+
+	void Quit()
+	{
+		PostMessageA(AviUtlUI::GetMainWindow(), WM_CLOSE, 0, 0);
+	}
+
+	void SaveProject(const char* path)
+	{
+		dlgdata.path = path;
+		IATModifier hook3{ "comdlg32.dll", "GetSaveFileNameA", static_cast<decltype(GetSaveFileNameA)*>([](LPOPENFILENAMEA pofn) -> BOOL {
+				strcpy_s(pofn->lpstrFile, pofn->nMaxFile, dlgdata.path);
+				return TRUE;
+			}), GetModuleHandleA(nullptr) };
+
+		SendMessageA(AviUtlUI::GetMainWindow(), WM_COMMAND, 1023, 0xFFFFFFFF);
+	}
+
+	void SwitchScene(size_t n)
+	{
+		HMODULE ex = GetModuleHandleA("exedit.auf");
+		if(!ex || n < 0 || n >= 50)	return;
+
+		dlgdata.scene_no = n;
+		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
+				proc(nullptr, WM_COMMAND, MAKEWPARAM(190, LBN_SELCHANGE), 0);
+				return dlgdata.scene_no;
+			}), ex };
+		IATModifier hook2{ "user32.dll", "SendDlgItemMessageA", static_cast<decltype(SendDlgItemMessageA)*>([](HWND, int, UINT, WPARAM, LPARAM) -> LRESULT {
+				return dlgdata.scene_no;
+			}), ex };
+
+		SendMessageA(getExeditWindow(), WM_LBUTTONDOWN, MK_LBUTTON, 0);
+	}
+
+	void TransparentScene(bool b)
+	{
+		HMODULE ex = GetModuleHandleA("exedit.auf");
+		if(!ex)	return;
+
+		dlgdata.transparent = b;
+		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
+				proc(nullptr, WM_COMMAND, IDOK, 0);
+				return IDOK;
+			}), ex };
+		IATModifier hook2{ "user32.dll", "IsDlgButtonChecked", static_cast<decltype(IsDlgButtonChecked)*>([](HWND, int) -> UINT {
+				return dlgdata.transparent ? BST_CHECKED : BST_UNCHECKED;
+			}), ex };
+
+		SendMessageA(getExeditWindow(), WM_COMMAND, 1096, 0xFFFFFFFF);
+	}
+
+}
+
+namespace
+{
+	HWND getExeditWindow()
+	{
+		HWND ret = nullptr;
+		EnumThreadWindows(GetCurrentThreadId(), static_cast<WNDENUMPROC>([](HWND hwnd, LPARAM data) -> BOOL {
+				static constexpr char head[] = "拡張編集";
+				char buf[16];
+				GetWindowTextA(hwnd, buf, std::size(buf));
+				if(std::memcmp(buf, head, sizeof(head)-1))	return TRUE;
+				*reinterpret_cast<HWND*>(data) = hwnd;
+				return FALSE;
+			}), reinterpret_cast<LPARAM>(&ret));
+		return ret;
+	}
+}

--- /dev/null
+++ b/command.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace AviUtlCommand
+{
+	void CreateProject(size_t cx, size_t cy, size_t fps, size_t freq);
+	void OpenExoFile(const char* path);
+	void Quit();
+	void SaveProject(const char* path);
+	void SwitchScene(size_t n);
+	void TransparentScene(bool b);
+}

--- a/core.cpp
+++ b/core.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
 #include <utility>
+#include "command.h"
+#include "core.h"
 #include "parser.h"
 #include "ui.h"
 
@@ -16,7 +18,7 @@ namespace
 			size_t offset;
 			void* proc;
 			size_t bytes;
-		} patch[4];
+		} patch[5];
 	};
 
 	BOOL init(FILTER*);
@@ -26,13 +28,18 @@ namespace
 	void Reload1();
 	void Reset1();
 	void Loader1();
-	constexpr patchdata makeVer2Patch(size_t, size_t);
+	void Save1();
+	constexpr patchdata makeVer2Patch(size_t, size_t, size_t);
 	void Socket(void*, const char*);
 	void ClearBuffer2();
 	void Reload2();
 	void Reset2();
 	void Loader2();
+	void Save2();
 	size_t recalc(size_t, size_t, const char*);
+	bool is_aup_path(const char*);
+	void ModifyReturnAddress(size_t);
+
 	inline const IMAGE_NT_HEADERS32* getNtHeaders(HMODULE);
 	inline DWORD getTimeStamp(HMODULE);
 	inline size_t getTextSectionSize(HMODULE);
@@ -50,12 +57,13 @@ namespace
 	constexpr size_t bufsize = 0x1000;
 }
 
+
 extern "C" const FILTER_DLL* CALLBACK GetFilterTable()
 {
 	static constexpr FILTER_DLL filter = {
 		FILTER_FLAG_ALWAYS_ACTIVE | FILTER_FLAG_NO_CONFIG | FILTER_FLAG_IMPORT,
 		0, 0, const_cast<char*>("Script Engine"), 0, nullptr, nullptr, 0, 0, 0, nullptr, nullptr, nullptr,
-		init, nullptr, nullptr, wndproc, nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr
+		init, nullptr, nullptr, AviUtlUI::WndProc, nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr
 	};
 	return &filter;
 }
@@ -67,12 +75,12 @@ namespace
 		const patchdata* p = getpatch();
 		if(!p)	return FALSE;
 
-		addmenu();
+		AviUtlUI::AddMenu();
 		applypatch(p);
 		return TRUE;
 	}
 
-	constexpr patchdata makeVer1Patch(size_t offset_engine, size_t offset_parser)
+	constexpr patchdata makeVer1Patch(size_t offset_engine, size_t offset_saver, size_t offset_parser)
 	{
 		return { offset_parser + 0x48, offset_parser + 0x40,
 			{ offset_engine, nullptr },
@@ -80,7 +88,8 @@ namespace
 				{ offset_engine + 0x2D, ClearBuffer1, 5 },
 				{ offset_parser + 0x07, Reload1, 6 },
 				{ offset_parser + 0x2E, Reset1, 5 },
-				{ offset_engine + 0x47, Loader1, 5 }
+				{ offset_engine + 0x47, Loader1, 5 },
+				{ offset_saver + 0x7D3, Save1, 7 }
 			}
 		};
 	}
@@ -136,7 +145,7 @@ namespace
 			lea edx, [esp+12]
 			push edx
 			push edx
-			call ScriptParser
+			call SubParser
 			add esp, 4
 			xor ecx, ecx
 			pop edx
@@ -149,7 +158,38 @@ namespace
 		}
 	}
 
-	constexpr patchdata makeVer2Patch(size_t offset_engine, size_t offset_parser)
+	__declspec(naked) void Save1()
+	{
+		__asm{
+			lea eax, [ebp+0x108]
+			push eax
+			call is_aup_path
+			add esp, 4
+			test eax, eax
+			jne SAVE_AUP
+			mov eax, [esp]
+			cmp [ebp+0x4BC498], 2
+			jl SAVE_AVI
+			add eax, 8
+			mov [esp], eax
+			ret
+		SAVE_AVI:
+			add eax, 0x110
+			mov [esp], eax
+			ret
+		SAVE_AUP:
+			mov eax, [esp]
+			add eax, 0x6A
+			mov [esp], eax
+			lea eax, [ebp+0x108]
+			push eax
+			call AviUtlCommand::SaveProject
+			add esp, 4
+			ret
+		}
+	}
+
+	constexpr patchdata makeVer2Patch(size_t offset_engine, size_t offset_saver, size_t offset_parser)
 	{
 		return { offset_parser + 0x64, offset_parser + 0x5E,
 			{ offset_engine, Socket },
@@ -157,7 +197,8 @@ namespace
 				{ offset_engine + 0x42D, ClearBuffer2, 7 },
 				{ offset_parser + 0x20, Reload2, 5 },
 				{ offset_parser + 0x48, Reset2, 8 },
-				{ offset_engine + 0x450, Loader2, 7 }
+				{ offset_engine + 0x450, Loader2, 7 },
+				{ offset_saver + 0xAE9, Save2, 7 }
 			}
 		};
 	}
@@ -216,7 +257,7 @@ namespace
 			lea edx, [esp+44Ch]
 			push edx
 			push edx
-			call ScriptParser
+			call SubParser
 			add esp, 4
 			xor ecx, ecx
 			pop edx
@@ -226,6 +267,42 @@ namespace
 		}
 	}
 
+	__declspec(naked) void Save2()
+	{
+		__asm{
+			lea eax, [ebx+0x108]
+			push eax
+			call is_aup_path
+			add esp, 4
+			test eax, eax
+			jne SAVE_AUP
+			mov eax, [esp]
+			cmp dword ptr [ebx+004BC498h],2
+			mov dword ptr [esp+3Ch],edx
+			jl SAVE_AVI
+			add eax, 12
+			mov [esp], eax
+			ret
+		SAVE_AVI:
+			add eax, 0x19F
+			mov [esp], eax
+			ret
+		SAVE_AUP:
+//			mov eax, [esp]
+//			add eax, 0x11C
+//			mov [esp], eax
+			lea eax, [ebx+0x108]
+			push eax
+			call AviUtlCommand::SaveProject
+			add esp, 4
+			xor eax, eax
+			push 0x11C
+			call ModifyReturnAddress
+			add esp, 4
+			ret
+		}
+	}
+
 	void applypatch(const patchdata* p)
 	{
 		HMODULE base = GetModuleHandleA(nullptr);
@@ -256,6 +333,26 @@ namespace
 		return offset;
 	}
 
+	bool is_aup_path(const char* path)
+	{
+		static constexpr char ext[] = ".aup";
+		static constexpr size_t extlen = sizeof(ext) - 1;
+
+		size_t len = std::strlen(path);
+		return len > extlen && !_strcmpi(path + len - extlen, ext);
+	}
+
+	void ModifyReturnAddress(size_t off)
+	{
+		_asm{
+			push eax
+			mov eax, [ebp+12]
+			add eax, off
+			mov [ebp+12], eax
+			pop eax
+		}
+	}
+
 	inline const IMAGE_NT_HEADERS32* getNtHeaders(HMODULE base)
 	{
 		const IMAGE_DOS_HEADER* dos = reinterpret_cast<const IMAGE_DOS_HEADER*>(base);
@@ -274,15 +371,15 @@ namespace
 
 	const patchdata* getpatch()
 	{
-		static constexpr patchdata VER_0_99_k	= makeVer1Patch(0xC7F0, 0x22A80);
-		static constexpr patchdata VER_0_99_k2	= makeVer1Patch(0xC830, 0x22BF0);
-		static constexpr patchdata VER_0_99_l	= makeVer1Patch(0xC8F0, 0x22DC0);
-		static constexpr patchdata VER_0_99_m	= makeVer1Patch(0xC950, 0x22EA0);
-		static constexpr patchdata VER_1_00		= makeVer1Patch(0xC990, 0x22F70);
-
-		static constexpr patchdata VER_1_10_rc1	= makeVer2Patch(0xF910, 0x2C010);
-		static constexpr patchdata VER_1_10_rc2	= makeVer2Patch(0xFAE0, 0x2C1E0);
-		static constexpr patchdata VER_1_10		= makeVer2Patch(0xFA20, 0x2C0F0);
+		static constexpr patchdata VER_0_99_k	= makeVer1Patch(0xC7F0, 0x14F60, 0x22A80);
+		static constexpr patchdata VER_0_99_k2	= makeVer1Patch(0xC830, 0x14F90, 0x22BF0);
+		static constexpr patchdata VER_0_99_l	= makeVer1Patch(0xC8F0, 0x15120, 0x22DC0);
+		static constexpr patchdata VER_0_99_m	= makeVer1Patch(0xC950, 0x151B0, 0x22EA0);
+		static constexpr patchdata VER_1_00		= makeVer1Patch(0xC990, 0x15260, 0x22F70);
+
+		static constexpr patchdata VER_1_10_rc1	= makeVer2Patch(0xF910, 0x1A0A0, 0x2C010);
+		static constexpr patchdata VER_1_10_rc2	= makeVer2Patch(0xFAE0, 0x1A270, 0x2C1E0);
+		static constexpr patchdata VER_1_10		= makeVer2Patch(0xFA20, 0x1A1A0, 0x2C0F0);
 
 		switch(getTimeStamp(GetModuleHandleA(nullptr))){
 			case 0x4F01F831: return &VER_0_99_k;

--- a/parser.cpp
+++ b/parser.cpp
@@ -4,187 +4,74 @@
 #include <typeinfo>
 
 #include "apihook.h"
+#include "command.h"
+#include "core.h"
 #include "parser.h"
 #include "ui.h"
 
 namespace
 {
-	void quit();
-	void save(const char* path);
-
-	void newproject(size_t cx, size_t cy, size_t fps, size_t freq);
-	void openexo(const char* path);
-	void switchscene(size_t n);
-	void transparentscene(bool b);
-
-	HWND getExeditWindow();
-
 	bool is_comment(const char*);
 	bool is_loading_script(const char*);
 	size_t starts_with(const char*, const char*);
 	size_t ends_with(const char*, const char*);
+	bool has_argument(const char*);
 	const char* skiparg(const char*);
-
-
-	union{
-		int scene_no;
-		struct{ unsigned int cx, cy, fps, freq; }* videoinfo;
-		const char* path;
-		bool transparent;
-	} dlgdata;
 }
 
-BOOL ScriptParser(const char* script)
+bool SubParser(const char* script)
 {
-	OutputDebugStringA(script);
-	OutputDebugStringA("\r\n");
-
-	if(is_comment(script))	return FALSE;
-	if(is_loading_script(script))	return FALSE;
+	if(is_comment(script))	return false;
+	if(is_loading_script(script))	return false;
 
 	size_t match;
 	if(match = starts_with(script, "exedit ")){
 		HMODULE base = GetModuleHandleA("exedit.auf");
-		if(!base)	return FALSE;
+		if(!base)	return false;
 
 		script += match;
 
 		unsigned int params[4];
 		if(sscanf_s(script, "new %u, %u, %u, %u", &params[0], &params[1], &params[2], &params[3]) == 4){
-			newproject(params[0], params[1], params[2], params[3]);
-			return FALSE;
+			AviUtlCommand::CreateProject(params[0], params[1], params[2], params[3]);
+			return false;
 		}
 		else if(match = starts_with(script, "openexo ")){
 			script += match;
-			openexo(script);
-			return FALSE;
+			AviUtlCommand::OpenExoFile(script);
+			return false;
 		}
 		else if(sscanf_s(script, "switchscene #%u", &params[0]) == 1){
-			switchscene(params[0]);
-			return FALSE;
+			AviUtlCommand::SwitchScene(params[0]);
+			return false;
 		}
 		else if(match = starts_with(script, "transparentscene ")){
 			script += match;
-			transparentscene(script[0] != 'f');
-			return FALSE;
+			AviUtlCommand::TransparentScene(script[0] != 'f');
+			return false;
 		}
 	}
 	else{
 		script = skiparg(script);
-		if(script[0] == '-' && script[1] == 'q'){
-			quit();
-			return FALSE;
+		if((script[0] == '-' || script[0] == '/') && (script[1] == 'q' || script[1] == 'Q')){
+			script += 2;
+			if(!has_argument(script)){
+				AviUtlCommand::Quit();
+				return false;
+			}
 		}
-		else if(script[0] == '-' && script[1] == 's'){
+		else if((script[0] == '-' || script[0] == '/') && (script[1] == 'o' || script[1] == 'O')){
 			script += 2;
 			while(*script == ' ')	script++;
-			save(script);
-			return FALSE;
+			AviUtlCommand::SaveProject(script);
+			return false;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 namespace
 {
-	void quit()
-	{
-		PostMessageA(getmainwindow(), WM_CLOSE, 0, 0);
-	}
-
-	void save(const char* path)
-	{
-		dlgdata.path = path;
-		IATModifier hook3{ "comdlg32.dll", "GetSaveFileNameA", static_cast<decltype(GetSaveFileNameA)*>([](LPOPENFILENAMEA pofn) -> BOOL {
-				strcpy_s(pofn->lpstrFile, pofn->nMaxFile, dlgdata.path);
-				return TRUE;
-			}), GetModuleHandleA(nullptr) };
-
-		SendMessageA(getmainwindow(), WM_COMMAND, 1023, 0xFFFFFFFF);
-	}
-
-	void newproject(size_t cx, size_t cy, size_t fps, size_t freq)
-	{
-		HMODULE ex = GetModuleHandleA("exedit.auf");
-		if(!ex)	return;
-
-		std::remove_pointer<decltype(dlgdata.videoinfo)>::type data{ cx, cy, fps, freq };
-		dlgdata.videoinfo = &data;
-
-		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
-				proc(nullptr, WM_COMMAND, IDOK, 0);
-				return IDOK;
-			}), ex };
-		IATModifier hook2{ "user32.dll", "GetDlgItemInt", static_cast<decltype(GetDlgItemInt)*>([](HWND, int id, BOOL*, BOOL) -> UINT {
-				if(id == 171)	return dlgdata.videoinfo->cx;
-				if(id == 172)	return dlgdata.videoinfo->cy;
-				return dlgdata.videoinfo->freq;
-			}), ex };
-		IATModifier hook3{ "user32.dll", "GetDlgItemTextA", static_cast<decltype(GetDlgItemTextA)*>([](HWND, int, char* buf, int nmax) -> UINT {
-				return sprintf_s(buf, nmax, "%d", dlgdata.videoinfo->fps);
-			}), ex };
-
-		SendMessageA(getExeditWindow(), WM_COMMAND, 1030, 0xFFFFFFFF);
-	}
-
-	void openexo(const char* path)
-	{
-		dlgdata.path = path;
-		IATModifier hook3{ "comdlg32.dll", "GetOpenFileNameA", static_cast<decltype(GetOpenFileNameA)*>([](LPOPENFILENAMEA pofn) -> BOOL {
-				strcpy_s(pofn->lpstrFile, pofn->nMaxFile, dlgdata.path);
-				return TRUE;
-			}), GetModuleHandleA(nullptr) };
-
-		SendMessageA(getExeditWindow(), WM_COMMAND, 1037, 0xFFFFFFFF);
-	}
-
-	void switchscene(size_t n)
-	{
-		HMODULE ex = GetModuleHandleA("exedit.auf");
-		if(!ex || n < 0 || n >= 50)	return;
-
-		dlgdata.scene_no = n;
-		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
-				proc(nullptr, WM_COMMAND, MAKEWPARAM(190, LBN_SELCHANGE), 0);
-				return dlgdata.scene_no;
-			}), ex };
-		IATModifier hook2{ "user32.dll", "SendDlgItemMessageA", static_cast<decltype(SendDlgItemMessageA)*>([](HWND, int, UINT, WPARAM, LPARAM) -> LRESULT {
-				return dlgdata.scene_no;
-			}), ex };
-
-		SendMessageA(getExeditWindow(), WM_LBUTTONDOWN, MK_LBUTTON, 0);
-	}
-
-	void transparentscene(bool b)
-	{
-		HMODULE ex = GetModuleHandleA("exedit.auf");
-		if(!ex)	return;
-
-		dlgdata.transparent = b;
-		IATModifier hook1{ "user32.dll", "DialogBoxParamA", static_cast<decltype(DialogBoxParamA)*>([](HINSTANCE, LPCSTR, HWND, DLGPROC proc, LPARAM) -> INT_PTR {
-				proc(nullptr, WM_COMMAND, IDOK, 0);
-				return IDOK;
-			}), ex };
-		IATModifier hook2{ "user32.dll", "IsDlgButtonChecked", static_cast<decltype(IsDlgButtonChecked)*>([](HWND, int) -> UINT {
-				return dlgdata.transparent ? BST_CHECKED : BST_UNCHECKED;
-			}), ex };
-
-		SendMessageA(getExeditWindow(), WM_COMMAND, 1096, 0xFFFFFFFF);
-	}
-
-	HWND getExeditWindow()
-	{
-		HWND ret = nullptr;
-		EnumThreadWindows(GetCurrentThreadId(), static_cast<WNDENUMPROC>([](HWND hwnd, LPARAM data) -> BOOL {
-				char buf[16];
-				GetWindowTextA(hwnd, buf, std::size(buf));
-				if(!starts_with(buf, "拡張編集"))	return TRUE;
-				*reinterpret_cast<HWND*>(data) = hwnd;
-				return FALSE;
-			}), reinterpret_cast<LPARAM>(&ret));
-		return ret;
-	}
-
 	bool is_comment(const char* str)
 	{
 		return str[0] == ';';
@@ -210,7 +97,7 @@ namespace
 	size_t starts_with(const char* str, const char* pat)
 	{
 		size_t n = std::strlen(pat);
-		if(!std::strncmp(pat, str, n))	return n;
+		if(!_strnicmp(pat, str, n))	return n;
 		return 0;
 	}
 
@@ -218,10 +105,16 @@ namespace
 	{
 		size_t m = std::strlen(str);
 		size_t n = std::strlen(pat);
-		if(m >= n && !std::strncmp(pat, str + m - n, n))	return n;
+		if(m >= n && !_strnicmp(pat, str + m - n, n))	return n;
 		return 0;
 	}
 
+	bool has_argument(const char* script)
+	{
+		while(*script == ' ')	script++;
+		return !!*script;
+	}
+
 	const char* skiparg(const char* script)
 	{
 		while(*script == ' ')	script++;

--- a/parser.h
+++ b/parser.h
@@ -1,5 +1,3 @@
 #pragma once
 
-#include <windows.h>
-
-BOOL ScriptParser(const char*);
+bool SubParser(const char*);

--- a/ui.cpp
+++ b/ui.cpp
@@ -9,41 +9,56 @@ namespace
 	int findmenu(HMENU, const char*, HMENU*);
 }
 
-HWND getmainwindow()
+namespace AviUtlUI
 {
-	HWND ret = nullptr;
-	EnumThreadWindows(GetCurrentThreadId(), static_cast<WNDENUMPROC>([](HWND hwnd, LPARAM data) -> BOOL {
-			char buf[16];
-			GetClassNameA(hwnd, buf, std::size(buf));
-			if(_strcmpi(buf, "AviUtl"))	return TRUE;
+	HWND GetMainWindow()
+	{
+		HWND ret = nullptr;
+		EnumThreadWindows(GetCurrentThreadId(), static_cast<WNDENUMPROC>([](HWND hwnd, LPARAM data) -> BOOL {
+				char buf[16];
+				GetClassNameA(hwnd, buf, std::size(buf));
+				if(_strcmpi(buf, "AviUtl"))	return TRUE;
 
-			*reinterpret_cast<HWND*>(data) = hwnd;
-			return FALSE;
-		}), reinterpret_cast<LPARAM>(&ret));
+				*reinterpret_cast<HWND*>(data) = hwnd;
+				return FALSE;
+			}), reinterpret_cast<LPARAM>(&ret));
 
-	while(HWND owner = GetWindow(ret, GW_OWNER))	ret = owner;
+		while(HWND owner = GetWindow(ret, GW_OWNER))	ret = owner;
 
-	return ret;
-}
+		return ret;
+	}
 
-void addmenu()
-{
-	HMENU file = GetSubMenu(GetMenu(getmainwindow()), 0);
-	HMENU imp = nullptr;
-	findmenu(file, "インポート", &imp);
-	const int delpos = findmenu(imp, "Script Engine", nullptr);
-	if(delpos < 0)	return;
-	const int inspos = findmenu(file, "AVI出力 (Ctrl+S)", nullptr);
-	if(inspos < 0)	return;
+	void AddMenu()
+	{
+		HMENU file = GetSubMenu(GetMenu(GetMainWindow()), 0);
+		HMENU imp = nullptr;
+		findmenu(file, "インポート", &imp);
+		const int delpos = findmenu(imp, "Script Engine", nullptr);
+		if(delpos < 0)	return;
+		const int inspos = findmenu(file, "AVI出力 (Ctrl+S)", nullptr);
+		if(inspos < 0)	return;
+
+		UINT id = GetMenuItemID(imp, delpos);
+		DeleteMenu(imp, delpos, MF_BYPOSITION);
 
-	UINT id = GetMenuItemID(imp, delpos);
-	DeleteMenu(imp, delpos, MF_BYPOSITION);
+		const MENUITEMINFOA load { sizeof(load), MIIM_ID | MIIM_TYPE, MFT_STRING, MFS_ENABLED, id, nullptr, nullptr, nullptr, 0, const_cast<char*>("スクリプト読み込み"), 0, nullptr };
+		InsertMenuItemA(file, inspos, TRUE, &load);
+
+		constexpr MENUITEMINFOA sep { sizeof(sep), MIIM_TYPE, MFT_SEPARATOR, MFS_DEFAULT, 0, nullptr, nullptr, nullptr, 0, nullptr, 0, nullptr };
+		InsertMenuItemA(file, inspos + 1, TRUE, &sep);
+	}
 
-	const MENUITEMINFOA load { sizeof(load), MIIM_ID | MIIM_TYPE, MFT_STRING, MFS_ENABLED, id, nullptr, nullptr, nullptr, 0, const_cast<char*>("スクリプト読み込み"), 0, nullptr };
-	InsertMenuItemA(file, inspos, TRUE, &load);
+	BOOL WndProc(HWND hwnd, UINT msg, WPARAM, LPARAM, void* editp, FILTER*)
+	{
+		if(msg == WM_FILTER_IMPORT){
+			char path[MAX_PATH] = "";
+			OPENFILENAMEA ofn{ sizeof(ofn), hwnd, nullptr, "Script Files(*.aus)\0*.aus\0\0", nullptr, 0, 1, path, std::size(path), nullptr, 0, "", nullptr, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, 0, 0, "aus", 0, nullptr, nullptr, nullptr, 0, 0 };
+			if(!GetOpenFileNameA(&ofn))	return FALSE;
 
-	constexpr MENUITEMINFOA sep { sizeof(sep), MIIM_TYPE, MFT_SEPARATOR, MFS_DEFAULT, 0, nullptr, nullptr, nullptr, 0, nullptr, 0, nullptr };
-	InsertMenuItemA(file, inspos + 1, TRUE, &sep);
+			LoadScript(path, editp);
+		}
+		return FALSE;
+	}
 }
 
 namespace
@@ -65,15 +80,3 @@ namespace
 		return -1;
 	}
 }
-
-BOOL wndproc(HWND hwnd, UINT msg, WPARAM, LPARAM, void* editp, FILTER*)
-{
-	if(msg == WM_FILTER_IMPORT){
-		char path[MAX_PATH] = "";
-		OPENFILENAMEA ofn{ sizeof(ofn), hwnd, nullptr, "Script Files(*.aus)\0*.aus\0\0", nullptr, 0, 1, path, std::size(path), nullptr, 0, "", nullptr, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, 0, 0, "aus", 0, nullptr, nullptr, nullptr, 0, 0 };
-		if(!GetOpenFileNameA(&ofn))	return FALSE;
-
-		LoadScript(path, editp);
-	}
-	return FALSE;
-}

--- a/ui.h
+++ b/ui.h
@@ -3,7 +3,10 @@
 #include <windows.h>
 #include "filter.h"
 
-HWND getmainwindow();
+namespace AviUtlUI
+{
+	HWND GetMainWindow();
 
-void addmenu();
-BOOL wndproc(HWND, UINT, WPARAM, LPARAM, void*, FILTER*);
+	void AddMenu();
+	BOOL WndProc(HWND, UINT, WPARAM, LPARAM, void*, FILTER*);
+}