Something changed

This commit is contained in:
2017-08-25 17:01:39 -04:00
parent 5fb9d86b62
commit 6b61ae9e5f
3 changed files with 42 additions and 34 deletions

View File

@@ -9,9 +9,9 @@ FS_Archive ArchiveThemeExt;
Result open_archives(void); Result open_archives(void);
int get_number_entries(char*); int get_number_entries(char*);
u64 file_to_buf(FS_Path path, FS_Archive archive, char* buf); u64 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
u32 zip_file_to_buf(char *file_name, u16 *zip_path, char *buf); u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf); u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf);
bool check_file_exists(char *path, FS_Archive archive); void remake_file(char *path, FS_Archive archive, u32 size);
#endif #endif

View File

@@ -81,7 +81,7 @@ int get_number_entries(char *path)
return count; return count;
} }
u64 file_to_buf(FS_Path path, FS_Archive archive, char* buf) u64 file_to_buf(FS_Path path, FS_Archive archive, char** buf)
{ {
Handle file; Handle file;
Result res = FSUSER_OpenFile(&file, archive, path, FS_OPEN_READ, 0); Result res = FSUSER_OpenFile(&file, archive, path, FS_OPEN_READ, 0);
@@ -89,13 +89,13 @@ u64 file_to_buf(FS_Path path, FS_Archive archive, char* buf)
u64 size; u64 size;
FSFILE_GetSize(file, &size); FSFILE_GetSize(file, &size);
buf = malloc(size); *buf = malloc(size);
FSFILE_Read(file, NULL, 0, buf, size); FSFILE_Read(file, NULL, 0, *buf, size);
FSFILE_Close(file); FSFILE_Close(file);
return size; return size;
} }
u32 zip_file_to_buf(char *file_name, u16 *zip_path, char *buf) u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
{ {
fflush(stdout); fflush(stdout);
ssize_t len = strulen(zip_path, 0x106); ssize_t len = strulen(zip_path, 0x106);
@@ -112,19 +112,22 @@ u32 zip_file_to_buf(char *file_name, u16 *zip_path, char *buf)
if (status == UNZ_OK) if (status == UNZ_OK)
{ {
unz_file_info *file_info = malloc(sizeof(unz_file_info)); unz_file_info *file_info = malloc(sizeof(unz_file_info));
unzGetCurrentFileInfo(zip_handle, file_info, NULL, 0, NULL, 0, NULL, 0);
file_size = file_info->uncompressed_size; file_size = file_info->uncompressed_size;
free(file_info); *buf = malloc(file_size);
buf = malloc(file_size);
unzOpenCurrentFile(zip_handle); unzOpenCurrentFile(zip_handle);
unzReadCurrentFile(zip_handle, buf, file_size); unzReadCurrentFile(zip_handle, *buf, file_size);
unzCloseCurrentFile(zip_handle); unzCloseCurrentFile(zip_handle);
} else {
puts("fileziprip");
}
unzClose(zip_handle); unzClose(zip_handle);
free(path); free(path);
free(file_info);
return file_size; return file_size;
} else {
free(path);
puts("fileziprip");
return 0;
}
} }
u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf) u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf)
@@ -137,10 +140,16 @@ u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf)
if (R_FAILED(res)) return res; if (R_FAILED(res)) return res;
res = FSFILE_Close(handle); res = FSFILE_Close(handle);
if (R_FAILED(res)) return res; if (R_FAILED(res)) return res;
return 0; return bytes;
} }
bool check_file_exists(char *path, FS_Archive archive) void remake_file(char *path, FS_Archive archive, u32 size)
{ {
return (R_SUMMARY(FSUSER_OpenFile(NULL, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0)) == RS_NOTFOUND); Handle handle;
if (R_SUCCEEDED(FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0)))
{
FSFILE_Close(handle);
FSUSER_DeleteFile(archive, fsMakePath(PATH_ASCII, path));
}
FSUSER_CreateFile(archive, fsMakePath(PATH_ASCII, path), 0, size);
} }

View File

@@ -17,24 +17,25 @@ Result single_install(theme theme_to_install)
u32 music_size; u32 music_size;
u32 savedata_size; u32 savedata_size;
savedata_size = file_to_buf(fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, savedata_buf); savedata_size = file_to_buf(fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, &savedata_buf);
savedata_buf[0x141b] = 0; savedata_buf[0x141b] = 0;
memset(&savedata_buf[0x13b8], 0, 8); memset(&savedata_buf[0x13b8], 0, 8);
savedata_buf[0x13bd] = 3; savedata_buf[0x13bd] = 3;
savedata_buf[0x13b8] = 0xff; savedata_buf[0x13b8] = 0xff;
Result res = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf); u32 size = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf);
printf("%li\n", res); printf("Savedata size: %lu\n", savedata_size);
printf("Return: %lx\n", size);
free(savedata_buf); free(savedata_buf);
// Open body cache file. Test if theme is zipped // Open body cache file. Test if theme is zipped
if (theme_to_install.is_zip) if (theme_to_install.is_zip)
{ {
body_size = zip_file_to_buf("body_LZ.bin", theme_to_install.path, body); body_size = zip_file_to_buf("body_LZ.bin", theme_to_install.path, &body);
} else { } else {
u16 path[0x106] = {0}; u16 path[0x106] = {0};
memcpy(path, theme_to_install.path, 0x106 * sizeof(u16)); memcpy(path, theme_to_install.path, 0x106 * sizeof(u16));
struacat(path, "/body_lz.bin"); struacat(path, "/body_lz.bin");
body_size = file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, body); body_size = file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, &body);
} }
if (body_size == 0) if (body_size == 0)
@@ -44,43 +45,41 @@ Result single_install(theme theme_to_install)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
} }
if (check_file_exists("/BodyCache.bin", ArchiveThemeExt)) FSUSER_DeleteFile(ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache.bin")); remake_file("/BodyCache.bin", ArchiveThemeExt, 0x150000);
FSUSER_CreateFile(ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache.bin"), 0, body_size);
u32 size = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file size = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file
free(body); free(body);
if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
if (theme_to_install.is_zip) // Same as above but this time with bgm if (theme_to_install.is_zip) // Same as above but this time with bgm
{ {
music_size = zip_file_to_buf("bgm.bcstm", theme_to_install.path, music); music_size = zip_file_to_buf("bgm.bcstm", theme_to_install.path, &music);
} else { } else {
u16 path[0x106] = {0}; u16 path[0x106] = {0};
memcpy(path, theme_to_install.path, 0x106 * sizeof(16)); memcpy(path, theme_to_install.path, 0x106 * sizeof(16));
struacat(path, "/bgm.bcstm"); struacat(path, "/bgm.bcstm");
music_size = file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, music); music_size = file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, &music);
} }
if (music_size == 0) if (music_size == 0)
{ {
free(music); free(music);
music = calloc(1, 3371008); music = calloc(1, 3371008);
} else if (size > 3371008) { } else if (music_size > 3371008) {
free(music); free(music);
puts("musicrip"); puts("musicrip");
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
} }
if (check_file_exists("/BgmCache.bin", ArchiveThemeExt)) FSUSER_DeleteFile(ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BgmCache.bin")); remake_file("/BgmCache.bin", ArchiveThemeExt, 3371008);
FSUSER_CreateFile(ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BgmCache.bin"), 0, music_size);
size = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music); size = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music);
free(music); free(music);
if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, thememanage_buf); file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
thememanage_buf[0x00] = 1; thememanage_buf[0x00] = 1;
thememanage_buf[0x01] = 0; thememanage_buf[0x01] = 0;
thememanage_buf[0x02] = 0; thememanage_buf[0x02] = 0;
@@ -104,7 +103,7 @@ Result single_install(theme theme_to_install)
memset(&thememanage_buf[0x340], 0, 4); memset(&thememanage_buf[0x340], 0, 4);
memset(&thememanage_buf[0x360], 0, 4); memset(&thememanage_buf[0x360], 0, 4);
memset(&thememanage_buf[0x368], 0, 4); memset(&thememanage_buf[0x368], 0, 4);
buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf); size = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf);
free(thememanage_buf); free(thememanage_buf);
return 0; return 0;