version 3.2.2

- legacy fix for global sections save/load memory out of bounds access
- fixed delay index fuckup during export when skipping instruments with delay mode "note sync"
This commit is contained in:
Dominik Ries
2018-10-28 22:18:13 +01:00
parent d1f776b473
commit 7d758d6d66
5 changed files with 10 additions and 10 deletions

Binary file not shown.

Binary file not shown.

View File

@ -488,6 +488,7 @@ void Go4kVSTi_UpdateDelayTimes()
int delay; int delay;
if (v->synctype == 2) if (v->synctype == 2)
{ {
(&go4k_delay_times)[delayindex] = 0; // added for debug. doesnt hurt though
v->delay = 0; v->delay = 0;
v->count = 1; v->count = 1;
} }
@ -1439,7 +1440,9 @@ void Go4kVSTi_LoadInstrument(char* filename, char channel)
else else
{ {
Go4kVSTi_ResetGlobal(); Go4kVSTi_ResetGlobal();
fread(SynthObj.InstrumentNames[channel], 1, 64, file); // read the instrument name in a dummy buffer, as global section doesnt have an own name
BYTE dummyNameBuf[64];
fread(dummyNameBuf, 1, 64, file);
if (version13) if (version13)
{ {
BYTE dummyBuf[16]; BYTE dummyBuf[16];
@ -1548,7 +1551,8 @@ void Go4kVSTi_SaveInstrument(char* filename, char channel)
} }
else else
{ {
fwrite(SynthObj.InstrumentNames[channel], 1, 64, file); // write a dummy name for global section as it doesnt have an own name
fwrite("GlobalUnitsStoredAs.4ki ", 1, 64, file);
fwrite(SynthObj.GlobalValues, 1, MAX_UNITS*MAX_UNIT_SLOTS, file); fwrite(SynthObj.GlobalValues, 1, MAX_UNITS*MAX_UNIT_SLOTS, file);
} }
fclose(file); fclose(file);
@ -2127,12 +2131,8 @@ void Go4kVSTi_SaveByteStream(HINSTANCE hInst, char* filename, int useenvlevels,
{ {
if (!v->reverb) if (!v->reverb)
{ {
// if not notesync // just push a dummy index
if (v->synctype != 2) delay_indices.push_back(-1);
{
// just push a dummy index
delay_indices.push_back(-1);
}
} }
} }
if (v->id == M_GLITCH) if (v->id == M_GLITCH)

View File

@ -37,7 +37,7 @@ IDR_ASM_RES BINARY "4klang.bin"
IDD_GO4KVSTIDIALOG DIALOGEX 0, 0, 594, 341 IDD_GO4KVSTIDIALOG DIALOGEX 0, 0, 594, 341
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Alcatraz - 4klang Synth Plugin - Version 3.2.1" CAPTION "Alcatraz - 4klang Synth Plugin - Version 3.2.2"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
PUSHBUTTON "Load Patch Data",IDC_LOAD_PATCH,13,13,70,14 PUSHBUTTON "Load Patch Data",IDC_LOAD_PATCH,13,13,70,14

View File

@ -36,7 +36,7 @@ IDR_ASM_RES BINARY "4klang.bin"
IDD_GO4KVSTIDIALOG DIALOGEX 0, 0, 594, 341 IDD_GO4KVSTIDIALOG DIALOGEX 0, 0, 594, 341
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Alcatraz - 8klang Synth Plugin (4klang addon) - Version 3.2.1" CAPTION "Alcatraz - 8klang Synth Plugin (4klang addon) - Version 3.2.2"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
PUSHBUTTON "Load Patch Data",IDC_LOAD_PATCH,13,13,70,14 PUSHBUTTON "Load Patch Data",IDC_LOAD_PATCH,13,13,70,14