--- np2/win9xc/subwind.cpp	2004/03/31 11:59:18	1.1
+++ np2/win9xc/subwind.cpp	2005/02/07 14:46:15	1.5
@@ -94,7 +94,7 @@ static HBITMAP allocbmp(int width, int h
 	if (ret != NULL) {
 		ZeroMemory(image, width * height * 4);
 		if (vram) {
-			vram->ptr = (BYTE *)image;
+			vram->ptr = (UINT8 *)image;
 			vram->width = width;
 			vram->height = height;
 			vram->xalign = 4;
@@ -130,35 +130,31 @@ static const PFTBL mdbgini[] = {
 	{"WindposX", PFTYPE_SINT32,		&mdbgcfg.posx,			0},
 	{"WindposY", PFTYPE_SINT32,		&mdbgcfg.posy,			0}};
 
-static const UINT32 mdwinpal[MEMDBG32_PALS] =
-			{0x00333333, 0x00000000, 
-				0x00ffaa00, 0x00ff0000, 0x00118811, 0x0000ff00, 0xffffffff};
 
-static UINT32 mdwin_getpal32(CMNPALFN *self, UINT num) {
+static void mdpalcnv(CMNPAL *dst, const RGB32 *src, UINT pals, UINT bpp) {
 
-	if (num < MEMDBG32_PALS) {
-		return(mdwinpal[num] & 0xffffff);
+	UINT	i;
+
+	switch(bpp) {
+		case 32:
+			for (i=0; i<pals; i++) {
+				dst[i].pal32.d = src[i].d;
+			}
+			break;
 	}
-	return(0);
 }
 
 static void mdwincreate(HWND hWnd) {
 
 	int			width;
 	int			height;
-	CMNPALFN	palfn;
 
 	memdbg32_initialize();
 	memdbg32_getsize(&width, &height);
-	palfn.get8 = NULL;
-	palfn.get32 = mdwin_getpal32;
-	palfn.cnv16 = NULL;
-	palfn.userdata = 0;
-	memdbg32_setpal(&palfn);
 	setclientsize(hWnd, width, height);
 	mdbgwin.hbmp = allocbmp(width, height, &mdbgwin.vram);
 	if (mdbgwin.hbmp) {
-		memdbg32_paint(&mdbgwin.vram, TRUE);
+		memdbg32_paint(&mdbgwin.vram, mdpalcnv, TRUE);
 	}
 }
 
@@ -273,7 +269,7 @@ void memdbg_destroy(void) {
 void memdbg_process(void) {
 
 	if ((mdbgwin.hwnd) && (mdbgwin.hbmp)) {
-		if (memdbg32_paint(&mdbgwin.vram, FALSE)) {
+		if (memdbg32_paint(&mdbgwin.vram, mdpalcnv, FALSE)) {
 			InvalidateRect(mdbgwin.hwnd, NULL, TRUE);
 		}
 	}
@@ -286,7 +282,7 @@ void memdbg_readini(void) {
 	mdbgcfg.posx = CW_USEDEFAULT;
 	mdbgcfg.posy = CW_USEDEFAULT;
 	file_cpyname(path, file_getcd(inifile), sizeof(path));
-	profile_iniread(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(PFTBL));
+	profile_iniread(path, mdbgapp, mdbgini, NELEMENTS(mdbgini), NULL);
 }
 
 void memdbg_writeini(void) {
@@ -294,7 +290,7 @@ void memdbg_writeini(void) {
 	char	path[MAX_PATH];
 
 	file_cpyname(path, file_getcd(inifile), sizeof(path));
-	profile_iniwrite(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(PFTBL));
+	profile_iniwrite(path, mdbgapp, mdbgini, NELEMENTS(mdbgini), NULL);
 }
 #endif
 
@@ -322,7 +318,7 @@ static const PFTBL skbdini[] = {
 	{"WindposX", PFTYPE_SINT32,		&skbdcfg.posx,			0},
 	{"WindposY", PFTYPE_SINT32,		&skbdcfg.posy,			0}};
 
-static void skpalcnv(CMNPAL *dst, RGB32 *src, UINT pals, UINT bpp) {
+static void skpalcnv(CMNPAL *dst, const RGB32 *src, UINT pals, UINT bpp) {
 
 	UINT	i;
 
@@ -344,7 +340,7 @@ static void skcreate(HWND hWnd) {
 	setclientsize(hWnd, width, height);
 	skbdwin.hbmp = allocbmp(width, height, &skbdwin.vram);
 	if (skbdwin.hbmp) {
-		softkbd_paint(&skbdwin.vram, skpalcnv);
+		softkbd_paint(&skbdwin.vram, skpalcnv, TRUE);
 	}
 }
 
@@ -476,6 +472,15 @@ void skbdwin_destroy(void) {
 	}
 }
 
+void skbdwin_process(void) {
+
+	if ((skbdwin.hwnd) && (skbdwin.hbmp)) {
+		if (softkbd_paint(&skbdwin.vram, skpalcnv, FALSE)) {
+			InvalidateRect(skbdwin.hwnd, NULL, TRUE);
+		}
+	}
+}
+
 void skbdwin_readini(void) {
 
 	char	path[MAX_PATH];
@@ -483,8 +488,7 @@ void skbdwin_readini(void) {
 	skbdcfg.posx = CW_USEDEFAULT;
 	skbdcfg.posy = CW_USEDEFAULT;
 	file_cpyname(path, file_getcd(inifile), sizeof(path));
-	profile_iniread(path, skbdapp,
-								skbdini, sizeof(skbdini)/sizeof(PFTBL));
+	profile_iniread(path, skbdapp, skbdini, NELEMENTS(skbdini), NULL);
 }
 
 void skbdwin_writeini(void) {
@@ -492,8 +496,7 @@ void skbdwin_writeini(void) {
 	char	path[MAX_PATH];
 
 	file_cpyname(path, file_getcd(inifile), sizeof(path));
-	profile_iniwrite(path, skbdapp,
-								skbdini, sizeof(skbdini)/sizeof(PFTBL));
+	profile_iniwrite(path, skbdapp, skbdini, NELEMENTS(skbdini), NULL);
 }
 #endif