August 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : oleaut32: Clean QueryInterface() method, turn impl. calls to interface calls.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: c69be3bfb9e0ea749b5e6185be380ba925c50541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69be3bfb9e0ea749b5e6185b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 12:27:53 2011 +0400 oleaut32: Clean QueryInterface() method, turn impl. calls to interface calls. --- dlls/oleaut32/olefont.c | 50 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 019132f..c986f0e 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -476,32 +476,42 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( *ppvObject = 0; - if (IsEqualGUID(&IID_IUnknown, riid)) - *ppvObject = this; - if (IsEqualGUID(&IID_IFont, riid)) + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IFont, riid)) + { *ppvObject = this; - if (IsEqualGUID(&IID_IDispatch, riid)) - *ppvObject = &this->IDispatch_iface; - if (IsEqualGUID(&IID_IFontDisp, riid)) + } + else if (IsEqualGUID(&IID_IDispatch, riid) || + IsEqualGUID(&IID_IFontDisp, riid)) + { *ppvObject = &this->IDispatch_iface; - if (IsEqualIID(&IID_IPersist, riid) || IsEqualGUID(&IID_IPersistStream, riid)) + } + else if (IsEqualGUID(&IID_IPersist, riid) || + IsEqualGUID(&IID_IPersistStream, riid)) + { *ppvObject = &this->IPersistStream_iface; - if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) + } + else if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) + { *ppvObject = &this->IConnectionPointContainer_iface; - if (IsEqualGUID(&IID_IPersistPropertyBag, riid)) + } + else if (IsEqualGUID(&IID_IPersistPropertyBag, riid)) + { *ppvObject = &this->IPersistPropertyBag_iface; - if (IsEqualGUID(&IID_IPersistStreamInit, riid)) + } + else if (IsEqualGUID(&IID_IPersistStreamInit, riid)) + { *ppvObject = &this->IPersistStreamInit_iface; + } - /* - * Check that we obtained an interface. - */ - if ((*ppvObject)==0) + if (!*ppvObject) { - FIXME("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - OLEFontImpl_AddRef(&this->IFont_iface); + + IFont_AddRef(iface); + return S_OK; } @@ -1124,7 +1134,7 @@ static HRESULT WINAPI OLEFontImpl_QueryTextMetrics( HFONT hOldFont, hNewFont; hdcRef = GetDC(0); - OLEFontImpl_get_hFont(iface, &hNewFont); + IFont_get_hFont(iface, &hNewFont); hOldFont = SelectObject(hdcRef, hNewFont); GetTextMetricsW(hdcRef, ptm); SelectObject(hdcRef, hOldFont); @@ -1304,7 +1314,7 @@ static HRESULT WINAPI OLEFontImpl_GetIDsOfNames( if (cNames == 0) return E_INVALIDARG; - hres = OLEFontImpl_GetTypeInfo(iface, 0, lcid, &pTInfo); + hres = IDispatch_GetTypeInfo(iface, 0, lcid, &pTInfo); if (FAILED(hres)) { ERR("GetTypeInfo failed.\n"); @@ -1484,7 +1494,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( case DISPID_FONT_SIZE: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_CY; - return OLEFontImpl_get_Size(&this->IFont_iface, &V_CY(pVarResult)); + return IFont_get_Size(&this->IFont_iface, &V_CY(pVarResult)); } else { VARIANTARG vararg; @@ -1502,7 +1512,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( case DISPID_FONT_WEIGHT: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_I2; - return OLEFontImpl_get_Weight(&this->IFont_iface, &V_I2(pVarResult)); + return IFont_get_Weight(&this->IFont_iface, &V_I2(pVarResult)); } else { VARIANTARG vararg;

1 0

Nikolay Sivov : oleaut32: Get rid of duplicated condition check.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e800158ab0e0b33577c2c063f2bd145c1beb2adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e800158ab0e0b33577c2c063f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 13:40:32 2011 +0400 oleaut32: Get rid of duplicated condition check. --- dlls/oleaut32/olefont.c | 171 +++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 87 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c986f0e..fa60da6 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -584,88 +584,85 @@ static int CALLBACK font_enum_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, static void realize_font(OLEFontImpl *This) { - if (This->dirty) - { - LOGFONTW logFont; - INT fontHeight; - WCHAR text_face[LF_FACESIZE]; - HDC hdc = get_dc(); - HFONT old_font; - TEXTMETRICW tm; + LOGFONTW logFont; + INT fontHeight; + WCHAR text_face[LF_FACESIZE]; + HDC hdc = get_dc(); + HFONT old_font; + TEXTMETRICW tm; - text_face[0] = 0; + if (!This->dirty) return; - if(This->gdiFont) - { - old_font = SelectObject(hdc, This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); - SelectObject(hdc, old_font); - dec_int_ref(This->gdiFont); - This->gdiFont = 0; - } + text_face[0] = 0; - memset(&logFont, 0, sizeof(LOGFONTW)); + if(This->gdiFont) + { + old_font = SelectObject(hdc, This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + SelectObject(hdc, old_font); + dec_int_ref(This->gdiFont); + This->gdiFont = 0; + } - lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); - logFont.lfCharSet = This->description.sCharset; + memset(&logFont, 0, sizeof(LOGFONTW)); - /* If the font name has been changed then enumerate all charsets - and pick one that'll result in the font specified being selected */ - if(text_face[0] && lstrcmpiW(text_face, This->description.lpstrName)) - { - enum_data data; - data.orig_cs = This->description.sCharset; - data.avail_cs = -1; - logFont.lfCharSet = DEFAULT_CHARSET; - EnumFontFamiliesExW(get_dc(), &logFont, font_enum_proc, (LPARAM)&data, 0); - if(data.avail_cs != -1) logFont.lfCharSet = data.avail_cs; - } + lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); + logFont.lfCharSet = This->description.sCharset; + /* If the font name has been changed then enumerate all charsets + and pick one that'll result in the font specified being selected */ + if(text_face[0] && lstrcmpiW(text_face, This->description.lpstrName)) + { + enum_data data; + data.orig_cs = This->description.sCharset; + data.avail_cs = -1; + logFont.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesExW(get_dc(), &logFont, font_enum_proc, (LPARAM)&data, 0); + if(data.avail_cs != -1) logFont.lfCharSet = data.avail_cs; + } - /* - * The height of the font returned by the get_Size property is the - * height of the font in points multiplied by 10000... Using some - * simple conversions and the ratio given by the application, it can - * be converted to a height in pixels. - * - * Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. - * Ratio is applied here relative to the standard. - */ - - fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); + /* + * The height of the font returned by the get_Size property is the + * height of the font in points multiplied by 10000... Using some + * simple conversions and the ratio given by the application, it can + * be converted to a height in pixels. + * + * Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. + * Ratio is applied here relative to the standard. + */ + fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); - logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : + logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : (-fontHeight/10000L); - logFont.lfItalic = This->description.fItalic; - logFont.lfUnderline = This->description.fUnderline; - logFont.lfStrikeOut = This->description.fStrikethrough; - logFont.lfWeight = This->description.sWeight; - logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; - logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - logFont.lfQuality = DEFAULT_QUALITY; - logFont.lfPitchAndFamily = DEFAULT_PITCH; - - This->gdiFont = CreateFontIndirectW(&logFont); - This->dirty = FALSE; - - add_hfontitem(This->gdiFont); - - /* Fixup the name and charset properties so that they match the - selected font */ - old_font = SelectObject(get_dc(), This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); - if(lstrcmpiW(text_face, This->description.lpstrName)) - { - HeapFree(GetProcessHeap(), 0, This->description.lpstrName); - This->description.lpstrName = strdupW(text_face); - } - GetTextMetricsW(hdc, &tm); - This->description.sCharset = tm.tmCharSet; - /* While we have it handy, stash the realized font height for use by get_Size() */ - This->nRealHeight = tm.tmHeight - tm.tmInternalLeading; /* corresponds to LOGFONT lfHeight */ - SelectObject(hdc, old_font); + logFont.lfItalic = This->description.fItalic; + logFont.lfUnderline = This->description.fUnderline; + logFont.lfStrikeOut = This->description.fStrikethrough; + logFont.lfWeight = This->description.sWeight; + logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = DEFAULT_PITCH; + + This->gdiFont = CreateFontIndirectW(&logFont); + This->dirty = FALSE; + + add_hfontitem(This->gdiFont); + + /* Fixup the name and charset properties so that they match the + selected font */ + old_font = SelectObject(get_dc(), This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + if(lstrcmpiW(text_face, This->description.lpstrName)) + { + HeapFree(GetProcessHeap(), 0, This->description.lpstrName); + This->description.lpstrName = strdupW(text_face); } + GetTextMetricsW(hdc, &tm); + This->description.sCharset = tm.tmCharSet; + /* While we have it handy, stash the realized font height for use by get_Size() */ + This->nRealHeight = tm.tmHeight - tm.tmInternalLeading; /* corresponds to LOGFONT lfHeight */ + SelectObject(hdc, old_font); } /************************************************************************ @@ -683,7 +680,7 @@ static HRESULT WINAPI OLEFontImpl_get_Name( if (pname==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); if (this->description.lpstrName!=0) *pname = SysAllocString(this->description.lpstrName); @@ -741,7 +738,7 @@ static HRESULT WINAPI OLEFontImpl_get_Size( if (!psize) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); /* * Convert realized font height in pixels to points descaled by current @@ -785,7 +782,7 @@ static HRESULT WINAPI OLEFontImpl_get_Bold( if (!pbold) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pbold = this->description.sWeight > 550; @@ -820,7 +817,7 @@ static HRESULT WINAPI OLEFontImpl_get_Italic( if (pitalic==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pitalic = this->description.fItalic; @@ -856,7 +853,7 @@ static HRESULT WINAPI OLEFontImpl_get_Underline( if (punderline==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *punderline = this->description.fUnderline; @@ -892,7 +889,7 @@ static HRESULT WINAPI OLEFontImpl_get_Strikethrough( if (pstrikethrough==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pstrikethrough = this->description.fStrikethrough; @@ -928,7 +925,7 @@ static HRESULT WINAPI OLEFontImpl_get_Weight( if (pweight==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pweight = this->description.sWeight; @@ -964,7 +961,7 @@ static HRESULT WINAPI OLEFontImpl_get_Charset( if (pcharset==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pcharset = this->description.sCharset; @@ -999,7 +996,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont( if (phfont==NULL) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *phfont = this->gdiFont; TRACE("Returning %p\n", *phfont);

1 0

Huw Davies : gdi32: Use the dib driver GetImage and PutImage implementations in GetBitmapBits and SetBitmapBits when appropriate .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a55ec17b74a2a0608e63d16250712eb0f29c9309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55ec17b74a2a0608e63d1625… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:14 2011 +0100 gdi32: Use the dib driver GetImage and PutImage implementations in GetBitmapBits and SetBitmapBits when appropriate. --- dlls/gdi32/bitmap.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 33d3a53..e5008fb 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -463,8 +463,10 @@ 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 ); if (bmp->dib) dst_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); else dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -482,7 +484,7 @@ LONG WINAPI GetBitmapBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + if (!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 ); @@ -536,12 +538,15 @@ 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; @@ -611,7 +616,7 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = 0; info->bmiHeader.biHeight = 0; info->bmiHeader.biSizeImage = 0; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + err = funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); if (!err || err == ERROR_BAD_FORMAT) { @@ -620,7 +625,7 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); + err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0;

1 0

Huw Davies : gdi32: Avoid directly accessing the bits ptr where possible.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: de213f2c668224ee8fc8b943d806e548f9e921a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de213f2c668224ee8fc8b943d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:15 2011 +0100 gdi32: Avoid directly accessing the bits ptr where possible. --- dlls/gdi32/dibdrv/primitives.c | 42 ++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de213f2c668224ee8fc8b…

1 0

Huw Davies : gdi32: Simplify dibdrv_PutImage a little.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 2e908e067c6bf1f74fe7b768ca632f5f8c14d6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e908e067c6bf1f74fe7b768c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:16 2011 +0100 gdi32: Simplify dibdrv_PutImage a little. --- dlls/gdi32/dibdrv/dc.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9e996a0..2f93648 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -490,7 +490,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF DWORD ret; POINT origin; dib_info src_dib; - HRGN total_clip, saved_clip = NULL; + HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; const WINEREGION *clip_data; int i, rop2; @@ -518,6 +518,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF goto done; } dib = &stand_alone; + rop = SRCCOPY; } else { @@ -544,22 +545,18 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF origin.x = src->visrect.left; origin.y = src->visrect.top; - if (hbitmap) - { - total_clip = clip; - rop2 = R2_COPYPEN; - } - else + if (!hbitmap) { if (clip) saved_clip = add_extra_clipping_region( pdev, clip ); - total_clip = pdev->clip; - rop2 = ((rop >> 16) & 0xf) + 1; + clip = pdev->clip; } - if (total_clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); + rop2 = ((rop >> 16) & 0xf) + 1; + + if (clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); else { - clip_data = get_wine_region( total_clip ); + clip_data = get_wine_region( clip ); for (i = 0; i < clip_data->numRects; i++) { RECT clipped_rect; @@ -571,7 +568,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); } } - release_wine_region( total_clip ); + release_wine_region( clip ); } ret = ERROR_SUCCESS;

1 0

Huw Davies : gdi32: Use the gdi_image_bits structure to maintain the dib driver's bits.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 1e83fd0076c8c83240d5ecc0559fe828d27a52b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e83fd0076c8c83240d5ecc05… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:17 2011 +0100 gdi32: Use the gdi_image_bits structure to maintain the dib driver's bits. --- dlls/gdi32/dibdrv/dc.c | 33 ++++++++++++++++++--------------- dlls/gdi32/dibdrv/objects.c | 14 ++++++++++---- dlls/gdi32/dibdrv/primitives.c | 14 +++++++------- dlls/gdi32/gdi_private.h | 3 +-- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2f93648..64769be 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -69,13 +69,15 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static 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) { - dib->bit_count = bi->biBitCount; - dib->width = bi->biWidth; - dib->height = bi->biHeight; - dib->stride = get_dib_stride( dib->width, dib->bit_count ); - dib->bits = bits; - dib->ptr_to_free = NULL; - dib->flags = flags; + dib->bit_count = bi->biBitCount; + dib->width = bi->biWidth; + dib->height = bi->biHeight; + dib->stride = get_dib_stride( dib->width, dib->bit_count ); + dib->bits.ptr = bits; + dib->bits.is_copy = FALSE; + dib->bits.free = NULL; + dib->bits.param = NULL; + dib->flags = flags; if(dib->height < 0) /* top-down */ { @@ -84,7 +86,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD else /* bottom-up */ { /* bits always points to the top-left corner and the stride is -ve */ - dib->bits = (BYTE*)dib->bits + (dib->height - 1) * dib->stride; + dib->bits.ptr = (BYTE*)dib->bits.ptr + (dib->height - 1) * dib->stride; dib->stride = -dib->stride; } @@ -211,8 +213,9 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; - dib->bits = NULL; - dib->ptr_to_free = NULL; + dib->bits.ptr = NULL; + dib->bits.free = NULL; + dib->bits.param = NULL; } /********************************************************************** @@ -224,11 +227,9 @@ void free_dib_info(dib_info *dib) { if (dib->flags & private_color_table) HeapFree(GetProcessHeap(), 0, dib->color_table); - dib->color_table = NULL; - HeapFree(GetProcessHeap(), 0, dib->ptr_to_free); - dib->ptr_to_free = NULL; - dib->bits = NULL; + if (dib->bits.free) dib->bits.free( &dib->bits ); + clear_dib_info( dib ); } void copy_dib_color_info(dib_info *dst, const dib_info *src) @@ -423,7 +424,7 @@ static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, if (bits) { - bits->ptr = dib->bits; + bits->ptr = dib->bits.ptr; if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; bits->is_copy = FALSE; @@ -479,6 +480,7 @@ static inline BOOL rop_uses_pat(DWORD rop) return ((rop >> 4) & 0x0f0000) != (rop & 0x0f0000); } + /*********************************************************************** * dibdrv_PutImage */ @@ -541,6 +543,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF } init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); + src_dib.bits.is_copy = bits->is_copy; origin.x = src->visrect.left; origin.y = src->visrect.top; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 15ce72f..d96f4bd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1089,7 +1089,7 @@ void free_pattern_brush( dibdrv_physdev *pdev ) static BOOL create_pattern_brush_bits(dibdrv_physdev *pdev) { DWORD size = pdev->brush_dib.height * abs(pdev->brush_dib.stride); - DWORD *brush_bits = pdev->brush_dib.bits; + DWORD *brush_bits = pdev->brush_dib.bits.ptr; DWORD *and_bits, *xor_bits; assert(pdev->brush_and_bits == NULL); @@ -1161,7 +1161,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) hatch.bit_count = 1; hatch.height = hatch.width = 8; hatch.stride = 4; - hatch.bits = (void *) hatches[pdev->brush_hatch]; + hatch.bits.ptr = (void *) hatches[pdev->brush_hatch]; + hatch.bits.free = hatch.bits.param = NULL; + hatch.bits.is_copy = FALSE; fg_mask.and = pdev->brush_and; fg_mask.xor = pdev->brush_xor; @@ -1306,8 +1308,12 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) 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.ptr_to_free = HeapAlloc( GetProcessHeap(), 0, pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits = pdev->brush_dib.ptr_to_free; + + 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; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 7b3468b..c102f9c 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -29,37 +29,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y) { - return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4); + return (DWORD *)((BYTE*)dib->bits.ptr + y * dib->stride + x * 4); } static inline DWORD *get_pixel_ptr_24_dword(const dib_info *dib, int x, int y) { - return (DWORD *)((BYTE*)dib->bits + y * dib->stride) + x * 3 / 4; + return (DWORD *)((BYTE*)dib->bits.ptr + y * dib->stride) + x * 3 / 4; } static inline BYTE *get_pixel_ptr_24(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x * 3; + return (BYTE*)dib->bits.ptr + y * dib->stride + x * 3; } static inline WORD *get_pixel_ptr_16(const dib_info *dib, int x, int y) { - return (WORD *)((BYTE*)dib->bits + y * dib->stride + x * 2); + return (WORD *)((BYTE*)dib->bits.ptr + y * dib->stride + x * 2); } static inline BYTE *get_pixel_ptr_8(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x; + return (BYTE*)dib->bits.ptr + y * dib->stride + x; } static inline BYTE *get_pixel_ptr_4(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x / 2; + return (BYTE*)dib->bits.ptr + y * dib->stride + x / 2; } static inline BYTE *get_pixel_ptr_1(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x / 8; + return (BYTE*)dib->bits.ptr + y * dib->stride + x / 8; } static const BYTE pixel_masks_1[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e3cc3c..f3ba2cf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -83,8 +83,7 @@ typedef struct { int bit_count, width, height; int stride; /* stride in bytes. Will be -ve for bottom-up dibs (see bits). */ - void *bits; /* points to the top-left corner of the dib. */ - void *ptr_to_free; + struct gdi_image_bits bits; /* bits.ptr points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; int red_shift, green_shift, blue_shift;

1 0

Henri Verbeet : wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 18434ddc57c049e1f78d79471651d73d0dbc5f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18434ddc57c049e1f78d79471… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:57 2011 +0200 wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill(). And avoid a potential infinite recursion if wined3d_surface_blt() ends up calling cpu_blit_color_fill(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d7d65fb..087196c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7024,12 +7024,13 @@ release: static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { + static const RECT src_rect; WINEDDBLTFX BltFx; memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color); - return wined3d_surface_blt(dst_surface, dst_rect, NULL, NULL, + return surface_cpu_blt(dst_surface, dst_rect, NULL, &src_rect, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); }

1 0

Henri Verbeet : wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a887128ffddf4d44569cd8480387409533c95e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a887128ffddf4d44569cd8480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:58 2011 +0200 wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 087196c..9b02177 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,6 +6367,9 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: + if (dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET)))

1 0

Henri Verbeet : wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: d063ff55e7f3639e492e24b6dcef8e8489825569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d063ff55e7f3639e492e24b6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:59 2011 +0200 wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 165 ++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 83 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9b02177..62828e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1210,6 +1210,73 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } +/* This function checks if the primary render target uses the 8bit paletted format. */ +static BOOL primary_render_target_is_p8(const struct wined3d_device *device) +{ + if (device->fb.render_targets && device->fb.render_targets[0]) + { + const struct wined3d_surface *render_target = device->fb.render_targets[0]; + if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) + return TRUE; + } + return FALSE; +} + +static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, + DWORD color, WINED3DCOLORVALUE *float_color) +{ + const struct wined3d_format *format = surface->resource.format; + const struct wined3d_device *device = surface->resource.device; + + switch (format->id) + { + case WINED3DFMT_P8_UINT: + if (surface->palette) + { + float_color->r = surface->palette->palents[color].peRed / 255.0f; + float_color->g = surface->palette->palents[color].peGreen / 255.0f; + float_color->b = surface->palette->palents[color].peBlue / 255.0f; + } + else + { + float_color->r = 0.0f; + float_color->g = 0.0f; + float_color->b = 0.0f; + } + float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + break; + + case WINED3DFMT_B5G6R5_UNORM: + float_color->r = ((color >> 11) & 0x1f) / 31.0f; + float_color->g = ((color >> 5) & 0x3f) / 63.0f; + float_color->b = (color & 0x1f) / 31.0f; + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8A8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = D3DCOLOR_A(color); + break; + + default: + ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); + return FALSE; + } + + return TRUE; +} + static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format; @@ -1464,6 +1531,21 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } } + else + { + if (flags & WINEDDBLT_COLORFILL) + { + WINED3DCOLORVALUE color; + + TRACE("Color fill.\n"); + + if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + goto fallback; + + if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) + return WINED3D_OK; + } + } fallback: @@ -2029,19 +2111,6 @@ void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info } } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; -} - /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -2523,60 +2592,6 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *d } } -static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, - DWORD color, WINED3DCOLORVALUE *float_color) -{ - const struct wined3d_format *format = surface->resource.format; - const struct wined3d_device *device = surface->resource.device; - - switch (format->id) - { - case WINED3DFMT_P8_UINT: - if (surface->palette) - { - float_color->r = surface->palette->palents[color].peRed / 255.0f; - float_color->g = surface->palette->palents[color].peGreen / 255.0f; - float_color->b = surface->palette->palents[color].peBlue / 255.0f; - } - else - { - float_color->r = 0.0f; - float_color->g = 0.0f; - float_color->b = 0.0f; - } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; - - default: - ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); - return FALSE; - } - - return TRUE; -} - HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -5552,22 +5567,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3D_OK; } - else - { - /* Source-Less Blit to render target */ - if (flags & WINEDDBLT_COLORFILL) - { - WINED3DCOLORVALUE color; - - TRACE("Colorfill\n"); - - /* The color as given in the Blt function is in the surface format. */ - if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) - return WINED3DERR_INVALIDCALL; - - return surface_color_fill(dst_surface, dst_rect, &color); - } - } /* Default: Fall back to the generic blt. Not an error, a TRACE is enough */ TRACE("Didn't find any usable render target setup for hw blit, falling back to software\n");

1 0

Henri Verbeet : wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a04f0e9c789295c22aab6e0d3b3239d0c794b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04f0e9c789295c22aab6e0d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:35:00 2011 +0200 wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 293 +++++++++++++++++++++++------------------------- 1 files changed, 140 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04f0e9c789295c22aab6…

1 0