Modification to use external DDS.h header in MO2.

.gitignore

@@ -134,7 +134,6 @@ ui_*.h
 *.jsc
 Makefile*
 *build-*
-vsbuild
 
 # Qt unit tests
 target_wrapper.*

CMakeLists.txt

@@ -1,92 +1,71 @@
 cmake_minimum_required(VERSION 3.16)
 
-include(CMakePackageConfigHelpers)
+option(copy_dll_to_binary_dir "Will copy libbsarch DLL to the binary directory. May not work if libbsarch is used as a subproject" ON)
 
+# Project
 project(libbsarch CXX)
 
-find_package(mo2-dds-header CONFIG REQUIRED)
-find_package(Qt6 COMPONENTS Core REQUIRED)
-
-get_target_property(SRCS mo2::dds-header SOURCES)
-
-# libbsarch
-add_library(libbsarch SHARED)
-target_sources(libbsarch
-    PRIVATE
-        src/libbsarch.cpp
-        src/libbsarch.def
-    PUBLIC
-        FILE_SET HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
-        FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h
+# Add library to build.
+add_library(libbsarch SHARED
+    src/libbsarch.h
+    src/libbsarch.cpp
+    src/libbsarch.def
 )
-target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch)
-set_target_properties(libbsarch PROPERTIES DEBUG_POSTFIX "d" CXX_STANDARD 11)
-target_link_libraries(libbsarch PUBLIC mo2::dds-header)
+target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds)
+target_compile_features(libbsarch PRIVATE cxx_std_11)
+
+# Preprocessor definitions
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    if(MSVC)
+        target_compile_options(libbsarch PRIVATE /W3 /MDd /Od /EHsc)
+    endif()
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    if(MSVC)
+        target_compile_options(libbsarch PRIVATE /W3 /Zi /EHsc)
+    endif()
+endif()
+
 target_compile_definitions(libbsarch PRIVATE BSARCH_DLL_EXPORT)
 
-# preprocessor definitions
-if(MSVC)
-    target_compile_options(libbsarch PRIVATE
-        /W3 /EHsc /MP
-        $<$<CONFIG:DEBUG>:/MDd /Od>
-        $<$<CONFIG:RELEASE>:/Zi>
-    )
-endif()
+#We only want the lib file. The DLL will be provided by Delphi
+#Removing the generated DLL
+add_custom_command(TARGET libbsarch POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove
+    ${CMAKE_CURRENT_BINARY_DIR}/libbsarch.dll)
 
+############################################################
+# libbsarch_OOP                                            #
+############################################################
 
-# libbsarch_OOP
-add_library(libbsarch_OOP STATIC)
+find_package(Qt6 COMPONENTS Core REQUIRED)
 
-target_sources(libbsarch_OOP
-    PRIVATE
-        src/bs_archive_entries.cpp
-        src/utils/string_convert.cpp
-        src/utils/convertible_ostream.cpp
-        src/utils/convertible_string.cpp
-        src/bs_archive_auto.cpp
-        src/bs_archive.cpp
-    PUBLIC
-        FILE_SET HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
-        FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/base_types.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_auto.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_entries.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_string.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_ostream.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/string_convert.hpp
+add_library(libbsarch_OOP STATIC
+    src/base_types.hpp
+    src/bs_archive_auto.cpp
+    src/bs_archive_auto.hpp
+    src/bs_archive.cpp
+    src/bs_archive.h
+    src/bs_archive_entries.cpp
+    src/bs_archive_entries.h
+
+    src/libbsarch.hpp
+    src/libbsarch.h
+
+    src/utils/convertible_string.cpp
+    src/utils/convertible_string.hpp
+    src/utils/convertible_ostream.cpp
+    src/utils/convertible_ostream.hpp
+    src/utils/string_convert.cpp
+    src/utils/string_convert.hpp
 )
-target_include_directories(libbsarch_OOP PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils)
-target_link_libraries(libbsarch_OOP PUBLIC mo2::dds-header)
+target_include_directories(libbsarch_OOP PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds)
 
-set_target_properties(libbsarch_OOP PROPERTIES
-    DEBUG_POSTFIX "d"
-    CXX_STANDARD 17
-)
 
-if (MSVC)
-    target_compile_options(libbsarch_OOP PRIVATE /MP)
-endif()
+## Copying the corresponding DLL ##
 
-# adding Qt support
-if(Qt6_FOUND)
-    message("libbsarch: Qt6 found, enabling Qt support")
-    target_link_libraries(libbsarch_OOP PUBLIC Qt::Core)
-    target_compile_definitions(libbsarch PUBLIC "LIBBSARCH_QT_SUPPORT")
-    target_compile_definitions(libbsarch_OOP PUBLIC "LIBBSARCH_QT_SUPPORT")
-endif()
-
-# target_link_libraries(libbsarch_OOP PUBLIC libbsarch)
-
-# install
-
-# finding 32 or 64bits
+#Finding 32 or 64bits
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     # 64 bits
     set(lib_delphi "${CMAKE_CURRENT_SOURCE_DIR}/delphi/lib64")
@@ -97,34 +76,30 @@ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
     message("libbsarch: using 32bits DLL")
 endif()
 
-install(TARGETS libbsarch libbsarch_OOP EXPORT libbsarchTargets FILE_SET HEADERS)
-install(FILES $<TARGET_PDB_FILE:libbsarch> DESTINATION pdb OPTIONAL)
-install(EXPORT libbsarchTargets
-        FILE mo2-libbsarch-targets.cmake
-        NAMESPACE mo2::
-        DESTINATION lib/cmake/mo2-libbsarch
-)
+if(copy_dll_to_binary_dir)
+    #Finding debug or release
+    if(CMAKE_BUILD_TYPE MATCHES DEBUG)
+        set(libbsarch_dll_path "${lib_delphi}/libbsarchd.dll")
+    else()
+        set(libbsarch_dll_path "${lib_delphi}/libbsarch.dll")
+    endif()
 
-# install the true DLLs
-install(FILES ${lib_delphi}/libbsarch.dll DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-install(FILES ${lib_delphi}/libbsarchd.dll DESTINATION bin CONFIGURATIONS Debug)
+    #Actually copying the DLL
+    add_custom_command(TARGET libbsarch POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${libbsarch_dll_path}
+        ${CMAKE_BINARY_DIR}/libbsarch.dll)
+    message("libbsarch: Copying the DLL to ${CMAKE_BINARY_DIR}/libbsarch.dll")
+endif()
 
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake.in
-  "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake"
-  INSTALL_DESTINATION "lib/cmake/mo2-libbsarch"
-  NO_SET_AND_CHECK_MACRO
-  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-)
+#Adding Qt support
+if(Qt6_FOUND)
+    message("libbsarch: Qt6 found, enabling Qt support")
+    target_link_libraries(libbsarch_OOP PUBLIC Qt::Core)
+    target_compile_definitions(libbsarch PUBLIC "QT")
+    target_compile_definitions(libbsarch_OOP PUBLIC "QT")
+endif()
 
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake"
-  VERSION "0.0.13"
-  COMPATIBILITY AnyNewerVersion
-  ARCH_INDEPENDENT
-)
-
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake
-  DESTINATION lib/cmake/mo2-libbsarch
-)
+target_link_libraries(libbsarch_OOP PUBLIC libbsarch)
+target_compile_features(libbsarch_OOP PRIVATE cxx_std_17)
+target_compile_definitions(libbsarch_OOP PRIVATE _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)

CMakePresets.json

@@ -1,17 +0,0 @@
-{
-  "configurePresets": [
-    {
-      "binaryDir": "${sourceDir}/vsbuild",
-      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-      "generator": "Visual Studio 17 2022",
-      "name": "vs2022-windows"
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "vs2022-windows",
-      "configurePreset": "vs2022-windows"
-    }
-  ],
-  "version": 4
-}

README.md

@@ -1,5 +1,4 @@
 # BSArchive DLL and C++ bindings
-
 BSArchive Dynamic Link Library and C++ bindings
 
 ## How to build
@@ -10,7 +9,7 @@ BSArchive Dynamic Link Library and C++ bindings
 
 ## How to use
 
-With CMake:
+With CMake: 
 Use ``add_subdirectory`` and ``target_link_library``
 Then ``#include "libbsarch.h"`` for the C wrapper, or ``#include "bs_archive_auto"`` for the C++ wrapper.
 See the example for code use.
@@ -21,5 +20,4 @@ Use `libbsarch.dll` (provided in delphi/lib), `libbsarch.lib` and `libbsarch.h`
 ## Credits
 
 The original BSArchive can be found at: https://github.com/TES5Edit/TES5Edit/tree/dev/Tools/BSArchive
-The version in this project had been modified for better compatibility with C/C++ and
-allow the users to allocate their own memory in some cases.
+The version in this project had been modified for better compatibility with C/C++ and allow the users to allocate their own memory in some cases.

cmake/config.cmake.in

@@ -1,24 +0,0 @@
-@PACKAGE_INIT@
-
-include ( "${CMAKE_CURRENT_LIST_DIR}/mo2-libbsarch-targets.cmake" )
-
-target_link_libraries(mo2::libbsarch PUBLIC mo2::libbsarch_OOP)
-
-# libbsarch is usually be build in Debug or Release/RelWithDebInfo, so we need to map
-# missing configurations to avoid issue with CMP0111
-list(FIND _LIBBSARCH_CONFIGURATIONS "RELEASE" _LIBBSARCH_HAS_RELEASE)
-if (_LIBBSARCH_HAS_RELEASE EQUAL -1)
-    set_target_properties(mo2::libbsarch PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL RelWithDebInfo
-        MAP_IMPORTED_CONFIG_RELEASE    RelWithDebInfo
-    )
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-else()
-    set_target_properties(mo2::libbsarch PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL      Release
-        MAP_IMPORTED_CONFIG_RELWITHDEBINFO  Release
-    )
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
-endif()

dds/dds.h

@@ -0,0 +1,240 @@
+//--------------------------------------------------------------------------------------
+// dds.h
+//
+// This header defines constants and structures that are useful when parsing
+// DDS files.  DDS files were originally designed to use several structures
+// and constants that are native to DirectDraw and are defined in ddraw.h,
+// such as DDSURFACEDESC2 and DDSCAPS2.  This file defines similar
+// (compatible) constants and structures so that one can use DDS files
+// without needing to include ddraw.h.
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <dxgiformat.h>
+#include <stdint.h>
+
+namespace DirectX {
+#pragma pack(push, 1)
+
+const uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+
+struct DDS_PIXELFORMAT
+{
+    uint32_t size;
+    uint32_t flags;
+    uint32_t fourCC;
+    uint32_t RGBBitCount;
+    uint32_t RBitMask;
+    uint32_t GBitMask;
+    uint32_t BBitMask;
+    uint32_t ABitMask;
+};
+
+#define DDS_FOURCC 0x00000004      // DDPF_FOURCC
+#define DDS_RGB 0x00000040         // DDPF_RGB
+#define DDS_RGBA 0x00000041        // DDPF_RGB | DDPF_ALPHAPIXELS
+#define DDS_LUMINANCE 0x00020000   // DDPF_LUMINANCE
+#define DDS_LUMINANCEA 0x00020001  // DDPF_LUMINANCE | DDPF_ALPHAPIXELS
+#define DDS_ALPHAPIXELS 0x00000001 // DDPF_ALPHAPIXELS
+#define DDS_ALPHA 0x00000002       // DDPF_ALPHA
+#define DDS_PAL8 0x00000020        // DDPF_PALETTEINDEXED8
+#define DDS_PAL8A 0x00000021       // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
+#define DDS_BUMPDUDV 0x00080000    // DDPF_BUMPDUDV
+
+#ifndef MAKEFOURCC
+#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
+    (static_cast<uint32_t>(static_cast<uint8_t>(ch0)) | (static_cast<uint32_t>(static_cast<uint8_t>(ch1)) << 8) \
+     | (static_cast<uint32_t>(static_cast<uint8_t>(ch2)) << 16) \
+     | (static_cast<uint32_t>(static_cast<uint8_t>(ch3)) << 24))
+#endif /* defined(MAKEFOURCC) */
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DXT1 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DXT2 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DXT3 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DXT4 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '4'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DXT5 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '5'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_BC4_UNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '4', 'U'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_BC4_SNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '4', 'S'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_BC5_UNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '5', 'U'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_BC5_SNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '5', 'S'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_R8G8_B8G8 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('R', 'G', 'B', 'G'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_G8R8_G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('G', 'R', 'G', 'B'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_YUY2 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('Y', 'U', 'Y', '2'), 0, 0, 0, 0, 0};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A8R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_X8R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A8B8G8R8 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_X8B8G8R8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_G16R16 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_R5G6B5 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 16, 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A1R5G5B5 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00007c00, 0x000003e0, 0x0000001f, 0x00008000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A4R4G4B4 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00000f00, 0x000000f0, 0x0000000f, 0x0000f000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000};
+
+extern __declspec(selectany) const
+    DDS_PIXELFORMAT DDSPF_L8 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 8, 0xff, 0x00, 0x00, 0x00};
+
+extern __declspec(selectany) const
+    DDS_PIXELFORMAT DDSPF_L16 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 16, 0xffff, 0x0000, 0x0000, 0x0000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A8L8 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCEA, 0, 16, 0x00ff, 0x0000, 0x0000, 0xff00};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_A8L8_ALT = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCEA, 0, 8, 0x00ff, 0x0000, 0x0000, 0xff00};
+
+extern __declspec(selectany) const
+    DDS_PIXELFORMAT DDSPF_A8 = {sizeof(DDS_PIXELFORMAT), DDS_ALPHA, 0, 8, 0x00, 0x00, 0x00, 0xff};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_V8U8 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0x0000, 0x0000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_Q8W8V8U8 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000};
+
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_V16U16 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000};
+
+// D3DFMT_A2R10G10B10/D3DFMT_A2B10G10R10 should be written using DX10 extension to avoid D3DX 10:10:10:2 reversal issue
+
+// This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat)
+extern __declspec(selectany) const DDS_PIXELFORMAT
+    DDSPF_DX10 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', '1', '0'), 0, 0, 0, 0, 0};
+
+#define DDS_HEADER_FLAGS_TEXTURE 0x00001007    // DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT
+#define DDS_HEADER_FLAGS_MIPMAP 0x00020000     // DDSD_MIPMAPCOUNT
+#define DDS_HEADER_FLAGS_VOLUME 0x00800000     // DDSD_DEPTH
+#define DDS_HEADER_FLAGS_PITCH 0x00000008      // DDSD_PITCH
+#define DDS_HEADER_FLAGS_LINEARSIZE 0x00080000 // DDSD_LINEARSIZE
+
+#define DDS_HEIGHT 0x00000002 // DDSD_HEIGHT
+#define DDS_WIDTH 0x00000004  // DDSD_WIDTH
+
+#define DDS_SURFACE_FLAGS_TEXTURE 0x00001000 // DDSCAPS_TEXTURE
+#define DDS_SURFACE_FLAGS_MIPMAP 0x00400008  // DDSCAPS_COMPLEX | DDSCAPS_MIPMAP
+#define DDS_SURFACE_FLAGS_CUBEMAP 0x00000008 // DDSCAPS_COMPLEX
+
+#define DDS_CUBEMAP_POSITIVEX 0x00000600 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX
+#define DDS_CUBEMAP_NEGATIVEX 0x00000a00 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX
+#define DDS_CUBEMAP_POSITIVEY 0x00001200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY
+#define DDS_CUBEMAP_NEGATIVEY 0x00002200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY
+#define DDS_CUBEMAP_POSITIVEZ 0x00004200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ
+#define DDS_CUBEMAP_NEGATIVEZ 0x00008200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ
+
+#define DDS_CUBEMAP_ALLFACES \
+    (DDS_CUBEMAP_POSITIVEX | DDS_CUBEMAP_NEGATIVEX | DDS_CUBEMAP_POSITIVEY | DDS_CUBEMAP_NEGATIVEY \
+     | DDS_CUBEMAP_POSITIVEZ | DDS_CUBEMAP_NEGATIVEZ)
+
+#define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP
+
+#define DDS_FLAGS_VOLUME 0x00200000 // DDSCAPS2_VOLUME
+
+// Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
+enum DDS_RESOURCE_DIMENSION
+{
+    DDS_DIMENSION_TEXTURE1D = 2,
+    DDS_DIMENSION_TEXTURE2D = 3,
+    DDS_DIMENSION_TEXTURE3D = 4,
+};
+
+// Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG
+enum DDS_RESOURCE_MISC_FLAG
+{
+    DDS_RESOURCE_MISC_TEXTURECUBE = 0x4L,
+};
+
+enum DDS_MISC_FLAGS2
+{
+    DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L,
+};
+
+enum DDS_ALPHA_MODE
+{
+    DDS_ALPHA_MODE_UNKNOWN = 0,
+    DDS_ALPHA_MODE_STRAIGHT = 1,
+    DDS_ALPHA_MODE_PREMULTIPLIED = 2,
+    DDS_ALPHA_MODE_OPAQUE = 3,
+    DDS_ALPHA_MODE_CUSTOM = 4,
+};
+
+struct DDS_HEADER
+{
+    uint32_t size;
+    uint32_t flags;
+    uint32_t height;
+    uint32_t width;
+    uint32_t pitchOrLinearSize;
+    uint32_t depth; // only if DDS_HEADER_FLAGS_VOLUME is set in flags
+    uint32_t mipMapCount;
+    uint32_t reserved1[11];
+    DDS_PIXELFORMAT ddspf;
+    uint32_t caps;
+    uint32_t caps2;
+    uint32_t caps3;
+    uint32_t caps4;
+    uint32_t reserved2;
+};
+
+struct DDS_HEADER_DXT10
+{
+    DXGI_FORMAT dxgiFormat;
+    uint32_t resourceDimension;
+    uint32_t miscFlag; // see D3D11_RESOURCE_MISC_FLAG
+    uint32_t arraySize;
+    uint32_t miscFlags2; // see DDS_MISC_FLAGS2
+};
+
+#pragma pack(pop)
+
+static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch");
+static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended Header size mismatch");
+
+} // namespace DirectX

delphi/libbsarch.dpr

@@ -68,7 +68,7 @@ end;
 function bsa_entry_list_create:Pointer; stdcall;
 begin
   try
-    Result := TStringList.Create;
+    Result := TwbBSEntryList.Create;
   except
     Result := nil;
   end;
@@ -78,8 +78,8 @@ function bsa_entry_list_free(obj: Pointer): TwbBSResultMessage; stdcall;
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TStringList(obj).Clear();
-    TStringList(obj).free;
+    TwbBSEntryList(obj).Clear();
+    TwbBSEntryList(obj).free;
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -89,7 +89,7 @@ end;
 function bsa_entry_list_count(obj: Pointer): Integer; stdcall;
 begin
   try
-    Result := TStringList(obj).Count;
+    Result := TwbBSEntryList(obj).Count;
   except
     Result := Ord(BSA_RESULT_EXCEPTION);
   end;
@@ -99,7 +99,7 @@ function bsa_entry_list_add(obj: Pointer; const aEntryString: PChar): TwbBSResul
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TStringList(obj).Add(String(aEntryString));
+    TwbBSEntryList(obj).Add(String(aEntryString));
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -109,7 +109,7 @@ end;
 function bsa_entry_list_get(obj: Pointer; const aIndex: Cardinal; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Integer; stdcall;
 begin
   try
-    Result := string_to_cstring_end(TStringList(obj).Strings[aIndex], aStringBufferSize, aStringBuffer);
+    Result := string_to_cstring_end(TwbBSEntryList(obj).Strings[aIndex], aStringBufferSize, aStringBuffer);
   except
     Result := Integer(BSA_RESULT_EXCEPTION);
   end;
@@ -148,11 +148,11 @@ begin
   end;
 end;
 
-function bsa_create_archive(obj: Pointer; const aFilePath: PChar; aType: TBSArchiveType; aFileList: TStringList): TwbBSResultMessage; stdcall;
+function bsa_create_archive(obj: Pointer; const aFilePath: PChar; aType: TBSArchiveType; aFileList: TwbBSEntryList): TwbBSResultMessage; stdcall;
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TwbBSArchive(obj).CreateArchive(String(aFilePath), aType, aFileList);
+    TwbBSArchive(obj).CreateArchiveCompat(String(aFilePath), aType, aFileList);
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -196,7 +196,7 @@ function bsa_add_file_from_memory(obj: Pointer; const aFilePath: PChar; const aS
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TwbBSArchive(obj).AddFileData(String(aFilePath), aSize, aData);
+    TwbBSArchive(obj).AddFileDataCompat(String(aFilePath), aSize, aData);
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -216,7 +216,7 @@ function bsa_extract_file_data_by_record(obj: Pointer; aFileRecord: Pointer): Tw
 begin
   Result.message.code := Ord(BSA_RESULT_NONE);
   try
-    Result.buffer := TwbBSArchive(obj).ExtractFileData(aFileRecord);
+    Result.buffer := TwbBSArchive(obj).ExtractFileDataCompat(aFileRecord);
   except
     on E: Exception do
       buffer_exception_handler(E, Result);
@@ -227,7 +227,7 @@ function bsa_extract_file_data_by_filename(obj: Pointer; const aFilePath: PChar)
 begin
   Result.message.code := Ord(BSA_RESULT_NONE);
   try
-    Result.buffer := TwbBSArchive(obj).ExtractFileData(String(aFilePath));
+    Result.buffer := TwbBSArchive(obj).ExtractFileDataCompat(String(aFilePath));
   except
     on E: Exception do
       buffer_exception_handler(E, Result);
@@ -238,7 +238,7 @@ function bsa_file_data_free(obj: Pointer; fileDataResult: TwbBSResultMessageBuff
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TwbBSArchive(obj).ReleaseFileData(fileDataResult.buffer);
+    TwbBSArchive(obj).ReleaseFileDataCompat(fileDataResult.buffer);
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -256,11 +256,11 @@ begin
   end;
 end;
 
-function bsa_iterate_files(obj: Pointer; aProc: TBSFileIterationProc; aContext: Pointer): TwbBSResultMessage; stdcall;
+function bsa_iterate_files(obj: Pointer; aProc: TBSFileIterationProcCompat; aContext: Pointer): TwbBSResultMessage; stdcall;
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TwbBSArchive(obj).IterateFiles(aProc, aContext);
+    TwbBSArchive(obj).IterateFilesCompat(aProc, aContext);
   except
     on E: Exception do
       exception_handler(E, Result);
@@ -276,17 +276,28 @@ begin
   end;
 end;
 
-function bsa_get_resource_list(obj: Pointer; const aEntryResultList: TStringList; aFolder: PChar): TwbBSResultMessage; stdcall;
+function bsa_get_resource_list(obj: Pointer; const aEntryResultList: TwbBSEntryList; aFolder: PChar): TwbBSResultMessage; stdcall;
 begin
   Result.code := Ord(BSA_RESULT_NONE);
   try
-    TwbBSArchive(obj).ResourceList(aEntryResultList, String(aFolder));
+    TwbBSArchive(obj).ResourceListCompat(aEntryResultList, String(aFolder));
   except
     on E: Exception do
       exception_handler(E, Result);
   end;
 end;
 
+function bsa_resolve_hash(obj: Pointer; const aHash: UInt64; const aEntryResultList: TwbBSEntryList): TwbBSResultMessage; stdcall;
+begin
+  Result.code := Ord(BSA_RESULT_NONE);
+  try
+    TwbBSArchive(obj).ResolveHashCompat(aHash, aEntryResultList);
+  except
+    on E: Exception do
+      exception_handler(E, Result);
+  end;
+end;     
+
 function bsa_close(obj: Pointer): TwbBSResultMessage; stdcall;
 begin
   Result.code := Ord(BSA_RESULT_NONE);
@@ -363,7 +374,7 @@ begin
   TwbBSArchive(obj).ShareData := shareData;
 end;
 
-procedure bsa_file_dds_info_callback_set(obj: Pointer; aProc: TBSFileDDSInfoProc; aContext: Pointer); stdcall;
+procedure bsa_file_dds_info_callback_set(obj: Pointer; aProc: TBSFileDDSInfoProcCompat; aContext: Pointer); stdcall;
 begin
   TwbBSArchive(obj).DDSInfoProc := aProc;
   TwbBSArchive(obj).DDSInfoProcContext := aContext;
@@ -392,6 +403,7 @@ exports
   bsa_file_dds_info_callback_set,
 
   bsa_close,
+  bsa_resolve_hash,
   bsa_get_resource_list,
   bsa_file_exists,
   bsa_iterate_files,

src/libbsarch.def

@@ -22,6 +22,7 @@ EXPORTS
  bsa_iterate_files
  bsa_file_exists
  bsa_get_resource_list
+ bsa_resolve_hash
  bsa_close
  bsa_filename_get
  bsa_archive_type_get

src/libbsarch.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include <dxgiformat.h>
-
-#include <DDS.h>
-
+#include <dds.h>
 #include <stdint.h>
 
 #ifdef BSARCH_DLL_EXPORT
@@ -77,9 +75,7 @@ typedef enum bsa_archive_type_e
     baFO3,
     baSSE,
     baFO4,
-    baFO4dds,
-    baSF,
-    baSFdds
+    baFO4dds
 } bsa_archive_type_t;
 
 typedef void (*bsa_file_dds_info_proc_t)(bsa_archive_t archive,
@@ -127,6 +123,8 @@ bsa_iterate_files(bsa_archive_t archive, bsa_file_iteration_proc_t file_iteratio
 BSARCH_DLL_API(bool) bsa_file_exists(bsa_archive_t archive, const wchar_t *file_path);
 BSARCH_DLL_API(bsa_result_message_t)
 bsa_get_resource_list(bsa_archive_t archive, bsa_entry_list_t entry_result_list, const wchar_t *folder);
+BSARCH_DLL_API(bsa_result_message_t)
+bsa_resolve_hash(bsa_archive_t archive, uint64_t hash, bsa_entry_list_t entry_result_list);
 BSARCH_DLL_API(bsa_result_message_t) bsa_close(bsa_archive_t archive);
 
 BSARCH_DLL_API(uint32_t)