--- np2/win9x/ini.cpp 2003/10/29 14:02:35 1.7 +++ np2/win9x/ini.cpp 2005/03/20 08:58:19 1.38 @@ -2,20 +2,44 @@ #include #include #include "strres.h" +#include "profile.h" #include "np2.h" #include "np2arg.h" +#if defined(OSLANG_UCS2) +#include "oemtext.h" +#endif #include "dosio.h" #include "ini.h" #include "winkbd.h" #include "pccore.h" -static void inirdargs16(const char *src, const INITBL *ini) { + +static BOOL inigetbmp(const UINT8 *ptr, UINT pos) { + + return((ptr[pos >> 3] >> (pos & 7)) & 1); +} + +static void inisetbmp(UINT8 *ptr, UINT pos, BOOL set) { + + UINT8 bit; + + ptr += (pos >> 3); + bit = 1 << (pos & 7); + if (set) { + *ptr |= bit; + } + else { + *ptr &= ~bit; + } +} + +static void inirdargs16(const OEMCHAR *src, const PFTBL *ini) { SINT16 *dst; int dsize; int i; - char c; + OEMCHAR c; dst = (SINT16 *)ini->value; dsize = ini->arg; @@ -37,16 +61,16 @@ static void inirdargs16(const char *src, } } -static void inirdargh8(const char *src, const INITBL *ini) { +static void inirdargh8(const OEMCHAR *src, const PFTBL *ini) { - BYTE *dst; + UINT8 *dst; int dsize; int i; - BYTE val; + UINT8 val; BOOL set; - char c; + OEMCHAR c; - dst = (BYTE *)ini->value; + dst = (UINT8 *)ini->value; dsize = ini->arg; for (i=0; ivalue; + ptr = (UINT8 *)ini->value; arg = ini->arg; if (arg > 0) { - SPRINTF(tmp, "%.2x", ptr[0]); + OEMSPRINTF(tmp, OEMTEXT("%.2x"), ptr[0]); milstr_ncpy(work, tmp, size); } for (i=1; ivalue)[i] = src[i]; + ((UINT8 *)ini->value)[i] = (UINT8)src[i]; } } } -static void inirdkb(const char *src, const INITBL *ini) { +static void inirdkb(const OEMCHAR *src, const PFTBL *ini) { - if ((!milstr_extendcmp(src, "PC98")) || - (!milstr_cmp(src, "98"))) { - *(BYTE *)ini->value = KEY_PC98; - } - else if ((!milstr_extendcmp(src, "DOS")) || - (!milstr_cmp(src, "PCAT")) || - (!milstr_cmp(src, "AT"))) { - *(BYTE *)ini->value = KEY_KEY106; - } - else if ((!milstr_extendcmp(src, "KEY101")) || - (!milstr_cmp(src, "101"))) { - *(BYTE *)ini->value = KEY_KEY101; + if ((!milstr_extendcmp(src, OEMTEXT("PC98"))) || + (!milstr_cmp(src, OEMTEXT("98")))) { + *(UINT8 *)ini->value = KEY_PC98; + } + else if ((!milstr_extendcmp(src, OEMTEXT("DOS"))) || + (!milstr_cmp(src, OEMTEXT("PCAT"))) || + (!milstr_cmp(src, OEMTEXT("AT")))) { + *(UINT8 *)ini->value = KEY_KEY106; + } + else if ((!milstr_extendcmp(src, OEMTEXT("KEY101"))) || + (!milstr_cmp(src, OEMTEXT("101")))) { + *(UINT8 *)ini->value = KEY_KEY101; } } // ---- -void ini_read(const char *path, const char *title, - const INITBL *tbl, UINT count) { +void ini_read(const OEMCHAR *path, const OEMCHAR *title, + const PFTBL *tbl, UINT count) { -const INITBL *p; -const INITBL *pterm; - char work[512]; - UINT32 val; +const PFTBL *p; +const PFTBL *pterm; + OEMCHAR work[512]; + UINT32 val; p = tbl; pterm = tbl + count; while(p < pterm) { - switch(p->itemtype & INITYPE_MASK) { - case INITYPE_STR: - GetPrivateProfileString(title, p->item, (char *)p->value, - (char *)p->value, p->arg, path); + switch(p->itemtype & PFTYPE_MASK) { + case PFTYPE_STR: + GetPrivateProfileString(title, p->item, (OEMCHAR *)p->value, + (OEMCHAR *)p->value, p->arg, path); break; - case INITYPE_BOOL: + case PFTYPE_BOOL: GetPrivateProfileString(title, p->item, - (*((BYTE *)p->value))?str_true:str_false, - work, sizeof(work), path); - *((BYTE *)p->value) = (!milstr_cmp(work, str_true))?1:0; + (*((UINT8 *)p->value))?str_true:str_false, + work, NELEMENTS(work), path); + *((UINT8 *)p->value) = (!milstr_cmp(work, str_true))?1:0; break; - case INITYPE_ARGS16: + case PFTYPE_BITMAP: + GetPrivateProfileString(title, p->item, + (inigetbmp((UINT8 *)p->value, p->arg))?str_true:str_false, + work, NELEMENTS(work), path); + inisetbmp((UINT8 *)p->value, p->arg, + (milstr_cmp(work, str_true) == 0)); + break; + + case PFTYPE_ARGS16: GetPrivateProfileString(title, p->item, str_null, - work, sizeof(work), path); + work, NELEMENTS(work), path); inirdargs16(work, p); break; - case INITYPE_ARGH8: + case PFTYPE_BIN: GetPrivateProfileString(title, p->item, str_null, - work, sizeof(work), path); + work, NELEMENTS(work), path); inirdargh8(work, p); break; - case INITYPE_SINT8: - case INITYPE_UINT8: - val = (BYTE)GetPrivateProfileInt(title, p->item, - *(BYTE *)p->value, path); - *(BYTE *)p->value = (BYTE)val; + case PFTYPE_SINT8: + case PFTYPE_UINT8: + val = (UINT8)GetPrivateProfileInt(title, p->item, + *(UINT8 *)p->value, path); + *(UINT8 *)p->value = (UINT8)val; break; - case INITYPE_SINT16: - case INITYPE_UINT16: + case PFTYPE_SINT16: + case PFTYPE_UINT16: val = (UINT16)GetPrivateProfileInt(title, p->item, *(UINT16 *)p->value, path); *(UINT16 *)p->value = (UINT16)val; break; - case INITYPE_SINT32: - case INITYPE_UINT32: + case PFTYPE_SINT32: + case PFTYPE_UINT32: val = (UINT32)GetPrivateProfileInt(title, p->item, *(UINT32 *)p->value, path); *(UINT32 *)p->value = (UINT32)val; break; - case INITYPE_HEX8: - SPRINTF(work, str_x, *(BYTE *)p->value), + case PFTYPE_HEX8: + OEMSPRINTF(work, str_x, *(UINT8 *)p->value), GetPrivateProfileString(title, p->item, work, - work, sizeof(work), path); - val = (BYTE)milstr_solveHEX(work); - *(BYTE *)p->value = (BYTE)val; + work, NELEMENTS(work), path); + val = (UINT8)milstr_solveHEX(work); + *(UINT8 *)p->value = (UINT8)val; break; - case INITYPE_HEX16: - SPRINTF(work, str_x, *(UINT16 *)p->value), + case PFTYPE_HEX16: + OEMSPRINTF(work, str_x, *(UINT16 *)p->value), GetPrivateProfileString(title, p->item, work, - work, sizeof(work), path); + work, NELEMENTS(work), path); val = (UINT16)milstr_solveHEX(work); *(UINT16 *)p->value = (UINT16)val; break; - case INITYPE_HEX32: - SPRINTF(work, str_x, *(UINT32 *)p->value), + case PFTYPE_HEX32: + OEMSPRINTF(work, str_x, *(UINT32 *)p->value), GetPrivateProfileString(title, p->item, work, - work, sizeof(work), path); + work, NELEMENTS(work), path); val = (UINT32)milstr_solveHEX(work); - *(UINT16 *)p->value = (UINT32)val; + *(UINT32 *)p->value = (UINT32)val; break; - case INITYPE_BYTE3: + case PFTYPE_BYTE3: GetPrivateProfileString(title, p->item, str_null, - work, sizeof(work), path); + work, NELEMENTS(work), path); inirdbyte3(work, p); break; - case INITYPE_KB: + case PFTYPE_KB: GetPrivateProfileString(title, p->item, str_null, - work, sizeof(work), path); + work, NELEMENTS(work), path); inirdkb(work, p); break; } @@ -236,67 +268,67 @@ const INITBL *pterm; } } -void ini_write(const char *path, const char *title, - const INITBL *tbl, UINT count) { +void ini_write(const OEMCHAR *path, const OEMCHAR *title, + const PFTBL *tbl, UINT count) { -const INITBL *p; -const INITBL *pterm; -const char *set; - char work[512]; +const PFTBL *p; +const PFTBL *pterm; +const OEMCHAR *set; + OEMCHAR work[512]; p = tbl; pterm = tbl + count; while(p < pterm) { - if (!(p->itemtype & INIFLAG_RO)) { + if (!(p->itemtype & PFFLAG_RO)) { work[0] = '\0'; set = work; - switch(p->itemtype & INITYPE_MASK) { - case INITYPE_STR: - set = (char *)p->value; + switch(p->itemtype & PFTYPE_MASK) { + case PFTYPE_STR: + set = (OEMCHAR *)p->value; break; - case INITYPE_BOOL: - set = (*((BYTE *)p->value))?str_true:str_false; + case PFTYPE_BOOL: + set = (*((UINT8 *)p->value))?str_true:str_false; break; - case INITYPE_ARGH8: - iniwrsetargh8(work, sizeof(work), p); + case PFTYPE_BIN: + iniwrsetargh8(work, NELEMENTS(work), p); break; - case INITYPE_SINT8: - SPRINTF(work, str_d, *((char *)p->value)); + case PFTYPE_SINT8: + OEMSPRINTF(work, str_d, *((SINT8 *)p->value)); break; - case INITYPE_SINT16: - SPRINTF(work, str_d, *((SINT16 *)p->value)); + case PFTYPE_SINT16: + OEMSPRINTF(work, str_d, *((SINT16 *)p->value)); break; - case INITYPE_SINT32: - SPRINTF(work, str_d, *((SINT32 *)p->value)); + case PFTYPE_SINT32: + OEMSPRINTF(work, str_d, *((SINT32 *)p->value)); break; - case INITYPE_UINT8: - SPRINTF(work, str_u, *((BYTE *)p->value)); + case PFTYPE_UINT8: + OEMSPRINTF(work, str_u, *((UINT8 *)p->value)); break; - case INITYPE_UINT16: - SPRINTF(work, str_u, *((UINT16 *)p->value)); + case PFTYPE_UINT16: + OEMSPRINTF(work, str_u, *((UINT16 *)p->value)); break; - case INITYPE_UINT32: - SPRINTF(work, str_u, *((UINT32 *)p->value)); + case PFTYPE_UINT32: + OEMSPRINTF(work, str_u, *((UINT32 *)p->value)); break; - case INITYPE_HEX8: - SPRINTF(work, str_x, *((BYTE *)p->value)); + case PFTYPE_HEX8: + OEMSPRINTF(work, str_x, *((UINT8 *)p->value)); break; - case INITYPE_HEX16: - SPRINTF(work, str_x, *((UINT16 *)p->value)); + case PFTYPE_HEX16: + OEMSPRINTF(work, str_x, *((UINT16 *)p->value)); break; - case INITYPE_HEX32: - SPRINTF(work, str_x, *((UINT32 *)p->value)); + case PFTYPE_HEX32: + OEMSPRINTF(work, str_x, *((UINT32 *)p->value)); break; default: @@ -314,188 +346,213 @@ const char *set; // ---- -static const char ini_title[] = "NekoProjectII"; +#if !defined(SUPPORT_PC9821) +static const OEMCHAR ini_title[] = OEMTEXT("NekoProjectII"); +#else +static const OEMCHAR ini_title[] = OEMTEXT("NekoProject21"); +#endif enum { - INIRO_STR = INITYPE_STR + INIFLAG_RO, - INIRO_BOOL = INITYPE_BOOL + INIFLAG_RO, - INIMAX_UINT8 = INITYPE_UINT8 + INIFLAG_RO, - INIAND_UINT8 = INITYPE_UINT8 + INIFLAG_AND, - INIROMAX_SINT32 = INITYPE_SINT32 + INIFLAG_RO + INIFLAG_MAX, - INIROAND_HEX32 = INITYPE_HEX32 + INIFLAG_RO + INIFLAG_AND, - - INIRO_BYTE3 = INITYPE_BYTE3 + INIFLAG_RO, - INIRO_KB = INITYPE_KB + INIFLAG_RO + PFRO_STR = PFFLAG_RO + PFTYPE_STR, + PFRO_BOOL = PFFLAG_RO + PFTYPE_BOOL, + PFRO_BITMAP = PFFLAG_RO + PFTYPE_BITMAP, + PFRO_UINT8 = PFFLAG_RO + PFTYPE_UINT8, + PFRO_SINT32 = PFFLAG_RO + PFTYPE_SINT32, + PFRO_HEX32 = PFFLAG_RO + PFTYPE_HEX32, + PFRO_BYTE3 = PFFLAG_RO + PFTYPE_BYTE3, + PFRO_KB = PFFLAG_RO + PFTYPE_KB }; -static const INITBL iniitem[] = { - {"np2title", INIRO_STR, np2oscfg.titles, - sizeof(np2oscfg.titles)}, - {"np2winid", INIRO_BYTE3, np2oscfg.winid, 0}, - {"WindposX", INITYPE_SINT32, &np2oscfg.winx, 0}, - {"WindposY", INITYPE_SINT32, &np2oscfg.winy, 0}, - {"paddingx", INIROMAX_SINT32, &np2oscfg.paddingx, 32}, - {"paddingy", INIROMAX_SINT32, &np2oscfg.paddingy, 32}, - {"Win_Snap", INITYPE_BOOL, &np2oscfg.WINSNAP, 0}, - - {"FDfolder", INITYPE_STR, fddfolder, MAX_PATH}, - {"HDfolder", INITYPE_STR, hddfolder, MAX_PATH}, - {"bmap_Dir", INITYPE_STR, bmpfilefolder, MAX_PATH}, - {"fontfile", INITYPE_STR, np2cfg.fontfile, MAX_PATH}, - - {"clk_base", INITYPE_UINT32, &np2cfg.baseclock, 0}, - {"clk_mult", INITYPE_UINT32, &np2cfg.multiple, 0}, - - {"DIPswtch", INITYPE_ARGH8, np2cfg.dipsw, 3}, - {"MEMswtch", INITYPE_ARGH8, np2cfg.memsw, 8}, - {"ExMemory", INIMAX_UINT8, &np2cfg.EXTMEM, 13}, - {"ITF_WORK", INIRO_BOOL, &np2cfg.ITF_WORK, 0}, - - {"HDD1FILE", INITYPE_STR, np2cfg.hddfile[0], MAX_PATH}, - {"HDD2FILE", INITYPE_STR, np2cfg.hddfile[1], MAX_PATH}, -// {"Removabl", INI_EX|1, 0, &np2cfg.REMOVEHD, 0}, - - {"SampleHz", INITYPE_UINT16, &np2cfg.samplingrate, 0}, - {"Latencys", INITYPE_UINT16, &np2cfg.delayms, 0}, - {"SNDboard", INITYPE_HEX8, &np2cfg.SOUND_SW, 0}, - {"BEEP_vol", INIAND_UINT8, &np2cfg.BEEP_VOL, 3}, - {"xspeaker", INIRO_BOOL, &np2cfg.snd_x, 0}, - - {"SND14vol", INITYPE_ARGH8, np2cfg.vol14, 6}, -// {"opt14BRD", INITYPE_ARGH8, np2cfg.snd14opt, 3}, - {"opt26BRD", INITYPE_HEX8, &np2cfg.snd26opt, 0}, - {"opt86BRD", INITYPE_HEX8, &np2cfg.snd86opt, 0}, - {"optSPBRD", INITYPE_HEX8, &np2cfg.spbopt, 0}, - {"optSPBVR", INITYPE_HEX8, &np2cfg.spb_vrc, 0}, - {"optSPBVL", INIMAX_UINT8, &np2cfg.spb_vrl, 24}, - {"optSPB_X", INITYPE_BOOL, &np2cfg.spb_x, 0}, - {"optMPU98", INITYPE_HEX8 &np2cfg.mpuopt, 0}, - - {"volume_F", INIMAX_UINT8, &np2cfg.vol_fm, 128}, - {"volume_S", INIMAX_UINT8, &np2cfg.vol_ssg, 128}, - {"volume_A", INIMAX_UINT8, &np2cfg.vol_adpcm, 128}, - {"volume_P", INIMAX_UINT8, &np2cfg.vol_pcm, 128}, - {"volume_R", INIMAX_UINT8, &np2cfg.vol_rhythm, 128}, - - {"Seek_Snd", INITYPE_BOOL, &np2cfg.MOTOR, 0}, - {"Seek_Vol", INIMAX_UINT8, &np2cfg.MOTORVOL, 100}, - - {"btnRAPID", INITYPE_BOOL, &np2cfg.BTN_RAPID, 0}, - {"btn_MODE", INITYPE_BOOL, &np2cfg.BTN_MODE, 0}, - {"Mouse_sw", INITYPE_BOOL, &np2oscfg.MOUSE_SW, 0}, - {"MS_RAPID", INITYPE_BOOL, &np2cfg.MOUSERAPID, 0}, - - {"backgrnd", INIAND_UINT8, &np2oscfg.background, 3}, - {"VRAMwait", INITYPE_ARGH8, np2cfg.wait, 6}, - {"DspClock", INIAND_UINT8, &np2oscfg.DISPCLK, 3}, - {"DispSync", INITYPE_BOOL, &np2cfg.DISPSYNC, 0}, - {"Real_Pal", INITYPE_BOOL, &np2cfg.RASTER, 0}, - {"RPal_tim", INIMAX_UINT8, &np2cfg.realpal, 64}, - {"s_NOWAIT", INITYPE_BOOL, &np2oscfg.NOWAIT, 0}, - {"SkpFrame", INITYPE_UINT8, &np2oscfg.DRAW_SKIP, 0}, - {"uPD72020", INITYPE_BOOL, &np2cfg.uPD72020, 0}, - {"GRCG_EGC", INIAND_UINT8, &np2cfg.grcg, 3}, - {"color16b", INITYPE_BOOL, &np2cfg.color16, 0}, - {"skipline", INITYPE_BOOL, &np2cfg.skipline, 0}, - {"skplight", INITYPE_UINT16 &np2cfg.skiplight, 0}, - {"LCD_MODE", INIAND_UINT8, &np2cfg.LCD_MODE, 0x03}, - {"BG_COLOR", INIROAND_HEX32, &np2cfg.BG_COLOR, 0xffffff}, - {"FG_COLOR", INIROAND_HEX32, &np2cfg.FG_COLOR, 0xffffff}, - - {"pc9861_e", INITYPE_BOOL, &np2cfg.pc9861enable, 0}, - {"pc9861_s", INITYPE_ARGH8, np2cfg.pc9861sw, 3}, - {"pc9861_j", INITYPE_ARGH8, np2cfg.pc9861jmp, 6}, - - {"calendar", INITYPE_BOOL, &np2cfg.calendar, 0}, - {"USE144FD", INITYPE_BOOL, &np2cfg.usefd144, 0}, +static const PFTBL iniitem[] = { + PFSTR("np2title", PFRO_STR, np2oscfg.titles), + PFVAL("np2winid", PFRO_BYTE3, np2oscfg.winid), + PFVAL("WindposX", PFTYPE_SINT32, &np2oscfg.winx), + PFVAL("WindposY", PFTYPE_SINT32, &np2oscfg.winy), + PFMAX("paddingx", PFRO_SINT32, &np2oscfg.paddingx, 32), + PFMAX("paddingy", PFRO_SINT32, &np2oscfg.paddingy, 32), + PFVAL("Win_Snap", PFTYPE_BOOL, &np2oscfg.WINSNAP), + + PFSTR("FDfolder", PFTYPE_STR, fddfolder), + PFSTR("HDfolder", PFTYPE_STR, hddfolder), + PFSTR("bmap_Dir", PFTYPE_STR, bmpfilefolder), + PFSTR("fontfile", PFTYPE_STR, np2cfg.fontfile), + PFSTR("biospath", PFRO_STR, np2cfg.biospath), + +#if defined(SUPPORT_HOSTDRV) + PFSTR("hdrvroot", PFRO_STR, np2cfg.hdrvroot), + PFVAL("hdrv_acc", PFRO_UINT8, &np2cfg.hdrvacc), +#endif + + PFSTR("pc_model", PFTYPE_STR, &np2cfg.model), + PFVAL("clk_base", PFTYPE_UINT32, &np2cfg.baseclock), + PFVAL("clk_mult", PFTYPE_UINT32, &np2cfg.multiple), + + PFEXT("DIPswtch", PFTYPE_BIN, np2cfg.dipsw, 3), + PFEXT("MEMswtch", PFTYPE_BIN, np2cfg.memsw, 8), + PFMAX("ExMemory", PFTYPE_UINT8, &np2cfg.EXTMEM, 63), + PFVAL("ITF_WORK", PFRO_BOOL, &np2cfg.ITF_WORK), + + PFSTR("HDD1FILE", PFTYPE_STR, np2cfg.sasihdd[0]), + PFSTR("HDD2FILE", PFTYPE_STR, np2cfg.sasihdd[1]), +#if defined(SUPPORT_SCSI) + PFSTR("SCSIHDD0", PFTYPE_STR, np2cfg.scsihdd[0]), + PFSTR("SCSIHDD1", PFTYPE_STR, np2cfg.scsihdd[1]), + PFSTR("SCSIHDD2", PFTYPE_STR, np2cfg.scsihdd[2]), + PFSTR("SCSIHDD3", PFTYPE_STR, np2cfg.scsihdd[3]), +#endif + + PFVAL("SampleHz", PFTYPE_UINT16, &np2cfg.samplingrate), + PFVAL("Latencys", PFTYPE_UINT16, &np2cfg.delayms), + PFVAL("SNDboard", PFTYPE_HEX8, &np2cfg.SOUND_SW), + PFAND("BEEP_vol", PFTYPE_UINT8, &np2cfg.BEEP_VOL, 3), + PFVAL("xspeaker", PFRO_BOOL, &np2cfg.snd_x), + + PFEXT("SND14vol", PFTYPE_BIN, np2cfg.vol14, 6), +// PFEXT("opt14BRD", PFTYPE_BIN, np2cfg.snd14opt, 3), + PFVAL("opt26BRD", PFTYPE_HEX8, &np2cfg.snd26opt), + PFVAL("opt86BRD", PFTYPE_HEX8, &np2cfg.snd86opt), + PFVAL("optSPBRD", PFTYPE_HEX8, &np2cfg.spbopt), + PFVAL("optSPBVR", PFTYPE_HEX8, &np2cfg.spb_vrc), + PFMAX("optSPBVL", PFTYPE_UINT8, &np2cfg.spb_vrl, 24), + PFVAL("optSPB_X", PFTYPE_BOOL, &np2cfg.spb_x), + PFVAL("optMPU98", PFTYPE_HEX8, &np2cfg.mpuopt), + + PFMAX("volume_F", PFTYPE_UINT8, &np2cfg.vol_fm, 128), + PFMAX("volume_S", PFTYPE_UINT8, &np2cfg.vol_ssg, 128), + PFMAX("volume_A", PFTYPE_UINT8, &np2cfg.vol_adpcm, 128), + PFMAX("volume_P", PFTYPE_UINT8, &np2cfg.vol_pcm, 128), + PFMAX("volume_R", PFTYPE_UINT8, &np2cfg.vol_rhythm, 128), + + PFVAL("Seek_Snd", PFTYPE_BOOL, &np2cfg.MOTOR), + PFMAX("Seek_Vol", PFTYPE_UINT8, &np2cfg.MOTORVOL, 100), + + PFVAL("btnRAPID", PFTYPE_BOOL, &np2cfg.BTN_RAPID), + PFVAL("btn_MODE", PFTYPE_BOOL, &np2cfg.BTN_MODE), + PFVAL("Mouse_sw", PFTYPE_BOOL, &np2oscfg.MOUSE_SW), + PFVAL("MS_RAPID", PFTYPE_BOOL, &np2cfg.MOUSERAPID), + + PFAND("backgrnd", PFTYPE_UINT8, &np2oscfg.background, 3), + PFEXT("VRAMwait", PFTYPE_BIN, np2cfg.wait, 6), + PFAND("DspClock", PFTYPE_UINT8, &np2oscfg.DISPCLK, 3), + PFVAL("DispSync", PFTYPE_BOOL, &np2cfg.DISPSYNC), + PFVAL("Real_Pal", PFTYPE_BOOL, &np2cfg.RASTER), + PFMAX("RPal_tim", PFTYPE_UINT8, &np2cfg.realpal, 64), + PFVAL("s_NOWAIT", PFTYPE_BOOL, &np2oscfg.NOWAIT), + PFVAL("SkpFrame", PFTYPE_UINT8, &np2oscfg.DRAW_SKIP), + PFVAL("uPD72020", PFTYPE_BOOL, &np2cfg.uPD72020), + PFAND("GRCG_EGC", PFTYPE_UINT8, &np2cfg.grcg, 3), + PFVAL("color16b", PFTYPE_BOOL, &np2cfg.color16), + PFVAL("skipline", PFTYPE_BOOL, &np2cfg.skipline), + PFVAL("skplight", PFTYPE_UINT16, &np2cfg.skiplight), + PFAND("LCD_MODE", PFTYPE_UINT8, &np2cfg.LCD_MODE, 0x03), + PFAND("BG_COLOR", PFRO_HEX32, &np2cfg.BG_COLOR, 0xffffff), + PFAND("FG_COLOR", PFRO_HEX32, &np2cfg.FG_COLOR, 0xffffff), + + PFVAL("pc9861_e", PFTYPE_BOOL, &np2cfg.pc9861enable), + PFEXT("pc9861_s", PFTYPE_BIN, np2cfg.pc9861sw, 3), + PFEXT("pc9861_j", PFTYPE_BIN, np2cfg.pc9861jmp, 6), + + PFVAL("calendar", PFTYPE_BOOL, &np2cfg.calendar), + PFVAL("USE144FD", PFTYPE_BOOL, &np2cfg.usefd144), + PFEXT("FDDRIVE1", PFRO_BITMAP, &np2cfg.fddequip, 0), + PFEXT("FDDRIVE2", PFRO_BITMAP, &np2cfg.fddequip, 1), + PFEXT("FDDRIVE3", PFRO_BITMAP, &np2cfg.fddequip, 2), + PFEXT("FDDRIVE4", PFRO_BITMAP, &np2cfg.fddequip, 3), // OS°Í¸¡© - {"keyboard", INIRO_KB, &np2oscfg.KEYBOARD, 0}, - {"F12_COPY", INITYPE_UINT8, &np2oscfg.F12COPY, 0}, - {"Joystick", INITYPE_BOOL, &np2oscfg.JOYPAD1, 0}, - {"Joy1_btn", INITYPE_ARGH8, np2oscfg.JOY1BTN, 4}, - - {"clocknow", INITYPE_UINT8, &np2oscfg.clk_x, 0}, - {"clockfnt", INITYPE_UINT8, &np2oscfg.clk_fnt, 0}, - {"clock_up", INIROAND_HEX32, &np2oscfg.clk_color1, 0xffffff}, - {"clock_dn", INIROAND_HEX32, &np2oscfg.clk_color2, 0xffffff}, - - {"use_sstp", INITYPE_BOOL, &np2oscfg.sstp, 0}, - {"sstpport", INITYPE_UINT16, &np2oscfg.sstpport, 0}, - {"comfirm_", INITYPE_BOOL, &np2oscfg.comfirm, 0}, - {"shortcut", INITYPE_HEX8, &np2oscfg.shortcut, 0}, // ver0.30 - - {"mpu98map", INITYPE_STR, np2oscfg.mpu.mout, MAXPNAMELEN}, - {"mpu98min", INITYPE_STR, np2oscfg.mpu.min, MAXPNAMELEN}, - {"mpu98mdl", INITYPE_STR, np2oscfg.mpu.mdl, 64}, - {"mpu98def", INITYPE_STR, np2oscfg.mpu.def, MAX_PATH}, - - {"com1port", INIMAX_UINT8, &np2oscfg.com1.port, 5}, // ver0.34 - {"com1para", INITYPE_UINT8, &np2oscfg.com1.param, 0}, - {"com1_bps", INITYPE_UINT32, &np2oscfg.com1.speed, 0}, - {"com1mmap", INITYPE_STR, np2oscfg.com1.mout, MAXPNAMELEN}, - {"com1mmdl", INITYPE_STR, np2oscfg.com1.mdl, 64}, - {"com1mdef", INITYPE_STR, np2oscfg.com1.def, MAX_PATH}, - - {"com2port", INIMAX_UINT8, &np2oscfg.com2.port, 5}, // ver0.34 - {"com2para", INITYPE_UINT8, &np2oscfg.com2.param, 0}, - {"com2_bps", INITYPE_UINT32, &np2oscfg.com2.speed, 0}, - {"com2mmap", INITYPE_STR, np2oscfg.com2.mout, MAXPNAMELEN}, - {"com2mmdl", INITYPE_STR, np2oscfg.com2.mdl, 64}, - {"com2mdef", INITYPE_STR, np2oscfg.com2.def, MAX_PATH}, - - {"com3port", INIMAX_UINT8, &np2oscfg.com3.port, 5}, // ver0.34 - {"com3para", INITYPE_UINT8, &np2oscfg.com3.param, 0}, - {"com3_bps", INITYPE_UINT32, &np2oscfg.com3.speed, 0}, - {"com3mmap", INITYPE_STR, np2oscfg.com3.mout, MAXPNAMELEN}, - {"com3mmdl", INITYPE_STR, np2oscfg.com3.mdl, 64}, - {"com3mdef", INITYPE_STR, np2oscfg.com3.def, MAX_PATH}, - - {"force400", INITYPE_BOOL, &np2oscfg.force400, 0}, - {"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0}, - {"STATSAVE", INIRO_BOOL, &np2oscfg.statsave, 0}, - {"nousemmx", INITYPE_BOOL, &np2oscfg.disablemmx, 0}, // ver0.36 - {"toolwind", INITYPE_BOOL, &np2oscfg.toolwin, 0}, // ver0.38 - {"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}}; + PFVAL("keyboard", PFRO_KB, &np2oscfg.KEYBOARD), + PFVAL("F12_COPY", PFTYPE_UINT8, &np2oscfg.F12COPY), + PFVAL("Joystick", PFTYPE_BOOL, &np2oscfg.JOYPAD1), + PFEXT("Joy1_btn", PFTYPE_BIN, np2oscfg.JOY1BTN, 4), + + PFVAL("clocknow", PFTYPE_UINT8, &np2oscfg.clk_x), + PFVAL("clockfnt", PFTYPE_UINT8, &np2oscfg.clk_fnt), + PFAND("clock_up", PFRO_HEX32, &np2oscfg.clk_color1, 0xffffff), + PFAND("clock_dn", PFRO_HEX32, &np2oscfg.clk_color2, 0xffffff), + + PFVAL("use_sstp", PFTYPE_BOOL, &np2oscfg.sstp), + PFVAL("sstpport", PFTYPE_UINT16, &np2oscfg.sstpport), + PFVAL("comfirm_", PFTYPE_BOOL, &np2oscfg.comfirm), + PFVAL("shortcut", PFTYPE_HEX8, &np2oscfg.shortcut), + + PFSTR("mpu98map", PFTYPE_STR, np2oscfg.mpu.mout), + PFSTR("mpu98min", PFTYPE_STR, np2oscfg.mpu.min), + PFSTR("mpu98mdl", PFTYPE_STR, np2oscfg.mpu.mdl), + PFSTR("mpu98def", PFTYPE_STR, np2oscfg.mpu.def), + + PFMAX("com1port", PFTYPE_UINT8, &np2oscfg.com1.port, 5), + PFVAL("com1para", PFTYPE_UINT8, &np2oscfg.com1.param), + PFVAL("com1_bps", PFTYPE_UINT32, &np2oscfg.com1.speed), + PFSTR("com1mmap", PFTYPE_STR, np2oscfg.com1.mout), + PFSTR("com1mmdl", PFTYPE_STR, np2oscfg.com1.mdl), + PFSTR("com1mdef", PFTYPE_STR, np2oscfg.com1.def), + + PFMAX("com2port", PFTYPE_UINT8, &np2oscfg.com2.port, 5), + PFVAL("com2para", PFTYPE_UINT8, &np2oscfg.com2.param), + PFVAL("com2_bps", PFTYPE_UINT32, &np2oscfg.com2.speed), + PFSTR("com2mmap", PFTYPE_STR, np2oscfg.com2.mout), + PFSTR("com2mmdl", PFTYPE_STR, np2oscfg.com2.mdl), + PFSTR("com2mdef", PFTYPE_STR, np2oscfg.com2.def), + + PFMAX("com3port", PFTYPE_UINT8, &np2oscfg.com3.port, 5), + PFVAL("com3para", PFTYPE_UINT8, &np2oscfg.com3.param), + PFVAL("com3_bps", PFTYPE_UINT32, &np2oscfg.com3.speed), + PFSTR("com3mmap", PFTYPE_STR, np2oscfg.com3.mout), + PFSTR("com3mmdl", PFTYPE_STR, np2oscfg.com3.mdl), + PFSTR("com3mdef", PFTYPE_STR, np2oscfg.com3.def), + + PFVAL("force400", PFRO_BOOL, &np2oscfg.force400), + PFVAL("e_resume", PFTYPE_BOOL, &np2oscfg.resume), + PFVAL("STATSAVE", PFRO_BOOL, &np2oscfg.statsave), + PFVAL("nousemmx", PFTYPE_BOOL, &np2oscfg.disablemmx), + PFVAL("windtype", PFTYPE_UINT8, &np2oscfg.wintype), + PFVAL("toolwind", PFTYPE_BOOL, &np2oscfg.toolwin), + PFVAL("keydispl", PFTYPE_BOOL, &np2oscfg.keydisp), + PFVAL("jast_snd", PFTYPE_BOOL, &np2oscfg.jastsnd), + PFVAL("useromeo", PFTYPE_BOOL, &np2oscfg.useromeo), + PFVAL("thickfrm", PFTYPE_BOOL, &np2oscfg.thickframe), + PFVAL("xrollkey", PFRO_BOOL, &np2oscfg.xrollkey), + PFVAL("fscrnbpp", PFRO_UINT8, &np2oscfg.fscrnbpp), + PFVAL("I286SAVE", PFRO_BOOL, &np2oscfg.I286SAVE)}; -static void getinifile(char *initfile, int max) { +void initgetfile(OEMCHAR *path, UINT size) { - char *p; +const OEMCHAR *ext; - milstr_ncpy(initfile, modulefile, max); + file_cpyname(path, modulefile, size); if (np2arg.ini) { if ((np2arg.ini[0] == '/') || (np2arg.ini[0] == '-')) { - file_cutname(initfile); - milstr_ncat(initfile, file_getname(np2arg.ini + 2), max); + file_cutname(path); + file_catname(path, file_getname(np2arg.ini + 2), size); } else { - milstr_ncpy(initfile, np2arg.ini, max); + file_cpyname(path, np2arg.ini, size); } - p = file_getext(initfile); - if (!(*p)) { - milstr_ncat(initfile, ".ini", max); + ext = file_getext(path); + if (ext[0] != '\0') { + file_catname(path, OEMTEXT(".ini"), size); } } else { - file_cutext(initfile); - milstr_ncat(initfile, ".ini", max); + file_cutext(path); + file_catname(path, OEMTEXT(".ini"), size); } } void initload(void) { - char path[MAX_PATH]; + OEMCHAR path[MAX_PATH]; - getinifile(path, sizeof(path)); - ini_read(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + initgetfile(path, NELEMENTS(path)); + ini_read(path, ini_title, iniitem, NELEMENTS(iniitem)); } void initsave(void) { - char path[MAX_PATH]; + OEMCHAR path[MAX_PATH]; - getinifile(path, sizeof(path)); - ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + initgetfile(path, NELEMENTS(path)); + ini_write(path, ini_title, iniitem, NELEMENTS(iniitem)); }