wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Dmitry Timoshkov : ntdll: Use PAGE_READWRITE access when resolving DLL imports.
by Alexandre Julliard 03 Nov '11

03 Nov '11

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

Hans Leidekker : msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small .
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: eb7d8b92cb3f74655f9721e020e12d971076d58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d8b92cb3f74655f9721e02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 3 11:40:16 2011 +0100 msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c265cca..756be42 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1014,7 +1014,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) } } len = 0; - if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_BUFFER_OVERFLOW) { WCHAR *computername; if ((computername = msi_alloc( len * sizeof(WCHAR) )))

1 0

Hans Leidekker : msiexec: Preserve the first argument in process_args_from_reg.
by Alexandre Julliard 03 Nov '11

03 Nov '11

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

Henri Verbeet : wined3d: Use wined3d_surface_blt() in swapchain_gl_present( ).
by Alexandre Julliard 03 Nov '11

03 Nov '11

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

Henri Verbeet : wined3d: Use wined3d_surface_blt() in wined3d_swapchain_get_front_buffer_data().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 0b3185665f590a2facb2ee06cd1442fa88a69090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3185665f590a2facb2ee06c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:53 2011 +0100 wined3d: Use wined3d_surface_blt() in wined3d_swapchain_get_front_buffer_data(). --- dlls/wined3d/swapchain.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7141165..e31b622 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -154,16 +154,23 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface) { - POINT offset = {0, 0}; + struct wined3d_surface *src_surface; + RECT src_rect, dst_rect; TRACE("swapchain %p, dst_surface %p.\n", swapchain, dst_surface); - if (swapchain->presentParms.Windowed) - MapWindowPoints(swapchain->win_handle, NULL, &offset, 1); + src_surface = swapchain->front_buffer; + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + dst_rect = src_rect; - surface_bltfast(dst_surface, offset.x, offset.y, swapchain->front_buffer, NULL, 0); + if (swapchain->presentParms.Windowed) + { + MapWindowPoints(swapchain->win_handle, NULL, (POINT *)&dst_rect, 2); + FIXME("Using destination rect %s in windowed mode, this is likely wrong.\n", + wine_dbgstr_rect(&dst_rect)); + } - return WINED3D_OK; + return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3DTEXF_POINT); } HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Use wined3d_surface_blt() in surface_upload_from_surface().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: c30ea3767c69cacd2ed487fc3b6085028e097ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30ea3767c69cacd2ed487fc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:52 2011 +0100 wined3d: Use wined3d_surface_blt() in surface_upload_from_surface(). --- dlls/wined3d/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7361391..21848e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2588,13 +2588,13 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* This call loads the OpenGL surface directly, instead of copying the - * surface to the destination's sysmem copy. If surface conversion is - * needed, use BltFast instead to copy in sysmem and use regular surface - * loading. */ + /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ d3dfmt_get_conv(dst_surface, FALSE, TRUE, &format, &convert); if (convert != NO_CONVERSION || format.convert) - return surface_bltfast(dst_surface, dst_point->x, dst_point->y, src_surface, src_rect, 0); + { + RECT dst_rect = {dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h}; + return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3DTEXF_POINT); + } context = context_acquire(dst_surface->resource.device, NULL); gl_info = context->gl_info;

1 0

Nikolay Sivov : msxml3: Add type id placeholder for index 0 to make lookup code actually work.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 8d602efe88dc2bc3d1e3551720e4ed2b31bba218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d602efe88dc2bc3d1e355172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 23:13:24 2011 +0300 msxml3: Add type id placeholder for index 0 to make lookup code actually work. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 436c277..67ce77c 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -78,6 +78,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID_NULL, &IID_IXMLDOMAttribute, &IID_IXMLDOMCDATASection, &IID_IXMLDOMComment, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8b84aca..698655e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -38,6 +38,7 @@ typedef enum { /* typelibs */ typedef enum tid_t { + NULL_tid, IXMLDOMAttribute_tid, IXMLDOMCDATASection_tid, IXMLDOMComment_tid,

1 0

Alexandre Julliard : gdi32: Add support for pattern brushes in the DIB driver.
by Alexandre Julliard 03 Nov '11

03 Nov '11

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

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

03 Nov '11

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: Don't free bitmap bits when changing the owner, we may still have pointers to them.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 8277ac3f7cb670c8c2bc64310f3d384089a765ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8277ac3f7cb670c8c2bc64310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 12:49:46 2011 +0100 gdi32: Don't free bitmap bits when changing the owner, we may still have pointers to them. --- dlls/gdi32/bitmap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8aea89c..a158735 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -574,8 +574,6 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) get_ddb_bitmapinfo( bmp, info ); SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); - bmp->bitmap.bmBits = NULL; } /***********************************************************************

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011