--- np2/win9xc/subwind.cpp	2004/04/07 13:15:40	1.3
+++ 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;
@@ -282,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) {
@@ -290,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
 
@@ -364,7 +364,7 @@ static void skpaintmsg(HWND hWnd) {
 
 static LRESULT CALLBACK skproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
 
-	swit	ch(msg) {
+	switch(msg) {
 		case WM_CREATE:
 			skcreate(hWnd);
 			break;
@@ -488,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) {
@@ -497,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