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

Nikolay Sivov : dwrite: Implement IDWriteFont3::GetFontFaceReference().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: d9c446050adc372fcf71ae43f85d7a4d36be67e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c446050adc372fcf71ae43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:20 2016 +0300 dwrite: Implement IDWriteFont3::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 +++++-- dlls/dwrite/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f579e19..2a2f39f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1511,8 +1511,11 @@ static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font) static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWriteFontFaceReference **reference) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(%p): stub\n", This, reference); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, reference); + + return IDWriteFactory3_CreateFontFaceReference_(This->data->factory, This->data->file, This->data->face_index, + This->data->simulations, reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ae6cbcf..bad347d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5830,6 +5830,8 @@ static void test_CreateFontFaceReference(void) IDWriteFontFile *file, *file1; IDWriteFactory3 *factory3; IDWriteFactory *factory; + IDWriteFont3 *font3; + IDWriteFont *font; UINT32 index; WCHAR *path; HRESULT hr; @@ -5921,6 +5923,23 @@ todo_wine IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); + /* references returned from IDWriteFont3 */ + font = get_tahoma_instance((IDWriteFactory*)factory3, DWRITE_FONT_STYLE_NORMAL); + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont3, (void**)&font3); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFont3_GetFontFaceReference(font3, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref != ref1, "got %p, %p\n", ref1, ref); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + IDWriteFont3_Release(font3); + IDWriteFactory3_Release(factory3); DELETE_FONTFILE(path); }

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontFaceReference::Equals().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 9d0bbb13642add299b8b989a86bb8a2448d0285d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0bbb13642add299b8b989a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:17 2016 +0300 dwrite: Implement IDWriteFontFaceReference::Equals(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 597fb97..24ee58c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5390,10 +5390,18 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDWriteFontFaceReference *ref) { struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + IDWriteFontFile *file; + BOOL ret; - FIXME("(%p)->(%p): stub\n", This, ref); + TRACE("(%p)->(%p)\n", This, ref); - return E_NOTIMPL; + if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) + return FALSE; + + ret = is_same_fontfile(This->file, file); + IDWriteFontFile_Release(file); + + return ret; } static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference *iface)

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM*::CreateObject.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: c44d9dad3f76a62f7a85d8036c14989929639f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44d9dad3f76a62f7a85d8036… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Apr 20 20:40:09 2016 +0530 d3drm: Implement IDirect3DRM*::CreateObject. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index fe33315..edb46df 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -139,10 +139,12 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, @@ -603,10 +605,12 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, @@ -1054,10 +1058,50 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + IUnknown *object; + HRESULT hr; + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + if (!out) + return D3DRMERR_BADVALUE; + + if (!clsid || !iid) + { + *out = NULL; + return D3DRMERR_BADVALUE; + } + + if (outer) + { + FIXME("COM aggregation for outer IUnknown (%p) not implemented. Returning E_NOTIMPL.\n", outer); + *out = NULL; + return E_NOTIMPL; + } + + if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + { + struct d3drm_texture *texture; + if (FAILED(hr = d3drm_texture_create(&texture))) + { + *out = NULL; + return hr; + } + object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; + } + else + { + FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); + *out = NULL; + return CLASSFACTORY_E_FIRST; + } + + if (FAILED(hr = IUnknown_QueryInterface(object, iid, out))) + *out = NULL; + IUnknown_Release(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a8f9c40..9f6eaab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1353,23 +1353,24 @@ static void test_object(void) { REFCLSID clsid; REFIID iid; + BOOL todo; } tests[] = { - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2 }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3 }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2 }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice, TRUE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3, FALSE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport, TRUE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2, TRUE }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; IDirect3DRM3 *d3drm3; - IUnknown *unknown; + IUnknown *unknown = (IUnknown *)0xdeadbeef; HRESULT hr; ULONG ref1, ref2, ref3, ref4; int i; @@ -1382,17 +1383,26 @@ static void test_object(void) hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown); + ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + todo_wine_if(tests[i].todo) + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); if (SUCCEEDED(hr)) { ref2 = get_refcount((IUnknown *)d3drm1);

1 0

Michael Stefaniuc : shell32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 816df88a77d1f4847e0cc5ddb5e5ec22dbed43c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816df88a77d1f4847e0cc5ddb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:58:01 2016 +0200 shell32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 5dfdd08..694b5d1 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem( Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- %s\n", wine_dbgstr_rect(&TextRect)); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -794,8 +794,8 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", - rect.right, rect.left, rect.top, rect.bottom); + { + FIXME("%s\n", wine_dbgstr_rect(&rect)); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } return 0x00100010; /*FIXME*/

1 0

Henri Verbeet : wined3d: Store sub-resource parents in struct wined3d_texture_sub_resource().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 81b2ed4f0a111e4d0c9ee9d6d7772315d5cdda98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b2ed4f0a111e4d0c9ee9d6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:14 2016 +0200 wined3d: Store sub-resource parents in struct wined3d_texture_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 26 +++++++++++++------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a5270c6..149b5e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1423,17 +1423,19 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; struct wined3d_surface *surface; unsigned int i; for (i = 0; i < sub_count; ++i) { - if ((surface = texture->sub_resources[i].u.surface)) + sub_resource = &texture->sub_resources[i]; + if ((surface = sub_resource->u.surface)) { TRACE("surface %p.\n", surface); wined3d_surface_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.surface); @@ -1937,7 +1939,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = device_parent->ops->surface_created(device_parent, - texture, idx, &parent, &parent_ops))) + texture, idx, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); wined3d_surface_cleanup(surface); @@ -1945,10 +1947,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return hr; } - TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); + TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); - surface->resource.parent = parent; - surface->resource.parent_ops = parent_ops; TRACE("Created surface level %u, layer %u @ %p.\n", i, j, surface); if (((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) @@ -2014,17 +2014,19 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; struct wined3d_volume *volume; unsigned int i; for (i = 0; i < sub_count; ++i) { - if ((volume = texture->sub_resources[i].u.volume)) + sub_resource = &texture->sub_resources[i]; + if ((volume = sub_resource->u.volume)) { TRACE("volume %p.\n", volume); wined3d_volume_cleanup(volume); - volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); @@ -2191,7 +2193,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct sub_resource->u.volume = volume; if (FAILED(hr = device_parent->ops->volume_created(device_parent, - texture, i, &parent, &parent_ops))) + texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); wined3d_volume_cleanup(volume); @@ -2201,8 +2203,6 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); - volume->resource.parent = parent; - volume->resource.parent_ops = parent_ops; TRACE("Created volume level %u @ %p.\n", i, volume); /* Calculate the next mipmap level. */ @@ -2377,7 +2377,7 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex return NULL; } - return texture->sub_resources[sub_resource_idx].resource->parent; + return texture->sub_resources[sub_resource_idx].parent; } void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, @@ -2393,7 +2393,7 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu return; } - texture->sub_resources[sub_resource_idx].resource->parent = parent; + texture->sub_resources[sub_resource_idx].parent = parent; } HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4417293..773dccf 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -69,7 +69,7 @@ void * CDECL wined3d_rendertarget_view_get_sub_resource_parent(const struct wine texture = texture_from_resource(view->resource); - return wined3d_resource_get_parent(texture->sub_resources[view->sub_resource_idx].resource); + return texture->sub_resources[view->sub_resource_idx].parent; } void CDECL wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 351584e..7421368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2500,6 +2500,10 @@ struct wined3d_texture struct wined3d_texture_sub_resource { struct wined3d_resource *resource; + + void *parent; + const struct wined3d_parent_ops *parent_ops; + union { struct wined3d_surface *surface;

1 0

Michael Stefaniuc : mshtml: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: db8159ee89649954620169da7b168c8b71d61395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8159ee89649954620169da7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:37:03 2016 +0200 mshtml: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 43ea3e3..8ca3caf 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -250,9 +250,8 @@ static HRESULT activate_window(HTMLDocumentObj *This) return hres; } - TRACE("got window context: %p %p {%d %d %d %d} {%d %d %d %d} {%d %x %p %p %d}\n", - pIPFrame, This->ip_window, posrect.left, posrect.top, posrect.right, posrect.bottom, - cliprect.left, cliprect.top, cliprect.right, cliprect.bottom, + TRACE("got window context: %p %p %s %s {%d %x %p %p %d}\n", + pIPFrame, This->ip_window, wine_dbgstr_rect(&posrect), wine_dbgstr_rect(&cliprect), frameinfo.cb, frameinfo.fMDIApp, frameinfo.hwndFrame, frameinfo.haccel, frameinfo.cAccelEntries); hres = IOleInPlaceSite_GetWindow(This->ipsite, &parent_hwnd);

1 0

Henri Verbeet : wined3d: Evict system memory for complete textures.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: e6780a5e0518fcf02a1b25e20dd2ea4df110a130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6780a5e0518fcf02a1b25e20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:11 2016 +0200 wined3d: Evict system memory for complete textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ------------------ dlls/wined3d/texture.c | 60 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/volume.c | 25 ------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 55 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6780a5e0518fcf02a1b2…

1 0

Henri Verbeet : wined3d: Implement surface_modify_ds_location() on top of the regular resource location management.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 2066e1a96216efcbd53ef7de70a193317952ca5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2066e1a96216efcbd53ef7de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:10 2016 +0200 wined3d: Implement surface_modify_ds_location() on top of the regular resource location management. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 162c932..7a71193 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2606,19 +2606,16 @@ static void surface_depth_blt(const struct wined3d_surface *surface, struct wine void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) { - struct wined3d_texture_sub_resource *sub_resource; + struct wined3d_texture *texture = surface->container; + unsigned int sub_resource_idx; TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - sub_resource = surface_get_sub_resource(surface); - if (((sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) && !(location & WINED3D_LOCATION_TEXTURE_RGB)) - || (!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - && (location & WINED3D_LOCATION_TEXTURE_RGB))) - wined3d_texture_set_dirty(surface->container); - + sub_resource_idx = surface_get_sub_resource_idx(surface); surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - sub_resource->locations = location; + wined3d_texture_validate_location(texture, sub_resource_idx, location); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~location); } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Avoid wined3d_resource_get_desc() on a surface in surface_convert_format().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: a077c1f6698a9d6eebba2a8a7b8fa4567fd0bf1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a077c1f6698a9d6eebba2a8a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:09 2016 +0200 wined3d: Avoid wined3d_resource_get_desc() on a surface in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c32a1f7..162c932 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1561,6 +1561,7 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, unsigned int sub_resource_idx, const struct wined3d_format *dst_format) { + unsigned int texture_level = sub_resource_idx % src_texture->level_count; const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; @@ -1578,11 +1579,16 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } /* FIXME: Multisampled conversion? */ - wined3d_resource_get_desc(src_texture->sub_resources[sub_resource_idx].resource, &desc); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; desc.format = dst_format->id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; desc.usage = 0; desc.pool = WINED3D_POOL_SCRATCH; + desc.width = wined3d_texture_get_level_width(src_texture, texture_level); + desc.height = wined3d_texture_get_level_height(src_texture, texture_level); + desc.depth = 1; + desc.size = 0; if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, NULL, NULL, &wined3d_null_parent_ops, &dst_texture)))

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 23e945ffa9e85be44159d3f3a7c8cc6228adb8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e945ffa9e85be44159d3f3a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 20 20:41:38 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 93 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 68 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4201199..862c0dc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-20 13:01+0200\n" +"PO-Revision-Date: 2016-04-20 20:39+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -11656,111 +11656,82 @@ msgid "The operation completed successfully\n" msgstr "Операція успішно завершена\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Помилка: неправильне ім'я ключа\n" +msgstr "reg: невірне ім'я ключа\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Помилка: неправильні параметри командного рядка\n" +msgstr "reg: невірні параметри командного рядка\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Помилка: неможливо отримати доступ до віддаленої машини\n" +msgstr "reg: неможливо отримати доступ до віддаленої машини\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Помилка: Непідтримуваний тип\n" +msgstr "reg: непідтримуваний тип даних [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +msgstr "reg: після параметра [/d] повинно бути вказано ціле число\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +"reg: після параметра [/d] повинно бути вказано число в шістнадцятковому " +"форматі\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: невідомий тип даних [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Вказаний файл вже існує. Ви хочете його замінити?" +msgstr "Значення реєстру '%1' вже існує. Ви хочете його замінити?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Операцію з реєстром було скасовано\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" -msgstr "(Стандартно)" +msgstr "(За замовчуванням)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ви впевнені, що хочете видалити ці значення?" +msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ви впевнені, що хочете видалити значення '%s'?" +msgstr "Ви впевнені, що хочете видалити всі значення реєстру в '%1'?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ви впевнені, що хочете вилучити '%1'?" +msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" #: reg.rc:52 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +msgstr "reg: після параметра [/d] повинно бути вказано рядок\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо видалити всі значення реєстру в '%1'. Сталася неочікувана " +"помилка.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо завершити зазначену операцію. Сталася неочікувана помилка.\n" #: regedit.rc:34 msgid "&Registry" @@ -13268,7 +13239,7 @@ msgstr "&Нове заміщення для бібліотеки:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Додати" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13295,8 +13266,6 @@ msgid "&Native (Windows)" msgstr "&Стороння (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "В&будована, потім стороння" @@ -13321,14 +13290,10 @@ msgstr "" "редагуватися." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Додати..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" msgstr "Автовизначення" @@ -13337,10 +13302,8 @@ msgid "&Path:" msgstr "&Шлях:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Показати &Додаткове" +msgstr "Показати &додат. налаштування" #: winecfg.rc:249 msgid "De&vice:" @@ -13359,10 +13322,8 @@ msgid "S&erial:" msgstr "&Сер.ном:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Показати &файли, що починаються з крапки" +msgstr "Показувати &файли, що починаються з крапки" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -13441,10 +13402,8 @@ msgid "Select the Unix target directory, please." msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Сховати &Додаткове" +msgstr "Сховати &додат. налаштування" #: winecfg.rc:39 msgid "(No Theme)" @@ -13905,12 +13864,10 @@ msgid "Configuration error" msgstr "Помилка конфігурації" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Розмір буфера екрану повинен бути не менший буфера вікна" +msgstr "Розмір буфера екрану повинен бути не менший розміру вікна." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0