--- np2/win9x/ini.cpp 2005/02/09 20:11:35 1.32 +++ np2/win9x/ini.cpp 2005/03/16 06:05:18 1.35 @@ -180,7 +180,7 @@ const OEMCHAR *item; pterm = tbl + count; while(p < pterm) { #if defined(OSLANG_UCS2) - oemtext_sjis2oem(item, NELEMENTS(item), p->item, (UINT)-1); + oemtext_sjistooem(item, NELEMENTS(item), p->item, (UINT)-1); #else item = p->item; #endif @@ -407,7 +407,7 @@ static const INITBL iniitem[] = { {"DIPswtch", INITYPE_ARGH8, np2cfg.dipsw, 3}, {"MEMswtch", INITYPE_ARGH8, np2cfg.memsw, 8}, - {"ExMemory", INIMAX_UINT8, &np2cfg.EXTMEM, 13}, + {"ExMemory", INIMAX_UINT8, &np2cfg.EXTMEM, 63}, {"ITF_WORK", INIRO_BOOL, &np2cfg.ITF_WORK, 0}, {"HDD1FILE", INITYPE_STR, np2cfg.sasihdd[0], MAX_PATH}, @@ -531,12 +531,13 @@ static const INITBL iniitem[] = { {"useromeo", INITYPE_BOOL, &np2oscfg.useromeo, 0}, // ver0.74 {"thickfrm", INITYPE_BOOL, &np2oscfg.thickframe, 0}, // ver0.77 {"xrollkey", INIRO_BOOL, &np2oscfg.xrollkey, 0}, // ver0.78 + {"fscrnbpp", INIRO_UINT8, &np2oscfg.fscrnbpp, 0}, {"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}}; void initgetfile(OEMCHAR *path, UINT size) { - OEMCHAR *p; +const OEMCHAR *ext; file_cpyname(path, modulefile, size); if (np2arg.ini) { @@ -547,8 +548,8 @@ void initgetfile(OEMCHAR *path, UINT siz else { file_cpyname(path, np2arg.ini, size); } - p = file_getext(path); - if (!(*p)) { + ext = file_getext(path); + if (ext[0] != '\0') { file_catname(path, OEMTEXT(".ini"), size); } }