tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

By Eduardo - update hardcoded country and codepage IDs 

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1071 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Luchezar Georgiev 2004-12-05 14:21:00 +00:00
parent a77e3ef3c7
commit 7b0a023193
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/history.txt
View File

@ -350,6 +350,7 @@
* portab.h: pragma aux default to gain ~800B unpacked size (Watcom) * portab.h: pragma aux default to gain ~800B unpacked size (Watcom)
(the last 2 changes proposed by Bart Oldeman) (the last 2 changes proposed by Bart Oldeman)
+ Changes Eduardo + Changes Eduardo
* config.c: update hardcoded country and codepage IDs
* country.asm: added NLS uppercase/collating tables (437,850,857,858) * country.asm: added NLS uppercase/collating tables (437,850,857,858)
* inthndlr.c: * inthndlr.c:
- added Int 2Fh/26-29h processing for NLSFUNC (with Lucho) - added Int 2Fh/26-29h processing for NLSFUNC (with Lucho)

2
hdr/nls.h
View File

@ -476,7 +476,7 @@ struct nlsInfoBlock { /* This block contains all information
}; };
extern struct nlsInfoBlock nlsInfo; extern struct nlsInfoBlock nlsInfo;
extern struct nlsPackage ASM nlsPackageHardcoded; extern struct nlsPackage FAR ASM nlsPackageHardcoded;
/* These are the "must have" tables within the hard coded NLS pkg */ /* These are the "must have" tables within the hard coded NLS pkg */
extern struct nlsFnamTerm FAR ASM nlsFnameTermHardcoded; extern struct nlsFnamTerm FAR ASM nlsFnameTermHardcoded;
extern struct nlsDBCS FAR ASM nlsDBCSHardcoded; extern struct nlsDBCS FAR ASM nlsDBCSHardcoded;

10
kernel/config.c
View File

@ -1247,6 +1247,8 @@ err:printf("%s has invalid format\n", filename);
!= entry.codepage != entry.codepage
&& cpage) && cpage)
continue; continue;
nlsPackageHardcoded.cntry = entry.country;
nlsPackageHardcoded.cp = entry.codepage;
subf_data.length = /* MS-DOS "CTYINFO" is up to 38 bytes */ subf_data.length = /* MS-DOS "CTYINFO" is up to 38 bytes */
min(subf_data.length, sizeof(struct CountrySpecificInfo)); min(subf_data.length, sizeof(struct CountrySpecificInfo));
} }
@ -1255,7 +1257,7 @@ err:printf("%s has invalid format\n", filename);
} }
goto ret; goto ret;
} }
printf("couldn't find country info for country ID %u\n", ccode); printf("couldn't find info for country ID %u\n", ccode);
ret: ret:
close(fd); close(fd);
} }
@ -1796,11 +1798,7 @@ STATIC void config_init_fnodes(int f_nodes_cnt)
*/ */
STATIC void SetAnyDos(PCStr p) STATIC void SetAnyDos(PCStr p)
{ {
if (*p) /* garbage at line end? */ UNREFERENCED_PARAMETER(p);
{
CfgFailure(p);
return;
}
ReturnAnyDosVersionExpected = TRUE; ReturnAnyDosVersionExpected = TRUE;
} }