Ver 1.0.3

CHANGELOG

@@ -1,5 +1,8 @@
 ----------------------------------------------------------------------
-Version 0.0.1
-    * First version, development state
+Version 1.0.0
+	* First beta version of library, with most functions for extracting/patching already implemented
+----------------------------------------------------------------------	
+Version 1.0.2
+    * Fixed issue when some text files were patched but didn't appear in game ("<string error DID.." error due to incomplete dictionary update)
 ----------------------------------------------------------------------
     

CMakeLists.txt

@@ -13,7 +13,7 @@ if (MSVS)
 endif(MSVS)
 
 set(CMAKE_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/bin)
-set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source)
+set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
 
 include_directories(${CMAKE_SOURCE_DIR}/Common/Yaml)
 
@@ -63,7 +63,7 @@ set(SOURCE_FILES
 
         ${CMAKE_SOURCE_DIR}/Subfiles/UnknownSubfile.cpp
         ${CMAKE_SOURCE_DIR}/Subfiles/UnknownSubfile.h
-        Source/SubfileData.h)
+        src/SubfileData.h)
 
 set(CompilerFlags
         CMAKE_CXX_FLAGS
@@ -87,9 +87,9 @@ add_library(LotroDat_static STATIC ${SOURCE_FILES})
 # SHARED LIBRARY
 add_library(LotroDat SHARED ${SOURCE_FILES})
 # CONSOLE EXTRACTOR TOOL
-add_executable(LotRO_dat_extract_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Tests/extract_test.cpp)
+add_executable(LotRO_dat_extract_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Examples/extractor_example.cpp)
 # CONSOLE PATCHER TOOL
-add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Tests/patch_test.cpp)
+add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Examples/patcher_example.cpp)
 
 foreach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)
     if(MSVC)
@@ -101,4 +101,4 @@ foreach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_t
         target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Common/Yaml/libyaml-cpp.a)
         target_link_libraries(${TARGET} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic)
     endif(MSVC)
-endforeach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)
+endforeach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)

Source/BinaryData.cpp → src/BinaryData.cpp

@@ -30,6 +30,8 @@ namespace LOTRO_DAT {
 
     BinaryData::BinaryData(unsigned int size) {
         data_ = new unsigned char[size];
+        for (int i = 0; i < size; i++)
+            data_[i] = 0;
         size_ = size;
     }
 

Source/DatFile.cpp → src/DatFile.cpp

@@ -11,19 +11,17 @@
 #include "SubfileData.h"
 
 #include <locale>
+#include <algorithm>
 
 extern "C++"
 {
 namespace LOTRO_DAT {
-    DatFile::DatFile() {
-        dat_state_ = CLOSED;
-        patched_ = false;
-    }
+    DatFile::DatFile() : dat_state_(CLOSED), patched_(false) {}
 
-    DatFile::DatFile(const char *filename, int dat_id) {
-        dat_id_ = dat_id;
-        dat_state_ = CLOSED;
-        patched_ = false;
+    DatFile::DatFile(const char *filename, int dat_id)
+            : dat_id_(dat_id)
+            , dat_state_(CLOSED)
+            , patched_(false) {
         OpenDatFile(filename);
         ReadSuperBlock();
         MakeDirectories();
@@ -135,7 +133,7 @@ namespace LOTRO_DAT {
         }
 
         if (export_data == SubfileData()) {
-            fprintf(stderr, "WARNING: file with id %lld is too small. Passing it\n", dictionary_[file_id]->file_id());
+            fprintf(stderr, "WARNING: file with id %lld is empty. Passing it\n", dictionary_[file_id]->file_id());
             return true;
         }
 
@@ -225,6 +223,12 @@ namespace LOTRO_DAT {
     bool DatFile::PatchFile(const SubfileData &data) {
         auto file_id = data.options["fid"].as<long long>();
         Subfile *file = dictionary_[file_id];
+
+        if (file == nullptr) {
+            fprintf(stderr, "ERROR DatFile::PatchFile() - Cannot patch file - there is no file in dictionary with file_id = %lld.\n", file_id);
+            return false;
+        }
+
         BinaryData old_data = GetFileData(file);
         BinaryData patch_data = file->MakeForImport(old_data, data);
         ApplyFilePatch(file, patch_data);
@@ -461,18 +465,16 @@ namespace LOTRO_DAT {
             fprintf(stderr, "Warning: DatFile::ApplyFilePatch - found 2 files in patch with the same file_id. Passing last...\n");
             return;
         }
-
         patched_list[file->file_id()] = new BinaryData(file->MakeHeaderData());
         patched_ = true;
 
         auto journal = GetFragmentationJournal();
 
         file->file_size_ = data.size() - 8;
-        //file->fragments_count_ = 0;
 
-        if (data.size() > file->block_size()) {
+        //if (data.size() > file->block_size()) {
             file->file_offset_ = journal[0].second;
-            file->block_size_ = data.size();
+            file->block_size_ = std::max(data.size(), 256u);
 
             journal[0].second += data.size();
 
@@ -480,7 +482,7 @@ namespace LOTRO_DAT {
             WriteData(nulls, nulls.size(), file_size_);
 
             this->file_size_ += data.size();
-        }
+        //}
 
         BinaryData fragments_count(4);
         fragments_count.FromNumber<4>(0);
@@ -492,6 +494,9 @@ namespace LOTRO_DAT {
                                        "Patch wasn't written to .dat file");
 
         WriteData(file_data, file_data.size(), file->file_offset());
+
+        nulls = BinaryData(unsigned(file->block_size_ - file_data.size()));
+        WriteData(nulls, nulls.size(), file->file_offset() + file_data.size());
         UpdateFragmentationJournal(journal);
     }
 

Source/Tests/extract_test.cpp → src/Examples/extractor_example.cpp

@@ -60,40 +60,45 @@ int main() {
         std::cout << "Starting search...\n" << std::flush;
         DatFile a((path + filename).c_str(), 0);
         std::cout << "Total files found: " << a.files_number() << std::endl << std::flush;
-
+        a.WriteUnorderedDictionary(output_dir);
         std::cout << "Beginning unpacking... Please, wait for some minutes."
         "\nMaybe it's a good idea to have a cup of tea, while unpacker is working...\n" << std::flush;
 
         Database *out = new Database("out.db");
         if (exportImagesToDb) {
-            Database *images = out;//new Database(output_dir + std::string("Images.db"));
+            //Database *images = out;//new Database(output_dir + std::string("Images.db"));
+            Database *images = new Database(output_dir + std::string("Images.db"));
             std::cout << "Extracted " << a.ExtractAllFilesByType(JPG, images) << " .jpg files to Images.db" << std::endl << std::flush;
-//            delete images;
+            delete images;
         }
 
         if (exportSoundsToDb) {
-            Database *sounds = out;//new Database(output_dir + std::string("Sounds.db"));
+//            Database *sounds = out;//new Database(output_dir + std::string("Sounds.db"));
+            Database *sounds = new Database(output_dir + std::string("Sounds.db"));
             std::cout << "Extracted " << a.ExtractAllFilesByType(WAV, sounds) << " .wav files to Sounds.db" << std::endl << std::flush;
             std::cout << "Extracted " << a.ExtractAllFilesByType(OGG, sounds) << " .ogg files to Sounds.db" << std::endl << std::flush;
-//            delete sounds;
+            delete sounds;
         }
 
         if (exportTextsToDb) {
-            Database *texts = out;//new Database(output_dir + std::string("Texts.db"));
+//            Database *texts = out;//new Database(output_dir + std::string("Texts.db"));
+            Database *texts = new Database(output_dir + std::string("Texts.db"));
             std::cout << "Extracted " << a.ExtractAllFilesByType(TEXT, texts) << " text files to Texts.db" << std::endl << std::flush;
-//            delete texts;
+            delete texts;
         }
 
         if (exportFontsToDb) {
-            Database *fonts = out;//new Database(output_dir + std::string("Fonts.db"));
+//            Database *fonts = out;//new Database(output_dir + std::string("Fonts.db"));
+            Database *fonts = new Database(output_dir + std::string("Fonts.db"));
             std::cout << "Extracted " << a.ExtractAllFilesByType(FONT, fonts) << " font files to Fonts.db" << std::endl << std::flush;
-//            delete fonts;
+            delete fonts;
         }
 
         if (exportTexturesToDb) {
-            Database *textures = out;//new Database(output_dir + std::string("Textures.db"));
+//            Database *textures = out;//new Database(output_dir + std::string("Textures.db"));
+            Database *textures = new Database(output_dir + std::string("Textures.db"));
             std::cout << "Extracted " << a.ExtractAllFilesByType(DDS, textures) << " .dds files to Textures.db" << std::endl << std::flush;
-//            delete textures;
+            delete textures;
         }
         delete out;
 

Source/Tests/patch_test.cpp → src/Examples/patcher_example.cpp

@@ -21,35 +21,33 @@ const std::string filename = "client_local_English.dat";
 
 int main() {
     const clock_t begin_time = clock();
-
+    std::cout << "Gi1dor's LotRO .dat patcher ver. 1.0.3" << std::endl;
     freopen("errors.log", "w", stderr);
-    //freopen("stdout.log", "w", stdout);
+
     setbuf(stdout, NULL);
     setbuf(stderr, NULL);
 
     setvbuf (stdout, NULL, _IONBF, BUFSIZ);
     setvbuf (stderr, NULL, _IONBF, BUFSIZ);
-    Database db;
-    db.InitDatabase("out.db");
 
-    DatFile *a;
+    Database db;
+    db.InitDatabase("patch.db");
 
     try {
-        a = new DatFile((path + filename).c_str(), 0);
+        DatFile *a = new DatFile((path + filename).c_str(), 0);
         std::cout << "Starting magic...\n";
         std::cout << "Files number: " << a->files_number() << std::endl;
-        a->WriteUnorderedDictionary("");
         a->PatchAllDatabase(&db);
+        delete a;
     } catch (std::exception &e) {
         fprintf(stderr, "Caught %s exception.", e.what());
         printf("Caught %s exception.", e.what());
         fflush(stdout);
 
-        printf("Some critical errors occured. Need to stop execution. See information in errors.log file");
-        fprintf(stderr, "Some critical errors occured. Need to stop execution now...");
+        printf("Some critical errors occured. Need to stop execution. See information in errors.log file\n");
+        fprintf(stderr, "Some critical errors occured. Need to stop execution now...\n");
     }
 
-    delete a;
     fprintf(stdout, "Spent %f seconds on performing magic! Thank you for your patience!\n",
             float(clock() - begin_time) / CLOCKS_PER_SEC);
     system("pause");

Source/SubDirectory.cpp → src/SubDirectory.cpp

@@ -127,7 +127,7 @@ namespace LOTRO_DAT {
             if (patched_files.count(file_id) != 0) {
                 BinaryData data(32);
                 dat_->ReadData(data, 32, subfiles_[i]->dictionary_offset());
-                if (data != *patched_files[file_id])
+                if (data.CutData(8, 16) != patched_files[file_id]->CutData(8, 16))
                     continue;
 
                 BinaryData header = dict[subfiles_[i]->file_id()]->MakeHeaderData();

Source/Subfiles/TextSubfile.cpp → src/Subfiles/TextSubfile.cpp

@@ -66,9 +66,6 @@ namespace LOTRO_DAT {
 
     SubfileData TextSubfile::PrepareForExport(const BinaryData &file_data) {
         SubfileData result;
-        if (file_size() <= 10) // File is empty, nothing to do;
-            return result;
-
         long long offset = 9; // first 4 bytes - file_id, then 4 bytes - unknown, then 1 byte - unknown
 
         long long text_fragment_num = file_data.ToNumber<1>(offset);
@@ -136,7 +133,6 @@ namespace LOTRO_DAT {
             new_data = new_data + old_data.CutData(offset - 8, offset);
 
             if (patch_fragments.count(fragment_id) == 0) {
-                std::cerr << "Omg, what..? " << file_id() << " " << fragment_id << " is not in patch? " << std::endl;
                 try {
                     // Retrieving old pieces
                     new_data = new_data + GetPieceData(old_data, offset);