December 2012 - Wine-Commits

Vincent Povirk : gdiplus: Avoid accessing dib bits directly in GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 04412f7a74fb2a915584de080dab9190f0edc414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04412f7a74fb2a915584de080… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 5 10:36:40 2012 -0600 gdiplus: Avoid accessing dib bits directly in GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/image.c | 80 +++++++++++++++++++++---------------------------- 1 files changed, 34 insertions(+), 46 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73f08b9..a8f43e3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4694,62 +4694,50 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi format, &lockeddata); if (retval == Ok) { - if (bm.bmBits) - { - for (y=0; y<bm.bmHeight; y++) - { - memcpy((BYTE*)lockeddata.Scan0+lockeddata.Stride*y, - (BYTE*)bm.bmBits+bm.bmWidthBytes*(bm.bmHeight-1-y), - bm.bmWidthBytes); - } - } - else - { - HDC hdc; - HBITMAP oldhbm; - BITMAPINFO *pbmi; - INT src_height, dst_stride; - BYTE *dst_bits; + HDC hdc; + HBITMAP oldhbm; + BITMAPINFO *pbmi; + INT src_height, dst_stride; + BYTE *dst_bits; - hdc = CreateCompatibleDC(NULL); - oldhbm = SelectObject(hdc, hbm); + hdc = CreateCompatibleDC(NULL); + oldhbm = SelectObject(hdc, hbm); - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (pbmi) - { - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = 0; - - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - - src_height = abs(pbmi->bmiHeader.biHeight); + if (pbmi) + { + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; - if (pbmi->bmiHeader.biHeight > 0) - { - dst_bits = (BYTE*)lockeddata.Scan0+lockeddata.Stride*(src_height-1); - dst_stride = -lockeddata.Stride; - } - else - { - dst_bits = lockeddata.Scan0; - dst_stride = lockeddata.Stride; - } + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - for (y=0; y<src_height; y++) - { - GetDIBits(hdc, hbm, y, 1, dst_bits+dst_stride*y, - pbmi, DIB_RGB_COLORS); - } + src_height = abs(pbmi->bmiHeader.biHeight); - GdipFree(pbmi); + if (pbmi->bmiHeader.biHeight > 0) + { + dst_bits = (BYTE*)lockeddata.Scan0+lockeddata.Stride*(src_height-1); + dst_stride = -lockeddata.Stride; } else - retval = OutOfMemory; + { + dst_bits = lockeddata.Scan0; + dst_stride = lockeddata.Stride; + } + + for (y=0; y<src_height; y++) + { + GetDIBits(hdc, hbm, y, 1, dst_bits+dst_stride*y, + pbmi, DIB_RGB_COLORS); + } - SelectObject(hdc, oldhbm); - DeleteDC(hdc); + GdipFree(pbmi); } + else + retval = OutOfMemory; + + SelectObject(hdc, oldhbm); + DeleteDC(hdc); GdipBitmapUnlockBits(*bitmap, &lockeddata); }

1 0

Henri Verbeet : ddraw: Avoid LPDDSCAPS2.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 338e4593ac87ee50eca8628e7592fc62e564b80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=338e4593ac87ee50eca8628e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 5 21:01:44 2012 +0100 ddraw: Avoid LPDDSCAPS2. --- include/ddraw.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index ec4b850..7e96762 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1657,7 +1657,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS2 *caps, DWORD *total, DWORD *free) PURE; /* added in v4 */ /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface4 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; @@ -1773,7 +1773,7 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS2 *caps, DWORD *total, DWORD *free) PURE; /* added in v4 */ /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface7 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; @@ -2315,7 +2315,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface4 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface4 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; @@ -2482,7 +2482,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface7 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface7 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;

1 0

Alexandre Julliard : gdi32: Don' t store a font pointer in the generic part of the DC.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 8cca615f0200df17ab71199590db1194bfeade86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cca615f0200df17ab7119959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:13:54 2012 +0100 gdi32: Don't store a font pointer in the generic part of the DC. --- dlls/gdi32/dc.c | 1 - dlls/gdi32/freetype.c | 4 ++-- dlls/gdi32/gdi_private.h | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5df55bc..07d68eb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -409,7 +409,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) newdc->vportExtY = dc->vportExtY; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; - newdc->gdiFont = dc->gdiFont; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a06d575..456a094 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -309,6 +309,8 @@ typedef struct tagHFONTLIST { HFONT hfont; } HFONTLIST; +typedef struct tagGdiFont GdiFont; + typedef struct { struct list entry; Face *face; @@ -4552,7 +4554,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (!hfont) /* notification that the font has been changed by another driver */ { - dc->gdiFont = NULL; physdev->font = NULL; release_dc_ptr( dc ); return 0; @@ -5010,7 +5011,6 @@ done: } } TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); - dc->gdiFont = ret; physdev->font = ret; } LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2408c97..8288e35 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,8 +57,6 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -typedef struct tagGdiFont GdiFont; - typedef struct tagDC { HDC hSelf; /* Handle to this DC */ @@ -103,7 +101,6 @@ typedef struct tagDC HBITMAP hBitmap; HPALETTE hPalette; - GdiFont *gdiFont; struct gdi_path *path; UINT font_code_page;

1 0

Alexandre Julliard : gdi32: Don' t create a separate font handle for linked fonts.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: baedf81b11d2321a0c1ca903d89bfcd762226dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=baedf81b11d2321a0c1ca903d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:13:29 2012 +0100 gdi32: Don't create a separate font handle for linked fonts. --- dlls/gdi32/freetype.c | 44 +------------------------------------------- 1 files changed, 1 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f9db1d7..a06d575 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -374,7 +374,6 @@ struct enum_charset_list { static struct list gdi_font_list = LIST_INIT(gdi_font_list); static struct list unused_gdi_font_list = LIST_INIT(unused_gdi_font_list); #define UNUSED_CACHE_SIZE 10 -static struct list child_font_list = LIST_INIT(child_font_list); static struct list system_links = LIST_INIT(system_links); static struct list font_subst_list = LIST_INIT(font_subst_list); @@ -4058,7 +4057,6 @@ static void free_font(GdiFont *font) LIST_FOR_EACH_SAFE(cursor, cursor2, &font->hfontlist) { HFONTLIST *hfontlist = LIST_ENTRY(cursor, HFONTLIST, entry); - DeleteObject(hfontlist->hfont); list_remove(&hfontlist->entry); HeapFree(GetProcessHeap(), 0, hfontlist); } @@ -4288,19 +4286,6 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); - /* try the child list */ - LIST_FOR_EACH(font_elem_ptr, &child_font_list) { - ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); - if(!fontcmp(ret, &fd)) { - if(!can_use_bitmap && !FT_IS_SCALABLE(ret->ft_face)) continue; - LIST_FOR_EACH(hfontlist_elem_ptr, &ret->hfontlist) { - hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); - if(hflist->hfont == hfont) - return ret; - } - } - } - /* try the in-use list */ LIST_FOR_EACH(font_elem_ptr, &gdi_font_list) { ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); @@ -5051,13 +5036,6 @@ static void dump_gdi_font_list(void) TRACE("gdiFont=%p %s %d\n", gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); } - - TRACE("---------- Child gdiFont Cache ----------\n"); - LIST_FOR_EACH(elem_ptr, &child_font_list) { - gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry); - TRACE("gdiFont=%p %s %d\n", - gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); - } } /************************************************************* @@ -5077,21 +5055,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - LIST_FOR_EACH_ENTRY(gdiFont, &child_font_list, struct tagGdiFont, entry) - { - hfontlist_elem_ptr = list_head(&gdiFont->hfontlist); - while(hfontlist_elem_ptr) { - hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); - hfontlist_elem_ptr = list_next(&gdiFont->hfontlist, hfontlist_elem_ptr); - if(hflist->hfont == handle) { - TRACE("removing child font %p from child list\n", gdiFont); - list_remove(&gdiFont->entry); - LeaveCriticalSection( &freetype_cs ); - return TRUE; - } - } - } - TRACE("destroying hfont=%p\n", handle); if(TRACE_ON(font)) dump_gdi_font_list(); @@ -7128,7 +7091,6 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) { - HFONTLIST *hfontlist; child->font = alloc_font(); child->font->ft_face = OpenFontFace(child->font, child->face, 0, -font->ppem); if(!child->font->ft_face) @@ -7142,13 +7104,9 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) child->font->ntmFlags = child->face->ntmFlags; child->font->orientation = font->orientation; child->font->scale_y = font->scale_y; - hfontlist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hfontlist)); - hfontlist->hfont = CreateFontIndirectW(&font->font_desc.lf); child->font->name = strdupW(child->face->family->FamilyName); - list_add_head(&child->font->hfontlist, &hfontlist->entry); child->font->base_font = font; - list_add_head(&child_font_list, &child->font->entry); - TRACE("created child font hfont %p for base %p child %p\n", hfontlist->hfont, font, child->font); + TRACE("created child font %p for base %p\n", child->font, font); return TRUE; }

1 0

Andrew Talbot : comctl32: Remove unneeded address-of operators from array names.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: da715453194c7295bf2d7d1460f870e6bd8a42b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da715453194c7295bf2d7d146… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 22:42:28 2012 +0000 comctl32: Remove unneeded address-of operators from array names. --- dlls/comctl32/datetime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d36032f..748e0fc 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -178,7 +178,7 @@ static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYST (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; - limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM)range); if (limits & GDTR_MAX) { @@ -585,7 +585,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) } /* Ensure time is within bounds */ - limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM)range); min = delta < 0; if (limits & (min ? GDTR_MIN : GDTR_MAX))

1 0

Vincent Povirk : gdiplus: Fix graphics bounds for memory DC's.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: ba4ef584d70e05a765a5a8cffc95ce0d04c34859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4ef584d70e05a765a5a8cff… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 5 14:11:25 2012 -0600 gdiplus: Fix graphics bounds for memory DC's. --- dlls/gdiplus/graphics.c | 19 +++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 8 ++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4474db6..8cec80d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2113,6 +2113,25 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) stat = GdipGetImageBounds(graphics->image, rect, &unit); if (stat == Ok && unit != UnitPixel) FIXME("need to convert from unit %i\n", unit); + }else if (GetObjectType(graphics->hdc) == OBJ_MEMDC){ + HBITMAP hbmp; + BITMAP bmp; + + rect->X = 0; + rect->Y = 0; + + hbmp = GetCurrentObject(graphics->hdc, OBJ_BITMAP); + if (hbmp && GetObjectW(hbmp, sizeof(bmp), &bmp)) + { + rect->Width = bmp.bmWidth; + rect->Height = bmp.bmHeight; + } + else + { + /* FIXME: ??? */ + rect->Width = 1; + rect->Height = 1; + } }else{ rect->X = 0; rect->Y = 0; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f4e7ffa..42612dd 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4091,6 +4091,7 @@ static void test_alpha_hdc(void) GpGraphics *graphics; ULONG *bits; BITMAPINFO bmi; + GpRectF bounds; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4110,6 +4111,13 @@ static void test_alpha_hdc(void) status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); + status = GdipGetVisibleClipBounds(graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(5.0, bounds.Width); + expectf(5.0, bounds.Height); + bits[0] = 0xdeadbeef; status = GdipGraphicsClear(graphics, 0xffaaaaaa);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSSetSamplers().
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: e5805c316c4ed105528ec508ef4c624bc2060795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5805c316c4ed105528ec508e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 5 21:01:47 2012 +0100 d3d10core: Implement d3d10_device_VSSetSamplers(). --- dlls/d3d10core/d3d10core_private.h | 3 + dlls/d3d10core/device.c | 13 +++++- dlls/d3d10core/state.c | 18 ++++++++ dlls/wined3d/Makefile.in | 1 + dlls/wined3d/device.c | 21 +++++++++ dlls/wined3d/sampler.c | 79 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 10 +++++ dlls/wined3d/wined3d.spec | 6 +++ dlls/wined3d/wined3d_private.h | 8 ++++ include/wine/wined3d.h | 7 +++ 10 files changed, 165 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5805c316c4ed105528ec…

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 49e6d411b07c922a0324026c05bc03e4ad6c80f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e6d411b07c922a0324026c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:53:15 2012 +0100 qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface. --- dlls/qmgr/enum_files.c | 84 +++++++++++++++++++++++++----------------------- dlls/qmgr/qmgr.h | 10 ------ 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index d7f36cd..05659cf 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +typedef struct +{ + IEnumBackgroundCopyFiles IEnumBackgroundCopyFiles_iface; + LONG ref; + IBackgroundCopyFile **files; + ULONG numFiles; + ULONG indexFiles; +} EnumBackgroundCopyFilesImpl; + static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) { ULONG i; @@ -34,37 +43,39 @@ static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef( - IEnumBackgroundCopyFiles* iface) +static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - return InterlockedIncrement(&This->ref); + return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface( - IEnumBackgroundCopyFiles* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface(IEnumBackgroundCopyFiles *iface, + REFIID riid, void **ppv) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyFiles_AddRef(iface); + *ppv = iface; + IEnumBackgroundCopyFiles_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( - IEnumBackgroundCopyFiles* iface) +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -74,13 +85,10 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( } /* Return reference to one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( - IEnumBackgroundCopyFiles* iface, - ULONG celt, - IBackgroundCopyFile **rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next(IEnumBackgroundCopyFiles *iface, + ULONG celt, IBackgroundCopyFile **rgelt, ULONG *pceltFetched) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG fetched; ULONG i; IBackgroundCopyFile *file; @@ -115,11 +123,10 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( } /* Skip over one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( - IEnumBackgroundCopyFiles* iface, - ULONG celt) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip(IEnumBackgroundCopyFiles *iface, + ULONG celt) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); if (celt > This->numFiles - This->indexFiles) { @@ -131,27 +138,24 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( - IEnumBackgroundCopyFiles* iface) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); This->indexFiles = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( - IEnumBackgroundCopyFiles* iface, - IEnumBackgroundCopyFiles **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone(IEnumBackgroundCopyFiles *iface, + IEnumBackgroundCopyFiles **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( - IEnumBackgroundCopyFiles* iface, - ULONG *puCount) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount(IEnumBackgroundCopyFiles *iface, + ULONG *puCount) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); *puCount = This->numFiles; return S_OK; } @@ -181,7 +185,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; + This->IEnumBackgroundCopyFiles_iface.lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; This->ref = 1; /* Create array of files */ @@ -210,6 +214,6 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i } LeaveCriticalSection(&job->cs); - *ppObj = &This->lpVtbl; + *ppObj = &This->IEnumBackgroundCopyFiles_iface; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 4bd1e34..93fcd0e 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -46,16 +46,6 @@ typedef struct struct list entryFromQmgr; } BackgroundCopyJobImpl; -/* Enum background copy files vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyFilesVtbl *lpVtbl; - LONG ref; - IBackgroundCopyFile **files; - ULONG numFiles; - ULONG indexFiles; -} EnumBackgroundCopyFilesImpl; - /* Background copy file vtbl and related data */ typedef struct {

1 0

Andrew Talbot : gdiplus: Remove unneeded address-of operator from array name.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: e4351708d5579d6590e4e5a384b9cdb2073b48f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4351708d5579d6590e4e5a38… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 22:42:32 2012 +0000 gdiplus: Remove unneeded address-of operator from array name. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8cec80d..e5678a7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -465,7 +465,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst GetRegionData(hrgn, size, rgndata); - rects = (RECT*)&rgndata->Buffer; + rects = (RECT*)rgndata->Buffer; for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) {

1 0

Vincent Povirk : gdiplus: Always use AlphaBlend to draw to 32-bit DIB's.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 81d9ffa041129a9394e05ccdb564d7149884135b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d9ffa041129a9394e05ccdb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 5 13:15:25 2012 -0600 gdiplus: Always use AlphaBlend to draw to 32-bit DIB's. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 19 ++++++++++++++----- dlls/gdiplus/tests/graphics.c | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4a8b10a..cb7330e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -152,6 +152,7 @@ struct GpGraphics{ HDC hdc; HWND hwnd; BOOL owndc; + BOOL alpha_hdc; GpImage *image; SmoothingMode smoothing; CompositingQuality compqual; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 247b17d..4474db6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2250,6 +2250,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics) { GpStatus retval; + HBITMAP hbitmap; + DIBSECTION dib; TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); @@ -2274,6 +2276,13 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra return retval; } + hbitmap = GetCurrentObject(hdc, OBJ_BITMAP); + if (hbitmap && GetObjectW(hbitmap, sizeof(dib), &dib) == sizeof(dib) && + dib.dsBmih.biBitCount == 32 && dib.dsBmih.biCompression == BI_RGB) + { + (*graphics)->alpha_hdc = 1; + } + (*graphics)->hdc = hdc; (*graphics)->hwnd = WindowFromDC(hdc); (*graphics)->owndc = FALSE; @@ -3157,7 +3166,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image graphics->scale, image->xres, image->yres, bitmap->format, imageAttributes ? imageAttributes->outside_color : 0); - if (imageAttributes || + if (imageAttributes || graphics->alpha_hdc || (graphics->image && graphics->image->type == ImageTypeBitmap) || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || @@ -4021,7 +4030,7 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(graphics->busy) return ObjectBusy; - if (!graphics->image) + if (!graphics->image && !graphics->alpha_hdc) stat = GDI32_GdipFillPath(graphics, brush, path); if (stat == NotImplemented) @@ -4359,7 +4368,7 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if(graphics->busy) return ObjectBusy; - if (!graphics->image) + if (!graphics->image && !graphics->alpha_hdc) stat = GDI32_GdipFillRegion(graphics, brush, region); if (stat == NotImplemented) @@ -5982,7 +5991,7 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } - else if (!graphics->hdc || + else if (!graphics->hdc || graphics->alpha_hdc || (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { /* Create a fake HDC and fill it with a constant color. */ @@ -6626,7 +6635,7 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, if (length == -1) length = strlenW(text); - if (graphics->hdc && + if (graphics->hdc && !graphics->alpha_hdc && ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 553e77f..f4e7ffa 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4115,7 +4115,7 @@ static void test_alpha_hdc(void) status = GdipGraphicsClear(graphics, 0xffaaaaaa); expect(Ok, status); - todo_wine expect(0xffaaaaaa, bits[0]); + expect(0xffaaaaaa, bits[0]); SelectObject(hdc, old_hbm);

1 0