--- np2/win9x/dialog/d_sound.cpp	2003/10/16 17:59:03	1.1
+++ np2/win9x/dialog/d_sound.cpp	2003/10/22 14:13:25	1.4
@@ -2,19 +2,19 @@
 #include	<windowsx.h>
 #include	<commctrl.h>
 #include	<prsht.h>
-#include	"resource.h"
 #include	"strres.h"
+#include	"resource.h"
 #include	"np2.h"
 #include	"joymng.h"
 #include	"sysmng.h"
 #include	"menu.h"
+#include	"dialog.h"
+#include	"dialogs.h"
+#include	"bit2res.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"fmboard.h"
-#include	"bit2res.h"
-#include	"dialog.h"
-#include	"dialogs.h"
 #include	"s98.h"
 
 
@@ -137,7 +137,7 @@ static LRESULT CALLBACK SndmixDlgProc(HW
 			break;
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				for (i=0; i<5; i++) {
 					if (sliderrestore(hWnd, &sndmixitem[i])) {
 						sysmng_update(SYS_UPDATECFG);
@@ -193,7 +193,7 @@ static LRESULT CALLBACK Snd14optDlgProc(
 			break;
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				for (i=0; i<6; i++) {
 					if (sliderrestore(hWnd, &snd14item[i])) {
 						sysmng_update(SYS_UPDATECFG);
@@ -456,7 +456,7 @@ static LRESULT CALLBACK Snd26optDlgProc(
 			break;
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				if (np2cfg.snd26opt != snd26) {
 					np2cfg.snd26opt = snd26;
 					sysmng_update(SYS_UPDATECFG);
@@ -689,7 +689,7 @@ static LRESULT CALLBACK Snd86optDlgProc(
 			break;
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				if (np2cfg.snd86opt != snd86) {
 					np2cfg.snd86opt = snd86;
 					sysmng_update(SYS_UPDATECFG);
@@ -919,7 +919,7 @@ static LRESULT CALLBACK SPBoptDlgProc(HW
 			break;
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				update = 0;
 				if (np2cfg.spbopt != spb) {
 					np2cfg.spbopt = spb;
@@ -935,7 +935,7 @@ static LRESULT CALLBACK SPBoptDlgProc(HW
 					np2cfg.spb_vrl = b;
 					update |= SYS_UPDATECFG;
 				}
-//				FM_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);
+				opngen_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);
 				b = (BYTE)(Button_GetCheck(GetDlgItem(hWnd, IDC_SPBREVERSE))?																			1:0);
 				if (np2cfg.spb_x != b) {
 					np2cfg.spb_x = b;
@@ -1012,7 +1012,7 @@ static LRESULT CALLBACK PAD1optDlgProc(H
 			return(TRUE);
 
 		case WM_NOTIFY:
-			if ((((NMHDR *)lp)->code) == PSN_APPLY) {
+			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				renewal = 0;
 				for (i=0; i<13; i++) {
 					renewal |= checkbtnres_store(hWnd, pad1opt + i);