Update github actions

Author: GoGoOtaku

.github/workflows/multi-os-build.yml

@@ -20,7 +20,7 @@ jobs:
         # Space-separated list of packages to install using apt-get.  Will only run if on ubuntu.
         apt-get: libssl-dev cmake binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
     - name: Checkout with submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: config shared=${{ matrix.shared }}
       run: >-
         cmake
@@ -35,30 +35,27 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Checkout with submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: config
       run: >-
         cmake
         -Bbuild
         -DENABLE_TESTS=Off
     - name: Compile
       run: cmake --build build
-#    - name: Compile
-#      run: CFLAGS="-I$(brew --prefix openssl@1.1)/include/" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib/" make
 
-  build-win64:
+  build-win64-cygwin:
     runs-on: windows-latest
     steps:
     - name: Install Cygwin
       # You may pin to the exact commit or the version.
       # uses: egor-tensin/setup-cygwin@4f96f9fecb8c952fa32ff791b0a77d93d5191bb4
       uses: egor-tensin/setup-cygwin@v4
       with:
-        platform: x64 # optional, default is x64
         install-dir: c:\tools\cygwin # optional, default is C:\tools\cygwin
         packages: gcc-core gcc-g++ binutils make ninja zip libssl-devel cmake  # optional
     - name: Checkout with submodules
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Config
       run: >-
         cmake
@@ -69,8 +66,17 @@ jobs:
       run: cmake --build build
     - name: Pack
       run: cd build && cpack -G CygwinBinary
-#    - name: Compile
-#      run: make
-#    - name: Compile Windows-only tools and create a ZIP package
-#      run: make zip
 
+  build-win64-msvc:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Install OpenSSL
+      run: vcpkg install --triplet x64-windows
+    - name: Build with CL.EXE
+      run: |
+        cmake -G "NMake Makefiles" -B build -DENABLE_TESTS=Off -DVCPKG_ROOT="C:/vcpkg"
+        cmake --build build
+    - name: Package
+      run: cd build && cpack -G ZIP

CMakeLists.txt

@@ -25,6 +25,10 @@ endif()
 
 option(LIBPE_LINK_SSDEEP "LINK SSDEEP GPL2 code into libpe" ${DEFAULT_LINK_SSDEEP})
 
+if(!VCPKG_ROOT)
+    set(VCPKG_ROOT "$ENV{VCPKG_ROOT}")
+endif()
+
 include(dependencies)
 
 if(MSVC)
@@ -35,15 +39,11 @@ if(MSVC)
     if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
         include(cmake/toolchains/msvc-wine.cmake)
 
-        # My wine installation of msvc does not like my CRT
-        add_definitions(
-            -D_CRT_SECURE_NO_WARNINGS
-        )
-
         set(OPENSSL_ROOT_DIR ${VCPKG_ROOT}/installed/x64-windows)
     endif()
 
     add_definitions(
+        -D_CRT_SECURE_NO_WARNINGS
         -D_SLURP_EXECUTABLE
     )
 
@@ -52,7 +52,7 @@ if(MSVC)
 
     # TODO: This might not work on windows
     install(PROGRAMS
-        "${VCPKG_ROOT}/installed/x64-windows/bin/libcrypto-3-x64.dll"
+        "${VCPKG_ROOT}/packages/openssl_x64-windows/bin/libcrypto-3-x64.dll"
         DESTINATION bin
     )
 endif()

build-msvc-wine.sh

@@ -47,11 +47,11 @@ CMAKE_ARGS=(
     -DCMAKE_CXX_COMPILER=$BIN/cl
     -DCMAKE_SYSTEM_NAME=Windows
     -DVCPKG_TARGET_TRIPLET=x64-windows
-    -DVCPKG_OVERLAY_TRIPLETS=./msvc-wine
+    # -DVCPKG_OVERLAY_TRIPLETS=./msvc-wine
     -DVCPKG_MANIFEST_INSTALL=OFF
     -DVCPKG_MANIFEST_MODE=ON
     -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
-    -DOpenSSL_DIR=$VCPKG_ROOT/installed/x64-windows/share/openssl
+    # -DOpenSSL_DIR=$VCPKG_ROOT/installed/x64-windows/share/openssl
 )
 
 # Vcpkg uses pwsh and dumpbin to copy dependencies into the output directory for executables.

cmake/dependencies.cmake

@@ -31,5 +31,7 @@ list(APPEND content uthash)
 FetchContent_MakeAvailable(${content})
 
 add_library(uthash INTERFACE)
-target_include_directories(uthash INTERFACE ${uthash_SOURCE_DIR}/include)
-
+target_include_directories(uthash INTERFACE SYSTEM ${uthash_SOURCE_DIR}/src)
+set_target_properties(uthash PROPERTIES
+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${uthash_SOURCE_DIR}/src"
+)

include/libpe/resources.h

@@ -89,7 +89,9 @@ char      *
 pe_resource_parse_string_u(pe_ctx_t *ctx, char *output, size_t output_size,
                                 const IMAGE_RESOURCE_DATA_STRING_U *data_string_ptr);
 void pe_resources_dealloc(pe_resources_t *obj);
-const VS_FIXEDFILEINFO *pe_resource_get_fixedfileinfo(const pe_ctx_t *ctx, const pe_resource_node_t *node, void **child_out);
+PEAPI const VS_FIXEDFILEINFO *
+pe_resource_get_fixedfileinfo(const pe_ctx_t           *ctx,
+                              const pe_resource_node_t *node, void **child_out);
 
 #ifdef __cplusplus
 } // extern "C"

lib/compat/asprintf.c

@@ -48,8 +48,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define USE_MY_ASPRINTF
-
 #ifdef __cplusplus
 extern "C" {
 #endif

lib/libpe/CMakeLists.txt

@@ -60,9 +60,11 @@ if(LIBPE_LINK_SSDEEP)
     )
 endif()
 
-target_include_directories(pe SYSTEM PRIVATE
-    "${uthash_INCLUDE_DIR}"
-)
+# target_include_directories(pe SYSTEM PRIVATE
+#     "${uthash_INCLUDE_DIR}"
+#     "${uthash_SOURCE_DIR}/include"
+# )
+
 target_include_directories(pe PRIVATE
     "${CMAKE_SOURCE_DIR}/include"
 )

lib/libpe/error.c

@@ -135,7 +135,7 @@ void pe_error_print(FILE *stream, pe_err_e error)
 #elif defined(_GNU_SOURCE) // GNU-specific
         const char *errmsg_ptr = strerror_r(errno, errmsg, sizeof errmsg);
 #elif defined(_MSC_VER)    // C11
-        int         ret        = strerror_s(errmsg, sizeof(errmsg), errno);
+        /* int ret = */ strerror_s(errmsg, sizeof(errmsg), errno);
         const char *errmsg_ptr = errmsg;
 #else                      // Fallback to XSI-compliant
         /* int ret = */ strerror_r(errno, errmsg, sizeof errmsg);