np2/win9x/ini.cpp - diff

Return to ini.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/ini.cpp between versions 1.29 and 1.31

version 1.29, 2004/05/23 15:01:45	version 1.31, 2005/02/07 14:46:14
Line 12	Line 12



static BOOL inigetbmp(const BYTE *ptr, UINT pos) {	static BOOL inigetbmp(const UINT8 *ptr, UINT pos) {

return((ptr[pos >> 3] >> (pos & 7)) & 1);	return((ptr[pos >> 3] >> (pos & 7)) & 1);
}	}

static void inisetbmp(BYTE *ptr, UINT pos, BOOL set) {	static void inisetbmp(UINT8 *ptr, UINT pos, BOOL set) {

UINT8 bit;	UINT8 bit;

Line 60 static void inirdargs16(const char *src,	Line 60 static void inirdargs16(const char *src,

static void inirdargh8(const char src, const INITBL ini) {	static void inirdargh8(const char src, const INITBL ini) {

BYTE *dst;	UINT8 *dst;
int dsize;	int dsize;
int i;	int i;
BYTE val;	UINT8 val;
BOOL set;	BOOL set;
char c;	char c;

dst = (BYTE *)ini->value;	dst = (UINT8 *)ini->value;
dsize = ini->arg;	dsize = ini->arg;

for (i=0; i<dsize; i++) {	for (i=0; i<dsize; i++) {
Line 106 static void inirdargh8(const char *src,	Line 106 static void inirdargh8(const char *src,
static void iniwrsetargh8(char work, int size, const INITBL ini) {	static void iniwrsetargh8(char work, int size, const INITBL ini) {

UINT i;	UINT i;
const BYTE *ptr;	const UINT8 *ptr;
UINT arg;	UINT arg;
char tmp[8];	char tmp[8];

ptr = (BYTE *)ini->value;	ptr = (UINT8 *)ini->value;
arg = ini->arg;	arg = ini->arg;
if (arg > 0) {	if (arg > 0) {
SPRINTF(tmp, "%.2x", ptr[0]);	SPRINTF(tmp, "%.2x", ptr[0]);
Line 135 static void inirdbyte3(const char *src,	Line 135 static void inirdbyte3(const char *src,
}	}
if ((((src[i] - '0') & 0xff) < 9) \|\|	if ((((src[i] - '0') & 0xff) < 9) \|\|
(((src[i] - 'A') & 0xdf) < 26)) {	(((src[i] - 'A') & 0xdf) < 26)) {
((BYTE *)ini->value)[i] = src[i];	((UINT8 *)ini->value)[i] = src[i];
}	}
}	}
}	}
Line 144 static void inirdkb(const char *src, con	Line 144 static void inirdkb(const char *src, con

if ((!milstr_extendcmp(src, "PC98")) \|\|	if ((!milstr_extendcmp(src, "PC98")) \|\|
(!milstr_cmp(src, "98"))) {	(!milstr_cmp(src, "98"))) {
(BYTE )ini->value = KEY_PC98;	(UINT8 )ini->value = KEY_PC98;
}	}
else if ((!milstr_extendcmp(src, "DOS")) \|\|	else if ((!milstr_extendcmp(src, "DOS")) \|\|
(!milstr_cmp(src, "PCAT")) \|\|	(!milstr_cmp(src, "PCAT")) \|\|
(!milstr_cmp(src, "AT"))) {	(!milstr_cmp(src, "AT"))) {
(BYTE )ini->value = KEY_KEY106;	(UINT8 )ini->value = KEY_KEY106;
}	}
else if ((!milstr_extendcmp(src, "KEY101")) \|\|	else if ((!milstr_extendcmp(src, "KEY101")) \|\|
(!milstr_cmp(src, "101"))) {	(!milstr_cmp(src, "101"))) {
(BYTE )ini->value = KEY_KEY101;	(UINT8 )ini->value = KEY_KEY101;
}	}
}	}

Line 179 const INITBL *pterm;	Line 179 const INITBL *pterm;

case INITYPE_BOOL:	case INITYPE_BOOL:
GetPrivateProfileString(title, p->item,	GetPrivateProfileString(title, p->item,
(((BYTE )p->value))?str_true:str_false,	(((UINT8 )p->value))?str_true:str_false,
work, sizeof(work), path);	work, sizeof(work), path);
((BYTE )p->value) = (!milstr_cmp(work, str_true))?1:0;	((UINT8 )p->value) = (!milstr_cmp(work, str_true))?1:0;
break;	break;

case INITYPE_BITMAP:	case INITYPE_BITMAP:
GetPrivateProfileString(title, p->item,	GetPrivateProfileString(title, p->item,
(inigetbmp((BYTE *)p->value, p->arg))?str_true:str_false,	(inigetbmp((UINT8 *)p->value, p->arg))?str_true:str_false,
work, sizeof(work), path);	work, sizeof(work), path);
inisetbmp((BYTE *)p->value, p->arg,	inisetbmp((UINT8 *)p->value, p->arg,
(milstr_cmp(work, str_true) == 0));	(milstr_cmp(work, str_true) == 0));
break;	break;

Line 206 const INITBL *pterm;	Line 206 const INITBL *pterm;

case INITYPE_SINT8:	case INITYPE_SINT8:
case INITYPE_UINT8:	case INITYPE_UINT8:
val = (BYTE)GetPrivateProfileInt(title, p->item,	val = (UINT8)GetPrivateProfileInt(title, p->item,
(BYTE )p->value, path);	(UINT8 )p->value, path);
(UINT8 )p->value = (UINT8)val;	(UINT8 )p->value = (UINT8)val;
break;	break;

Line 226 const INITBL *pterm;	Line 226 const INITBL *pterm;
break;	break;

case INITYPE_HEX8:	case INITYPE_HEX8:
SPRINTF(work, str_x, (BYTE )p->value),	SPRINTF(work, str_x, (UINT8 )p->value),
GetPrivateProfileString(title, p->item, work,	GetPrivateProfileString(title, p->item, work,
work, sizeof(work), path);	work, sizeof(work), path);
val = (BYTE)milstr_solveHEX(work);	val = (UINT8)milstr_solveHEX(work);
(UINT8 )p->value = (UINT8)val;	(UINT8 )p->value = (UINT8)val;
break;	break;

Line 285 const char *set;	Line 285 const char *set;
break;	break;

case INITYPE_BOOL:	case INITYPE_BOOL:
set = (((BYTE )p->value))?str_true:str_false;	set = (((UINT8 )p->value))?str_true:str_false;
break;	break;

case INITYPE_ARGH8:	case INITYPE_ARGH8:
Line 511 static const INITBL iniitem[] = {	Line 511 static const INITBL iniitem[] = {
{"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, // ver0.73	{"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, // ver0.73
{"useromeo", INITYPE_BOOL, &np2oscfg.useromeo, 0}, // ver0.74	{"useromeo", INITYPE_BOOL, &np2oscfg.useromeo, 0}, // ver0.74
{"thickfrm", INITYPE_BOOL, &np2oscfg.thickframe, 0}, // ver0.77	{"thickfrm", INITYPE_BOOL, &np2oscfg.thickframe, 0}, // ver0.77
	{"xrollkey", INIRO_BOOL, &np2oscfg.xrollkey, 0}, // ver0.78
{"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}};	{"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}};


Line 543 void initload(void) {	Line 544 void initload(void) {
char path[MAX_PATH];	char path[MAX_PATH];

initgetfile(path, sizeof(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) {	void initsave(void) {
Line 551 void initsave(void) {	Line 552 void initsave(void) {
char path[MAX_PATH];	char path[MAX_PATH];

initgetfile(path, sizeof(path));	initgetfile(path, sizeof(path));
ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL));	ini_write(path, ini_title, iniitem, NELEMENTS(iniitem));
}	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.29
changed lines
	Added in v.1.31