Merge pull request #35 from CppCXY/master

修复一些隐患

Author: CppCXY

.github/workflows/build.yml

@@ -16,24 +16,6 @@ jobs:
         cmake ../
         cmake --build . --config RelWithDebInfo --target install
     
-    - name: Build x86.51
-      run: |
-        cd x86
-        cmake ../ -DEMMY_LUA_VERSION=51 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
-    
-    - name: Build x86.52
-      run: |
-        cd x86
-        cmake ../ -DEMMY_LUA_VERSION=52 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
-    
-    - name: Build x86.53
-      run: |
-        cd x86
-        cmake ../ -DEMMY_LUA_VERSION=53 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
-    
     - name: Upload x86
       uses: actions/[email protected]
       with:
@@ -46,24 +28,6 @@ jobs:
         cd x64
         cmake ../ -G "Visual Studio 15 2017 Win64"
         cmake --build . --config RelWithDebInfo --target install
-
-    - name: Build x64.51
-      run: |
-        cd x64
-        cmake ../ -G "Visual Studio 15 2017 Win64" -DEMMY_LUA_VERSION=51 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
-
-    - name: Build x64.52
-      run: |
-        cd x64
-        cmake ../ -G "Visual Studio 15 2017 Win64" -DEMMY_LUA_VERSION=52 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
-
-    - name: Build x64.53
-      run: |
-        cd x64
-        cmake ../ -G "Visual Studio 15 2017 Win64" -DEMMY_LUA_VERSION=53 -DEMMY_USE_LUA_SOURCE=true
-        cmake --build . --config RelWithDebInfo --target install
     
     - name: Upload x64
       uses: actions/[email protected]

emmy_debugger/src/emmy_debugger.cpp

@@ -969,7 +969,7 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
 	// setup env
 #ifndef EMMY_USE_LUA_SOURCE
 	lua_setfenv(L, fIdx);
-#elif EMMY_LUA_51
+#elif defined(EMMY_LUA_51) || defined(EMMY_LUA_JIT)
     lua_setfenv(L, fIdx);
 #else //52 & 53
     lua_setupvalue(L, fIdx, 1);

emmy_hook/src/emmy_hook.windows.cpp

@@ -14,6 +14,7 @@
 #include "emmy_debugger/proto/socket_server_transporter.h"
 #include "shared/shme.h"
 
+
 typedef TRACED_HOOK_HANDLE HOOK_HANDLE;
 typedef NTSTATUS HOOK_STATUS;
 
@@ -28,7 +29,11 @@ typedef int (*_lua_pcall)(lua_State* L, int nargs, int nresults, int errfunc);
 
 typedef int (*_lua_pcallk)(lua_State* L, int nargs, int nresults, int errfunc, lua_KContext ctx, lua_KFunction k);
 
-typedef int (*_lua_resume)(lua_State* L, lua_State* from, int nargs, int* nresults);
+typedef int (*_lua_resume_54)(lua_State* L, lua_State* from, int nargs, int* nresults);
+
+typedef int (*_lua_resume_53_52)(lua_State* L, lua_State* from, int narg);
+
+typedef int (*_lua_resume_51)(lua_State* L, int narg);
 
 typedef HMODULE (WINAPI *LoadLibraryExW_t)(LPCWSTR lpFileName, HANDLE hFile, DWORD dwFlags);
 
@@ -91,15 +96,33 @@ int lua_error_worker(lua_State* L)
 	return error(L);
 }
 
-int lua_resume_worker(lua_State* L, lua_State* from, int nargs, int* nresults)
+int lua_resume_worker_54(lua_State* L, lua_State* from, int nargs, int* nresults)
 {
 	LPVOID lp;
 	LhBarrierGetCallback(&lp);
-	const auto luaResume = (_lua_resume)lp;
+	const auto luaResume = (_lua_resume_54)lp;
 	EmmyFacade::Get().Attach(L);
 	return luaResume(L, from, nargs, nresults);
 }
 
+int lua_resume_worker_53_52(lua_State* L, lua_State* from, int nargs)
+{
+	LPVOID lp;
+	LhBarrierGetCallback(&lp);
+	const auto luaResume = (_lua_resume_53_52)lp;
+	EmmyFacade::Get().Attach(L);
+	return luaResume(L, from, nargs);
+}
+
+int lua_resume_worker_51(lua_State* L, int nargs)
+{
+	LPVOID lp;
+	LhBarrierGetCallback(&lp);
+	const auto luaResume = (_lua_resume_51)lp;
+	EmmyFacade::Get().Attach(L);
+	return luaResume(L, nargs);
+}
+
 #define HOOK(FN, WORKER, REQUIRED) {\
 	const auto it = symbols.find(""#FN"");\
 	if (it != symbols.end()) {\
@@ -112,6 +135,8 @@ int lua_resume_worker(lua_State* L, lua_State* from, int nargs, int* nresults)
 	}\
 }
 
+#define EXIST_SYMBOL(FN) (symbols.find(""#FN"") != symbols.end())
+
 void HookLuaFunctions(std::unordered_map<std::string, DWORD64>& symbols)
 {
 	if (symbols.empty())
@@ -121,7 +146,20 @@ void HookLuaFunctions(std::unordered_map<std::string, DWORD64>& symbols)
 	// lua 5.2
 	HOOK(lua_pcallk, lua_pcallk_worker, false);
 	// HOOK(lua_error, lua_error_worker, true);
-	HOOK(lua_resume, lua_resume_worker, false);
+
+	// lua5.4
+	if (EXIST_SYMBOL(lua_newuserdatauv)) 
+	{
+		HOOK(lua_resume, lua_resume_worker_54, false);
+	}
+	else if(EXIST_SYMBOL(lua_rotate) || EXIST_SYMBOL(lua_callk)) //lua5.3 lua5.2
+	{
+		HOOK(lua_resume, lua_resume_worker_53_52, false);
+	}
+	else // lua5.1 or luajit
+	{
+		HOOK(lua_resume, lua_resume_worker_51, false);
+	}
 }
 
 void LoadSymbolsRecursively(HANDLE hProcess, HMODULE hModule)

emmy_tool/src/main.cpp

@@ -21,6 +21,17 @@ int doAttach(CommandLine& commandLine)
 	return 0;
 }
 
+void translateText(std::string& text)
+{
+	for(auto& c: text)
+	{
+		if(c == '\n')
+		{
+			c = ' ';
+		}
+	}
+}
+
 int doListProcesses()
 {
 	std::vector<Process> list;
@@ -29,7 +40,13 @@ int doListProcesses()
 	for (auto& value : list)
 	{
 		printf("%d\n", value.id);
+		// title 中可能出现\n 所以title中的\n全部转为' '
+		translateText(value.title);
+
 		printf("%s\n", value.title.c_str());
+
+		translateText(value.path);
+
 		printf("%s\n", value.path.c_str());
 		printf("----\n");
 	}