November 2011 - Wine-Commits

Alexandre Julliard : gdi32: Store internal brush data in separate fields in the brush object.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 20ecd97bee647febca40ab51d96f1847753107ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ecd97bee647febca40ab51d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 20:58:36 2011 +0100 gdi32: Store internal brush data in separate fields in the brush object. --- dlls/gdi32/brush.c | 67 +++++++++++++++++++++------------------------------- 1 files changed, 27 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 45874af..5e811cb 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,8 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; - LOGBRUSH logbrush; + GDIOBJHDR header; + LOGBRUSH logbrush; + HBITMAP bitmap; /* bitmap handle for DDB pattern brushes */ + BITMAPINFO *info; /* DIB info for pattern brushes */ + struct gdi_image_bits bits; /* DIB bits for pattern brushes */ + UINT usage; /* color usage for DIB info */ } BRUSHOBJ; #define NB_HATCH_STYLES 6 @@ -77,12 +81,11 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; + HGLOBAL hmem = 0; - if (!(ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(*ptr) ))) return 0; + if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) return 0; - ptr->logbrush.lbStyle = brush->lbStyle; - ptr->logbrush.lbColor = brush->lbColor; - ptr->logbrush.lbHatch = brush->lbHatch; + ptr->logbrush = *brush; switch (ptr->logbrush.lbStyle) { @@ -95,31 +98,26 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->logbrush.lbHatch = (ULONG_PTR)BITMAP_CopyBitmap( (HBITMAP) ptr->logbrush.lbHatch ); + ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); + if (!ptr->bitmap) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; - if (!ptr->logbrush.lbHatch) goto error; break; + case BS_DIBPATTERN: + hmem = (HGLOBAL)ptr->logbrush.lbHatch; + if (!(ptr->logbrush.lbHatch = (ULONG_PTR)GlobalLock( hmem ))) goto error; + /* fall through */ case BS_DIBPATTERNPT: + ptr->usage = ptr->logbrush.lbColor; + ptr->info = copy_packed_dib( (BITMAPINFO *)ptr->logbrush.lbHatch, ptr->usage ); + if (hmem) GlobalUnlock( hmem ); + if (!ptr->info) goto error; + ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( (BITMAPINFO *) ptr->logbrush.lbHatch, - ptr->logbrush.lbColor ); - if (!ptr->logbrush.lbHatch) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; break; - case BS_DIBPATTERN: - { - BITMAPINFO* bmi; - HGLOBAL h = (HGLOBAL)ptr->logbrush.lbHatch; - - ptr->logbrush.lbStyle = BS_DIBPATTERN; - if (!(bmi = GlobalLock( h ))) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( bmi, ptr->logbrush.lbColor ); - GlobalUnlock( h ); - if (!ptr->logbrush.lbHatch) goto error; - break; - } - case BS_DIBPATTERN8X8: case BS_MONOPATTERN: case BS_INDEXED: @@ -135,13 +133,8 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) } error: - if (ptr->logbrush.lbHatch) - { - if (ptr->logbrush.lbStyle == BS_PATTERN) - DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); - else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - HeapFree( GetProcessHeap(), 0, (void *)ptr->logbrush.lbHatch ); - } + if (ptr->bitmap) DeleteObject( ptr->bitmap ); + HeapFree( GetProcessHeap(), 0, ptr->info ); HeapFree( GetProcessHeap(), 0, ptr ); return 0; } @@ -411,15 +404,9 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; - switch(brush->logbrush.lbStyle) - { - case BS_PATTERN: - DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); - break; - case BS_DIBPATTERN: - HeapFree( GetProcessHeap(), 0, (void *)brush->logbrush.lbHatch ); - break; - } + if (brush->bits.free) brush->bits.free( &brush->bits ); + if (brush->bitmap) DeleteObject( brush->bitmap ); + HeapFree( GetProcessHeap(), 0, brush->info ); return HeapFree( GetProcessHeap(), 0, brush ); }

1 0

Alexandre Julliard : gdi32: Retrieve the bits of a pattern brush when it' s selected into a different type of DC.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 457c9650dee21afa4bf858d9f5721e04da394590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457c9650dee21afa4bf858d9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:11:14 2011 +0100 gdi32: Retrieve the bits of a pattern brush when it's selected into a different type of DC. --- dlls/gdi32/brush.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/dib.c | 2 +- dlls/gdi32/gdi_private.h | 5 ++- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 822f907..59d0bed 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -58,6 +58,38 @@ static const struct gdi_obj_funcs brush_funcs = }; +/* fetch the contents of the brush bitmap and cache them in the brush object */ +static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) +{ + const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); + struct gdi_image_bits bits; + struct bitblt_coords src; + BITMAPINFO *info; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) + return FALSE; + + src.visrect.left = src.x = 0; + src.visrect.top = src.y = 0; + src.visrect.right = src.width = bmp->bitmap.bmWidth; + src.visrect.bottom = src.height = bmp->bitmap.bmHeight; + if (funcs->pGetImage( NULL, brush->bitmap, info, &bits, &src )) + { + HeapFree( GetProcessHeap(), 0, info ); + return FALSE; + } + + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); + + /* release the unneeded space */ + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, + bitmap_info_size( info, DIB_RGB_COLORS )); + brush->info = info; + brush->bits = bits; + brush->usage = DIB_RGB_COLORS; + return TRUE; +} + /*********************************************************************** * CreateBrushIndirect (GDI32.@) * @@ -366,10 +398,17 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); HBITMAP bitmap = brush->bitmap; - BITMAPINFO *info = brush->info; - void *bits = brush->bits.ptr; - UINT usage = brush->usage; + BITMAPINFO *info; + void *bits; + UINT usage; + if (bitmap && !brush->info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + /* fetch the bitmap bits if we are selecting into a different type of DC */ + if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp ); + GDI_ReleaseObj( bitmap ); + } if (brush->logbrush.lbStyle == BS_PATTERN) { PHYSDEV pattern_dev = physdev; @@ -381,6 +420,9 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); } + info = brush->info; + bits = brush->bits.ptr; + usage = brush->usage; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b9f9f3b..bc9564a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1058,7 +1058,7 @@ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT colorus } } -static void fill_default_color_table( BITMAPINFO *info ) +void fill_default_color_table( BITMAPINFO *info ) { int i; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ddeb0bd..0c73a9d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,8 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; -extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; @@ -258,6 +256,9 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; +extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; +extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add support for pattern brushes in the DIB driver.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 37b56554a6b8777465d30d3175ff5683194ce604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b56554a6b8777465d30d317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:24:07 2011 +0100 gdi32: Add support for pattern brushes in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 25 +++---------- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 85 ++++++++++++++++++++++++------------------- 3 files changed, 55 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 41e996c..5a7d011 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -161,25 +161,18 @@ BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_f return TRUE; } -BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE palette) +BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE palette) { - DWORD *masks = NULL; + DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; RGBQUAD *color_table = NULL, pal_table[256]; - BYTE *ptr = (BYTE*)bi + bi->biSize; - int num_colors = get_dib_num_of_colors( (const BITMAPINFO *)bi ); - - if(bi->biCompression == BI_BITFIELDS) - { - masks = (DWORD *)ptr; - ptr += 3 * sizeof(DWORD); - } + int num_colors = get_dib_num_of_colors( bi ); if(num_colors) { if(usage == DIB_PAL_COLORS) { PALETTEENTRY entries[256]; - const WORD *index = (const WORD*) ptr; + const WORD *index = (const WORD *)bi->bmiColors; UINT i, count = GetPaletteEntries( palette, 0, num_colors, entries ); for (i = 0; i < num_colors; i++, index++) { @@ -190,16 +183,10 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u pal_table[i].rgbReserved = 0; } color_table = pal_table; - ptr += num_colors * sizeof(WORD); - } - else - { - color_table = (RGBQUAD*)ptr; - ptr += num_colors * sizeof(*color_table); } + else color_table = (RGBQUAD *)bi->bmiColors; } - - return init_dib_info(dib, bi, masks, color_table, num_colors, ptr, private_color_table); + return init_dib_info(dib, &bi->bmiHeader, masks, color_table, num_colors, bits, private_color_table); } BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b810e75..0650e08 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -195,7 +195,7 @@ extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 233fa8e..3418dc8 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1345,6 +1345,53 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, TRACE("(%p, %p)\n", dev, hbrush); + if (bitmap || info) /* pattern brush */ + { + dib_info orig_dib; + HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; + RECT rect; + BOOL ret; + + if (!info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + + if (!bmp) return 0; + ret = init_dib_info_from_bitmapobj( &orig_dib, bmp, 0 ); + GDI_ReleaseObj( bitmap ); + } + else ret = init_dib_info_from_brush( &orig_dib, info, bits, usage, pal ); + + if (!ret) return 0; + + if (usage == DIB_PAL_COLORS) FIXME( "DIB_PAL_COLORS brush not handled correctly\n"); + + free_pattern_brush( pdev ); + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); + + pdev->brush_dib.height = orig_dib.height; + pdev->brush_dib.width = orig_dib.width; + pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); + + pdev->brush_dib.bits.param = NULL; + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; + + rect.left = rect.top = 0; + rect.right = orig_dib.width; + rect.bottom = orig_dib.height; + + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); + pdev->brush_rects = pattern_brush; + pdev->brush_style = BS_DIBPATTERN; + pdev->defer &= ~DEFER_BRUSH; + free_dib_info(&orig_dib); + + return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); + } + if (!GetObjectW( hbrush, sizeof(logbrush), &logbrush )) return 0; if (hbrush == GetStockObject( DC_BRUSH )) @@ -1371,42 +1418,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->defer &= ~DEFER_BRUSH; break; - case BS_DIBPATTERN: - { - BITMAPINFOHEADER *bi = (BITMAPINFOHEADER *)logbrush.lbHatch; - dib_info orig_dib; - WORD usage = LOWORD(logbrush.lbColor); - HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; - RECT rect; - - if(init_dib_info_from_packed(&orig_dib, bi, usage, pal)) - { - copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - - pdev->brush_dib.height = orig_dib.height; - pdev->brush_dib.width = orig_dib.width; - pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - - pdev->brush_dib.bits.param = NULL; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; - - rect.left = rect.top = 0; - rect.right = orig_dib.width; - rect.bottom = orig_dib.height; - - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); - pdev->brush_rects = pattern_brush; - pdev->defer &= ~DEFER_BRUSH; - free_dib_info(&orig_dib); - } - break; - } - case BS_HATCHED: - { if(logbrush.lbHatch > HS_DIAGCROSS) return 0; pdev->brush_hatch = logbrush.lbHatch; pdev->brush_colorref = logbrush.lbColor; @@ -1415,10 +1427,9 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_rects = pattern_brush; pdev->defer &= ~DEFER_BRUSH; break; - } default: - break; + return 0; } return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage );

1 0

Hans Leidekker : msiexec: Preserve the first argument in process_args_from_reg.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 494e20541d8e485227deea24e5a64ee483e64ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494e20541d8e485227deea24e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 3 11:39:44 2011 +0100 msiexec: Preserve the first argument in process_args_from_reg. --- programs/msiexec/msiexec.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index d7c83cb..b794557 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -471,12 +471,12 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) *pargv = argv; } -static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv ) { LONG r; - HKEY hkey = 0, hkeyArgs = 0; + HKEY hkey; DWORD sz = 0, type = 0; - LPWSTR buf = NULL; + WCHAR *buf; BOOL ret = FALSE; r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); @@ -485,8 +485,15 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); if(r == ERROR_SUCCESS && type == REG_SZ) { - buf = HeapAlloc(GetProcessHeap(), 0, sz); - r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); + int len = lstrlenW( *pargv[0] ); + if (!(buf = HeapAlloc( GetProcessHeap(), 0, sz + (len + 1) * sizeof(WCHAR) ))) + { + RegCloseKey( hkey ); + return FALSE; + } + memcpy( buf, *pargv[0], len * sizeof(WCHAR) ); + buf[len++] = ' '; + r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz); if( r == ERROR_SUCCESS ) { process_args(buf, pargc, pargv); @@ -494,7 +501,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) } HeapFree(GetProcessHeap(), 0, buf); } - RegCloseKey(hkeyArgs); + RegCloseKey(hkey); return ret; }

1 0

Stefan Dösinger : wined3d: Locking partial blocks is not allowed in DEFAULT pool resources.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 9b0adb406dda4a1796e8207f1f3206e0d2784ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0adb406dda4a1796e8207f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 23:35:38 2011 +0200 wined3d: Locking partial blocks is not allowed in DEFAULT pool resources. --- dlls/wined3d/surface.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1492071..f75593d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6,7 +6,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006-2008 Stefan Dösinger for CodeWeavers + * Copyright 2006-2011 Stefan Dösinger for CodeWeavers * Copyright 2007-2008 Henri Verbeet * Copyright 2006-2008 Roderick Colenbrander * Copyright 2009-2011 Henri Verbeet for CodeWeavers @@ -3782,6 +3782,8 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { + const struct wined3d_format *format = surface->resource.format; + TRACE("surface %p, locked_rect %p, rect %s, flags %#x.\n", surface, locked_rect, wine_dbgstr_rect(rect), flags); @@ -3790,6 +3792,29 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; } + if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED + && rect && (rect->left || rect->top + || rect->right != surface->resource.width + || rect->bottom != surface->resource.height)) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + + if ((rect->left & width_mask) || (rect->right & width_mask) + || (rect->top & height_mask) || (rect->bottom & height_mask)) + { + switch (surface->resource.pool) + { + case WINED3DPOOL_DEFAULT: + WARN("Partial block lock with WINED3DPOOL_DEFAULT\n"); + return WINED3DERR_INVALIDCALL; + + default: + FIXME("Partial block lock with %s\n", debug_d3dpool(surface->resource.pool)); + } + } + } + surface->flags |= SFLAG_LOCKED; if (!(surface->flags & SFLAG_LOCKABLE)) @@ -3809,8 +3834,6 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } else { - const struct wined3d_format *format = surface->resource.format; - if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED) { /* Compressed textures are block based, so calculate the offset of

1 0

Andrew Talbot : sane.ds: Remove unneeded address-of operators from array name.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 8c41a3bd01428b649a77b1661834bc3d1f56c854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c41a3bd01428b649a77b1661… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 2 22:29:07 2011 +0000 sane.ds: Remove unneeded address-of operators from array name. --- dlls/sane.ds/ui.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index d57376e..8ff3b70 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -528,7 +528,7 @@ BOOL DoScannerUI(void) hdc = GetDC(0); - memset(&psp,0,sizeof(psp)); + memset(psp,0,sizeof(psp)); rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE, &optcount, NULL); if (rc != SANE_STATUS_GOOD) @@ -585,7 +585,7 @@ BOOL DoScannerUI(void) psh.pszCaption = szCaption; psh.nPages = page_count; psh.u2.nStartPage = 0; - psh.u3.ppsp = (LPCPROPSHEETPAGEW) &psp; + psh.u3.ppsp = (LPCPROPSHEETPAGEW)psp; psh.pfnCallback = PropSheetProc; psrc = PropertySheetW(&psh);

1 0

Stefan Dösinger : d3d9/tests: Move the double unlock test into a separate test, test other pools.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: f1d98aed7015da2d7a647c6de3b685a55305f08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d98aed7015da2d7a647c6de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 23:13:53 2011 +0200 d3d9/tests: Move the double unlock test into a separate test, test other pools. --- dlls/d3d9/tests/surface.c | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 8353b81..361e8a3 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -1,5 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet + * Copyright 2011 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -238,8 +239,6 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); - hr = IDirect3DSurface9_UnlockRect(surface); - ok(hr == D3DERR_INVALIDCALL, "Double UnlockRect returned %08x, expected D3DERR_INVALIDCALL\n", hr); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); @@ -590,6 +589,50 @@ static void test_surface_format_null(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } +static void test_surface_double_unlock(IDirect3DDevice9 *device) +{ + static const struct + { + D3DPOOL pool; + const char *name; + } + pools[] = + { + { D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT" }, + { D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH" }, + { D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM" }, + /* There are no standalone MANAGED pool surfaces */ + }; + IDirect3DSurface9 *surface; + unsigned int i; + HRESULT hr; + D3DLOCKED_RECT lr; + + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_X8R8G8B8, + pools[i].pool, &surface, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Unlock without lock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); + ok(SUCCEEDED(hr), "IDirect3DSurface9_LockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Double unlock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + IDirect3DSurface9_Release(surface); + } +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -614,6 +657,7 @@ START_TEST(surface) test_getdc(device_ptr); test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); + test_surface_double_unlock(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Dmitry Timoshkov : ntdll: Make the VirtualProtect tests pass under Wine.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 33255ee6ecf48725e8e061313da8f387a5714e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33255ee6ecf48725e8e061313… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:54 2011 +0800 ntdll: Make the VirtualProtect tests pass under Wine. --- dlls/kernel32/tests/virtual.c | 16 ---------------- dlls/ntdll/virtual.c | 1 + 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 49630fd..d0b9f4f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1472,16 +1472,8 @@ static void test_VirtualProtect(void) } else { - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].prot_set == PAGE_WRITECOPY) || (td[i].prot_set == PAGE_EXECUTE_WRITECOPY)) - todo_wine { ok(!ret, "%d: VirtualProtect should fail\n", i); ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); - } - else { - ok(!ret, "%d: VirtualProtect should fail\n", i); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); - } } old_prot = 0xdeadbeef; @@ -1491,13 +1483,7 @@ static void test_VirtualProtect(void) if (td[i].prot_get) ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); else - { - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].prot_set == PAGE_WRITECOPY) || (td[i].prot_set == PAGE_EXECUTE_WRITECOPY)) - todo_wine ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - else ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - } } exec_prot = 0; @@ -1521,10 +1507,8 @@ static void test_VirtualProtect(void) { if (prot & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)) { - todo_wine { ok(!ret, "VirtualProtect(%02x) should fail\n", prot); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } } else ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index b23e596..8c5e773 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2088,6 +2088,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); if ((status = get_vprot_flags( new_prot, &new_vprot ))) return status; + if (new_vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; new_vprot |= VPROT_COMMITTED; server_enter_uninterrupted_section( &csVirtual, &sigset );

1 0

Dmitry Timoshkov : ntdll: Use PAGE_READWRITE access when resolving DLL imports.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: df9a0868656fc4d1bf6ed351385f44ffa2f6b116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9a0868656fc4d1bf6ed3513… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:37 2011 +0800 ntdll: Use PAGE_READWRITE access when resolving DLL imports. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5ee7d0a..314813f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -563,7 +563,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d protect_base = thunk_list; protect_size *= sizeof(*thunk_list); NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, - &protect_size, PAGE_WRITECOPY, &protect_old ); + &protect_size, PAGE_READWRITE, &protect_old ); imp_mod = wmImp->ldr.BaseAddress; exports = RtlImageDirectoryEntryToData( imp_mod, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size );

1 0

Henri Verbeet : wined3d: Use wined3d_surface_blt() in swapchain_gl_present( ).
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 335a6ca78e18cdc0196377f8e258fb3e299b73dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=335a6ca78e18cdc0196377f8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:54 2011 +0100 wined3d: Use wined3d_surface_blt() in swapchain_gl_present(). --- dlls/wined3d/surface.c | 19 ------------------- dlls/wined3d/swapchain.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21848e9..1492071 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1815,25 +1815,6 @@ cpu: return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } -/* Do not call while under the GL lock. */ -HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) -{ - RECT src_rect, dst_rect; - - TRACE("dst_surface %p, dst_x %u, dst_y %u, src_surface %p, src_rect_in %s, flags %#x.\n", - dst_surface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect_in), flags); - - surface_get_rect(src_surface, src_rect_in, &src_rect); - - dst_rect.left = dst_x; - dst_rect.top = dst_y; - dst_rect.right = dst_x + src_rect.right - src_rect.left; - dst_rect.bottom = dst_y + src_rect.bottom - src_rect.top; - - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, NULL, WINED3DTEXF_POINT); -} - HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, struct wined3d_surface *render_target) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e31b622..7d7be5b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -482,9 +482,12 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R if (swapchain->device->logo_surface) { + struct wined3d_surface *src_surface = swapchain->device->logo_surface; + RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; + /* Blit the logo into the upper left corner of the drawable. */ - surface_bltfast(swapchain->back_buffers[0], 0, 0, - swapchain->device->logo_surface, NULL, WINEDDBLT_KEYSRC); + wined3d_surface_blt(swapchain->back_buffers[0], &rect, src_surface, &rect, + WINEDDBLT_KEYSRC, NULL, WINED3DTEXF_POINT); } TRACE("Presenting HDC %p.\n", context->hdc); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26be952..2a987d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,8 +2079,6 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0