--- np2/win9x/np2.cpp	2004/04/08 13:08:22	1.49
+++ np2/win9x/np2.cpp	2004/04/16 06:14:57	1.51
@@ -115,7 +115,7 @@ WINLOCEX np2_winlocexallwin(HWND base) {
 	list[cnt++] = toolwin_gethwnd();
 	list[cnt++] = kdispwin_gethwnd();
 	list[cnt++] = skbdwin_gethwnd();
-	list[cnt++] = memdbg_gethwnd();
+	list[cnt++] = mdbgwin_gethwnd();
 	for (i=0; i<cnt; i++) {
 		if (list[i] == base) {
 			list[i] = NULL;
@@ -147,7 +147,7 @@ static void changescreen(BYTE newmode) {
 			toolwin_destroy();
 			kdispwin_destroy();
 			skbdwin_destroy();
-			memdbg_destroy();
+			mdbgwin_destroy();
 		}
 		else if (renewal & SCRNMODE_ROTATEMASK) {
 			wlex = np2_winlocexallwin(hWndMain);
@@ -597,42 +597,49 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 		case IDM_F12MOUSE:
 			xmenu_setf12copy(0);
 			winkbd_resetf12();
+			winkbd_setf12(0);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
 			xmenu_setf12copy(1);
 			winkbd_resetf12();
+			winkbd_setf12(1);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12STOP:
 			xmenu_setf12copy(2);
 			winkbd_resetf12();
+			winkbd_setf12(2);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12EQU:
 			xmenu_setf12copy(3);
 			winkbd_resetf12();
+			winkbd_setf12(3);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COMMA:
 			xmenu_setf12copy(4);
 			winkbd_resetf12();
+			winkbd_setf12(4);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_USERKEY1:
 			xmenu_setf12copy(5);
 			winkbd_resetf12();
+			winkbd_setf12(5);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_USERKEY2:
 			xmenu_setf12copy(6);
 			winkbd_resetf12();
+			winkbd_setf12(6);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
@@ -938,7 +945,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 #endif
 #if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
 				case IDM_MEMDBG32:
-					memdbg_create();
+					mdbgwin_create();
 					break;
 #endif
 				case IDM_SCREENCENTER:
@@ -1007,7 +1014,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					if (subwin) {
 						ShowWindow(subwin, SW_SHOWNOACTIVATE);
 					}
-					subwin = memdbg_gethwnd();
+					subwin = mdbgwin_gethwnd();
 					if (subwin) {
 						ShowWindow(subwin, SW_SHOWNOACTIVATE);
 					}
@@ -1339,7 +1346,7 @@ static void framereset(UINT cnt) {
 	scrnmng_dispclock();
 	kdispwin_draw((BYTE)cnt);
 	skbdwin_process();
-	memdbg_process();
+	mdbgwin_process();
 	toolwin_draw((BYTE)cnt);
 	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
@@ -1382,7 +1389,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	toolwin_readini();
 	kdispwin_readini();
 	skbdwin_readini();
-	memdbg_readini();
+	mdbgwin_readini();
 
 	rand_setseed((unsigned)time(NULL));
 
@@ -1414,6 +1421,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			np2oscfg.KEYBOARD = KEY_KEY106;
 		}
 	}
+	winkbd_roll(np2oscfg.KEYBOARD != KEY_PC98);
+	winkbd_setf12(np2oscfg.F12COPY);
 	keystat_initialize();
 
 	np2class_initialize(hInstance);
@@ -1435,7 +1444,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	toolwin_initapp(hInstance);
 	kdispwin_initialize(hPreInst);
 	skbdwin_initialize(hPreInst);
-	memdbg_initialize(hPreInst);
+	mdbgwin_initialize(hPreInst);
 	viewer_init(hPreInst);
 
 	mousemng_initialize();
@@ -1679,7 +1688,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	toolwin_destroy();
 	kdispwin_destroy();
 	skbdwin_destroy();
-	memdbg_destroy();
+	mdbgwin_destroy();
 
 	pccore_cfgupdate();
 
@@ -1710,7 +1719,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		toolwin_writeini();
 		kdispwin_writeini();
 		skbdwin_writeini();
-		memdbg_writeini();
+		mdbgwin_writeini();
 	}
 	skbdwin_deinitialize();