May 2018 - Wine-commits - list.winehq.org

Pablo Martin : wined3d: Add unimplemented flags parameter to wined3d_device_copy_sub_resource_region.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 43efd4f5ecc96a8c0c119b3086d9da18495cd837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43efd4f5ecc96a8c0c119b30… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Fri May 18 16:08:45 2018 +0200 wined3d: Add unimplemented flags parameter to wined3d_device_copy_sub_resource_region. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/device.c | 9 ++++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 863f71f..8ec53cc 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1018,7 +1018,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } @@ -4511,7 +4511,7 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e3562c7..2f3ad28 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1536,7 +1536,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), - src->sub_resource_idx, &src_box); + src->sub_resource_idx, &src_box, 0); if (SUCCEEDED(hr) && dst->texture) d3d9_texture_flag_auto_gen_mipmap(dst->texture); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b20b9ed..2ba29a7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -345,7 +345,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_buffer_get_resource(buffer->dst_vertex_buffer), 0, ci->wDest * sizeof(D3DTLVERTEX), 0, 0, - wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box); + wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box, 0); break; default: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8257efd..9906f74 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4154,14 +4154,17 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags) { struct wined3d_box dst_box, b; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_sub_resource_idx %u, src_box %s.\n", + "src_resource %p, src_sub_resource_idx %u, src_box %s, flags %#x.\n", device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, - src_resource, src_sub_resource_idx, debug_box(src_box)); + src_resource, src_sub_resource_idx, debug_box(src_box), flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bf29e20..7a8cf20 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -40,7 +40,7 @@ @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) -@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) +@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7681aa2..bb4ad48 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx,

1 0

Pablo Martin : d3d11: Make CopySubresourceRegion1 call wined3d_device_copy_sub_resource_region directly.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 2bebfa2fc582e8d80bf3f6f935ce3ae9546b6786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bebfa2fc582e8d80bf3f6f9… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Fri May 18 16:08:46 2018 +0200 d3d11: Make CopySubresourceRegion1 call wined3d_device_copy_sub_resource_region directly. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8ec53cc..68d6cf0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2606,16 +2606,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box, UINT flags) { + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct wined3d_box wined3d_src_box; + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " "src_resource %p, src_subresource_idx %u, src_box %p, flags %#x.\n", iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); - if (flags) - FIXME("Ignoring flags %#x.\n", flags); + if (src_box) + wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, + src_box->right, src_box->bottom, src_box->front, src_box->back); - d3d11_immediate_context_CopySubresourceRegion(iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, - src_resource, src_subresource_idx, src_box); + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_mutex_lock(); + wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, flags); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface,

1 0

Ken Thomases : winemac: Fix z-ordering between two child (owned) windows of the same parent (owner).
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 64704bef1865b0729ef81e46675d5b1183b49ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64704bef1865b0729ef81e46… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 21 13:39:02 2018 -0500 winemac: Fix z-ordering between two child (owned) windows of the same parent (owner). The window being ordered was first put in the correct place and then was moved to the other end of the children list by the loop that was intended to adjust the windows strictly between the window and the ancestor. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b94b774..e37e071 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1590,14 +1590,17 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [ancestor orderWindow:orderingMode relativeTo:[ancestorOfOther windowNumber]]; } - for (child = self; - (parent = (WineWindow*)child.parentWindow); - child = parent) + if (!ancestorOfOther || ancestor != self) { - if ([parent isKindOfClass:[WineWindow class]]) - [parent order:-orderingMode childWindow:child relativeTo:nil]; - if (parent == ancestor) - break; + for (child = self; + (parent = (WineWindow*)child.parentWindow); + child = parent) + { + if ([parent isKindOfClass:[WineWindow class]]) + [parent order:-orderingMode childWindow:child relativeTo:nil]; + if (parent == ancestor) + break; + } } [self checkWineDisplayLink];

1 0

Nikolay Sivov : dwrite: Support IDWriteFontList1 for font families.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: f3908ad6763eeef0e750a0162ebca8855a3cfb3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3908ad6763eeef0e750a016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 21 23:11:02 2018 +0300 dwrite: Support IDWriteFontList1 for font families. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 14 ++++++-- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c7824b6..9556fd3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -124,6 +124,7 @@ struct dwrite_fontcollection { struct dwrite_fontfamily { IDWriteFontFamily1 IDWriteFontFamily1_iface; + IDWriteFontList1 IDWriteFontList1_iface; LONG ref; struct dwrite_fontfamily_data *data; @@ -289,6 +290,11 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily1(IDWriteFont return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily1_iface); } +static inline struct dwrite_fontfamily *impl_family_from_IDWriteFontList1(IDWriteFontList1 *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontList1_iface); +} + static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection1(IDWriteFontCollection1 *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection1_iface); @@ -1963,7 +1969,6 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, if (IsEqualIID(riid, &IID_IDWriteFontFamily1) || IsEqualIID(riid, &IID_IDWriteFontFamily) || - IsEqualIID(riid, &IID_IDWriteFontList) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -1971,6 +1976,14 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface, return S_OK; } + if (IsEqualIID(riid, &IID_IDWriteFontList1) || + IsEqualIID(riid, &IID_IDWriteFontList)) + { + *obj = &This->IDWriteFontList1_iface; + IDWriteFontList1_AddRef(&This->IDWriteFontList1_iface); + return S_OK; + } + WARN("%s not implemented.\n", debugstr_guid(riid)); *obj = NULL; @@ -2261,6 +2274,74 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; +static HRESULT WINAPI dwritefontfamilylist_QueryInterface(IDWriteFontList1 *iface, REFIID riid, void **obj) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_QueryInterface(&This->IDWriteFontFamily1_iface, riid, obj); +} + +static ULONG WINAPI dwritefontfamilylist_AddRef(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_AddRef(&This->IDWriteFontFamily1_iface); +} + +static ULONG WINAPI dwritefontfamilylist_Release(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_Release(&This->IDWriteFontFamily1_iface); +} + +static HRESULT WINAPI dwritefontfamilylist_GetFontCollection(IDWriteFontList1 *iface, + IDWriteFontCollection **collection) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFontCollection(&This->IDWriteFontFamily1_iface, collection); +} + +static UINT32 WINAPI dwritefontfamilylist_GetFontCount(IDWriteFontList1 *iface) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFontCount(&This->IDWriteFontFamily1_iface); +} + +static HRESULT WINAPI dwritefontfamilylist_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont **font) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily_GetFont(&This->IDWriteFontFamily1_iface, index, font); +} + +static DWRITE_LOCALITY WINAPI dwritefontfamilylist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFontLocality(&This->IDWriteFontFamily1_iface, index); +} + +static HRESULT WINAPI dwritefontfamilylist1_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont3 **font) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFont(&This->IDWriteFontFamily1_iface, index, font); +} + +static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, + IDWriteFontFaceReference **reference) +{ + struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); + return dwritefontfamily1_GetFontFaceReference(&This->IDWriteFontFamily1_iface, index, reference); +} + +static const IDWriteFontList1Vtbl fontfamilylistvtbl = { + dwritefontfamilylist_QueryInterface, + dwritefontfamilylist_AddRef, + dwritefontfamilylist_Release, + dwritefontfamilylist_GetFontCollection, + dwritefontfamilylist_GetFontCount, + dwritefontfamilylist_GetFont, + dwritefontfamilylist1_GetFontLocality, + dwritefontfamilylist1_GetFont, + dwritefontfamilylist1_GetFontFaceReference, +}; + static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -2271,6 +2352,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 if (!This) return E_OUTOFMEMORY; This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl; + This->IDWriteFontList1_iface.lpVtbl = &fontfamilylistvtbl; This->ref = 1; This->collection = collection; IDWriteFontCollection1_AddRef(&collection->IDWriteFontCollection1_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c226dba..1180ad4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1517,6 +1517,7 @@ if (0) /* crashes on native */ hr = IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily1, (void**)&family1); if (hr == S_OK) { IDWriteFontFaceReference *ref, *ref1; + IDWriteFontList1 *fontlist1; IDWriteFontList *fontlist; IDWriteFont3 *font3; IDWriteFont1 *font1; @@ -1537,8 +1538,17 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFont1_Release(font1); - hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void**)&fontlist); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void **)&fontlist1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#x.\n", hr); + if (hr == S_OK) { + hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void **)&fontlist); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontlist == (IDWriteFontList *)fontlist1, "Unexpected interface pointer.\n"); + ok(fontlist != (IDWriteFontList *)family1, "Unexpected interface pointer.\n"); + ok(fontlist != (IDWriteFontList *)family, "Unexpected interface pointer.\n"); + IDWriteFontList1_Release(fontlist1); + IDWriteFontList_Release(fontlist); + } hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void**)&fontlist); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Support IDWriteTextFormat2 for layout.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 8b9ba16e9ad9ca85b93b05c13d6c5044a1a5ecf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9ba16e9ad9ca85b93b05c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 00:08:06 2018 +0300 dwrite: Support IDWriteTextFormat2 for layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 248 +++++++++++++++++++++++++-------------------- dlls/dwrite/tests/layout.c | 14 ++- 2 files changed, 149 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b9ba16e9ad9ca85b93b…

1 0

Lucian Poston : d2d1: Add ID2D1Device stub.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 02603467e942c7318ef418bc80af803e329c8c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02603467e942c7318ef418bc… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Sat May 19 21:08:17 2018 +0430 d2d1: Add ID2D1Device stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 +++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 +++- include/d2d1_1.idl | 61 +++++++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26..4bfe3b5 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c..21e2b88 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84..f74e9f8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Device) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc85..7810e95 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb30..2b1ef2e 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0x0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 0x1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -50,6 +60,22 @@ typedef enum D2D1_UNIT_MODE D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, } D2D1_UNIT_MODE; +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0x0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 0x1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 0x2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0x0, + D2D1_COLOR_SPACE_SRGB = 0x1, + D2D1_COLOR_SPACE_SCRGB = 0x2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 @@ -75,10 +101,43 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 D2D1_UNIT_MODE unitMode; } D2D1_DRAWING_STATE_DESCRIPTION1; +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + float rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ]

1 0

Nikolay Sivov : d2d1/tests: Add a simple test for creating d2d devices.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: e202a9ea25363eaed3be9d155f96a34061e69ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e202a9ea25363eaed3be9d15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 21:08:18 2018 +0430 d2d1/tests: Add a simple test for creating d2d devices. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f833294..8299ceb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -19,7 +19,7 @@ #define COBJMACROS #include <limits.h> #include <math.h> -#include "d2d1.h" +#include "d2d1_1.h" #include "wincrypt.h" #include "wine/test.h" #include "initguid.h" @@ -6426,6 +6426,47 @@ static void test_bezier_intersect(void) DestroyWindow(window); } +static void test_create_device(void) +{ + ID3D10Device1 *d3d_device; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1Factory *factory2; + ID2D1Device *device; + ULONG refcount; + HRESULT hr; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + ID2D1Device_GetFactory(device, &factory2); + ok(factory2 == (ID2D1Factory *)factory, "Got unexpected factory %p, expected %p.\n", factory2, factory); + ID2D1Factory_Release(factory2); + ID2D1Device_Release(device); + + IDXGIDevice_Release(dxgi_device); + ID3D10Device1_Release(d3d_device); + + refcount = ID2D1Factory1_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(d2d1) { test_clip(); @@ -6454,4 +6495,5 @@ START_TEST(d2d1) test_gdi_interop(); test_layer(); test_bezier_intersect(); + test_create_device(); }

1 0

Zebediah Figura : d3d11: Implement depth clip control.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 19f2c4473b9d501c9d91347d50775739cf9456f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f2c4473b9d501c9d91347d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 19 21:08:19 2018 +0430 d3d11: Implement depth clip control. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/context.c | 2 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 28 +++++++++++++++++++++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 6 +++--- include/wine/wined3d.h | 1 + 12 files changed, 35 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19f2c4473b9d501c9d91…

1 0

Gijs Vermeulen : include: Add DOF_* definitions.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 223a2099f4d47940394e27d3589c8b5b69e05fd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223a2099f4d47940394e27d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 18 18:52:03 2018 +0200 include: Add DOF_* definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d0893a4..8e9e91b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2158,6 +2158,13 @@ typedef struct tagDROPSTRUCT DWORD dwControlData; } DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT; +#define DOF_EXECUTABLE 0x8001 +#define DOF_DOCUMENT 0x8002 +#define DOF_DIRECTORY 0x8003 +#define DOF_MULTIPLE 0x8004 +#define DOF_PROGMAN 0x0001 +#define DOF_SHELLDATA 0x0002 + /* modifiers for RegisterHotKey */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002

1 0

Alistair Leslie-Hughes : include: Add more WM interfaces.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: b0f5c3a169ccbddfacd553391ba0ab92b548a26f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f5c3a169ccbddfacd55339… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 21 05:31:34 2018 +0000 include: Add more WM interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1cbcd2..60d8b2c 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -495,6 +495,18 @@ interface IWMProfileManager : IUnknown [out] IWMProfile **ppProfile); } +[ + object, + uuid(7a924e51-73c1-494d-8019-23d37ed9b89a), + pointer_default(unique), + local +] +interface IWMProfileManager2 : IWMProfileManager +{ + HRESULT GetSystemProfileVersion(WMT_VERSION *version); + HRESULT SetSystemProfileVersion(WMT_VERSION version); +}; + cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") [ @@ -1615,6 +1627,73 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT EndPlaylistBurn([in] HRESULT result); } +[ + object, + uuid(72995a79-5090-42a4-9c8c-d9d0b6d34be5), + pointer_default(unique), + local +] +interface IWMPropertyVault : IUnknown +{ + HRESULT GetPropertyCount([in] DWORD *count); + + HRESULT GetPropertyByName( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT SetProperty( + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in] BYTE *value, + [in] DWORD size); + + HRESULT GetPropertyByIndex( + [in] DWORD index, + [out, size_is( *pdwNameLen )] WCHAR *name, + [in, out] DWORD *length, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT CopyPropertiesFrom([in] IWMPropertyVault *vault); + + HRESULT Clear(); +}; + +[ + object, + uuid(fc54a285-38c4-45b5-aa23-85b9f7cb424b), + pointer_default(unique), + local +] +interface IWMWriterPreprocess : IUnknown +{ + HRESULT GetMaxPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [out] DWORD *passes); + + HRESULT SetNumPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [in] DWORD passes); + + HRESULT BeginPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); + + HRESULT PreprocessSample( + [in] DWORD input, + [in] QWORD sample_time, + [in] DWORD flags, + [in] INSSBuffer *sample); + + HRESULT EndPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); +}; cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0