--- np2/win9x/ini.cpp 2003/11/04 15:44:59 1.11 +++ np2/win9x/ini.cpp 2005/02/07 14:46:14 1.31 @@ -2,6 +2,7 @@ #include #include #include "strres.h" +#include "profile.h" #include "np2.h" #include "np2arg.h" #include "dosio.h" @@ -10,6 +11,26 @@ #include "pccore.h" + +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 char *src, const INITBL *ini) { SINT16 *dst; @@ -39,14 +60,14 @@ static void inirdargs16(const char *src, static void inirdargh8(const char *src, const INITBL *ini) { - BYTE *dst; + UINT8 *dst; int dsize; int i; - BYTE val; + UINT8 val; BOOL set; char 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]); @@ -114,7 +135,7 @@ static void inirdbyte3(const char *src, } if ((((src[i] - '0') & 0xff) < 9) || (((src[i] - 'A') & 0xdf) < 26)) { - ((BYTE *)ini->value)[i] = src[i]; + ((UINT8 *)ini->value)[i] = src[i]; } } } @@ -123,16 +144,16 @@ static void inirdkb(const char *src, con if ((!milstr_extendcmp(src, "PC98")) || (!milstr_cmp(src, "98"))) { - *(BYTE *)ini->value = KEY_PC98; + *(UINT8 *)ini->value = KEY_PC98; } else if ((!milstr_extendcmp(src, "DOS")) || (!milstr_cmp(src, "PCAT")) || (!milstr_cmp(src, "AT"))) { - *(BYTE *)ini->value = KEY_KEY106; + *(UINT8 *)ini->value = KEY_KEY106; } else if ((!milstr_extendcmp(src, "KEY101")) || (!milstr_cmp(src, "101"))) { - *(BYTE *)ini->value = KEY_KEY101; + *(UINT8 *)ini->value = KEY_KEY101; } } @@ -158,9 +179,17 @@ const INITBL *pterm; case INITYPE_BOOL: GetPrivateProfileString(title, p->item, - (*((BYTE *)p->value))?str_true:str_false, + (*((UINT8 *)p->value))?str_true:str_false, + work, sizeof(work), path); + *((UINT8 *)p->value) = (!milstr_cmp(work, str_true))?1:0; + break; + + case INITYPE_BITMAP: + GetPrivateProfileString(title, p->item, + (inigetbmp((UINT8 *)p->value, p->arg))?str_true:str_false, work, sizeof(work), path); - *((BYTE *)p->value) = (!milstr_cmp(work, str_true))?1:0; + inisetbmp((UINT8 *)p->value, p->arg, + (milstr_cmp(work, str_true) == 0)); break; case INITYPE_ARGS16: @@ -177,9 +206,9 @@ const INITBL *pterm; case INITYPE_SINT8: case INITYPE_UINT8: - val = (BYTE)GetPrivateProfileInt(title, p->item, - *(BYTE *)p->value, path); - *(BYTE *)p->value = (BYTE)val; + val = (UINT8)GetPrivateProfileInt(title, p->item, + *(UINT8 *)p->value, path); + *(UINT8 *)p->value = (UINT8)val; break; case INITYPE_SINT16: @@ -197,11 +226,11 @@ const INITBL *pterm; break; case INITYPE_HEX8: - SPRINTF(work, str_x, *(BYTE *)p->value), + SPRINTF(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; + val = (UINT8)milstr_solveHEX(work); + *(UINT8 *)p->value = (UINT8)val; break; case INITYPE_HEX16: @@ -217,7 +246,7 @@ const INITBL *pterm; GetPrivateProfileString(title, p->item, work, work, sizeof(work), path); val = (UINT32)milstr_solveHEX(work); - *(UINT16 *)p->value = (UINT32)val; + *(UINT32 *)p->value = (UINT32)val; break; case INITYPE_BYTE3: @@ -256,7 +285,7 @@ const char *set; break; case INITYPE_BOOL: - set = (*((BYTE *)p->value))?str_true:str_false; + set = (*((UINT8 *)p->value))?str_true:str_false; break; case INITYPE_ARGH8: @@ -264,7 +293,7 @@ const char *set; break; case INITYPE_SINT8: - SPRINTF(work, str_d, *((char *)p->value)); + SPRINTF(work, str_d, *((SINT8 *)p->value)); break; case INITYPE_SINT16: @@ -276,7 +305,7 @@ const char *set; break; case INITYPE_UINT8: - SPRINTF(work, str_u, *((BYTE *)p->value)); + SPRINTF(work, str_u, *((UINT8 *)p->value)); break; case INITYPE_UINT16: @@ -288,7 +317,7 @@ const char *set; break; case INITYPE_HEX8: - SPRINTF(work, str_x, *((BYTE *)p->value)); + SPRINTF(work, str_x, *((UINT8 *)p->value)); break; case INITYPE_HEX16: @@ -314,11 +343,17 @@ const char *set; // ---- +#if !defined(SUPPORT_PC9821) static const char ini_title[] = "NekoProjectII"; +#else +static const char ini_title[] = "NekoProject21"; +#endif enum { INIRO_STR = INITYPE_STR + INIFLAG_RO, INIRO_BOOL = INITYPE_BOOL + INIFLAG_RO, + INIRO_BITMAP = INITYPE_BITMAP + INIFLAG_RO, + INIRO_UINT8 = INITYPE_UINT8 + INIFLAG_RO, INIMAX_UINT8 = INITYPE_UINT8 + INIFLAG_MAX, INIAND_UINT8 = INITYPE_UINT8 + INIFLAG_AND, INIROMAX_SINT32 = INITYPE_SINT32 + INIFLAG_RO + INIFLAG_MAX, @@ -342,7 +377,12 @@ static const INITBL iniitem[] = { {"HDfolder", INITYPE_STR, hddfolder, MAX_PATH}, {"bmap_Dir", INITYPE_STR, bmpfilefolder, MAX_PATH}, {"fontfile", INITYPE_STR, np2cfg.fontfile, MAX_PATH}, + {"biospath", INIRO_STR, np2cfg.biospath, MAX_PATH}, + {"hdrvroot", INIRO_STR, np2cfg.hdrvroot, MAX_PATH}, + {"hdrv_acc", INIRO_UINT8, &np2cfg.hdrvacc, 0}, + {"pc_model", INITYPE_STR, &np2cfg.model, + sizeof(np2cfg.model)}, {"clk_base", INITYPE_UINT32, &np2cfg.baseclock, 0}, {"clk_mult", INITYPE_UINT32, &np2cfg.multiple, 0}, @@ -351,9 +391,14 @@ static const INITBL iniitem[] = { {"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}, + {"HDD1FILE", INITYPE_STR, np2cfg.sasihdd[0], MAX_PATH}, + {"HDD2FILE", INITYPE_STR, np2cfg.sasihdd[1], MAX_PATH}, +#if defined(SUPPORT_SCSI) + {"SCSIHDD0", INITYPE_STR, np2cfg.scsihdd[0], MAX_PATH}, + {"SCSIHDD1", INITYPE_STR, np2cfg.scsihdd[1], MAX_PATH}, + {"SCSIHDD2", INITYPE_STR, np2cfg.scsihdd[2], MAX_PATH}, + {"SCSIHDD3", INITYPE_STR, np2cfg.scsihdd[3], MAX_PATH}, +#endif {"SampleHz", INITYPE_UINT16, &np2cfg.samplingrate, 0}, {"Latencys", INITYPE_UINT16, &np2cfg.delayms, 0}, @@ -369,7 +414,7 @@ static const INITBL iniitem[] = { {"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}, + {"optMPU98", INITYPE_HEX8, &np2cfg.mpuopt, 0}, {"volume_F", INIMAX_UINT8, &np2cfg.vol_fm, 128}, {"volume_S", INIMAX_UINT8, &np2cfg.vol_ssg, 128}, @@ -397,7 +442,7 @@ static const INITBL iniitem[] = { {"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}, + {"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}, @@ -408,6 +453,11 @@ static const INITBL iniitem[] = { {"calendar", INITYPE_BOOL, &np2cfg.calendar, 0}, {"USE144FD", INITYPE_BOOL, &np2cfg.usefd144, 0}, + {"FDDRIVE1", INIRO_BITMAP, &np2cfg.fddequip, 0}, + {"FDDRIVE2", INIRO_BITMAP, &np2cfg.fddequip, 1}, + {"FDDRIVE3", INIRO_BITMAP, &np2cfg.fddequip, 2}, + {"FDDRIVE4", INIRO_BITMAP, &np2cfg.fddequip, 3}, + // OS°Í¸¡© {"keyboard", INIRO_KB, &np2oscfg.KEYBOARD, 0}, @@ -451,13 +501,17 @@ static const INITBL iniitem[] = { {"com3mmdl", INITYPE_STR, np2oscfg.com3.mdl, 64}, {"com3mdef", INITYPE_STR, np2oscfg.com3.def, MAX_PATH}, - {"force400", INITYPE_BOOL, &np2oscfg.force400, 0}, + {"force400", INIRO_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 {"windtype", INITYPE_UINT8, &np2oscfg.wintype, 0}, {"toolwind", INITYPE_BOOL, &np2oscfg.toolwin, 0}, // ver0.38 {"keydispl", INITYPE_BOOL, &np2oscfg.keydisp, 0}, + {"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, // ver0.73 + {"useromeo", INITYPE_BOOL, &np2oscfg.useromeo, 0}, // ver0.74 + {"thickfrm", INITYPE_BOOL, &np2oscfg.thickframe, 0}, // ver0.77 + {"xrollkey", INIRO_BOOL, &np2oscfg.xrollkey, 0}, // ver0.78 {"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}}; @@ -490,7 +544,7 @@ void initload(void) { char path[MAX_PATH]; initgetfile(path, sizeof(path)); - ini_read(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + ini_read(path, ini_title, iniitem, NELEMENTS(iniitem)); } void initsave(void) { @@ -498,6 +552,6 @@ void initsave(void) { char path[MAX_PATH]; initgetfile(path, sizeof(path)); - ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL)); + ini_write(path, ini_title, iniitem, NELEMENTS(iniitem)); }