January 2012 - Wine-Commits

Alexandre Julliard : gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information .
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 71ea68b65727a7abac8f179035fe895f8b641a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ea68b65727a7abac8f17903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:09:54 2012 +0100 gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information. --- dlls/gdi32/bitmap.c | 63 +++++++++++++++++++++++---------------------- dlls/gdi32/brush.c | 8 +++--- dlls/gdi32/dib.c | 30 +++++++++------------ dlls/gdi32/dibdrv/dc.c | 12 ++++---- dlls/gdi32/gdi_private.h | 1 - 5 files changed, 55 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71ea68b65727a7abac8f1…

1 0

Alexandre Julliard : gdi32: Get rid of the get_bitmap_funcs function.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 8a9be0a30bd9e8b5fd5ab4e7c78905cfabefeb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9be0a30bd9e8b5fd5ab4e7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:11:50 2012 +0100 gdi32: Get rid of the get_bitmap_funcs function. DIBs no longer use the display driver functions. --- dlls/gdi32/bitmap.c | 11 +++-------- dlls/gdi32/brush.c | 4 +--- dlls/gdi32/dib.c | 12 +++--------- dlls/gdi32/gdi_private.h | 6 ------ 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index ab93525..af96111 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -337,10 +337,8 @@ LONG WINAPI GetBitmapBits( struct bitblt_coords src; int dst_stride, max, ret; BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - const struct gdi_dc_funcs *funcs; if (!bmp) return 0; - funcs = get_bitmap_funcs( bmp ); dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); ret = max = dst_stride * bmp->bitmap.bmHeight; @@ -356,7 +354,7 @@ LONG WINAPI GetBitmapBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - if (!funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) { const char *src_ptr = src_bits.ptr; int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); @@ -410,15 +408,12 @@ LONG WINAPI SetBitmapBits( struct bitblt_coords src, dst; struct gdi_image_bits src_bits; HRGN clip = NULL; - const struct gdi_dc_funcs *funcs; if (!bits) return 0; bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return 0; - funcs = get_bitmap_funcs( bmp ); - if (count < 0) { WARN("(%d): Negative number of bytes passed???\n", count ); count = -count; @@ -487,14 +482,14 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = 0; info->bmiHeader.biHeight = 0; info->bmiHeader.biSizeImage = 0; - err = funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); if (!err || err == ERROR_BAD_FORMAT) { info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 7513fca..f8c91c1 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -58,7 +58,6 @@ static const struct gdi_obj_funcs brush_funcs = /* fetch the contents of the brush bitmap and cache them in the brush pattern */ void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) { - const struct gdi_dc_funcs *funcs; struct gdi_image_bits bits; struct bitblt_coords src; BITMAPINFO *info; @@ -76,8 +75,7 @@ void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - funcs = get_bitmap_funcs( bmp ); - if (funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) + if (bmp->funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) { HeapFree( GetProcessHeap(), 0, info ); goto done; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 143cc47..55ac726 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -657,7 +657,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, struct bitblt_coords src, dst; INT src_to_dst_offset; HRGN clip = 0; - const struct gdi_dc_funcs *funcs; if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE ) || coloruse > DIB_PAL_COLORS) { @@ -715,8 +714,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (lines < src.visrect.bottom) src.visrect.bottom = lines; } - funcs = get_bitmap_funcs( bitmap ); - result = lines; offset_rect( &src.visrect, 0, src_to_dst_offset ); @@ -736,11 +733,11 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, copy_bitmapinfo( dst_info, src_info ); - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = bitmap->funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); - if (!err) err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + if (!err) err = bitmap->funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } if(err) result = 0; @@ -1212,7 +1209,6 @@ INT WINAPI GetDIBits( BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; - const struct gdi_dc_funcs *funcs; struct gdi_image_bits src_bits; struct bitblt_coords src, dst; BOOL empty_rect = FALSE; @@ -1239,8 +1235,6 @@ INT WINAPI GetDIBits( return 0; } - funcs = get_bitmap_funcs( bmp ); - src.visrect.left = 0; src.visrect.top = 0; src.visrect.right = bmp->bitmap.bmWidth; @@ -1348,7 +1342,7 @@ INT WINAPI GetDIBits( lines = src.height; } - err = funcs->pGetImage( NULL, hbitmap, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); + err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); if (err) goto done; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 081ecfd..b5a80ca 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -486,12 +486,6 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) -{ - if( bitmap->dib ) return &dib_driver; - return bitmap->funcs; -} - extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Simplify CreateDIBSection and avoid using the reference DC if not needed.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 8946a33c4b0d85ac1c8dd5129cfb85c932d73438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8946a33c4b0d85ac1c8dd5129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 14:43:12 2012 +0100 gdi32: Simplify CreateDIBSection and avoid using the reference DC if not needed. --- dlls/gdi32/dib.c | 54 +++++++++++++++--------------------------------------- 1 files changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0f17972..3a8fadb 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1486,11 +1486,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; HBITMAP ret = 0; - DC *dc; - BOOL bDesktopDC = FALSE; DIBSECTION *dib; BITMAPOBJ *bmp; - RGBQUAD *color_table = NULL; void *mapBits = NULL; if (bits) *bits = NULL; @@ -1502,7 +1499,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, WARN( "%u planes not properly supported\n", info->bmiHeader.biPlanes ); } - if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; + if (!(bmp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*bmp) ))) return 0; + if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) goto error; TRACE("format (%d,%d), planes %d, bpp %d, %s, size %d %s\n", info->bmiHeader.biWidth, info->bmiHeader.biHeight, @@ -1519,14 +1517,17 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBm.bmBits = NULL; dib->dsBmih = info->bmiHeader; + bmp->funcs = &dib_driver; + bmp->dib = dib; + if (info->bmiHeader.biBitCount <= 8) /* build the color table */ { if (usage == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( info, hdc )) goto error; dib->dsBmih.biClrUsed = info->bmiHeader.biClrUsed; - if (!(color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ))) + if (!(bmp->color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed*sizeof(RGBQUAD) ))) goto error; - memcpy( color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); + memcpy( bmp->color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); } /* set dsBitfields values */ @@ -1572,46 +1573,21 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!dib->dsBm.bmBits) goto error; - /* If the reference hdc is null, take the desktop dc */ - if (hdc == 0) - { - hdc = CreateCompatibleDC(0); - bDesktopDC = TRUE; - } - - if (!(dc = get_dc_ptr( hdc ))) goto error; - - /* create Device Dependent Bitmap and add DIB pointer */ - ret = CreateBitmap( dib->dsBm.bmWidth, dib->dsBm.bmHeight, 1, - (info->bmiHeader.biBitCount == 1) ? 1 : GetDeviceCaps(hdc, BITSPIXEL), NULL ); + bmp->bitmap = dib->dsBm; + bmp->bitmap.bmWidthBytes = get_bitmap_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + bmp->bitmap.bmBits = NULL; - if (ret && ((bmp = GDI_GetObjPtr(ret, OBJ_BITMAP)))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); - bmp->dib = dib; - bmp->header.funcs = &dib_funcs; - bmp->funcs = physdev->funcs; - bmp->color_table = color_table; - GDI_ReleaseObj( ret ); - - if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) - { - DeleteObject( ret ); - ret = 0; - } - } + if (!(ret = alloc_gdi_handle( &bmp->header, OBJ_BITMAP, &dib_funcs ))) goto error; - release_dc_ptr( dc ); - if (bDesktopDC) DeleteDC( hdc ); - if (ret && bits) *bits = dib->dsBm.bmBits; + if (bits) *bits = dib->dsBm.bmBits; return ret; error: - if (bDesktopDC) DeleteDC( hdc ); if (section) UnmapViewOfFile( mapBits ); - else if (!offset) VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); - HeapFree( GetProcessHeap(), 0, color_table ); + else VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); + HeapFree( GetProcessHeap(), 0, bmp->color_table ); HeapFree( GetProcessHeap(), 0, dib ); + HeapFree( GetProcessHeap(), 0, bmp ); return 0; }

1 0

Alexandre Julliard : gdi32: Add a separate set of GDI object functions for DIBs.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: a51b2c8bd594199bf1a3de36a20845f5b604d366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51b2c8bd594199bf1a3de36a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 14:37:48 2012 +0100 gdi32: Add a separate set of GDI object functions for DIBs. --- dlls/gdi32/bitmap.c | 45 ++-------------- dlls/gdi32/dib.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0d637ec..dcccd3d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -566,7 +566,7 @@ static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return FALSE; - if (!bitmap->dib && bitmap->funcs != physdev->funcs) + if (bitmap->funcs != physdev->funcs) { /* we can only change from the null driver to some other driver */ if (bitmap->funcs == &null_driver) @@ -634,7 +634,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) old_physdev = pop_dc_driver( &dc->physDev ); physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if (bitmap->dib || physdev->funcs == &null_driver) + if (physdev->funcs == &null_driver) { physdev = dc->dibdrv; if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); @@ -701,26 +701,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) if (!(bmp = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); - - if (bmp->dib) - { - DIBSECTION *dib = bmp->dib; - - if (dib->dsBm.bmBits) - { - if (dib->dshSection) - { - SYSTEM_INFO SystemInfo; - GetSystemInfo( &SystemInfo ); - UnmapViewOfFile( (char *)dib->dsBm.bmBits - - (dib->dsOffset % SystemInfo.dwAllocationGranularity) ); - } - else if (!dib->dsOffset) - VirtualFree(dib->dsBm.bmBits, 0L, MEM_RELEASE ); - } - HeapFree(GetProcessHeap(), 0, dib); - HeapFree(GetProcessHeap(), 0, bmp->color_table); - } return HeapFree( GetProcessHeap(), 0, bmp ); } @@ -730,30 +710,13 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) */ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { - INT ret; + INT ret = 0; BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); if (!bmp) return 0; if (!buffer) ret = sizeof(BITMAP); - else if (count < sizeof(BITMAP)) ret = 0; - else if (bmp->dib) - { - if (count >= sizeof(DIBSECTION)) - { - DIBSECTION *dib = buffer; - *dib = *bmp->dib; - dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); - ret = sizeof(DIBSECTION); - } - else /* if (count >= sizeof(BITMAP)) */ - { - DIBSECTION *dib = bmp->dib; - memcpy( buffer, &dib->dsBm, sizeof(BITMAP) ); - ret = sizeof(BITMAP); - } - } - else + else if (count >= sizeof(BITMAP)) { memcpy( buffer, &bmp->bitmap, sizeof(BITMAP) ); ((BITMAP *) buffer)->bmBits = NULL; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5aab956..0f17972 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -72,6 +72,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); +static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ); +static INT DIB_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ); +static BOOL DIB_DeleteObject( HGDIOBJ handle ); + +static const struct gdi_obj_funcs dib_funcs = +{ + DIB_SelectObject, /* pSelectObject */ + DIB_GetObject, /* pGetObjectA */ + DIB_GetObject, /* pGetObjectW */ + NULL, /* pUnrealizeObject */ + DIB_DeleteObject /* pDeleteObject */ +}; + /*********************************************************************** * bitmap_info_size * @@ -1576,6 +1589,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); bmp->dib = dib; + bmp->header.funcs = &dib_funcs; bmp->funcs = physdev->funcs; bmp->color_table = color_table; GDI_ReleaseObj( ret ); @@ -1600,3 +1614,135 @@ error: HeapFree( GetProcessHeap(), 0, dib ); return 0; } + + +/*********************************************************************** + * DIB_SelectObject + */ +static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret; + BITMAPOBJ *bitmap; + DC *dc; + PHYSDEV physdev = NULL, old_physdev = NULL, pathdev = NULL; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + if (GetObjectType( hdc ) != OBJ_MEMDC) + { + ret = 0; + goto done; + } + ret = dc->hBitmap; + if (handle == dc->hBitmap) goto done; /* nothing to do */ + + if (!(bitmap = GDI_GetObjPtr( handle, OBJ_BITMAP ))) + { + ret = 0; + goto done; + } + + if (bitmap->header.selcount) + { + WARN( "Bitmap already selected in another DC\n" ); + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + + if (dc->physDev->funcs == &path_driver) pathdev = pop_dc_driver( &dc->physDev ); + + old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + physdev = dc->dibdrv; + if (old_physdev != dc->dibdrv) + { + if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + else + { + if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; + dc->dibdrv = physdev = dc->physDev; + } + } + + if (!physdev->funcs->pSelectBitmap( physdev, handle )) + { + GDI_ReleaseObj( handle ); + ret = 0; + } + else + { + dc->hBitmap = handle; + GDI_inc_ref_count( handle ); + dc->dirty = 0; + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = bitmap->bitmap.bmWidth; + dc->vis_rect.bottom = bitmap->bitmap.bmHeight; + GDI_ReleaseObj( handle ); + DC_InitDC( dc ); + GDI_dec_ref_count( ret ); + } + + done: + if(!ret) + { + if (old_physdev && old_physdev != dc->dibdrv) pop_dc_driver( &dc->physDev ); + } + if (pathdev) push_dc_driver( &dc->physDev, pathdev, pathdev->funcs ); + release_dc_ptr( dc ); + return ret; +} + + +/*********************************************************************** + * DIB_GetObject + */ +static INT DIB_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) +{ + INT ret = 0; + BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); + + if (!bmp) return 0; + + if (!buffer) ret = sizeof(BITMAP); + else if (count >= sizeof(DIBSECTION)) + { + DIBSECTION *dib = buffer; + *dib = *bmp->dib; + dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); + ret = sizeof(DIBSECTION); + } + else if (count >= sizeof(BITMAP)) + { + BITMAP *bitmap = buffer; + *bitmap = bmp->dib->dsBm; + ret = sizeof(BITMAP); + } + + GDI_ReleaseObj( handle ); + return ret; +} + + +/*********************************************************************** + * DIB_DeleteObject + */ +static BOOL DIB_DeleteObject( HGDIOBJ handle ) +{ + BITMAPOBJ *bmp; + + if (!(bmp = free_gdi_handle( handle ))) return FALSE; + + if (bmp->dib->dshSection) + { + SYSTEM_INFO SystemInfo; + GetSystemInfo( &SystemInfo ); + UnmapViewOfFile( (char *)bmp->dib->dsBm.bmBits - + (bmp->dib->dsOffset % SystemInfo.dwAllocationGranularity) ); + } + else VirtualFree( bmp->dib->dsBm.bmBits, 0, MEM_RELEASE ); + + HeapFree(GetProcessHeap(), 0, bmp->dib); + HeapFree(GetProcessHeap(), 0, bmp->color_table); + return HeapFree( GetProcessHeap(), 0, bmp ); +}

1 0

Jacek Caban : mshtml: Open document in a new window in IHlinkTarget:: Navigate if the document is not embedded.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 7bbe0d5ca6a9005d0c781d671c06a74fe9f2b0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bbe0d5ca6a9005d0c781d671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 10 17:07:36 2012 +0100 mshtml: Open document in a new window in IHlinkTarget::Navigate if the document is not embedded. --- dlls/mshtml/hlink.c | 4 ++++ dlls/mshtml/navigate.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index fd836de..4e63498 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -83,6 +84,9 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); + if(!This->doc_obj->client) + return navigate_new_window(This->window, This->window->uri, NULL, NULL); + return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1f532..9b650f4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2030,7 +2030,10 @@ HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IH IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); IWebBrowser2_Release(web_browser); - *ret = new_window; + if(ret) + *ret = new_window; + else + IHTMLWindow2_Release(new_window); return S_OK; }

1 0

Alexandre Julliard : winex11: Remove the remainining DIB section locking calls.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 40bf321e5ae9569b4722780db488b5edfdd53c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf321e5ae9569b4722780db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:37:50 2012 +0100 winex11: Remove the remainining DIB section locking calls. --- dlls/winex11.drv/bitblt.c | 3 --- dlls/winex11.drv/brush.c | 4 ---- dlls/winex11.drv/xrender.c | 6 ------ 3 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d20277..a54ca49 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1241,9 +1241,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info int height = dst->visrect.bottom - dst->visrect.top; image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, height * image->bytes_per_line ); if (bitmap) { diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 8de8c01..afc1e0b 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -215,8 +215,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); - X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); - wine_tsx11_lock(); if (physDev->brush.pixmap) XFreePixmap( gdi_display, physDev->brush.pixmap ); @@ -239,8 +237,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, } wine_tsx11_unlock(); - X11DRV_DIB_Unlock( physBitmap, TRUE ); - if (physBitmap->depth > 1) { physDev->brush.fillStyle = FillTiled; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cbe9185..dc3d55b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1997,9 +1997,6 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits if (ret) return ret; image->data = dst_bits.ptr; - /* hack: make sure the bits are readable if we are reading from a DIB section */ - /* to be removed once we get rid of DIB access protections */ - if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line ); *use_repeat = (width == 1 && height == 1); pa.repeat = *use_repeat ? RepeatNormal : RepeatNone; @@ -2641,8 +2638,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b GetObjectW( bitmap, sizeof(bm), &bm ); - X11DRV_DIB_Lock( physbitmap, DIB_Status_GdiMod ); - wine_tsx11_lock(); pixmap = XCreatePixmap( gdi_display, root_window, bm.bmWidth, bm.bmHeight, physdev->pict_format->depth ); @@ -2662,7 +2657,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); - X11DRV_DIB_Unlock( physbitmap, TRUE ); if (delete_bitmap) DeleteObject( bitmap ); return hbrush;

1 0

Alexandre Julliard : winex11: Fix support for PALETTEINDEX mapping and get rid of DIBINDEX support.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: c123c2f87af55f6b432e7be8560d65baee603520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c123c2f87af55f6b432e7be85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 11:56:06 2012 +0100 winex11: Fix support for PALETTEINDEX mapping and get rid of DIBINDEX support. --- dlls/winex11.drv/palette.c | 166 ++++++++++++++++---------------------------- 1 files changed, 61 insertions(+), 105 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index e6a2652..ec0f42c 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -882,39 +882,26 @@ static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) { HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); - unsigned char spec_type = color >> 24; - unsigned idx = color & 0xffff; PALETTEENTRY entry; - RGBQUAD quad; - switch(spec_type) + if (color & (1 << 24)) /* PALETTEINDEX */ { - case 2: /* PALETTERGB */ - idx = GetNearestPaletteIndex( hPal, color ); - /* fall through to PALETTEINDEX */ - - case 1: /* PALETTEINDEX */ - if (!GetPaletteEntries( hPal, idx, 1, &entry )) - { - WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); - return 0; - } + unsigned int idx = LOWORD(color); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; return RGB( entry.peRed, entry.peGreen, entry.peBlue ); + } - case 0x10: /* DIBINDEX */ - if( GetDIBColorTable( physDev->dev.hdc, idx, 1, &quad ) != 1 ) { - WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx); - return 0; - } - return RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); + if (color >> 24 == 2) /* PALETTERGB */ + { + unsigned int idx = GetNearestPaletteIndex( hPal, color & 0xffffff ); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) return 0; + return RGB( entry.peRed, entry.peGreen, entry.peBlue ); + } - default: - color &= 0xffffff; - /* fall through to RGB */ + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return 0; - case 0: /* RGB */ - return color; - } + return color & 0xffffff; } /*********************************************************************** @@ -926,7 +913,6 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { WORD index = 0; HPALETTE hPal = GetCurrentObject(physDev->dev.hdc, OBJ_PAL ); - unsigned char spec_type = color >> 24; int *mapping = palette_get_mapping( hPal ); PALETTEENTRY entry; ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; @@ -939,47 +925,35 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* there is no colormap limitation; we are going to have to compute * the pixel value from the visual information stored earlier */ + unsigned long red, green, blue; - unsigned long red, green, blue; - unsigned idx = color & 0xffff; - - switch(spec_type) + if (color & (1 << 24)) /* PALETTEINDEX */ { - case 0x10: /* DIBINDEX */ - color = X11DRV_PALETTE_GetColor( physDev, color ); - break; - - case 1: /* PALETTEINDEX */ + unsigned int idx = LOWORD( color ); + if (!GetPaletteEntries( hPal, idx, 1, &entry )) { WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); return 0; } if (mapping) return mapping[idx]; - color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); - break; - - default: - color &= 0xffffff; - /* fall through to RGB */ - - case 0: /* RGB */ - if (physDev->depth == 1) - { - int white = 1; - RGBQUAD table[2]; - - if (GetDIBColorTable( physDev->dev.hdc, 0, 2, table ) == 2) - { - if(!colour_is_brighter(table[1], table[0])) white = 0; - } - return (((color >> 16) & 0xff) + - ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? white : 1 - white; - } - - } - - red = GetRValue(color); green = GetGValue(color); blue = GetBValue(color); + red = entry.peRed; + green = entry.peGreen; + blue = entry.peBlue; + } + else if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + return 0; + } + else /* RGB */ + { + if (physDev->depth == 1) + return (((color >> 16) & 0xff) + + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; + red = GetRValue( color ); + green = GetGValue( color ); + blue = GetBValue( color ); + } if (X11DRV_PALETTE_Graymax) { @@ -1013,51 +987,33 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) if (!mapping) WARN("Palette %p is not realized\n", hPal); - switch(spec_type) /* we have to peruse DC and system palette */ - { - default: - color &= 0xffffff; - /* fall through to RGB */ - - case 0: /* RGB */ - if (physDev->depth == 1) - { - int white = 1; - RGBQUAD table[2]; - - if (GetDIBColorTable( physDev->dev.hdc, 0, 2, table ) == 2) - { - if(!colour_is_brighter(table[1], table[0])) - white = 0; - } - return (((color >> 16) & 0xff) + - ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? white : 1 - white; - } - - EnterCriticalSection( &palette_cs ); - index = X11DRV_SysPaletteLookupPixel( color, FALSE); - if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); - - /* TRACE(palette,"RGB(%lx) -> pixel %i\n", color, index); - */ - break; - case 1: /* PALETTEINDEX */ - index = color & 0xffff; - if (!GetPaletteEntries( hPal, index, 1, &entry )) - WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); - else if (mapping) index = mapping[index]; - - /* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index); - */ - break; - case 2: /* PALETTERGB */ - index = GetNearestPaletteIndex( hPal, color ); - if (mapping) index = mapping[index]; - /* TRACE(palette,"PALETTERGB(%lx) -> pixel %i\n", color, index); - */ - break; - } + if (color & (1 << 24)) /* PALETTEINDEX */ + { + index = LOWORD( color ); + if (!GetPaletteEntries( hPal, index, 1, &entry )) + WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); + else if (mapping) index = mapping[index]; + } + else if (color >> 24 == 2) /* PALETTERGB */ + { + index = GetNearestPaletteIndex( hPal, color ); + if (mapping) index = mapping[index]; + } + else if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + return 0; + } + else /* RGB */ + { + if (physDev->depth == 1) + return (((color >> 16) & 0xff) + + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; + + EnterCriticalSection( &palette_cs ); + index = X11DRV_SysPaletteLookupPixel( color & 0xffffff, FALSE); + if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; + LeaveCriticalSection( &palette_cs ); + } } return index; }

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 2dda47fe6fbccc25264fbaa14b5fc2d75efe84ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dda47fe6fbccc25264fbaa14… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 9 21:58:07 2012 +0900 po: Updated Korean translation. --- po/ko.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 173148d..516e3f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8361,9 +8361,8 @@ msgid "The specified device handle is invalid." msgstr "지정된 장치 핸들은 적합하지 않습니다." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "당신의 시스템에는 어떤 드라이버도 설치되어 있지 않습니다 !\n" +msgstr "당신의 시스템에는 어떤 드라이버도 설치되어 있지 않습니다 !" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -12961,7 +12960,7 @@ msgstr "다시 부르는 명령의 갯수(&N):" #: wineconsole.rc:76 msgid "&Remove doubles" -msgstr "두번 제거(&R)" +msgstr "두번 제거(&R)" #: wineconsole.rc:84 msgid "&Font" @@ -12972,9 +12971,8 @@ msgid "&Color" msgstr "색상(&C)" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " 설정 " +msgstr "설정 " #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Andrew Eikum : itss: Use case-insensitive strcmp.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: f71efc297bb50e55e2c2793d0320db18e9e373a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71efc297bb50e55e2c2793d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:28:31 2012 -0600 itss: Use case-insensitive strcmp. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 72d356b..02edd49 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -443,7 +443,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( TRACE("%p %s %p %p\n", This, debugstr_w( pszDisplayName ), pchEaten, ppmkOut ); - if( strncmpW( pszDisplayName, szPrefix, prefix_len ) ) + if( strncmpiW( pszDisplayName, szPrefix, prefix_len ) ) return MK_E_SYNTAX; /* search backwards for a double colon */

1 0

Kusanagi Kouichi : gdi32: GetGlyphIndices doesn't substitute glyph.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: fecb1d8b6f81c2bfff7116e80380b1d4f7b7befc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecb1d8b6f81c2bfff7116e80… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Jan 10 19:08:03 2012 +0900 gdi32: GetGlyphIndices doesn't substitute glyph. --- dlls/gdi32/freetype.c | 8 ++++++-- dlls/gdi32/tests/font.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b907209..537d81a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4988,7 +4988,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used); - return get_GSUB_vert_glyph(font,ret); + return ret; } if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) @@ -5001,7 +5001,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); - return get_GSUB_vert_glyph(font,glyphId); + return glyphId; } /************************************************************* @@ -6373,7 +6373,10 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, *linked_font = font; if((*glyph = get_glyph_index(font, c))) + { + *glyph = get_GSUB_vert_glyph(font, *glyph); return TRUE; + } LIST_FOR_EACH_ENTRY(child_font, &font->child_fonts, CHILD_FONT, entry) { @@ -6384,6 +6387,7 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if(!child_font->font->ft_face) continue; g = get_glyph_index(child_font->font, c); + g = get_GSUB_vert_glyph(child_font->font, g); if(g) { *glyph = g; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 41ceff4..8d30cdb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4070,13 +4070,14 @@ todo_wine DeleteFile(ttf_name); } -static void check_vertical_font(const char *name, BOOL *installed, BOOL *selected, GLYPHMETRICS *gm) +static void check_vertical_font(const char *name, BOOL *installed, BOOL *selected, GLYPHMETRICS *gm, WORD *gi) { LOGFONTA lf; HFONT hfont, hfont_prev; HDC hdc; char facename[100]; DWORD ret; + static const WCHAR str[] = { 0x2025 }; *installed = is_truetype_font_installed(name); @@ -4112,6 +4113,9 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte if (!*selected) memset(gm, 0, sizeof *gm); + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed\n"); + SelectObject(hdc, hfont_prev); DeleteObject(hfont); ReleaseDC(NULL, hdc); @@ -4123,10 +4127,11 @@ static void test_vertical_font(void) int num; BOOL ret, installed, selected; GLYPHMETRICS gm; + WORD hgi, vgi; - if (!pAddFontResourceExA || !pRemoveFontResourceExA) + if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) { - win_skip("AddFontResourceExA is not available on this platform\n"); + win_skip("AddFontResourceExA or GetGlyphIndicesW is not available on this platform\n"); return; } @@ -4139,20 +4144,22 @@ static void test_vertical_font(void) num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); - check_vertical_font("@WineTestVertical", &installed, &selected, &gm); + check_vertical_font("@WineTestVertical", &installed, &selected, &gm, &hgi); ok(installed, "@WineTestVertical is not installed\n"); ok(selected, "@WineTestVertical is not selected\n"); ok(gm.gmBlackBoxX > gm.gmBlackBoxY, "gmBlackBoxX(%u) should be greater than gmBlackBoxY(%u) if horizontal\n", gm.gmBlackBoxX, gm.gmBlackBoxY); - check_vertical_font("@@WineTestVertical", &installed, &selected, &gm); + check_vertical_font("@@WineTestVertical", &installed, &selected, &gm, &vgi); ok(installed, "@@WineTestVertical is not installed\n"); ok(selected, "@@WineTestVertical is not selected\n"); ok(gm.gmBlackBoxX < gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY); + ok(hgi == vgi, "different glyph h:%u v:%u\n", hgi, vgi); + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0