From 5b1afdbf37c205067434f9cc9aeb249112d349d8 Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 24 Sep 2023 19:47:16 -0700 Subject: [PATCH] fixes for rbox 6.7.5 --- Launcher/Config.h | 2 +- Launcher/Versions.cpp | 1 + Module/Config.cpp | 1 + Module/Config.h | 1 + Module/LoadFileHook.cpp | 3 ++- Module/RowDataTrack.cpp | 3 ++- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Launcher/Config.h b/Launcher/Config.h index 3b68536..88d0bd2 100644 --- a/Launcher/Config.h +++ b/Launcher/Config.h @@ -6,7 +6,7 @@ #include // The current version of RBSE -#define RBSE_VERSION "3.8.1" +#define RBSE_VERSION "3.8.2" // maximum length of output file names #define MAX_OUTFILE_NAME_LEN 64 // maximum length of output formats diff --git a/Launcher/Versions.cpp b/Launcher/Versions.cpp index 4993b57..8284432 100644 --- a/Launcher/Versions.cpp +++ b/Launcher/Versions.cpp @@ -5,6 +5,7 @@ using namespace std; // list of supported versions version_path versions[] = { // Friendly name Default installation path + { "Rekordbox 6.7.5", "C:\\Program Files\\Pioneer\\rekordbox 6.7.5\\rekordbox.exe" }, { "Rekordbox 6.7.0", "C:\\Program Files\\Pioneer\\rekordbox 6.7.0\\rekordbox.exe" }, { "Rekordbox 6.6.11", "C:\\Program Files\\Pioneer\\rekordbox 6.6.11\\rekordbox.exe" }, { "Rekordbox 6.6.10", "C:\\Program Files\\Pioneer\\rekordbox 6.6.10\\rekordbox.exe" }, diff --git a/Module/Config.cpp b/Module/Config.cpp index b32a7bb..9530b23 100644 --- a/Module/Config.cpp +++ b/Module/Config.cpp @@ -30,6 +30,7 @@ const char *rbver_strings[RBVER_COUNT] = { "6.6.10", // RBVER_6610 "6.6.11", // RBVER_6611 "6.7.0", // RBVER_670 + "6.7.5", // RBVER_675 }; // global config object diff --git a/Module/Config.h b/Module/Config.h index 2033b68..941f8df 100644 --- a/Module/Config.h +++ b/Module/Config.h @@ -33,6 +33,7 @@ typedef enum rbox_version_enum RBVER_6610, // 6.6.10 RBVER_6611, // 6.6.11 RBVER_670, // 6.7.0 + RBVER_675, // 6.7.5 RBVER_COUNT // the number of versions supported } rbox_version_t; diff --git a/Module/LoadFileHook.cpp b/Module/LoadFileHook.cpp index baa909b..2f1bf77 100644 --- a/Module/LoadFileHook.cpp +++ b/Module/LoadFileHook.cpp @@ -74,13 +74,14 @@ bool hook_load_file() // and the number of bytes to copy out into a trampoline uintptr_t lf_addr = 0; switch (config.version) { - default: // Unfortunately after 6.6.4 this changed and I don't want to go back and do older verisons case RBVER_664: case RBVER_6610: case RBVER_6611: lf_addr = sig_scan(EVENT_LOAD_FILE_SIG); break; + default: // Unfortunately after 6.6.4 this changed and I don't want to go back and do older verisons case RBVER_670: + case RBVER_675: lf_addr = sig_scan(EVENT_LOAD_FILE_SIG_670); break; }; diff --git a/Module/RowDataTrack.cpp b/Module/RowDataTrack.cpp index 68c3f31..9bf119e 100644 --- a/Module/RowDataTrack.cpp +++ b/Module/RowDataTrack.cpp @@ -138,7 +138,8 @@ static row_data *new_row_data() case RBVER_653: case RBVER_661: default: // RBVER_661+ just guess - rowdata = calloc(1, 0x488); + // this used to be 0x488 but it was crashing so I upped it to 0x512, should be enough + rowdata = calloc(1, 0x512); break; } return (row_data *)rowdata;