April 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : dmime/tests: Fix some failures on Win2k VMs.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 494c67402849566e425231eb7912a90cc8fed370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494c67402849566e425231eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:45:00 2015 +0300 dmime/tests: Fix some failures on Win2k VMs. --- dlls/dmime/tests/dmime.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f833a10..18586fd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,9 +421,10 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), - "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); @@ -452,9 +453,10 @@ static void test_segment(void) hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), - "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps);

1 0

Nikolay Sivov : dmime: No need to allocate description separately for IDirectMusicGraph.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: b508c85c666932a31d866049e92e364e06cad30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b508c85c666932a31d866049e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:53:47 2015 +0300 dmime: No need to allocate description separately for IDirectMusicGraph. --- dlls/dmime/graph.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index a784007..9e9c2fb 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -29,7 +29,7 @@ struct IDirectMusicGraphImpl { LONG ref; /* IDirectMusicGraphImpl fields */ - LPDMUS_OBJECTDESC pDesc; + DMUS_OBJECTDESC desc; WORD num_tools; struct list Tools; }; @@ -218,8 +218,7 @@ static HRESULT WINAPI DirectMusicObject_GetDescriptor(IDirectMusicObject *iface, { IDirectMusicGraphImpl *This = impl_from_IDirectMusicObject(iface); TRACE("(%p, %p)\n", This, desc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ - memcpy(desc, This->pDesc, This->pDesc->dwSize); + *desc = This->desc; return S_OK; } @@ -231,31 +230,31 @@ static HRESULT WINAPI DirectMusicObject_SetDescriptor(IDirectMusicObject *iface, /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - This->pDesc->guidObject = pDesc->guidObject; + This->desc.guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + This->desc.guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) - lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); + lstrcpynW (This->desc.wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - lstrcpynW (This->pDesc->wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); + lstrcpynW (This->desc.wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); + lstrcpynW (This->desc.wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - This->pDesc->vVersion = pDesc->vVersion; + This->desc.vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - This->pDesc->ftDate = pDesc->ftDate; + This->desc.ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - This->pDesc->llMemLength = pDesc->llMemLength; - memcpy(This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); + This->desc.llMemLength = pDesc->llMemLength; + memcpy(This->desc.pbMemData, pDesc->pbMemData, pDesc->llMemLength); } /* according to MSDN, we copy the stream */ if (pDesc->dwValidData & DMUS_OBJ_STREAM) - IStream_Clone(pDesc->pStream, &This->pDesc->pStream); + IStream_Clone(pDesc->pStream, &This->desc.pStream); /* add new flags */ - This->pDesc->dwValidData |= pDesc->dwValidData; + This->desc.dwValidData |= pDesc->dwValidData; return S_OK; } @@ -479,20 +478,20 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -514,8 +513,8 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -639,10 +638,9 @@ HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) obj->IDirectMusicGraph_iface.lpVtbl = &DirectMusicGraphVtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicObjectVtbl; obj->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; - obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(obj->pDesc); - obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicGraph; + DM_STRUCT_INIT(&obj->desc); + obj->desc.dwValidData |= DMUS_OBJ_CLASS; + obj->desc.guidClass = CLSID_DirectMusicGraph; obj->ref = 1; list_init(&obj->Tools);

1 0

Alexandre Julliard : server: Return a valid position also in posted messages.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 247275aec3ca9fbc8aa8b554319610ba57bb4f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247275aec3ca9fbc8aa8b5543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 17:24:15 2015 +0900 server: Return a valid position also in posted messages. --- dlls/user32/message.c | 14 ++++------ dlls/user32/tests/win.c | 12 ++++---- include/wine/server_protocol.h | 6 ++-- server/protocol.def | 4 +-- server/queue.c | 63 ++++++++++++++++++++++++++++-------------- server/request.h | 10 ++++--- server/trace.c | 2 ++ 7 files changed, 67 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=247275aec3ca9fbc8aa8b…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetInterpolationMode().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 1014d9a105609c9c3c6cdf4b5bee76e69b24efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1014d9a105609c9c3c6cdf4b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetInterpolationMode(). --- dlls/d2d1/brush.c | 68 ++++++++++++++++++++++++++++++------------------ dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9e45e1a..c15945a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -499,7 +499,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) if (!refcount) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + if (brush->u.bitmap.sampler_state) + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); HeapFree(GetProcessHeap(), 0, brush); } @@ -565,7 +566,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, D2D1_BITMAP_INTERPOLATION_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.interpolation_mode = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) @@ -627,35 +637,16 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { - D3D10_SAMPLER_DESC sampler_desc; - HRESULT hr; FIXME("Ignoring brush properties.\n"); d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); - - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.MipLODBias = 0.0f; - sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; - sampler_desc.BorderColor[0] = 0.0f; - sampler_desc.BorderColor[1] = 0.0f; - sampler_desc.BorderColor[2] = 0.0f; - sampler_desc.BorderColor[3] = 0.0f; - sampler_desc.MinLOD = 0.0f; - sampler_desc.MaxLOD = 0.0f; - - if (FAILED(hr = ID3D10Device_CreateSamplerState(render_target->device, - &sampler_desc, &brush->u.bitmap.sampler_state))) - { - ERR("Failed to create sampler state, hr %#x.\n", hr); - return hr; - } + if (bitmap_brush_desc) + brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + else + brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; return S_OK; } @@ -672,9 +663,36 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { + HRESULT hr; + if (brush->type == D2D_BRUSH_TYPE_BITMAP) { ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); + if (!brush->u.bitmap.sampler_state) + { + D3D10_SAMPLER_DESC sampler_desc; + + if (brush->u.bitmap.interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + else + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &sampler_desc, &brush->u.bitmap.sampler_state))) + ERR("Failed to create sampler state, hr %#x.\n", hr); + } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48465f2..285c422 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap; } u;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetInterpolationMode().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 719dfff5bd87577ebcefe2b35aff8313e84fc00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=719dfff5bd87577ebcefe2b35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:36 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetInterpolationMode(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c15945a..f2cb99e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -599,9 +599,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1B static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; + return brush->u.bitmap.interpolation_mode; } static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap)

1 0

Henri Verbeet : d2d1/tests: Add a test for bitmap brushes.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 61a40b0d9c5645d74d62d176e68e811d754cfcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a40b0d9c5645d74d62d176e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:37 2015 +0200 d2d1/tests: Add a test for bitmap brushes. --- dlls/d2d1/tests/d2d1.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3285acb..357a518 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -46,6 +46,12 @@ static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) color->a = a; } +static void set_size_u(D2D1_SIZE_U *size, unsigned int w, unsigned int h) +{ + size->width = w; + size->height = h; +} + static void set_matrix_identity(D2D1_MATRIX_3X2_F *matrix) { matrix->_11 = 1.0f; @@ -685,9 +691,143 @@ static void test_color_brush(void) DestroyWindow(window); } +static void test_bitmap_brush(void) +{ + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; + D2D1_MATRIX_3X2_F matrix, tmp_matrix; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *tmp_bitmap; + D2D1_RECT_F src_rect, dst_rect; + D2D1_EXTEND_MODE extend_mode; + IDXGISwapChain *swapchain; + ID2D1BitmapBrush *brush; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_COLOR_F color; + D2D1_SIZE_U size; + ULONG refcount; + float opacity; + HWND window; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on + * Windows 7+. */ + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1BitmapBrush_GetBitmap(brush, &tmp_bitmap); + ok(tmp_bitmap == bitmap, "Got unexpected bitmap %p, expected %p.\n", tmp_bitmap, bitmap); + ID2D1Bitmap_Release(tmp_bitmap); + opacity = ID2D1BitmapBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity); + set_matrix_identity(&matrix); + ID2D1BitmapBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + extend_mode = ID2D1BitmapBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %#x.\n", extend_mode); + interpolation_mode = ID2D1BitmapBrush_GetInterpolationMode(brush); + ok(interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + "Got unexpected interpolation mode %#x.\n", interpolation_mode); + ID2D1BitmapBrush_Release(brush); + + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetInterpolationMode(brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 2.0f); + translate_matrix(&matrix, 320.0f, 240.0f); + rotate_matrix(&matrix, M_PI / 4.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, -80.0f, -60.0f); + scale_matrix(&matrix, 40.0f, 30.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1BitmapBrush_SetOpacity(brush, 0.75f); + set_rect(&dst_rect, -80.0f, -60.0f, 80.0f, 60.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, -4.0f, 12.0f, -8.0f, 8.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 0.75f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + set_rect(&dst_rect, 0.0f, 8.0f, 4.0f, 12.0f); + set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + + ID2D1BitmapBrush_Release(brush); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %u references left.\n", refcount); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); test_color_brush(); + test_bitmap_brush(); }

1 0

Henri Verbeet : wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d () (Valgrind).
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 79f4ca9ec4dd6642c09f8f597449074a6d1c1415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f4ca9ec4dd6642c09f8f597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:38 2015 +0200 wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d() (Valgrind). --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4954d00..0822f61 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1086,6 +1086,12 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); + /* Release the context again as soon as possible. In particular, + * releasing the render target views below may release the last reference + * to the swapchain associated with this context, which in turn will + * destroy the context. */ + context_release(context); + /* Release the buffers (with sanity checks)*/ if (device->onscreen_depth_stencil) { @@ -1123,8 +1129,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->back_buffer_view = NULL; } - context_release(context); - for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Henri Verbeet : wined3d: Also free the input signature in shader_cleanup() (Valgrind).
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 4b86f13adef659dea80618afc5359bdeb5124e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b86f13adef659dea80618afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:39 2015 +0200 wined3d: Also free the input signature in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a2cf3a..d9ff768 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1862,6 +1862,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf);

1 0

Matteo Bruni : wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 64463b81dfb2a2c8fcfd3388d588983c77513294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64463b81dfb2a2c8fcfd3388d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:41 2015 +0200 wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer. Also rename the shader_buffer_(clear|init|free) functions. --- dlls/wined3d/arb_program_shader.c | 168 +++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 102 +++++++++++------------ dlls/wined3d/shader.c | 14 ++-- dlls/wined3d/wined3d_private.h | 17 ++-- 4 files changed, 150 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64463b81dfb2a2c8fcfd3…

1 0

Matteo Bruni : wined3d: Reduce initial wined3d_string_buffer buffer size to 32.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 54b4df6731cd7b9660ac3b9e1c16deef5bc92fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b4df6731cd7b9660ac3b9e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:42 2015 +0200 wined3d: Reduce initial wined3d_string_buffer buffer size to 32. Also try to avoid unnecessary HeapReAlloc() + vsnprintf() loops when we know the required size of the buffer. --- dlls/wined3d/shader.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 612b055..2d50ced 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -253,7 +253,7 @@ void string_buffer_clear(struct wined3d_string_buffer *buffer) BOOL string_buffer_init(struct wined3d_string_buffer *buffer) { - buffer->buffer_size = 16384; + buffer->buffer_size = 32; if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); @@ -274,6 +274,7 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va unsigned int rem; int rc; char *new_buffer; + unsigned int new_buffer_size; for (;;) { @@ -283,14 +284,17 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + new_buffer_size = buffer->buffer_size * 2; + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) + new_buffer_size *= 2; + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return -1; } buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; + buffer->buffer_size = new_buffer_size; } buffer->content_size += rc;

1 0