Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios_milan.c @ 4388:1524d3237820 SDL-1.2
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 08:00:57 +0000 |
parents | 6405314a7c07 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Milan Xbios video functions Patrice Mandin */ #include <mint/cookie.h> #include <mint/falcon.h> #include "SDL_xbios.h" #include "SDL_xbios_milan.h" #ifndef Validmode #define Validmode(mode) \ (short)trap_14_ww((short)0x5f,(short)(mode)) #endif #define NUM_PREDEFINED_MODES 7 typedef struct { Uint16 width, height; } predefined_mode_t; static const predefined_mode_t mode_list[NUM_PREDEFINED_MODES]={ {640,400}, {640,480}, {800,608}, {1024,768}, {1152,864}, {1280,1024}, {1600,1200} }; static const Uint8 mode_bpp[4]={ 8, 15, 16, 32 }; /*--- Variables ---*/ static int enum_actually_add; static SDL_VideoDevice *enum_this; /*--- Functions ---*/ static unsigned long /*cdecl*/ enumfunc(SCREENINFO *inf, unsigned long flag) { xbiosmode_t modeinfo; modeinfo.number = inf->devID; modeinfo.width = inf->scrWidth; modeinfo.height = inf->scrHeight; modeinfo.depth = inf->scrPlanes; modeinfo.flags = 0; SDL_XBIOS_AddMode(enum_this, enum_actually_add, &modeinfo); return ENUMMODE_CONT; } void SDL_XBIOS_ListMilanModes(_THIS, int actually_add) { int i; /* Read validated predefined modes */ for (i=0; i<NUM_PREDEFINED_MODES; i++) { int j; Uint16 deviceid = 0x1000 + (i<<4); for (j=1; j<4; j++) { if (Validmode(deviceid + j)) { xbiosmode_t modeinfo; modeinfo.number = deviceid + j; modeinfo.width = mode_list[i].width; modeinfo.height = mode_list[i].height; modeinfo.depth = mode_bpp[j-1]; modeinfo.flags = 0; SDL_XBIOS_AddMode(this, actually_add, &modeinfo); } } } /* Read custom created modes */ enum_this = this; enum_actually_add = actually_add; VsetScreen(-1, &enumfunc, MI_MAGIC, CMD_ENUMMODES); }