2.5.1 修复UC服补丁无效问题，修复一个崩溃问题。

xausky · xausky · commit a3b8be277314 · 2018-08-04T19:29:41.000+08:00
diff --git a/app/src/main/cpp/libuabe/FolderFile.cc b/app/src/main/cpp/libuabe/FolderFile.cc
@@ -8,7 +8,7 @@
 
 namespace xausky {
     char FolderPathBuffer[PATH_BUFFER_SIZE];
-    char indentifier[5];
+    char indentifier[7];
 
     void RestoreTarget(string targetPath, string backupPath){
         __LIBUABE_LOG("RestoreTarget: targetPath=%s,backupPath=%s\n", targetPath.c_str(), backupPath.c_str());
@@ -33,19 +33,19 @@ namespace xausky {
         sprintf(FolderPathBuffer, "%s/%s", modsPath.c_str(), matchName.c_str());
         if(stat(FolderPathBuffer,&modStat)==0){
             if(S_ISDIR(modStat.st_mode)){
-                memset(indentifier, 0, 5);
+                memset(indentifier, 0, 7);
                 binary_stream_t input;
                 if(binary_stream_create_file(&input, (targetPath + '/' + filename).c_str(), BINARY_STREAM_ORDER_LITTLE_ENDIAN) != 0){
                     __LIBUABE_LOG("binary_stream_create_file failed.");
                     return;
                 }
-                if(binary_stream_read(&input, indentifier, 4) != 4) {
+                if(binary_stream_read(&input, indentifier, 7) != 7) {
                     __LIBUABE_LOG("binary_stream_read failed.");
                     return;
                 }
                 BackupFile(filename, targetPath, backupPath);
-                if(strcmp(indentifier, "AKPK")){
-                    __LIBUABE_LOG("AKPK patch: %s\n", matchName.c_str());
+                if(memcmp(indentifier, "AKPK", 4) == 0){
+                    __LIBUABE_LOG("Wwise patch: %s\n", matchName.c_str());
                     wwise_akpk_t akpk;
                     wwise_akpk_patch_t patch;
                     binary_stream_seek(&input, 0, SEEK_SET);
@@ -75,16 +75,20 @@ namespace xausky {
                     binary_stream_destory(&input);
                 } else {
                     binary_stream_destory(&input);
-                    __LIBUABE_LOG("bundle patch: %s\n", matchName.c_str());
-                    BinaryStream bundle(targetPath + '/' + filename, true);
-                    BinaryStream patchedBundle(targetPath + '/' + filename, true);
-                    BundleFile bundleFile;
-                    bundleFile.open(bundle);
-                    map<string, map<int64_t, BinaryStream *> *> *patch = Utils::MakeBundlePatch(
-                            FolderPathBuffer);
-                    bundleFile.patch(*patch);
-                    bundleFile.save(patchedBundle);
-                    Utils::FreeBundlePatch(patch);
+                    if(memcmp(indentifier, "UnityFS", 7) == 0){
+                        __LIBUABE_LOG("Bundle patch: %s\n", matchName.c_str());
+                        BinaryStream bundle(targetPath + '/' + filename, true);
+                        BinaryStream patchedBundle(targetPath + '/' + filename, true);
+                        BundleFile bundleFile;
+                        bundleFile.open(bundle);
+                        map<string, map<int64_t, BinaryStream *> *> *patch = Utils::MakeBundlePatch(
+                                FolderPathBuffer);
+                        bundleFile.patch(*patch);
+                        bundleFile.save(patchedBundle);
+                        Utils::FreeBundlePatch(patch);
+                    } else {
+                        __LIBUABE_LOG("Unknown patch: %s\n", filename.c_str());
+                    }
                 }
             }else if(S_ISREG(modStat.st_mode)){
                 __LIBUABE_LOG("copy patch: %s\n", filename.c_str());
diff --git a/app/src/main/cpp/libuabe/Utils.cc b/app/src/main/cpp/libuabe/Utils.cc
@@ -1,5 +1,4 @@
 #include "Utils.hh"
-#include "LogUtils.hh"
 #include <iostream>
 #include <dirent.h>
 #include <sys/stat.h>
@@ -49,6 +48,9 @@ namespace xausky {
         while (!folders.empty()){
             string current = folders.back();folders.pop_back();
             DIR *folder = opendir((path + "/" + current).c_str());
+            if(folder == NULL){
+                continue;
+            }
             struct dirent *rent = NULL;
             while((rent = readdir(folder)) != NULL){
                 if(strcmp(rent->d_name,".")==0 || strcmp(rent->d_name,"..")==0){
diff --git a/app/src/main/cpp/libuabe/ZipFile.cc b/app/src/main/cpp/libuabe/ZipFile.cc
@@ -30,7 +30,7 @@ namespace xausky {
                 if(mz_zip_reader_extract_to_mem(zip, i, target.data, target.capacity, 0)){
                     target.size = entrityStat->m_uncomp_size;
                     if(memcmp(target.data, "AKPK", 4) == 0){
-                        __LIBUABE_LOG("AKPK patch: %s\n", entrityStat->m_filename);
+                        __LIBUABE_LOG("Wwise patch: %s\n", entrityStat->m_filename);
                         wwise_akpk_t akpk;
                         wwise_akpk_patch_t patch;
                         binary_stream_seek(&target, 0, SEEK_SET);
@@ -56,8 +56,8 @@ namespace xausky {
                         }
                         wwise_akpk_destory_patch(&patch);
                         mz_zip_writer_add_mem(out, entrityStat->m_filename, target.data, target.size, MZ_NO_COMPRESSION);
-                    } else {
-                        __LIBUABE_LOG("bundle patch: %s\n", entrityStat->m_filename);
+                    } else if(memcmp(target.data, "UnityFS", 7) == 0) {
+                        __LIBUABE_LOG("Bundle patch: %s\n", entrityStat->m_filename);
                         BinaryStream bundle((char *)target.data, entrityStat->m_uncomp_size, true);
                         BinaryStream patchedBundle(true);
                         BundleFile bundleFile;
@@ -69,12 +69,14 @@ namespace xausky {
                         int len = patchedBundle.size();
                         patchedBundle.ReadData(dataBuffer, len);
                         mz_zip_writer_add_mem(out, entrityStat->m_filename, dataBuffer, len, MZ_NO_COMPRESSION);
+                    } else {
+                        __LIBUABE_LOG("Unknown patch: %s\n", entrityStat->m_filename);
                     }
+                    binary_stream_destory(&target);
                     return;
                 } else {
                     __LIBUABE_LOG("mz_zip_reader_extract_to_mem() failed!\n");
                 }
-                binary_stream_destory(&target);
             }
             if(S_ISREG(modStat.st_mode)){
                 mz_zip_writer_add_file(out, entrityStat->m_filename, pathBuffer, NULL, 0, MZ_NO_COMPRESSION);
diff --git a/app/src/main/cpp/libuabe/libumm/utils.c b/app/src/main/cpp/libuabe/libumm/utils.c
@@ -20,4 +20,15 @@ klist_t(utils_file_list)* utils_file_list_make(const char *path){
 
 void utils_file_list_destory(klist_t(utils_file_list)* list){
     kl_destroy(utils_file_list, list);
+}
+
+void utils_file_stream_dump(binary_stream_t *stream, int len, uint32_t id){
+    char name[1024];
+    binary_stream_t out;
+    int64_t pos = binary_stream_seek(stream, 0, SEEK_CUR);
+    sprintf(name, "%u-%u.dump", id, rand());
+    binary_stream_create_file(&out, name, BINARY_STREAM_ORDER_LITTLE_ENDIAN);
+    binary_stream_copy(&out, stream, len);
+    binary_stream_destory(&out);
+    binary_stream_seek(stream, pos, SEEK_SET);
 }
diff --git a/app/src/main/cpp/libuabe/libumm/utils.h b/app/src/main/cpp/libuabe/libumm/utils.h
@@ -6,9 +6,24 @@ extern "C" {
 
 #include <dirent.h>
 #include <string.h>
-#include <climits>
+#include <limits.h>
 
 #include "klist.h"
+#include "binary_stream.h"
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#define __LIBUABE_LOG(str, args...) __android_log_print(ANDROID_LOG_DEBUG, "NativeUtils", str, ##args)
+#define __LIBUABE_DEBUG(str, args...)
+#else
+#include <stdio.h>
+#define __LIBUABE_LOG(str, args...) printf(str, ##args)
+#ifdef DEBUG
+#define __LIBUABE_DEBUG(str, args...) printf(str, ##args)
+#else
+#define __LIBUABE_DEBUG(str, args...)
+#endif
+#endif
 
 #define __unuse_free(x)
 
@@ -22,6 +37,8 @@ klist_t(utils_file_list) *utils_file_list_make(const char *path);
 
 void utils_file_list_destory(klist_t(utils_file_list) *list);
 
+void utils_file_stream_dump(binary_stream_t *stream, int len, uint32_t id);
+
 #endif
 #if defined (__cplusplus)
 }
diff --git a/app/src/main/cpp/libuabe/libumm/wwise_bank.c b/app/src/main/cpp/libuabe/libumm/wwise_bank.c
@@ -1,4 +1,5 @@
 #include "wwise_bank.h"
+#include "utils.h"
 
 int8_t wwise_bank_parser_event_voice(kbtree_t(wwise_bank_key_value_map) *map, binary_stream_t *stream){
     uint32_t id, wem;
@@ -21,6 +22,7 @@ int8_t wwise_bank_parser_event_voice(kbtree_t(wwise_bank_key_value_map) *map, bi
     if(type == 0){
         kb_put(wwise_bank_key_value_map, map, entity);
     }
+    __LIBUABE_DEBUG("voice:%u,%u,%u\n", id, type, wem);
     return 0;
 }
 
@@ -43,6 +45,7 @@ int8_t wwise_bank_parser_event_action(kbtree_t(wwise_bank_key_value_map) *map, b
     entity.key = id;
     entity.value = voice;
     kb_put(wwise_bank_key_value_map, map, entity);
+    __LIBUABE_DEBUG("action:%u,%u,%u,%u\n", id, scope, type, voice);
     return 0;
 }
 
@@ -57,43 +60,97 @@ int8_t wwise_bank_parser_event_event(kbtree_t(wwise_bank_key_values_map) *map, b
     }
     entity.key = id;
     entity.size = number;
+    __LIBUABE_DEBUG("event:%u\n", id);
     for(int i = 0; i < number; ++i){
         if(i >= EVENT_MAX_ACTION_BUMBER){
-            puts("EVENT_MAX_ACTION_BUMBER error.\n");
+            __LIBUABE_DEBUG("EVENT_MAX_ACTION_BUMBER error.\n");
             break;
         }
         if(binary_stream_read_uint32(stream, &action) != 0){
             return -3;
         }
+        __LIBUABE_DEBUG("--action:%u\n", action);
         entity.values[i] = action;
     }
     kb_put(wwise_bank_key_values_map, map, entity);
     return 0;
 }
 
-int8_t wwise_bank_parser_event_container(kbtree_t(wwise_bank_key_values_map) *map, binary_stream_t *stream){
-    uint32_t id, number, voice;
+int8_t wwise_bank_parser_event_sequence(kbtree_t(wwise_bank_key_values_map) *map, binary_stream_t *stream){
+    uint16_t check = 0;
+    uint32_t id, number, object;
     wwise_bank_key_values_t entity;
     uint64_t start = binary_stream_seek(stream, 0, SEEK_CUR);
     if(binary_stream_read_uint32(stream, &id) != 0){
         return -1;
     }
-    if(binary_stream_seek(stream, 0x34, SEEK_CUR) == -1){
+    do {
+        if(binary_stream_read_uint16(stream, &check) != 0){
+            return -2;
+        }
+        if(binary_stream_seek(stream, -1, SEEK_CUR) == -1){
+            return -2;
+        }
+    } while(check != 0x447A);
+    if(binary_stream_seek(stream, 15, SEEK_CUR) == -1){
+        return -2;
+    }
+    if(binary_stream_read_uint32(stream, &number) != 0){
+        return -2;
+    }
+    if(number > EVENT_MAX_ACTION_BUMBER){
+        __LIBUABE_DEBUG("sequence number too more.\n");
+        return 0;
+    }
+    entity.key = id;
+    entity.size = number;
+    __LIBUABE_DEBUG("sequence:%u\n", id);
+    for(int i = 0; i < number; ++i){
+        if(binary_stream_read_uint32(stream, &object) != 0){
+            return -3;
+        }
+        __LIBUABE_DEBUG("--object:%u\n", object);
+        entity.values[i] = object;
+    }
+    if(number > 0){
+        kb_put(wwise_bank_key_values_map, map, entity);
+    }
+    return 0;
+}
+
+int8_t wwise_bank_parser_event_switch(kbtree_t(wwise_bank_key_values_map) *map, binary_stream_t *stream){
+    uint8_t skip;
+    uint32_t id, number, object;
+    wwise_bank_key_values_t entity;
+    uint64_t start = binary_stream_seek(stream, 0, SEEK_CUR);
+    if(binary_stream_read_uint32(stream, &id) != 0){
+        return -1;
+    }
+    if(binary_stream_seek(stream, 0x0C, SEEK_CUR) == -1){
+        return -2;
+    }
+    if(binary_stream_read_uint8(stream, &skip) != 0){
+        return -2;
+    }
+    if(binary_stream_seek(stream, 0x19 + 5 * skip, SEEK_CUR) == -1){
         return -2;
     }
     if(binary_stream_read_uint32(stream, &number) != 0){
         return -2;
     }
     if(number > EVENT_MAX_ACTION_BUMBER){
+        __LIBUABE_DEBUG("switch number too more.\n");
         return 0;
     }
     entity.key = id;
     entity.size = number;
+    __LIBUABE_DEBUG("switch:%u\n", id);
     for(int i = 0; i < number; ++i){
-        if(binary_stream_read_uint32(stream, &voice) != 0){
+        if(binary_stream_read_uint32(stream, &object) != 0){
             return -3;
         }
-        entity.values[i] = voice;
+        __LIBUABE_DEBUG("--object:%u\n", object);
+        entity.values[i] = object;
     }
     if(number > 0){
         kb_put(wwise_bank_key_values_map, map, entity);
@@ -102,11 +159,11 @@ int8_t wwise_bank_parser_event_container(kbtree_t(wwise_bank_key_values_map) *ma
 }
 
 int8_t wwise_bank_parser_event(wwise_bank_t *bank, binary_stream_t *stream){
-    bank->voice_wem_map = kb_init(wwise_bank_key_value_map, KB_DEFAULT_SIZE);
-    bank->event_wems_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE);
-    bank->action_object_map = kb_init(wwise_bank_key_value_map, KB_DEFAULT_SIZE);
-    bank->event_actions_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE);
-    bank->object_voices_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE);
+    bank->voice_wem_map = kb_init(wwise_bank_key_value_map, KB_DEFAULT_SIZE * sizeof(wwise_bank_key_value_t));
+    bank->event_wems_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE* sizeof(wwise_bank_key_values_t));
+    bank->action_object_map = kb_init(wwise_bank_key_value_map, KB_DEFAULT_SIZE* sizeof(wwise_bank_key_value_t));
+    bank->event_actions_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE* sizeof(wwise_bank_key_values_t));
+    bank->object_voices_map = kb_init(wwise_bank_key_values_map, KB_DEFAULT_SIZE* sizeof(wwise_bank_key_values_t));
     uint8_t type;
     uint32_t number, length, id;
     int64_t end;
@@ -125,6 +182,15 @@ int8_t wwise_bank_parser_event(wwise_bank_t *bank, binary_stream_t *stream){
         if(end < 0){
             return -3;
         }
+        /*
+        if(binary_stream_read_uint32(stream, &id) != 0){
+            return -2;
+        }
+        binary_stream_seek(stream, -4, SEEK_CUR);
+        __LIBUABE_DEBUG("object:%u,%u,%u\n", id, type, length);
+        if(id == 151993151 || id == 606474963 || id == 698201592 || id == 462587676){
+            utils_file_stream_dump(stream, length, id);
+        }*/
         switch(type){
             case 4: //Event
                 if(wwise_bank_parser_event_event(bank->event_actions_map, stream)!=0){
@@ -142,7 +208,12 @@ int8_t wwise_bank_parser_event(wwise_bank_t *bank, binary_stream_t *stream){
                 }
                 break;
             case 5: //Random Container or Sequence Container
-                if(wwise_bank_parser_event_container(bank->object_voices_map, stream)!=0){
+                if(wwise_bank_parser_event_sequence(bank->object_voices_map, stream)!=0){
+                    return -7;
+                }
+                break;
+            case 6: //Switch
+                if(wwise_bank_parser_event_switch(bank->object_voices_map, stream)!=0){
                     return -7;
                 }
                 break;
@@ -212,6 +283,7 @@ int8_t wwise_bank_parser_didx(wwise_bank_t *bank, binary_stream_t *stream, uint3
         if(current < 0){
             return -6;
         }
+        __LIBUABE_DEBUG("wem:%u,%u\n", put.key, put.length);
     }
     return 0;
 }
@@ -221,7 +293,7 @@ int8_t wwise_bank_parser_data(wwise_bank_t *bank, binary_stream_t *stream){
     int32_t start;
     wwise_bank_key_stream_t put;
     if(bank->wem_stream_map == 0){
-        printf("wwise_bank_parser_data not didx.");
+        __LIBUABE_DEBUG("wwise_bank_parser_data not didx.");
         return 0;
     }
     start = binary_stream_seek(stream, 0, SEEK_CUR);
