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

Stefan Dösinger : wined3d: Move the ARB_texture_rectangle check to init_format_texture_info.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 0152b0dad33ee356f1dfeb7f3c0535de7c6aa1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0152b0dad33ee356f1dfeb7f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:12 2015 +0200 wined3d: Move the ARB_texture_rectangle check to init_format_texture_info. --- dlls/wined3d/texture.c | 53 ++++++++++++++++++++++++++++++++------------------ dlls/wined3d/utils.c | 3 ++- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 589f8bf..916bcb2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1076,6 +1076,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 UINT pow2_width, pow2_height; unsigned int i; HRESULT hr; + enum wined3d_gl_resource_type gl_type; + unsigned int required_flags = 0, ds_flags = WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL; + const struct wined3d_format *format; /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ @@ -1084,6 +1087,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture); return WINED3DERR_INVALIDCALL; } + format = wined3d_get_format(gl_info, desc->format); /* Non-power2 support. */ if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) @@ -1134,6 +1138,23 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } } + if (desc->usage & WINED3DUSAGE_TEXTURE) + required_flags |= WINED3DFMT_FLAG_TEXTURE; + if (desc->usage & WINED3DUSAGE_RENDERTARGET) + required_flags |= WINED3DFMT_FLAG_RENDERTARGET; + /* WINED3DUSAGE_DEPTHSTENCIL needs WINED3DFMT_FLAG_DEPTH or WINED3DFMT_FLAG_STENCIL, not both. */ + + if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & ds_flags)) + && (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || (desc->width == pow2_width && desc->height == pow2_height))) + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; + else if ((format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & ds_flags))) + gl_type = WINED3D_GL_RES_TYPE_TEX_RECT; + else + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; /* No error, may be SCRATCH pool or emulated conditional np2. */ + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, surface_flags, WINED3D_GL_RES_TYPE_TEX_2D, device, parent, parent_ops, &texture_resource_ops))) { @@ -1142,18 +1163,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } /* Precalculated scaling for 'faked' non power of two texture coords. */ - if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] - && (desc->width != pow2_width || desc->height != pow2_height)) - { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_COND_NP2; - } - else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] - && (desc->width != pow2_width || desc->height != pow2_height)) + if (gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; @@ -1165,21 +1175,26 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } else { - if ((desc->width != pow2_width) || (desc->height != pow2_height)) + texture->target = GL_TEXTURE_2D; + if (desc->width == pow2_width && desc->height == pow2_height) { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->pow2_matrix[0] = 1.0f; + texture->pow2_matrix[5] = 1.0f; } - else + else if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->pow2_matrix[0] = 1.0f; texture->pow2_matrix[5] = 1.0f; + texture->flags |= WINED3D_TEXTURE_COND_NP2; + } + else + { + texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); + texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } - texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 405a79c..8a7075d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1861,7 +1861,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2])

1 0

Henri Verbeet : wined3d: Release the context before potentially destroying the swapchain in wined3d_device_uninit_3d () (Valgrind).
by Alexandre Julliard April 27, 2015

April 27, 2015

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 : d2d1/tests: Add a test for bitmap brushes.
by Alexandre Julliard April 27, 2015

April 27, 2015

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

Alexandre Julliard : server: Return a valid position also in posted messages.
by Alexandre Julliard April 27, 2015

April 27, 2015

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

Nikolay Sivov : dmime: No need to allocate description separately for IDirectMusicGraph.
by Alexandre Julliard April 27, 2015

April 27, 2015

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

Nikolay Sivov : dmime/tests: Fix some failures on Win2k VMs.
by Alexandre Julliard April 27, 2015

April 27, 2015

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: Implement GetClassID() for IDirectMusicGraph.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: c6bc5f1a1ce5fb1a952ec443481505cd6ec85bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bc5f1a1ce5fb1a952ec4434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:42:54 2015 +0300 dmime: Implement GetClassID() for IDirectMusicGraph. --- dlls/dmime/graph.c | 5 +++-- dlls/dmime/tests/dmime.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7975a4f..a784007 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -439,8 +439,9 @@ static ULONG WINAPI PersistStream_Release(IPersistStream *iface) static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *clsid) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p: stub\n", This, clsid); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, clsid); + *clsid = CLSID_DirectMusicGraph; + return S_OK; } static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f7c018f..f833a10 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,8 +421,8 @@ 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); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + 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)); /* Unimplemented IPersistStream methods */

1 0

Mark Harmstone : include: Add buffered paint functions to uxtheme.h.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 85d6a5b9c97dc3fbdab15f868a44e163380d3355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6a5b9c97dc3fbdab15f868… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:46 2015 +0100 include: Add buffered paint functions to uxtheme.h. --- include/uxtheme.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 4a43154..fa0d3cb 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,4 +206,11 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC, const RECT *, BP_BUFFERFORMAT, HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER, BOOL); +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER, const RECT *); +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER, const RECT *, BYTE); +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER, RGBQUAD **, int *); +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); + #endif

1 0

Francois Gouget : ole32; Fix some storage32 comments and standardize some virtual table names.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 770385262730eb88b27916aceadd620c329cc396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770385262730eb88b27916ace… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:28 2015 +0200 ole32; Fix some storage32 comments and standardize some virtual table names. --- dlls/ole32/storage32.c | 86 +++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=770385262730eb88b2791…

1 0

Stefan Dösinger : wined3d: Move volume DXTn handling to apply_format_fixups.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 7109bebd024ee68ec2b3ef0a6b29e72ded08abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7109bebd024ee68ec2b3ef0a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:10 2015 +0200 wined3d: Move volume DXTn handling to apply_format_fixups. --- dlls/d3d8/tests/device.c | 24 ++++-------------------- dlls/d3d9/tests/device.c | 24 ++++-------------------- dlls/d3dx9_36/tests/texture.c | 15 +++++++++++++-- dlls/wined3d/directx.c | 19 ------------------- dlls/wined3d/utils.c | 16 ++++++++++++++++ 5 files changed, 37 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7109bebd024ee68ec2b3e…

1 0