September 2011 - Wine-commits

Francois Gouget : po: Remove an English string from the Spanish translation .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 199b04f10bbc63917c53c8a2e71878537c35b0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199b04f10bbc63917c53c8a2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:19 2011 +0200 po: Remove an English string from the Spanish translation. --- po/es.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/es.po b/po/es.po index b778abe..815f7ee 100644 --- a/po/es.po +++ b/po/es.po @@ -516,7 +516,7 @@ msgstr "Sin tóner; " #: comdlg32.rc:113 msgid "Page punt; " -msgstr "Page punt; " +msgstr "" #: comdlg32.rc:114 msgid "Interrupted by user; " @@ -10079,6 +10079,7 @@ msgstr "" "bajo ciertas condiciones; ejecute 'start /L' para obtener detalles.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -11336,6 +11337,7 @@ msgid "Error while selecting new font." msgstr "Error al seleccionar la nueva fuente." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove an English string from the Greek translation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: ceeafa18afbbb167ab541187c591a7716f730701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceeafa18afbbb167ab541187c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:33:21 2011 +0200 po: Remove an English string from the Greek translation. --- po/el.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/el.po b/po/el.po index 5f62482..426c432 100644 --- a/po/el.po +++ b/po/el.po @@ -2069,7 +2069,7 @@ msgstr "" #: hhctrl.rc:45 msgid "Sync" -msgstr "Sync" +msgstr "" #: hhctrl.rc:47 wordpad.rc:155 msgid "Options"

1 0

Nikolay Sivov : comctl32/monthcal: Implement MCM_GETCALENDARCOUNT.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 0d3b04d033a891149e613b9f6273da08a7209e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3b04d033a891149e613b9f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 20 09:57:28 2011 +0400 comctl32/monthcal: Implement MCM_GETCALENDARCOUNT. --- dlls/comctl32/monthcal.c | 3 +++ dlls/comctl32/tests/monthcal.c | 21 +++++++++++++++++++++ include/commctrl.h | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8fcdf28..f46ec5f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2809,6 +2809,9 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case MCM_GETUNICODEFORMAT: return MONTHCAL_GetUnicodeFormat(infoPtr); + case MCM_GETCALENDARCOUNT: + return MONTHCAL_GetCalCount(infoPtr); + case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 83b789d..87aadec 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1799,6 +1799,26 @@ static void test_MCM_SIZERECTTOMIN(void) DestroyWindow(hwnd); } +static void test_MCM_GETCALENDARCOUNT(void) +{ + HWND hwnd; + DWORD ret; + + hwnd = create_monthcal_control(0); + + ret = SendMessageA(hwnd, MCM_GETCALENDARCOUNT, 0, 0); + if (ret == 0) + { + win_skip("Message MCM_GETCALENDARCOUNT unsupported. Skipping.\n"); + DestroyWindow(hwnd); + return; + } + + todo_wine expect(2, ret); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1866,6 +1886,7 @@ START_TEST(monthcal) test_hittest_v6(); test_get_set_border(); test_MCM_SIZERECTTOMIN(); + test_MCM_GETCALENDARCOUNT(); unload_v6_module(ctx_cookie, hCtx); diff --git a/include/commctrl.h b/include/commctrl.h index 21f481e..e19b861 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4689,6 +4689,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', #define MCM_GETMONTHDELTA (MCM_FIRST + 19) #define MCM_SETMONTHDELTA (MCM_FIRST + 20) #define MCM_GETMAXTODAYWIDTH (MCM_FIRST + 21) +#define MCM_GETCALENDARCOUNT (MCM_FIRST + 23) #define MCM_SIZERECTTOMIN (MCM_FIRST + 29) #define MCM_SETCALENDARBORDER (MCM_FIRST + 30) #define MCM_GETCALENDARBORDER (MCM_FIRST + 31)

1 0

Nikolay Sivov : comctl32/monthcal: Fix today label position.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 57a70f492498de0fab4954f109b5bc3eaf586fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a70f492498de0fab4954f10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 20 10:45:24 2011 +0400 comctl32/monthcal: Fix today label position. --- dlls/comctl32/monthcal.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index f46ec5f..dfa3d6e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -963,9 +963,8 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1; if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--; - /* TODO: when multiple calendars layout is calculated use first column/last row calendar for that - imaginary day position */ - MONTHCAL_GetDayRectI(infoPtr, &text_rect, col, 6, 0); + /* label is located below first calendar last row */ + MONTHCAL_GetDayRectI(infoPtr, &text_rect, col, 6, infoPtr->dim.cx * infoPtr->dim.cy - infoPtr->dim.cx); box_rect = text_rect; GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &infoPtr->todaysDate, NULL,

1 0

Nikolay Sivov : comctl32/monthcal: Fix today date box painting.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 229d4e210999cb9b31baa7c66458cbd2a7d9706c URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d4e210999cb9b31baa7c66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 20 11:35:54 2011 +0400 comctl32/monthcal: Fix today date box painting. --- dlls/comctl32/monthcal.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index dfa3d6e..762a792 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -987,14 +987,20 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons /* today mark + focus */ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - if((infoPtr->minSel.wMonth == infoPtr->todaysDate.wMonth) && - (infoPtr->minSel.wYear == infoPtr->todaysDate.wYear) && - !(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) + /* circle today date if only it's in fully visible month */ + if (!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { - MONTHCAL_CircleDay(infoPtr, hdc, &infoPtr->todaysDate); + INT i; + + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) + if (!MONTHCAL_CompareMonths(&infoPtr->todaysDate, &infoPtr->calendars[i].month)) + { + MONTHCAL_CircleDay(infoPtr, hdc, &infoPtr->todaysDate); + break; + } } - if(!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) + if (!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) { RECT r; MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1);

1 0

Dmitry Timoshkov : kernel32: Add a test to show that uninitialized sections are not special regarding protection flags .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 0f500eac9881a6a49b925b560983f5f6388aa786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f500eac9881a6a49b925b560… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 20 17:48:12 2011 +0900 kernel32: Add a test to show that uninitialized sections are not special regarding protection flags. --- dlls/kernel32/tests/loader.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 866daba..ce59843 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -567,7 +567,25 @@ static void test_section_access(void) { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; @@ -651,6 +669,11 @@ static void test_section_access(void) "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + /* FIXME: remove the condition below once Wine is fixed */ + if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && + (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect);

1 0

Piotr Caban : msvcr90: Fix _vswprintf_p implementation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: af6fd252ef8d630be82b9dba3199d5990c80e2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6fd252ef8d630be82b9dba3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 20 10:32:29 2011 +0200 msvcr90: Fix _vswprintf_p implementation. --- dlls/msvcr90/msvcr90.c | 8 ++++++++ dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index fd24f11..6b97e2f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -358,3 +358,11 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); return NULL; } + +/********************************************************************* + * _vswprintf_p (MSVCR90.@) + */ +int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ms_va_list args) +{ + return _vswprintf_p_l(buffer, length, format, NULL, args); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ffdc931..c93efdd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1107,7 +1107,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l -@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p(ptr long wstr ptr) MSVCR90__vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d771d4f..0327ccb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -709,7 +709,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, FALSE, TRUE, arg_clbk_valist, NULL, &args); else ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 4e43635..e2c1669 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index eab28b7..4c26624 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -322,6 +322,7 @@ int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*);

1 0

Alexandre Julliard : winex11: Add a helper function to create the source pixmap from an image.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: aa4655e8995e14e49450f6b23866b80e186a8329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4655e8995e14e49450f6b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:21:00 2011 +0200 winex11: Add a helper function to create the source pixmap from an image. --- dlls/winex11.drv/xrender.c | 124 ++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 50 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b991935..384275f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2388,6 +2388,56 @@ static void get_colors( struct xrender_physdev *physdev_src, struct xrender_phys get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, bg ); } +/* create a pixmap and render picture for an image */ +static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, enum wxr_format format, + Pixmap *pixmap, Picture *pict, BOOL *use_repeat ) +{ + DWORD ret; + int width = src->visrect.right - src->visrect.left; + int height = src->visrect.bottom - src->visrect.top; + int depth = pict_formats[format]->depth; + struct gdi_image_bits dst_bits; + XRenderPictureAttributes pa; + XImage *image; + + wine_tsx11_lock(); + image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL, + info->bmiHeader.biWidth, height, 32, 0 ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + ret = copy_image_bits( info, (format == WXR_FORMAT_R8G8B8), image, bits, &dst_bits, src, NULL, ~0u ); + if (ret) return ret; + + image->data = dst_bits.ptr; + /* hack: make sure the bits are readable if we are reading from a DIB section */ + /* to be removed once we get rid of DIB access protections */ + if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); + + *use_repeat = (width == 1 && height == 1); + pa.repeat = *use_repeat ? RepeatNormal : RepeatNone; + + wine_tsx11_lock(); + *pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); + XPutImage( gdi_display, *pixmap, get_bitmap_gc( depth ), image, + src->visrect.left, 0, 0, 0, width, height ); + *pict = pXRenderCreatePicture( gdi_display, *pixmap, pict_formats[format], CPRepeat, &pa ); + wine_tsx11_unlock(); + + /* make coordinates relative to the pixmap */ + src->x -= src->visrect.left; + src->y -= src->visrect.top; + OffsetRect( &src->visrect, -src->visrect.left, -src->visrect.top ); + + image->data = NULL; + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ret; +} + static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, Drawable drawable, HRGN clip, const struct bitblt_coords *src, const struct bitblt_coords *dst ) @@ -2488,21 +2538,18 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr HeapFree( GetProcessHeap(), 0, clip_data ); } -static void xrender_put_image( XImage *image, HRGN clip, XRenderPictFormat *src_format, + +static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, XRenderPictFormat *dst_format, struct xrender_physdev *physdev, - Drawable drawable, struct bitblt_coords *src, struct bitblt_coords *dst ) + Drawable drawable, struct bitblt_coords *src, + struct bitblt_coords *dst, BOOL use_repeat ) { int x_src, y_src, x_dst, y_dst; - Picture dst_pict, src_pict; + Picture dst_pict; XRenderPictureAttributes pa; - Pixmap src_pixmap; double xscale, yscale; RGNDATA *clip_data = NULL; - /* make source relative to tmp pixmap origin */ - x_src = src->x - src->visrect.left; - y_src = src->y - src->visrect.top; - if (drawable) /* using an intermediate pixmap */ { if (clip) clip_data = X11DRV_GetRegionData( clip, 0 ); @@ -2524,35 +2571,25 @@ static void xrender_put_image( XImage *image, HRGN clip, XRenderPictFormat *src_ if (clip) clip_data = add_xrender_clipping_region( physdev, clip ); } - if (image->width == 1 && image->height == 1) - { - pa.repeat = RepeatNormal; - xscale = yscale = 1; /* no scaling needed with a repeating source */ - } - else + if (!use_repeat) { - pa.repeat = RepeatNone; xscale = src->width / (double)dst->width; yscale = src->height / (double)dst->height; } + else xscale = yscale = 1; /* no scaling needed with a repeating source */ + x_src = src->x; + y_src = src->y; if (src->width < 0) x_src += src->width + 1; if (src->height < 0) y_src += src->height + 1; if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; wine_tsx11_lock(); - src_pixmap = XCreatePixmap( gdi_display, root_window, image->width, image->height, src_format->depth ); - XPutImage( gdi_display, src_pixmap, get_bitmap_gc( src_format->depth ), - image, src->visrect.left, 0, 0, 0, image->width, image->height ); - src_pict = pXRenderCreatePicture( gdi_display, src_pixmap, src_format, CPRepeat, &pa ); - xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); if (drawable) pXRenderFreePicture( gdi_display, dst_pict ); - pXRenderFreePicture( gdi_display, src_pict ); - XFreePixmap( gdi_display, src_pixmap ); wine_tsx11_unlock(); if (!drawable) update_xrender_clipping( physdev, clip_data ); @@ -2655,12 +2692,13 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA struct xrender_physdev *physdev; X_PHYSBITMAP *bitmap; DWORD ret; - XImage *image; Pixmap tmp_pixmap; GC gc; - struct gdi_image_bits dst_bits; enum wxr_format src_format, dst_format; XRenderPictFormat *pict_format; + Pixmap src_pixmap; + Picture src_pict; + BOOL use_repeat; if (!X11DRV_XRender_Installed) goto x11drv_fallback; @@ -2691,24 +2729,11 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA if (!bits) return ERROR_SUCCESS; /* just querying the format */ - wine_tsx11_lock(); - image = XCreateImage( gdi_display, visual, pict_format->depth, ZPixmap, 0, NULL, - info->bmiHeader.biWidth, src->visrect.bottom - src->visrect.top, 32, 0 ); - wine_tsx11_unlock(); - if (!image) return ERROR_OUTOFMEMORY; - - ret = copy_image_bits( info, (src_format == WXR_FORMAT_R8G8B8), - image, bits, &dst_bits, src, NULL, ~0u ); - + ret = create_image_pixmap( info, bits, src, src_format, &src_pixmap, &src_pict, &use_repeat ); if (!ret) { struct bitblt_coords tmp; - image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); - if (bitmap) { HRGN rgn = CreateRectRgnIndirect( &dst->visrect ); @@ -2716,8 +2741,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA X11DRV_DIB_Lock( bitmap, DIB_Status_GdiMod ); - xrender_put_image( image, rgn, pict_formats[src_format], pict_formats[dst_format], - NULL, bitmap->pixmap, src, dst ); + xrender_put_image( src_pixmap, src_pict, rgn, pict_formats[dst_format], + NULL, bitmap->pixmap, src, dst, use_repeat ); X11DRV_DIB_Unlock( bitmap, TRUE ); DeleteObject( rgn ); @@ -2746,8 +2771,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA tmp.visrect.bottom - tmp.visrect.top, physdev->x11dev->depth ); wine_tsx11_unlock(); - xrender_put_image( image, NULL, pict_format, physdev->pict_format, - NULL, tmp_pixmap, src, &tmp ); + xrender_put_image( src_pixmap, src_pict, NULL, physdev->pict_format, + NULL, tmp_pixmap, src, &tmp, use_repeat ); execute_rop( physdev->x11dev, tmp_pixmap, gc, &dst->visrect, rop ); wine_tsx11_lock(); @@ -2761,20 +2786,19 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA { HRGN rgn = CreateRectRgnIndirect( &dst->visrect ); if (clip) CombineRgn( rgn, rgn, clip, RGN_AND ); - xrender_put_image( image, rgn, pict_format, physdev->pict_format, physdev, 0, src, dst ); + xrender_put_image( src_pixmap, src_pict, rgn, + physdev->pict_format, physdev, 0, src, dst, use_repeat ); DeleteObject( rgn ); } - X11DRV_UnlockDIBSection( physdev->x11dev, !ret ); + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); } - image->data = NULL; + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, src_pict ); + XFreePixmap( gdi_display, src_pixmap ); + wine_tsx11_unlock(); } - - wine_tsx11_lock(); - XDestroyImage( image ); - wine_tsx11_unlock(); - if (dst_bits.free) dst_bits.free( &dst_bits ); return ret; update_format:

1 0

Alexandre Julliard : winex11: Set XRender clipping lazily when retrieving the destination picture.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 3be01b185dcb8637a1ddd1b607bad47097a96a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be01b185dcb8637a1ddd1b60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:51:43 2011 +0200 winex11: Set XRender clipping lazily when retrieving the destination picture. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 142 ++++++++++++++----------------------------- 3 files changed, 48 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3be01b185dcb8637a1ddd…

1 0

Alexandre Julliard : winex11: Implement a BlendImage entry point in the XRender driver.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: fb4dc8a544b3089937650e92cbde81c22406b7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4dc8a544b3089937650e92c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 12:00:00 2011 +0200 winex11: Implement a BlendImage entry point in the XRender driver. --- dlls/winex11.drv/xrender.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7dd32cc..cdd71e8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2766,6 +2766,80 @@ x11drv_fallback: /*********************************************************************** + * xrenderdrv_BlendImage + */ +static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, + BLENDFUNCTION func ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + DWORD ret; + enum wxr_format format; + XRenderPictFormat *pict_format; + Picture dst_pict, src_pict, mask_pict; + Pixmap src_pixmap; + BOOL use_repeat; + + if (!X11DRV_XRender_Installed) + { + dev = GET_NEXT_PHYSDEV( dev, pBlendImage ); + return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); + } + + format = get_xrender_format_from_bitmapinfo( info, func.AlphaFormat & AC_SRC_ALPHA ); + if (!(pict_format = pict_formats[format])) goto update_format; + + /* make sure we can create an image with the same bpp */ + if (info->bmiHeader.biBitCount != pixmap_formats[pict_format->depth]->bits_per_pixel) + goto update_format; + + if (format == WXR_FORMAT_MONO && physdev->format != WXR_FORMAT_MONO) + goto update_format; + + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + ret = create_image_pixmap( info, bits, src, format, &src_pixmap, &src_pict, &use_repeat ); + if (!ret) + { + double xscale, yscale; + + X11DRV_LockDIBSection( physdev->x11dev, DIB_Status_GdiMod ); + + if (!use_repeat) + { + xscale = src->width / (double)dst->width; + yscale = src->height / (double)dst->height; + } + else xscale = yscale = 1; /* no scaling needed with a repeating source */ + + dst_pict = get_xrender_picture( physdev, 0, &dst->visrect ); + + EnterCriticalSection( &xrender_cs ); + mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); + + wine_tsx11_lock(); + xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, src->x, src->y, + physdev->x11dev->dc_rect.left + dst->x, + physdev->x11dev->dc_rect.top + dst->y, + xscale, yscale, dst->width, dst->height ); + pXRenderFreePicture( gdi_display, src_pict ); + XFreePixmap( gdi_display, src_pixmap ); + wine_tsx11_unlock(); + + LeaveCriticalSection( &xrender_cs ); + + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); + } + return ret; + +update_format: + if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + set_color_info( physdev->pict_format, info ); + return ERROR_BAD_FORMAT; +} + + +/*********************************************************************** * xrenderdrv_AlphaBlend */ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, @@ -2881,7 +2955,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ - NULL, /* pBlendImage */ + xrenderdrv_BlendImage, /* pBlendImage */ NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */

1 0