wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Piotr Caban : msvcrt: Added _configthreadlocale implementation.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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: Add helper function that returns current locale.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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

Piotr Caban : msvcrt: Change implementation of setlocale.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d58b385b385b9ba244377c534f2a7e09c50aa997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58b385b385b9ba244377c534… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:13 2010 +0200 msvcrt: Change implementation of setlocale. --- dlls/msvcrt/ctype.c | 9 +- dlls/msvcrt/locale.c | 380 +++++++++++++++++++++++--------------------------- dlls/msvcrt/main.c | 13 ++- dlls/msvcrt/msvcrt.h | 5 +- 4 files changed, 188 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d58b385b385b9ba244377…

1 0

Piotr Caban : msvcrt: Change _create_locale implementation so generated structure is easier to modify .
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 10023a15d60f381084254f0c2b9dcbaf7a4d03b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10023a15d60f381084254f0c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:24:53 2010 +0200 msvcrt: Change _create_locale implementation so generated structure is easier to modify. --- dlls/msvcrt/locale.c | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b5bbe74..07a793b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -699,16 +699,10 @@ int CDECL ___lc_collate_cp_func(void) void CDECL _free_locale(MSVCRT__locale_t locale) { int i; - BOOL localeC = TRUE; for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { - if(locale->locinfo->lc_category[i].refcount) { - MSVCRT_free(locale->locinfo->lc_category[i].locale); - MSVCRT_free(locale->locinfo->lc_category[i].refcount); - } else if(localeC) { - MSVCRT_free(locale->locinfo->lc_category[i].locale); - localeC = FALSE; - } + MSVCRT_free(locale->locinfo->lc_category[i].locale); + MSVCRT_free(locale->locinfo->lc_category[i].refcount); } if(locale->locinfo->lconv) { @@ -744,7 +738,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) { MSVCRT__locale_t loc; LCID lcid; - char buf[256], *localeC; + char buf[256]; int i; TRACE("(%d %s)\n", category, locale); @@ -807,21 +801,6 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); memset(loc->mbcinfo, 0, sizeof(MSVCRT_threadmbcinfo)); - if(category!=MSVCRT_LC_ALL || !lcid) { - localeC = MSVCRT_malloc(sizeof(char[2])); - - if(localeC) { - localeC[0] = 'C'; - localeC[1] = '\0'; - - for(i=MSVCRT_LC_ALL+1; i<=MSVCRT_LC_MAX; i++) - loc->locinfo->lc_category[i].locale = localeC; - } else { - _free_locale(loc); - return NULL; - } - } - loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { _free_locale(loc); @@ -843,7 +822,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) _free_locale(loc); return NULL; } - } + } else + loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = strdup("C"); if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp; @@ -883,6 +863,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lc_clike = 1; loc->locinfo->mb_cur_max = 1; loc->locinfo->pctype = MSVCRT__ctype+1; + loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = strdup("C"); } for(i=0; i<256; i++) @@ -1069,6 +1050,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lconv->n_sep_by_space = 127; loc->locinfo->lconv->p_sign_posn = 127; loc->locinfo->lconv->n_sign_posn = 127; + + loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = strdup("C"); } if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) { @@ -1131,6 +1114,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lconv->decimal_point[1] = '\0'; loc->locinfo->lconv->thousands_sep[0] = '\0'; loc->locinfo->lconv->grouping[0] = '\0'; + + loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = strdup("C"); } if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { @@ -1138,7 +1123,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) _free_locale(loc); return NULL; } - } + } else + loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = strdup("C"); return loc; }

1 0

Piotr Caban : msvcr90: Forward _iswalpha_l calls to msvcrt.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: b22ff84d6c842e1076c89fde88f6ea9f1cd6f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ff84d6c842e1076c89fde8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:24:28 2010 +0200 msvcr90: Forward _iswalpha_l calls to msvcrt. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 46e7077..ac3ca94 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -611,7 +611,7 @@ @ stub _isspace_l @ stub _isupper_l @ stub _iswalnum_l -@ stub _iswalpha_l +@ cdecl _iswalpha_l(long ptr) msvcrt._iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1d7e139..a038a8f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -599,7 +599,7 @@ @ stub _isspace_l @ stub _isupper_l @ stub _iswalnum_l -@ stub _iswalpha_l +@ cdecl _iswalpha_l(long ptr) msvcrt._iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l

1 0

Marcus Meissner : msvcrt: Implement findfirst64 and findnext64.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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: Add support for big-endian 32-bpp Xrender formats.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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

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

15 Apr '10

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: Use the BITBLT_GetVisRectangles helper function for AlphaBlend too.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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: Move logical to physical mapping into the BITBLT_GetVisRectangles helper function .
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 439223d43a20353bf6b0efcf4d3d7e622e72818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=439223d43a20353bf6b0efcf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:41:18 2010 +0200 winex11: Move logical to physical mapping into the BITBLT_GetVisRectangles helper function. --- dlls/winex11.drv/bitblt.c | 76 ++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 297fb73..ee247fe 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1165,20 +1165,33 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE rect.top = dst->y; rect.right = dst->x + dst->width; rect.bottom = dst->y + dst->height; + LPtoDP( physDevDst->hdc, (POINT *)&rect, 2 ); + dst->x = rect.left; + dst->y = rect.top; + dst->width = rect.right - rect.left; + dst->height = rect.bottom - rect.top; if (dst->width < 0) SWAP_INT32( &rect.left, &rect.right ); if (dst->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + GetRgnBox( physDevDst->region, &clipRect ); if (!IntersectRect( &dst->visrect, &rect, &clipRect )) return FALSE; /* Get the source visible rectangle */ if (!physDevSrc) return TRUE; + rect.left = src->x; rect.top = src->y; rect.right = src->x + src->width; rect.bottom = src->y + src->height; + LPtoDP( physDevSrc->hdc, (POINT *)&rect, 2 ); + src->x = rect.left; + src->y = rect.top; + src->width = rect.right - rect.left; + src->height = rect.bottom - rect.top; if (src->width < 0) SWAP_INT32( &rect.left, &rect.right ); if (src->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + /* Apparently the clipping and visible regions are only for output, so just check against dc extent here to avoid BadMatch errors */ clipRect = physDevSrc->drawable_rect; @@ -1376,7 +1389,6 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN const BYTE *opcode; Pixmap pixmaps[3] = { 0, 0, 0 }; /* pixmaps for DST, SRC, TMP */ GC tmpGC = 0; - POINT pts[2]; /* compensate for off-by-one shifting for negative widths and heights */ if (widthDst < 0) @@ -1393,65 +1405,39 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN useDst = (((rop >> 1) & 0x550000) != (rop & 0x550000)); if (!physDevSrc && useSrc) return FALSE; - /* Map the coordinates to device coords */ - - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hdc, pts, 2); - xDst = pts[0].x; - yDst = pts[0].y; - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - - TRACE(" rectdst=%d,%d-%d,%d orgdst=%d,%d\n", - xDst, yDst, widthDst, heightDst, - physDevDst->dc_rect.left, physDevDst->dc_rect.top ); + src.x = xSrc; + src.y = ySrc; + src.width = widthSrc; + src.height = heightSrc; + dst.x = xDst; + dst.y = yDst; + dst.width = widthDst; + dst.height = heightDst; if (useSrc) { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - LPtoDP(physDevSrc->hdc, pts, 2); - xSrc = pts[0].x; - ySrc = pts[0].y; - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - - fStretch = (widthSrc != widthDst) || (heightSrc != heightDst); - TRACE(" rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n", - xSrc, ySrc, widthSrc, heightSrc, - physDevSrc->dc_rect.left, physDevSrc->dc_rect.top ); - src.x = xSrc; - src.y = ySrc; - src.width = widthSrc; - src.height = heightSrc; - dst.x = xDst; - dst.y = yDst; - dst.width = widthDst; - dst.height = heightDst; if (!BITBLT_GetVisRectangles( physDevDst, physDevSrc, &dst, &src )) return TRUE; - TRACE(" vissrc=%s visdst=%s\n", - wine_dbgstr_rect( &src.visrect ), wine_dbgstr_rect( &dst.visrect ) ); + fStretch = (src.width != dst.width) || (src.height != dst.height); + if (physDevDst != physDevSrc) sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); } else { fStretch = FALSE; - dst.x = xDst; - dst.y = yDst; - dst.width = widthDst; - dst.height = heightDst; if (!BITBLT_GetVisRectangles( physDevDst, NULL, &dst, NULL )) return TRUE; - TRACE(" vissrc=none visdst=%s\n", wine_dbgstr_rect( &dst.visrect ) ); } + TRACE(" rectdst=%d,%d %dx%d orgdst=%d,%d visdst=%s\n", + dst.x, dst.y, dst.width, dst.height, + physDevDst->dc_rect.left, physDevDst->dc_rect.top, wine_dbgstr_rect( &dst.visrect ) ); + if (useSrc) + TRACE(" rectsrc=%d,%d %dx%d orgsrc=%d,%d vissrc=%s\n", + src.x, src.y, src.width, src.height, + physDevSrc->dc_rect.left, physDevSrc->dc_rect.top, wine_dbgstr_rect( &src.visrect ) ); + width = dst.visrect.right - dst.visrect.left; height = dst.visrect.bottom - dst.visrect.top;

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010