Commit d222dcc2 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

win32u: Convert inter-process messages to Unicode.

Based on user32 WINPROC_CallProcWtoA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53744
parent 2b0cd25b
...@@ -3619,6 +3619,60 @@ CPTABLEINFO *get_cptable( WORD cp ) ...@@ -3619,6 +3619,60 @@ CPTABLEINFO *get_cptable( WORD cp )
return &tables[i]; return &tables[i];
} }
/* Based on NlsValidateLocale */
const NLS_LOCALE_DATA *get_locale_data( LCID lcid )
{
static const NLS_LOCALE_HEADER *locale_table;
static const NLS_LOCALE_LCID_INDEX *lcids_index;
int min = 0, max;
if (!locale_table)
{
LARGE_INTEGER size;
void *addr;
LCID lcid;
NTSTATUS status;
static struct
{
UINT ctypes;
UINT unknown1;
UINT unknown2;
UINT unknown3;
UINT locales;
UINT charmaps;
UINT geoids;
UINT scripts;
} *header;
status = NtInitializeNlsFiles( &addr, &lcid, &size );
if (status)
{
ERR( "Failed to load nls file\n" );
return NULL;
}
if (InterlockedCompareExchangePointer( (void **)&header, addr, NULL ))
NtUnmapViewOfSection( GetCurrentProcess(), addr );
locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales);
lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset);
}
max = locale_table->nb_lcids - 1;
while (min <= max)
{
int pos = (min + max) / 2;
if (lcid < lcids_index[pos].id) max = pos - 1;
else if (lcid > lcids_index[pos].id) min = pos + 1;
else
{
ULONG offset = locale_table->locales_offset + pos * locale_table->locale_size;
return (const NLS_LOCALE_DATA *)((const char *)locale_table + offset);
}
}
return NULL;
}
DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen )
{ {
DWORD ret; DWORD ret;
...@@ -3665,6 +3719,34 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr ...@@ -3665,6 +3719,34 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr
return ret / sizeof(WCHAR); return ret / sizeof(WCHAR);
} }
DWORD win32u_mbtowc_size( CPTABLEINFO *info, const char *src, DWORD srclen )
{
DWORD ret;
if (info->CodePage == CP_UTF8)
{
RtlUTF8ToUnicodeN( NULL, 0, &ret, src, srclen );
ret /= sizeof(WCHAR);
}
else if (info->DBCSCodePage)
{
for (ret = 0; srclen; srclen--, src++, ret++)
{
if (info->DBCSOffsets[(unsigned char)*src] && srclen > 1)
{
src++;
srclen--;
}
}
}
else
{
ret = srclen;
}
return ret;
}
static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default )
{ {
const CPTABLEINFO *info; const CPTABLEINFO *info;
......
...@@ -339,7 +339,6 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, ...@@ -339,7 +339,6 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name,
DWORD ntmflags, DWORD version, DWORD flags, DWORD ntmflags, DWORD version, DWORD flags,
const struct bitmap_font_size *size ) DECLSPEC_HIDDEN; const struct bitmap_font_size *size ) DECLSPEC_HIDDEN;
extern UINT font_init(void) DECLSPEC_HIDDEN; extern UINT font_init(void) DECLSPEC_HIDDEN;
extern CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN;
extern const struct font_backend_funcs *init_freetype_lib(void) DECLSPEC_HIDDEN; extern const struct font_backend_funcs *init_freetype_lib(void) DECLSPEC_HIDDEN;
/* opentype.c */ /* opentype.c */
......
...@@ -453,11 +453,14 @@ static inline WCHAR win32u_towupper( WCHAR ch ) ...@@ -453,11 +453,14 @@ static inline WCHAR win32u_towupper( WCHAR ch )
extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN; extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN;
CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN;
const NLS_LOCALE_DATA *get_locale_data( LCID lcid ) DECLSPEC_HIDDEN;
DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src,
DWORD srclen ) DECLSPEC_HIDDEN; DWORD srclen ) DECLSPEC_HIDDEN;
DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src,
DWORD srclen ) DECLSPEC_HIDDEN; DWORD srclen ) DECLSPEC_HIDDEN;
DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen ) DECLSPEC_HIDDEN; DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen ) DECLSPEC_HIDDEN;
DWORD win32u_mbtowc_size( CPTABLEINFO *info, const char *src, DWORD srclen ) DECLSPEC_HIDDEN;
static inline WCHAR *win32u_wcsdup( const WCHAR *str ) static inline WCHAR *win32u_wcsdup( const WCHAR *str )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment