Mercurial > sdl-ios-xcode
annotate src/main/win32/version.rc @ 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 | c57d816eb9c5 |
children |
rev | line source |
---|---|
4089
37345dc3dd83
Switched afxres.h to winresrc.h
Sam Lantinga <slouken@libsdl.org>
parents:
4078
diff
changeset
|
1 |
37345dc3dd83
Switched afxres.h to winresrc.h
Sam Lantinga <slouken@libsdl.org>
parents:
4078
diff
changeset
|
2 #include "winresrc.h" |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
3 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
6 ///////////////////////////////////////////////////////////////////////////// |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
7 // |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 // Version |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 // |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 VS_VERSION_INFO VERSIONINFO |
4271
c57d816eb9c5
Updated version for mingw32 build
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
12 FILEVERSION 1,2,14,0 |
c57d816eb9c5
Updated version for mingw32 build
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
13 PRODUCTVERSION 1,2,14,0 |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
14 FILEFLAGSMASK 0x3fL |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
15 FILEFLAGS 0x0L |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
16 FILEOS 0x40004L |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
17 FILETYPE 0x2L |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
18 FILESUBTYPE 0x0L |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
19 BEGIN |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 BLOCK "StringFileInfo" |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 BEGIN |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
22 BLOCK "040904b0" |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
23 BEGIN |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
24 VALUE "CompanyName", "\0" |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
25 VALUE "FileDescription", "SDL\0" |
4271
c57d816eb9c5
Updated version for mingw32 build
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
26 VALUE "FileVersion", "1, 2, 14, 0\0" |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
27 VALUE "InternalName", "SDL\0" |
4159 | 28 VALUE "LegalCopyright", "Copyright © 2009 Sam Lantinga\0" |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
29 VALUE "OriginalFilename", "SDL.dll\0" |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
30 VALUE "ProductName", "Simple DirectMedia Layer\0" |
4271
c57d816eb9c5
Updated version for mingw32 build
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
31 VALUE "ProductVersion", "1, 2, 14, 0\0" |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
32 END |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
33 END |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
34 BLOCK "VarFileInfo" |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
35 BEGIN |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
36 VALUE "Translation", 0x409, 1200 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
37 END |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
38 END |