Fixing windows side compilation problems with the Visual C standard library used by the windows side clang/llvm

Author: Gabidal

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ dev, main ]
   pull_request:
-    branches: [ main ]
+    branches: [ dev, main ]
 
 permissions:
   contents: read
@@ -16,17 +16,21 @@ concurrency:
 
 jobs:
   build-test:
-    name: Build & Test (${{ matrix.os }} / ${{ matrix.compiler }})
+    name: Build & Test (${{ matrix.os }} / ${{ matrix.compiler }} / ${{ matrix.platform }})
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false  # We want to test on all compilers, so stopping jobs when other job fails is not good.
       matrix:
         os: [ubuntu-latest, windows-latest]
-        compiler: [gcc, clang]
+        compiler: [g++, clang]
+        platform: [x86, x64]
 
     env:
-      CXX: ${{ matrix.compiler == 'clang' && 'clang++' || 'g++' }}
-      CC: ${{ matrix.compiler == 'clang' && 'clang' || 'gcc' }}
+      CXX: ${{ matrix.compiler == 'clang' && 'clang++-14' || 'g++-13' }}
+      CC: ${{ matrix.compiler == 'clang' && 'clang-14' || 'gcc-13' }}
+      CFLAGS: ${{ matrix.platform == 'x86' && '-m32' || '-m64' }}
+      CXXFLAGS: ${{ matrix.platform == 'x86' && '-m32' || '-m64' }}
+      LDFLAGS: ${{ matrix.platform == 'x86' && '-m32' || '-m64' }}
 
     steps:
       - name: Checkout
@@ -36,9 +40,14 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential python3 python3-pip ninja-build meson valgrind
+          sudo apt-get install -y build-essential python3 python3-pip ninja-build meson
+          if [ "${{ matrix.platform }}" = "x86" ]; then
+            sudo apt-get install -y gcc-13-multilib g++-13-multilib
+          fi
           if [ "${{ matrix.compiler }}" = "clang" ]; then
-            sudo apt-get install -y clang
+            sudo apt-get install -y clang-14
+          else
+            sudo apt-get install -y gcc-13 g++-13
           fi
 
       - name: Install dependencies (Windows)
@@ -59,14 +68,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: .\bin\init.bat
 
-      - name: Compile Ubuntu
-        if: matrix.os == 'ubuntu-latest'
-        run: ./bin/build.sh
-
-      - name: Compile Windows
-        if: matrix.os == 'windows-latest'
-        run: .\bin\build.bat
-
       - name: Run tests Ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: ./bin/test.sh

src/core/renderer.cpp

@@ -16,10 +16,14 @@
 #include <exception>
 #include <csignal>
 #include <atomic>
+#include <iomanip>
 
 #if _WIN32
     #include <windows.h>
     #include <dbghelp.h>
+    #undef min
+    #undef max
+    #undef small
 #else
     #include <sys/ioctl.h>
     #include <signal.h>
@@ -112,13 +116,14 @@ namespace GGUI{
          */
         std::string now(){
             // This function takes the current time and returns a string of the time.
-            // Format: DD.MM.YYYY: SS.MM.HH
             std::time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+            std::tm* tm_ptr = std::localtime(&now);
+            
+            std::ostringstream oss;
+            // Format: DD.MM.YYYY: SS.MM.HH
+            oss << std::put_time(tm_ptr, "%d.%m.%Y: %S.%M.%H");
 
-            std::string Result = std::ctime(&now);
-
-            // Remove the newline at the end of the string
-            return Result.substr(0, Result.size() - 1);
+            return oss.str();
         }
 
         /**

src/core/utils/conveyorAllocator.h

@@ -16,7 +16,7 @@ namespace GGUI {
          */
         template<typename T>
         class conveyorAllocator {
-            unsigned char* rawBuffer = nullptr;
+            T* rawBuffer = nullptr;
             std::size_t capacity = 0;
             std::size_t size = 0;   
             public:
@@ -28,7 +28,7 @@ namespace GGUI {
              * The memory is uninitialized (raw bytes) and the logical size is set to 0.
              */
             conveyorAllocator(std::size_t initialSize) {
-                rawBuffer = new unsigned char[sizeof(T) * initialSize];
+                rawBuffer = new T[initialSize];
                 capacity = initialSize;
                 clear();
             }
@@ -52,7 +52,7 @@ namespace GGUI {
             void resize(std::size_t newCapacity) {
                 if (newCapacity > capacity) {
                     // Allocate new mem
-                    unsigned char* newBuffer = new unsigned char[sizeof(T) * newCapacity];
+                    T* newBuffer = new T[newCapacity];
                     // Copy existing contents (based on current logical size)
                     if (rawBuffer && size > 0) {
                         std::memcpy(newBuffer, rawBuffer, sizeof(T) * size);
@@ -91,7 +91,7 @@ namespace GGUI {
                     resize(size + mapSize);
                 }
 
-                compactString* view = reinterpret_cast<compactString*>(rawBuffer + size * sizeof(T));
+                compactString* view = reinterpret_cast<compactString*>(rawBuffer + size);
 
                 result.remap(
                     view,
@@ -117,7 +117,7 @@ namespace GGUI {
              * @brief Obtain a mutable pointer to the contiguous element data.
              * @return Pointer to first element (reinterpret_cast from raw bytes).
              */
-            T* getData() { return (T*)rawBuffer; }
+            T* getData() { return rawBuffer; }
         };
 
     }

src/core/utils/fileStreamer.cpp

@@ -5,6 +5,9 @@
 
 #if _WIN32
     #include <windows.h>
+    #undef min
+    #undef max
+    #undef small
 #else
     #include <sys/types.h>
     #include <sys/wait.h>

src/core/utils/fileStreamer.h

@@ -177,6 +177,7 @@ namespace GGUI{
              * @return True if synchronization was successful, false otherwise.
              */
             bool sync(bufferCapture* Informer);
+            using std::streambuf::sync; // Keep the base class virtual function. (Maybe we should add this as an proper override in bufferCapture?...)
 
             /**
              * @brief Gets the name of this BUFFER_CAPTURE.

src/core/utils/logger.cpp

@@ -14,6 +14,9 @@
     #if _WIN32
         #include <windows.h>
         #include <dbghelp.h>
+        #undef min
+        #undef max
+        #undef small
     #else
         #if !defined(__ANDROID__)   // Currently Termux does not support execinfo libraries as part of cpplib.
         #include <execinfo.h>   // For stacktrace

src/core/utils/style.h

@@ -1890,7 +1890,7 @@ namespace GGUI{
 
         inline ~node() override { styleBase::~styleBase(); }
 
-        inline styleBase* copy() const override;
+        styleBase* copy() const override;
 
         constexpr node& operator=(const node& other){
             // Only copy the information if the other is enabled.
@@ -1924,7 +1924,7 @@ namespace GGUI{
 
         inline ~childs() override { styleBase::~styleBase(); }
 
-        inline styleBase* copy() const override;
+        styleBase* copy() const override;
 
         constexpr childs& operator=(const childs& other){
             // Only copy the information if the other is enabled.

src/core/utils/utils.cpp

@@ -13,16 +13,12 @@ namespace GGUI{
         extern void* Stack_Start_Address;
         extern void* Heap_Start_Address;
 
-        /**
-         * @brief Initializes the Stack_Start_Address and Heap_Start_Address variables
-         *
-         * This function captures the nearest stack address and the nearest heap address
-         * and assigns them to the Stack_Start_Address and Heap_Start_Address variables
-         * respectively. This only happens if the variables are not already set.
-         */
-        #if _WIN32
+    #if _WIN32
         #include <windows.h>
         #include <winternl.h>
+        #undef min
+        #undef max
+        #undef small
 
         /**
          * @typedef NtQueryInformationThread_t
@@ -118,7 +114,8 @@ namespace GGUI{
                 Heap_Start_Address = new int;
             }
         }
-        #else
+    #else
+
         /**
          * @brief Reads the start addresses of the stack and heap memory areas.
          * 
@@ -184,9 +181,9 @@ namespace GGUI{
                 Heap_Start_Address = new int;
             }
         }
-        #endif
+    #endif
 
-    /**
+        /**
          * @brief Extracts the directory path from a full executable path.
          *
          * This function takes a full path to an executable and returns the directory
@@ -210,8 +207,11 @@ namespace GGUI{
             return ""; // Fallback if separator not found
         }
 
-        #if defined(_WIN32) || defined(_WIN64)
+    #if defined(_WIN32) || defined(_WIN64)
         #include <windows.h>
+        #undef min
+        #undef max
+        #undef small
 
         /**
          * @brief Retrieves the path of the executable file of the current process.
@@ -231,7 +231,7 @@ namespace GGUI{
             return path;
         }
 
-        #elif defined(__linux__) || defined(__unix__) || defined(__APPLE__)
+    #elif defined(__linux__) || defined(__unix__) || defined(__APPLE__)
         #include <unistd.h>
         #include <limits.h>
 
@@ -256,7 +256,7 @@ namespace GGUI{
             return path;
         }
 
-        #else
+    #else
         /**
          * @brief Retrieves the path of the executable.
          * 
@@ -265,7 +265,7 @@ namespace GGUI{
         const char* Get_Executable_Path() {
             return "";
         }
-        #endif
+    #endif
 
         /**
          * @brief Constructs the file name for the logger.

src/elements/listView.cpp

@@ -93,7 +93,7 @@ void GGUI::listView::addChild(element* e) {
         // Determine the flow direction for the list view.
         if (Style->Flow_Priority.value == DIRECTION::ROW) {
             // Adjust for minimum width needed when borders are present.
-            signed int Width_Modifier = e->hasBorder() & Last_Child->hasBorder();
+            signed int Width_Modifier = e->hasBorder() && Last_Child->hasBorder();
             if (isDynamicSizeAllowed()){
                 unsigned long long Proposed_Height = INTERNAL::Max(Child_Needs_Minimum_Height_Of, getHeight());
                 unsigned long long Proposed_Width = INTERNAL::Max(Last_Child->getPosition().x + Child_Needs_Minimum_Width_Of - Width_Modifier, getWidth());
@@ -110,7 +110,7 @@ void GGUI::listView::addChild(element* e) {
             Last_Child->setDimensions(e->getWidth(), e->getHeight());
         } else {
             // Adjust for minimum height needed when borders are present.
-            signed int Height_Modifier = e->hasBorder() & Last_Child->hasBorder();
+            signed int Height_Modifier = e->hasBorder() && Last_Child->hasBorder();
             if (isDynamicSizeAllowed()){
                 unsigned long long Proposed_Width = INTERNAL::Max(Child_Needs_Minimum_Width_Of, getWidth());
                 unsigned long long Proposed_Height = INTERNAL::Max(Last_Child->getPosition().y + Child_Needs_Minimum_Height_Of - Height_Modifier, getHeight());
@@ -166,7 +166,7 @@ void GGUI::listView::calculateChildsHitboxes(size_t Starting_Offset){
             element* Next = Style->Childs[i];
 
             // Affect minimum width needed, when current child has borders as well as the previous one.
-            int Width_Modifier = Next->hasBorder() & Current->hasBorder();
+            int Width_Modifier = Next->hasBorder() && Current->hasBorder();
 
             Next->setPosition({Current->getPosition().x + Current->getWidth() - Width_Modifier, Next->getPosition().y, Next->getPosition().z});
 
@@ -181,7 +181,7 @@ void GGUI::listView::calculateChildsHitboxes(size_t Starting_Offset){
             element* Next = Style->Childs[i];
 
             // Affect minimum height needed, when current child has borders as well as the previous one.
-            int Height_Modifier = Next->hasBorder() & Current->hasBorder();
+            int Height_Modifier = Next->hasBorder() && Current->hasBorder();
 
             Next->setPosition({Next->getPosition().x, Current->getPosition().y + Current->getHeight() - Height_Modifier, Next->getPosition().z});