Mercurial > sdl-ios-xcode
view src/thread/win32/SDL_syssem.c @ 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 Lesser General Public License as published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Semaphore functions using the Win32 API */ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "SDL_thread.h" #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) #include "win_ce_semaphore.h" #endif struct SDL_semaphore { #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) SYNCHHANDLE id; #else HANDLE id; #endif Uint32 volatile count; }; /* Create a semaphore */ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) { SDL_sem *sem; /* Allocate sem memory */ sem = (SDL_sem *)SDL_malloc(sizeof(*sem)); if ( sem ) { /* Create the semaphore, with max value 32K */ #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) sem->id = CreateSemaphoreCE(NULL, initial_value, 32*1024, NULL); #else sem->id = CreateSemaphore(NULL, initial_value, 32*1024, NULL); #endif sem->count = initial_value; if ( ! sem->id ) { SDL_SetError("Couldn't create semaphore"); SDL_free(sem); sem = NULL; } } else { SDL_OutOfMemory(); } return(sem); } /* Free the semaphore */ void SDL_DestroySemaphore(SDL_sem *sem) { if ( sem ) { if ( sem->id ) { #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) CloseSynchHandle(sem->id); #else CloseHandle(sem->id); #endif sem->id = 0; } SDL_free(sem); } } int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) { int retval; DWORD dwMilliseconds; if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } if ( timeout == SDL_MUTEX_MAXWAIT ) { dwMilliseconds = INFINITE; } else { dwMilliseconds = (DWORD)timeout; } #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) switch (WaitForSemaphoreCE(sem->id, dwMilliseconds)) { #else switch (WaitForSingleObject(sem->id, dwMilliseconds)) { #endif case WAIT_OBJECT_0: InterlockedDecrement(&sem->count); retval = 0; break; case WAIT_TIMEOUT: retval = SDL_MUTEX_TIMEDOUT; break; default: SDL_SetError("WaitForSingleObject() failed"); retval = -1; break; } return retval; } int SDL_SemTryWait(SDL_sem *sem) { return SDL_SemWaitTimeout(sem, 0); } int SDL_SemWait(SDL_sem *sem) { return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT); } /* Returns the current count of the semaphore */ Uint32 SDL_SemValue(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return 0; } return sem->count; } int SDL_SemPost(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } /* Increase the counter in the first place, because * after a successful release the semaphore may * immediately get destroyed by another thread which * is waiting for this semaphore. */ InterlockedIncrement(&sem->count); #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) if ( ReleaseSemaphoreCE(sem->id, 1, NULL) == FALSE ) { #else if ( ReleaseSemaphore(sem->id, 1, NULL) == FALSE ) { #endif InterlockedDecrement(&sem->count); /* restore */ SDL_SetError("ReleaseSemaphore() failed"); return -1; } return 0; }