mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 21:02:18 -05:00
Code Issues Projects Releases Wiki Activity

Fixed StormLib Forward Slash BackSlash issues

Browse Source
This commit is contained in:
Nicholas Estelami 2022-06-14 18:56:17 -04:00
parent aeaaa54e0d
commit 960a29e513
7 changed files with 104 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
StormLib/src/SBaseCommon.cpp
View File

@ -52,7 +52,7 @@ unsigned char AsciiToLowerTable[256] =
}; };
// Converts ASCII characters to uppercase // Converts ASCII characters to uppercase
// Converts backslash (0x5C) to backslash (0x2F) // Converts slash (0x2F) to backslash (0x5C)
unsigned char AsciiToUpperTable[256] = unsigned char AsciiToUpperTable[256] =
{ {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
@ -95,6 +95,49 @@ unsigned char AsciiToUpperTable_Slash[256] =
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
}; };
// 5C (\) -> 2F (/)
unsigned char AsciiToUpperTable_FS2BS[256] =
{
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x2F, 0x5D, 0x5E, 0x5F,
0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
};
// 2F (/) -> 5C (\)
unsigned char AsciiToUpperTable_BS2FS[256] =
{
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x5C,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
};
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Safe string functions (for ANSI builds) // Safe string functions (for ANSI builds)
@ -303,8 +346,29 @@ DWORD HashStringSlash(const char * szFileName, DWORD dwHashType)
{ {
// Convert the input character to uppercase // Convert the input character to uppercase
// DON'T convert slash (0x2F) to backslash (0x5C) // DON'T convert slash (0x2F) to backslash (0x5C)
//ch = AsciiToUpperTable_Slash[*pbKey++]; ch = AsciiToUpperTable_FS2BS[*pbKey++];
ch = AsciiToUpperTable[*pbKey++]; //ch = AsciiToUpperTable[*pbKey++];
dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
}
return dwSeed1;
}
DWORD HashStringSlash2(const char* szFileName, DWORD dwHashType)
{
LPBYTE pbKey = (BYTE*)szFileName;
DWORD dwSeed1 = 0x7FED7FED;
DWORD dwSeed2 = 0xEEEEEEEE;
DWORD ch;
while (*pbKey != 0)
{
// Convert the input character to uppercase
// DON'T convert slash (0x2F) to backslash (0x5C)
//ch = AsciiToUpperTable_Slash[*pbKey++];
ch = AsciiToUpperTable_BS2FS[*pbKey++];
dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2); dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3; dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
@ -783,9 +847,13 @@ TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName)
{ {
DWORD dwHashIndexMask = HASH_INDEX_MASK(ha); DWORD dwHashIndexMask = HASH_INDEX_MASK(ha);
DWORD dwStartIndex = ha->pfnHashString(szFileName, MPQ_HASH_TABLE_INDEX); DWORD dwStartIndex = ha->pfnHashString(szFileName, MPQ_HASH_TABLE_INDEX);
DWORD dwStartIndex2 = HashStringSlash2(szFileName, MPQ_HASH_TABLE_INDEX);
DWORD dwName1 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_A); DWORD dwName1 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_A);
DWORD dwName2 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_B); DWORD dwName2 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_B);
DWORD dwName1B = HashStringSlash2(szFileName, MPQ_HASH_NAME_A);
DWORD dwName2B = HashStringSlash2(szFileName, MPQ_HASH_NAME_B);
DWORD dwIndex; DWORD dwIndex;
bool isSecondTry = false;
// Set the initial index // Set the initial index
dwStartIndex = dwIndex = (dwStartIndex & dwHashIndexMask); dwStartIndex = dwIndex = (dwStartIndex & dwHashIndexMask);
@ -796,12 +864,22 @@ TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName)
TMPQHash * pHash = ha->pHashTable + dwIndex; TMPQHash * pHash = ha->pHashTable + dwIndex;
// If the entry matches, we found it. // If the entry matches, we found it.
if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && MPQ_BLOCK_INDEX(pHash) < ha->dwFileTableSize) if ((pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 || (pHash->dwName1 == dwName1B && pHash->dwName2 == dwName2B)) && MPQ_BLOCK_INDEX(pHash) < ha->dwFileTableSize)
return pHash; return pHash;
// If that hash entry is a free entry, it means we haven't found the file // If that hash entry is a free entry, it means we haven't found the file
if(pHash->dwBlockIndex == HASH_ENTRY_FREE) if (pHash->dwBlockIndex == HASH_ENTRY_FREE)
return NULL; {
// We've tried back slashes, now let's try forward slashes
if (!isSecondTry)
{
dwStartIndex = dwIndex = (dwStartIndex2 & dwHashIndexMask);
isSecondTry = true;
continue;
}
else
return NULL;
}
// Move to the next hash entry. Stop searching // Move to the next hash entry. Stop searching
// if we got reached the original hash entry // if we got reached the original hash entry

5
StormLib/src/SFileListFile.cpp
View File

@ -340,8 +340,9 @@ static LPBYTE CreateListFile(TMPQArchive * ha, DWORD * pcbListFile)
{ {
for (int i = 0; i < strlen(pFileEntry->szFileName); i++) for (int i = 0; i < strlen(pFileEntry->szFileName); i++)
{ {
if (pFileEntry->szFileName[i] == '/') // OTRTODO
pFileEntry->szFileName[i] = '\\'; //if (pFileEntry->szFileName[i] == '/')
//pFileEntry->szFileName[i] = '\\';
} }
SortTable[nFileNodes++] = pFileEntry->szFileName; SortTable[nFileNodes++] = pFileEntry->szFileName;

3
StormLib/src/StormCommon.h
View File

@ -209,7 +209,8 @@ void StringCat(TCHAR * szTarget, size_t cchTargetMax, const TCHAR * szSource);
#define MPQ_HASH_KEY2_MIX 0x400 #define MPQ_HASH_KEY2_MIX 0x400
DWORD HashString(const char * szFileName, DWORD dwHashType); DWORD HashString(const char * szFileName, DWORD dwHashType);
DWORD HashStringSlash(const char * szFileName, DWORD dwHashType); DWORD HashStringSlash(const char* szFileName, DWORD dwHashType);
DWORD HashStringSlash2(const char * szFileName, DWORD dwHashType);
DWORD HashStringLower(const char * szFileName, DWORD dwHashType); DWORD HashStringLower(const char * szFileName, DWORD dwHashType);
void InitializeMpqCryptography(); void InitializeMpqCryptography();

10
libultraship/libultraship/Archive.cpp
View File

@ -61,11 +61,11 @@ namespace Ship {
bool attempt = SFileOpenFileEx(mainMPQ, filePath.c_str(), 0, &fileHandle); bool attempt = SFileOpenFileEx(mainMPQ, filePath.c_str(), 0, &fileHandle);
/*if (!attempt) //if (!attempt)
{ //{
std::string filePathAlt = StringHelper::Replace(filePath, "/", "\\"); //std::string filePathAlt = StringHelper::Replace(filePath, "/", "\\");
attempt |= SFileOpenFileEx(mainMPQ, filePathAlt.c_str(), 0, &fileHandle); //attempt |= SFileOpenFileEx(mainMPQ, filePathAlt.c_str(), 0, &fileHandle);
}*/ //}
if (!attempt) { if (!attempt) {
printf("({%i}) Failed to open file {%s} from mpq archive {%s}", GetLastError(), filePath.c_str(), MainPath.c_str()); printf("({%i}) Failed to open file {%s} from mpq archive {%s}", GetLastError(), filePath.c_str(), MainPath.c_str());

2
libultraship/libultraship/SDLAudioPlayer.cpp
View File

@ -29,7 +29,7 @@ namespace Ship {
} }
int SDLAudioPlayer::GetDesiredBuffered(void) { int SDLAudioPlayer::GetDesiredBuffered(void) {
return 1680; return 2480;
} }
void SDLAudioPlayer::Play(const uint8_t* Buffer, uint32_t BufferLen) { void SDLAudioPlayer::Play(const uint8_t* Buffer, uint32_t BufferLen) {

2
libultraship/libultraship/WasapiAudioPlayer.cpp
View File

@ -81,7 +81,7 @@ namespace Ship {
} }
int WasapiAudioPlayer::GetDesiredBuffered(void) { int WasapiAudioPlayer::GetDesiredBuffered(void) {
return 1680; return 2480;
} }
void WasapiAudioPlayer::Play(const uint8_t* Buffer, uint32_t BufferLen) { void WasapiAudioPlayer::Play(const uint8_t* Buffer, uint32_t BufferLen) {

13
soh/src/code/audio_load.c
View File

@ -897,8 +897,8 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
Drum* drum; Drum* drum;
SoundFontSound* sfx; SoundFontSound* sfx;
s32 i; s32 i;
SoundFont* sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]); SoundFont* sf = NULL;
s32 numDrums = 0; s32 numDrums = 0;
s32 numInstruments = 0; s32 numInstruments = 0;
s32 numSfx = 0; s32 numSfx = 0;
@ -908,6 +908,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
numInstruments = gAudioContext.soundFonts[fontId].numInstruments; numInstruments = gAudioContext.soundFonts[fontId].numInstruments;
numSfx = gAudioContext.soundFonts[fontId].numSfx; numSfx = gAudioContext.soundFonts[fontId].numSfx;
} else { } else {
sf = ResourceMgr_LoadAudioSoundFont(fontMap[fontId]);
numDrums = sf->numDrums; numDrums = sf->numDrums;
numInstruments = sf->numInstruments; numInstruments = sf->numInstruments;
numSfx = sf->numSfx; numSfx = sf->numSfx;
@ -1436,7 +1437,10 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
if (gUseLegacySD) if (gUseLegacySD)
numFonts = gAudioContext.soundFontTable->numEntries; numFonts = gAudioContext.soundFontTable->numEntries;
if (gUseLegacySD) { if (gUseLegacySD)
{
gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.audioInitPool, numFonts * sizeof(SoundFont));
for (i = 0; i < numFonts; i++) { for (i = 0; i < numFonts; i++) {
AudioLoad_InitSoundFontMeta(i); AudioLoad_InitSoundFontMeta(i);
} }
@ -1474,11 +1478,10 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
numFonts = fntListSize; numFonts = fntListSize;
free(fntList); free(fntList);
gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.audioInitPool, numFonts * sizeof(SoundFont));
int bp = 0;
} }
gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.audioInitPool, numFonts * sizeof(SoundFont));
if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) { if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) {
// cast away const from D_8014A6C4 // cast away const from D_8014A6C4