--- np2/win9x/soundmng.cpp	2005/02/07 14:46:14	1.8
+++ np2/win9x/soundmng.cpp	2006/12/30 23:26:35	1.12.2.2
@@ -10,7 +10,17 @@
 #if defined(VERMOUTH_LIB)
 #include	"vermouth.h"
 #endif
+#if defined(MT32SOUND_DLL)
+#include	"mt32snd.h"
+#endif
 
+#if defined(_M_IA64) || defined(_M_AMD64)
+#define	SOUNDBUFFERALIGN	(1 << 3)
+#else
+#define	SOUNDBUFFERALIGN	(1 << 2)
+#endif
+
+#if !defined(_WIN64)
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,6 +28,7 @@ void __fastcall satuation_s16mmx(SINT16 
 #ifdef __cplusplus
 }
 #endif
+#endif
 
 
 #if 1
@@ -50,7 +61,7 @@ static	void				(PARTSCALL *fnmix)(SINT16
 
 // ---- directsound
 
-static BOOL dsoundcreate(void) {
+static BRESULT dsoundcreate(void) {
 
 	// DirectSound¤Î½é´ü²½
 	if (FAILED(DirectSoundCreate(0, &pDSound, 0))) {
@@ -75,6 +86,7 @@ UINT soundmng_create(UINT rate, UINT ms)
 	UINT			samples;
 	DSBUFFERDESC	dsbdesc;
 	PCMWAVEFORMAT	pcmwf;
+	int				i;
 
 	if ((pDSound == NULL) ||
 		(rate != 11025) && (rate != 22050) && (rate != 44100)) {
@@ -91,7 +103,7 @@ UINT soundmng_create(UINT rate, UINT ms)
 //	keydispr_delayinit((UINT8)((ms * 10 + 563) / 564));
 
 	samples = (rate * ms) / 2000;
-	samples = (samples + 3) & (~3);
+	samples = (samples + SOUNDBUFFERALIGN - 1) & (~(SOUNDBUFFERALIGN - 1));
 	dsstreambytes = samples * 2 * sizeof(SINT16);
 	soundmng_setreverse(FALSE);
 
@@ -103,14 +115,19 @@ UINT soundmng_create(UINT rate, UINT ms)
 	pcmwf.wf.nBlockAlign = 2 * sizeof(SINT16);
 	pcmwf.wf.nAvgBytesPerSec = rate * 2 * sizeof(SINT16);
 
-	ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));
-	dsbdesc.dwSize = DSBUFFERDESC_SIZE;
-	dsbdesc.dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME |
+	for (i=0; i<2; i++) {
+		ZeroMemory(&dsbdesc, sizeof(DSBUFFERDESC));
+		dsbdesc.dwSize = i ? sizeof(dsbdesc) : DSBUFFERDESC_SIZE;
+		dsbdesc.dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME |
 						DSBCAPS_CTRLFREQUENCY |
 						DSBCAPS_STICKYFOCUS | DSBCAPS_GETCURRENTPOSITION2;
-	dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
-	dsbdesc.dwBufferBytes = dsstreambytes * 2;
-	if (FAILED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {
+		dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
+		dsbdesc.dwBufferBytes = dsstreambytes * 2;
+		if (SUCCEEDED(pDSound->CreateSoundBuffer(&dsbdesc, &pDSData3, NULL))) {
+			break;
+		}
+	}
+	if (i >= 2) {
 		goto stcre_err2;
 	}
 
@@ -118,8 +135,10 @@ UINT soundmng_create(UINT rate, UINT ms)
 	vermouth_module = midimod_create(rate);
 	midimod_loadall(vermouth_module);
 #endif
+#if defined(MT32SOUND_DLL)
+	mt32sound_setrate(rate);
+#endif
 	dsstreamevent = (UINT8)-1;
-	soundmng_reset();
 	return(samples);
 
 stcre_err2:
@@ -157,6 +176,9 @@ void soundmng_destroy(void) {
 		midimod_destroy(vermouth_module);
 		vermouth_module = NULL;
 #endif
+#if defined(MT32SOUND_DLL)
+		mt32sound_setrate(0);
+#endif
 		pDSData3->Stop();
 		pDSData3->Release();
 		pDSData3 = NULL;
@@ -247,12 +269,16 @@ void soundmng_sync(void) {
 void soundmng_setreverse(BOOL reverse) {
 
 	if (!reverse) {
+#if !defined(_WIN64)
 		if (mmxflag) {
 			fnmix = satuation_s16;
 		}
 		else {
 			fnmix = satuation_s16mmx;
 		}
+#else
+		fnmix = satuation_s16;
+#endif
 	}
 	else {
 		fnmix = satuation_s16x;
@@ -297,7 +323,7 @@ static void pcmstop(void) {
 	}
 }
 
-void soundmng_pcmload(UINT num, const char *filename, UINT type) {
+void soundmng_pcmload(UINT num, const OEMCHAR *filename, UINT type) {
 
 	EXTROMH				erh;
 	RIFF_HEADER			riff;
@@ -408,7 +434,7 @@ void soundmng_pcmvolume(UINT num, int vo
 	}
 }
 
-BOOL soundmng_pcmplay(UINT num, BOOL loop) {
+BRESULT soundmng_pcmplay(UINT num, BOOL loop) {
 
 	LPDIRECTSOUNDBUFFER	dsbuf;
 
@@ -438,12 +464,15 @@ void soundmng_pcmstop(UINT num) {
 
 // ----
 
-BOOL soundmng_initialize(void) {
+BRESULT soundmng_initialize(void) {
 
 	if (dsoundcreate() != SUCCESS) {
 		goto smcre_err;
 	}
 	pcmcreate();
+#if defined(MT32SOUND_DLL)
+	mt32sound_initialize();
+#endif
 	return(SUCCESS);
 
 smcre_err:
@@ -453,6 +482,9 @@ smcre_err:
 
 void soundmng_deinitialize(void) {
 
+#if defined(MT32SOUND_DLL)
+	mt32sound_deinitialize();
+#endif
 	pcmdestroy();
 	soundmng_destroy();
 	RELEASE(pDSound);