March 2015 - Wine-Commits - list.winehq.org

Huw Davies : ole32: Read the class id from the top-level storage object.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: c5e020c5b5c0218a146d11cd5fba5aadb6f380cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e020c5b5c0218a146d11cd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:33 2015 +0000 ole32: Read the class id from the top-level storage object. The cache_entries' storages are just references to the same object anyway. --- dlls/ole32/datacache.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2aae536..d9754a3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1182,34 +1182,28 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( /************************************************************************ * DataCache_GetClassID (IPersistStorage) * - * The data cache doesn't implement this method. */ -static HRESULT WINAPI DataCache_GetClassID( - IPersistStorage* iface, - CLSID* pClassID) +static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { - DataCache *This = impl_from_IPersistStorage(iface); - DataCacheEntry *cache_entry; + DataCache *This = impl_from_IPersistStorage( iface ); + HRESULT hr; + STATSTG statstg; - TRACE("(%p, %p)\n", iface, pClassID); + TRACE( "(%p, %p)\n", iface, clsid ); - LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) - { - if (cache_entry->storage != NULL) + if (This->presentationStorage) { - STATSTG statstg; - HRESULT hr = IStorage_Stat(cache_entry->storage, &statstg, STATFLAG_NONAME); - if (SUCCEEDED(hr)) - { - *pClassID = statstg.clsid; - return S_OK; - } + hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); + if (SUCCEEDED(hr)) + { + *clsid = statstg.clsid; + return S_OK; + } } - } - *pClassID = CLSID_NULL; + *clsid = CLSID_NULL; - return S_OK; + return S_OK; } /************************************************************************

1 0

Huw Davies : ole32: Add support for drawing the dib format.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: b4cd2c4dbb68e181d6124ef75329eac715a3977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cd2c4dbb68e181d6124ef75… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:40 2015 +0000 ole32: Add support for drawing the dib format. --- dlls/ole32/datacache.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ff15d91..35b27de 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1646,6 +1646,26 @@ static HRESULT WINAPI DataCache_Draw( return S_OK; } + case CF_DIB: + { + BITMAPFILEHEADER *file_head; + BITMAPINFO *info; + BYTE *bits; + + if ((cache_entry->stgmedium.tymed != TYMED_HGLOBAL) || + !((file_head = GlobalLock( cache_entry->stgmedium.u.hGlobal )))) + continue; + + info = (BITMAPINFO *)(file_head + 1); + bits = (BYTE *) file_head + file_head->bfOffBits; + StretchDIBits( hdcDraw, lprcBounds->left, lprcBounds->top, + lprcBounds->right - lprcBounds->left, lprcBounds->bottom - lprcBounds->top, + 0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight, + bits, info, DIB_RGB_COLORS, SRCCOPY ); + + GlobalUnlock( cache_entry->stgmedium.u.hGlobal ); + return S_OK; + } } }

1 0

Nikolay Sivov : taskmgr: Simplify setting extended style for a list.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 66722487a7d3755d7facaff53283ee4a5634b00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66722487a7d3755d7facaff53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 10:06:59 2015 +0300 taskmgr: Simplify setting extended style for a list. --- programs/taskmgr/procpage.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 3161399..1b0aacd 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -445,7 +445,6 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int nXDifference; int nYDifference; int cx, cy; - DWORD extended_styles; switch (message) { case WM_INITDIALOG: @@ -467,11 +466,9 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hProcessPageEndProcessButton = GetDlgItem(hDlg, IDC_ENDPROCESS); hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); - /* - * Set the extended window styles for the list control - */ - extended_styles = SendMessageW(hProcessPageListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - SendMessageW(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, extended_styles | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + /* Enable manual column reordering, set full select */ + SendMessageW(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP, + LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP); AddColumns();

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_GetTextRenderingParams().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 063080f747375bbb6df6afb46a2a6938efbbf825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063080f747375bbb6df6afb46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:28 2015 +0100 d2d1: Implement d2d_state_block_GetTextRenderingParams(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/state_block.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 42694d2..89d2377 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -174,6 +174,8 @@ struct d2d_state_block { ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + + IDWriteRenderingParams *text_rendering_params; }; void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 4aa8cd4..62458fb 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -65,7 +65,11 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + if (state_block->text_rendering_params) + IDWriteRenderingParams_Release(state_block->text_rendering_params); HeapFree(GetProcessHeap(), 0, state_block); + } return refcount; } @@ -98,7 +102,12 @@ static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1Drawin static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface, IDWriteRenderingParams **text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if ((*text_rendering_params = state_block->text_rendering_params)) + IDWriteRenderingParams_AddRef(*text_rendering_params); } static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = @@ -120,4 +129,9 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; + if (text_rendering_params) + { + state_block->text_rendering_params = text_rendering_params; + IDWriteRenderingParams_AddRef(state_block->text_rendering_params); + } }

1 0

Huw Davies : ole32: Add support for loading dibs.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: bbba2c00aaaf478bce1b42aecc2aa6b5fda0ab79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbba2c00aaaf478bce1b42aec… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:38 2015 +0000 ole32: Add support for loading dibs. --- dlls/ole32/datacache.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a2b7e57..36c02dd 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -581,6 +581,43 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) return hr; } +static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + void *dib; + HGLOBAL hglobal; + ULONG read; + + if (cache_entry->stream_type != contents_stream) + { + FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + return E_FAIL; + } + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + hglobal = GlobalAlloc( GMEM_MOVEABLE, stat.cbSize.u.LowPart ); + if (!hglobal) return E_OUTOFMEMORY; + dib = GlobalLock( hglobal ); + + hr = IStream_Read( stm, dib, stat.cbSize.u.LowPart, &read ); + GlobalUnlock( hglobal ); + + if (hr != S_OK || read != stat.cbSize.u.LowPart) + { + GlobalFree( hglobal ); + return E_FAIL; + } + + cache_entry->data_cf = cache_entry->fmtetc.cfFormat; + cache_entry->stgmedium.tymed = TYMED_HGLOBAL; + cache_entry->stgmedium.u.hGlobal = hglobal; + + return S_OK; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -608,6 +645,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) hr = load_mf_pict( cache_entry, stm ); break; + case CF_DIB: + hr = load_dib( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL;

1 0

Nikolay Sivov : comctl32/tests: Listview doesn't subclass its header.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 59cb4ff6f3fe167d8fa78811bec7c787881bb1d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cb4ff6f3fe167d8fa78811b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 08:51:51 2015 +0300 comctl32/tests: Listview doesn't subclass its header. --- dlls/comctl32/tests/listview.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3d439df..8ce1cfe 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5644,6 +5644,30 @@ static void test_insertitem(void) DestroyWindow(hwnd); } +static void test_header_proc(void) +{ + HWND hwnd, header, hdr; + WNDPROC proc1, proc2; + + hwnd = create_listview_control(LVS_REPORT); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header != NULL, "got %p\n", header); + + hdr = CreateWindowExA(0, WC_HEADERA, NULL, + WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, + 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + ok(hdr != NULL, "got %p\n", hdr); + + proc1 = (WNDPROC)GetWindowLongPtrW(header, GWLP_WNDPROC); + proc2 = (WNDPROC)GetWindowLongPtrW(hdr, GWLP_WNDPROC); + ok(proc1 == proc2, "got %p, expected %p\n", proc1, proc2); + + DestroyWindow(hdr); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5712,6 +5736,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_header_proc(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5729,6 +5754,7 @@ START_TEST(listview) test_deleteitem(); test_multiselect(); test_insertitem(); + test_header_proc(); unload_v6_module(ctx_cookie, hCtx);

1 0

Huw Davies : ole32: Add support for parsing the 'CONTENTS' stream.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 480c10cce994ee1cae89c2fdf9921d0d0e1e4a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=480c10cce994ee1cae89c2fdf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:36 2015 +0000 ole32: Add support for parsing the 'CONTENTS' stream. --- dlls/ole32/datacache.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 53defc1..f791f80 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -92,6 +92,7 @@ enum stream_type { no_stream, pres_stream, + contents_stream }; typedef struct DataCacheEntry @@ -1293,6 +1294,26 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) return S_OK; } +static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + +static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + const FORMATETC *fmt; + + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) + fmt = &static_dib_fmt; + else + return E_FAIL; + + return add_cache_entry( This, fmt, stm, contents_stream ); +} + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; /************************************************************************ * DataCache_Load (IPersistStorage) @@ -1306,12 +1327,21 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) { DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; + IStream *stm; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); - hr = parse_pres_streams( This, pStg ); + hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, + 0, &stm ); + if (SUCCEEDED( hr )) + { + hr = parse_contents_stream( This, pStg, stm ); + IStream_Release( stm ); + } + else + hr = parse_pres_streams( This, pStg ); if (SUCCEEDED( hr )) {

1 0

Henri Verbeet : d2d1: Properly take the source offset into account in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: f87b0ce4d77fb99c74e16935b1d2ed7d218860f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87b0ce4d77fb99c74e16935b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:27 2015 +0100 d2d1: Properly take the source offset into account in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f109849..83b4dab 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -752,10 +752,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = d.left; + brush_desc.transform._31 = d.left - s.left; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); - brush_desc.transform._32 = d.top; + brush_desc.transform._32 = d.top - s.top; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Vincent Povirk : gdiplus: Fix blend_colors when alpha channel differs.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 9c579023f0750539bdf7815f8545c4620540387a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c579023f0750539bdf7815f8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 24 12:50:18 2015 -0500 gdiplus: Fix blend_colors when alpha channel differs. When picking a color halfway between 100% white (0xffffffff) and fully transparent (0x00000000), the result was 50% opaque 50% grey (0x80808080) when it should really be 50% opaque white (0x80ffffff). This had a tendency to create grey fringes on things. The fix is to weight the non-alpha components based on how much they contribute to the final alpha value. --- dlls/gdiplus/graphics.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ae530a9..580390f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -521,20 +521,22 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, static ARGB blend_colors(ARGB start, ARGB end, REAL position) { - ARGB result=0; - ARGB i; - INT a1, a2, a3; + INT start_a, end_a, final_a; + INT pos; - a1 = (start >> 24) & 0xff; - a2 = (end >> 24) & 0xff; + pos = gdip_round(position * 0xff); - a3 = (int)(a1*(1.0f - position)+a2*(position)); + start_a = ((start >> 24) & 0xff) * (pos ^ 0xff); + end_a = ((end >> 24) & 0xff) * pos; - result |= a3 << 24; + final_a = start_a + end_a; - for (i=0xff; i<=0xff0000; i = i << 8) - result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; - return result; + if (final_a < 0xff) return 0; + + return (final_a / 0xff) << 24 | + ((((start >> 16) & 0xff) * start_a + (((end >> 16) & 0xff) * end_a)) / final_a) << 16 | + ((((start >> 8) & 0xff) * start_a + (((end >> 8) & 0xff) * end_a)) / final_a) << 8 | + (((start & 0xff) * start_a + ((end & 0xff) * end_a)) / final_a); } static ARGB blend_line_gradient(GpLineGradient* brush, REAL position)

1 0

Nikolay Sivov : comctl32: Claim success in InitializeFlatSB().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 524f6860d40c9564fba62357288fdfa31389882c URL: http://source.winehq.org/git/wine.git/?a=commit;h=524f6860d40c9564fba623572… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 00:07:06 2015 +0300 comctl32: Claim success in InitializeFlatSB(). --- dlls/comctl32/flatsb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 174e22d..66e25c3 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -63,7 +63,7 @@ typedef struct BOOL WINAPI InitializeFlatSB(HWND hwnd) { TRACE("[%p]\n", hwnd); - return FALSE; + return TRUE; } /***********************************************************************

1 0