--- np2/win9x/mt32snd.cpp 2005/03/02 04:28:08 1.1 +++ np2/win9x/mt32snd.cpp 2005/03/19 20:46:07 1.3 @@ -11,25 +11,25 @@ typedef struct { HMODULE mod; BOOL opened; UINT rate; - int (*Open)(int rate, int reverb, int def, int revtype, int revtime, int revlvl); - int (*Close)(void); - int (*Write)(unsigned char data); - int (*Mix)(void *buff, unsigned long size); + int (WINAPI * Open)(int rate, int reverb, int def, int revtype, int revtime, int revlvl); + int (WINAPI * Close)(void); + int (WINAPI * Write)(unsigned char data); + int (WINAPI * Mix)(void *buff, unsigned long size); } MT32SOUND; static MT32SOUND mt32sound; typedef struct { -const TCHAR *symbol; +const char *symbol; UINT addr; } DLLPROC; -static const TCHAR mt32sounddll[] = _T("mt32sound.dll"); -static const TCHAR fn_mt32soundopen[] = _T("MT32Sound_Open"); -static const TCHAR fn_mt32soundclose[] = _T("MT32Sound_Close"); -static const TCHAR fn_mt32soundwrite[] = _T("MT32Sound_Write"); -static const TCHAR fn_mt32soundmix[] = _T("MT32Sound_Mix"); +static const TCHAR mt32sounddll[] = _T("mt32sound.dll"); +static const char fn_mt32soundopen[] = "MT32Sound_Open"; +static const char fn_mt32soundclose[] = "MT32Sound_Close"; +static const char fn_mt32soundwrite[] = "MT32Sound_Write"; +static const char fn_mt32soundmix[] = "MT32Sound_Mix"; static const DLLPROC dllproc[] = { {fn_mt32soundopen, offsetof(MT32SOUND, Open)}, @@ -117,7 +117,7 @@ void mt32sound_close(void) { void mt32sound_shortmsg(UINT32 msg) { - int (*Write)(unsigned char data); + int (WINAPI * Write)(unsigned char data); Write = mt32sound.Write; switch((msg >> 4) & (0xf0 >> 4)) { @@ -141,7 +141,7 @@ void mt32sound_shortmsg(UINT32 msg) { void mt32sound_longmsg(const UINT8 *ptr, UINT32 leng) { - int (*Write)(unsigned char data); + int (WINAPI * Write)(unsigned char data); Write = mt32sound.Write; while(leng) {