winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
737 discussions
Start a n
N
ew thread
Daniel Jelinski : ntdll: Add missing parameters to syscall call.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 6ec731b65cb6525d04b86737ff85a3e77054ed36 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6ec731b65cb6525d04b86737f…
Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue May 29 21:49:35 2012 +0200 ntdll: Add missing parameters to syscall call. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 881d961..8f8fdcf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1188,7 +1188,7 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) ULONG processor; #if defined(__linux__) && defined(__NR_getcpu) - int res = syscall(__NR_getcpu, &processor); + int res = syscall(__NR_getcpu, &processor, NULL, NULL); if (res != -1) return processor; #endif
1
0
0
0
Alexandre Julliard : ntdll: Export _local_unwind.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: bb23d63663ad6d9cb4b5fed72fd9e1ae7319321b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bb23d63663ad6d9cb4b5fed72…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 21:30:29 2012 +0200 ntdll: Export _local_unwind. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 842fc41..ec865cc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1289,6 +1289,7 @@ @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) +@ stdcall -arch=x86_64 -private _local_unwind(ptr ptr) ntdll._local_unwind @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) @ stdcall _lwrite(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cff7081..65fd405 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1270,6 +1270,7 @@ @ cdecl -private _itoa(long ptr long) @ cdecl -private _itow(long ptr long) @ cdecl -private _lfind(ptr ptr ptr long ptr) +@ stdcall -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -private _ltoa(long ptr long) @ cdecl -private _ltow(long ptr long) @ cdecl -private _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b31cfb8..7d2b8d5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3109,6 +3109,16 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void /******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); +} + + +/******************************************************************* * __C_specific_handler (NTDLL.@) */ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,
1
0
0
0
Alexandre Julliard : winex11: Remove the support for device-dependent bitmaps.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 191cd773202357edce7d27d92fa0c7c160a473be URL:
http://source.winehq.org/git/wine.git/?a=commit;h=191cd773202357edce7d27d92…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:55:17 2012 +0200 winex11: Remove the support for device-dependent bitmaps. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/bitblt.c | 27 ++---- dlls/winex11.drv/bitmap.c | 214 ------------------------------------------ dlls/winex11.drv/init.c | 13 +-- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/x11drv.h | 21 ---- dlls/winex11.drv/xrender.c | 22 +---- dlls/winex11.drv/xvidmode.c | 10 -- 8 files changed, 17 insertions(+), 293 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=191cd773202357edce7d2…
1
0
0
0
Alexandre Julliard : winex11: Always allocate a new GC for bitmap operations.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 73919154bf7b781132404d2ef6937fe7e5133574 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=73919154bf7b781132404d2ef…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 21:12:15 2012 +0200 winex11: Always allocate a new GC for bitmap operations. --- dlls/winex11.drv/bitblt.c | 13 ++++++++++--- dlls/winex11.drv/bitmap.c | 2 +- dlls/winex11.drv/brush.c | 7 ++++--- dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/xrender.c | 6 ++++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 887384e..2db9e70 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1365,16 +1365,21 @@ DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, if (X11DRV_check_error()) { /* use a temporary pixmap to avoid the BadMatch error */ + GC gc; Pixmap pixmap; wine_tsx11_lock(); pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); - XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(vis.depth), + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, gc, False ); + XCopyArea( gdi_display, physdev->drawable, pixmap, gc, 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 ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); } + if (!image) return ERROR_OUTOFMEMORY; info->bmiHeader.biWidth = width; @@ -1408,6 +1413,7 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, { DWORD ret; XImage *image; + GC gc; struct bitblt_coords coords; struct gdi_image_bits dst_bits; const XPixmapFormatValues *format = pixmap_formats[vis->depth]; @@ -1439,8 +1445,9 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, { image->data = dst_bits.ptr; wine_tsx11_lock(); - XPutImage( gdi_display, pixmap, get_bitmap_gc( vis->depth ), - image, 0, 0, 0, 0, coords.width, coords.height ); + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XPutImage( gdi_display, pixmap, gc, image, 0, 0, 0, 0, coords.width, coords.height ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); image->data = NULL; } diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 27723ef..eb423a2 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -36,7 +36,7 @@ X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default s static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ -GC get_bitmap_gc(int depth) +static GC get_bitmap_gc(int depth) { if(depth < 1 || depth > 32) return 0; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 3406190..23fcce5 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -110,7 +110,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) static COLORREF prevColor = 0xffffffff; unsigned int x, y; Pixmap pixmap; - GC gc = get_bitmap_gc(depth); + GC gc; wine_tsx11_lock(); if (!ditherImage) @@ -149,8 +149,9 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) } pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, depth ); - XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, - 0, 0, MATRIX_SIZE, MATRIX_SIZE ); + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); return pixmap; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0b10ecf..0d9746a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -164,9 +164,6 @@ static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) extern X_PHYSBITMAP BITMAP_stock_phys_bitmap DECLSPEC_HIDDEN; /* phys bitmap for the default stock bitmap */ -/* Retrieve the GC used for bitmap operations */ -extern GC get_bitmap_gc(int depth) DECLSPEC_HIDDEN; - /* Wine driver X11 functions */ extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 0c66ff8..68a2b4d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1876,6 +1876,7 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits int depth = pict_formats[format]->depth; struct gdi_image_bits dst_bits; XRenderPictureAttributes pa; + GC gc; XImage *image; wine_tsx11_lock(); @@ -1894,9 +1895,10 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits 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 ); + gc = XCreateGC( gdi_display, *pixmap, 0, NULL ); + XPutImage( gdi_display, *pixmap, gc, image, src->visrect.left, 0, 0, 0, width, height ); *pict = pXRenderCreatePicture( gdi_display, *pixmap, pict_formats[format], CPRepeat, &pa ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); /* make coordinates relative to the pixmap */
1
0
0
0
Alexandre Julliard : winex11: XRender repeat mode is no longer needed in functions that use a DC.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 567340f0c581e9e40cd34cf329fbd7a35efed01f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=567340f0c581e9e40cd34cf32…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 11:28:37 2012 +0200 winex11: XRender repeat mode is no longer needed in functions that use a DC. --- dlls/winex11.drv/xrender.c | 50 ++++++++----------------------------------- 1 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7986ae7..0c66ff8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -529,14 +529,6 @@ static void set_xrender_transformation(Picture src_pict, double xscale, double y #endif } -/* check if we can use repeating instead of scaling for the specified source DC */ -static BOOL use_source_repeat( struct xrender_physdev *dev ) -{ - return (dev->x11dev->bitmap && - dev->x11dev->drawable_rect.right - dev->x11dev->drawable_rect.left == 1 && - dev->x11dev->drawable_rect.bottom - dev->x11dev->drawable_rect.top == 1); -} - static void update_xrender_clipping( struct xrender_physdev *dev, HRGN rgn ) { XRenderPictureAttributes pa; @@ -1926,26 +1918,15 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { int x_dst, y_dst; Picture src_pict = 0, dst_pict, mask_pict = 0; - BOOL use_repeat; - double xscale, yscale; - - use_repeat = use_source_repeat( physdev_src ); - 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 */ + double xscale = src->width / (double)dst->width; + double yscale = src->height / (double)dst->height; if (drawable) /* using an intermediate pixmap */ { - XRenderPictureAttributes pa; - x_dst = dst->x; y_dst = dst->y; - pa.repeat = RepeatNone; wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); + dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, 0, NULL ); wine_tsx11_unlock(); } else @@ -1955,7 +1936,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect ); } - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + src_pict = get_xrender_picture_source( physdev_src, FALSE ); /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) @@ -1998,7 +1979,6 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask { int x_dst, y_dst; Picture dst_pict; - XRenderPictureAttributes pa; double xscale, yscale; if (drawable) /* using an intermediate pixmap */ @@ -2008,9 +1988,8 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask if (clip) clip_data = X11DRV_GetRegionData( clip, 0 ); x_dst = dst->x; y_dst = dst->y; - pa.repeat = RepeatNone; wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, dst_format, CPRepeat, &pa ); + dst_pict = pXRenderCreatePicture( gdi_display, drawable, dst_format, 0, NULL ); if (clip_data) pXRenderSetPictureClipRectangles( gdi_display, dst_pict, 0, 0, (XRectangle *)clip_data->Buffer, clip_data->rdh.nCount ); @@ -2280,7 +2259,6 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, XRenderPictureAttributes pa; Pixmap tmp_pixmap = 0; double xscale, yscale; - BOOL use_repeat; if (src_dev->funcs != dst_dev->funcs) { @@ -2296,15 +2274,10 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect ); - use_repeat = use_source_repeat( physdev_src ); - 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 */ + xscale = src->width / (double)dst->width; + yscale = src->height / (double)dst->height; - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + src_pict = get_xrender_picture_source( physdev_src, FALSE ); if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2321,9 +2294,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); tmp_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physdev_dst->pict_format->depth ); - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; - tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, - CPRepeat, &pa ); + tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, 0, NULL ); wine_tsx11_unlock(); xrender_mono_blit( src_pict, tmp_pict, physdev_dst->format, &fg, &bg, @@ -2337,9 +2308,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, { wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; tmp_pict = pXRenderCreatePicture( gdi_display, physdev_src->x11dev->drawable, - pict_formats[format], CPSubwindowMode|CPRepeat, &pa ); + pict_formats[format], CPSubwindowMode, &pa ); wine_tsx11_unlock(); } }
1
0
0
0
Alexandre Julliard : gdi32: Remove the CreateBitmap and DeleteBitmap driver entry points.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 93758c43fd2d8568ae3003ffece1278ef820dc86 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=93758c43fd2d8568ae3003ffe…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:46:22 2012 +0200 gdi32: Remove the CreateBitmap and DeleteBitmap driver entry points. --- dlls/gdi32/dibdrv/dc.c | 10 ------ dlls/gdi32/driver.c | 12 -------- dlls/gdi32/enhmfdrv/init.c | 2 - dlls/gdi32/freetype.c | 2 - dlls/gdi32/mfdrv/init.c | 2 - dlls/gdi32/path.c | 2 - dlls/wineps.drv/init.c | 2 - dlls/winex11.drv/bitmap.c | 48 ------------------------------- dlls/winex11.drv/init.c | 2 - dlls/winex11.drv/opengl.c | 2 - dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xrender.c | 67 -------------------------------------------- include/wine/gdi_driver.h | 4 +-- 13 files changed, 1 insertions(+), 156 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=93758c43fd2d8568ae300…
1
0
0
0
Alexandre Julliard : gdi32: Remove the bitmap parameter from the Get/ PutImage entry points.
by Alexandre Julliard
30 May '12
30 May '12
Module: wine Branch: master Commit: 1416d0e6f151a4937307b42f810606ea09e68fd2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1416d0e6f151a4937307b42f8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:36:20 2012 +0200 gdi32: Remove the bitmap parameter from the Get/PutImage entry points. --- dlls/gdi32/bitblt.c | 20 +++--- dlls/gdi32/dib.c | 10 +- dlls/gdi32/dibdrv/bitblt.c | 30 +------ dlls/gdi32/dibdrv/dibdrv.h | 6 +- dlls/gdi32/driver.c | 6 +- dlls/gdi32/font.c | 6 +- dlls/wineps.drv/bitmap.c | 4 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/bitblt.c | 181 +++++++++++++------------------------------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 109 +++++++++------------------ include/wine/gdi_driver.h | 6 +- 12 files changed, 125 insertions(+), 259 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1416d0e6f151a4937307b…
1
0
0
0
Vincent Povirk : propsys: Add test for saving/ loading an empty property store.
by Alexandre Julliard
29 May '12
29 May '12
Module: wine Branch: master Commit: 6fe6a43a6c9c540f3d07f613b7d573c76ca3de91 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6fe6a43a6c9c540f3d07f613b…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 23 14:01:34 2012 -0500 propsys: Add test for saving/loading an empty property store. --- dlls/propsys/tests/propstore.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 5c1b021..01500dd 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -196,11 +196,64 @@ static void test_inmemorystore(void) IPropertyStoreCache_Release(propcache); } +static void test_persistserialized(void) +{ + IPropertyStore *propstore; + IPersistSerializedPropStorage *serialized; + HRESULT hr; + SERIALIZEDPROPSTORAGE *result; + DWORD result_size; + + hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyStore, (void**)&propstore); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IPropertyStore_QueryInterface(propstore, &IID_IPersistSerializedPropStorage, + (void**)&serialized); + todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + skip("IPersistSerializedPropStorage not supported\n"); + return; + } + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, NULL, &result_size); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, NULL); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, &result_size); + ok(hr == S_OK, "GetPropertyStorage failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + ok(result_size == 0, "expected 0 bytes, got %i\n", result_size); + + CoTaskMemFree(result); + } + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 4); + ok(hr == E_POINTER, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 0); + ok(hr == S_OK, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPropertyStore_GetCount(propstore, &result_size); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(result_size == 0, "expecting 0, got %d\n", result_size); + + IPropertyStore_Release(propstore); + IPersistSerializedPropStorage_Release(serialized); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); + test_persistserialized(); CoUninitialize(); }
1
0
0
0
Alexandre Julliard : winedbg: Fix some pointer conversion warnings.
by Alexandre Julliard
29 May '12
29 May '12
Module: wine Branch: master Commit: d17bc39b1fa51d46988872da11c69c04fd22e0fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d17bc39b1fa51d46988872da1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 19:14:31 2012 +0200 winedbg: Fix some pointer conversion warnings. --- programs/winedbg/be_x86_64.c | 3 +-- programs/winedbg/dbg.y | 2 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index dde30f3..7fae50c 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -561,8 +561,7 @@ static unsigned be_x86_64_remove_Xpoint(HANDLE hProcess, const struct be_process if (size != 0) return 0; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; break; diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 5929b87..61acb90 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -181,7 +181,7 @@ list_arg: | pathname ':' identifier { symbol_get_line($1, $3, &$$); } | '*' expr_lvalue { DWORD disp; ADDRESS64 addr; $$.SizeOfStruct = sizeof($$); types_extract_as_address(&$2, &addr); - SymGetLineFromAddr64(dbg_curr_process->handle, (unsigned long)memory_to_linear_addr(& addr), &disp, & $$); } + SymGetLineFromAddr64(dbg_curr_process->handle, (ULONG_PTR)memory_to_linear_addr(& addr), &disp, & $$); } ; run_command: diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 735ef53..cfbf161 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -73,7 +73,7 @@ static void memory_report_invalid_addr(const void* addr) address.Mode = AddrModeFlat; address.Segment = 0; - address.Offset = (unsigned long)addr; + address.Offset = (ULONG_PTR)addr; dbg_printf("*** Invalid address "); print_address(&address, FALSE); dbg_printf(" ***\n"); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9ac49f2..ef92e89 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -67,7 +67,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, if (type.id == dbg_itype_segptr) { - return (long int)memory_to_linear_addr(&lvalue->addr); + return (LONG_PTR)memory_to_linear_addr(&lvalue->addr); } if (psize) *psize = 0;
1
0
0
0
Jacek Caban : mshtml: Fixed Exec_ShellDocView_84 tests.
by Alexandre Julliard
29 May '12
29 May '12
Module: wine Branch: master Commit: 0675f5c3d1f839544f27bf35d8cd6afca94f6573 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0675f5c3d1f839544f27bf35d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 14:38:04 2012 +0200 mshtml: Fixed Exec_ShellDocView_84 tests. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 41 ++++++++++------------------------------- dlls/mshtml/oleobj.c | 23 +++++++++++++++++++++++ dlls/mshtml/persist.c | 1 + dlls/mshtml/tests/htmldoc.c | 31 ++++++++++++++++++++----------- 5 files changed, 55 insertions(+), 42 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0675f5c3d1f839544f27b…
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200