Merge pull request #19 from thebest12dev/dev

v1.8.0

Author: thebest12dev

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.8.0 (2025-05-24)
+- Added containers
+- Added images 
+- Added more modular XML processors
+- Bug fixes
+
 # v1.7.0 (2025-05-15)
 - Added custom title bar (not accessible)
 - Renamed CinnamonToast to Reflect

CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 message(STATUS "Generating files...")
 message(STATUS "vcpkg toolchain location: ${CMAKE_TOOLCHAIN_FILE}")
 # Enable Hot Reload for MSVC compilers if supported.
+# Force static runtime
 if (POLICY CMP0141)
   cmake_policy(SET CMP0141 NEW)
   if (CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -17,16 +18,18 @@ if (POLICY CMP0141)
 endif()
 # Enable exceptions in MSVC
 if(MSVC)
-    add_compile_options(/EHsc /Zc:__cplusplus)
+    add_compile_options(/EHsc)
+    add_compile_options(/MT /NODEFAULTLIB:libcmt)
 endif()
 
 # Define the project
-set(TRIPLET "x64-windows")
+set(TRIPLET "x64-windows-static-md")
+set(VCPKG_TARGET_TRIPLET "x64-windows-static-md")
 project("cinnamontoast")
 set(CMAKE_GENERATOR_PLATFORM "x64")
 
 enable_testing()
-
+set(OPENSSL_USE_STATIC_LIBS TRUE)
 file(GLOB_RECURSE REFLECT_CORE "src/core/*.cpp" "src/core/*.h")
 file(GLOB_RECURSE REFLECT_NET "src/net/*.cpp" "src/net/*.h" )
 file(GLOB_RECURSE REFLECT_CRASHHANDLER "src/crash/*.cpp" "src/crash/*.h")
@@ -57,7 +60,7 @@ endif()
 
 get_filename_component(VCPKG_DIR "${CMAKE_TOOLCHAIN_FILE}" DIRECTORY)
 set(VCPKG_DIR "${VCPKG_DIR}/../../")
-set(PKG_CONFIG_EXECUTABLE "${VCPKG_DIR}/installed/${TRIPLET}/tools/pkgconf/pkgconf.exe")
+set(PKG_CONFIG_EXECUTABLE "${VCPKG_DIR}/installed/x64-windows/tools/pkgconf/pkgconf.exe")
 set(LIB_FILE_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed/${TRIPLET}/lib")
 set(JAVA_VERSION "21")
 set(JNI_INCLUDE_DIR "$ENV{JAVA_HOME}/include/win32" "$ENV{JAVA_HOME}/include")
@@ -88,6 +91,7 @@ else()
     add_library(Reflect STATIC ${REFLECT_CSTYLE} 
                 ${REFLECT_CRASHHANDLER} 
                 ${REFLECT_LUA}
+                ${REFLECT_JAVA}
                 ${REFLECT_NET} ${REFLECT_CORE} ${REFLECT_COMMONS_CORE}
     )
     target_compile_definitions(Reflect PRIVATE REFLECT_STATIC_LIBRARY=1)
@@ -159,13 +163,15 @@ set_target_properties(reflectw PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
 add_executable(reflectt ${REFLECT_TEST})
 find_package(tinyxml2 CONFIG REQUIRED)
 find_package(GTest REQUIRED)
-find_package(OpenSSL REQUIRED)
+# find_package(OpenSSL CONFIG REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(LUAJIT REQUIRED luajit)
 
 set(LUAJIT_LIBRARIES "${LIB_FILE_DIR}/${LUAJIT_LIBRARIES}.lib")
+set(OPENSSL_LIBRARIES "${LIB_FILE_DIR}/libcrypto.lib" "${LIB_FILE_DIR}/libssl.lib" crypt32)
 message(STATUS "LuaJIT binaries: ${LUAJIT_LIBRARIES}")
+message(STATUS "OpenSSL binaries: ${OPENSSL_LIBRARIES}")
 file(GLOB DLL_FILE_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed/${TRIPLET}/bin/*")
 
 #foreach(file ${DLL_FILE_DIR})
@@ -183,7 +189,8 @@ if(DEFINED REFLECT_BUNDLE)
 
     target_link_libraries(Reflect PRIVATE tinyxml2::tinyxml2 GLEW::GLEW)
     target_link_libraries(Reflect PRIVATE ${LUAJIT_LIBRARIES})
-    target_link_libraries(Reflect PRIVATE OpenSSL::SSL ws2_32)
+    target_link_libraries(Reflect PRIVATE ${OPENSSL_LIBRARIES} ws2_32)
+
 else()
 
     target_link_libraries(Reflect.CStyleAPI PRIVATE Reflect.Core)

src/api/cstyle/ReflectC.cpp

@@ -20,7 +20,6 @@
 // Includes
 #include "ReflectC.h"
 #include "../../core/ReflectAPI.h"
-
 // why do you need this really?
 using namespace reflect;
 
@@ -65,4 +64,14 @@ REFLECT_API bool Reflect_setFontSize(ReflectComponent comp, uint8_t fontSize) {
   // font color sizing???
   external::setComponentFontSize(comp.id, fontSize);
   return true;
+};
+
+REFLECT_API bool Reflect_run(ReflectComponent comp) {
+  external::run(comp.id);
+  return true;
+};
+
+REFLECT_API bool Reflect_invoke(const char *location) {
+  external::invoke(location);
+  return true;
 };

src/api/cstyle/ReflectC.h

@@ -161,7 +161,8 @@ REFLECT_API bool Reflect_setFont(ReflectComponent comp, ReflectString font);
  * @return true if successful, false otherwise.
  */
 REFLECT_API bool Reflect_setFontSize(ReflectComponent comp, uint8_t fontSize);
-
+REFLECT_API bool Reflect_invoke(const char *location);
+REFLECT_API bool Reflect_run(ReflectComponent comp);
 // why do we need extern c really?
 #ifdef __cplusplus
 // end extern "C"

src/api/cstyle/ReflectCExtern.h

@@ -171,6 +171,8 @@ REFLECT_API bool Reflect_setFont(ReflectComponent comp, ReflectString font);
  * @return true if successful, false otherwise.
  */
 REFLECT_API bool Reflect_setFontSize(ReflectComponent comp, uint8_t fontSize);
+REFLECT_API bool Reflect_invoke(const char *location);
+REFLECT_API bool Reflect_run(ReflectComponent comp);
 #ifdef __cplusplus
 // end extern "C"
 }

src/api/java/ReflectJava.c

@@ -19,8 +19,8 @@
 #include "ReflectJava.h"
 #include "../cstyle/ReflectCExtern.h"
 #include "ReflectJavaUtil.h"
+#include <Windows.h>
 #include <jni.h>
-
 JNIEXPORT jint JNICALL JavaFunction(ReflectNative,
                                     getReferenceById)(JNI_PARAM_DECL,
                                                       jstring id) {
@@ -53,3 +53,42 @@ JNIEXPORT void JNICALL JavaFunction(ReflectNative, addComp)(JNI_PARAM_DECL,
   comp2.id = (uint8_t)compRef;
   Reflect_addComponent(comp1, comp2);
 }
+
+JNIEXPORT void JNICALL JavaFunction(ReflectNative, run)(JNI_PARAM_DECL,
+                                                        jint ref) {
+  ReflectComponent comp1;
+  comp1.id = ref;
+  Reflect_run(comp1);
+}
+
+JNIEXPORT void JNICALL Java_reflect4j_ReflectNative_invoke(JNIEnv *env,
+                                                           jclass clazz,
+                                                           jstring location) {
+
+  const char *utfChars = (*env)->GetStringUTFChars(env, location, NULL);
+  if (utfChars == NULL)
+    return; // Could not get string
+
+  // Call your real native function here with the C string
+  Reflect_invoke(utfChars);
+
+  // Don't forget to release memory!
+  (*env)->ReleaseStringUTFChars(env, location, utfChars);
+}
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+  HMODULE hModule = NULL;
+
+  // Get handle to the current module (i.e., the DLL)
+  if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                            GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                        (LPCSTR)&JNI_OnLoad, // any symbol in this DLL
+                        &hModule)) {
+    // Manually increase the refcount
+    wchar_t dllPath[MAX_PATH];
+    if (GetModuleFileNameW(hModule, dllPath, MAX_PATH)) {
+      LoadLibraryW(dllPath); // increments refcount, keeps DLL loaded
+    }
+  }
+
+  return JNI_VERSION_1_8;
+}

src/api/java/ReflectJava.h

@@ -1,5 +1,4 @@
 #include "ReflectLua.h"
-
 namespace reflect {
 
 // Constructor

src/api/lua/ReflectLua.cpp

@@ -24,9 +24,9 @@
 
 // Include Lua headers
 extern "C" {
-#include "lauxlib.h"
-#include "lua.h"
-#include "lualib.h"
+#include "luajit/lua.h"
+#include "luajit/lualib.h"
+#include <luajit/lauxlib.h>
 }
 // Include C++ headers
 #include "TypeDefinitions.h"

src/api/lua/ReflectLua.h

@@ -22,7 +22,13 @@
 #include "../core/logging/LogInstance.h"
 namespace {
 // Indicates whether debug logging is enabled.
+
+#ifdef _DEBUG
+bool debugEnabled = true;
+#else
 bool debugEnabled = false;
+#endif
+
 } // namespace
 
 namespace reflect {