Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio_stfa.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 | a1b03ba2fcd0 |
| 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" /* STFA control structure Patrice Mandin */ #ifndef _SDL_mintaudio_stfa_h #define _SDL_mintaudio_stfa_h /*--- Defines ---*/ #define C_STFA 0x53544641L /* Sound treiber für atari (seb/The removers) */ #define STFA_PLAY_ENABLE (1<<0) #define STFA_PLAY_DISABLE (0<<0) #define STFA_PLAY_REPEAT (1<<1) #define STFA_PLAY_SINGLE (0<<1) #define STFA_FORMAT_SIGNED (1<<15) #define STFA_FORMAT_UNSIGNED (0<<15) #define STFA_FORMAT_STEREO (1<<14) #define STFA_FORMAT_MONO (0<<14) #define STFA_FORMAT_16BIT (1<<13) #define STFA_FORMAT_8BIT (0<<13) #define STFA_FORMAT_LITENDIAN (1<<9) #define STFA_FORMAT_BIGENDIAN (0<<9) #define STFA_FORMAT_FREQ_MASK 0x0f enum { STFA_FORMAT_F4995=0, STFA_FORMAT_F6269, STFA_FORMAT_F7493, STFA_FORMAT_F8192, STFA_FORMAT_F9830, STFA_FORMAT_F10971, STFA_FORMAT_F12538, STFA_FORMAT_F14985, STFA_FORMAT_F16384, STFA_FORMAT_F19819, STFA_FORMAT_F21943, STFA_FORMAT_F24576, STFA_FORMAT_F30720, STFA_FORMAT_F32336, STFA_FORMAT_F43885, STFA_FORMAT_F49152 }; /*--- Types ---*/ typedef struct { unsigned short sound_enable; unsigned short sound_control; unsigned short sound_output; unsigned long sound_start; unsigned long sound_current; unsigned long sound_end; unsigned short version; void *old_vbl; void *old_timera; unsigned long old_mfp_status; void *new_vbl; void *drivers_list; void *play_stop; unsigned short frequency; void *set_frequency; unsigned short frequency_threshold; unsigned short *custom_freq_table; unsigned short stfa_on_off; void *new_drivers_list; unsigned long old_bit_2_of_cookie_snd; void (*stfa_it)(void); } cookie_stfa_t __attribute__((packed)); #endif /* _SDL_mintaudio_stfa_h */