Merge pull request #102 from Stat1cV01D/cpp_unicode

Minor string-related and style fixes

Author: GlebChili

gm_dotnet_native/dotnethelper-src/LuaAPIExposure.cpp

@@ -50,16 +50,7 @@ void export_set_metatable(ILuaBase * lua, int iStackPos)
 
 int export_get_metatable(ILuaBase * lua, int iStackPos)
 {
-    bool tmp_ret = lua->GetMetaTable(iStackPos);
-
-    if(tmp_ret)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
+    return static_cast<int>(lua->GetMetaTable(iStackPos));
 }
 
 void export_call(ILuaBase * lua, int IArgs, int iResults)
@@ -124,16 +115,7 @@ double export_get_number(ILuaBase * lua, int iStackPos)
 
 int export_get_bool (ILuaBase * lua, int iStackPos)
 {
-    bool tmp_ret = lua->GetBool(iStackPos);
-
-    if(tmp_ret)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
+    return static_cast<int>(lua->GetBool(iStackPos));
 }
 
 CFunc export_get_c_function(ILuaBase * lua, int iStackPos)
@@ -158,17 +140,7 @@ void export_push_number(ILuaBase * lua, double val)
 
 void export_push_bool(ILuaBase * lua, int val)
 {
-    bool tmp;
-    if(val == 0)
-    {
-        tmp = false;
-    }
-    else
-    {
-        tmp = true;
-    }
-
-    lua->PushBool(tmp);
+    lua->PushBool(static_cast<bool>(val));
 }
 
 void export_push_c_function(ILuaBase * lua, CFunc val)
@@ -203,16 +175,7 @@ void export_push_special(ILuaBase * lua, int table_type_number)
 
 int export_is_type(ILuaBase * lua, int iStackPos, int iType)
 {
-    bool tmp = lua->IsType(iStackPos, iType);
-
-    if(tmp)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
+    return static_cast<int>(lua->IsType(iStackPos, iType));
 }
 
 int export_get_type(ILuaBase * lua, int iStackPos)
@@ -222,10 +185,9 @@ int export_get_type(ILuaBase * lua, int iStackPos)
 
 const char * export_get_type_name(ILuaBase * lua, int iType, int * out_name_len)
 {
-    const char * ptr =  lua->GetTypeName(iType);
-    int tmp_len = strlen(ptr);
-    *out_name_len = tmp_len;
-    return ptr;
+    const char * name =  lua->GetTypeName(iType);
+    *out_name_len = static_cast<int>(strlen(name));
+    return name;
 }
 
 int export_obj_len(ILuaBase * lua, int iStackPos)
@@ -235,42 +197,42 @@ int export_obj_len(ILuaBase * lua, int iStackPos)
 
 void export_get_angle(ILuaBase * lua, float * out_angle_components, int iStackPos)
 {
-    const QAngle& tmp = lua->GetAngle(iStackPos);
+    const QAngle& angle = lua->GetAngle(iStackPos);
 
-    out_angle_components[0] = tmp.x;
-    out_angle_components[1] = tmp.y;
-    out_angle_components[2] = tmp.z;
+    out_angle_components[0] = angle.x;
+    out_angle_components[1] = angle.y;
+    out_angle_components[2] = angle.z;
 }
 
 void export_get_vector(ILuaBase * lua, float * out_vector_components, int iStackPos)
 {
-    const Vector& tmp = lua->GetVector(iStackPos);
+    const Vector& vector = lua->GetVector(iStackPos);
 
-    out_vector_components[0] = tmp.x;
-    out_vector_components[1] = tmp.y;
-    out_vector_components[2] = tmp.z;
+    out_vector_components[0] = vector.x;
+    out_vector_components[1] = vector.y;
+    out_vector_components[2] = vector.z;
 }
 
 void export_push_angle(ILuaBase * lua, float x, float y, float z)
 {
-    QAngle tmp;
+    QAngle angle;
 
-    tmp.x = x;
-    tmp.y = y;
-    tmp.z = z;
+    angle.x = x;
+    angle.y = y;
+    angle.z = z;
 
-    lua->PushAngle(tmp);
+    lua->PushAngle(angle);
 }
 
 void export_push_vector(ILuaBase * lua, float x, float y, float z)
 {
-    Vector tmp;
+    Vector vector;
 
-    tmp.x = x;
-    tmp.y = y;
-    tmp.z = z;
+    vector.x = x;
+    vector.y = y;
+    vector.z = z;
 
-    lua->PushVector(tmp);
+    lua->PushVector(vector);
 }
 
 void export_set_state(ILuaBase * lua, lua_State * state)
@@ -285,16 +247,7 @@ int export_create_metatable(ILuaBase * lua, const char * name)
 
 int export_push_metatable(ILuaBase * lua, int iType)
 {
-    bool tmp = lua->PushMetaTable(iType);
-
-    if(tmp)
-    {
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
+    return static_cast<int>(lua->PushMetaTable(iType));
 }
 
 void export_push_user_type(ILuaBase * lua, void * data, int iType)
@@ -344,16 +297,14 @@ void export_push_user_data(ILuaBase * lua, void * data)
 
 const char * export_check_string(ILuaBase * lua, int iStackPos, int * output_string_length)
 {
-    const char * tmp = lua->CheckString(iStackPos);
+    const char * str = lua->CheckString(iStackPos);
 
-    if(tmp == nullptr)
+    if(str != nullptr)
     {
-        return nullptr;
+        *output_string_length = static_cast<int>(strlen(str));
     }
 
-    *output_string_length = strlen(tmp);
-
-    return tmp;
+    return str;
 }
 
 double export_check_number(ILuaBase * lua, int iStackPos)

gm_dotnet_native/dotnethelper-src/dotnethelper.cpp

@@ -13,16 +13,21 @@
 #ifdef WIN32
 #include <Windows.h>
 #else
+#include <cstring>
 #include <dlfcn.h>
 #include <unistd.h>
 #endif
 
 #ifdef WIN32
-#define DYNANAMIC_EXPORT _declspec(dllexport)
+#define DYNAMIC_EXPORT _declspec(dllexport)
+#define __T(x) L ## x
 #else
-#define DYNANAMIC_EXPORT __attribute__((visibility("default")))
+#define DYNAMIC_EXPORT __attribute__((visibility("default")))
+#define __T(x) x
 #endif
 
+#define _T(x) __T(x)
+
 typedef int (*managed_delegate_executor_fn)(
         lua_State * luaState
 );
@@ -36,40 +41,37 @@ typedef cleanup_function_fn(*managed_main_fn)(
         /* Out Param */ managed_delegate_executor_fn* managed_delegate_executor_ptr
         );
 
+using tstring = std::basic_string<char_t>;
+
 std::ofstream error_log_file;
 
 managed_delegate_executor_fn managed_delegate_executor = nullptr;
 
 managed_main_fn managed_main = nullptr;
 
-std::string hosfxr_path = "garrysmod/lua/bin/dotnet/host/fxr/" + std::string(NET_CORE_VERSION);
+const std::filesystem::path lua_bin_folder = _T("garrysmod/lua/bin");
+const std::filesystem::path hostfxr_path = (lua_bin_folder / _T("dotnet/host/fxr") / NET_CORE_VERSION).make_preferred();
 #ifdef WIN32
-void* hostfxr_library_handle = LoadLibraryA((hosfxr_path + "/hostfxr.dll").c_str());
+HMODULE hostfxr_library_handle = LoadLibraryW((hostfxr_path / _T("hostfxr.dll")).c_str());
 #elif __APPLE__
-void* hostfxr_library_handle = dlopen((hosfxr_path + "/libhostfxr.dylib").c_str(), RTLD_LAZY | RTLD_LOCAL);
+void* hostfxr_library_handle = dlopen((hostfxr_path / "libhostfxr.dylib").c_str(), RTLD_LAZY | RTLD_LOCAL);
 #elif __gnu_linux__
-void* hostfxr_library_handle = dlopen((hosfxr_path + "/libhostfxr.so").c_str(), RTLD_LAZY);
+void* hostfxr_library_handle = dlopen((hostfxr_path / "libhostfxr.so").c_str(), RTLD_LAZY);
 #endif
 
+template<typename T>
+bool LoadFunction(const char* function_name, T& out_func)
+{
 #ifdef WIN32
-hostfxr_initialize_for_dotnet_command_line_fn hostfxr_initialize_for_dotnet_command_line =
-        reinterpret_cast<hostfxr_initialize_for_dotnet_command_line_fn>(GetProcAddress(static_cast<HMODULE>(hostfxr_library_handle),
-                                                                                       "hostfxr_initialize_for_dotnet_command_line"));
-hostfxr_get_runtime_delegate_fn hostfxr_get_runtime_delegate =
-        reinterpret_cast<hostfxr_get_runtime_delegate_fn>(GetProcAddress(static_cast<HMODULE>(hostfxr_library_handle),
-                                                                         "hostfxr_get_runtime_delegate"));
-
-hostfxr_set_error_writer_fn hostfxr_set_error_writer =
-        reinterpret_cast<hostfxr_set_error_writer_fn>(GetProcAddress(static_cast<HMODULE>(hostfxr_library_handle),
-                                                                     "hostfxr_set_error_writer"));
+    out_func = reinterpret_cast<T>(GetProcAddress(hostfxr_library_handle, function_name));
 #else
-hostfxr_initialize_for_dotnet_command_line_fn hostfxr_initialize_for_dotnet_command_line =
-        reinterpret_cast<hostfxr_initialize_for_dotnet_command_line_fn>(dlsym(hostfxr_library_handle, "hostfxr_initialize_for_dotnet_command_line"));
-hostfxr_get_runtime_delegate_fn hostfxr_get_runtime_delegate =
-        reinterpret_cast<hostfxr_get_runtime_delegate_fn>(dlsym(hostfxr_library_handle, "hostfxr_get_runtime_delegate"));
-hostfxr_set_error_writer_fn hostfxr_set_error_writer =
-        reinterpret_cast<hostfxr_set_error_writer_fn>(dlsym(hostfxr_library_handle, "hostfxr_set_error_writer"));
+    out_func = reinterpret_cast<T>(dlsym(hostfxr_library_handle, function_name));
 #endif
+    return (out_func != nullptr);
+}
+hostfxr_initialize_for_dotnet_command_line_fn hostfxr_initialize_for_dotnet_command_line = nullptr;
+hostfxr_get_runtime_delegate_fn hostfxr_get_runtime_delegate = nullptr;
+hostfxr_set_error_writer_fn hostfxr_set_error_writer = nullptr;
 
 void HOSTFXR_CALLTYPE dotnet_error_writer(const char_t *message)
 {
@@ -150,7 +152,7 @@ void * params_to_managed_code[] = {
         reinterpret_cast<void*>(export_push_c_function_safe)
 };
 
-extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::ILuaBase* lua)
+extern "C" DYNAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::ILuaBase* lua)
 {
     if(!error_log_file.is_open())
     {
@@ -159,7 +161,9 @@ extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::I
 
     if(managed_main == nullptr)
     {
-        if(hostfxr_initialize_for_dotnet_command_line == nullptr || hostfxr_get_runtime_delegate == nullptr || hostfxr_set_error_writer == nullptr)
+        if(!(LoadFunction("hostfxr_initialize_for_dotnet_command_line", hostfxr_initialize_for_dotnet_command_line)
+            && LoadFunction("hostfxr_get_runtime_delegate", hostfxr_get_runtime_delegate)
+            && LoadFunction("hostfxr_set_error_writer", hostfxr_set_error_writer)))
         {
             error_log_file << "Unable to load hostfxr library" << std::endl;
             return nullptr;
@@ -169,27 +173,24 @@ extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::I
 
         hostfxr_set_error_writer(dotnet_error_writer);
 
+        const auto gmodnet_dll_relative_path = lua_bin_folder / _T("gmodnet/GmodNET.dll");
+        const auto dotnet_root_path = (std::filesystem::current_path() / lua_bin_folder / "dotnet").make_preferred();
+
+        const char_t* dotnet_args[] = {_T("exec"), gmodnet_dll_relative_path.c_str()};
+        
+        tstring game_exe_path(301, _T('\0'));
 #ifdef WIN32
-        const char_t* dotnet_args[2] = {L"exec", L"garrysmod/lua/bin/gmodnet/GmodNET.dll"};
+        GetModuleFileNameW(nullptr, game_exe_path.data(), static_cast<DWORD>(game_exe_path.size()) - 1);
 #else
-        const char_t* dotnet_args[2] = {"exec", "garrysmod/lua/bin/gmodnet/GmodNET.dll"};
+        readlink("/proc/self/exe", game_exe_path.data(), game_exe_path.size() - 1);
 #endif
         hostfxr_initialize_parameters dotnet_runtime_params;
         dotnet_runtime_params.size = sizeof(hostfxr_initialize_parameters);
-#ifdef WIN32
-        char_t game_exe_path[301];
-        int game_exe_path_len = GetModuleFileNameW(nullptr, game_exe_path, 300);
-#else
-        char game_exe_path[301];
-        int game_exe_path_len = readlink("/proc/self/exe", game_exe_path, 300);
-        game_exe_path[game_exe_path_len] = '\0';
-#endif
-        dotnet_runtime_params.host_path = game_exe_path;
+        dotnet_runtime_params.host_path = game_exe_path.c_str();
+        dotnet_runtime_params.dotnet_root = dotnet_root_path.c_str();
 
-        std::filesystem::path dotnet_root_path = std::filesystem::current_path() / "garrysmod" / "lua" / "bin" / "dotnet";
-        dotnet_runtime_params.dotnet_root = dotnet_root_path.native().c_str();
-
-        int init_success_code = hostfxr_initialize_for_dotnet_command_line(2, dotnet_args, &dotnet_runtime_params, &runtime_environment_handle);
+        int init_success_code = hostfxr_initialize_for_dotnet_command_line(static_cast<int>(std::size(dotnet_args)), dotnet_args, 
+                                                                           &dotnet_runtime_params, &runtime_environment_handle);
         if(init_success_code != 0)
         {
             error_log_file << "Unable to initialize dotnet runtime. Error code: " << init_success_code << std::endl;
@@ -212,13 +213,9 @@ extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::I
             error_log_file << "get_function_pointer is null" << std::endl;
             return nullptr;
         }
-#ifdef WIN32
-        int get_managed_main_success_code = get_function_pointer(L"GmodNET.Startup, GmodNET", L"Main", UNMANAGEDCALLERSONLY_METHOD,
-                                                                 nullptr, nullptr, reinterpret_cast<void**>(&managed_main));
-#else
-        int get_managed_main_success_code = get_function_pointer("GmodNET.Startup, GmodNET", "Main", UNMANAGEDCALLERSONLY_METHOD,
+
+        int get_managed_main_success_code = get_function_pointer(_T("GmodNET.Startup, GmodNET"), _T("Main"), UNMANAGEDCALLERSONLY_METHOD,
                                                                  nullptr, nullptr, reinterpret_cast<void**>(&managed_main));
-#endif
         if(get_managed_main_success_code != 0)
         {
             error_log_file << "Unable to load managed entry point: Error code: " << get_managed_main_success_code << std::endl;
@@ -230,7 +227,8 @@ extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::I
             return nullptr;
         }
     }
-    return managed_main(lua, std::string(SEM_VERSION).c_str(), std::string(SEM_VERSION).length(), params_to_managed_code,
+
+    return managed_main(lua, SEM_VERSION, static_cast<int>(std::strlen(SEM_VERSION)), params_to_managed_code,
                         native_delegate_executor, &managed_delegate_executor);
 }