From a6cfb249d62c19fb106bad6b89d6f4c8e5effe5c Mon Sep 17 00:00:00 2001 From: maintenance <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:03:07 +0000 Subject: [PATCH] ci: maintenance `2023-10-02.1` --- .../include/RE/B/BSIntrusiveRefCounted.h | 2 +- CommonLibSF/include/RE/B/BSLock.h | 4 ++-- CommonLibSF/include/RE/B/BSStringT.h | 6 +++--- CommonLibSF/include/RE/N/NativeFunctionBase.h | 18 +++++++++--------- CommonLibSF/include/RE/S/Script.h | 6 +++--- CommonLibSF/include/RE/Starfield.h | 2 ++ CommonLibSF/src/REL/Module.cpp | 6 +++--- CommonLibSF/vcpkg.json | 2 +- README.md | 2 +- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h b/CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h index feb6ba04..f556ddf4 100644 --- a/CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h +++ b/CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h @@ -8,7 +8,7 @@ namespace RE SF_RTTI(BSIntrusiveRefCounted); volatile mutable std::uint32_t refCount{}; // 00 - std::uint32_t unk04; // 04 + std::uint32_t unk04; // 04 }; static_assert(sizeof(BSIntrusiveRefCounted) == 0x08); } diff --git a/CommonLibSF/include/RE/B/BSLock.h b/CommonLibSF/include/RE/B/BSLock.h index b06ba17a..40dac9cc 100644 --- a/CommonLibSF/include/RE/B/BSLock.h +++ b/CommonLibSF/include/RE/B/BSLock.h @@ -35,8 +35,8 @@ namespace RE private: // members - std::uint32_t _writerThread{ 0 }; // 0 - volatile std::uint32_t _lock{ 0 }; // 4 + std::uint32_t _writerThread{ 0 }; // 0 + volatile std::uint32_t _lock{ 0 }; // 4 }; static_assert(sizeof(BSReadWriteLock) == 0x8); diff --git a/CommonLibSF/include/RE/B/BSStringT.h b/CommonLibSF/include/RE/B/BSStringT.h index 4b7adf39..a98a9985 100644 --- a/CommonLibSF/include/RE/B/BSStringT.h +++ b/CommonLibSF/include/RE/B/BSStringT.h @@ -114,8 +114,8 @@ namespace RE a_rhs._capacity = 0; } - pointer _data{}; // ?? - size_type _size{}; // ?? - size_type _capacity{}; // ?? + pointer _data{}; // ?? + size_type _size{}; // ?? + size_type _capacity{}; // ?? }; } diff --git a/CommonLibSF/include/RE/N/NativeFunctionBase.h b/CommonLibSF/include/RE/N/NativeFunctionBase.h index 04fc736e..d826acb3 100644 --- a/CommonLibSF/include/RE/N/NativeFunctionBase.h +++ b/CommonLibSF/include/RE/N/NativeFunctionBase.h @@ -119,17 +119,17 @@ namespace RE virtual void Run() = 0; protected: - BSFixedString _name; // 10 - BSFixedString _className; // 18 - BSFixedString _stateName{ "" }; // 20 - std::uint64_t _retType; // 28 TypeInfo - ParameterInfo _params; // 30 - bool _isStatic; // 40 + BSFixedString _name; // 10 + BSFixedString _className; // 18 + BSFixedString _stateName{ "" }; // 20 + std::uint64_t _retType; // 28 TypeInfo + ParameterInfo _params; // 30 + bool _isStatic; // 40 bool _isCallableFromTasklet{}; // 41 bool _isLatent{}; // 42 - std::uint8_t _pad43; // 43 - std::uint32_t _userFlags{}; // 44 - BSFixedString _docString; // 48 + std::uint8_t _pad43; // 43 + std::uint32_t _userFlags{}; // 44 + BSFixedString _docString; // 48 }; static_assert(sizeof(NativeFunctionBase) == 0x50); } diff --git a/CommonLibSF/include/RE/S/Script.h b/CommonLibSF/include/RE/S/Script.h index b0f8e381..051fefdf 100644 --- a/CommonLibSF/include/RE/S/Script.h +++ b/CommonLibSF/include/RE/S/Script.h @@ -80,9 +80,9 @@ namespace RE { public: // members - const char* paramName{ "" }; // 00 - std::uint32_t paramType; // 08 enumeration - bool optional{}; // 0C + const char* paramName{ "" }; // 00 + std::uint32_t paramType; // 08 enumeration + bool optional{}; // 0C }; static_assert(sizeof(SCRIPT_PARAMETER) == 0x10); diff --git a/CommonLibSF/include/RE/Starfield.h b/CommonLibSF/include/RE/Starfield.h index 16b2acdb..96aacde4 100644 --- a/CommonLibSF/include/RE/Starfield.h +++ b/CommonLibSF/include/RE/Starfield.h @@ -36,6 +36,7 @@ #include "RE/B/BSInputEventReceiver.h" #include "RE/B/BSInputEventUser.h" #include "RE/B/BSIntrusiveRefCounted.h" +#include "RE/B/BSLock.h" #include "RE/B/BSReflection.h" #include "RE/B/BSStringPool.h" #include "RE/B/BSStringT.h" @@ -101,6 +102,7 @@ #include "RE/T/TESBoundObject.h" #include "RE/T/TESCamera.h" #include "RE/T/TESContainer.h" +#include "RE/T/TESDataHandler.h" #include "RE/T/TESFile.h" #include "RE/T/TESForm.h" #include "RE/T/TESFormRefCount.h" diff --git a/CommonLibSF/src/REL/Module.cpp b/CommonLibSF/src/REL/Module.cpp index 433fedfa..bd325561 100644 --- a/CommonLibSF/src/REL/Module.cpp +++ b/CommonLibSF/src/REL/Module.cpp @@ -8,10 +8,10 @@ namespace REL _base = a_base; - const auto dosHeader = reinterpret_cast(_base); - const auto ntHeader = stl::adjust_pointer(dosHeader, dosHeader->lfanew); + const auto dosHeader = reinterpret_cast(_base); + const auto ntHeader = stl::adjust_pointer(dosHeader, dosHeader->lfanew); const auto sections = WinAPI::IMAGE_FIRST_SECTION(ntHeader); - const auto size = std::min(ntHeader->fileHeader.sectionCount, _segments.size()); + const auto size = std::min(ntHeader->fileHeader.sectionCount, _segments.size()); for (std::size_t i = 0; i < size; ++i) { const auto& section = sections[i]; diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json index 50fae178..0c56d7c0 100644 --- a/CommonLibSF/vcpkg.json +++ b/CommonLibSF/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "commonlibsf", - "version-date": "2023-10-02", + "version-date": "2023-10-02.1", "port-version": 0, "description": "A collaborative reverse-engineered library for Starfield.", "homepage": "https://github.com/Starfield-Reverse-Engineering/CommonLibSF", diff --git a/README.md b/README.md index 6bbae6b8..42d3b688 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![C++23](https://img.shields.io/static/v1?label=standard&message=c%2B%2B23&color=blue&logo=c%2B%2B&&logoColor=red&style=flat)](https://en.cppreference.com/w/cpp/compiler_support) ![Platform](https://img.shields.io/static/v1?label=platform&message=windows&color=dimgray&style=flat&logo=windows) [![Game version](https://img.shields.io/badge/game%20version-1.7.29-orange)](#Developing-with-CommonLibSF) -[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-10-02&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) +[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-10-02.1&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) [![Main CI](https://img.shields.io/github/actions/workflow/status/Starfield-Reverse-Engineering/CommonLibSF/main_ci.yml)](https://github.com/Starfield-Reverse-Engineering/CommonLibSF/actions/workflows/main_ci.yml) ## Build Dependencies