--- np2/win9x/np2.cpp	2003/11/21 06:51:14	1.31
+++ np2/win9x/np2.cpp	2003/12/25 03:02:40	1.33
@@ -74,7 +74,7 @@ static	char		szClassName[] = "NP2-MainWi
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						0xffffff, 0xffbf6a, 0, 0,
-						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0};		// ver0.38
+						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0};	// ver0.73
 
 		char		fddfolder[MAX_PATH];
 		char		hddfolder[MAX_PATH];
@@ -739,10 +739,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					update |= SYS_UPDATECFG;
 					break;
 
-				case IDM_SNDOPT:
-					winuienter();
-					dialog_sndopt(hWnd);
-					winuileave();
+				case IDM_JASTSOUND:
+					xmenu_setjastsound(np2oscfg.jastsnd ^ 1);
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_SEEKSND:
@@ -795,6 +794,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					pc9861k_midipanic();
 					break;
 
+				case IDM_SNDOPT:
+					winuienter();
+					dialog_sndopt(hWnd);
+					winuileave();
+					break;
+
 				case IDM_BMPSAVE:
 					winuienter();
 					dialog_writebmp(hWnd);
@@ -1226,6 +1231,7 @@ static void processwait(UINT cnt) {
 	else {
 		Sleep(1);
 	}
+	soundmng_sync();
 }
 
 
@@ -1234,7 +1240,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	WNDCLASS	wc;
 	MSG			msg;
 	HMENU		hMenu;
-	HWND		hwndorg;
+	HWND		hWnd;
 	UINT		i;
 #ifdef OPENING_WAIT
 	UINT32		tick;
@@ -1254,10 +1260,10 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	CopyMemory(szClassName, np2oscfg.winid, 3);
 
-	if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) {
+	if ((hWnd = FindWindow(szClassName, NULL)) != NULL) {
 		sstpmsg_running();
-		ShowWindow(hwndorg, SW_RESTORE);
-		SetForegroundWindow(hwndorg);
+		ShowWindow(hWnd, SW_RESTORE);
+		SetForegroundWindow(hWnd);
 		dosio_term();
 		return(FALSE);
 	}
@@ -1307,31 +1313,35 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 						WS_THICKFRAME | WS_MINIMIZEBOX,
 						np2oscfg.winx, np2oscfg.winy, 640, 400,
 						NULL, NULL, hInstance, NULL);
+	hWnd = hWndMain;
 	scrnmng_initialize();
 
-	xmenu_setsound(np2cfg.SOUND_SW);
-	xmenu_setbeepvol(np2cfg.BEEP_VOL);
-	xmenu_setkey(0);
-	xmenu_setbtnrapid(np2cfg.BTN_RAPID);
-	xmenu_setbtnmode(np2cfg.BTN_MODE);
-	xmenu_setmsrapid(np2cfg.MOUSERAPID);
+	xmenu_setroltate(0);
+	xmenu_setdispmode(np2cfg.DISPSYNC);
+	xmenu_setraster(np2cfg.RASTER);
 	xmenu_setwaitflg(np2oscfg.NOWAIT);
 	xmenu_setframe(np2oscfg.DRAW_SKIP);
-	xmenu_setdispmode(np2cfg.DISPSYNC);
-	xmenu_setdispclk(np2oscfg.DISPCLK);
-	xmenu_seti286save(np2oscfg.I286SAVE);
-	xmenu_setmotorflg(np2cfg.MOTOR);
-	xmenu_setroltate(0);
+
+	xmenu_setkey(0);
 	xmenu_setxshift(0);
 	xmenu_setf12copy(np2oscfg.F12COPY);
+	xmenu_setbeepvol(np2cfg.BEEP_VOL);
+	xmenu_setsound(np2cfg.SOUND_SW);
+	xmenu_setjastsound(np2oscfg.jastsnd);
+	xmenu_setmotorflg(np2cfg.MOTOR);
 	xmenu_setextmem(np2cfg.EXTMEM);
-	xmenu_setraster(np2cfg.RASTER);
-	xmenu_setshortcut(np2oscfg.shortcut);						// ver0.30
-	xmenu_setsstp(np2oscfg.sstp);
 	xmenu_setmouse(np2oscfg.MOUSE_SW);
 
-	ShowWindow(hWndMain, nCmdShow);
-	UpdateWindow(hWndMain);
+	xmenu_setshortcut(np2oscfg.shortcut);
+	xmenu_setdispclk(np2oscfg.DISPCLK);
+	xmenu_setbtnmode(np2cfg.BTN_MODE);
+	xmenu_setbtnrapid(np2cfg.BTN_RAPID);
+	xmenu_setmsrapid(np2cfg.MOUSERAPID);
+	xmenu_setsstp(np2oscfg.sstp);
+	xmenu_seti286save(np2oscfg.I286SAVE);
+
+	ShowWindow(hWnd, nCmdShow);
+	UpdateWindow(hWnd);
 
 #ifdef OPENING_WAIT
 	tick = GetTickCount();
@@ -1340,7 +1350,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	// めにゅー追加
 	if (np2oscfg.statsave) {
 		char buf[16];
-		hMenu = GetMenu(hWndMain);
+		hMenu = GetMenu(hWnd);
 		hStat = CreatePopupMenu();
 		for (i=0; i<STATSAVEMAX; i++) {
 			wsprintf(buf, "Save %d", i);
@@ -1354,11 +1364,11 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		InsertMenu(hMenu, 1, MF_BYPOSITION | MF_POPUP, (UINT)hStat, "S&tat");
 	}
 	sysmenu_initialize();
-	DrawMenuBar(hWndMain);
+	DrawMenuBar(hWnd);
 
 	// ver0.30
 	if (file_attr_c(np2help) == (short)-1) {
-		EnableMenuItem(GetMenu(hWndMain), IDM_HELP, MF_GRAYED);
+		EnableMenuItem(GetMenu(hWnd), IDM_HELP, MF_GRAYED);
 	}
 
 	sysmenu_settoolwin(np2oscfg.toolwin);
@@ -1379,7 +1389,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		scrnmode ^= SCRNMODE_FULLSCREEN;
 		if (scrnmng_create(scrnmode) != SUCCESS) {
 			if (sstpmsg_dxerror()) {
-				MessageBox(hWndMain, "Couldn't create DirectDraw Object",
+				MessageBox(hWnd, "Couldn't create DirectDraw Object",
 										np2oscfg.titles, MB_OK | MB_ICONSTOP);
 			}
 			return(FALSE);
@@ -1422,15 +1432,6 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	pccore_reset();
 
-	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
-		if (np2oscfg.toolwin) {
-			toolwin_create();
-		}
-		if (np2oscfg.keydisp) {
-			kdispwin_create();
-		}
-	}
-
 	np2opening = 0;
 
 	// れじうむ
@@ -1442,7 +1443,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			for (i=0; i<4; i++) np2arg.disk[i] = NULL;
 		}
 		else if (id == IDCANCEL) {
-			DestroyWindow(hWndMain);
+			DestroyWindow(hWnd);
 			mousemng_disable(MOUSEPROC_WINUI);
 			S98_trash();
 			pccore_term();
@@ -1464,13 +1465,22 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		}
 	}
 
+	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
+		if (np2oscfg.toolwin) {
+			toolwin_create();
+		}
+		if (np2oscfg.keydisp) {
+			kdispwin_create();
+		}
+	}
+
 	while(1) {
 		if (!np2stopemulate) {
 			if (PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE)) {
 				if (!GetMessage(&msg, NULL, 0, 0)) {
 					break;
 				}
-				if ((msg.hwnd != hWndMain) ||
+				if ((msg.hwnd != hWnd) ||
 					((msg.message != WM_SYSKEYDOWN) &&
 					(msg.message != WM_SYSKEYUP))) {
 					TranslateMessage(&msg);