提交: 8d6e8f0f1dcaa7bd55ec2d9aa8498b996fe227a1 - ScriptEngine (git)

Commit MetaInfo

• 修訂: 8d6e8f0f1dcaa7bd55ec2d9aa8498b996fe227a1 (tree)
• 時間: 2021-04-27 10:15:19
• 作者: majiponi <majiponi@yaho...>
• Commiter: majiponi

Log Message

Ver0.02 - The engin ignores needless [aviutl path] in .aus files correctly.

Change Summary

• modified: apihook.cpp
• modified: apihook.h
• modified: aus.vcxproj
• modified: aus.vcxproj.filters
• modified: command.cpp
• modified: command.h
• modified: core.cpp
• add: coreimp.h
• modified: parser.cpp
• modified: ui.cpp
• add: v1patch.cpp
• add: v2patch.cpp

差異

--- a/apihook.cpp
+++ b/apihook.cpp
@@ -10,68 +10,65 @@ namespace
 }
 
 
-IATModifier::IATModifier(const char* dll, const char* name, const void* hook, HMODULE mod)
-	: dll(dll), name(name), hook(hook), oldproc(GetProcAddress(GetModuleHandleA(dll), name)), mod(mod)
+IATModifier::IATModifier(const char* exporter, const char* apiname, const void* newproc, HMODULE importer)
+	: exporter{exporter}, apiname{apiname}, newproc{newproc}, oldproc{ GetProcAddress(GetModuleHandleA(exporter), apiname) }, importer{importer}
 {
-	if(mod){
-	    modifyIAT(dll, oldproc, hook, mod);
+	if(importer){
+	    modifyIAT(exporter, oldproc, newproc, importer);
 	}
 	else{
-	    modifyIAT(dll, oldproc, hook);
+	    modifyIAT(exporter, oldproc, newproc);
 	}
 }
 
 IATModifier::~IATModifier()
 {
-	if(mod){
-	    modifyIAT(dll, hook, oldproc, mod);
+	if(importer){
+	    modifyIAT(exporter, newproc, oldproc, importer);
 	}
 	else{
-	    modifyIAT(dll, hook, oldproc);
+	    modifyIAT(exporter, newproc, oldproc);
 	}
 }
 
 namespace
 {
-	void modifyIAT(const char* apidll, const void* origaddr, const void* newaddr, HMODULE target)
+	void modifyIAT(const char* exporter, const void* oldproc, const void* newproc)
+	{
+		MODULEENTRY32 entry{ sizeof(entry) };
+
+		const HANDLE hSnap{ CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId()) };
+
+		if(Module32First(hSnap, &entry)){
+			do{
+				modifyIAT(exporter, oldproc, newproc, entry.hModule);
+			}while(Module32Next(hSnap, &entry));
+		}
+
+		CloseHandle(hSnap);
+	}
+
+	void modifyIAT(const char* exporter, const void* oldproc, const void* newproc, HMODULE importer)
 	{
 		ULONG size;
-		const IMAGE_IMPORT_DESCRIPTOR* pDesc = static_cast<const IMAGE_IMPORT_DESCRIPTOR*>(ImageDirectoryEntryToData(target, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size));
+		auto pDesc{ static_cast<const IMAGE_IMPORT_DESCRIPTOR*>(ImageDirectoryEntryToData(importer, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size)) };
 		if(!pDesc)	return;
 
 		for(; pDesc->Name; pDesc++){
-			const char* name = reinterpret_cast<const char*>(target) + pDesc->Name;
-			if(!_strcmpi(name, apidll))	break;
+			const char* name{ reinterpret_cast<const char*>(importer) + pDesc->Name };
+			if(!_strcmpi(name, exporter))	break;
 		}
 		if(!pDesc->Name)	return;
 
-		IMAGE_THUNK_DATA* pThunk = reinterpret_cast<IMAGE_THUNK_DATA*>(reinterpret_cast<char*>(target) + pDesc->FirstThunk);
+		auto pThunk{ reinterpret_cast<IMAGE_THUNK_DATA*>(reinterpret_cast<char*>(importer) + pDesc->FirstThunk) };
 		for(; pThunk->u1.Function; pThunk++){
-			const void* addr = reinterpret_cast<const void*>(pThunk->u1.Function);
-			if(addr == origaddr)	break;
+			if(pThunk->u1.Function == reinterpret_cast<DWORD>(oldproc))	break;
 		}
 		if(!pThunk->u1.Function)	return;
 
-		const void*& proc = reinterpret_cast<const void*&>(pThunk->u1.Function);
-
 		DWORD protect;
-		VirtualProtect(&proc, sizeof(proc), PAGE_EXECUTE_READWRITE, &protect);
-		proc = newaddr;
-		VirtualProtect(&proc, sizeof(proc), protect, &protect);
-	}
-
-	void modifyIAT(const char* apidll, const void* origaddr, const void* newaddr)
-	{
-		MODULEENTRY32 entry { sizeof(entry) };
-
-		HANDLE hSnap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
-
-		if(Module32First(hSnap, &entry)){
-			do{
-				modifyIAT(apidll, origaddr, newaddr, entry.hModule);
-			}while(Module32Next(hSnap, &entry));
-		}
-
-		CloseHandle(hSnap);
+		VirtualProtect(&pThunk->u1.Function, sizeof(pThunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect);
+		pThunk->u1.Function = reinterpret_cast<DWORD>(newproc);
+		VirtualProtect(&pThunk->u1.Function, sizeof(pThunk->u1.Function), protect, &protect);
 	}
 }

--- a/apihook.h
+++ b/apihook.h
@@ -5,13 +5,14 @@
 class IATModifier
 {
 private:
-	const char* dll;
-	const char* name;
-	const void* hook;
+	const char* exporter;
+	const char* apiname;
+	const void* newproc;
 	const void* oldproc;
-	HMODULE mod;
+	HMODULE importer;
+
 public:
-	IATModifier(const char* dll, const char* name, const void* hook, HMODULE mod = nullptr);
+	IATModifier(const char* exporter, const char* apiname, const void* newproc, HMODULE importer = nullptr);
 	IATModifier(const IATModifier&) = delete;
 	~IATModifier();
 };

--- a/aus.vcxproj
+++ b/aus.vcxproj
@@ -95,6 +95,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AssemblerOutput>NoListing</AssemblerOutput>
       <AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -130,6 +131,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AssemblerOutput>NoListing</AssemblerOutput>
       <AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -163,6 +165,7 @@
     <ClInclude Include="apihook.h" />
     <ClInclude Include="command.h" />
     <ClInclude Include="core.h" />
+    <ClInclude Include="coreimp.h" />
     <ClInclude Include="parser.h" />
     <ClInclude Include="filter.h" />
     <ClInclude Include="stdafx.h" />
@@ -181,6 +184,8 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ui.cpp" />
+    <ClCompile Include="v1patch.cpp" />
+    <ClCompile Include="v2patch.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="aus.def" />

--- a/aus.vcxproj.filters
+++ b/aus.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClInclude Include="command.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="coreimp.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -59,6 +62,12 @@
     <ClCompile Include="command.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="v1patch.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+    <ClCompile Include="v2patch.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="aus.def">

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

--- a/command.h
+++ b/command.h
@@ -2,10 +2,13 @@
 
 namespace AviUtlCommand
 {
+	void SaveProject(const char* path);
+}
+
+namespace ExeditCommand
+{
 	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);
+	void SwitchScene(size_t scene_no);
+	void TransparentScene(bool transparency);
 }

--- a/core.cpp
+++ b/core.cpp
@@ -1,64 +1,26 @@
 #include "stdafx.h"
+#include <memory>
 #include <utility>
 #include "command.h"
 #include "core.h"
-#include "parser.h"
+#include "coreimp.h"
 #include "ui.h"
 
 namespace
 {
-	struct patchdata{
-		size_t offset_buf;
-		size_t offset_loaded;
-		struct{
-			size_t offset;
-			void (*socketproc)(void*, const char*);
-		} engine;
-		struct{
-			size_t offset;
-			void* proc;
-			size_t bytes;
-		} patch[5];
-	};
-
 	BOOL init(FILTER*);
-	void applypatch(const patchdata*);
-	constexpr patchdata makeVer1Patch(size_t, size_t);
-	void ClearBuffer1();
-	void Reload1();
-	void Reset1();
-	void Loader1();
-	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*);
+	const ScriptEngineCoreImplement::patchdata* getpatch();
 	inline const IMAGE_NT_HEADERS32* getNtHeaders(HMODULE);
 	inline DWORD getTimeStamp(HMODULE);
 	inline size_t getTextSectionSize(HMODULE);
-	const patchdata* getpatch();
 	void writecaller(void*, const void*, size_t);
 	inline void writeptr(void*, const void*);
 	void modifycode(void*, const void*, size_t);
-
-	char* scriptbuf;
-	size_t* ploaded;
-	size_t oldoffset;
-	void (*engineproc)();
-	void (*socketproc)(void*, const char*);
-
-	constexpr size_t bufsize = 0x1000;
 }
 
-
 extern "C" const FILTER_DLL* CALLBACK GetFilterTable()
 {
-	static constexpr FILTER_DLL filter = {
+	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, AviUtlUI::WndProc, nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr
@@ -66,238 +28,76 @@ extern "C" const FILTER_DLL* CALLBACK GetFilterTable()
 	return &filter;
 }
 
-namespace
+void LoadScript(const char* path, void *editp)
 {
-	BOOL init(FILTER*)
-	{
-		const patchdata* p = getpatch();
-		if(!p)	return FALSE;
-
-		AviUtlUI::AddMenu();
-		applypatch(p);
-		return TRUE;
-	}
-
-	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 },
-			{
-				{ offset_engine + 0x2D, ClearBuffer1, 5 },
-				{ offset_parser + 0x07, Reload1, 6 },
-				{ offset_parser + 0x2E, Reset1, 5 },
-				{ offset_engine + 0x47, Loader1, 5 },
-				{ offset_saver + 0x8E8, Save1, 6 }
-			}
-		};
-	}
-
-	__declspec(naked) void ClearBuffer1()
-	{
-		__asm{
-			xor edx, edx
-			lea ecx, [esp+8]
-			mov [ecx], dl
-			pop edx
-			push ecx
-			push edx
-			ret
-		}
-	}
-
-	__declspec(naked) void Reload1()
-	{
-		__asm{
-			push eax
-			push edx
-			mov eax, ploaded
-			push scriptbuf
-			push oldoffset
-			push [eax]
-			call recalc
-			add esp, 12
-			mov edi, ploaded
-			pop edx
-			mov [edi], eax
-			mov oldoffset, eax
-			pop eax
-			mov edi, [esp+0x14]
-			mov esi, ebp
-			ret
-		}
-	}
+	ScriptEngineCoreImplement::core.loadscript(path, editp);
+}
 
-	__declspec(naked) void Reset1()
-	{
-		__asm{
-			xor ecx, ecx
-			mov oldoffset, ecx
-			cmp eax, bufsize
-			ret
-		}
-	}
+namespace ScriptEngineCoreImplement
+{
+	coredata core;
 
-	__declspec(naked) void Loader1()
+	size_t recalc(size_t offset, size_t oldoffset, const char* buf)
 	{
-		__asm{
-			lea edx, [esp+12]
-			push edx
-			push edx
-			call SubParser
-			add esp, 4
-			xor ecx, ecx
-			pop edx
-			test eax, eax
-			cmove edx, ecx
-			pop ecx
-			push edx
-			push ecx
-			ret
-		}
-	}
+		if(!buf[0])	return offset;
+		if(offset < bufsize)	return offset;
 
-	__declspec(naked) void Save1()
-	{
-		__asm{
-			cmp [ebp+0x4BC498], 0
-			jne SAVE_WAV
-			lea eax, [ebp+0x108]
-			push eax
-			call is_aup_path
-			add esp, 4
-			test eax, eax
-			jne SAVE_AUP
-		SAVE_WAV:
-			mov dl, [ebp+0x4BC198]
-			ret
-		SAVE_AUP:
-			lea eax, [ebp+0x108]
-			push eax
-			call AviUtlCommand::SaveProject
-			mov eax, [esp+4]
-			add esp, 4
-			add eax, 0x97
-			mov [esp], eax
-			ret
-		}
+		offset = oldoffset;
+		for(; offset < bufsize && buf[offset] && buf[offset] != '\n' && buf[offset] != '\r'; offset++);
+		for(; offset < bufsize && (buf[offset] == '\n' || buf[offset] == '\r'); offset++);
+		return offset;
 	}
 
-	constexpr patchdata makeVer2Patch(size_t offset_engine, size_t offset_saver, size_t offset_parser)
+	bool is_aup_path(const char* path)
 	{
-		return { offset_parser + 0x64, offset_parser + 0x5E,
-			{ offset_engine, Socket },
-			{
-				{ offset_engine + 0x42D, ClearBuffer2, 7 },
-				{ offset_parser + 0x20, Reload2, 5 },
-				{ offset_parser + 0x48, Reset2, 8 },
-				{ offset_engine + 0x450, Loader2, 7 },
-				{ offset_saver + 0xC8D, Save2, 7 }
-			}
-		};
-	}
+		static constexpr char ext[]{".aup"};
+		static constexpr size_t extlen{ std::size(ext) - 1 };
 
-	void Socket(void* editp, const char* path)
-	{
-		__asm{
-			mov edx, path
-			mov ecx, editp
-			call engineproc
-		}
+		size_t len = std::strlen(path);
+		return len > extlen && !_strcmpi(path + len - extlen, ext);
 	}
 
-	__declspec(naked) void ClearBuffer2()
+	char* erase_exe_name(char* cmdline)
 	{
-		__asm{
-			xor ecx, ecx
-			lea edx, [esp+0x44C]
-			mov [edx], cl
-			ret
-		}
-	}
+		static constexpr char ext[]{".exe"};
+		static constexpr size_t extlen{ std::size(ext) - 1 };
 
-	__declspec(naked) void Reload2()
-	{
-		__asm{
-			mov eax, ploaded
-			push ecx
-			push edx
-			push scriptbuf
-			push oldoffset
-			push [eax]
-			call recalc
-			add esp, 12
-			mov oldoffset, eax
-			pop edx
-			pop ecx
-			ret
-		}
-	}
+		char* p = cmdline;
+		while(*p == ' ')	p++;
+		if(!*p)	return nullptr;
 
-	__declspec(naked) void Reset2()
-	{
-		__asm{
-			xor eax, eax
-			mov oldoffset, eax
-			mov eax, dword ptr [ebp-8]
-			cmp eax, bufsize
-			ret
+		char del = ' ';
+		if(*p++ == '\"')	del = '\"';
+		while(*p){
+			if(*p++ == del)	break;
 		}
-	}
-
-	__declspec(naked) void Loader2()
-	{
-		__asm{
-			lea edx, [esp+0x44C]
-			push edx
-			push edx
-			call SubParser
-			add esp, 4
-			xor ecx, ecx
-			pop edx
-			test eax, eax
-			cmove edx, ecx
-			ret
+		char* q = cmdline;
+		if(p - q >= extlen + 1){
+			if(!_memicmp(p - (extlen + 1), ext, extlen) || !memrchr(q, '.', p - q)){
+				std::memset(q, ' ', p - q);
+			}
 		}
+		return cmdline;
 	}
 
-	__declspec(naked) void Save2()
+	const void* memrchr(const void *s, int c, size_t n)
 	{
-		__asm{
-			cmp [ebx+0x4BC498], 0
-			jne SAVE_WAV
-			lea eax, [ebx+0x108]
-			push eax
-			call is_aup_path
-			add esp, 4
-			test eax, eax
-			jne SAVE_AUP
-		SAVE_WAV:
-			cmp byte ptr [ebx+0x4BC198], 0
-			ret
-		SAVE_AUP:
-			lea eax, [ebx+0x108]
-			push eax
-			call AviUtlCommand::SaveProject
-			mov eax, [esp+4]
-			add esp, 4
-			add eax, 0xC01
-			mov [esp], eax
-			ret
+		const char* p{ static_cast<const char*>(s) };
+		while(n-- > 0){
+			if(p[n] == c)	return p + n;
 		}
+		return nullptr;
 	}
 
-	void applypatch(const patchdata* p)
+	void coredata::apply(const patchdata* p)
 	{
-		HMODULE base = GetModuleHandleA(nullptr);
+		HMODULE base{ GetModuleHandleA(nullptr) };
 
 		ploaded = *reinterpret_cast<size_t* const*>(reinterpret_cast<const char*>(base) + p->offset_loaded);
 		scriptbuf = *reinterpret_cast<char* const*>(reinterpret_cast<const char*>(base) + p->offset_buf);
 
-		engineproc = reinterpret_cast<void(*)()>(reinterpret_cast<const char*>(base) + p->engine.offset);
+		engineproc = reinterpret_cast<const char*>(base) + p->engine.offset;
 		socketproc = p->engine.socketproc;
-		if(!socketproc){
-			socketproc = reinterpret_cast<void(*)(void*, const char*)>(engineproc);
-		}
 
 		for(const auto& e : p->patch){
 			writecaller(reinterpret_cast<char*>(base) + e.offset, e.proc, e.bytes);
@@ -305,53 +105,38 @@ namespace
 		FlushInstructionCache(GetCurrentProcess(), base, getTextSectionSize(base));
 	}
 
-	size_t recalc(size_t offset, size_t oldoffset, const char* buf)
+	void coredata::loadscript(const char* path, void *editp)
 	{
-		if(!buf[0])	return offset;
-		if(offset < bufsize)	return offset;
-
-		offset = oldoffset;
-		for(; offset < bufsize && buf[offset] && buf[offset] != '\n' && buf[offset] != '\r'; offset++);
-		for(; offset < bufsize && (buf[offset] == '\n' || buf[offset] == '\r'); offset++);
-		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);
-	}
-
-	inline const IMAGE_NT_HEADERS32* getNtHeaders(HMODULE base)
-	{
-		const IMAGE_DOS_HEADER* dos = reinterpret_cast<const IMAGE_DOS_HEADER*>(base);
-		return reinterpret_cast<const IMAGE_NT_HEADERS32*>(reinterpret_cast<const char*>(base) + dos->e_lfanew);
+		oldoffset = 0;
+		*ploaded = 0;
+		scriptbuf[0] = '\0';
+		socketproc(engineproc, path, editp);
 	}
+}
 
-	inline DWORD getTimeStamp(HMODULE base)
+namespace
+{
+	BOOL init(FILTER*)
 	{
-		return getNtHeaders(base)->FileHeader.TimeDateStamp;
-	}
+		const ScriptEngineCoreImplement::patchdata* p{getpatch()};
+		if(!p)	return FALSE;
 
-	inline size_t getTextSectionSize(HMODULE base)
-	{
-		return getNtHeaders(base)->OptionalHeader.SizeOfCode;
+		AviUtlUI::AddMenu();
+		ScriptEngineCoreImplement::core.apply(p);
+		return TRUE;
 	}
 
-	const patchdata* getpatch()
+	const ScriptEngineCoreImplement::patchdata* getpatch()
 	{
-		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 auto VER_0_99_k	= ScriptEngineCoreImplement::makeVer1Patch(0xC7F0, 0x14F60, 0x22A80);
+		static auto VER_0_99_k2	= ScriptEngineCoreImplement::makeVer1Patch(0xC830, 0x14F90, 0x22BF0);
+		static auto VER_0_99_l	= ScriptEngineCoreImplement::makeVer1Patch(0xC8F0, 0x15120, 0x22DC0);
+		static auto VER_0_99_m	= ScriptEngineCoreImplement::makeVer1Patch(0xC950, 0x151B0, 0x22EA0);
+		static auto VER_1_00	= ScriptEngineCoreImplement::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);
+		static auto VER_1_10_rc1	= ScriptEngineCoreImplement::makeVer2Patch(0xF910, 0x1A0A0, 0x2C010);
+		static auto VER_1_10_rc2	= ScriptEngineCoreImplement::makeVer2Patch(0xFAE0, 0x1A270, 0x2C1E0);
+		static auto VER_1_10		= ScriptEngineCoreImplement::makeVer2Patch(0xFA20, 0x1A1A0, 0x2C0F0);
 
 		switch(getTimeStamp(GetModuleHandleA(nullptr))){
 			case 0x4F01F831: return &VER_0_99_k;
@@ -366,11 +151,28 @@ namespace
 		return nullptr;
 	}
 
+	inline const IMAGE_NT_HEADERS32* getNtHeaders(HMODULE base)
+	{
+		const auto dos{ reinterpret_cast<const IMAGE_DOS_HEADER*>(base) };
+		return reinterpret_cast<const IMAGE_NT_HEADERS32*>(reinterpret_cast<const char*>(base) + dos->e_lfanew);
+	}
+
+	inline DWORD getTimeStamp(HMODULE base)
+	{
+		return getNtHeaders(base)->FileHeader.TimeDateStamp;
+	}
+
+	inline size_t getTextSectionSize(HMODULE base)
+	{
+		return getNtHeaders(base)->OptionalHeader.SizeOfCode;
+	}
+
 	void writecaller(void* dest, const void* proc, size_t opsize)
 	{
-		BYTE opcodes[] = {
-			0xE8, '\0', '\0', '\0', '\0', 0x90, 0x90, 0x90,
-			0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90
+		constexpr std::byte call{0xE8}, nop{0x90}, XXX{};
+		std::byte opcodes[]{
+			call, XXX, XXX, XXX, XXX, nop, nop, nop,
+			nop , nop, nop, nop, nop, nop, nop, nop
 		};
 		writeptr(&opcodes[1], static_cast<const char*>(proc) - (reinterpret_cast<size_t>(dest) + 5));
 		modifycode(dest, opcodes, opsize);
@@ -389,11 +191,3 @@ namespace
 		VirtualProtect(dest, size, protect, &protect);
 	}
 }
-
-void LoadScript(const char* path, void *editp)
-{
-	oldoffset = 0;
-	*ploaded = 0;
-	scriptbuf[0] = '\0';
-	socketproc(editp, path);
-}

--- /dev/null
+++ b/coreimp.h
@@ -0,0 +1,43 @@
+#pragma once
+
+namespace ScriptEngineCoreImplement
+{
+	class coredata{
+	private:
+		char* scriptbuf;
+		size_t* ploaded;
+		size_t oldoffset;
+		const void* engineproc;
+		void (*socketproc)(const void*, const char*, void*);
+
+	public:
+		void apply(const struct patchdata*);
+		void loadscript(const char*, void*);
+	};
+
+	struct patchdata{
+		size_t offset_buf;
+		size_t offset_loaded;
+		struct{
+			size_t offset;
+			void (*socketproc)(const void*, const char*, void*);
+		} engine;
+		struct{
+			size_t offset;
+			const void* proc;
+			size_t bytes;
+		} patch[5];
+	};
+
+	patchdata makeVer1Patch(size_t, size_t, size_t);
+	patchdata makeVer2Patch(size_t, size_t, size_t);
+
+	size_t recalc(size_t, size_t, const char*);
+	bool is_aup_path(const char*);
+	char* erase_exe_name(char*);
+	const void* memrchr(const void*, int, size_t);
+
+	static constexpr size_t bufsize{0x1000};
+
+	extern coredata core;
+}

--- a/parser.cpp
+++ b/parser.cpp
@@ -1,69 +1,38 @@
 #include "stdafx.h"
-#include <commdlg.h>
-#include <algorithm>
-#include <typeinfo>
+#include <cstdio>
+#include <cctype>
 
-#include "apihook.h"
 #include "command.h"
-#include "core.h"
 #include "parser.h"
-#include "ui.h"
 
 namespace
 {
 	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*);
 }
 
 bool SubParser(const char* script)
 {
 	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(size_t offset{}; sscanf_s(script, "%*[Ee]%*[Xx]%*[Ee]%*[Dd]%*[Ii]%*[Tt] %n", &offset) >= 0 && offset > 0){
+		if(!GetModuleHandleA("exedit.auf"))	return false;
 
-		script += match;
+		script += offset;
 
-		unsigned int params[4];
-		if(sscanf_s(script, "new %u, %u, %u, %u", &params[0], &params[1], &params[2], &params[3]) == 4){
-			AviUtlCommand::CreateProject(params[0], params[1], params[2], params[3]);
+		if(size_t cx, cy, fps, freq; sscanf_s(script, "%*[Nn]%*[Ee]%*[Ww] %u , %u , %u , %u", &cx, &cy, &fps, &freq) == 4){
+			ExeditCommand::CreateProject(cx, cy, fps, freq);
 			return false;
 		}
-		else if(match = starts_with(script, "openexo ")){
-			script += match;
-			AviUtlCommand::OpenExoFile(script);
+		else if(size_t offset{}; sscanf_s(script, "%*[Oo]%*[Pp]%*[Ee]%*[Nn]%*[Ee]%*[Xx]%*[Oo] %n", &offset) >= 0 && offset > 0){
+			ExeditCommand::OpenExoFile(script + offset);
 			return false;
 		}
-		else if(sscanf_s(script, "switchscene #%u", &params[0]) == 1){
-			AviUtlCommand::SwitchScene(params[0]);
+		else if(size_t id; sscanf_s(script, "%*[Ss]%*[Ww]%*[Ii]%*[Tt]%*[Cc]%*[Hh]%*[Ss]%*[Cc]%*[Ee]%*[Nn]%*[Ee] #%u", &id) == 1){
+			ExeditCommand::SwitchScene(id);
 			return false;
 		}
-		else if(match = starts_with(script, "transparentscene ")){
-			script += match;
-			AviUtlCommand::TransparentScene(script[0] != 'f');
-			return false;
-		}
-	}
-	else{
-		script = skiparg(script);
-		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[0] == '/') && (script[1] == 'o' || script[1] == 'O')){
-			script += 2;
-			while(*script == ' ')	script++;
-			AviUtlCommand::SaveProject(script);
+		else if(size_t offset{}; sscanf_s(script, "%*[Tt]%*[Rr]%*[Aa]%*[Nn]%*[Ss]%*[Pp]%*[Aa]%*[Rr]%*[Ee]%*[Nn]%*[Tt]%*[Ss]%*[Cc]%*[Ee]%*[Nn]%*[Ee] %n", &offset) >= 0 && offset > 0){
+			ExeditCommand::TransparentScene(std::toupper(script[offset]) != 'F');
 			return false;
 		}
 	}
@@ -74,58 +43,9 @@ namespace
 {
 	bool is_comment(const char* str)
 	{
-		return str[0] == ';';
-	}
+		static constexpr char head[]{"rem "};
+		static constexpr size_t size{ sizeof(head) - sizeof(head[0]) };
 
-	bool is_loading_script(const char* script)
-	{
-		script = skiparg(script);
-		while(*script){
-			if(*script != '-' && *script != '/'){
-				if(*script == '\"'){
-					if(ends_with(script, ".aus") || ends_with(script, ".aus\""))	return true;
-				}
-				else{
-					if(ends_with(script, ".aus") || ends_with(script, ".aus "))		return true;
-				}
-			}
-			script = skiparg(script);
-		}
-		return false;
-	}
-
-	size_t starts_with(const char* str, const char* pat)
-	{
-		size_t n = std::strlen(pat);
-		if(!_strnicmp(pat, str, n))	return n;
-		return 0;
-	}
-
-	size_t ends_with(const char* str, const char* pat)
-	{
-		size_t m = std::strlen(str);
-		size_t n = std::strlen(pat);
-		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++;
-		if(!*script)	return script;
-
-		char del = ' ';
-		if(*script++ == '\"')	del = '\"';
-		while(*script){
-			if(*script++ == del)	break;
-		}
-		while(*script == ' ')	script++;
-		return script;
+		return str[0] == ';' || !_memicmp(str, head, size);
 	}
 }

--- a/ui.cpp
+++ b/ui.cpp
@@ -1,12 +1,14 @@
 #include "stdafx.h"
 #include <commdlg.h>
 #include <algorithm>
+#include <memory>
 #include "core.h"
 #include "ui.h"
 
 namespace
 {
-	int findmenu(HMENU, const char*, HMENU*);
+	int findmenu(HMENU, const char*);
+	void onImport(HWND, void*);
 }
 
 namespace AviUtlUI
@@ -14,7 +16,8 @@ namespace AviUtlUI
 	HWND GetMainWindow()
 	{
 		HWND ret = nullptr;
-		EnumThreadWindows(GetCurrentThreadId(), static_cast<WNDENUMPROC>([](HWND hwnd, LPARAM data) -> BOOL {
+		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;
@@ -23,22 +26,23 @@ namespace AviUtlUI
 				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;
 	}
 
 	void AddMenu()
 	{
-		HMENU file = GetSubMenu(GetMenu(GetMainWindow()), 0);
-		HMENU imp = nullptr;
-		findmenu(file, "インポート", &imp);
-		const int delpos = findmenu(imp, "Script Engine", nullptr);
+		const HMENU file = GetSubMenu(GetMenu(GetMainWindow()), 0);
+		const HMENU imp = GetSubMenu(file, findmenu(file, "インポート"));
+		const int delpos = findmenu(imp, "Script Engine");
 		if(delpos < 0)	return;
-		const int inspos = findmenu(file, "AVI出力 (Ctrl+S)", nullptr);
+		const int inspos = findmenu(file, "AVI出力 (Ctrl+S)");
 		if(inspos < 0)	return;
 
-		UINT id = GetMenuItemID(imp, delpos);
+		const 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 };
@@ -51,11 +55,7 @@ namespace AviUtlUI
 	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);
+			onImport(hwnd, editp);
 		}
 		return FALSE;
 	}
@@ -63,20 +63,28 @@ namespace AviUtlUI
 
 namespace
 {
-	int findmenu(HMENU menu, const char* name, HMENU* psub)
+	int findmenu(HMENU menu, const char* name)
 	{
-		char buf[128];
+		const size_t size = std::strlen(name) + 3;
+		const auto buf = std::make_unique<char[]>(size);
 
-		int ncolumn = GetMenuItemCount(menu);
+		const int ncolumn = GetMenuItemCount(menu);
 		for(int i = 0; i < ncolumn; i++){
-			MENUITEMINFOA mi { sizeof(mi), MIIM_TYPE | MIIM_SUBMENU, 0, 0, 0, nullptr, nullptr, nullptr, 0, buf, std::size(buf), nullptr };
+			MENUITEMINFOA mi { sizeof(mi), MIIM_TYPE, 0, 0, 0, nullptr, nullptr, nullptr, 0, buf.get(), size, nullptr };
 			GetMenuItemInfoA(menu, i, TRUE, &mi);
-			if(mi.fType != MFT_STRING || std::strcmp(buf, name))	continue;
 
-			if(psub)	*psub = mi.hSubMenu;
+			if(mi.fType != MFT_STRING || std::strcmp(buf.get(), name))	continue;
 			return i;
 		}
-		if(psub)	*psub = nullptr;
 		return -1;
 	}
+
+	void onImport(HWND hwnd, void* editp)
+	{
+		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;
+
+		LoadScript(path, editp);
+	}
 }

--- /dev/null
+++ b/v1patch.cpp
@@ -0,0 +1,123 @@
+#include "stdafx.h"
+#include "command.h"
+#include "coreimp.h"
+#include "parser.h"
+#include "ui.h"
+
+namespace
+{
+	void Socket(const void*, const char*, void*);
+	void ClearBuffer();
+	void Reload();
+	void Reset();
+	void Loader();
+	void Save();
+}
+
+namespace ScriptEngineCoreImplement
+{
+	patchdata makeVer1Patch(size_t offset_engine, size_t offset_saver, size_t offset_parser)
+	{
+		return { offset_parser + 0x48, offset_parser + 0x40,
+			{ offset_engine, Socket },
+			{
+				{ offset_engine + 0x2D, ClearBuffer, 5 },
+				{ offset_parser + 0x07, Reload, 6 },
+				{ offset_parser + 0x2E, Reset, 5 },
+				{ offset_engine + 0x47, Loader, 5 },
+				{ offset_saver + 0x8E8, Save, 6 }
+			}
+		};
+	}
+}
+
+namespace
+{
+	void Socket(const void* proc, const char* path, void* editp)
+	{
+		reinterpret_cast<void(_cdecl*)(void*, const char*)>(proc)(editp, path);
+	}
+
+	__declspec(naked) void ClearBuffer()
+	{
+		__asm{
+			lea ecx, [esp+8]
+			pop edx
+			mov byte ptr [ecx], 0
+			push ecx
+			push edx
+			ret
+		}
+	}
+
+	__declspec(naked) void Reload()
+	{
+		__asm{
+			mov eax, (ScriptEngineCoreImplement::core.ploaded)
+			push (ScriptEngineCoreImplement::core.scriptbuf)
+			push (ScriptEngineCoreImplement::core.oldoffset)
+			push [eax]
+			call ScriptEngineCoreImplement::recalc
+			mov edi, (ScriptEngineCoreImplement::core.ploaded)
+			add esp, 12
+			mov [edi], eax
+			mov (ScriptEngineCoreImplement::core.oldoffset), eax
+			mov edi, [esp+0x14]
+			mov esi, ebp
+			ret
+		}
+	}
+
+	__declspec(naked) void Reset()
+	{
+		__asm{
+			mov (ScriptEngineCoreImplement::core.oldoffset), 0
+			cmp eax, ScriptEngineCoreImplement::bufsize
+			ret
+		}
+	}
+
+	__declspec(naked) void Loader()
+	{
+		__asm{
+			lea edx, [esp+12]
+			push edx
+			push edx
+			call SubParser
+			add esp, 4
+			test eax, eax
+			je SKIP_PARSE
+			call ScriptEngineCoreImplement::erase_exe_name
+		SKIP_PARSE:
+			add esp, 4
+			pop edx
+			push eax
+			push edx
+			ret
+		}
+	}
+
+	__declspec(naked) void Save()
+	{
+		__asm{
+			cmp [ebp+0x4BC498], 0
+			jne SAVE_AVI_OR_WAV
+			lea eax, [ebp+0x108]
+			push eax
+			call ScriptEngineCoreImplement::is_aup_path
+			add esp, 4
+			test eax, eax
+			jne SAVE_AUP
+		SAVE_AVI_OR_WAV:
+			mov dl, [ebp+0x4BC198]
+			ret
+		SAVE_AUP:
+			lea eax, [ebp+0x108]
+			add dword ptr [esp], 0x10B
+			push eax
+			call AviUtlCommand::SaveProject
+			add esp, 4
+			ret
+		}
+	}
+}

--- /dev/null
+++ b/v2patch.cpp
@@ -0,0 +1,117 @@
+#include "stdafx.h"
+#include "command.h"
+#include "coreimp.h"
+#include "parser.h"
+#include "ui.h"
+
+namespace
+{
+	void Socket(const void*, const char*, void*);
+	void ClearBuffer();
+	void Reload();
+	void Reset();
+	void Loader();
+	void Save();
+}
+
+namespace ScriptEngineCoreImplement
+{
+	patchdata makeVer2Patch(size_t offset_engine, size_t offset_saver, size_t offset_parser)
+	{
+		return { offset_parser + 0x64, offset_parser + 0x5E,
+			{ offset_engine, Socket },
+			{
+				{ offset_engine + 0x42D, ClearBuffer, 7 },
+				{ offset_parser + 0x20, Reload, 5 },
+				{ offset_parser + 0x48, Reset, 8 },
+				{ offset_engine + 0x450, Loader, 7 },
+				{ offset_saver + 0xC8D, Save, 7 }
+			}
+		};
+	}
+}
+
+namespace
+{
+	void Socket(const void* proc, const char* path, void* editp)
+	{
+		reinterpret_cast<void(__fastcall*)(void*, const char*)>(proc)(editp, path);
+	}
+
+	__declspec(naked) void ClearBuffer()
+	{
+		__asm{
+			lea edx, [esp+0x44C]
+			mov byte ptr [edx], 0
+			ret
+		}
+	}
+
+	__declspec(naked) void Reload()
+	{
+		__asm{
+			push ecx
+			mov eax, (ScriptEngineCoreImplement::core.ploaded)
+			push (ScriptEngineCoreImplement::core.scriptbuf)
+			push (ScriptEngineCoreImplement::core.oldoffset)
+			push [eax]
+			call ScriptEngineCoreImplement::recalc
+			add esp, 12
+			mov (ScriptEngineCoreImplement::core.oldoffset), eax
+			pop ecx
+			ret
+		}
+	}
+
+	__declspec(naked) void Reset()
+	{
+		__asm{
+			mov eax, dword ptr [ebp-8]
+			mov (ScriptEngineCoreImplement::core.oldoffset), 0
+			cmp eax, ScriptEngineCoreImplement::bufsize
+			ret
+		}
+	}
+
+	__declspec(naked) void Loader()
+	{
+		__asm{
+			lea edx, [esp+0x44C]
+			push edx
+			push edx
+			call SubParser
+			add esp, 4
+			test eax, eax
+			je SKIP_PARSE
+			call ScriptEngineCoreImplement::erase_exe_name
+		SKIP_PARSE:
+			add esp, 4
+			mov edx, eax
+			ret
+		}
+	}
+
+	__declspec(naked) void Save()
+	{
+		__asm{
+			cmp [ebx+0x4BC498], 0
+			jne SAVE_AVI_OR_WAV
+			lea eax, [ebx+0x108]
+			push eax
+			call ScriptEngineCoreImplement::is_aup_path
+			add esp, 4
+			test eax, eax
+			jne SAVE_AUP
+		SAVE_AVI_OR_WAV:
+			cmp byte ptr [ebx+0x4BC198], 0
+			ret
+		SAVE_AUP:
+			lea eax, [ebx+0x108]
+			add dword ptr [esp], 0xC01
+			push eax
+			call AviUtlCommand::SaveProject
+			add esp, 4
+			ret
+		}
+	}
+}