近期BUG修复

1、lua回退5.4.6 2、修复sqlite的BUG 3、支持windows下控制显示中文
xiyoo0812 · Apr 19, 2024 · e6fa075 · e6fa075
1 parent 2b61945
commit e6fa075
Show file tree

Hide file tree

Showing 57 changed files with 1,494 additions and 2,418 deletions.
diff --git a/core/luabus/src/socket_helper.cpp b/core/luabus/src/socket_helper.cpp
@@ -110,6 +110,7 @@ int derive_port(int port){
     while (try_cnt-- > 0) {
         addr.sin_port = htons(port);
         if (::bind(fd, (sockaddr*)&addr, sizeof(sockaddr_in)) != SOCKET_ERROR) {
+            closesocket(fd);
             return port;
         }
         port++;

diff --git a/core/quanta/src/execute.cpp b/core/quanta/src/execute.cpp
@@ -4,8 +4,6 @@
 int main(int argc, const char* argv[])
 {
     init_quanta(argv[1], argv[2]);
-    const char* data = call_quanta("get_world_addr");
-    printf("============================: %s\n", data);
     while (true) {
         if(run_quanta() != 0) break;
     }

diff --git a/core/quanta/src/mainlib.cpp b/core/quanta/src/mainlib.cpp
@@ -85,6 +85,13 @@ QUANTA_API const char* call_quanta(const char* func) {
     return "";
 }
 
+QUANTA_API void stop_quanta() {
+    if (q_app) {
+        delete q_app;
+        q_app = nullptr;
+    }
+}
+
 QUANTA_API int run_quanta() {
     if (q_app) {;
         if (!q_app->step()) {

diff --git a/core/quanta/src/mainlib.h b/core/quanta/src/mainlib.h
@@ -15,6 +15,7 @@ extern "C" {
 #endif
 
 QUANTA_API int run_quanta();
+QUANTA_API void stop_quanta();
 QUANTA_API int init_quanta(const char* zfile, const char* fconf);
 QUANTA_API const char* call_quanta(const char* func);
 

diff --git a/core/quanta/src/quanta.cpp b/core/quanta/src/quanta.cpp
@@ -306,6 +306,9 @@ luakit::lua_table quanta_app::init() {
         const char* env_service = get_env("QUANTA_SERVICE");
         logger::get_logger()->option(env_log_path, env_service, env_index);
     }
+#ifdef WIN32
+    m_lua.run_script("os.setlocale('.UTF8')");
+#endif
     m_lua.run_script(fmt::format("require '{}'", get_env("QUANTA_SANDBOX")), [&](std::string_view err) {
         exception_handler("load sandbox err: {}", err);
         });