October 2015 - Wine-commits

Huw Davies : ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: ced5800b99d3251f372102bd23fb25df15debc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced5800b99d3251f372102bd2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:33 2015 +0000 ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr. However, this should not be done in the case of pUnkForRelease. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 116 +++++++++++++++++++++++++++++++++++++----- dlls/ole32/usrmarshal.c | 9 +++- 2 files changed, 111 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ced5800b99d3251f37210…

1 0

Huw Davies : ole32: Fix ref counting in GetDataHere Proxy.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 28b916b26eceb35a071e9aad76da1fbbaa857ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b916b26eceb35a071e9aad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:34 2015 +0000 ole32: Fix ref counting in GetDataHere Proxy. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 236 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/usrmarshal.c | 38 +++++-- 2 files changed, 267 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index c68689c..529ad75 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -85,6 +85,91 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, umcb->CBType = buffer ? USER_MARSHAL_CB_UNMARSHALL : USER_MARSHAL_CB_BUFFER_SIZE; } +#define RELEASEMARSHALDATA WM_USER + +struct host_object_data +{ + IStream *stream; + IID iid; + IUnknown *object; + MSHLFLAGS marshal_flags; + HANDLE marshal_event; + IMessageFilter *filter; +}; + +static DWORD CALLBACK host_object_proc(LPVOID p) +{ + struct host_object_data *data = p; + HRESULT hr; + MSG msg; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + if (data->filter) + { + IMessageFilter * prev_filter = NULL; + hr = CoRegisterMessageFilter(data->filter, &prev_filter); + if (prev_filter) IMessageFilter_Release(prev_filter); + ok(hr == S_OK, "got %08x\n", hr); + } + + hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + ok(hr == S_OK, "got %08x\n", hr); + + /* force the message queue to be created before signaling parent thread */ + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(data->marshal_event); + + while (GetMessageA(&msg, NULL, 0, 0)) + { + if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) + { + CoReleaseMarshalData(data->stream); + SetEvent((HANDLE)msg.lParam); + } + else + DispatchMessageA(&msg); + } + + HeapFree(GetProcessHeap(), 0, data); + + CoUninitialize(); + + return hr; +} + +static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) +{ + DWORD tid = 0; + HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); + struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + + data->stream = stream; + data->iid = *riid; + data->object = object; + data->marshal_flags = marshal_flags; + data->marshal_event = marshal_event; + data->filter = filter; + + *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); + + /* wait for marshaling to complete before returning */ + ok( !WaitForSingleObject(marshal_event, 10000), "wait timed out\n" ); + CloseHandle(marshal_event); + + return tid; +} + +static void end_host_object(DWORD tid, HANDLE thread) +{ + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); + ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + /* be careful of races - don't return until hosting thread has terminated */ + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + static const char cf_marshaled[] = { 0x9, 0x0, 0x0, 0x0, @@ -1105,9 +1190,156 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +struct obj +{ + IDataObject IDataObject_iface; +}; + +static HRESULT WINAPI obj_QueryInterface(IDataObject *iface, REFIID iid, void **obj) +{ + *obj = NULL; + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IDataObject)) + *obj = iface; + + if (*obj) + { + IDataObject_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI obj_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI obj_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI obj_DO_GetDataHere(IDataObject *iface, FORMATETC *fmt, + STGMEDIUM *med) +{ + ok( med->pUnkForRelease == NULL, "got %p\n", med->pUnkForRelease ); + + if (fmt->cfFormat == 2) + { + IStream_Release(U(med)->pstm); + U(med)->pstm = &Test_Stream2.IStream_iface; + } + + return S_OK; +} + +static const IDataObjectVtbl obj_data_object_vtbl = +{ + obj_QueryInterface, + obj_AddRef, + obj_Release, + NULL, /* GetData */ + obj_DO_GetDataHere, + NULL, /* QueryGetData */ + NULL, /* GetCanonicalFormatEtc */ + NULL, /* SetData */ + NULL, /* EnumFormatEtc */ + NULL, /* DAdvise */ + NULL, /* DUnadvise */ + NULL /* EnumDAdvise */ +}; + +static struct obj obj = +{ + {&obj_data_object_vtbl} +}; + +static void test_GetDataHere_Proxy(void) +{ + HRESULT hr; + IStream *stm; + HANDLE thread; + DWORD tid; + static const LARGE_INTEGER zero; + IDataObject *data; + FORMATETC fmt; + STGMEDIUM med; + + hr = CreateStreamOnHGlobal( NULL, TRUE, &stm ); + ok( hr == S_OK, "got %08x\n", hr ); + tid = start_host_object2( stm, &IID_IDataObject, (IUnknown *)&obj.IDataObject_iface, MSHLFLAGS_NORMAL, NULL, &thread ); + + IStream_Seek( stm, zero, STREAM_SEEK_SET, NULL ); + hr = CoUnmarshalInterface( stm, &IID_IDataObject, (void **)&data ); + ok( hr == S_OK, "got %08x\n", hr ); + IStream_Release( stm ); + + Test_Stream.refs = 1; + Test_Stream2.refs = 1; + Test_Unknown.refs = 1; + + fmt.cfFormat = 1; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + U(med).pstm = NULL; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + fmt.tymed = med.tymed = TYMED_NULL; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + for (fmt.tymed = TYMED_HGLOBAL; fmt.tymed <= TYMED_ENHMF; fmt.tymed <<= 1) + { + med.tymed = fmt.tymed; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == (fmt.tymed <= TYMED_ISTORAGE ? S_OK : DV_E_TYMED), "got %08x for tymed %d\n", hr, fmt.tymed ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + } + + fmt.tymed = TYMED_ISTREAM; + med.tymed = TYMED_ISTORAGE; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + + fmt.cfFormat = 2; + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + ok( Test_Stream2.refs == 0, "got %d\n", Test_Stream2.refs ); + + IDataObject_Release( data ); + end_host_object( tid, thread ); +} + START_TEST(usrmarshal) { - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_marshal_CLIPFORMAT(); test_marshal_HWND(); @@ -1122,5 +1354,7 @@ START_TEST(usrmarshal) test_marshal_HICON(); test_marshal_HBRUSH(); + test_GetDataHere_Proxy(); + CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 1a3f6af..89d0675 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2783,13 +2783,39 @@ HRESULT __RPC_STUB IDataObject_GetData_Stub( return IDataObject_GetData(This, pformatetcIn, pRemoteMedium); } -HRESULT CALLBACK IDataObject_GetDataHere_Proxy( - IDataObject* This, - FORMATETC *pformatetc, - STGMEDIUM *pmedium) +HRESULT CALLBACK IDataObject_GetDataHere_Proxy(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med) { - TRACE("(%p)->(%p, %p)\n", This, pformatetc, pmedium); - return IDataObject_RemoteGetDataHere_Proxy(This, pformatetc, pmedium); + IUnknown *release; + IStorage *stg = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", iface, fmt, med); + + if ((med->tymed & (TYMED_HGLOBAL | TYMED_FILE | TYMED_ISTREAM | TYMED_ISTORAGE)) == 0) + return DV_E_TYMED; + if (med->tymed != fmt->tymed) + return DV_E_TYMED; + + release = med->pUnkForRelease; + med->pUnkForRelease = NULL; + + if (med->tymed == TYMED_ISTREAM || med->tymed == TYMED_ISTORAGE) + { + stg = med->u.pstg; /* This may actually be a stream, but that's ok */ + if (stg) IStorage_AddRef( stg ); + } + + hr = IDataObject_RemoteGetDataHere_Proxy(iface, fmt, med); + + med->pUnkForRelease = release; + if (stg) + { + if (med->u.pstg) + IStorage_Release( med->u.pstg ); + med->u.pstg = stg; + } + + return hr; } HRESULT __RPC_STUB IDataObject_GetDataHere_Stub(

1 0

Alexandre Julliard : makefiles: Generate rules for building tool binaries.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 7626728b562fae32f6d0f0c5d01589e5861f09dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7626728b562fae32f6d0f0c5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 12:13:26 2015 +0900 makefiles: Generate rules for building tool binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- server/Makefile.in | 4 +++- tools/Makefile.in | 8 ++------ tools/make_makefiles | 1 + tools/makedep.c | 46 ++++++++++++++++++++++++++++++++++++++++++--- tools/sfnt2fon/Makefile.in | 7 ++----- tools/widl/Makefile.in | 9 +++------ tools/winebuild/Makefile.in | 9 ++------- tools/winedump/Makefile.in | 9 ++------- tools/winegcc/Makefile.in | 12 +++++------- tools/wmc/Makefile.in | 8 ++------ tools/wrc/Makefile.in | 8 ++------ 13 files changed, 71 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7626728b562fae32f6d0f…

1 0

Gediminas Jakutis : d3dx9: Add adjacency generation for D3DXCreateCylinder ().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 329fb2f72890b3f283b8d0d4e0e3cbb16a4b5a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=329fb2f72890b3f283b8d0d4e… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Mon Oct 26 20:15:50 2015 +0200 d3dx9: Add adjacency generation for D3DXCreateCylinder(). Signed-off-by: Gediminas Jakutis <gediminas(a)varciai.lt> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 39d279d..6294036 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4986,12 +4986,6 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 return D3DERR_INVALIDCALL; } - if (adjacency) - { - FIXME("Case of adjacency != NULL not implemented.\n"); - return E_NOTIMPL; - } - number_of_vertices = 2 + (slices * (3 + stacks)); number_of_faces = 2 * slices + stacks * (2 * slices); @@ -5143,6 +5137,23 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 free_sincos_table(&theta); cylinder->lpVtbl->UnlockIndexBuffer(cylinder); cylinder->lpVtbl->UnlockVertexBuffer(cylinder); + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency))) + { + cylinder->lpVtbl->Release(cylinder); + return hr; + } + + if (FAILED(hr = cylinder->lpVtbl->GenerateAdjacency(cylinder, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency)))) + { + (*adjacency)->lpVtbl->Release(*adjacency); + cylinder->lpVtbl->Release(cylinder); + return hr; + } + } + *mesh = cylinder; return D3D_OK;

1 0

Francois Gouget : d3d11: Make impl_from_ID3D11ShaderResourceView() static.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 26c5fcd007b17368d0c02643ef5f89f14a759d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c5fcd007b17368d0c02643e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 19:20:51 2015 +0100 d3d11: Make impl_from_ID3D11ShaderResourceView() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 91f9265..ca53764 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1189,7 +1189,7 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend /* ID3D11ShaderResourceView methods */ -struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) +static inline struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) { return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); }

1 0

Józef Kucia : d3d11: Rename d3d10_query to d3d_query.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 9ea84e251da6d62044c1d9bd05f00e7206b7f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea84e251da6d62044c1d9bd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:28 2015 +0100 d3d11: Rename d3d10_query to d3d_query. 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/async.c | 24 ++++++++++++------------ dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 8983321..8f691a2 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -24,16 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface) +static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) { - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -56,7 +56,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) { - struct d3d10_query *This = impl_from_ID3D10Query(iface); + struct d3d_query *This = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedDecrement(&query->refcount); TRACE("%p decreasing refcount to %u.\n", query, refcount); @@ -88,7 +88,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -99,7 +99,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -110,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -121,7 +121,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -181,15 +181,15 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; -struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d10_query_vtbl); - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e8f66e3..104b898 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -351,7 +351,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ -struct d3d10_query +struct d3d_query { ID3D10Query ID3D10Query_iface; LONG refcount; @@ -362,9 +362,9 @@ struct d3d10_query ID3D10Device1 *device; }; -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; -struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 380769d..58269d3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2212,7 +2212,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, ID3D10Predicate *predicate, BOOL value) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *query; + struct d3d_query *query; TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); @@ -2946,7 +2946,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, { struct d3d_device *device = impl_from_ID3D10Device(iface); struct wined3d_query *wined3d_predicate; - struct d3d10_query *predicate_impl; + struct d3d_query *predicate_impl; TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); @@ -3712,7 +3712,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, const D3D10_QUERY_DESC *desc, ID3D10Query **query) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr; TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); @@ -3720,7 +3720,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, desc, FALSE))) + if (FAILED(hr = d3d_query_init(object, device, desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3737,7 +3737,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa const D3D10_QUERY_DESC *desc, ID3D10Predicate **predicate) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr; TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); @@ -3754,7 +3754,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, desc, TRUE))) + if (FAILED(hr = d3d_query_init(object, device, desc, TRUE))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : d3d11: Add ID3D11Query interface stub.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: d86ee74b80d02c0f2278efaa07629ebebb499413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86ee74b80d02c0f2278efaa0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:29 2015 +0100 d3d11: Add ID3D11Query interface stub. 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/async.c | 157 +++++++++++++++++++++++++++++++++++++++------ dlls/d3d11/d3d11_private.h | 5 +- 2 files changed, 139 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 8f691a2..172a7e6 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -24,27 +24,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) +/* ID3D11Query methods */ + +static inline struct d3d_query *impl_from_ID3D11Query(ID3D11Query *iface) { - return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_query_QueryInterface(ID3D11Query *iface, REFIID riid, void **object) { - struct d3d_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + if ((IsEqualGUID(riid, &IID_ID3D11Predicate) && query->predicate) + || IsEqualGUID(riid, &IID_ID3D11Query) + || IsEqualGUID(riid, &IID_ID3D11Asynchronous) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11Query_AddRef(iface); + *object = iface; + return S_OK; + } + if ((IsEqualGUID(riid, &IID_ID3D10Predicate) && query->predicate) || IsEqualGUID(riid, &IID_ID3D10Query) || IsEqualGUID(riid, &IID_ID3D10Asynchronous) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) - || IsEqualGUID(riid, &IID_IUnknown)) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) { - IUnknown_AddRef(iface); - *object = iface; + ID3D10Query_AddRef(&query->ID3D10Query_iface); + *object = &query->ID3D10Query_iface; return S_OK; } @@ -54,26 +64,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) +static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) { - struct d3d_query *This = impl_from_ID3D10Query(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_query *query = impl_from_ID3D11Query(iface); + ULONG refcount = InterlockedIncrement(&query->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", query, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) +static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) { - struct d3d_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); ULONG refcount = InterlockedDecrement(&query->refcount); TRACE("%p decreasing refcount to %u.\n", query, refcount); if (!refcount) { - ID3D10Device1_Release(query->device); + ID3D11Device_Release(query->device); wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); wined3d_private_store_cleanup(&query->private_store); @@ -84,6 +94,111 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) return refcount; } +static void STDMETHODCALLTYPE d3d11_query_GetDevice(ID3D11Query *iface, ID3D11Device **device) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = query->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_GetPrivateData(ID3D11Query *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&query->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateData(ID3D11Query *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&query->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateDataInterface(ID3D11Query *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&query->private_store, guid, data); +} + +static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11QueryVtbl d3d11_query_vtbl = +{ + /* IUnknown methods */ + d3d11_query_QueryInterface, + d3d11_query_AddRef, + d3d11_query_Release, + /* ID3D11DeviceChild methods */ + d3d11_query_GetDevice, + d3d11_query_GetPrivateData, + d3d11_query_SetPrivateData, + d3d11_query_SetPrivateDataInterface, + /* ID3D11Asynchronous methods */ + d3d11_query_GetDataSize, + /* ID3D11Query methods */ + d3d11_query_GetDesc, +}; + +/* ID3D10Query methods */ + +static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_query_QueryInterface(&query->ID3D11Query_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_query_AddRef(&query->ID3D11Query_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_query_Release(&query->ID3D11Query_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) @@ -92,8 +207,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)query->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(query->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, @@ -215,6 +329,7 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, if (desc->MiscFlags) FIXME("Ignoring MiscFlags %#x.\n", desc->MiscFlags); + query->ID3D11Query_iface.lpVtbl = &d3d11_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; wined3d_mutex_lock(); @@ -231,8 +346,8 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, wined3d_mutex_unlock(); query->predicate = predicate; - query->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(query->device); + query->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(query->device); return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 104b898..7cb9ca6 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -350,16 +350,17 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; -/* ID3D10Query */ +/* ID3D11Query, ID3D10Query */ struct d3d_query { + ID3D11Query ID3D11Query_iface; ID3D10Query ID3D10Query_iface; LONG refcount; struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device,

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreatePredicate().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: e958d49b067fad4c562fdb09d3444b3ebebff097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958d49b067fad4c562fdb09d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:30 2015 +0100 d3d11: Implement d3d11_device_CreatePredicate(). 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/async.c | 55 ++++++++++++++++++++++++++++++++++++++-------- dlls/d3d11/d3d11_private.h | 4 +++- dlls/d3d11/device.c | 34 +++++++++++----------------- 3 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 172a7e6..3b9bb81 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -304,20 +304,20 @@ struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) } HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D10_QUERY_DESC *desc, BOOL predicate) + const D3D11_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; static const enum wined3d_query_type query_type_map[] = { - /* D3D10_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, - /* D3D10_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D10_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, - /* D3D10_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, - /* D3D10_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, - /* D3D10_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D10_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, - /* D3D10_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, + /* D3D11_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, + /* D3D11_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, + /* D3D11_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, + /* D3D11_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, + /* D3D11_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, }; if (desc->Query >= sizeof(query_type_map) / sizeof(*query_type_map)) @@ -351,3 +351,40 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, return S_OK; } + +HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, + struct d3d_query **query) +{ + struct d3d_query *object; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + if (predicate + && desc->Query != D3D11_QUERY_OCCLUSION_PREDICATE + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3) + { + WARN("Query type %u is not a predicate.\n", desc->Query); + return E_INVALIDARG; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_query_init(object, device, desc, predicate))) + { + WARN("Failed to initialize predicate, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created predicate %p.\n", object); + *query = object; + + return S_OK; +} diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7cb9ca6..722f266 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -364,7 +364,9 @@ struct d3d_query }; HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; + const D3D11_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; +HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, + struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 58269d3..f5aca82 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1593,9 +1593,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc, ID3D11Predicate **predicate) { - FIXME("iface %p, desc %p, predicate %p stub!\n", iface, desc, predicate); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); + + if (FAILED(hr = d3d_query_create(device, desc, TRUE, &object))) + return hr; + + *predicate = (ID3D11Predicate *)&object->ID3D11Query_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface, const D3D11_COUNTER_DESC *desc, @@ -3720,7 +3729,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_query_init(object, device, desc, FALSE))) + if (FAILED(hr = d3d_query_init(object, device, (const D3D11_QUERY_DESC *)desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3742,26 +3751,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); - if (!desc) - return E_INVALIDARG; - - if (desc->Query != D3D10_QUERY_OCCLUSION_PREDICATE && desc->Query != D3D10_QUERY_SO_OVERFLOW_PREDICATE) - { - WARN("Query type %#x is not a predicate.\n", desc->Query); - return E_INVALIDARG; - } - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_query_init(object, device, desc, TRUE))) - { - WARN("Failed to initialize predicate, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object))) return hr; - } - TRACE("Created predicate %p.\n", object); *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; return S_OK;

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateQuery().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: bd1bb06d84f10acf54045ff77652d08db6adaa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1bb06d84f10acf54045ff77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:31 2015 +0100 d3d11: Implement d3d11_device_CreateQuery(). 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/async.c | 2 +- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 25 +++++++++++++------------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 3b9bb81..1e96fb3 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -303,7 +303,7 @@ struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } -HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, +static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 722f266..fcd4742 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -363,8 +363,6 @@ struct d3d_query ID3D11Device *device; }; -HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D11_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f5aca82..5f567ab 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1583,11 +1583,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *i } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, - const D3D11_QUERY_DESC *desc, ID3D11Query **query) + const D3D11_QUERY_DESC *desc, ID3D11Query **query) { - FIXME("iface %p, desc %p, query %p stub!\n", iface, desc, query); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); + + if (FAILED(hr = d3d_query_create(device, desc, FALSE, &object))) + return hr; + + *query = &object->ID3D11Query_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc, @@ -3726,17 +3735,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_query_init(object, device, (const D3D11_QUERY_DESC *)desc, FALSE))) - { - WARN("Failed to initialize query, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, FALSE, &object))) return hr; - } - TRACE("Created query %p.\n", object); *query = &object->ID3D10Query_iface; return S_OK;

1 0

Józef Kucia : d3d10core/tests: Extend test_create_predicate().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 2728569d938e7d0c393d667c7c829b4a9595c247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728569d938e7d0c393d667c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:32 2015 +0100 d3d10core/tests: Extend test_create_predicate(). 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/d3d10core/tests/device.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5606c3b..6c6d8bb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1788,25 +1788,41 @@ static void test_create_rasterizer_state(void) static void test_create_predicate(void) { + static const D3D10_QUERY other_queries[] = + { + D3D10_QUERY_EVENT, + D3D10_QUERY_OCCLUSION, + D3D10_QUERY_TIMESTAMP, + D3D10_QUERY_TIMESTAMP_DISJOINT, + D3D10_QUERY_PIPELINE_STATISTICS, + D3D10_QUERY_SO_STATISTICS, + }; + ULONG refcount, expected_refcount; D3D10_QUERY_DESC query_desc; ID3D10Predicate *predicate; ID3D10Device *device, *tmp; + IUnknown *iface; + unsigned int i; HRESULT hr; if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } hr = ID3D10Device_CreatePredicate(device, NULL, &predicate); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - query_desc.Query = D3D10_QUERY_OCCLUSION; query_desc.MiscFlags = 0; - hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i) + { + query_desc.Query = other_queries[i]; + hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x for query type %u.\n", hr, other_queries[i]); + } query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE; expected_refcount = get_refcount((IUnknown *)device) + 1; @@ -1821,6 +1837,10 @@ static void test_create_predicate(void) refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10Predicate_QueryInterface(predicate, &IID_ID3D11Predicate, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Predicate should implement ID3D11Predicate.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D10Predicate_Release(predicate); query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE;

1 0