diff --git a/.gitignore b/.gitignore index 539c826..06c85e2 100644 --- a/.gitignore +++ b/.gitignore @@ -442,3 +442,6 @@ healthchecksdb MigrationBackup/ # End of https://www.gitignore.io/api/vim,delphi,visualstudio,visualstudiocode + +libbsarch_delphi* +libbsarch_test.pas diff --git a/DDS.h b/dds.h similarity index 100% rename from DDS.h rename to dds.h diff --git a/libbsarch-visualstudio-test.cpp b/libbsarch-visualstudio-test.cpp new file mode 100644 index 0000000..2f3bae2 --- /dev/null +++ b/libbsarch-visualstudio-test.cpp @@ -0,0 +1,28 @@ +#include + +#include "libbsarch.h" + +using namespace std::string_literals; + +#pragma comment(lib, "libbsarch") + +int main() { + bsa_archive_t archive = bsa_create(); + + bsa_load_from_file(archive, L"test_read.bsa"); + bsa_close(archive); + + bsa_entry_list_t entries = bsa_entry_list_create(); + bsa_entry_list_add(entries, L"textures\\grass\\test.dds"); + + bsa_create_archive(archive, L"test_write.bsa", baSSE, entries); + bsa_add_file_from_disk(archive, L"files", L"files\\textures\\grass\\test.dds"); + bsa_save(archive); + bsa_close(archive); + + bsa_entry_list_free(entries); + + bsa_free(archive); + + printf("test\n"); +} diff --git a/libbsarch-visualstudio-test.sln b/libbsarch-visualstudio-test.sln new file mode 100644 index 0000000..8f105e4 --- /dev/null +++ b/libbsarch-visualstudio-test.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.156 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbsarch-visualstudio-test", "libbsarch-visualstudio-test.vcxproj", "{8F73F848-939D-4862-B58B-26572CF20A5F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8F73F848-939D-4862-B58B-26572CF20A5F}.Debug|x64.ActiveCfg = Debug|x64 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Debug|x64.Build.0 = Debug|x64 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Debug|x86.ActiveCfg = Debug|Win32 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Debug|x86.Build.0 = Debug|Win32 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Release|x64.ActiveCfg = Release|x64 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Release|x64.Build.0 = Release|x64 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Release|x86.ActiveCfg = Release|Win32 + {8F73F848-939D-4862-B58B-26572CF20A5F}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F05F0FBF-790B-4443-B2EC-E7033074D9E0} + EndGlobalSection +EndGlobal diff --git a/libbsarch-visualstudio-test.vcxproj b/libbsarch-visualstudio-test.vcxproj new file mode 100644 index 0000000..8957bfc --- /dev/null +++ b/libbsarch-visualstudio-test.vcxproj @@ -0,0 +1,176 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + {8F73F848-939D-4862-B58B-26572CF20A5F} + Win32Proj + libbsarchvisualstudiotest + 10.0 + libbsarch-visualstudio-test + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(OutDir);$(ReferencePath) + + + true + $(OutDir);$(LibraryPath) + $(OutDir);$(ReferencePath) + + + false + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(OutDir);$(ReferencePath) + + + false + $(OutDir);$(LibraryPath) + $(OutDir);$(ReferencePath) + + + + + + Level3 + Disabled + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + $(OutDir) + + + + + + + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + $(OutDir) + + + + + + + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + $(OutDir) + + + + + + + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + $(OutDir) + + + + + + + + + \ No newline at end of file diff --git a/libbsarch-visualstudio-test.vcxproj.filters b/libbsarch-visualstudio-test.vcxproj.filters new file mode 100644 index 0000000..47af292 --- /dev/null +++ b/libbsarch-visualstudio-test.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/libbsarch.cpp b/libbsarch.cpp index 5f16d1c..02749d6 100644 --- a/libbsarch.cpp +++ b/libbsarch.cpp @@ -8,19 +8,19 @@ BSARCH_DLL_API(bsa_entry_list_t) bsa_entry_list_create() { return NULL; } -BSARCH_DLL_API(void) bsa_entry_list_free(bsa_entry_list_t *entry_list) { +BSARCH_DLL_API(void) bsa_entry_list_free(bsa_entry_list_t entry_list) { return; } -BSARCH_DLL_API(uint32_t) bsa_entry_list_count(bsa_entry_list_t *entry_list) { +BSARCH_DLL_API(uint32_t) bsa_entry_list_count(bsa_entry_list_t entry_list) { return 0; } -BSARCH_DLL_API(void) bsa_entry_list_add(bsa_entry_list_t *entry_list, char *entry_string) { +BSARCH_DLL_API(void) bsa_entry_list_add(bsa_entry_list_t entry_list, const wchar_t *entry_string) { return; } -BSARCH_DLL_API(uint32_t) bsa_entry_list_get(bsa_entry_list_t *entry_list, uint32_t index, uint32_t string_buffer_size, char *string_buffer) { +BSARCH_DLL_API(uint32_t) bsa_entry_list_get(bsa_entry_list_t entry_list, uint32_t index, uint32_t string_buffer_size, const wchar_t *string_buffer) { return 0; } @@ -32,11 +32,11 @@ BSARCH_DLL_API(void) bsa_free(bsa_archive_t archive) { return; } -BSARCH_DLL_API(void) bsa_load_from_file(bsa_archive_t archive, char *filename) { +BSARCH_DLL_API(void) bsa_load_from_file(bsa_archive_t archive, const wchar_t *filename) { return; } -BSARCH_DLL_API(void) bsa_create_archive(bsa_archive_t archive, char *filename, bsa_archive_type_t archive_type, bsa_entry_list_t entry_list) { +BSARCH_DLL_API(void) bsa_create_archive(bsa_archive_t archive, const wchar_t *filename, bsa_archive_type_t archive_type, bsa_entry_list_t entry_list) { return; } @@ -44,15 +44,15 @@ BSARCH_DLL_API(void) bsa_save(bsa_archive_t archive) { return; } -BSARCH_DLL_API(void) bsa_add_file_from_disk(bsa_archive_t archive, char *root_dir, char *filename) { +BSARCH_DLL_API(void) bsa_add_file_from_disk(bsa_archive_t archive, const wchar_t *root_dir, const wchar_t *filename) { return; } -BSARCH_DLL_API(void) bsa_add_file_from_memory(bsa_archive_t archive, char *filename, uint32_t size, bsa_file_data_t data) { +BSARCH_DLL_API(void) bsa_add_file_from_memory(bsa_archive_t archive, const wchar_t *filename, uint32_t size, bsa_file_data_t data) { return; } -BSARCH_DLL_API(bsa_file_record_t) bsa_find_file_record(bsa_archive_t archive, char *filename) { +BSARCH_DLL_API(bsa_file_record_t) bsa_find_file_record(bsa_archive_t archive, const wchar_t *filename) { return NULL; } @@ -60,7 +60,7 @@ BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_record(bsa_archi return { 0 }; } -BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_filename(bsa_archive_t archive, char *filename) { +BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_filename(bsa_archive_t archive, const wchar_t *filename) { return { 0 }; } @@ -68,7 +68,7 @@ BSARCH_DLL_API(void) bsa_file_data_free(bsa_archive_t archive, bsa_file_data_res return; } -BSARCH_DLL_API(void) bsa_extract_file(bsa_archive_t archive, char *filename, char *save_as) { +BSARCH_DLL_API(void) bsa_extract_file(bsa_archive_t archive, const wchar_t *filename, const wchar_t *save_as) { return; } @@ -76,11 +76,11 @@ BSARCH_DLL_API(void) bsa_iterate_files(bsa_archive_t archive, bsa_file_iteration return; } -BSARCH_DLL_API(bool) bsa_file_exists(bsa_archive_t archive, char *filename) { +BSARCH_DLL_API(bool) bsa_file_exists(bsa_archive_t archive, const wchar_t *filename) { return false; } -BSARCH_DLL_API(void) bsa_get_resource_list(bsa_archive_t archive, bsa_entry_list_t entry_result_list, char *folder) { +BSARCH_DLL_API(void) bsa_get_resource_list(bsa_archive_t archive, bsa_entry_list_t entry_result_list, const wchar_t *folder) { return; } @@ -92,58 +92,58 @@ BSARCH_DLL_API(void) bsa_close(bsa_archive_t archive) { return; } -BSARCH_DLL_API(uint32_t) bsa_filename_get(bsa_archive_t *archive, uint32_t string_buffer_size, char *string_buffer) { +BSARCH_DLL_API(uint32_t) bsa_filename_get(bsa_archive_t archive, uint32_t string_buffer_size, const wchar_t *string_buffer) { return 0; } -BSARCH_DLL_API(bsa_archive_type_t) bsa_archive_type_get(bsa_archive_t *archive) { +BSARCH_DLL_API(bsa_archive_type_t) bsa_archive_type_get(bsa_archive_t archive) { return bsa_archive_type_t::baNone; } -BSARCH_DLL_API(uint32_t) bsa_version_get(bsa_archive_t *archive) { +BSARCH_DLL_API(uint32_t) bsa_version_get(bsa_archive_t archive) { return 0; } -BSARCH_DLL_API(uint32_t) bsa_format_name_get(bsa_archive_t *archive, uint32_t string_buffer_size, char *string_buffer) { +BSARCH_DLL_API(uint32_t) bsa_format_name_get(bsa_archive_t archive, uint32_t string_buffer_size, const wchar_t *string_buffer) { return 0; } -BSARCH_DLL_API(uint32_t) bsa_file_count_get(bsa_archive_t *archive) { +BSARCH_DLL_API(uint32_t) bsa_file_count_get(bsa_archive_t archive) { return 0; } -BSARCH_DLL_API(uint32_t) bsa_archive_flags_get(bsa_archive_t *archive) { +BSARCH_DLL_API(uint32_t) bsa_archive_flags_get(bsa_archive_t archive) { return 0; } -BSARCH_DLL_API(void) bsa_archive_flags_set(bsa_archive_t *archive, uint32_t flags) { +BSARCH_DLL_API(void) bsa_archive_flags_set(bsa_archive_t archive, uint32_t flags) { return; } -BSARCH_DLL_API(uint32_t) bsa_file_flags_get(bsa_archive_t *archive) { +BSARCH_DLL_API(uint32_t) bsa_file_flags_get(bsa_archive_t archive) { return 0; } -BSARCH_DLL_API(void) bsa_file_flags_set(bsa_archive_t *archive, uint32_t flags) { +BSARCH_DLL_API(void) bsa_file_flags_set(bsa_archive_t archive, uint32_t flags) { return; } -BSARCH_DLL_API(bool) bsa_compress_get(bsa_archive_t *archive) { +BSARCH_DLL_API(bool) bsa_compress_get(bsa_archive_t archive) { return false; } -BSARCH_DLL_API(void) bsa_compress_set(bsa_archive_t *archive, bool flags) { +BSARCH_DLL_API(void) bsa_compress_set(bsa_archive_t archive, bool flags) { return; } -BSARCH_DLL_API(bool) bsa_share_data_get(bsa_archive_t *archive) { +BSARCH_DLL_API(bool) bsa_share_data_get(bsa_archive_t archive) { return false; } -BSARCH_DLL_API(void) bsa_share_data_set(bsa_archive_t *archive, bool flags) { +BSARCH_DLL_API(void) bsa_share_data_set(bsa_archive_t archive, bool flags) { return; } -BSARCH_DLL_API(void) bsa_file_dds_info_callback_set(bsa_archive_t *archive, bsa_file_dds_info_proc_t file_dds_info_proc) { +BSARCH_DLL_API(void) bsa_file_dds_info_callback_set(bsa_archive_t archive, bsa_file_dds_info_proc_t file_dds_info_proc) { return; } diff --git a/libbsarch.def b/libbsarch.def index a232da4..bc4c94f 100644 --- a/libbsarch.def +++ b/libbsarch.def @@ -1,4 +1,4 @@ -LIBRARY LIBBSARCH_DLL +LIBRARY LIBBSARCH ;DESCRIPTION "BSArch DLL" EXPORTS bsa_entry_list_create diff --git a/libbsarch.dpr b/libbsarch.dpr index e9e4ef6..781236e 100644 --- a/libbsarch.dpr +++ b/libbsarch.dpr @@ -5,17 +5,13 @@ uses Classes, Types, SysUtils, - wbStreams in 'wbStreams.pas', - wbBSArchive in './wbBSArchive.pas'; - -{$IFDEF FPC} -{$mode delphi}{$H+} -{$ENDIF} + wbStreams, + wbBSArchive; {Shared} function string_to_cstring(aString: String; const aStringBufferSize: Cardinal; - const aStringBuffer: PChar): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; + const aStringBuffer: PChar): Cardinal; stdcall; begin Result := Min(aStringBufferSize, Length(AString)); if (aStringBuffer <> nil) and (Result > 0) then @@ -24,185 +20,185 @@ end; {BSA File List} -function bsa_entry_list_create:Pointer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_entry_list_create:Pointer; stdcall; begin Result := TwbBSEntryList.Create; end; -procedure bsa_entry_list_free(obj: Pointer); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_entry_list_free(obj: Pointer); stdcall; begin TwbBSEntryList(obj).Clear(); TwbBSEntryList(obj).free; end; -function bsa_entry_list_count(obj: Pointer): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_entry_list_count(obj: Pointer): Cardinal; stdcall; begin Result := TwbBSEntryList(obj).Count; end; -procedure bsa_entry_list_add(obj: Pointer; const aEntryString: PChar); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_entry_list_add(obj: Pointer; const aEntryString: PChar); stdcall; begin TwbBSEntryList(obj).Add(String(aEntryString)); end; -function bsa_entry_list_get(obj: Pointer; const aIndex: Cardinal; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_entry_list_get(obj: Pointer; const aIndex: Cardinal; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; stdcall; begin Result := string_to_cstring(TwbBSEntryList(obj).Strings[aIndex], aStringBufferSize, aStringBuffer); end; {BSArchive} -function bsa_create:Pointer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_create:Pointer; stdcall; begin Result := TwbBSArchive.Create; end; -procedure bsa_free(obj: Pointer); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_free(obj: Pointer); stdcall; begin TwbBSArchive(obj).free; end; -procedure bsa_load_from_file(obj: Pointer; const aFileName: PChar); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_load_from_file(obj: Pointer; const aFileName: PChar); stdcall; begin TwbBSArchive(obj).LoadFromFile(String(aFileName)); end; -procedure bsa_create_archive(obj: Pointer; const aFileName: PChar; aType: TBSArchiveType; aFileList: TwbBSEntryList); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_create_archive(obj: Pointer; const aFileName: PChar; aType: TBSArchiveType; aFileList: TwbBSEntryList); stdcall; begin TwbBSArchive(obj).CreateArchiveCompat(String(aFileName), aType, aFileList); end; -procedure bsa_save(obj: Pointer); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_save(obj: Pointer); stdcall; begin TwbBSArchive(obj).Save; end; -procedure bsa_add_file_from_disk(obj: Pointer; const aRootDir, aFileName: PChar); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_add_file_from_disk(obj: Pointer; const aRootDir, aFileName: PChar); stdcall; begin TwbBSArchive(obj).AddFile(String(aRootDir), String(aFileName)); end; -procedure bsa_add_file_from_memory(obj: Pointer; const aFileName: PChar; const aSize: Cardinal; const aData: PByte); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_add_file_from_memory(obj: Pointer; const aFileName: PChar; const aSize: Cardinal; const aData: PByte); stdcall; begin TwbBSArchive(obj).AddFileCompat(String(aFileName), aSize, aData); end; -function bsa_find_file_record(obj: Pointer; const aFileName: PChar): Pointer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_find_file_record(obj: Pointer; const aFileName: PChar): Pointer; stdcall; begin Result := TwbBSArchive(obj).FindFileRecord(String(aFileName)); end; -function bsa_extract_file_data_by_record(obj: Pointer; aFileRecord: Pointer): TwbBSFileDataResult; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_extract_file_data_by_record(obj: Pointer; aFileRecord: Pointer): TwbBSFileDataResult; stdcall; begin Result := TwbBSArchive(obj).ExtractFileDataCompat(aFileRecord); end; -function bsa_extract_file_data_by_filename(obj: Pointer; const aFileName: PChar): TwbBSFileDataResult; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_extract_file_data_by_filename(obj: Pointer; const aFileName: PChar): TwbBSFileDataResult; stdcall; begin Result := TwbBSArchive(obj).ExtractFileDataCompat(String(aFileName)); end; -procedure bsa_file_data_free(obj: Pointer; fileDataResult: TwbBSFileDataResult); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_file_data_free(obj: Pointer; fileDataResult: TwbBSFileDataResult); stdcall; begin TwbBSArchive(obj).ReleaseFileDataCompat(fileDataResult); end; -procedure bsa_extract_file(obj: Pointer; const aFileName, aSaveAs: PChar); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_extract_file(obj: Pointer; const aFileName, aSaveAs: PChar); stdcall; begin TwbBSArchive(obj).ExtractFile(String(aFileName), String(aSaveAs)); end; -procedure bsa_iterate_files(obj: Pointer; aProc: TBSFileIterationProcCompat; aContext: Pointer); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_iterate_files(obj: Pointer; aProc: TBSFileIterationProcCompat; aContext: Pointer); stdcall; begin TwbBSArchive(obj).IterateFilesCompat(aProc, aContext); end; -function bsa_file_exists(obj: Pointer; const aFileName: string): Boolean; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_file_exists(obj: Pointer; const aFileName: string): Boolean; stdcall; begin Result := TwbBSArchive(obj).FileExists(aFileName); end; -procedure bsa_get_resource_list(obj: Pointer; const aEntryResultList: TwbBSEntryList; aFolder: PChar); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_get_resource_list(obj: Pointer; const aEntryResultList: TwbBSEntryList; aFolder: PChar); stdcall; begin TwbBSArchive(obj).ResourceListCompat(aEntryResultList, String(aFolder)); end; -procedure bsa_resolve_hash(obj: Pointer; const aHash: UInt64; const aEntryResultList: TwbBSEntryList); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_resolve_hash(obj: Pointer; const aHash: UInt64; const aEntryResultList: TwbBSEntryList); stdcall; begin TwbBSArchive(obj).ResolveHashCompat(aHash, aEntryResultList); end; -procedure bsa_close(obj: Pointer); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_close(obj: Pointer); stdcall; begin TwbBSArchive(obj).Close; end; -function bsa_filename_get(obj: Pointer; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_filename_get(obj: Pointer; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; stdcall; begin Result := string_to_cstring(TwbBSArchive(obj).FileName, aStringBufferSize, aStringBuffer); end; -function bsa_archive_type_get(obj: Pointer): TBSArchiveType; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_archive_type_get(obj: Pointer): TBSArchiveType; stdcall; begin Result := TwbBSArchive(obj).ArchiveType; end; -function bsa_version_get(obj: Pointer): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_version_get(obj: Pointer): Cardinal; stdcall; begin Result := TwbBSArchive(obj).Version; end; -function bsa_format_name_get(obj: Pointer; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_format_name_get(obj: Pointer; const aStringBufferSize: Cardinal; const aStringBuffer: PChar): Cardinal; stdcall; begin Result := string_to_cstring(TwbBSArchive(obj).FormatName, aStringBufferSize, aStringBuffer); end; -function bsa_file_count_get(obj: Pointer): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_file_count_get(obj: Pointer): Cardinal; stdcall; begin Result := TwbBSArchive(obj).FileCount; end; -function bsa_archive_flags_get(obj: Pointer): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_archive_flags_get(obj: Pointer): Cardinal; stdcall; begin Result := TwbBSArchive(obj).ArchiveFlags; end; -procedure bsa_archive_flags_set(obj: Pointer; flags: Cardinal); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_archive_flags_set(obj: Pointer; flags: Cardinal); stdcall; begin TwbBSArchive(obj).ArchiveFlags := flags; end; -function bsa_file_flags_get(obj: Pointer): Cardinal; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_file_flags_get(obj: Pointer): Cardinal; stdcall; begin Result := TwbBSArchive(obj).FileFlags; end; -procedure bsa_file_flags_set(obj: Pointer; flags: Cardinal); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_file_flags_set(obj: Pointer; flags: Cardinal); stdcall; begin TwbBSArchive(obj).FileFlags := flags; end; -function bsa_compress_get(obj: Pointer): Boolean; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_compress_get(obj: Pointer): Boolean; stdcall; begin Result := TwbBSArchive(obj).Compress; end; -procedure bsa_compress_set(obj: Pointer; compress: Boolean); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_compress_set(obj: Pointer; compress: Boolean); stdcall; begin TwbBSArchive(obj).Compress := compress; end; -function bsa_share_data_get(obj: Pointer): Boolean; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +function bsa_share_data_get(obj: Pointer): Boolean; stdcall; begin Result := TwbBSArchive(obj).ShareData; end; -procedure bsa_share_data_set(obj: Pointer; shareData: Boolean); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_share_data_set(obj: Pointer; shareData: Boolean); stdcall; begin TwbBSArchive(obj).ShareData := shareData; end; -procedure bsa_file_dds_info_callback_set(obj: Pointer; aProc: TBSFileDDSInfoProcCompat); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; +procedure bsa_file_dds_info_callback_set(obj: Pointer; aProc: TBSFileDDSInfoProcCompat); stdcall; begin TwbBSArchive(obj).DDSInfoProc := aProc; end; diff --git a/libbsarch.dproj b/libbsarch.dproj index 4df1cf1..5fb2f6f 100644 --- a/libbsarch.dproj +++ b/libbsarch.dproj @@ -8,7 +8,7 @@ Library None 18.6 - Win64 + Win32 true @@ -28,11 +28,29 @@ Base true + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + true Base true + + true + Cfg_2 + true + true + true Cfg_2 @@ -72,22 +90,43 @@ false 0 + + Win32\Release\ + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + (None) + Win32\Release\libbsarch-visualstudio-test.exe + + + X64\Release\ + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + (None) + X64\Release\libbsarch-visualstudio-test.exe + DEBUG;$(DCC_Define) false true + + Win32\Debug\libbsarch-visualstudio-test.exe + Win32\Debug\ + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + (None) + true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= (None) + X64\Debug\ + X64\Debug\libbsarch-visualstudio-test.exe MainSource - - Cfg_2 Base diff --git a/libbsarch.h b/libbsarch.h index 106ae10..75fb69c 100644 --- a/libbsarch.h +++ b/libbsarch.h @@ -40,45 +40,45 @@ typedef enum bsa_archive_type_e { baNone, baTES3, baTES4, baFO3, baSSE, baFO4, baFO4dds } bsa_archive_type_t; -typedef void (*bsa_file_dds_info_proc_t)(bsa_archive_t bsa_archive, char **filename, bsa_dds_info_t dds_info); -typedef bool (*bsa_file_iteration_proc_t)(bsa_archive_t bsa_archive, char **filename, bsa_file_record_t file_record, bsa_folder_record_t folder_record, void *context); +typedef void (*bsa_file_dds_info_proc_t)(bsa_archive_t archive, const wchar_t *filename, bsa_dds_info_t dds_info); +typedef bool (*bsa_file_iteration_proc_t)(bsa_archive_t archive, const wchar_t *filename, bsa_file_record_t file_record, bsa_folder_record_t folder_record, void *context); BSARCH_DLL_API(bsa_entry_list_t) bsa_entry_list_create(); -BSARCH_DLL_API(void) bsa_entry_list_free(bsa_entry_list_t *entry_list); -BSARCH_DLL_API(uint32_t) bsa_entry_list_count(bsa_entry_list_t *entry_list); -BSARCH_DLL_API(void) bsa_entry_list_add(bsa_entry_list_t *entry_list, char *entry_string); -BSARCH_DLL_API(uint32_t) bsa_entry_list_get(bsa_entry_list_t *entry_list, uint32_t index, uint32_t string_buffer_size, char *string_buffer); +BSARCH_DLL_API(void) bsa_entry_list_free(bsa_entry_list_t entry_list); +BSARCH_DLL_API(uint32_t) bsa_entry_list_count(bsa_entry_list_t entry_list); +BSARCH_DLL_API(void) bsa_entry_list_add(bsa_entry_list_t entry_list, const wchar_t *entry_string); +BSARCH_DLL_API(uint32_t) bsa_entry_list_get(bsa_entry_list_t entry_list, uint32_t index, uint32_t string_buffer_size, const wchar_t *string_buffer); BSARCH_DLL_API(bsa_archive_t) bsa_create(); BSARCH_DLL_API(void) bsa_free(bsa_archive_t archive); -BSARCH_DLL_API(void) bsa_load_from_file(bsa_archive_t archive, char *filename); -BSARCH_DLL_API(void) bsa_create_archive(bsa_archive_t archive, char *filename, bsa_archive_type_t archive_type, bsa_entry_list_t entry_list); +BSARCH_DLL_API(void) bsa_load_from_file(bsa_archive_t archive, const wchar_t *filename); +BSARCH_DLL_API(void) bsa_create_archive(bsa_archive_t archive, const wchar_t *filename, bsa_archive_type_t archive_type, bsa_entry_list_t entry_list); BSARCH_DLL_API(void) bsa_save(bsa_archive_t archive); -BSARCH_DLL_API(void) bsa_add_file_from_disk(bsa_archive_t archive, char *root_dir, char *filename); -BSARCH_DLL_API(void) bsa_add_file_from_memory(bsa_archive_t archive, char *filename, uint32_t size, bsa_file_data_t data); -BSARCH_DLL_API(bsa_file_record_t) bsa_find_file_record(bsa_archive_t archive, char *filename); +BSARCH_DLL_API(void) bsa_add_file_from_disk(bsa_archive_t archive, const wchar_t *root_dir, const wchar_t *filename); +BSARCH_DLL_API(void) bsa_add_file_from_memory(bsa_archive_t archive, const wchar_t *filename, uint32_t size, bsa_file_data_t data); +BSARCH_DLL_API(bsa_file_record_t) bsa_find_file_record(bsa_archive_t archive, const wchar_t *filename); BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_record(bsa_archive_t archive, bsa_file_record_t file_record); -BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_filename(bsa_archive_t archive, char *filename); +BSARCH_DLL_API(bsa_file_data_result_t) bsa_extract_file_data_by_filename(bsa_archive_t archive, const wchar_t *filename); BSARCH_DLL_API(void) bsa_file_data_free(bsa_archive_t archive, bsa_file_data_result_t file_data_result); -BSARCH_DLL_API(void) bsa_extract_file(bsa_archive_t archive, char *filename, char *save_as); +BSARCH_DLL_API(void) bsa_extract_file(bsa_archive_t archive, const wchar_t *filename, const wchar_t *save_as); BSARCH_DLL_API(void) bsa_iterate_files(bsa_archive_t archive, bsa_file_iteration_proc_t file_iteration_proc, void *context); -BSARCH_DLL_API(bool) bsa_file_exists(bsa_archive_t archive, char *filename); -BSARCH_DLL_API(void) bsa_get_resource_list(bsa_archive_t archive, bsa_entry_list_t entry_result_list, char *folder); +BSARCH_DLL_API(bool) bsa_file_exists(bsa_archive_t archive, const wchar_t *filename); +BSARCH_DLL_API(void) bsa_get_resource_list(bsa_archive_t archive, bsa_entry_list_t entry_result_list, const wchar_t *folder); BSARCH_DLL_API(void) bsa_resolve_hash(bsa_archive_t archive, uint64_t hash, bsa_entry_list_t entry_result_list); BSARCH_DLL_API(void) bsa_close(bsa_archive_t archive); -BSARCH_DLL_API(uint32_t) bsa_filename_get(bsa_archive_t *archive, uint32_t string_buffer_size, char *string_buffer); -BSARCH_DLL_API(bsa_archive_type_t) bsa_archive_type_get(bsa_archive_t *archive); -BSARCH_DLL_API(uint32_t) bsa_version_get(bsa_archive_t *archive); -BSARCH_DLL_API(uint32_t) bsa_format_name_get(bsa_archive_t *archive, uint32_t string_buffer_size, char *string_buffer); -BSARCH_DLL_API(uint32_t) bsa_file_count_get(bsa_archive_t *archive); -BSARCH_DLL_API(uint32_t) bsa_archive_flags_get(bsa_archive_t *archive); -BSARCH_DLL_API(void) bsa_archive_flags_set(bsa_archive_t *archive, uint32_t flags); -BSARCH_DLL_API(uint32_t) bsa_file_flags_get(bsa_archive_t *archive); -BSARCH_DLL_API(void) bsa_file_flags_set(bsa_archive_t *archive, uint32_t flags); -BSARCH_DLL_API(bool) bsa_compress_get(bsa_archive_t *archive); -BSARCH_DLL_API(void) bsa_compress_set(bsa_archive_t *archive, bool flags); -BSARCH_DLL_API(bool) bsa_share_data_get(bsa_archive_t *archive); -BSARCH_DLL_API(void) bsa_share_data_set(bsa_archive_t *archive, bool flags); +BSARCH_DLL_API(uint32_t) bsa_filename_get(bsa_archive_t archive, uint32_t string_buffer_size, const wchar_t *string_buffer); +BSARCH_DLL_API(bsa_archive_type_t) bsa_archive_type_get(bsa_archive_t archive); +BSARCH_DLL_API(uint32_t) bsa_version_get(bsa_archive_t archive); +BSARCH_DLL_API(uint32_t) bsa_format_name_get(bsa_archive_t archive, uint32_t string_buffer_size, const wchar_t *string_buffer); +BSARCH_DLL_API(uint32_t) bsa_file_count_get(bsa_archive_t archive); +BSARCH_DLL_API(uint32_t) bsa_archive_flags_get(bsa_archive_t archive); +BSARCH_DLL_API(void) bsa_archive_flags_set(bsa_archive_t archive, uint32_t flags); +BSARCH_DLL_API(uint32_t) bsa_file_flags_get(bsa_archive_t archive); +BSARCH_DLL_API(void) bsa_file_flags_set(bsa_archive_t archive, uint32_t flags); +BSARCH_DLL_API(bool) bsa_compress_get(bsa_archive_t archive); +BSARCH_DLL_API(void) bsa_compress_set(bsa_archive_t archive, bool flags); +BSARCH_DLL_API(bool) bsa_share_data_get(bsa_archive_t archive); +BSARCH_DLL_API(void) bsa_share_data_set(bsa_archive_t archive, bool flags); -BSARCH_DLL_API(void) bsa_file_dds_info_callback_set(bsa_archive_t *archive, bsa_file_dds_info_proc_t file_dds_info_proc); +BSARCH_DLL_API(void) bsa_file_dds_info_callback_set(bsa_archive_t archive, bsa_file_dds_info_proc_t file_dds_info_proc); diff --git a/libbsarch.vcxproj b/libbsarch.vcxproj index 2fc5bb4..e480e4e 100644 --- a/libbsarch.vcxproj +++ b/libbsarch.vcxproj @@ -22,28 +22,28 @@ 15.0 {537F42AD-5B15-4671-B99E-2D1818999A98} Win32Proj - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 DynamicLibrary false - v141 + v142 DynamicLibrary true - v141 + v142 DynamicLibrary false - v141 + v142 @@ -67,11 +67,15 @@ true $(DirectXTexPath)\DirectXTex;$(IncludePath) $(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true $(DirectXTexPath)\DirectXTex;$(IncludePath) $(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(DirectXTexPath)\DirectXTex;$(IncludePath) @@ -91,9 +95,15 @@ MachineX86 - true + false Windows + libbsarch.def + + xcopy /y "$(ProjectDir)libbsarch.h" "$(OutDir)" + Copying header file + $(OutDir)libbsarch.h + @@ -108,7 +118,34 @@ Windows true true + libbsarch.def + + xcopy /y "$(ProjectDir)libbsarch.h" "$(OutDir)" + Copying header file + $(OutDir)libbsarch.h + + + + + false + libbsarch.def + + + xcopy /y "$(ProjectDir)libbsarch.h" "$(OutDir)" + Copying header file + $(OutDir)libbsarch.h + + + + + libbsarch.def + + + xcopy /y "$(ProjectDir)libbsarch.h" "$(OutDir)" + Copying header file + $(OutDir)libbsarch.h + diff --git a/wbBSArchive.pas b/wbBSArchive.pas index 8984f89..55a87b6 100644 --- a/wbBSArchive.pas +++ b/wbBSArchive.pas @@ -194,11 +194,11 @@ type TBSArchiveState = (stReading, stWriting); TBSArchiveStates = set of TBSArchiveState; TBSFileIterationProcCompat = function(aArchive: Pointer; const aFileName: PChar; - aFileRecord: Pointer; aFolderRecord: Pointer; aContext: Pointer): Boolean; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; + aFileRecord: Pointer; aFolderRecord: Pointer; aContext: Pointer): Boolean; stdcall; TDDSInfo = record Width, Height, MipMaps: Integer; end; TBSFileDDSInfoProcCompat = procedure(aArchive: Pointer; const aFileName: PChar; - var aInfo: TDDSInfo); {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF}; + var aInfo: TDDSInfo); stdcall; TwbBSHeaderTES3 = packed record HashOffset: Cardinal; @@ -1536,7 +1536,8 @@ procedure TwbBSArchive.AddFile(const aRootDir, aFileName: string); var fname: string; i: integer; - Buffer: PByte; + buffer: PByte; + stream: TFileStream; begin if not (stWriting in fStates) then raise Exception.Create('Archive is not in writing mode'); @@ -1547,13 +1548,18 @@ begin fname := Copy(aFileName, i + 1, Length(aFileName)); - with TFileStream.Create(aFileName, fmOpenRead + fmShareDenyNone) do try - GetMem(Buffer, Size); - Read(Buffer[0], Size); - AddFileCompat(fname, Size, Buffer); + stream := TFileStream.Create(aFileName, fmOpenRead + fmShareDenyNone); + try + GetMem(buffer, stream.Size); + try + stream.Read(buffer^, stream.Size); + AddFileCompat(fname, stream.Size, buffer); + finally + if Assigned(buffer) then + FreeMem(buffer); + end; finally - FreeAndNil(Buffer); - Free; + stream.Free; end; end;