April 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Use per thread locale in many functions.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: d1fa8b64e42a646b7452fd0cc1a480531d0180c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fa8b64e42a646b7452fd0cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:47 2010 +0200 msvcrt: Use per thread locale in many functions. --- dlls/msvcrt/ctype.c | 12 ++++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 75 ++++++++++++++++++++++++++------------------------ 4 files changed, 48 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1fa8b64e42a646b7452f…

1 0

Piotr Caban : msvcrt: Added _configthreadlocale implementation.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 20b77f44289db4b072264d03bf83c4333346abf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b77f44289db4b072264d03b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:47 2010 +0200 msvcrt: Added _configthreadlocale implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ac3ca94..21367a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -324,7 +324,7 @@ @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit @ extern _commode msvcrt._commode -@ stub _configthreadlocale +@ cdecl _configthreadlocale(long) msvcrt._configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a038a8f..d084047 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -316,7 +316,7 @@ @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit @ extern _commode msvcrt._commode -@ stub _configthreadlocale +@ cdecl _configthreadlocale(long) msvcrt._configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 45547ae..bc65f04 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -954,6 +954,43 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) return loc; } +/* _configthreadlocale - not exported in native msvcrt */ +int CDECL _configthreadlocale(int type) +{ + thread_data_t *data = msvcrt_get_thread_data(); + int ret; + + if(!data) + return -1; + + ret = (data->locale ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); + + if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { + if(!data->locale) { + /* Copy current global locale */ + data->locale = _create_locale(MSVCRT_LC_ALL, MSVCRT_setlocale(MSVCRT_LC_ALL, NULL)); + if(!data->locale) + return -1; + } + + return ret; + } + + if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { + if(data->locale) { + _free_locale(data->locale); + data->locale = NULL; + } + + return ret; + } + + if(!type) + return ret; + + return -1; +} + /********************************************************************* * setlocale (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9b99cd7..2ed5aeb 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -791,6 +791,9 @@ typedef struct MSVCRT_localeinfo_struct MSVCRT_pthreadmbcinfo mbcinfo; } MSVCRT__locale_tstruct, *MSVCRT__locale_t; +#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 +#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 + extern MSVCRT__locale_t MSVCRT_locale; MSVCRT__locale_t get_locale(void); void __cdecl _free_locale(MSVCRT__locale_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 22e921e..1f073d3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1417,3 +1417,4 @@ @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _create_locale(long str) @ cdecl _free_locale(ptr) +@ cdecl _configthreadlocale(long)

1 0

Piotr Caban : msvcrt: Move locale string interpretation to MSVCRT_locale_to_LCID.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 6ad7b4ff5cca4810eb8c15c70542046a02ae629a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad7b4ff5cca4810eb8c15c70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:01 2010 +0200 msvcrt: Move locale string interpretation to MSVCRT_locale_to_LCID. --- dlls/msvcrt/locale.c | 164 ++++++++++++++++++++++++-------------------------- 1 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index bc65f04..f654169 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -193,66 +193,86 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO extern int atoi(const char *); /* Internal: Find the LCID for a locale specification */ -static LCID MSVCRT_locale_to_LCID(locale_search_t* locale) +static LCID MSVCRT_locale_to_LCID(const char *locale) { - LCID lcid; - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, - (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, - (LONG_PTR)locale); - - if (!locale->match_flags) - return 0; + LCID lcid; + locale_search_t search; + char *cp, *region; - /* If we were given something that didn't match, fail */ - if (locale->search_country[0] && !(locale->match_flags & FOUND_COUNTRY)) - return 0; + memset(&search, 0, sizeof(locale_search_t)); - lcid = MAKELCID(locale->found_lang_id, SORT_DEFAULT); + cp = strchr(locale, '.'); + region = strchr(locale, '_'); - /* Populate partial locale, translating LCID to locale string elements */ - if (!locale->found_codepage[0]) - { - /* Even if a codepage is not enumerated for a locale - * it can be set if valid */ - if (locale->search_codepage[0]) - { - if (IsValidCodePage(atoi(locale->search_codepage))) - memcpy(locale->found_codepage,locale->search_codepage,MAX_ELEM_LEN); - else - { - /* Special codepage values: OEM & ANSI */ - if (strcasecmp(locale->search_codepage,"OCP")) - { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); - } - else if (strcasecmp(locale->search_codepage,"ACP")) - { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); + lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); + if(region) { + lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); + if(region-locale < MAX_ELEM_LEN) + search.search_language[region-locale] = '\0'; + } else + search.search_country[0] = '\0'; + + if(cp) { + lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); + if(cp-region < MAX_ELEM_LEN) + search.search_country[cp-region] = '\0'; + if(cp-locale < MAX_ELEM_LEN) + search.search_language[cp-locale] = '\0'; + } else + search.search_codepage[0] = '\0'; + + /* FIXME: MSVCRT_locale_to_LCID is not finding remaped values */ + remap_synonym(search.search_country); + + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, + (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, + (LONG_PTR)&search); + + if (!search.match_flags) + return 0; + + /* If we were given something that didn't match, fail */ + if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) + return 0; + + lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); + + /* Populate partial locale, translating LCID to locale string elements */ + if (!search.found_codepage[0]) { + /* Even if a codepage is not enumerated for a locale + * it can be set if valid */ + if (search.search_codepage[0]) { + if (IsValidCodePage(atoi(search.search_codepage))) + memcpy(search.found_codepage,search.search_codepage,MAX_ELEM_LEN); + else { + /* Special codepage values: OEM & ANSI */ + if (strcasecmp(search.search_codepage,"OCP")) { + GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + } else if (strcasecmp(search.search_codepage,"ACP")) { + GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + } else + return 0; + + if (!atoi(search.found_codepage)) + return 0; + } + } else { + /* Prefer ANSI codepages if present */ + GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + if (!search.found_codepage[0] || !atoi(search.found_codepage)) + GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, + search.found_codepage, MAX_ELEM_LEN); } - else - return 0; - - if (!atoi(locale->found_codepage)) - return 0; - } - } - else - { - /* Prefer ANSI codepages if present */ - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); - if (!locale->found_codepage[0] || !atoi(locale->found_codepage)) - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); } - } - GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, - locale->found_language, MAX_ELEM_LEN); - GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY|LOCALE_NOUSEROVERRIDE, - locale->found_country, MAX_ELEM_LEN); - return lcid; + + GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, + search.found_language, MAX_ELEM_LEN); + GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY|LOCALE_NOUSEROVERRIDE, + search.found_country, MAX_ELEM_LEN); + return lcid; } /* INTERNAL: Set lc_handle, lc_id and lc_category in threadlocinfo struct */ @@ -572,35 +592,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) */ return NULL; } else { - locale_search_t search; - char *cp, *region; - - memset(&search, 0, sizeof(locale_search_t)); - - cp = strchr(locale, '.'); - region = strchr(locale, '_'); - - lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); - if(region) { - lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); - if(region-locale < MAX_ELEM_LEN) - search.search_language[region-locale] = '\0'; - } else - search.search_country[0] = '\0'; - - if(cp) { - lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region < MAX_ELEM_LEN) - search.search_country[cp-region] = '\0'; - if(cp-locale < MAX_ELEM_LEN) - search.search_language[cp-locale] = '\0'; - } else - search.search_codepage[0] = '\0'; - - /* FIXME: MSVCRT_locale_to_LCID is not finding remaped values */ - remap_synonym(search.search_country); - - lcid = MSVCRT_locale_to_LCID(&search); + lcid = MSVCRT_locale_to_LCID(locale); if(!lcid) return NULL; }

1 0

Piotr Caban : msvcrt: Added multiple locales parsing to _create_locale.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 5efff1641384622e1b49b804a45723d2aca60510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efff1641384622e1b49b804a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:17 2010 +0200 msvcrt: Added multiple locales parsing to _create_locale. --- dlls/msvcrt/locale.c | 129 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5efff1641384622e1b49b…

1 0

Piotr Caban : msvcrt: Add helper function that returns current locale.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 59c2201a9cd128eeaf3c93ba2d8f9e6e0ced3679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c2201a9cd128eeaf3c93ba2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:34 2010 +0200 msvcrt: Add helper function that returns current locale. --- dlls/msvcrt/locale.c | 10 ++++++++++ dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c30b907..45547ae 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -317,6 +317,16 @@ static inline void swap_pointers(void **p1, void **p2) { *p2 = hlp; } +/* INTERNAL: returns _locale_t struct for current locale */ +MSVCRT__locale_t get_locale(void) { + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data || !data->locale) + return MSVCRT_locale; + + return data->locale; +} + /********************************************************************* * wsetlocale (MSVCRT.@) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a8b77e1..e2184b3 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -69,6 +69,7 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->asctime_buffer); HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(),0,tls->strerror_buffer); + _free_locale(tls->locale); } HeapFree(GetProcessHeap(), 0, tls); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 34d1c9e..9b99cd7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -115,6 +115,7 @@ struct __thread_data { MSVCRT_unexpected_function unexpected_handler; MSVCRT__se_translator_function se_translator; EXCEPTION_RECORD *exc_record; + struct MSVCRT_localeinfo_struct *locale; }; typedef struct __thread_data thread_data_t; @@ -791,6 +792,7 @@ typedef struct MSVCRT_localeinfo_struct } MSVCRT__locale_tstruct, *MSVCRT__locale_t; extern MSVCRT__locale_t MSVCRT_locale; +MSVCRT__locale_t get_locale(void); void __cdecl _free_locale(MSVCRT__locale_t); #ifndef __WINE_MSVCRT_TEST

1 0

Marcus Meissner : msvcrt: Implement findfirst64 and findnext64.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: debd7d36d007afae100ca0f5a2dffda985d567d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debd7d36d007afae100ca0f5a… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 15 13:42:27 2010 +0200 msvcrt: Implement findfirst64 and findnext64. --- dlls/msvcrt/dir.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index da688bf..a9f9234 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -96,6 +96,27 @@ static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddat strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAA to finddata64_t */ +static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = ((__int64)fd->nFileSizeHigh) << 32 | fd->nFileSizeLow; + strcpy(ft->name, fd->cFileName); +} + + /* INTERNAL: Translate WIN32_FIND_DATAW to wfinddatai64_t */ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddatai64_t* ft) { @@ -288,6 +309,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirsti64(const char * fspec, struct MSVCRT__fi } /********************************************************************* + * _findfirst64 (MSVCRT.@) + * + * 64-bit version of _findfirst. + */ +MSVCRT_intptr_t CDECL MSVCRT__findfirst64(const char * fspec, struct MSVCRT__finddata64_t* ft) +{ + WIN32_FIND_DATAA find_data; + HANDLE hfind; + + hfind = FindFirstFileA(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_fttofd64(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirsti64 (MSVCRT.@) * * Unicode version of _findfirsti64. @@ -377,6 +419,25 @@ int CDECL MSVCRT__findnexti64(MSVCRT_intptr_t hand, struct MSVCRT__finddatai64_t } /********************************************************************* + * _findnext64 (MSVCRT.@) + * + * 64-bit version of _findnext. + */ +int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) +{ + WIN32_FIND_DATAA find_data; + + if (!FindNextFileA((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_fttofd64(&find_data,ft); + return 0; +} + +/********************************************************************* * _wfindnexti64 (MSVCRT.@) * * Unicode version of _findnexti64. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d61e250..22e921e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -373,10 +373,10 @@ @ cdecl _fileno(ptr) MSVCRT__fileno @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst -# stub _findfirst64 +@ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64 @ cdecl _findnext(long ptr) MSVCRT__findnext -# stub _findnext64 +@ cdecl _findnext64(long ptr) MSVCRT__findnext64 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite( double ) @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf

1 0

Alexandre Julliard : winex11: Define a structure to hold coordinates information for BitBlt operations.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 39493b0660bfed2661e31a3837de06788cae5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39493b0660bfed2661e31a383… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:27:17 2010 +0200 winex11: Define a structure to hold coordinates information for BitBlt operations. --- dlls/winex11.drv/bitblt.c | 226 ++++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 13 ++- dlls/winex11.drv/xrender.c | 27 +++--- 3 files changed, 135 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39493b0660bfed2661e31…

1 0

Alexandre Julliard : winex11: Use the BITBLT_GetVisRectangles helper function for AlphaBlend too.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 246e3732c032b8659795909dbc17a3c0eed800f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246e3732c032b8659795909db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:41:18 2010 +0200 winex11: Use the BITBLT_GetVisRectangles helper function for AlphaBlend too. --- dlls/winex11.drv/bitblt.c | 33 +++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 ++ dlls/winex11.drv/xrender.c | 85 +++++++++++++------------------------------ 3 files changed, 62 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=246e3732c032b86597959…

1 0

Alexandre Julliard : winex11: Rewrite AlphaBlend to do everything on the server side, and support all types of source bitmaps.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: a53a3f50ad02997167de0438f12ea992d6236e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53a3f50ad02997167de0438f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 11:39:41 2010 +0200 winex11: Rewrite AlphaBlend to do everything on the server side, and support all types of source bitmaps. --- dlls/winex11.drv/xrender.c | 239 +++++++++++++++---------------------------- 1 files changed, 84 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a53a3f50ad02997167de0…

1 0

Alexandre Julliard : winex11: Add support for big-endian 32-bpp Xrender formats.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 5cafb7c917f35d46945b198e22aaff0d38cd6f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cafb7c917f35d46945b198e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:55:40 2010 +0200 winex11: Add support for big-endian 32-bpp Xrender formats. --- dlls/winex11.drv/xrender.c | 54 +++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4708139..83f8048 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -55,7 +55,6 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -#define MAX_FORMATS 10 typedef enum wine_xrformat { WXR_FORMAT_MONO, @@ -67,7 +66,10 @@ typedef enum wine_xrformat WXR_FORMAT_R8G8B8, WXR_FORMAT_B8G8R8, WXR_FORMAT_A8R8G8B8, + WXR_FORMAT_B8G8R8A8, WXR_FORMAT_X8R8G8B8, + WXR_FORMAT_B8G8R8X8, + WXR_NB_FORMATS } WXRFormat; typedef struct wine_xrender_format_template @@ -84,7 +86,7 @@ typedef struct wine_xrender_format_template unsigned int blueMask; } WineXRenderFormatTemplate; -static const WineXRenderFormatTemplate wxr_formats_template[] = +static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = { /* Format depth alpha mask red mask green mask blue mask*/ {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, @@ -96,7 +98,9 @@ static const WineXRenderFormatTemplate wxr_formats_template[] = {WXR_FORMAT_R8G8B8, 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, {WXR_FORMAT_B8G8R8, 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, {WXR_FORMAT_A8R8G8B8, 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff } + {WXR_FORMAT_B8G8R8A8, 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, + {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, + {WXR_FORMAT_B8G8R8X8, 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; typedef struct wine_xrender_format @@ -105,7 +109,7 @@ typedef struct wine_xrender_format XRenderPictFormat *pict_format; } WineXRenderFormat; -static WineXRenderFormat wxr_formats[MAX_FORMATS]; +static WineXRenderFormat wxr_formats[WXR_NB_FORMATS]; static int WineXRenderFormatsListSize = 0; static WineXRenderFormat *default_format = NULL; @@ -208,6 +212,16 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif +static WXRFormat get_format_without_alpha( WXRFormat format ) +{ + switch (format) + { + case WXR_FORMAT_A8R8G8B8: return WXR_FORMAT_X8R8G8B8; + case WXR_FORMAT_B8G8R8A8: return WXR_FORMAT_B8G8R8X8; + default: return format; + } +} + static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPictFormat *templ, unsigned long *mask) { templ->id = 0; @@ -1510,7 +1524,7 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel Pixmap xpm; Picture pict; int current_color; - } tiles[MAX_FORMATS], *tile; + } tiles[WXR_NB_FORMATS], *tile; XRenderColor col; tile = &tiles[wxr_format->format]; @@ -1992,7 +2006,7 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { - Picture dst_pict, src_pict, mask_pict = 0, tmp_pict = 0; + Picture dst_pict, src_pict = 0, mask_pict = 0, tmp_pict = 0; struct xrender_info *src_info = get_xrender_info( devSrc ); double xscale, yscale; BOOL use_repeat; @@ -2015,22 +2029,26 @@ BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && - src_info->format && src_info->format->format == WXR_FORMAT_A8R8G8B8) + if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && src_info->format) { /* we need a source picture with no alpha */ - XRenderPictureAttributes pa; - const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_X8R8G8B8 ); + WXRFormat format = get_format_without_alpha( src_info->format->format ); + if (format != src_info->format->format) + { + XRenderPictureAttributes pa; + const WineXRenderFormat *fmt = get_xrender_format( format ); - wine_tsx11_lock(); - pa.subwindow_mode = IncludeInferiors; - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; - tmp_pict = pXRenderCreatePicture( gdi_display, devSrc->drawable, fmt->pict_format, - CPSubwindowMode|CPRepeat, &pa ); - wine_tsx11_unlock(); - src_pict = tmp_pict; + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + pa.repeat = use_repeat ? RepeatNormal : RepeatNone; + tmp_pict = pXRenderCreatePicture( gdi_display, devSrc->drawable, fmt->pict_format, + CPSubwindowMode|CPRepeat, &pa ); + wine_tsx11_unlock(); + src_pict = tmp_pict; + } } - else src_pict = get_xrender_picture_source( devSrc, use_repeat ); + + if (!src_pict) src_pict = get_xrender_picture_source( devSrc, use_repeat ); EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 );

1 0