December 2011 - Wine-commits

Piotr Caban : msvcp90: Added _Getctype implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: c56c74331c337e7ec2ba0142d328b577b274375c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c74331c337e7ec2ba0142d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:52 2011 +0100 msvcp90: Added _Getctype implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a319d12..2fd3bd1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -68,7 +68,7 @@ typedef struct { typedef struct { LCID handle; unsigned page; - const short *table; + short *table; int delfl; } _Ctypevec; @@ -868,14 +868,33 @@ _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) return _Getcoll(); } +/* _Getctype */ +_Ctypevec __cdecl _Getctype(void) +{ + _Ctypevec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_codepage; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret.delfl = TRUE; + ret.table = malloc(sizeof(short[256])); + if(!ret.table) { + _free_locale(locale); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy(ret.table, locale->locinfo->pctype, sizeof(short[256])); + _free_locale(locale); + return ret; +} + /* ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ /* ?_Getctype(a)_Locinfo@std@@QEBA?AU_Ctypevec@@XZ */ DEFINE_THISCALL_WRAPPER_RETPTR(_Locinfo__Getctype, 4) _Ctypevec __thiscall _Locinfo__Getctype(const _Locinfo *this) { - _Ctypevec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getctype(); } /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2464328..bcaaa1c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5751,7 +5751,7 @@ @ extern _FSnan # extern _FXbig @ cdecl _Getcoll() -@ stub _Getctype +@ cdecl _Getctype() @ stub _Getcvt @ stub _Getdateorder @ stub _Getwctype diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 069c935..221edf1 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -17,12 +17,22 @@ */ #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> #include "wine/test.h" +typedef struct { + LCID handle; + unsigned page; + short *table; + int delfl; +} MSVCP__Ctypevec; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); +static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); @@ -35,6 +45,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); #ifdef __i386__ #define __thiscall __stdcall @@ -119,7 +130,9 @@ static BOOL init(void) } p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); - if(!p_set_invalid_parameter_handler) { + p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p_free = (void*)GetProcAddress(msvcr, "free"); + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -127,6 +140,7 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); SET(p_wctype, "wctype"); + SET(p__Getctype, "_Getctype"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -291,6 +305,26 @@ static void test_wctype(void) } } +static void test__Getctype(void) +{ + MSVCP__Ctypevec ret; + + ret = p__Getctype(); + ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); + + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + ret = p__Getctype(); + ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -331,6 +365,7 @@ START_TEST(misc) test_equal(); test_Copy_s(); test_wctype(); + test__Getctype(); test_allocator_char();

1 0

Jacek Caban : mshtml: Don' t use WINAPI for assembly functions to avoid linker warnings on mingw.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 3284d17ec28382177be1e42dbccf66ae5435d21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3284d17ec28382177be1e42db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 11:09:40 2011 +0100 mshtml: Don't use WINAPI for assembly functions to avoid linker warnings on mingw. --- dlls/mshtml/ifacewrap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index 006afd2..0e49190 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -88,7 +88,7 @@ static HRESULT WINAPI wrapper_Release(IUnknown *iface) #ifdef __i386__ #define DEFINE_WRAPPER_FUNC(n, off, x) \ - HRESULT WINAPI wrapper_func_##n(IUnknown*); \ + HRESULT wrapper_func_##n(IUnknown*); \ __ASM_GLOBAL_FUNC(wrapper_func_##n, \ "movl 4(%esp), %eax\n\t" \ "movl 4(%eax), %eax\n\t" \

1 0

Alexandre Julliard : gdi32: Add a helper function to clip a rectangle to the DC visible rect.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 1e2dd7cad83a5e1de5fbb71709e9a69510f4a83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2dd7cad83a5e1de5fbb7170… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 12:57:30 2011 +0100 gdi32: Add a helper function to clip a rectangle to the DC visible rect. --- dlls/gdi32/bitblt.c | 12 +++--------- dlls/gdi32/clipping.c | 19 ++++++++++++++++++- dlls/gdi32/dib.c | 18 +++++++----------- dlls/gdi32/font.c | 4 +--- dlls/gdi32/gdi_private.h | 2 +- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a7c4918..bfb56a6 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -104,7 +104,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, DC *dc_src, struct bitblt_coords *src ) { - RECT rect, clip; + RECT rect; /* get the destination visible rectangle */ @@ -124,10 +124,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } get_bounding_rect( &rect, dst->x, dst->y, dst->width, dst->height ); - if (get_clip_box( dc_dst, &clip )) - intersect_rect( &dst->visrect, &rect, &clip ); - else - dst->visrect = rect; + clip_visrect( dc_dst, &dst->visrect, &rect ); /* get the source visible rectangle */ @@ -408,7 +405,6 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, struct gdi_image_bits bits; unsigned int i; POINT *pts; - RECT clip; BOOL ret = TRUE; DWORD err; HRGN rgn; @@ -437,9 +433,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, dst.y = dst.visrect.top; dst.width = dst.visrect.right - dst.visrect.left; dst.height = dst.visrect.bottom - dst.visrect.top; - - if (get_clip_box( dc, &clip )) intersect_rect( &dst.visrect, &dst.visrect, &clip ); - if (is_rect_empty( &dst.visrect )) goto done; + if (!clip_visrect( dc, &dst.visrect, &dst.visrect )) goto done; /* query the bitmap format */ info->bmiHeader.biSize = sizeof(info->bmiHeader); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 70e0e32..53ad56b 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -57,7 +57,7 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot * * Get the clipping rectangle in device coordinates. */ -int get_clip_box( DC *dc, RECT *rect ) +static int get_clip_box( DC *dc, RECT *rect ) { int ret = ERROR; HRGN rgn, clip = get_clip_region( dc ); @@ -74,6 +74,23 @@ int get_clip_box( DC *dc, RECT *rect ) } /*********************************************************************** + * clip_visrect + * + * Clip a rectangle to the DC visible rect. + */ +BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) +{ + RECT clip; + + if (!get_clip_box( dc, &clip )) + { + *dst = *src; + return !is_rect_empty( dst ); + } + return intersect_rect( dst, src, &clip ); +} + +/*********************************************************************** * CLIPPING_UpdateGCRegion * * Update the GC clip region when the ClipRgn or VisRgn have changed. diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index bc9564a..0b8bb76 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -403,7 +403,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he INT ret = 0; INT height = abs( src_info->bmiHeader.biHeight ); BOOL top_down = src_info->bmiHeader.biHeight < 0, non_stretch_from_origin = FALSE; - RECT rect, clip_rect; + RECT rect; TRACE("%d %d %d %d <- %d %d %d %d rop %08x\n", xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, rop); @@ -487,11 +487,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); - if (get_clip_box( dc, &clip_rect )) - intersect_rect( &dst.visrect, &rect, &clip_rect ); - else - dst.visrect = rect; - if (is_rect_empty( &dst.visrect )) goto done; + if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; if (!intersect_vis_rectangles( &dst, &src )) goto done; @@ -796,11 +792,11 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR dst.height = cy; if (GetLayout( dev->hdc ) & LAYOUT_RTL) dst.x -= cx - 1; - dst.visrect.left = dst.x; - dst.visrect.top = dst.y; - dst.visrect.right = dst.x + cx; - dst.visrect.bottom = dst.y + cy; - if (get_clip_box( dc, &rect )) intersect_rect( &dst.visrect, &dst.visrect, &rect ); + rect.left = dst.x; + rect.top = dst.y; + rect.right = dst.x + cx; + rect.bottom = dst.y + cy; + if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; offset_rect( &src.visrect, dst.x - src.x, dst.y - src.y ); intersect_rect( &rect, &src.visrect, &dst.visrect ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a785283..0d308b0 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1863,13 +1863,11 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect struct gdi_image_bits bits; struct bitblt_coords src, dst; PHYSDEV dst_dev; - RECT clip; dst_dev = GET_DC_PHYSDEV( dc, pPutImage ); src.visrect = get_total_extents( dev->hdc, x, y, flags, aa_flags, str, count, dx ); if (flags & ETO_CLIPPED) intersect_rect( &src.visrect, &src.visrect, rect ); - if (get_clip_box( dc, &clip )) intersect_rect( &src.visrect, &src.visrect, &clip ); - if (is_rect_empty( &src.visrect )) return TRUE; + if (!clip_visrect( dc, &src.visrect, &src.visrect )) return TRUE; /* FIXME: check for ETO_OPAQUE and avoid GetImage */ src.x = src.visrect.left; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fe879ac..c01c2f5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -212,7 +212,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ -extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; +extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* Return the total clip region (if any) */

1 0

Alexandre Julliard : gdi32: Maintain a region inside gdi32 to keep track of the total visible region.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 5a1a6e935a8a42c63712e9a41f6b779ce13426d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1a6e935a8a42c63712e9a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:08:19 2011 +0100 gdi32: Maintain a region inside gdi32 to keep track of the total visible region. --- dlls/gdi32/clipping.c | 52 +++++++++++++-------------------------------- dlls/gdi32/dc.c | 3 ++ dlls/gdi32/gdi_private.h | 15 +++++++++--- 3 files changed, 29 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 53ad56b..b4d77d3 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -53,27 +53,6 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** - * get_clip_box - * - * Get the clipping rectangle in device coordinates. - */ -static int get_clip_box( DC *dc, RECT *rect ) -{ - int ret = ERROR; - HRGN rgn, clip = get_clip_region( dc ); - - if (!clip) return GetRgnBox( dc->hVisRgn, rect ); - - if ((rgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - CombineRgn( rgn, dc->hVisRgn, clip, RGN_AND ); - ret = GetRgnBox( rgn, rect ); - DeleteObject( rgn ); - } - return ret; -} - -/*********************************************************************** * clip_visrect * * Clip a rectangle to the DC visible rect. @@ -82,7 +61,7 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) { RECT clip; - if (!get_clip_box( dc, &clip )) + if (!GetRgnBox( get_dc_region(dc), &clip )) { *dst = *src; return !is_rect_empty( dst ); @@ -105,13 +84,22 @@ void CLIPPING_UpdateGCRegion( DC * dc ) { if (!dc->hMetaClipRgn) dc->hMetaClipRgn = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( dc->hMetaClipRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); - clip_rgn = dc->hMetaClipRgn; } else /* only one is set, no need for an intersection */ { if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); dc->hMetaClipRgn = 0; - clip_rgn = dc->hMetaRgn ? dc->hMetaRgn : dc->hClipRgn; + } + clip_rgn = get_clip_region( dc ); + if (clip_rgn || dc->hVisRgn) + { + if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); + CombineRgn( dc->region, dc->hVisRgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + } + else + { + if (dc->region) DeleteObject( dc->region ); + dc->region = 0; } physdev->funcs->pSetDeviceClipping( physdev, dc->hVisRgn, clip_rgn ); } @@ -365,7 +353,6 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) { POINT pt; BOOL ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); TRACE("%p %d,%d\n", hdc, x, y ); @@ -375,8 +362,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = PtInRegion( dc->hVisRgn, pt.x, pt.y ); - if (ret && (clip = get_clip_region(dc))) ret = PtInRegion( clip, pt.x, pt.y ); + ret = PtInRegion( get_dc_region(dc), pt.x, pt.y ); release_dc_ptr( dc ); return ret; } @@ -389,7 +375,6 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) { RECT tmpRect; BOOL ret; - HRGN clip; DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; TRACE("%p %s\n", hdc, wine_dbgstr_rect( rect )); @@ -398,14 +383,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - if ((clip = get_clip_region(dc))) - { - HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( hrgn, dc->hVisRgn, clip, RGN_AND ); - ret = RectInRegion( hrgn, &tmpRect ); - DeleteObject( hrgn ); - } - else ret = RectInRegion( dc->hVisRgn, &tmpRect ); + ret = RectInRegion( get_dc_region(dc), &tmpRect ); release_dc_ptr( dc ); return ret; } @@ -421,7 +399,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (!dc) return ERROR; update_dc( dc ); - ret = get_clip_box( dc, rect ); + ret = GetRgnBox( get_dc_region(dc), rect ); if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b357cee..77897e9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -103,6 +103,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->hMetaRgn = 0; dc->hMetaClipRgn = 0; dc->hVisRgn = 0; + dc->region = 0; dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); @@ -174,6 +175,7 @@ static void free_dc_state( DC *dc ) if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); HeapFree( GetProcessHeap(), 0, dc ); } @@ -418,6 +420,7 @@ INT nulldrv_SaveDC( PHYSDEV dev ) /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ + newdc->region = 0; newdc->hVisRgn = 0; newdc->hClipRgn = 0; newdc->hMetaRgn = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c01c2f5..f499de0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -104,10 +104,11 @@ typedef struct tagDC int flags; DWORD layout; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hMetaRgn; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ + HRGN hClipRgn; /* Clip region */ + HRGN hMetaRgn; /* Meta region */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions */ + HRGN hVisRgn; /* Visible region */ + HRGN region; /* Total DC region (intersection of clip and visible) */ HPEN hPen; HBRUSH hBrush; HFONT hFont; @@ -223,6 +224,12 @@ static inline HRGN get_clip_region( DC * dc ) return dc->hClipRgn; } +/* Return the total DC region (if any) */ +static inline HRGN get_dc_region( DC *dc ) +{ + return dc->region; +} + /* dc.c */ extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Pass the total visible region in the SetDeviceClipping driver entry point.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 7534d47b1ba75886297bca2c653a28cc41c2a28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7534d47b1ba75886297bca2c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:15:35 2011 +0100 gdi32: Pass the total visible region in the SetDeviceClipping driver entry point. --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dibdrv/dc.c | 9 +++++---- dlls/gdi32/driver.c | 2 +- dlls/winex11.drv/graphics.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index b4d77d3..7f69950 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -101,7 +101,7 @@ void CLIPPING_UpdateGCRegion( DC * dc ) if (dc->region) DeleteObject( dc->region ); dc->region = 0; } - physdev->funcs->pSetDeviceClipping( physdev, dc->hVisRgn, clip_rgn ); + physdev->funcs->pSetDeviceClipping( physdev, dc->region ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 8af8c85..f9b5e7b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -475,14 +475,15 @@ static INT dibdrv_SetBkMode( PHYSDEV dev, INT mode ) /*********************************************************************** * dibdrv_SetDeviceClipping */ -static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - TRACE("(%p, %p, %p)\n", dev, vis_rgn, clip_rgn); + TRACE("(%p, %p)\n", dev, rgn); - CombineRgn( pdev->clip, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - return next->funcs->pSetDeviceClipping( next, vis_rgn, clip_rgn); + SetRectRgn( pdev->clip, 0, 0, pdev->dib.width, pdev->dib.height ); + if (rgn) CombineRgn( pdev->clip, pdev->clip, rgn, RGN_AND ); + return next->funcs->pSetDeviceClipping( next, rgn ); } /*********************************************************************** diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 26048b4..15481ac 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -582,7 +582,7 @@ static UINT nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const R return 0; } -static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index f2cf037..4f76a1f 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -239,12 +239,12 @@ void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) /*********************************************************************** * X11DRV_SetDeviceClipping */ -void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { RGNDATA *data; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + CombineRgn( physDev->region, rgn, 0, RGN_COPY ); if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) update_x11_clipping( physDev, data ); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d90968d..f1f22bd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -230,7 +230,7 @@ extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; -extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; +extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1c15d2a..5aafd2d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1337,14 +1337,14 @@ static DWORD xrenderdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info /*********************************************************************** * xrenderdrv_SetDeviceClipping */ -static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); physdev->update_clip = TRUE; dev = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); - dev->funcs->pSetDeviceClipping( dev, vis_rgn, clip_rgn ); + dev->funcs->pSetDeviceClipping( dev, rgn ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d996fb4..b3241c0 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -159,7 +159,7 @@ struct gdi_dc_funcs COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF); UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT); - VOID (*pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); + VOID (*pSetDeviceClipping)(PHYSDEV,HRGN); BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID); DWORD (*pSetLayout)(PHYSDEV,DWORD); INT (*pSetMapMode)(PHYSDEV,INT); @@ -205,7 +205,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 19 +#define WINE_GDI_DRIVER_VERSION 20 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : wineps: Fall through to the null driver for Polyline and Polygon.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: d45eb00abc82c73c64191ad4b0c58201ca41e252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45eb00abc82c73c64191ad4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:29:46 2011 +0100 wineps: Fall through to the null driver for Polyline and Polygon. --- dlls/wineps.drv/graphics.c | 18 ------------------ dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/psdrv.h | 2 -- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 41f6e91..5459ce4 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -351,15 +351,6 @@ BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWO /*********************************************************************** - * PSDRV_Polyline - */ -BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolyline( dev, pt, (LPDWORD) &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyPolygon */ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) @@ -402,15 +393,6 @@ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT p /*********************************************************************** - * PSDRV_Polygon - */ -BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolygon( dev, pt, &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyBezier */ BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e61df3e..9cba84a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -897,8 +897,8 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pPolyDraw */ PSDRV_PolyPolygon, /* pPolyPolygon */ PSDRV_PolyPolyline, /* pPolyPolyline */ - PSDRV_Polygon, /* pPolygon */ - PSDRV_Polyline, /* pPolyline */ + NULL, /* pPolygon */ + NULL, /* pPolyline */ NULL, /* pPolylineTo */ PSDRV_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index b86f527..a11048c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -450,8 +450,6 @@ extern BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLS extern BOOL PSDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use an X11 error handler to catch BadMatch errors from XGetImage.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 4c6a40977998c0aa7f9f5fa26021b5c5a4d3520c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a40977998c0aa7f9f5fa26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:47:31 2011 +0100 winex11: Use an X11 error handler to catch BadMatch errors from XGetImage. --- dlls/winex11.drv/bitblt.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c1df77a..9830327 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -582,6 +582,12 @@ int main() #endif /* BITBLT_TEST */ +/* handler for XGetImage BadMatch errors */ +static int XGetImage_handler( Display *dpy, XErrorEvent *event, void *arg ) +{ + return (event->request_code == X_GetImage && event->error_code == BadMatch); +} + /*********************************************************************** * BITBLT_GetDstArea * @@ -1423,16 +1429,23 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } else { - Pixmap pixmap; + X11DRV_expect_error( gdi_display, XGetImage_handler, NULL ); + image = XGetImage( gdi_display, physdev->drawable, + physdev->dc_rect.left + x, physdev->dc_rect.top + y, + width, height, AllPlanes, ZPixmap ); + if (X11DRV_check_error()) + { + /* use a temporary pixmap to avoid the BadMatch error */ + Pixmap pixmap; - wine_tsx11_lock(); - /* use a temporary pixmap to avoid BadMatch errors */ - pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); - XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), - physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); - image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); - XFreePixmap( gdi_display, pixmap ); - wine_tsx11_unlock(); + wine_tsx11_lock(); + pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); + XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), + physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); + image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); + XFreePixmap( gdi_display, pixmap ); + wine_tsx11_unlock(); + } } if (!image) return ERROR_OUTOFMEMORY;

1 0

Henri Verbeet : wined3d: Don' t declare more varyings than required by the shader model.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 66d453ce5c77fe1bfa044f65c5f956a0d4cdd0ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d453ce5c77fe1bfa044f65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:53 2011 +0100 wined3d: Don't declare more varyings than required by the shader model. --- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b746139..47d2e66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1129,16 +1129,15 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ if (pshader && reg_maps->shader_version.major >= 3) { + UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + if (use_vs(state)) - { - shader_addline(buffer, "varying vec4 IN[%u];\n", vec4_varyings(reg_maps->shader_version.major, gl_info)); - } else { + shader_addline(buffer, "varying vec4 IN[%u];\n", in_count); + else /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the - * pixel shader that reads the fixed function color into the packed input registers. - */ - shader_addline(buffer, "vec4 IN[%u];\n", vec4_varyings(reg_maps->shader_version.major, gl_info)); - } + * pixel shader that reads the fixed function color into the packed input registers. */ + shader_addline(buffer, "vec4 IN[%u];\n", in_count); } /* Declare output register temporaries */ @@ -3916,8 +3915,9 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else { + UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits.packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(buffer, "varying vec4 IN[%u];\n", vec4_varyings(3, gl_info)); + shader_addline(buffer, "varying vec4 IN[%u];\n", in_count); shader_addline(buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); /* First, sort out position and point size. Those are not passed to the pixel shader */

1 0

Henri Verbeet : wined3d: Disable client storage in upload_palette().
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 107369d018cb9d6426538ed0a011e7518eacece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107369d018cb9d6426538ed0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:54 2011 +0100 wined3d: Disable client storage in upload_palette(). Stack pointers don't work so well with client storage. --- dlls/wined3d/arb_program_shader.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 86eb5f1..ecb2c03 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6950,6 +6950,13 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d d3dfmt_p8_init_palette(surface, table, colorkey); ENTER_GL(); + + if (gl_info->supported[APPLE_CLIENT_STORAGE]) + { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } + if (!priv->palette_texture) glGenTextures(1, &priv->palette_texture); @@ -6966,6 +6973,12 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d /* TODO: avoid unneeded uploads in the future by adding some SFLAG_PALETTE_DIRTY mechanism */ glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, table); + if (gl_info->supported[APPLE_CLIENT_STORAGE]) + { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + } + /* Switch back to unit 0 in which the 2D texture will be stored. */ context_active_texture(context, gl_info, 0); LEAVE_GL();

1 0

Henri Verbeet : ddraw: Don't enumerate surfaces without references.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 6523ef5f679950627a79dc2c802ea6655c73c3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6523ef5f679950627a79dc2c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:55 2011 +0100 ddraw: Don't enumerate surfaces without references. --- dlls/ddraw/ddraw.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 03d8b1c..b344b81 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3422,6 +3422,13 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, LIST_FOR_EACH_SAFE(entry, entry2, &This->surface_list) { surf = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + + if (!surf->iface_count) + { + WARN("Not enumerating surface %p because it doesn't have any references.\n", surf); + continue; + } + if (all || (nomatch != ddraw_match_surface_desc(DDSD, &surf->surface_desc))) { TRACE("Enumerating surface %p.\n", surf);

1 0