[greatlrd] 24527: adding ansi to utf-8 converting support follow code pages oem437, oem850, windows28591 ( iso-2859-1 Latin 1)
Author: greatlrd Date: Sun Oct 15 23:07:19 2006 New Revision: 24527
URL: http://svn.reactos.org/svn/reactos?rev=24527&view=rev Log: adding ansi to utf-8 converting support follow code pages oem437, oem850, windows28591 ( iso-2859-1 Latin 1)
Added: trunk/rosapps/devutils/roswebparser/Windows28591.h (with props) trunk/rosapps/devutils/roswebparser/oem437.h (with props) trunk/rosapps/devutils/roswebparser/oem850.h (with props) trunk/rosapps/devutils/roswebparser/utf8.c (with props) Modified: trunk/rosapps/devutils/roswebparser/roswebparser.c trunk/rosapps/devutils/roswebparser/roswebparser.rbuild
Added: trunk/rosapps/devutils/roswebparser/Windows28591.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/Windo... ============================================================================== --- trunk/rosapps/devutils/roswebparser/Windows28591.h (added) +++ trunk/rosapps/devutils/roswebparser/Windows28591.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,32 @@ +/* + * Windows OEM 457 code page table. need by english rc files, area 0x80 to 0x9f should be blank + */ + +unsigned short table_Windows28591[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081, + 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, + 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, + 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, + 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, + 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, + 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, + 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, + 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, + 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, + 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF};
Propchange: trunk/rosapps/devutils/roswebparser/Windows28591.h ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/devutils/roswebparser/oem437.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/oem43... ============================================================================== --- trunk/rosapps/devutils/roswebparser/oem437.h (added) +++ trunk/rosapps/devutils/roswebparser/oem437.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,35 @@ +/* + * Windows OEM 457 code page table. need by english rc files + */ + +unsigned short table_OEM437[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x00C7, 0x00FC, + 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, + 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, + 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, + 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, + 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, + 0x255B, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, 0x2568, 0x2564, + 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, + 0x2584, 0x258C, 0x2590, 0x2580, 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, + 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, + 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0}; + + +
Propchange: trunk/rosapps/devutils/roswebparser/oem437.h ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/devutils/roswebparser/oem850.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/oem85... ============================================================================== --- trunk/rosapps/devutils/roswebparser/oem850.h (added) +++ trunk/rosapps/devutils/roswebparser/oem850.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,32 @@ +/* + * Windows OEM 850 code page table. need by english rc files + */ + +unsigned short table_OEM850[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x00C7, 0x00FC, + 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, + 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, + 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x00AE, + 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, + 0x2524, 0x00C1, 0x00C2, 0x00C0, 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, + 0x00A5, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, 0x00F0, 0x00D0, + 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE, 0x00CF, 0x2518, 0x250C, 0x2588, + 0x2584, 0x00A6, 0x00CC, 0x2580, 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, + 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, + 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, + 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0};
Propchange: trunk/rosapps/devutils/roswebparser/oem850.h ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rosapps/devutils/roswebparser/roswebparser.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/roswe... ============================================================================== --- trunk/rosapps/devutils/roswebparser/roswebparser.c (original) +++ trunk/rosapps/devutils/roswebparser/roswebparser.c Sun Oct 15 23:07:19 2006 @@ -18,27 +18,27 @@ #define false 0
-int paraser1(char *buf, long buf_size, char * output_text, char * output_resid, char * output_format, char *iso_type); - -void find_str(char asc,char *buf, long *foundPos); -void find_str2(char *asc,char *buf, long *foundPos, char * output_resid, char *output_text ); -void trim(char* buf); -void stringbugs(char *buf, int shift2); -void stringbugs2(char *buf, int shift2); - -void ParserCMD1(char *text, char *output_resid, char *output_text, char *output_format); -void ParserCMD2(char *text, char *output_resid, char *output_text, char *output_format); -void ParserCMD3(char *text, char *output_resid, char *output_text, char *output_format); - -void ParserComment(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserLang(char *text, char *output_resid, char *output_text, char *output_format); -void ParserString(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserDialog(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void DialogCMDBuild1(char *output_resid, char *output_format, long pos, char * text); -void DialogCMDBuild2(char *output_resid, char *output_format, long pos, char * text); -void DialogCMDBuild3(char *output_resid, char *output_format, long pos, char * text); -void ParserAccelerators(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserMenu(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); +int paraser1(unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format, unsigned char *iso_type); + +void find_str(unsigned char asc, unsigned char *buf, long *foundPos); +void find_str2(unsigned char *asc, unsigned char *buf, long *foundPos, unsigned char * output_resid, unsigned char *output_text ); +void trim(unsigned char* buf); +void stringbugs(unsigned char *buf, int shift2); +void stringbugs2(unsigned char *buf, int shift2); + +void ParserCMD1(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserCMD2(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserCMD3(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); + +void ParserComment(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserLang(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserString(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserDialog(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void DialogCMDBuild1(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void DialogCMDBuild2(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void DialogCMDBuild3(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void ParserAccelerators(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserMenu(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format);
/* return -1 : No file found @@ -47,29 +47,31 @@ return -4 : Fail get size return -5 : Fail size of the file is 0 bytes return -6 : Fail malloc memory - return -7 : Fail to read the file + return -7 : Fail to read the file + return -8 : Fail to write to the file + return -9 : Fail to open write file */
int main(int argc, char * argv[]) { FILE * fp; - char * buffer; - char * output_text; - char * output_resid; - char * output_format; + FILE * Outfp; + unsigned char * buffer; + unsigned char * output_text; + unsigned char * output_resid; + unsigned char * output_format; long buf_size; long buf_size_calc = 0; - if (argc!=3) + if (argc!=4) { printf("Help\n"); printf("%s inputfile iso-type\n\n",argv[0]); - printf("example %s en.rc UTF-8\n\n",argv[0]); - printf("Contry table\n"); - printf("en (English = \n"); - printf("se (Swedish = \n"); - printf("jp (Japanice = \n"); + printf("example %s sv.rc 28591 sv.xml\n\n",argv[0]); + printf("Contry table\n"); + printf("se (Swedish = Windows-28591 (Latin1 ISO-8859-1)\n"); + return -1; } @@ -97,6 +99,7 @@ return -4; }
+ /* We make sure it is least 4 times + 2K biger for we can grow around 2-3 times biger @@ -171,10 +174,22 @@
/* Now we can write our parser */ - paraser1(buffer, buf_size, output_text, output_resid, output_format,argv[2]); - printf ("%s",output_format); - + paraser1(buffer, buf_size, output_text, output_resid, output_format,"UTF-8"); + // printf ("%s",output_format); + + /* Now we convert to utf-8 */ + memset(output_resid,0,buf_size_calc); + buf_size_calc = ansiCodePage(atoi(argv[2]), output_format, output_resid, strlen(output_format)); + + if ((Outfp = fopen(argv[3],"wb")) != NULL ) + { + fwrite(output_resid,1,buf_size_calc,Outfp); + fclose(Outfp); + } + + + if(buffer!=NULL) free(buffer); if(output_text!=NULL) @@ -188,9 +203,9 @@ return 0; }
-int paraser1(char *buf, long buf_size, char * output_text, char * output_resid, char * output_format, char *iso_type) +int paraser1(unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format, unsigned char *iso_type) { - char *row; + unsigned char *row; long foundPos=0; long foundNextPos=0; long row_size=0; @@ -353,7 +368,7 @@ param : output_format = xml data store buffer */
-void ParserCMD1(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD1(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long le;
@@ -395,7 +410,7 @@
*/
-void ParserCMD2(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD2(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long le; long flag = 0; @@ -476,7 +491,7 @@ param : output_format = xml data store buffer
*/ -void ParserCMD3(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD3(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long foundPos=0;
@@ -507,7 +522,7 @@ param : output_format = xml data store buffer */
-void ParserLang(char *text, char *output_resid, char *output_text, char *output_format) +void ParserLang(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long foundPos=0;
@@ -547,12 +562,12 @@ param : output_format = xml data store buffer */
-void ParserComment(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserComment(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { - long foundPos=0; + long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text;
row_size = strlen(row); @@ -648,7 +663,7 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserAccelerators(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserAccelerators(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; @@ -751,11 +766,11 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserString(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserString(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; int start=false;
while(*pos < buf_size) @@ -891,12 +906,12 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserDialog(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserDialog(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; long commandfound=0; long le;
@@ -1078,12 +1093,12 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserMenu(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserMenu(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; long commandfound=0; long le; long count=0; @@ -1220,7 +1235,7 @@
}
-void stringbugs(char *buf, int shift2) +void stringbugs(unsigned char *buf, int shift2) { long foundPos=0; long foundNextPos=0; @@ -1319,7 +1334,7 @@ /* have remove all wrong syntax */ }
-void stringbugs2(char *buf, int shift2) +void stringbugs2(unsigned char *buf, int shift2) { long foundPos=0; long foundNextPos=0; @@ -1412,7 +1427,7 @@
-void trim(char* buf) +void trim(unsigned char* buf) { size_t le;
@@ -1453,7 +1468,7 @@ } } } -void find_str(char asc,char *buf, long *foundPos) +void find_str(unsigned char asc,unsigned char *buf, long *foundPos) { int t; size_t le; @@ -1479,8 +1494,8 @@
}
-void find_str2(char *asc,char *buf, long *foundPos, - char * output_resid, char *output_text) +void find_str2(unsigned char *asc, unsigned char *buf, long *foundPos, + unsigned char * output_resid, unsigned char *output_text) { int t=0; size_t le; @@ -1515,11 +1530,11 @@ }
-void DialogCMDBuild1(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild1(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) {
- char extra[1000]; + unsigned char extra[1000]; long foundPos=0; long foundNextPos=0; long le; @@ -1614,7 +1629,7 @@ }
-void DialogCMDBuild2(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild2(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) { long le;
@@ -1634,7 +1649,7 @@ }
// input : CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 -void DialogCMDBuild3(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild3(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) { long foundPos=0; long foundNextPos=0;
Modified: trunk/rosapps/devutils/roswebparser/roswebparser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/roswe... ============================================================================== --- trunk/rosapps/devutils/roswebparser/roswebparser.rbuild (original) +++ trunk/rosapps/devutils/roswebparser/roswebparser.rbuild Sun Oct 15 23:07:19 2006 @@ -5,4 +5,6 @@ <define name="__USE_W32API" /> <library>kernel32</library> <file>roswebparser.c</file> + <file>utf8.c</file> + </module>
Added: trunk/rosapps/devutils/roswebparser/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/utf8.... ============================================================================== --- trunk/rosapps/devutils/roswebparser/utf8.c (added) +++ trunk/rosapps/devutils/roswebparser/utf8.c Sun Oct 15 23:07:19 2006 @@ -1,0 +1,70 @@ + +/* + * Convert ansi to utf-8 + * it does not support more that utf-16 + * the table we are using is base on utf-16 then we convert the table to utf-8 + * + * All table lookup the ansi char to utf-16 then we calc the utf-8 format. + */ + +#include "oem437.h" +#include "oem850.h" +#include "Windows28591.h" + +int ansiCodePage(int codepage, unsigned char *inBuffer, unsigned char *outBuffer, int Lenght) +{ + int t; + int ch; + int pos=0; + + for (t=0;t<Lenght;t++) + { + ch=-1; + if (codepage == 437) + { + ch = (int) table_OEM437[ ((unsigned char)inBuffer[t])]; + } + + if (codepage == 850) + { + ch = (int) table_OEM850[ ((unsigned char)inBuffer[t])]; + } + + if (codepage == 28591) + { + ch = (int) table_Windows28591[ ((unsigned char)inBuffer[t])]; + } + + + + + if (ch == -1) + { + break; + } + + if (ch <= 0x7F) + { + outBuffer[pos]=ch; + pos++; + } + else if (ch <=0x07FF) // 1 1111 11 1111 + { + outBuffer[pos]= 0xC0 | (0x1F & (ch >> 6)); // 110x xxxx + outBuffer[pos+1]= 0x80 | (0x3f & ch); // 11xx xxxx + pos+=2; + } + + else if (ch <=0xFFFF) // 11 11 11 11 11 11 11 11 + { + outBuffer[pos]= 0xC2 | (0xf & (ch >> 12)); // 1110xxxx + outBuffer[pos+1]= 0x80 | (0x3f & (ch >> 6)); // 10xxxxxx + outBuffer[pos+1]= 0x80 | (0x3f & ch); // 10xxxxxx + pos+=3; + } + + } + + return pos; +} +
Propchange: trunk/rosapps/devutils/roswebparser/utf8.c ------------------------------------------------------------------------------ svn:eol-style = native
-
greatlrd＠svn.reactos.org