From 01789c0781796f9764978aa841d96b4f673a2300 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Thu, 28 Aug 2014 14:05:56 -0600 Subject: [PATCH 1/4] 0x00401000 --- src/audio.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/audio.h | 96 ++++++++++++++++++++++++++++ 2 files changed, 275 insertions(+), 1 deletion(-) diff --git a/src/audio.c b/src/audio.c index 6fe7726f63..0299246ac7 100644 --- a/src/audio.c +++ b/src/audio.c @@ -344,7 +344,185 @@ int map_sound_info(const char* filename) */ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2, int channel) { - RCT2_CALLFUNC_6(0x00401000, void, UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR, int, uTimerID, uMsg, dwUser, dw1, dw2, channel); + //RCT2_CALLFUNC_6(0x00401000, void, UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR, int, uTimerID, uMsg, dwUser, dw1, dw2, channel); + rct_sound_unknown* unknown = &RCT2_ADDRESS(0x014262E0, rct_sound_unknown)[channel]; + DWORD status; + DWORD dwCurrentPlayCursor; + DWORD dwCurrentWriteCursor; + int var1; + int var2; + int bufferlost = 0; + char* buf1; + int buf1size; + char* buf2; + int buf2size; + unknown->dsbuffer->lpVtbl->GetStatus(unknown->dsbuffer, &status); + if (status & DSBSTATUS_BUFFERLOST) { + if (FAILED(unknown->dsbuffer->lpVtbl->Restore(unknown->dsbuffer))) { + return; + } + unknown->playpos = 0; + bufferlost = 1; + } + unknown->dsbuffer->lpVtbl->GetCurrentPosition(unknown->dsbuffer, &dwCurrentPlayCursor, &dwCurrentWriteCursor); + if (dwCurrentPlayCursor != unknown->playpos || bufferlost) { + if (unknown->var_168 && !unknown->var_15C) { + if (!unknown->var_160) { + unknown->var_160 = 1; + if (!unknown->var_4) { + LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel]; + unknown->var_0 = 0; + if (dsbuffer) { + dsbuffer->lpVtbl->Stop(dsbuffer); + dsbuffer->lpVtbl->Release(dsbuffer); + RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel] = 0; + } + if (unknown->var_120) { + sound_channel_free(&unknown->var_120, &unknown->var_11C); + } + } + } + return; + } + if (dwCurrentPlayCursor >= unknown->playpos) { + var1 = dwCurrentPlayCursor - unknown->playpos; + } else { + var1 = dwCurrentPlayCursor + unknown->var_150 - unknown->playpos; + } + if (bufferlost) { + var2 = 2 * unknown->var_150 / 6; + } else { + var2 = var1; + } + unknown->var_158 += var1; + if (unknown->var_168) { + int var3 = unknown->var_15C; + int* var4 = &unknown->var_15C; + if (var3) { + if (var1 <= var3) { + *var4 = var3 - var1; + } else { + *var4 = 0; + } + if (SUCCEEDED(unknown->dsbuffer->lpVtbl->Lock(unknown->dsbuffer, unknown->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { + char var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + var5 &= 0x80; + memset(buf1, var5 + 128, buf1size); + if (buf2 && buf2size) { + char var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + var5 &= 0x80; + memset(buf2, var5 + 128, buf2size); + } + unknown->dsbuffer->lpVtbl->Unlock(unknown->dsbuffer, buf1, buf1size, buf2, buf2size); + unknown->playpos += var2; + if( unknown->playpos >= unknown->var_150) { + unknown->playpos = unknown->playpos - unknown->var_150; + } + return; + } + // TimeFunc() could not lock DirectSoundBuffer + return; + } + } + if (FAILED(unknown->dsbuffer->lpVtbl->Lock(unknown->dsbuffer, unknown->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { + // TimeFunc() could not lock DirectSoundBuffer + return; + } + if (buf1size) { + if (unknown->var_160) { + int var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + var5 &= 0x80; + memset(buf1, var5 + 128, buf1size); + goto label49; + } + } + int var7; + RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, buf1size, buf1, &unknown->var_124, &var7); + if (var7 < buf1size) { + if (!unknown->var_164) { + int s = *(char*)((char*)unknown->var_11C + 14); + int t = buf1size - var7; + int v; + if (s == 8) { + v = 128; + } else { + if (s != 16) { + goto label42; + } + v = 0; + } + memset(&buf1[var7], v, t); + label42: + unknown->var_168 = 1; + if (dwCurrentPlayCursor <= unknown->playpos) { + unknown->var_15C = unknown->playpos - dwCurrentPlayCursor; + } else { + unknown->var_15C = unknown->playpos + unknown->var_150 - dwCurrentPlayCursor; + } + goto label49; + } + char* v21 = buf1; + int v38 = buf1size; + do { + v38 -= var7; + v21 += var7; + RCT2_CALLFUNC_1(0x0040153B, int, int, channel); + RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, v38, v21, &unknown->var_124, &var7); + } while(var7 < v38); + } + label49: + if (buf2size == 0 || unknown->var_160 != 0) { + if(buf2 != 0 && buf2size != 0 && unknown->var_160 != 0) { + int var5 = -(*(char*)((char*)unknown->var_11C + 14) != 8); + var5 &= 0x80; + memset(buf2, var5 + 128, buf2size); + } + goto label68; + } + RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, buf2size, buf2, &unknown->var_124, &var7); + if (var7 >= buf2size) { + label68: + unknown->dsbuffer->lpVtbl->Unlock(unknown->dsbuffer, buf1, buf1size, buf2, buf2size); + unknown->playpos += var2; + if( unknown->playpos >= unknown->var_150 ) { + unknown->playpos -= unknown->var_150; + } + if (bufferlost != 0) { + unknown->dsbuffer->lpVtbl->Play(unknown->dsbuffer, 0, 0, DSBPLAY_LOOPING); + } + return; + } + if (unknown->var_164 != 0) { + char* v26 = buf2; + int v27 = buf2size; + do { + v26 += var7; + v27 -= var7; + RCT2_CALLFUNC_1(0x0040153B, int, int, channel); + RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, v27, v26, &unknown->var_124, &var7); + } while(var7 < v27); + goto label68; + } + int s = buf2size - var7; + int v; + if (unknown->var_11C == (HGLOBAL)8) { + v = 128; + } else { + if (unknown->var_11C != (HGLOBAL)16) { + goto label58; + } + v = 0; + } + memset(&buf2[var7], v, s); + label58: + unknown->var_168 = 1; + if (dwCurrentPlayCursor <= unknown->playpos) { + unknown->var_15C = unknown->playpos - dwCurrentPlayCursor; + } else { + unknown->var_15C = unknown->playpos + unknown->var_150 - dwCurrentPlayCursor; + } + goto label68; + } } /** diff --git a/src/audio.h b/src/audio.h index 85aba58db8..b630ba92ce 100644 --- a/src/audio.h +++ b/src/audio.h @@ -100,6 +100,101 @@ typedef struct { rct_sound sound; } rct_other_sound; +typedef struct { + uint32 var_0; + uint32 var_4; + uint32 var_8; + uint16 var_C; + uint16 var_E; + uint32 var_10; + uint32 var_14; + uint32 var_18; + uint32 var_1C; + uint32 var_20; + uint32 var_24; + uint32 var_28; + uint32 var_2C; + uint32 var_30; + uint32 var_34; + uint32 var_38; + uint32 var_3C; + uint32 var_40; + uint32 var_44; + uint32 var_48; + uint32 var_4C; + uint32 var_50; + uint32 var_54; + uint32 var_58; + uint32 var_5C; + uint32 var_60; + uint32 var_64; + uint32 var_68; + uint32 var_6C; + uint32 var_70; + uint32 var_74; + uint32 var_78; + uint32 var_7C; + uint32 var_80; + uint32 var_84; + uint32 var_88; + uint32 var_8C; + uint32 var_90; + uint32 var_94; + uint32 var_98; + uint32 var_9C; + uint32 var_A0; + uint32 var_A4; + uint32 var_A8; + uint32 var_AC; + uint32 var_B0; + uint32 var_B4; + uint32 var_B8; + uint32 var_BC; + uint32 var_C0; + uint32 var_C4; + uint32 var_C8; + uint32 var_CC; + uint32 var_D0; + uint32 var_D4; + uint32 var_D8; + uint32 var_DC; + uint32 var_E0; + uint32 var_E4; + uint32 var_E8; + uint32 var_EC; + uint32 var_F0; + uint32 var_F4; + uint32 var_F8; + uint32 var_FC; + uint32 var_100; + uint32 var_104; + uint32 var_108; + uint32 var_10C; + uint32 var_110; + uint32 var_114; + uint32 var_118; + HGLOBAL var_11C; + HMMIO var_120; + uint32 var_124; + uint32 var_128; + uint32 var_12C; + uint32 var_130; + uint32 var_134; + uint32 var_138; + uint32 var_13C; + uint32 var_140; + uint32 var_144; + uint32 var_148; + LPDIRECTSOUNDBUFFER dsbuffer; // 0x14C + uint32 var_150; + uint32 playpos; // 0x154 + uint32 var_158; + uint32 var_15C; + uint32 var_160; + uint32 var_164; + uint32 var_168; +} rct_sound_unknown; + int get_dsound_devices(); int sound_prepare(int sound_id, rct_sound *sound, int channels, int software); int sound_play_panned(int sound_id, int x); @@ -112,6 +207,7 @@ int sound_channel_play(int channel, int a2, int volume, int pan, int frequency); int sound_channel_set_frequency(int channel, int frequency); int sound_channel_set_pan(int channel, int pan); int sound_channel_set_volume(int channel, int volume); +void sound_channel_free(HMMIO* hmmio, HGLOBAL* hmem); int sound_stop(rct_sound *sound); int sound_stop_all(); int unmap_file(LPCVOID base); From 5c44a07aac9d1f985c74813ec66fc4a72d34df2e Mon Sep 17 00:00:00 2001 From: zsilencer Date: Thu, 28 Aug 2014 17:36:52 -0600 Subject: [PATCH 2/4] sub_405383 --- src/audio.c | 177 +++++++++++++++++++++++++++++++++++----------------- src/audio.h | 113 +++++---------------------------- 2 files changed, 134 insertions(+), 156 deletions(-) diff --git a/src/audio.c b/src/audio.c index 0299246ac7..2683c80652 100644 --- a/src/audio.c +++ b/src/audio.c @@ -338,14 +338,77 @@ int map_sound_info(const char* filename) } } +/** +* +* rct2: 0x00405383 +*/ +MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, uint32* a4, int* read) +{ + MMIOINFO mmioinfo; + MMRESULT result; + result = mmioGetInfo(hmmio, &mmioinfo, 0); + if (result != 0) { + *read = 0; + return 1; + } + int size2 = size; + if (size > a4[1]) { + size2 = a4[1]; + } + int v8 = 0; + a4[1] -= size2; + if (size2) { + while (1) { + HPSTR p = mmioinfo.pchEndRead; + if (mmioinfo.pchNext == mmioinfo.pchEndRead) { + result = mmioAdvance(hmmio, &mmioinfo, 0); + if (result != 0) { + *read = 0; + return result; + } + p = mmioinfo.pchEndRead; + if (mmioinfo.pchNext == mmioinfo.pchEndRead) { + break; + } + } + int q = p - mmioinfo.pchNext; + if (size2 - v8 < p - mmioinfo.pchNext) { + q = size2 - v8; + } + memcpy(&buffer[v8], mmioinfo.pchNext, q); + mmioinfo.pchNext += q; + v8 += q; + if (v8 >= size2) { + result = mmioSetInfo(hmmio, &mmioinfo, 0); + if (result != 0) { + *read = 0; + return result; + } else { + *read = size2; + return result; + } + } + } + *read = 0; + return 57603; + } + result = mmioSetInfo(hmmio, &mmioinfo, 0); + if (result != 0) { + *read = 0; + return result; + } else { + *read = size2; + return result; + } +} + /** * * rct2: 0x00401000 */ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2, int channel) { - //RCT2_CALLFUNC_6(0x00401000, void, UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR, int, uTimerID, uMsg, dwUser, dw1, dw2, channel); - rct_sound_unknown* unknown = &RCT2_ADDRESS(0x014262E0, rct_sound_unknown)[channel]; + rct_sound_channel* soundchannel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; DWORD status; DWORD dwCurrentPlayCursor; DWORD dwCurrentWriteCursor; @@ -356,67 +419,67 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD int buf1size; char* buf2; int buf2size; - unknown->dsbuffer->lpVtbl->GetStatus(unknown->dsbuffer, &status); + soundchannel->dsbuffer->lpVtbl->GetStatus(soundchannel->dsbuffer, &status); if (status & DSBSTATUS_BUFFERLOST) { - if (FAILED(unknown->dsbuffer->lpVtbl->Restore(unknown->dsbuffer))) { + if (FAILED(soundchannel->dsbuffer->lpVtbl->Restore(soundchannel->dsbuffer))) { return; } - unknown->playpos = 0; + soundchannel->playpos = 0; bufferlost = 1; } - unknown->dsbuffer->lpVtbl->GetCurrentPosition(unknown->dsbuffer, &dwCurrentPlayCursor, &dwCurrentWriteCursor); - if (dwCurrentPlayCursor != unknown->playpos || bufferlost) { - if (unknown->var_168 && !unknown->var_15C) { - if (!unknown->var_160) { - unknown->var_160 = 1; - if (!unknown->var_4) { + soundchannel->dsbuffer->lpVtbl->GetCurrentPosition(soundchannel->dsbuffer, &dwCurrentPlayCursor, &dwCurrentWriteCursor); + if (dwCurrentPlayCursor != soundchannel->playpos || bufferlost) { + if (soundchannel->var_168 && !soundchannel->var_15C) { + if (!soundchannel->var_160) { + soundchannel->var_160 = 1; + if (!soundchannel->var_4) { LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel]; - unknown->var_0 = 0; + soundchannel->var_0 = 0; if (dsbuffer) { dsbuffer->lpVtbl->Stop(dsbuffer); dsbuffer->lpVtbl->Release(dsbuffer); RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel] = 0; } - if (unknown->var_120) { - sound_channel_free(&unknown->var_120, &unknown->var_11C); + if (soundchannel->hmmio) { + sound_channel_free(&soundchannel->hmmio, &soundchannel->hmem); } } } return; } - if (dwCurrentPlayCursor >= unknown->playpos) { - var1 = dwCurrentPlayCursor - unknown->playpos; + if (dwCurrentPlayCursor >= soundchannel->playpos) { + var1 = dwCurrentPlayCursor - soundchannel->playpos; } else { - var1 = dwCurrentPlayCursor + unknown->var_150 - unknown->playpos; + var1 = dwCurrentPlayCursor + soundchannel->var_150 - soundchannel->playpos; } if (bufferlost) { - var2 = 2 * unknown->var_150 / 6; + var2 = 2 * soundchannel->var_150 / 6; } else { var2 = var1; } - unknown->var_158 += var1; - if (unknown->var_168) { - int var3 = unknown->var_15C; - int* var4 = &unknown->var_15C; + soundchannel->var_158 += var1; + if (soundchannel->var_168) { + int var3 = soundchannel->var_15C; + int* var4 = &soundchannel->var_15C; if (var3) { if (var1 <= var3) { *var4 = var3 - var1; } else { *var4 = 0; } - if (SUCCEEDED(unknown->dsbuffer->lpVtbl->Lock(unknown->dsbuffer, unknown->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { - char var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + if (SUCCEEDED(soundchannel->dsbuffer->lpVtbl->Lock(soundchannel->dsbuffer, soundchannel->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { + uint16 var5 = -(soundchannel->var_128 != 8); var5 &= 0x80; memset(buf1, var5 + 128, buf1size); if (buf2 && buf2size) { - char var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + uint16 var5 = -(soundchannel->var_128 != 8); var5 &= 0x80; memset(buf2, var5 + 128, buf2size); } - unknown->dsbuffer->lpVtbl->Unlock(unknown->dsbuffer, buf1, buf1size, buf2, buf2size); - unknown->playpos += var2; - if( unknown->playpos >= unknown->var_150) { - unknown->playpos = unknown->playpos - unknown->var_150; + soundchannel->dsbuffer->lpVtbl->Unlock(soundchannel->dsbuffer, buf1, buf1size, buf2, buf2size); + soundchannel->playpos += var2; + if( soundchannel->playpos >= soundchannel->var_150) { + soundchannel->playpos = soundchannel->playpos - soundchannel->var_150; } return; } @@ -424,23 +487,23 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD return; } } - if (FAILED(unknown->dsbuffer->lpVtbl->Lock(unknown->dsbuffer, unknown->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { + if (FAILED(soundchannel->dsbuffer->lpVtbl->Lock(soundchannel->dsbuffer, soundchannel->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { // TimeFunc() could not lock DirectSoundBuffer return; } if (buf1size) { - if (unknown->var_160) { - int var5 = -(((char*)unknown->var_11C + 14) != (char *)8); + if (soundchannel->var_160) { + uint16 var5 = -(soundchannel->var_128 != 8); var5 &= 0x80; memset(buf1, var5 + 128, buf1size); goto label49; } } int var7; - RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, buf1size, buf1, &unknown->var_124, &var7); + sub_405383(soundchannel->hmmio, buf1size, buf1, &soundchannel->var_124, &var7); if (var7 < buf1size) { - if (!unknown->var_164) { - int s = *(char*)((char*)unknown->var_11C + 14); + if (!soundchannel->var_164) { + int s = soundchannel->var_128; int t = buf1size - var7; int v; if (s == 8) { @@ -453,11 +516,11 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD } memset(&buf1[var7], v, t); label42: - unknown->var_168 = 1; - if (dwCurrentPlayCursor <= unknown->playpos) { - unknown->var_15C = unknown->playpos - dwCurrentPlayCursor; + soundchannel->var_168 = 1; + if (dwCurrentPlayCursor <= soundchannel->playpos) { + soundchannel->var_15C = soundchannel->playpos - dwCurrentPlayCursor; } else { - unknown->var_15C = unknown->playpos + unknown->var_150 - dwCurrentPlayCursor; + soundchannel->var_15C = soundchannel->playpos + soundchannel->var_150 - dwCurrentPlayCursor; } goto label49; } @@ -467,59 +530,59 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD v38 -= var7; v21 += var7; RCT2_CALLFUNC_1(0x0040153B, int, int, channel); - RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, v38, v21, &unknown->var_124, &var7); + sub_405383(soundchannel->hmmio, v38, v21, &soundchannel->var_124, &var7); } while(var7 < v38); } label49: - if (buf2size == 0 || unknown->var_160 != 0) { - if(buf2 != 0 && buf2size != 0 && unknown->var_160 != 0) { - int var5 = -(*(char*)((char*)unknown->var_11C + 14) != 8); + if (buf2size == 0 || soundchannel->var_160 != 0) { + if(buf2 != 0 && buf2size != 0 && soundchannel->var_160 != 0) { + int var5 = -(soundchannel->var_128 != 8); var5 &= 0x80; memset(buf2, var5 + 128, buf2size); } goto label68; } - RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, buf2size, buf2, &unknown->var_124, &var7); + sub_405383(soundchannel->hmmio, buf2size, buf2, &soundchannel->var_124, &var7); if (var7 >= buf2size) { label68: - unknown->dsbuffer->lpVtbl->Unlock(unknown->dsbuffer, buf1, buf1size, buf2, buf2size); - unknown->playpos += var2; - if( unknown->playpos >= unknown->var_150 ) { - unknown->playpos -= unknown->var_150; + soundchannel->dsbuffer->lpVtbl->Unlock(soundchannel->dsbuffer, buf1, buf1size, buf2, buf2size); + soundchannel->playpos += var2; + if (soundchannel->playpos >= soundchannel->var_150) { + soundchannel->playpos -= soundchannel->var_150; } if (bufferlost != 0) { - unknown->dsbuffer->lpVtbl->Play(unknown->dsbuffer, 0, 0, DSBPLAY_LOOPING); + soundchannel->dsbuffer->lpVtbl->Play(soundchannel->dsbuffer, 0, 0, DSBPLAY_LOOPING); } return; } - if (unknown->var_164 != 0) { + if (soundchannel->var_164 != 0) { char* v26 = buf2; int v27 = buf2size; do { v26 += var7; v27 -= var7; RCT2_CALLFUNC_1(0x0040153B, int, int, channel); - RCT2_CALLFUNC_5(0x00405383, int, HMMIO, int, char*, int*, int*, unknown->var_120, v27, v26, &unknown->var_124, &var7); + sub_405383(soundchannel->hmmio, v27, v26, &soundchannel->var_124, &var7); } while(var7 < v27); goto label68; } int s = buf2size - var7; int v; - if (unknown->var_11C == (HGLOBAL)8) { + if (soundchannel->hmem == (HGLOBAL)8) { v = 128; } else { - if (unknown->var_11C != (HGLOBAL)16) { + if (soundchannel->hmem != (HGLOBAL)16) { goto label58; } v = 0; } memset(&buf2[var7], v, s); label58: - unknown->var_168 = 1; - if (dwCurrentPlayCursor <= unknown->playpos) { - unknown->var_15C = unknown->playpos - dwCurrentPlayCursor; + soundchannel->var_168 = 1; + if (dwCurrentPlayCursor <= soundchannel->playpos) { + soundchannel->var_15C = soundchannel->playpos - dwCurrentPlayCursor; } else { - unknown->var_15C = unknown->playpos + unknown->var_150 - dwCurrentPlayCursor; + soundchannel->var_15C = soundchannel->playpos + soundchannel->var_150 - dwCurrentPlayCursor; } goto label68; } diff --git a/src/audio.h b/src/audio.h index b630ba92ce..625e40591e 100644 --- a/src/audio.h +++ b/src/audio.h @@ -69,10 +69,20 @@ typedef struct { typedef struct { uint32 var_0; - uint8 pad_4[0x118]; - HMMIO hmmio; - HGLOBAL hmem; - uint8 pad_124[0x3C]; + uint32 var_4; + uint8 pad_8[0x114]; + HGLOBAL hmem; // 0x11C + HMMIO hmmio; // 0x120 + uint32 var_124; + uint32 var_128; + uint32 var_12C; + uint32 var_130; + uint8 pad_134[0x18]; + LPDIRECTSOUNDBUFFER dsbuffer; // 0x14C + uint32 var_150; + uint32 playpos; // 0x154 + uint32 var_158; + uint32 var_15C; uint32 var_160; uint32 var_164; uint32 var_168; @@ -100,101 +110,6 @@ typedef struct { rct_sound sound; } rct_other_sound; -typedef struct { - uint32 var_0; - uint32 var_4; - uint32 var_8; - uint16 var_C; - uint16 var_E; - uint32 var_10; - uint32 var_14; - uint32 var_18; - uint32 var_1C; - uint32 var_20; - uint32 var_24; - uint32 var_28; - uint32 var_2C; - uint32 var_30; - uint32 var_34; - uint32 var_38; - uint32 var_3C; - uint32 var_40; - uint32 var_44; - uint32 var_48; - uint32 var_4C; - uint32 var_50; - uint32 var_54; - uint32 var_58; - uint32 var_5C; - uint32 var_60; - uint32 var_64; - uint32 var_68; - uint32 var_6C; - uint32 var_70; - uint32 var_74; - uint32 var_78; - uint32 var_7C; - uint32 var_80; - uint32 var_84; - uint32 var_88; - uint32 var_8C; - uint32 var_90; - uint32 var_94; - uint32 var_98; - uint32 var_9C; - uint32 var_A0; - uint32 var_A4; - uint32 var_A8; - uint32 var_AC; - uint32 var_B0; - uint32 var_B4; - uint32 var_B8; - uint32 var_BC; - uint32 var_C0; - uint32 var_C4; - uint32 var_C8; - uint32 var_CC; - uint32 var_D0; - uint32 var_D4; - uint32 var_D8; - uint32 var_DC; - uint32 var_E0; - uint32 var_E4; - uint32 var_E8; - uint32 var_EC; - uint32 var_F0; - uint32 var_F4; - uint32 var_F8; - uint32 var_FC; - uint32 var_100; - uint32 var_104; - uint32 var_108; - uint32 var_10C; - uint32 var_110; - uint32 var_114; - uint32 var_118; - HGLOBAL var_11C; - HMMIO var_120; - uint32 var_124; - uint32 var_128; - uint32 var_12C; - uint32 var_130; - uint32 var_134; - uint32 var_138; - uint32 var_13C; - uint32 var_140; - uint32 var_144; - uint32 var_148; - LPDIRECTSOUNDBUFFER dsbuffer; // 0x14C - uint32 var_150; - uint32 playpos; // 0x154 - uint32 var_158; - uint32 var_15C; - uint32 var_160; - uint32 var_164; - uint32 var_168; -} rct_sound_unknown; - int get_dsound_devices(); int sound_prepare(int sound_id, rct_sound *sound, int channels, int software); int sound_play_panned(int sound_id, int x); From 0496312cab05c4c777ebf0194842d6d4e44ab269 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Thu, 28 Aug 2014 21:47:35 -0600 Subject: [PATCH 3/4] 0x0040153, 0x0040182 --- src/audio.c | 183 +++++++++++++++++++++++++++++++++++----------------- src/audio.h | 13 ++-- 2 files changed, 130 insertions(+), 66 deletions(-) diff --git a/src/audio.c b/src/audio.c index 7ebe1bb41d..b5d7adf004 100644 --- a/src/audio.c +++ b/src/audio.c @@ -187,6 +187,18 @@ int sound_load3dparameters() return 0; } +/** +* +* rct2: 0x00404F3F +*/ +int sound_load3dposition() +{ + if (SUCCEEDED(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER)->lpVtbl->GetPosition(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER), &RCT2_GLOBAL(0x009A6084, DS3DBUFFER), 1))) { + return 1; + } + return 0; +} + /** * * rct2: 0x00404932 @@ -240,7 +252,7 @@ int dsound_create_primary_buffer(int a, int device, int channels, int samples, i RCT2_GLOBAL(0x009A6084, DS3DBUFFER).vPosition.x = -1.0f; RCT2_GLOBAL(0x009A6084, DS3DBUFFER).flMaxDistance = 9.8999996f; RCT2_GLOBAL(0x009A6084, DS3DBUFFER).flMinDistance = 0.25f; - if (RCT2_CALLFUNC(0x00404F3F, int)) { + if (sound_load3dposition()) { if (SUCCEEDED(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER)->lpVtbl->SetMinDistance(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER), RCT2_GLOBAL(0x009A6084, DS3DBUFFER).flMinDistance, 1))) { if (sound_load3dparameters()) { return 1; @@ -402,13 +414,64 @@ MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, uint32* a4, int* rea } } +/** +* +* rct2: 0x00401822 +*/ +int sub_401822(int channel, HMMIO hmmio, LONG offset) +{ + rct_sound_channel* sound_channel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; + LPMMCKINFO v4 = &sound_channel->mmckinfo2; + HMMIO* v5 = &sound_channel->hmmio; + if (RCT2_CALLFUNC_4(0x00405222, int, HMMIO, HMMIO*, HGLOBAL*, LPMMCKINFO, hmmio, &sound_channel->hmmio, &sound_channel->hmem, &sound_channel->mmckinfo2)) { + return -100; + } + if (*(uint16*)sound_channel->hmem != 1) { + sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem); + return -101; + } + if (RCT2_CALLFUNC_4(0x00405465, int, HMMIO*, LPMMCKINFO, LPMMCKINFO, int, &sound_channel->hmmio, &sound_channel->mmckinfo1, &sound_channel->mmckinfo2, offset)) { + sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem); + return -103; + } + sound_channel->var_158 = offset; + return 0; +} + +/** +* +* rct2: 0x0040153B +*/ +int sub_40153B(int channel) +{ + rct_sound_channel* sound_channel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; + if (sound_channel->var_4) { + if (sound_channel->hmmio) { + sound_channel_free(sound_channel->hmmio, sound_channel->hmem); + } + if (sub_401822(channel, &sound_channel->var_8, sound_channel->var_110)) { + return 0; + } + sound_channel->var_164 = sound_channel->var_114; + sound_channel->var_118 = sound_channel->var_110; + sound_channel->var_4 = 0; + } else { + int result = RCT2_CALLFUNC_4(0x00405465, int, HMMIO*, LPMMCKINFO, LPMMCKINFO, int, &sound_channel->hmmio, &sound_channel->mmckinfo1, &sound_channel->mmckinfo2, sound_channel->var_118); + sound_channel->var_158 = sound_channel->var_118; + if (result) { + return 0; + } + } + return 1; +} + /** * * rct2: 0x00401000 */ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2, int channel) { - rct_sound_channel* soundchannel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; + rct_sound_channel* sound_channel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; DWORD status; DWORD dwCurrentPlayCursor; DWORD dwCurrentWriteCursor; @@ -419,67 +482,67 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD int buf1size; char* buf2; int buf2size; - soundchannel->dsbuffer->lpVtbl->GetStatus(soundchannel->dsbuffer, &status); + sound_channel->dsbuffer->lpVtbl->GetStatus(sound_channel->dsbuffer, &status); if (status & DSBSTATUS_BUFFERLOST) { - if (FAILED(soundchannel->dsbuffer->lpVtbl->Restore(soundchannel->dsbuffer))) { + if (FAILED(sound_channel->dsbuffer->lpVtbl->Restore(sound_channel->dsbuffer))) { return; } - soundchannel->playpos = 0; + sound_channel->playpos = 0; bufferlost = 1; } - soundchannel->dsbuffer->lpVtbl->GetCurrentPosition(soundchannel->dsbuffer, &dwCurrentPlayCursor, &dwCurrentWriteCursor); - if (dwCurrentPlayCursor != soundchannel->playpos || bufferlost) { - if (soundchannel->var_168 && !soundchannel->var_15C) { - if (!soundchannel->var_160) { - soundchannel->var_160 = 1; - if (!soundchannel->var_4) { + sound_channel->dsbuffer->lpVtbl->GetCurrentPosition(sound_channel->dsbuffer, &dwCurrentPlayCursor, &dwCurrentWriteCursor); + if (dwCurrentPlayCursor != sound_channel->playpos || bufferlost) { + if (sound_channel->var_168 && !sound_channel->var_15C) { + if (!sound_channel->var_160) { + sound_channel->var_160 = 1; + if (!sound_channel->var_4) { LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel]; - soundchannel->var_0 = 0; + sound_channel->var_0 = 0; if (dsbuffer) { dsbuffer->lpVtbl->Stop(dsbuffer); dsbuffer->lpVtbl->Release(dsbuffer); RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel] = 0; } - if (soundchannel->hmmio) { - sound_channel_free(&soundchannel->hmmio, &soundchannel->hmem); + if (sound_channel->hmmio) { + sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem); } } } return; } - if (dwCurrentPlayCursor >= soundchannel->playpos) { - var1 = dwCurrentPlayCursor - soundchannel->playpos; + if (dwCurrentPlayCursor >= sound_channel->playpos) { + var1 = dwCurrentPlayCursor - sound_channel->playpos; } else { - var1 = dwCurrentPlayCursor + soundchannel->var_150 - soundchannel->playpos; + var1 = dwCurrentPlayCursor + sound_channel->var_150 - sound_channel->playpos; } if (bufferlost) { - var2 = 2 * soundchannel->var_150 / 6; + var2 = 2 * sound_channel->var_150 / 6; } else { var2 = var1; } - soundchannel->var_158 += var1; - if (soundchannel->var_168) { - int var3 = soundchannel->var_15C; - int* var4 = &soundchannel->var_15C; + sound_channel->var_158 += var1; + if (sound_channel->var_168) { + int var3 = sound_channel->var_15C; + int* var4 = &sound_channel->var_15C; if (var3) { if (var1 <= var3) { *var4 = var3 - var1; } else { *var4 = 0; } - if (SUCCEEDED(soundchannel->dsbuffer->lpVtbl->Lock(soundchannel->dsbuffer, soundchannel->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { - uint16 var5 = -(soundchannel->var_128 != 8); + if (SUCCEEDED(sound_channel->dsbuffer->lpVtbl->Lock(sound_channel->dsbuffer, sound_channel->playpos, var2, (LPVOID*)&buf1, (LPDWORD)&buf1size, (LPVOID*)&buf2, &buf2size, 0))) { + uint16 var5 = -(sound_channel->mmckinfo1.cksize != 8); var5 &= 0x80; memset(buf1, var5 + 128, buf1size); if (buf2 && buf2size) { - uint16 var5 = -(soundchannel->var_128 != 8); + uint16 var5 = -(sound_channel->mmckinfo1.cksize != 8); var5 &= 0x80; memset(buf2, var5 + 128, buf2size); } - soundchannel->dsbuffer->lpVtbl->Unlock(soundchannel->dsbuffer, buf1, buf1size, buf2, buf2size); - soundchannel->playpos += var2; - if( soundchannel->playpos >= soundchannel->var_150) { - soundchannel->playpos = soundchannel->playpos - soundchannel->var_150; + sound_channel->dsbuffer->lpVtbl->Unlock(sound_channel->dsbuffer, buf1, buf1size, buf2, buf2size); + sound_channel->playpos += var2; + if (sound_channel->playpos >= sound_channel->var_150) { + sound_channel->playpos = sound_channel->playpos - sound_channel->var_150; } return; } @@ -487,23 +550,23 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD return; } } - if (FAILED(soundchannel->dsbuffer->lpVtbl->Lock(soundchannel->dsbuffer, soundchannel->playpos, var2, &buf1, &buf1size, &buf2, &buf2size, 0))) { + if (FAILED(sound_channel->dsbuffer->lpVtbl->Lock(sound_channel->dsbuffer, sound_channel->playpos, var2, (LPVOID*)&buf1, (LPDWORD)&buf1size, (LPVOID*)&buf2, &buf2size, 0))) { // TimeFunc() could not lock DirectSoundBuffer return; } if (buf1size) { - if (soundchannel->var_160) { - uint16 var5 = -(soundchannel->var_128 != 8); + if (sound_channel->var_160) { + uint16 var5 = -(sound_channel->mmckinfo1.cksize != 8); var5 &= 0x80; memset(buf1, var5 + 128, buf1size); goto label49; } } int var7; - sub_405383(soundchannel->hmmio, buf1size, buf1, &soundchannel->var_124, &var7); + sub_405383(sound_channel->hmmio, buf1size, buf1, &sound_channel->mmckinfo1, &var7); if (var7 < buf1size) { - if (!soundchannel->var_164) { - int s = soundchannel->var_128; + if (!sound_channel->var_164) { + int s = sound_channel->mmckinfo1.cksize; int t = buf1size - var7; int v; if (s == 8) { @@ -516,11 +579,11 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD } memset(&buf1[var7], v, t); label42: - soundchannel->var_168 = 1; - if (dwCurrentPlayCursor <= soundchannel->playpos) { - soundchannel->var_15C = soundchannel->playpos - dwCurrentPlayCursor; + sound_channel->var_168 = 1; + if (dwCurrentPlayCursor <= sound_channel->playpos) { + sound_channel->var_15C = sound_channel->playpos - dwCurrentPlayCursor; } else { - soundchannel->var_15C = soundchannel->playpos + soundchannel->var_150 - dwCurrentPlayCursor; + sound_channel->var_15C = sound_channel->playpos + sound_channel->var_150 - dwCurrentPlayCursor; } goto label49; } @@ -529,60 +592,60 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD do { v38 -= var7; v21 += var7; - RCT2_CALLFUNC_1(0x0040153B, int, int, channel); - sub_405383(soundchannel->hmmio, v38, v21, &soundchannel->var_124, &var7); + sub_40153B(channel);//RCT2_CALLFUNC_1(0x0040153B, int, int, channel); + sub_405383(sound_channel->hmmio, v38, v21, &sound_channel->mmckinfo1, &var7); } while(var7 < v38); } label49: - if (buf2size == 0 || soundchannel->var_160 != 0) { - if(buf2 != 0 && buf2size != 0 && soundchannel->var_160 != 0) { - int var5 = -(soundchannel->var_128 != 8); + if (buf2size == 0 || sound_channel->var_160 != 0) { + if(buf2 != 0 && buf2size != 0 && sound_channel->var_160 != 0) { + int var5 = -(sound_channel->mmckinfo1.cksize != 8); var5 &= 0x80; memset(buf2, var5 + 128, buf2size); } goto label68; } - sub_405383(soundchannel->hmmio, buf2size, buf2, &soundchannel->var_124, &var7); + sub_405383(sound_channel->hmmio, buf2size, buf2, &sound_channel->mmckinfo1, &var7); if (var7 >= buf2size) { label68: - soundchannel->dsbuffer->lpVtbl->Unlock(soundchannel->dsbuffer, buf1, buf1size, buf2, buf2size); - soundchannel->playpos += var2; - if (soundchannel->playpos >= soundchannel->var_150) { - soundchannel->playpos -= soundchannel->var_150; + sound_channel->dsbuffer->lpVtbl->Unlock(sound_channel->dsbuffer, buf1, buf1size, buf2, buf2size); + sound_channel->playpos += var2; + if (sound_channel->playpos >= sound_channel->var_150) { + sound_channel->playpos -= sound_channel->var_150; } if (bufferlost != 0) { - soundchannel->dsbuffer->lpVtbl->Play(soundchannel->dsbuffer, 0, 0, DSBPLAY_LOOPING); + sound_channel->dsbuffer->lpVtbl->Play(sound_channel->dsbuffer, 0, 0, DSBPLAY_LOOPING); } return; } - if (soundchannel->var_164 != 0) { + if (sound_channel->var_164 != 0) { char* v26 = buf2; int v27 = buf2size; do { v26 += var7; v27 -= var7; - RCT2_CALLFUNC_1(0x0040153B, int, int, channel); - sub_405383(soundchannel->hmmio, v27, v26, &soundchannel->var_124, &var7); + sub_40153B(channel);//RCT2_CALLFUNC_1(0x0040153B, int, int, channel); + sub_405383(sound_channel->hmmio, v27, v26, &sound_channel->mmckinfo1, &var7); } while(var7 < v27); goto label68; } int s = buf2size - var7; int v; - if (soundchannel->hmem == (HGLOBAL)8) { + if (sound_channel->hmem == (HGLOBAL)8) { v = 128; } else { - if (soundchannel->hmem != (HGLOBAL)16) { + if (sound_channel->hmem != (HGLOBAL)16) { goto label58; } v = 0; } memset(&buf2[var7], v, s); label58: - soundchannel->var_168 = 1; - if (dwCurrentPlayCursor <= soundchannel->playpos) { - soundchannel->var_15C = soundchannel->playpos - dwCurrentPlayCursor; + sound_channel->var_168 = 1; + if (dwCurrentPlayCursor <= sound_channel->playpos) { + sound_channel->var_15C = sound_channel->playpos - dwCurrentPlayCursor; } else { - soundchannel->var_15C = soundchannel->playpos + soundchannel->var_150 - dwCurrentPlayCursor; + sound_channel->var_15C = sound_channel->playpos + sound_channel->var_150 - dwCurrentPlayCursor; } goto label68; } @@ -1288,7 +1351,7 @@ int sound_channel_stop(int channel) while (_InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 1) != 1) { Sleep(10); } - if (sound_channel->hmem) { + if (sound_channel->hmmio) { sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem); } diff --git a/src/audio.h b/src/audio.h index 625e40591e..2848af7840 100644 --- a/src/audio.h +++ b/src/audio.h @@ -70,14 +70,15 @@ typedef struct { typedef struct { uint32 var_0; uint32 var_4; - uint8 pad_8[0x114]; + uint32 var_8; + uint8 pad_C[0x104]; + uint32 var_110; + uint32 var_114; + uint32 var_118; HGLOBAL hmem; // 0x11C HMMIO hmmio; // 0x120 - uint32 var_124; - uint32 var_128; - uint32 var_12C; - uint32 var_130; - uint8 pad_134[0x18]; + MMCKINFO mmckinfo1; // 0x124 + MMCKINFO mmckinfo2; // 0x138 LPDIRECTSOUNDBUFFER dsbuffer; // 0x14C uint32 var_150; uint32 playpos; // 0x154 From f0ce2dcb1a519fe434043fc6f4225131efc14b4f Mon Sep 17 00:00:00 2001 From: zsilencer Date: Thu, 28 Aug 2014 22:02:05 -0600 Subject: [PATCH 4/4] test --- src/audio.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/audio.c b/src/audio.c index b5d7adf004..0b89bc68d3 100644 --- a/src/audio.c +++ b/src/audio.c @@ -193,9 +193,9 @@ int sound_load3dparameters() */ int sound_load3dposition() { - if (SUCCEEDED(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER)->lpVtbl->GetPosition(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER), &RCT2_GLOBAL(0x009A6084, DS3DBUFFER), 1))) { + /*if (SUCCEEDED(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER)->lpVtbl->GetPosition(RCT2_GLOBAL(0x009E2BA4, LPDIRECTSOUND3DBUFFER), &RCT2_GLOBAL(0x009A6084, DS3DBUFFER), 1))) { return 1; - } + }*/ return 0; } @@ -354,7 +354,7 @@ int map_sound_info(const char* filename) * * rct2: 0x00405383 */ -MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, uint32* a4, int* read) +MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, LPMMCKINFO a4, int* read) { MMIOINFO mmioinfo; MMRESULT result; @@ -364,11 +364,11 @@ MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, uint32* a4, int* rea return 1; } int size2 = size; - if (size > a4[1]) { - size2 = a4[1]; + if (size > a4->cksize) { + size2 = a4->cksize; } int v8 = 0; - a4[1] -= size2; + a4->cksize -= size2; if (size2) { while (1) { HPSTR p = mmioinfo.pchEndRead; @@ -418,12 +418,12 @@ MMRESULT sub_405383(HMMIO hmmio, uint32 size, char* buffer, uint32* a4, int* rea * * rct2: 0x00401822 */ -int sub_401822(int channel, HMMIO hmmio, LONG offset) +int sub_401822(int channel, HMMIO* hmmio, LONG offset) { rct_sound_channel* sound_channel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; LPMMCKINFO v4 = &sound_channel->mmckinfo2; HMMIO* v5 = &sound_channel->hmmio; - if (RCT2_CALLFUNC_4(0x00405222, int, HMMIO, HMMIO*, HGLOBAL*, LPMMCKINFO, hmmio, &sound_channel->hmmio, &sound_channel->hmem, &sound_channel->mmckinfo2)) { + if (RCT2_CALLFUNC_4(0x00405222, int, HMMIO*, HMMIO*, HGLOBAL*, LPMMCKINFO, hmmio, &sound_channel->hmmio, &sound_channel->hmem, &sound_channel->mmckinfo2)) { return -100; } if (*(uint16*)sound_channel->hmem != 1) { @@ -447,9 +447,9 @@ int sub_40153B(int channel) rct_sound_channel* sound_channel = &RCT2_ADDRESS(0x014262E0, rct_sound_channel)[channel]; if (sound_channel->var_4) { if (sound_channel->hmmio) { - sound_channel_free(sound_channel->hmmio, sound_channel->hmem); + sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem); } - if (sub_401822(channel, &sound_channel->var_8, sound_channel->var_110)) { + if (sub_401822(channel, (HMMIO*)&sound_channel->var_8, sound_channel->var_110)) { return 0; } sound_channel->var_164 = sound_channel->var_114; @@ -475,7 +475,7 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD DWORD status; DWORD dwCurrentPlayCursor; DWORD dwCurrentWriteCursor; - int var1; + uint32 var1; int var2; int bufferlost = 0; char* buf1; @@ -522,15 +522,15 @@ void sub_401000(UINT uTimerID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD } sound_channel->var_158 += var1; if (sound_channel->var_168) { - int var3 = sound_channel->var_15C; - int* var4 = &sound_channel->var_15C; + uint32 var3 = sound_channel->var_15C; + uint32* var4 = &sound_channel->var_15C; if (var3) { if (var1 <= var3) { *var4 = var3 - var1; } else { *var4 = 0; } - if (SUCCEEDED(sound_channel->dsbuffer->lpVtbl->Lock(sound_channel->dsbuffer, sound_channel->playpos, var2, (LPVOID*)&buf1, (LPDWORD)&buf1size, (LPVOID*)&buf2, &buf2size, 0))) { + if (SUCCEEDED(sound_channel->dsbuffer->lpVtbl->Lock(sound_channel->dsbuffer, sound_channel->playpos, var2, (LPVOID*)&buf1, (LPDWORD)&buf1size, (LPVOID*)&buf2, (LPDWORD)&buf2size, 0))) { uint16 var5 = -(sound_channel->mmckinfo1.cksize != 8); var5 &= 0x80; memset(buf1, var5 + 128, buf1size);