May 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : propsys: Implement IPropertyStore::GetAt.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 0ba11e8970697ff32684fcc716565dd395d7c5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba11e8970697ff32684fcc71… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:34:25 2012 -0500 propsys: Implement IPropertyStore::GetAt. --- dlls/propsys/propstore.c | 47 ++++++++++++++++++++++++++++++++++++++- dlls/propsys/tests/propstore.c | 8 +++--- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index b89eb76..a57bb2e 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -156,8 +156,51 @@ static HRESULT WINAPI PropertyStore_GetCount(IPropertyStoreCache *iface, static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, DWORD iProp, PROPERTYKEY *pkey) { - FIXME("%p,%d,%p: stub\n", iface, iProp, pkey); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format=NULL, *format_candidate; + propstore_value *value; + HRESULT hr; + + TRACE("%p,%d,%p\n", iface, iProp, pkey); + + if (!pkey) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format_candidate, &This->formats, propstore_format, entry) + { + if (format_candidate->count > iProp) + { + format = format_candidate; + pkey->fmtid = format->fmtid; + break; + } + + iProp -= format_candidate->count; + } + + if (format) + { + LIST_FOR_EACH_ENTRY(value, &format->values, propstore_value, entry) + { + if (iProp == 0) + { + pkey->pid = value->pid; + break; + } + + iProp--; + } + + hr = S_OK; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key, diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 6ca67e9..7915b96 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -68,7 +68,7 @@ static void test_inmemorystore(void) ok(hr == S_OK, "Commit failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - todo_wine ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); pkey.fmtid = PKEY_WineTest; pkey.pid = 4; @@ -97,9 +97,9 @@ static void test_inmemorystore(void) memset(&pkey, 0, sizeof(pkey)); hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - todo_wine ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); - todo_wine ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); + ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); + ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); + ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); pkey.fmtid = PKEY_WineTest; pkey.pid = 4;

1 0

Alexandre Julliard : gdi32: Always store a copy of the bitmap bits for pattern brushes.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: a196ad8fc1687e3814c978ecf6224dbf7db18c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a196ad8fc1687e3814c978ecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 21:12:04 2012 +0200 gdi32: Always store a copy of the bitmap bits for pattern brushes. --- dlls/gdi32/brush.c | 90 ++++++++----------------------------------- dlls/gdi32/dibdrv/objects.c | 12 +----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/pen.c | 6 +-- 4 files changed, 18 insertions(+), 91 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index cb5a163..e0dd599 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -55,88 +55,37 @@ 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 ) +static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])]; + BITMAPINFO *info = (BITMAPINFO *)buffer; struct gdi_image_bits bits; struct bitblt_coords src; - BITMAPINFO *info; - BITMAPOBJ *bmp; - - if (pattern->info) return; /* already cached */ - if (!(bmp = GDI_GetObjPtr( pattern->bitmap, OBJ_BITMAP ))) return; - - /* we don't need to cache if we are selecting into the same type of DC */ - if (physdev && bmp->funcs == physdev->funcs) goto done; + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!bmp) return FALSE; src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->dib.dsBm.bmWidth; src.visrect.bottom = src.height = bmp->dib.dsBm.bmHeight; - if (bmp->funcs->pGetImage( NULL, pattern->bitmap, info, &bits, &src )) - { - HeapFree( GetProcessHeap(), 0, info ); - goto done; - } - - /* release the unneeded space */ - HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, - get_dib_info_size( info, DIB_RGB_COLORS )); - pattern->info = info; - pattern->bits = bits; - pattern->usage = DIB_RGB_COLORS; - -done: - GDI_ReleaseObj( pattern->bitmap ); -} + if (bmp->funcs->pGetImage( NULL, bitmap, info, &bits, &src )) goto done; -static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) -{ - BITMAPINFO *info; - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (!bmp) return FALSE; - - if (!is_bitmapobj_dib( bmp )) + brush->bits = bits; + if (!bits.free) { - if ((brush->bitmap = CreateBitmap( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmHeight, - bmp->dib.dsBm.bmPlanes, bmp->dib.dsBm.bmBitsPixel, NULL ))) - { - if (bmp->funcs->pCopyBitmap( bitmap, brush->bitmap )) - { - BITMAPOBJ *copy = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); - copy->funcs = bmp->funcs; - GDI_ReleaseObj( copy ); - } - else - { - DeleteObject( brush->bitmap ); - brush->bitmap = 0; - } - } - GDI_ReleaseObj( bitmap ); - return brush->bitmap != 0; + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + memcpy( brush->bits.ptr, bits.ptr, info->bmiHeader.biSizeImage ); + brush->bits.free = free_heap_bits; } - info = HeapAlloc( GetProcessHeap(), 0, - get_dib_info_size( (BITMAPINFO *)&bmp->dib.dsBmih, DIB_RGB_COLORS )); - if (!info) goto done; - info->bmiHeader = bmp->dib.dsBmih; - if (info->bmiHeader.biCompression == BI_BITFIELDS) - memcpy( &info->bmiHeader + 1, bmp->dib.dsBitfields, sizeof(bmp->dib.dsBitfields) ); - else if (info->bmiHeader.biClrUsed) - memcpy( &info->bmiHeader + 1, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); - if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) + if (!(brush->info = HeapAlloc( GetProcessHeap(), 0, get_dib_info_size( info, DIB_RGB_COLORS )))) { - HeapFree( GetProcessHeap(), 0, info ); + if (brush->bits.free) brush->bits.free( &brush->bits ); goto done; } - memcpy( brush->bits.ptr, bmp->dib.dsBm.bmBits, info->bmiHeader.biSizeImage ); - brush->bits.is_copy = TRUE; - brush->bits.free = free_heap_bits; - brush->info = info; + memcpy( brush->info, info, get_dib_info_size( info, DIB_RGB_COLORS )); + brush->bits.is_copy = FALSE; /* the bits can't be modified */ brush->usage = DIB_RGB_COLORS; done: @@ -200,7 +149,6 @@ BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) void free_brush_pattern( struct brush_pattern *pattern ) { if (pattern->bits.free) pattern->bits.free( &pattern->bits ); - if (pattern->bitmap) DeleteObject( pattern->bitmap ); HeapFree( GetProcessHeap(), 0, pattern->info ); } @@ -211,8 +159,6 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; - if (!brush->pattern.info) cache_pattern_bits( NULL, &brush->pattern ); - if (brush->pattern.info) { memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); @@ -495,11 +441,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); struct brush_pattern *pattern = &brush->pattern; - if (!pattern->info) - { - if (pattern->bitmap) cache_pattern_bits( physdev, pattern ); - else pattern = NULL; - } + if (!pattern->info) pattern = NULL; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dd47ee1..35164e6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1873,17 +1873,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * if (pattern.bit_count == 1 && !pattern.color_table) dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ - if (!brush->pattern.info) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); - BOOL ret; - - if (!bmp) return FALSE; - ret = init_dib_info_from_bitmapobj( &pattern, bmp ); - GDI_ReleaseObj( brush->pattern.bitmap ); - if (!ret) return FALSE; - } - else if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) + if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { copy_bitmapinfo( info, brush->pattern.info ); fill_color_table_from_pal_colors( info, pdev->dev.hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index db8fd24..36d0131 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -221,7 +221,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* brush.c */ -extern void cache_pattern_bits( PHYSDEV physdev, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1d04dae..6695ee9 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -243,11 +243,7 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) break; case OBJ_EXTPEN: pattern = &pen->pattern; - if (!pattern->info) - { - if (pattern->bitmap) cache_pattern_bits( physdev, pattern ); - else pattern = NULL; - } + if (!pattern->info) pattern = NULL; break; default: GDI_ReleaseObj( handle );

1 0

Dmitry Timoshkov : comctl32: Use WARN instead of ERR if a toolbar index is out of range.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 92a81c215f0a6540212a68b4300f6f69a4e8fa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a81c215f0a6540212a68b43… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:43:36 2012 +0900 comctl32: Use WARN instead of ERR if a toolbar index is out of range. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index da13aa2..cd19a58 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -428,7 +428,7 @@ TOOLBAR_GetImageListForDrawing (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPt if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) { if (btnPtr->iBitmap == I_IMAGENONE) return NULL; - ERR("bitmap for ID %d, index %d is not valid, number of bitmaps in imagelist: %d\n", + WARN("bitmap for ID %d, index %d is not valid, number of bitmaps in imagelist: %d\n", HIWORD(btnPtr->iBitmap), LOWORD(btnPtr->iBitmap), infoPtr->nNumBitmaps); return NULL; }

1 0

Alexandre Julliard : winex11: Always create the brush pixmap from the pattern bits.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 995e2104df603af1feea7999fefe4765a655d2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=995e2104df603af1feea7999f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 21:44:59 2012 +0200 winex11: Always create the brush pixmap from the pattern bits. --- dlls/winex11.drv/brush.c | 79 +------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 44 ++++++------------------ 3 files changed, 12 insertions(+), 112 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 6574eb8..3406190 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -210,76 +210,6 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) } -/*********************************************************************** - * BRUSH_SelectPatternBrush - */ -static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, X_PHYSBITMAP *physBitmap ) -{ - BITMAP bitmap; - - GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); - - wine_tsx11_lock(); - - if (physDev->brush.pixmap) XFreePixmap( gdi_display, physDev->brush.pixmap ); - - if ((physDev->depth == 1) && (physBitmap->depth != 1)) - { - /* Special case: a color pattern on a monochrome DC */ - physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, 1); - /* FIXME: should probably convert to monochrome instead */ - XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(1), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); - } - else - { - physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, physBitmap->depth ); - XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); - } - wine_tsx11_unlock(); - - if (physBitmap->depth > 1) - { - physDev->brush.fillStyle = FillTiled; - physDev->brush.pixel = 0; /* Ignored */ - } - else - { - physDev->brush.fillStyle = FillOpaqueStippled; - physDev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ - } -} - -/* create a bitmap appropriate for the given DIB pattern brush */ -HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern *pattern ) -{ - HDC memdc; - int bpp = screen_bpp; - HBITMAP bitmap; - const BITMAPINFO *info = pattern->info; - - if (physDev->depth == 1 || info->bmiHeader.biBitCount == 1) bpp = 1; - bitmap = CreateBitmap( info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), 1, bpp, NULL ); - if (!bitmap) return 0; - - /* make sure it's owned by x11drv */ - memdc = CreateCompatibleDC( physDev->dev.hdc ); - SelectObject( memdc, bitmap ); - DeleteDC( memdc ); - if (!X11DRV_get_phys_bitmap( bitmap )) - { - DeleteObject( bitmap ); - return 0; - } - - SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), - pattern->bits.ptr, info, pattern->usage ); - return bitmap; -} - static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pattern *pattern ) { XVisualInfo vis; @@ -330,14 +260,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter if (pattern) /* pattern brush */ { - X_PHYSBITMAP *physbitmap; - HBITMAP bitmap = pattern->bitmap; - - if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) - { - if (!select_pattern_brush( physDev, pattern )) return 0; - } - else BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + if (!select_pattern_brush( physDev, pattern )) return 0; TRACE("BS_PATTERN\n"); physDev->brush.style = BS_PATTERN; return hbrush; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9b05e3e..7ea8164 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -221,7 +221,6 @@ extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_BITMAP_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; -extern HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_get_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_create_phys_bitmap( HBITMAP hbitmap, const BITMAP *bitmap, int depth ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ffd1b4d..91a6bd2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2589,56 +2589,34 @@ fallback: static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); - X_PHYSBITMAP *physbitmap; - BOOL delete_bitmap = FALSE; - BITMAP bm; - HBITMAP bitmap; Pixmap pixmap; - XRenderPictFormat *pict_format; - Picture src_pict, dst_pict; - XRenderPictureAttributes pa; + XVisualInfo vis; + XRenderPictFormat *format = physdev->pict_format; if (!pattern) goto x11drv_fallback; + if (pattern->info->bmiHeader.biBitCount == 1) goto x11drv_fallback; if (physdev->format == WXR_FORMAT_MONO) goto x11drv_fallback; - bitmap = pattern->bitmap; - if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) - { - if (!(bitmap = create_brush_bitmap( physdev->x11dev, pattern ))) return 0; - physbitmap = X11DRV_get_phys_bitmap( bitmap ); - delete_bitmap = TRUE; - } - - if (physbitmap->format == WXR_FORMAT_MONO) goto x11drv_fallback; - if (!(pict_format = pict_formats[physbitmap->format])) goto x11drv_fallback; + memset( &vis, 0, sizeof(vis) ); + vis.depth = format->depth; + vis.red_mask = format->direct.redMask << format->direct.red; + vis.green_mask = format->direct.greenMask << format->direct.green; + vis.blue_mask = format->direct.blueMask << format->direct.blue; - GetObjectW( bitmap, sizeof(bm), &bm ); + pixmap = create_pixmap_from_image( physdev->dev.hdc, &vis, pattern->info, + &pattern->bits, pattern->usage ); + if (!pixmap) return 0; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, bm.bmWidth, bm.bmHeight, - physdev->pict_format->depth ); - - pa.repeat = RepeatNone; - src_pict = pXRenderCreatePicture(gdi_display, physbitmap->pixmap, pict_format, CPRepeat, &pa); - dst_pict = pXRenderCreatePicture(gdi_display, pixmap, physdev->pict_format, CPRepeat, &pa); - - xrender_blit( PictOpSrc, src_pict, 0, dst_pict, 0, 0, bm.bmWidth, bm.bmHeight, - 0, 0, bm.bmWidth, bm.bmHeight, 1.0, 1.0 ); - pXRenderFreePicture( gdi_display, src_pict ); - pXRenderFreePicture( gdi_display, dst_pict ); - if (physdev->x11dev->brush.pixmap) XFreePixmap( gdi_display, physdev->x11dev->brush.pixmap ); physdev->x11dev->brush.pixmap = pixmap; physdev->x11dev->brush.fillStyle = FillTiled; physdev->x11dev->brush.pixel = 0; /* ignored */ physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); - - if (delete_bitmap) DeleteObject( bitmap ); return hbrush; x11drv_fallback: - if (delete_bitmap) DeleteObject( bitmap ); dev = GET_NEXT_PHYSDEV( dev, pSelectBrush ); return dev->funcs->pSelectBrush( dev, hbrush, pattern ); }

1 0

Alexander Morozov : wininet: Add "Content-Disposition" field.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: ef95a7938462f6dcc15a82124a36f19e9a72f81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef95a7938462f6dcc15a82124… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed May 23 17:49:24 2012 +0400 wininet: Add "Content-Disposition" field. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f26f45f..0e3c1a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -98,6 +98,7 @@ static const WCHAR szAllow[] = { 'A','l','l','o','w',0 }; static const WCHAR szCache_Control[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0 }; static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; static const WCHAR szContent_Base[] = { 'C','o','n','t','e','n','t','-','B','a','s','e',0 }; +static const WCHAR szContent_Disposition[] = { 'C','o','n','t','e','n','t','-','D','i','s','p','o','s','i','t','i','o','n',0 }; static const WCHAR szContent_Encoding[] = { 'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0 }; static const WCHAR szContent_ID[] = { 'C','o','n','t','e','n','t','-','I','D',0 }; static const WCHAR szContent_Language[] = { 'C','o','n','t','e','n','t','-','L','a','n','g','u','a','g','e',0 }; @@ -3277,7 +3278,7 @@ static const LPCWSTR header_lookup[] = { szCookie, /* HTTP_QUERY_COOKIE = 44 */ NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ NULL, /* HTTP_QUERY_REFRESH = 46 */ - NULL, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ + szContent_Disposition, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ szAge, /* HTTP_QUERY_AGE = 48 */ szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */ szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */

1 0

Alexandre Julliard : gdi32: Don' t use the DC colors when drawing a monochrome pattern to a monochrome DDB.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 8a86f6c99329fd5a325428f4824580131a8fd767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a86f6c99329fd5a325428f48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 12:30:23 2012 +0200 gdi32: Don't use the DC colors when drawing a monochrome pattern to a monochrome DDB. --- dlls/gdi32/dibdrv/objects.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index d865768..dd47ee1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1870,6 +1870,9 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * dib_info pattern; BOOL dither = (brush->dib.bit_count == 1); + if (pattern.bit_count == 1 && !pattern.color_table) + dither = FALSE; /* monochrome DDB pattern brushes don't get dithered */ + if (!brush->pattern.info) { BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); @@ -1892,7 +1895,8 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * init_dib_info_from_bitmapinfo( &pattern, brush->pattern.info, brush->pattern.bits.ptr ); } - if (pattern.bit_count == 1 && !pattern.color_table) + if (pattern.bit_count == 1 && !pattern.color_table && + (pdev->dib.bit_count != 1 || pdev->dib.color_table)) { /* monochrome DDB pattern uses DC colors */ DWORD pixel; @@ -1916,7 +1920,6 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * pattern.color_table = color_table; pattern.color_table_size = 2; *needs_reselect = TRUE; - dither = FALSE; /* DDB pattern brushes don't get dithered */ } copy_dib_color_info(&brush->dib, &pdev->dib);

1 0

Alexandre Julliard : gdi32: Implement dithering of solid brushes when drawing to DDBs.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 139aeba3ef44f11c21ef38d598746ad2aebeb50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=139aeba3ef44f11c21ef38d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:14:16 2012 +0200 gdi32: Implement dithering of solid brushes when drawing to DDBs. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 69 +++++++++++++-- dlls/gdi32/dibdrv/primitives.c | 189 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=139aeba3ef44f11c21ef3…

1 0

Vincent Povirk : propsys: Implement IPropertyStore::GetCount.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: d2d225f6a5228899a358f8ef05d77fbadd2d2385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d225f6a5228899a358f8ef0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:24:03 2012 -0500 propsys: Implement IPropertyStore::GetCount. --- dlls/propsys/propstore.c | 21 +++++++++++++++++++-- dlls/propsys/tests/propstore.c | 10 +++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 88a6a7e..b89eb76 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -133,8 +133,24 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) static HRESULT WINAPI PropertyStore_GetCount(IPropertyStoreCache *iface, DWORD *cProps) { - FIXME("%p,%p: stub\n", iface, cProps); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format; + + TRACE("%p,%p\n", iface, cProps); + + if (!cProps) + return E_POINTER; + + *cProps = 0; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format, &This->formats, propstore_format, entry) + *cProps += format->count; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, @@ -201,6 +217,7 @@ static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key value->pid = key->pid; list_add_tail(&format->values, &value->entry); + format->count++; } *result = value; diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index c24cb35..6ca67e9 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -55,11 +55,11 @@ static void test_inmemorystore(void) } hr = IPropertyStoreCache_GetCount(propcache, NULL); - todo_wine ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); + ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetCount(propcache, &count); - todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - todo_wine ok(count == 0, "GetCount returned %i, expected 0\n", count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 0, "GetCount returned %i, expected 0\n", count); hr = IPropertyStoreCache_Commit(propcache); ok(hr == S_OK, "Commit failed, hr=%x\n", hr); @@ -91,8 +91,8 @@ static void test_inmemorystore(void) ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetCount(propcache, &count); - todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - todo_wine ok(count == 1, "GetCount returned %i, expected 0\n", count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "GetCount returned %i, expected 0\n", count); memset(&pkey, 0, sizeof(pkey));

1 0

Vincent Povirk : propsys: Add stub InMemoryPropertyStore implementation.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: d8fcf75d0431c0055d5d547bd200b4611245ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fcf75d0431c0055d5d547bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 14:18:11 2012 -0500 propsys: Add stub InMemoryPropertyStore implementation. --- dlls/propsys/Makefile.in | 3 +- dlls/propsys/propstore.c | 193 ++++++++++++++++++++++++++++++++++++++++ dlls/propsys/propsys.spec | 4 +- dlls/propsys/propsys_main.c | 77 ++++++++++++++++ dlls/propsys/propsys_private.h | 21 +++++ dlls/propsys/tests/propstore.c | 76 ++++++++-------- 6 files changed, 333 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8fcf75d0431c0055d5d5…

1 0

Francois Gouget : vbscript: Add support for integer values in conditional jumps.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: d090c39470b57fa931299c7c0b0b8027a8f181fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d090c39470b57fa931299c7c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 23 15:36:04 2012 +0200 vbscript: Add support for integer values in conditional jumps. --- dlls/vbscript/interp.c | 52 +++++++++++++++++++++++++++-------------- dlls/vbscript/tests/lang.vbs | 8 ++++++ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 67e1070..3f3e9c8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -350,6 +350,34 @@ static inline void release_val(variant_val_t *v) VariantClear(v->v); } +static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) +{ + variant_val_t val; + HRESULT hres; + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + switch (V_VT(val.v)) + { + case VT_BOOL: + *b = V_BOOL(val.v); + break; + case VT_I2: + *b = V_I2(val.v); + break; + case VT_I4: + *b = V_I4(val.v); + break; + default: + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + return S_OK; +} + static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) { VARIANT *v = stack_pop(ctx); @@ -886,22 +914,16 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_false(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; - variant_val_t val; HRESULT hres; + BOOL b; TRACE("%u\n", arg); - hres = stack_pop_val(ctx, &val); + hres = stack_pop_bool(ctx, &b); if(FAILED(hres)) return hres; - if(V_VT(val.v) != VT_BOOL) { - FIXME("unsupported for %s\n", debugstr_variant(val.v)); - release_val(&val); - return E_NOTIMPL; - } - - if(V_BOOL(val.v)) + if(b) ctx->instr++; else instr_jmp(ctx, ctx->instr->arg1.uint); @@ -911,22 +933,16 @@ static HRESULT interp_jmp_false(exec_ctx_t *ctx) static HRESULT interp_jmp_true(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; - variant_val_t val; HRESULT hres; + BOOL b; TRACE("%u\n", arg); - hres = stack_pop_val(ctx, &val); + hres = stack_pop_bool(ctx, &b); if(FAILED(hres)) return hres; - if(V_VT(val.v) != VT_BOOL) { - FIXME("unsupported for %s\n", debugstr_variant(val.v)); - release_val(&val); - return E_NOTIMPL; - } - - if(V_BOOL(val.v)) + if(b) instr_jmp(ctx, ctx->instr->arg1.uint); else ctx->instr++; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1015e34..4900a52 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -260,6 +260,14 @@ End If Call ok(x, "elseif not called?") x = false +if 1 then x = true +Call ok(x, "if 1 not run?") + +x = false +if &h10000& then x = true +Call ok(x, "if &h10000& not run?") + +x = false y = false while not (x and y) if x then

1 0