--- np2/win9x/winkbd.cpp	2003/10/30 18:09:06	1.3
+++ np2/win9x/winkbd.cpp	2004/02/18 03:24:48	1.6
@@ -1,8 +1,7 @@
 #include	"compiler.h"
 #include	"np2.h"
 #include	"winkbd.h"
-#include	"pccore.h"
-#include	"iocore.h"
+#include	"keystat.h"
 
 
 #define		NC		0xff
@@ -35,7 +34,7 @@ static const BYTE key106[256] = {
 			//	<£°>,<£±>,<£²>,<£³>,<£´>,<£µ>,<£¶>,<£·>		; 0x60
 				0x4e,0x4a,0x4b,0x4c,0x46,0x47,0x48,0x42,
 			//	<£¸>,<£¹>,<¡ö>,<¡Ü>,<¡¤>,<¡Ý>,<¡¥>,<¡¿>		; 0x68
-				0x43,0x44,0x45,0x49,  NC,0x40,0x50,0x41,
+				0x43,0x44,0x45,0x49,0x4f,0x40,0x50,0x41,
 			//	 f.1, f.2, f.3, f.4, f.5, f.6, f.7, f.8		; 0x70
 				0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
 			//	 f.9, f10, f11, f12, f13, f14, f15, f16		; 0x78
@@ -62,8 +61,8 @@ static const BYTE key106[256] = {
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 			//	    ,    ,    ,    ,    ,    ,    ,    		; 0xd0
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    ,    ,    ,  ¡Î,  ¡ï,  ¡Ï,  ¡°,    		; 0xd8
-				  NC,  NC,  NC,0x1b,0x0d,0x28,0x0c,  NC,
+			//	    ,    ,    ,  ¡Î,  ¡ï,  ¡Ï,  ¡°,  ¡²		; 0xd8
+				  NC,  NC,  NC,0x1b,0x0d,0x28,0x0c,0x33,
 			//	    ,    ,  ¡²,    ,    ,    ,    ,    		; 0xe0
 				  NC,  NC,0x33,  NC,  NC,  NC,  NC,  NC,
 			//	    ,    ,    ,    ,    ,    ,    ,    		; 0xe8
@@ -139,8 +138,8 @@ static const BYTE key106ext[256] = {
 			//	    ,    ,    ,    ,    ,    ,    ,    		; 0xf8
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC};
 
-static const BYTE f12keys[] = {
-			0x61, 0x60, 0x4d, 0x4f};
+static const UINT8 f12keys[] = {
+			0x61, 0x60, 0x4d, 0x4f, 0x76, 0x77};
 
 
 static BYTE getf12key(void) {
@@ -148,7 +147,7 @@ static BYTE getf12key(void) {
 	UINT	key;
 
 	key = np2oscfg.F12COPY - 1;
-	if (key < (sizeof(f12keys)/sizeof(BYTE))) {
+	if (key < (sizeof(f12keys)/sizeof(UINT8))) {
 		return(f12keys[key]);
 	}
 	else {
@@ -224,7 +223,7 @@ void winkbd_resetf12(void) {
 
 	UINT	i;
 
-	for (i=0; i<(sizeof(f12keys)/sizeof(BYTE)); i++) {
+	for (i=0; i<(sizeof(f12keys)/sizeof(UINT8)); i++) {
 		keystat_forcerelease(f12keys[i]);
 	}
 }