--- np2/win9x/subwind.cpp	2004/04/08 13:08:22	1.7
+++ np2/win9x/subwind.cpp	2005/02/09 20:11:35	1.11
@@ -49,16 +49,16 @@ typedef struct {
 typedef struct {
 	int		posx;
 	int		posy;
-	BYTE	mode;
-	BYTE	type;
+	UINT8	mode;
+	UINT8	type;
 } KDISPCFG;
 
 static	KDISPWIN	kdispwin;
 static	KDISPCFG	kdispcfg;
 
-static const char kdispapp[] = "Key Display";
-static const char kdispclass[] = "NP2-KeyDispWin";
-static const char str_kdclose[] = "&Close";
+static const OEMCHAR kdispapp[] = OEMTEXT("Key Display");
+static const OEMCHAR kdispclass[] = OEMTEXT("NP2-KeyDispWin");
+static const OEMCHAR str_kdclose[] = OEMTEXT("&Close");
 
 static const UINT32 kdisppal[KEYDISP_PALS] =
 									{0x00000000, 0xffffffff, 0xf9ff0000};
@@ -70,7 +70,7 @@ static const INITBL kdispini[] = {
 	{"windtype", INITYPE_BOOL,		&kdispcfg.type,			0}};
 
 
-static BYTE kdgetpal8(CMNPALFN *self, UINT num) {
+static UINT8 kdgetpal8(CMNPALFN *self, UINT num) {
 
 	if (num < KEYDISP_PALS) {
 		return(kdisppal[num] >> 24);
@@ -127,7 +127,7 @@ static void kdsetwinsize(void) {
 	winlocex_destroy(wlex);
 }
 
-static void kdsetdispmode(BYTE mode) {
+static void kdsetdispmode(UINT8 mode) {
 
 	HMENU	hmenu;
 
@@ -305,7 +305,7 @@ BOOL kdispwin_initialize(HINSTANCE hPreI
 void kdispwin_create(void) {
 
 	HWND		hwnd;
-	BYTE		mode;
+	UINT8		mode;
 	CMNPALFN	palfn;
 
 	if (kdispwin.hwnd != NULL) {
@@ -316,7 +316,7 @@ void kdispwin_create(void) {
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						kdispcfg.posx, kdispcfg.posy,
-						CW_USEDEFAULT, CW_USEDEFAULT,
+						KEYDISP_WIDTH, KEYDISP_HEIGHT,
 						NULL, NULL, hInst, NULL);
 	kdispwin.hwnd = hwnd;
 	if (hwnd == NULL) {
@@ -368,9 +368,9 @@ HWND kdispwin_gethwnd(void) {
 	return(kdispwin.hwnd);
 }
 
-void kdispwin_draw(BYTE cnt) {
+void kdispwin_draw(UINT8 cnt) {
 
-	BYTE	flag;
+	UINT8	flag;
 
 	if (kdispwin.hwnd) {
 		if (!cnt) {
@@ -386,21 +386,21 @@ void kdispwin_draw(BYTE cnt) {
 
 void kdispwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	ZeroMemory(&kdispcfg, sizeof(kdispcfg));
 	kdispcfg.posx = CW_USEDEFAULT;
 	kdispcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, kdispapp, kdispini, sizeof(kdispini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, kdispapp, kdispini, NELEMENTS(kdispini));
 }
 
 void kdispwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, kdispapp, kdispini, sizeof(kdispini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, kdispapp, kdispini, NELEMENTS(kdispini));
 }
 #endif
 
@@ -426,8 +426,8 @@ typedef struct {
 static	MDBGWIN		mdbgwin;
 static	MDBGCFG		mdbgcfg;
 
-static const char mdbgapp[] = "Memory Map";
-static const char mdbgclass[] = "NP2-MemDbgWin";
+static const OEMCHAR mdbgapp[] = OEMTEXT("Memory Map");
+static const OEMCHAR mdbgclass[] = OEMTEXT("NP2-MemDbgWin");
 static const INITBL mdbgini[] = {
 	{"WindposX", INITYPE_SINT32,	&mdbgcfg.posx,			0},
 	{"WindposY", INITYPE_SINT32,	&mdbgcfg.posy,			0},
@@ -439,11 +439,25 @@ static void mdpalcnv(CMNPAL *dst, const 
 	UINT	i;
 
 	switch(bpp) {
+#if defined(SUPPORT_16BPP)
+		case 16:
+			for (i=0; i<pals; i++) {
+				dst[i].pal16 = dd2_get16pal(mdbgwin.dd2hdl, src[i]);
+			}
+			break;
+#endif
+#if defined(SUPPORT_24BPP)
+		case 24:
+#endif
+#if defined(SUPPORT_32BPP)
 		case 32:
+#endif
+#if defined(SUPPORT_24BPP) || defined(SUPPORT_32BPP)
 			for (i=0; i<pals; i++) {
 				dst[i].pal32.d = src[i].d;
 			}
 			break;
+#endif
 	}
 }
 
@@ -553,7 +567,7 @@ static LRESULT CALLBACK mdproc(HWND hWnd
 	return(0);
 }
 
-BOOL memdbg_initialize(HINSTANCE hInstance) {
+BOOL mdbgwin_initialize(HINSTANCE hInstance) {
 
 	WNDCLASS	wc;
 
@@ -574,7 +588,7 @@ BOOL memdbg_initialize(HINSTANCE hInstan
 	return(SUCCESS);
 }
 
-void memdbg_create(void) {
+void mdbgwin_create(void) {
 
 	HWND	hwnd;
 
@@ -610,41 +624,41 @@ mdcre_err1:
 	return;
 }
 
-void memdbg_destroy(void) {
+void mdbgwin_destroy(void) {
 
 	if (mdbgwin.hwnd) {
 		DestroyWindow(mdbgwin.hwnd);
 	}
 }
 
-void memdbg_process(void) {
+void mdbgwin_process(void) {
 
 	if ((mdbgwin.hwnd) && (memdbg32_process())) {
 		mddrawwin(mdbgwin.hwnd, FALSE);
 	}
 }
 
-HWND memdbg_gethwnd(void) {
+HWND mdbgwin_gethwnd(void) {
 
 	return(mdbgwin.hwnd);
 }
 
-void memdbg_readini(void) {
+void mdbgwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	mdbgcfg.posx = CW_USEDEFAULT;
 	mdbgcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, mdbgapp, mdbgini, NELEMENTS(mdbgini));
 }
 
-void memdbg_writeini(void) {
+void mdbgwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, mdbgapp, mdbgini, NELEMENTS(mdbgini));
 }
 #endif
 
@@ -669,8 +683,8 @@ typedef struct {
 static	SKBDWIN		skbdwin;
 static	SKBDCFG		skbdcfg;
 
-static const char skbdapp[] = "Soft Keyboard";
-static const char skbdclass[] = "NP2-SoftKBDWin";
+static const OEMCHAR skbdapp[] = OEMTEXT("Soft Keyboard");
+static const OEMCHAR skbdclass[] = OEMTEXT("NP2-SoftKBDWin");
 static const INITBL skbdini[] = {
 	{"WindposX", INITYPE_SINT32,	&skbdcfg.posx,			0},
 	{"WindposY", INITYPE_SINT32,	&skbdcfg.posy,			0},
@@ -681,10 +695,6 @@ static void skpalcnv(CMNPAL *dst, const 
 	UINT	i;
 
 	switch(bpp) {
-#if defined(SUPPORT_8BPP)
-		case 8:
-			break;
-#endif
 #if defined(SUPPORT_16BPP)
 		case 16:
 			for (i=0; i<pals; i++) {
@@ -912,20 +922,20 @@ void skbdwin_process(void) {
 
 void skbdwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	skbdcfg.posx = CW_USEDEFAULT;
 	skbdcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, skbdapp, skbdini, sizeof(skbdini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, skbdapp, skbdini, NELEMENTS(skbdini));
 }
 
 void skbdwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, skbdapp, skbdini, sizeof(skbdini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, skbdapp, skbdini, NELEMENTS(skbdini));
 }
 #endif