update bee

actboy168 · Apr 6, 2024 · e61f1df · e61f1df
1 parent 1cb16ab
commit e61f1df
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/3rd/bee.lua b/3rd/bee.lua
diff --git a/compile/common/runtime.lua b/compile/common/runtime.lua
@@ -58,7 +58,7 @@ lm:source_set 'luadbg' {
     windows = {
         defines = {
             "_CRT_SECURE_NO_WARNINGS",
-            "_WIN32_WINNT=0x0601",
+            "_WIN32_WINNT=0x0602",
         },
     }
 }
@@ -92,7 +92,7 @@ lm:source_set 'luadbg-compatible' {
     windows = {
         defines = {
             "_CRT_SECURE_NO_WARNINGS",
-            "_WIN32_WINNT=0x0601",
+            "_WIN32_WINNT=0x0602",
         },
     }
 }
@@ -344,7 +344,7 @@ for _, luaver in ipairs {
             deps = luaver..'/'..luaver,
             defines = {
                 "_CRT_SECURE_NO_WARNINGS",
-                "_WIN32_WINNT=0x0601",
+                "_WIN32_WINNT=0x0602",
                 ("LUA_DLL_VERSION="..luaver)
             },
             links = {

diff --git a/compile/windows/runtime.lua b/compile/windows/runtime.lua
@@ -4,7 +4,7 @@ require "compile.common.config"
 
 local platform = lm.runtime_platform
 
-lm.defines = "_WIN32_WINNT=0x0601"
+lm.defines = "_WIN32_WINNT=0x0602"
 lm.builddir = ("build/%s/%s"):format(platform, lm.mode)
 
 require "compile.common.runtime"

diff --git a/src/process_inject/windows/inject.cpp b/src/process_inject/windows/inject.cpp
@@ -1,6 +1,7 @@
 #include <Windows.h>
 #include <bee/lua/binding.h>
 #include <bee/platform/win/unicode.h>
+#include <bee/utility/zstring_view.h>
 #include <bee/subprocess.h>
 #include <binding/binding.h>
 
@@ -9,22 +10,27 @@
 
 #include "injectdll.h"
 
-inline std::string_view checkstrview(lua_State* L, int idx) {
+static bee::zstring_view checkstrview(lua_State* L, int idx) {
     size_t len      = 0;
     const char* buf = luaL_checklstring(L, idx, &len);
     return { buf, len };
 }
 
+static std::wstring checkstring(lua_State* L, int idx) {
+    auto str = checkstrview(L, idx);
+    return bee::win::u2w(str);
+}
+
 static int injectdll(lua_State* L) {
     if (lua_type(L, 1) == LUA_TNUMBER) {
         DWORD pid = (DWORD)luaL_checkinteger(L, 1);
-        bool ok   = injectdll(pid, bee::lua::checkstring(L, 2), bee::lua::checkstring(L, 3), checkstrview(L, 4));
+        bool ok   = injectdll(pid, checkstring(L, 2), checkstring(L, 3), checkstrview(L, 4));
         lua_pushboolean(L, ok);
         return 1;
     }
     else {
         auto& self = *(bee::subprocess::process*)luaL_checkudata(L, 1, "bee::subprocess");
-        bool ok    = injectdll(self.native_handle(), self.thread_handle(), bee::lua::checkstring(L, 2), bee::lua::checkstring(L, 3), checkstrview(L, 4));
+        bool ok    = injectdll(self.native_handle(), self.thread_handle(), checkstring(L, 2), checkstring(L, 3), checkstrview(L, 4));
         lua_pushboolean(L, ok);
         return 1;
     }

diff --git a/src/process_inject/windows/injectdll.cpp b/src/process_inject/windows/injectdll.cpp
@@ -49,7 +49,7 @@ static bool wow64_write_memory(uint64_t nwvm, HANDLE hProcess, uint64_t lpBaseAd
     return true;
 }
 
-static bool injectdll_x64(HANDLE process_handle, HANDLE thread_handle, const std::wstring& dll, const std::string_view& entry) {
+static bool injectdll_x64(HANDLE process_handle, HANDLE thread_handle, const std::wstring& dll, const bee::zstring_view& entry) {
     static unsigned char sc[] = {
         0x9C,                                                        // pushfq
         0x0F, 0xA8,                                                  // push gs
@@ -195,7 +195,7 @@ static bool injectdll_x64(HANDLE process_handle, HANDLE thread_handle, const std
     return true;
 }
 
-static bool injectdll_x86(HANDLE process_handle, HANDLE thread_handle, const std::wstring& dll, const std::string_view& entry) {
+static bool injectdll_x86(HANDLE process_handle, HANDLE thread_handle, const std::wstring& dll, const bee::zstring_view& entry) {
     static unsigned char sc[] = {
         0x68, 0x00, 0x00, 0x00, 0x00,  // push eip
         0x9C,                          // pushfd
@@ -266,7 +266,7 @@ static bool injectdll_x86(HANDLE process_handle, HANDLE thread_handle, const std
     return true;
 }
 
-bool injectdll(HANDLE process_handle, HANDLE thread_handle, const std::wstring& x86dll, const std::wstring& x64dll, const std::string_view& entry) {
+bool injectdll(HANDLE process_handle, HANDLE thread_handle, const std::wstring& x86dll, const std::wstring& x64dll, const bee::zstring_view& entry) {
     if (is_process64(process_handle)) {
         return !x64dll.empty() && injectdll_x64(process_handle, thread_handle, x64dll, entry);
     }
@@ -342,7 +342,7 @@ static bool openprocess(DWORD pid, DWORD process_access, DWORD thread_access, PR
     return true;
 }
 
-bool injectdll(DWORD pid, const std::wstring& x86dll, const std::wstring& x64dll, const std::string_view& entry) {
+bool injectdll(DWORD pid, const std::wstring& x86dll, const std::wstring& x64dll, const bee::zstring_view& entry) {
     PROCESS_INFORMATION pi = { 0 };
     if (!openprocess(pid, PROCESS_ALL_ACCESS, THREAD_GET_CONTEXT | THREAD_SET_CONTEXT | THREAD_SUSPEND_RESUME, pi)) {
         return false;

diff --git a/src/process_inject/windows/injectdll.h b/src/process_inject/windows/injectdll.h
@@ -7,7 +7,7 @@
 #include <Windows.h>
 
 #include <string>
-#include <string_view>
+#include <bee/utility/zstring_view.h>
 
-bool injectdll(HANDLE process_handle, HANDLE thread_handle, const std::wstring& x86dll, const std::wstring& x64dll, const std::string_view& entry = 0);
-bool injectdll(DWORD pid, const std::wstring& x86dll, const std::wstring& x64dll, const std::string_view& entry = 0);
+bool injectdll(HANDLE process_handle, HANDLE thread_handle, const std::wstring& x86dll, const std::wstring& x64dll, const bee::zstring_view& entry = 0);
+bool injectdll(DWORD pid, const std::wstring& x86dll, const std::wstring& x64dll, const bee::zstring_view& entry = 0);
+4 −9		bee/filewatch/filewatch.h
+26 −30		bee/filewatch/filewatch_linux.cpp
+0 −7		bee/filewatch/filewatch_osx.cpp
+1 −8		bee/filewatch/filewatch_win.cpp
+4 −20		bee/lua/binding.h
+2 −2		bee/net/fd.h
+10 −10		bee/net/socket.cpp
+1 −1		bee/nonstd/debugging.h
+1 −1		bee/platform/version.cpp
+2 −2		bee/subprocess/subprocess_posix.cpp
+2 −2		bee/subprocess/subprocess_win.cpp
+1 −1		bee/subprocess/subprocess_win.h
+4 −3		bee/thread/simplethread_posix.cpp
+10 −9		bee/thread/simplethread_win.cpp
+0 −3		bee/utility/file_handle.h
+1 −1		bee/utility/path_helper.cpp
+1 −1		bee/utility/zstring_view.h
+1 −1		binding/lua_debugging.cpp
+31 −27		binding/lua_filesystem.cpp
+11 −15		binding/lua_filewatch.cpp
+1 −1		binding/lua_platform.cpp
+7 −7		binding/lua_select.cpp
+2 −3		binding/lua_socket.cpp
+21 −7		binding/lua_subprocess.cpp
+5 −7		binding/lua_thread.cpp
+18 −29		binding/lua_time.cpp
+1 −1		compile/config.lua
+1 −1		test/test.lua
+8 −8		test/test_filesystem.lua
+2 −2		test/test_socket.lua
+20 −20		test/test_subprocess.lua
+9 −9		test/test_thread.lua