May 2019 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Implement ID3D11Multithread.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: c4f6993d379caec9000f93ea38cca56f7bbd0a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f6993d379caec9000f93ea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:03:23 2019 +0200 d3d11: Implement ID3D11Multithread. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 141 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 114 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 44e774b..2219680 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -499,6 +499,7 @@ struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) struct d3d11_immediate_context { ID3D11DeviceContext1 ID3D11DeviceContext1_iface; + ID3D11Multithread ID3D11Multithread_iface; LONG refcount; struct wined3d_private_store private_store; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index aaa525d..751afc1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -46,23 +46,32 @@ static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext1(ID3D } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext1 *iface, - REFIID riid, void **out) + REFIID iid, void **out) { - TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - if (IsEqualGUID(riid, &IID_ID3D11DeviceContext1) - || IsEqualGUID(riid, &IID_ID3D11DeviceContext) - || IsEqualGUID(riid, &IID_ID3D11DeviceChild) - || IsEqualGUID(riid, &IID_IUnknown)) + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID3D11DeviceContext1) + || IsEqualGUID(iid, &IID_ID3D11DeviceContext) + || IsEqualGUID(iid, &IID_ID3D11DeviceChild) + || IsEqualGUID(iid, &IID_IUnknown)) { - ID3D11DeviceContext1_AddRef(iface); - *out = iface; - return S_OK; + *out = &context->ID3D11DeviceContext1_iface; + } + else if (IsEqualGUID(iid, &IID_ID3D11Multithread)) + { + *out = &context->ID3D11Multithread_iface; + } + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + ID3D11DeviceContext1_AddRef(iface); + return S_OK; } static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext1 *iface) @@ -2780,9 +2789,85 @@ static const struct ID3D11DeviceContext1Vtbl d3d11_immediate_context_vtbl = d3d11_immediate_context_DiscardView1, }; +/* ID3D11Multithread methods */ + +static inline struct d3d11_immediate_context *impl_from_ID3D11Multithread(ID3D11Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_immediate_context, ID3D11Multithread_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_multithread_QueryInterface(ID3D11Multithread *iface, + REFIID iid, void **out) +{ + struct d3d11_immediate_context *context = impl_from_ID3D11Multithread(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d3d11_immediate_context_QueryInterface(&context->ID3D11DeviceContext1_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d11_multithread_AddRef(ID3D11Multithread *iface) +{ + struct d3d11_immediate_context *context = impl_from_ID3D11Multithread(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_immediate_context_AddRef(&context->ID3D11DeviceContext1_iface); +} + +static ULONG STDMETHODCALLTYPE d3d11_multithread_Release(ID3D11Multithread *iface) +{ + struct d3d11_immediate_context *context = impl_from_ID3D11Multithread(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_immediate_context_Release(&context->ID3D11DeviceContext1_iface); +} + +static void STDMETHODCALLTYPE d3d11_multithread_Enter(ID3D11Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); +} + +static void STDMETHODCALLTYPE d3d11_multithread_Leave(ID3D11Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_unlock(); +} + +static BOOL STDMETHODCALLTYPE d3d11_multithread_SetMultithreadProtected( + ID3D11Multithread *iface, BOOL enable) +{ + FIXME("iface %p, enable %#x stub!\n", iface, enable); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE d3d11_multithread_GetMultithreadProtected(ID3D11Multithread *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static const struct ID3D11MultithreadVtbl d3d11_multithread_vtbl = +{ + d3d11_multithread_QueryInterface, + d3d11_multithread_AddRef, + d3d11_multithread_Release, + d3d11_multithread_Enter, + d3d11_multithread_Leave, + d3d11_multithread_SetMultithreadProtected, + d3d11_multithread_GetMultithreadProtected, +}; + static void d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) { context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_immediate_context_vtbl; + context->ID3D11Multithread_iface.lpVtbl = &d3d11_multithread_vtbl; context->refcount = 1; ID3D11Device2_AddRef(&device->ID3D11Device2_iface); @@ -2797,10 +2882,10 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont /* ID3D11Device methods */ -static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device2 *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device2 *iface, REFIID iid, void **out) { struct d3d_device *device = impl_from_ID3D11Device2(iface); - return IUnknown_QueryInterface(device->outer_unk, riid, out); + return IUnknown_QueryInterface(device->outer_unk, iid, out); } static ULONG STDMETHODCALLTYPE d3d11_device_AddRef(ID3D11Device2 *iface) @@ -3279,10 +3364,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID riid, +static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID iid, void **out) { - FIXME("iface %p, resource %p, riid %s, out %p stub!\n", iface, resource, debugstr_guid(riid), out); + FIXME("iface %p, resource %p, iid %s, out %p stub!\n", iface, resource, debugstr_guid(iid), out); return E_NOTIMPL; } @@ -3712,18 +3797,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle, - REFIID riid, void **resource) + REFIID iid, void **resource) { - FIXME("iface %p, handle %p, riid %s, resource %p stub!\n", iface, handle, debugstr_guid(riid), resource); + FIXME("iface %p, handle %p, iid %s, resource %p stub!\n", iface, handle, debugstr_guid(iid), resource); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResourceByName(ID3D11Device2 *iface, const WCHAR *name, - DWORD access, REFIID riid, void **resource) + DWORD access, REFIID iid, void **resource) { - FIXME("iface %p, name %s, access %#x, riid %s, resource %p stub!\n", iface, debugstr_w(name), access, - debugstr_guid(riid), resource); + FIXME("iface %p, name %s, access %#x, iid %s, resource %p stub!\n", iface, debugstr_w(name), access, + debugstr_guid(iid), resource); return E_NOTIMPL; } @@ -3905,11 +3990,11 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID riid, - void **ppv) +static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID iid, + void **out) { struct d3d_device *device = impl_from_ID3D10Device(iface); - return IUnknown_QueryInterface(device->outer_unk, riid, ppv); + return IUnknown_QueryInterface(device->outer_unk, iid, out); } static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device1 *iface) @@ -5963,9 +6048,9 @@ static void STDMETHODCALLTYPE d3d10_multithread_Leave(ID3D10Multithread *iface) wined3d_mutex_unlock(); } -static BOOL STDMETHODCALLTYPE d3d10_multithread_SetMultithreadProtected(ID3D10Multithread *iface, BOOL protect) +static BOOL STDMETHODCALLTYPE d3d10_multithread_SetMultithreadProtected(ID3D10Multithread *iface, BOOL enable) { - FIXME("iface %p, protect %#x stub!\n", iface, protect); + FIXME("iface %p, enable %#x stub!\n", iface, enable); return TRUE; } @@ -5996,10 +6081,10 @@ static inline struct d3d_device *device_from_dxgi_device_parent(IWineDXGIDeviceP } static HRESULT STDMETHODCALLTYPE dxgi_device_parent_QueryInterface(IWineDXGIDeviceParent *iface, - REFIID riid, void **ppv) + REFIID iid, void **out) { struct d3d_device *device = device_from_dxgi_device_parent(iface); - return IUnknown_QueryInterface(device->outer_unk, riid, ppv); + return IUnknown_QueryInterface(device->outer_unk, iid, out); } static ULONG STDMETHODCALLTYPE dxgi_device_parent_AddRef(IWineDXGIDeviceParent *iface)

1 0

Henri Verbeet : wined3d: Get rid of the "target" parameter to wined3d_context_init().
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: c82423df853a8ad8e72f62f3bec1e0361c593230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82423df853a8ad8e72f62f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 6 21:34:28 2019 +0430 wined3d: Get rid of the "target" parameter to wined3d_context_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3b1832f..a4f4be5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1910,8 +1910,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; @@ -1952,7 +1951,7 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d context->device = device; context->swapchain = swapchain; - context->current_rt.texture = target; + context->current_rt.texture = swapchain->front_buffer; context->current_rt.sub_resource_idx = 0; context->tid = GetCurrentThreadId(); @@ -1981,7 +1980,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons return NULL; context = &context_gl->c; - if (!(wined3d_context_init(context, swapchain, target, ds_format))) + if (!(wined3d_context_init(context, swapchain))) { heap_free(context_gl); return NULL;

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Multithread.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 47abad1ddfcf6f6a47ed8395ad68c309ab161473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47abad1ddfcf6f6a47ed8395… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:03:25 2019 +0200 d3d11/tests: Add test for ID3D11Multithread. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b1148cd..5b56a04 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2152,7 +2152,10 @@ static void test_get_immediate_context(void) { ID3D11DeviceContext *immediate_context, *previous_immediate_context; ULONG expected_refcount, refcount; + ID3D11Multithread *multithread; ID3D11Device *device; + BOOL enabled; + HRESULT hr; if (!(device = create_device(NULL))) { @@ -2181,6 +2184,31 @@ static void test_get_immediate_context(void) refcount = ID3D11DeviceContext_Release(immediate_context); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ID3D11Device_GetImmediateContext(device, &immediate_context); + expected_refcount = get_refcount(immediate_context) + 1; + hr = ID3D11DeviceContext_QueryInterface(immediate_context, &IID_ID3D11Multithread, (void **)&multithread); + if (hr == E_NOINTERFACE) + { + win_skip("ID3D11Multithread is not supported.\n"); + goto done; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(immediate_context); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + + expected_refcount = refcount; + refcount = get_refcount(multithread); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + + enabled = ID3D11Multithread_GetMultithreadProtected(multithread); + todo_wine ok(!enabled, "Multithread protection is %#x.\n", enabled); + + ID3D11Multithread_Release(multithread); + +done: + refcount = ID3D11DeviceContext_Release(immediate_context); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Nikolay Sivov : mfplat: Add topology attributes guids.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 9092f1f3daaa5f58416a5989701983c94b6cae85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9092f1f3daaa5f58416a5989… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:14 2019 +0300 mfplat: Add topology attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- include/mfidl.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9092f1f3daaa5f58416a…

1 0

Alexandre Julliard : include/msvcrt: Add inttypes.h header.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: cff0227ff11b75ad4e13438c51dde5a867ef4355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff0227ff11b75ad4e13438c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 06:57:04 2019 -0500 include/msvcrt: Add inttypes.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/inttypes.h | 241 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6c8d39a..979695f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -424,6 +424,7 @@ SOURCES = \ msvcrt/fcntl.h \ msvcrt/float.h \ msvcrt/fpieee.h \ + msvcrt/inttypes.h \ msvcrt/io.h \ msvcrt/limits.h \ msvcrt/locale.h \ diff --git a/include/msvcrt/inttypes.h b/include/msvcrt/inttypes.h new file mode 100644 index 0000000..c26d732 --- /dev/null +++ b/include/msvcrt/inttypes.h @@ -0,0 +1,241 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +/* 7.8 Format conversion of integer types <inttypes.h> */ + +#ifndef _INTTYPES_H_ +#define _INTTYPES_H_ + +#include <crtdefs.h> +#include <stdint.h> +#define __need_wchar_t +#include <stddef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + intmax_t quot; + intmax_t rem; + } imaxdiv_t; + +/* 7.8.1 Macros for format specifiers */ +#define PRId64 "lld" +#define PRIi64 "lli" +#define PRIo64 "llo" +#define PRIu64 "llu" +#define PRIx64 "llx" +#define PRIX64 "llX" + +/* fprintf macros for signed types */ +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" + +#define PRIdLEAST8 "d" +#define PRIdLEAST16 "d" +#define PRIdLEAST32 "d" +#define PRIdLEAST64 PRId64 + +#define PRIdFAST8 "d" +#define PRIdFAST16 "d" +#define PRIdFAST32 "d" +#define PRIdFAST64 PRId64 + +#define PRIdMAX PRId64 + +#define PRIi8 "i" +#define PRIi16 "i" +#define PRIi32 "i" + +#define PRIiLEAST8 "i" +#define PRIiLEAST16 "i" +#define PRIiLEAST32 "i" +#define PRIiLEAST64 PRIi64 + +#define PRIiFAST8 "i" +#define PRIiFAST16 "i" +#define PRIiFAST32 "i" +#define PRIiFAST64 PRIi64 + +#define PRIiMAX PRIi64 + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" + +#define PRIoLEAST8 "o" +#define PRIoLEAST16 "o" +#define PRIoLEAST32 "o" +#define PRIoLEAST64 PRIo64 + +#define PRIoFAST8 "o" +#define PRIoFAST16 "o" +#define PRIoFAST32 "o" +#define PRIoFAST64 PRIo64 + +#define PRIoMAX PRIo64 + +/* fprintf macros for unsigned types */ +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" + + +#define PRIuLEAST8 "u" +#define PRIuLEAST16 "u" +#define PRIuLEAST32 "u" +#define PRIuLEAST64 PRIu64 + +#define PRIuFAST8 "u" +#define PRIuFAST16 "u" +#define PRIuFAST32 "u" +#define PRIuFAST64 PRIu64 + +#define PRIuMAX PRIu64 + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" + +#define PRIxLEAST8 "x" +#define PRIxLEAST16 "x" +#define PRIxLEAST32 "x" +#define PRIxLEAST64 PRIx64 + +#define PRIxFAST8 "x" +#define PRIxFAST16 "x" +#define PRIxFAST32 "x" +#define PRIxFAST64 PRIx64 + +#define PRIxMAX PRIx64 + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" + +#define PRIXLEAST8 "X" +#define PRIXLEAST16 "X" +#define PRIXLEAST32 "X" +#define PRIXLEAST64 PRIX64 + +#define PRIXFAST8 "X" +#define PRIXFAST16 "X" +#define PRIXFAST32 "X" +#define PRIXFAST64 PRIX64 + +#define PRIXMAX PRIX64 + +/* + * fscanf macros for signed int types + * NOTE: if 32-bit int is used for int_fast8_t and int_fast16_t + * (see stdint.h, 7.18.1.3), FAST8 and FAST16 should have + * no length identifiers + */ + +#define SCNd16 "hd" +#define SCNd32 "d" +#define SCNd64 PRId64 + +#define SCNdLEAST16 "hd" +#define SCNdLEAST32 "d" +#define SCNdLEAST64 PRId64 + +#define SCNdFAST16 "hd" +#define SCNdFAST32 "d" +#define SCNdFAST64 PRId64 + +#define SCNdMAX PRId64 + +#define SCNi16 "hi" +#define SCNi32 "i" +#define SCNi64 PRIi64 + +#define SCNiLEAST16 "hi" +#define SCNiLEAST32 "i" +#define SCNiLEAST64 PRIi64 + +#define SCNiFAST16 "hi" +#define SCNiFAST32 "i" +#define SCNiFAST64 PRIi64 + +#define SCNiMAX PRIi64 + +#define SCNo16 "ho" +#define SCNo32 "o" +#define SCNo64 PRIo64 + +#define SCNoLEAST16 "ho" +#define SCNoLEAST32 "o" +#define SCNoLEAST64 PRIo64 + +#define SCNoFAST16 "ho" +#define SCNoFAST32 "o" +#define SCNoFAST64 PRIo64 + +#define SCNoMAX PRIo64 + +#define SCNx16 "hx" +#define SCNx32 "x" +#define SCNx64 PRIx64 + +#define SCNxLEAST16 "hx" +#define SCNxLEAST32 "x" +#define SCNxLEAST64 PRIx64 + +#define SCNxFAST16 "hx" +#define SCNxFAST32 "x" +#define SCNxFAST64 PRIx64 + +#define SCNxMAX PRIx64 + +/* fscanf macros for unsigned int types */ + +#define SCNu16 "hu" +#define SCNu32 "u" +#define SCNu64 PRIu64 + +#define SCNuLEAST16 "hu" +#define SCNuLEAST32 "u" +#define SCNuLEAST64 PRIu64 + +#define SCNuFAST16 "hu" +#define SCNuFAST32 "u" +#define SCNuFAST64 PRIu64 + +#define SCNuMAX PRIu64 + +#ifdef _WIN64 +#define PRIdPTR PRId64 +#define PRIiPTR PRIi64 +#define PRIoPTR PRIo64 +#define PRIuPTR PRIu64 +#define PRIxPTR PRIx64 +#define PRIXPTR PRIX64 +#define SCNdPTR PRId64 +#define SCNiPTR PRIi64 +#define SCNoPTR PRIo64 +#define SCNxPTR PRIx64 +#define SCNuPTR PRIu64 +#else +#define PRIdPTR "d" +#define PRIiPTR "i" +#define PRIoPTR "o" +#define PRIuPTR "u" +#define PRIxPTR "x" +#define PRIXPTR "X" +#define SCNdPTR "d" +#define SCNiPTR "i" +#define SCNoPTR "o" +#define SCNxPTR "x" +#define SCNuPTR "u" +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ndef _INTTYPES_H */

1 0

Zebediah Figura : msi: Remove registration for no longer used WineMsiRemoteCustomAction coclass.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: f73fefd24c175436f3623939973b377d0822e02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f73fefd24c175436f3623939… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 26 15:59:34 2019 -0500 msi: Remove registration for no longer used WineMsiRemoteCustomAction coclass. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiserver.idl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 4eb33fe..1fda4fa 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -117,11 +117,6 @@ coclass MsiPatch { } /* FIXME: unidentified class */ coclass MsiServerX3 { interface IMsiServer; } -[ - uuid(ba26e6fa-4f27-4f56-953a-3f90272018aa) -] -coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller {

1 0

Piotr Caban : hid: Add support for ranges in find_value.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 6249de6e5d3e5f781a023e925c59672f1a3171d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6249de6e5d3e5f781a023e92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:06 2019 +0200 hid: Add support for ranges in find_value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index e4d4820..bfdc888 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -199,7 +199,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_HID_ELEMENT **element) + WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_REPORT *report = NULL; @@ -247,11 +247,22 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT for (i = 0; i < report->elementCount; i++) { - if (report->Elements[i].ElementType == ValueElement && - report->Elements[i].caps.value.UsagePage == UsagePage && - report->Elements[i].caps.value.u.NotRange.Usage == Usage) + HIDP_VALUE_CAPS *value = &report->Elements[i].caps.value; + + if (report->Elements[i].ElementType != ValueElement || + value->UsagePage != UsagePage) + continue; + + if (value->IsRange && value->u.Range.UsageMin <= Usage && Usage <= value->u.Range.UsageMax) + { + *element = report->Elements[i]; + element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); + element->bitCount = value->BitSize; + return HIDP_STATUS_SUCCESS; + } + else if (report->Elements[i].caps.value.u.NotRange.Usage == Usage) { - *element = &report->Elements[i]; + *element = report->Elements[i]; return HIDP_STATUS_SUCCESS; } } @@ -289,7 +300,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { NTSTATUS rc; - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); @@ -299,10 +310,10 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag { ULONG rawValue; rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, &rawValue); + element.valueStartBit, element.bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - *UsageValue = logical_to_physical(sign_extend(rawValue, element), element); + *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); } return rc; @@ -313,7 +324,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -324,7 +335,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -598,7 +609,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -609,7 +620,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -620,7 +631,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; ULONG i; @@ -634,7 +645,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, -1); + element.valueStartBit, element.bitCount, -1); if (rc != HIDP_STATUS_SUCCESS) {

1 0

Piotr Caban : hidclass.sys: Set LinkUsagePage field in build_elements function.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 31cd586c8cfc679441be2e3e54735df1c6b46fa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cd586c8cfc679441be2e3e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:38 2019 +0200 hidclass.sys: Set LinkUsagePage field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 90ba3d1..adf9a98 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -714,6 +714,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; wine_element->caps.button.LinkCollection = feature->collection->index; + wine_element->caps.button.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; @@ -750,6 +751,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; wine_element->caps.value.LinkCollection = feature->collection->index; + wine_element->caps.value.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange;

1 0

Nikolay Sivov : mf: Add a stub for sample grabber activation object.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 3170638758dabe531b3333b5a6f6c5783f4bb07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3170638758dabe531b3333b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:13 2019 +0300 mf: Add a stub for sample grabber activation object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 436 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/mf_private.h | 27 +++ dlls/mf/samplegrabber.c | 83 +++++++++ dlls/mf/tests/mf.c | 110 ++++++++++++ include/mfidl.idl | 26 ++- 7 files changed, 683 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3170638758dabe531b33…

1 0

Nikolay Sivov : mf: Implement SetObject()/GetObject() for topology node.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: c1d023565af92b9e3d3cc6c198191e652616f47e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d023565af92b9e3d3cc6c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:15 2019 +0300 mf: Implement SetObject()/GetObject() for topology node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 78 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index f233cff..bdb493c 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat +IMPORTS = mf mfplat mfuuid C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 059062f..cea5f98 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -27,6 +27,12 @@ #include "winbase.h" #include "initguid.h" +#include "ole2.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -35,11 +41,45 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_unk_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_unk_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl test_unk_vtbl = +{ + test_unk_QueryInterface, + test_unk_AddRef, + test_unk_Release, +}; + static void test_topology(void) { IMFCollection *collection, *collection2; + IUnknown test_unk2 = { &test_unk_vtbl }; + IUnknown test_unk = { &test_unk_vtbl }; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology, *topology2; + UINT32 attr_count; + IUnknown *object; DWORD size; WORD count; HRESULT hr; @@ -302,6 +342,49 @@ static void test_topology(void) ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); hr = IMFTopology_AddNode(topology, node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + /* Associated object. */ + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_SetObject(node, &test_unk); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == S_OK, "Failed to get object, hr %#x.\n", hr); + ok(object == &test_unk, "Unexpected object %p.\n", object); + IUnknown_Release(object); + + hr = IMFTopologyNode_SetObject(node, &test_unk2); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 0, "Unexpected attribute count %u.\n", attr_count); + + hr = IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &MF_TOPONODE_TRANSFORM_OBJECTID); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFTopologyNode_GetObject(node, &object); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!object, "Unexpected object %p.\n", object); + + hr = IMFTopologyNode_GetCount(node, &attr_count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(attr_count == 1, "Unexpected attribute count %u.\n", attr_count); + IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 543e08f..e01444b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -25,7 +25,13 @@ #include "windef.h" #include "winbase.h" + #include "initguid.h" +#include "ole2.h" +#include "ocidl.h" + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mferror.h" #include "mfidl.h" @@ -54,6 +60,8 @@ struct topology_node IMFAttributes *attributes; MF_TOPOLOGY_TYPE node_type; TOPOID id; + IUnknown *object; + CRITICAL_SECTION cs; }; struct topology_loader @@ -755,7 +763,10 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) if (!refcount) { + if (node->object) + IUnknown_Release(node->object); IMFAttributes_Release(node->attributes); + DeleteCriticalSection(&node->cs); heap_free(node); } @@ -1038,16 +1049,74 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) { - FIXME("(%p)->(%p)\n", iface, object); + static const GUID *iids[3] = { &IID_IPersist, &IID_IPersistStorage, &IID_IPersistPropertyBag }; + struct topology_node *node = impl_from_IMFTopologyNode(iface); + IPersist *persist = NULL; + BOOL has_object_id; + GUID object_id; + unsigned int i; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + has_object_id = IMFAttributes_GetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id) == S_OK; + + if (object && !has_object_id) + { + for (i = 0; i < ARRAY_SIZE(iids); ++i) + { + persist = NULL; + if (SUCCEEDED(hr = IUnknown_QueryInterface(object, iids[i], (void **)&persist))) + break; + } + + if (persist) + { + if (FAILED(hr = IPersist_GetClassID(persist, &object_id))) + { + IPersist_Release(persist); + persist = NULL; + } + } + } + + EnterCriticalSection(&node->cs); + + if (node->object) + IUnknown_Release(node->object); + node->object = object; + if (node->object) + IUnknown_AddRef(node->object); + + if (persist) + IMFAttributes_SetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id); + + LeaveCriticalSection(&node->cs); + + if (persist) + IPersist_Release(persist); + + return S_OK; } static HRESULT WINAPI topology_node_GetObject(IMFTopologyNode *iface, IUnknown **object) { - FIXME("(%p)->(%p)\n", iface, object); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + if (!object) + return E_POINTER; + + EnterCriticalSection(&node->cs); + + *object = node->object; + if (*object) + IUnknown_AddRef(*object); + + LeaveCriticalSection(&node->cs); + + return *object ? S_OK : E_FAIL; } static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOLOGY_TYPE *node_type) @@ -1243,6 +1312,7 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); + InitializeCriticalSection(&object->cs); *node = &object->IMFTopologyNode_iface;

1 0