view src/video/xbios/SDL_xbios_blowup.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"

/*
	Blowup extension definitions

	Patrice Mandin
*/

#ifndef _SDL_xbios_blowup_h
#define _SDL_xbios_blowup_h

#include "SDL_xbios.h"

/*--- Types ---*/

typedef struct {
	/* 64 bytes */
	unsigned short	enabled;		/* Extended mode enabled ? 0=yes, <>0=no */
	unsigned short	dummy10[6];
	unsigned short	registers_0E;	/* value for register 0xffff820e */
	unsigned short	registers_10;	/* value for register 0xffff8210 */
	unsigned short	dummy11[23];

	/* 64 bytes */
	unsigned short	width;			/* width-1 */
	unsigned short	height;			/* height-1 */
	unsigned short	dummy20;
	unsigned long	screensize;		/* screensize in bytes */
	unsigned short	dummy21[8];
	unsigned short	virtual;		/* Virtual screen ? */
	unsigned short	virwidth;		/* Virtual screen width */
	unsigned short	virheight;		/* Virtual screen height */

	unsigned short dummy22;
	unsigned short monitor;			/* Monitor defined for this mode */
	unsigned short extension;		/* Extended mode defined ? 0=yes, 1=no */
	unsigned short dummy23[13];

	/* 64 bytes */
	unsigned short	dummy30;
	unsigned short	registers_82[6];	/* values for registers 0xffff8282-8c */
	unsigned short	dummy31[9];

	unsigned short	dummy32;
	unsigned short	registers_A2[6];	/* values for registers 0xffff82a2-ac */
	unsigned short	dummy33[9];

	/* 64 bytes */
	unsigned short	registers_C0;	/* value for register 0xffff82c0 */
	unsigned short	registers_C2;	/* value for register 0xffff82c2 */
	unsigned short	dummy40[30];
} __attribute__((packed)) blow_mode_t;

typedef struct {
	blow_mode_t	blowup_modes[10];
	unsigned char	num_mode[6];
	unsigned long	dummy;
	unsigned short	montype;
} __attribute__((packed)) blow_cookie_t;

/*--- Functions prototypes ---*/

void SDL_XBIOS_ListBlowupModes(_THIS, int actually_add, blow_cookie_t *cookie_blow);

#endif /* _SDL_xbios_blowup_h */