Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios_sb3.h @ 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 | 05c9e942cc46 |
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" /* ScreenBlaster 3 definitions Patrice Mandin */ #ifndef _SDL_xbios_sb3_h_ #define _SDL_xbios_sb3_h_ /*--- Defines ---*/ #ifndef C_SCPN #define C_SCPN 0x5343504EL #endif #define SCPN_DEV_1BPP 0 #define SCPN_DEV_2BPP 1 #define SCPN_DEV_4BPP 2 #define SCPN_DEV_8BPP 3 #define SCPN_DEV_16BPP 4 extern const int SDL_XBIOS_scpn_planes_device[]; /*--- Types ---*/ typedef struct { unsigned short virtual_width; /* Virtual screen width */ unsigned short virtual_height; /* Virtual screen height */ unsigned short visible_width; /* Visible width */ unsigned short visible_height; /* Visible height */ unsigned short h_pos; /* Horizontal position in virtual screen */ unsigned short v_pos; /* Vertical position in virtual screen */ unsigned short dummy; unsigned long size; /* Size of screen in bytes */ unsigned short device; /* Device number to find planes = getRez() */ /* = Index in scpn_planes_device[] */ } __attribute__((packed)) scpn_screeninfo_t; typedef struct { unsigned long magic; /* just a BRA assembler jump */ unsigned short version; void *dummy1; unsigned short ptsout0_1; unsigned short ptsout0_2; unsigned short dummy3; unsigned char date[8]; /* Date of program build */ unsigned char asm_string[30]; /* 10 times the 'ASM' string */ unsigned short dummy4; scpn_screeninfo_t *screen_info; unsigned short dummy6; } __attribute__((packed)) scpn_cookie_t; /*--- Function prototypes ---*/ int SDL_XBIOS_SB3Usable(scpn_cookie_t *cookie_scpn); void SDL_XBIOS_ListSB3Modes(_THIS, int actually_add, scpn_cookie_t *cookie_scpn); #endif /* _SDL_xbios_sb3_h_ */