annotate test/testnative.h @ 3539:f2846bf19360

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:03:43 +0000
parents 94dd49f6b005
children e8916fe9cfc8
rev   line source
3059
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
1
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
2 /* Definitions for platform dependent windowing functions to test SDL
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
3 integration with native windows
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
4 */
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
5
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
6 #include "SDL.h"
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
7
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
8 /* This header includes all the necessary system headers for native windows */
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
9 #include "SDL_syswm.h"
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
10
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
11 typedef struct
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
12 {
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
13 const char *tag;
3061
94dd49f6b005 More of the same
Sam Lantinga <slouken@libsdl.org>
parents: 3059
diff changeset
14 void *(*CreateNativeWindow) (int w, int h);
94dd49f6b005 More of the same
Sam Lantinga <slouken@libsdl.org>
parents: 3059
diff changeset
15 void (*DestroyNativeWindow) (void *window);
3059
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
16 } NativeWindowFactory;
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
17
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
18 #ifdef SDL_VIDEO_DRIVER_WIN32
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
19 #define TEST_NATIVE_WIN32
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
20 extern NativeWindowFactory Win32WindowFactory;
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
21 #endif
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
22
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
23 #ifdef SDL_VIDEO_DRIVER_X11
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
24 #define TEST_NATIVE_X11
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
25 extern NativeWindowFactory X11WindowFactory;
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
26 #endif
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
27
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
28 #ifdef SDL_VIDEO_DRIVER_COCOA
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
29 /* Actually, we don't really do this, since it involves adding Objective C
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
30 support to the build system, which is a little tricky. You can uncomment
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
31 it manually though and link testnativecocoa.m into the test application.
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
32 */
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
33 #if 1
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
34 #define TEST_NATIVE_COCOA
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
35 extern NativeWindowFactory CocoaWindowFactory;
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
36 #endif
79b061c4f316 Whoops, missed a file
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
37 #endif