July 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : msscript: Added IActiveScriptSiteWindow stub.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 11275cc707a10811aecdf201896384d487b11909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11275cc707a10811aecdf2018… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:18 2016 +0300 msscript: Added IActiveScriptSiteWindow stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 55 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 11 +++++--- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3fcbb42..752679a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -57,6 +57,7 @@ struct ConnectionPoint { typedef struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; + IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; IServiceProvider IServiceProvider_iface; LONG ref; @@ -222,6 +223,11 @@ static inline ScriptHost *impl_from_IActiveScriptSite(IActiveScriptSite *iface) return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface); } +static inline ScriptHost *impl_from_IActiveScriptSiteWindow(IActiveScriptSiteWindow *iface) +{ + return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSiteWindow_iface); +} + static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface); @@ -238,6 +244,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = &This->IActiveScriptSite_iface; + }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); + *ppv = &This->IActiveScriptSiteWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; @@ -379,6 +388,51 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +/* IActiveScriptSiteWindow */ +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *hwnd) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + + FIXME("(%p, %p)\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL enable) +{ + ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); + + FIXME("(%p, %d)\n", This, enable); + + return E_NOTIMPL; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + /* IServiceProvider */ static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) { @@ -428,6 +482,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; host->script = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 1ef7e9f..17b7fc1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -247,6 +247,7 @@ static ULONG WINAPI ActiveScript_Release(IActiveScript *iface) static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { IActiveScriptSiteInterruptPoll *poll; + IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; ICanHandleException *canexpection; @@ -258,7 +259,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(pass != NULL, "pass == NULL\n"); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteInterruptPoll, (void**)&poll); - ok(hres == E_NOINTERFACE, "Could not get IActiveScriptSiteInterruptPoll interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteInterruptPoll interface: %08x\n", hres); hres = IActiveScriptSite_GetLCID(pass, &lcid); ok(hres == S_OK, "GetLCID failed: %08x\n", hres); @@ -267,15 +268,19 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == E_NOTIMPL, "OnStateChange failed: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); - ok(hres == E_NOINTERFACE, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); - ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); IServiceProvider_Release(service); + hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteWindow, (void**)&window); + ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); + IActiveScriptSiteWindow_Release(window); + site = pass; IActiveScriptSite_AddRef(site); return S_OK;

1 0

Nikolay Sivov : msscript: Implement Reset().
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 20993a38f162bd5d75e3720d81307c8aa6df4a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20993a38f162bd5d75e3720d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:19 2016 +0300 msscript: Implement Reset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 9 ++++- dlls/msscript.ocx/tests/msscript.c | 79 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 752679a..79e53f1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -847,8 +847,13 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if (!This->host) + return E_FAIL; + + return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 17b7fc1..3f3ff00 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -94,6 +94,7 @@ DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); +DEFINE_EXPECT(SetScriptState_INITIALIZED); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -295,7 +296,13 @@ static HRESULT WINAPI ActiveScript_GetScriptSite(IActiveScript *iface, REFIID ri static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { - ok(0, "unexpected call\n"); + if (ss == SCRIPTSTATE_INITIALIZED) { + CHECK_EXPECT(SetScriptState_INITIALIZED); + return S_OK; + } + else + ok(0, "unexpected call, state %u\n", ss); + return E_NOTIMPL; } @@ -1010,6 +1017,75 @@ static void test_timeout(void) IScriptControl_Release(sc); } +static void test_Reset(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_Reset(sc); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + str = SysAllocString(vbW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_Language(sc, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) { + static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(testscriptW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine\n"); +} + START_TEST(msscript) { IUnknown *unk; @@ -1034,6 +1110,7 @@ START_TEST(msscript) test_viewobject(); test_pointerinactive(); test_timeout(); + test_Reset(); CoUninitialize(); }

1 0

Henri Verbeet : d3drm/tests: Fix some IDirect3D2 reference leaks.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: fe3a78ba996280b8c43ac99230e5d599c470e243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3a78ba996280b8c43ac9923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:56 2016 +0200 d3drm/tests: Fix some IDirect3D2 reference leaks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 15e62b5..76e4fb4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4474,7 +4474,7 @@ static void test_create_device_from_d3d2(void) /* Release leaked references */ while (IDirect3DRM_Release(d3drm1) > ref4); while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0); - while (IDirect3D2_Release(temp_d3d2) > ref5); + while (IDirect3D2_Release(temp_d3d2) >= ref5); IDirectDrawSurface_Release(surface); IDirectDraw2_Release(temp_ddraw2); IDirectDraw_Release(temp_ddraw1); @@ -4755,7 +4755,7 @@ static void test_create_device_from_d3d3(void) /* Release leaked references */ while (IDirect3DRM_Release(d3drm1) > ref4); while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0); - while (IDirect3D2_Release(temp_d3d2) > ref5); + while (IDirect3D2_Release(temp_d3d2) >= ref5); IDirectDrawSurface_Release(surface); IDirectDraw2_Release(temp_ddraw2); IDirectDraw_Release(temp_ddraw1);

1 0

Henri Verbeet : wined3d: Also try DRIVER_MODEL_NT6X in init_driver_info().
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: f03c25699723ed03aa0b05e5d432a52402608f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03c25699723ed03aa0b05e5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:57 2016 +0200 wined3d: Also try DRIVER_MODEL_NT6X in init_driver_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dc41c7e..a1af01c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1588,7 +1588,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * This could be an indication that our database is not up to date, so this should be fixed. */ if ((version_info = get_driver_version_info(driver, driver_model)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X))) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X)) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT6X))) { driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version);

1 0

Henri Verbeet : wined3d: Get rid of redundant NULL checks for event query "extendedData".
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 0a5e205c06e0f0ccf632e02a48e86a386a4884e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e205c06e0f0ccf632e02a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:58 2016 +0200 wined3d: Get rid of redundant NULL checks for event query "extendedData". If creation succeeded this is non-NULL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c8d6b47..c09fe86 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -244,7 +244,7 @@ static void wined3d_query_destroy_object(void *object) if (query->type == WINED3D_QUERY_TYPE_EVENT) { struct wined3d_event_query *event_query = query->extendedData; - if (event_query) wined3d_event_query_destroy(event_query); + wined3d_event_query_destroy(event_query); } else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { @@ -389,14 +389,8 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, TRACE("query %p, data %p, size %#x, flags %#x.\n", query, data, size, flags); - if (!data || !size) return S_OK; - if (!event_query) - { - WARN("Event query not supported by GL, reporting GPU idle.\n"); - signaled = TRUE; - fill_query_data(data, size, &signaled, sizeof(signaled)); + if (!data || !size) return S_OK; - } ret = wined3d_event_query_test(event_query, query->device); switch(ret) @@ -449,9 +443,6 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_event_query *event_query = query->extendedData; - /* Faked event query support */ - if (!event_query) return WINED3D_OK; - wined3d_event_query_issue(event_query, query->device); } else if (flags & WINED3DISSUE_BEGIN)

1 0

Hugh McMaster : regedit: Output the registry data type as a string when it is used in error messages.
by Alexandre Julliard 21 Jul '16

21 Jul '16

1 0

Hugh McMaster : reg: Handle a special case for Default values and ' reg query'.
by Alexandre Julliard 21 Jul '16

21 Jul '16

1 0

Iván Matellanes : msvcirt: Implement istream:: getdouble.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: ae5343bd97bb5a22857b1c72bccc7c68a8410337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5343bd97bb5a22857b1c72b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 21 10:56:50 2016 +0100 msvcirt: Implement istream::getdouble. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 63 +++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5343bd97bb5a22857b1…

1 0

Iván Matellanes : msvcirt: Implement istream::ws.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: 681e905b6e319baaa352f342a0ffa476b3242b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681e905b6e319baaa352f342a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 21 10:56:51 2016 +0100 msvcirt: Implement istream::ws. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9361d6b..7ea6541 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3546,8 +3546,9 @@ int __thiscall istream_getdouble(istream *this, char *str, int count) /* ?ws@@YAAEAVistream@@AEAV1@@Z */ istream* __cdecl istream_ws(istream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + istream_eatwhite(this); + return this; } /******************************************************************

1 0

Józef Kucia : d3d11: Allow creating UAVs for structured buffers with NULL description.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: b68dfc5c8a56e20fb75386c70b75c0668f74fd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68dfc5c8a56e20fb75386c70… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 20 15:49:43 2016 +0200 d3d11: Allow creating UAVs for structured buffers with NULL description. 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 | 25 +++++++++++++++++++++++++ dlls/d3d11/view.c | 27 +++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a20b8b..2ffad87 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9245,6 +9245,9 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); @@ -9261,6 +9264,28 @@ static void test_create_unordered_access_view(void) ID3D11UnorderedAccessView_Release(uav); ID3D11Buffer_Release(buffer); + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + buffer_desc.StructureByteStride = 4; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + memset(&uav_desc, 0, sizeof(uav_desc)); + ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); + + ok(uav_desc.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", uav_desc.Format); + ok(uav_desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER, "Got unexpected view dimension %#x.\n", + uav_desc.ViewDimension); + ok(!U(uav_desc).Buffer.FirstElement, "Got unexpected first element %u.\n", U(uav_desc).Buffer.FirstElement); + ok(U(uav_desc).Buffer.NumElements == 256, "Got unexpected num elements %u.\n", U(uav_desc).Buffer.NumElements); + ok(!U(uav_desc).Buffer.Flags, "Got unexpected flags %u.\n", U(uav_desc).Buffer.Flags); + + ID3D11UnorderedAccessView_Release(uav); + ID3D11Buffer_Release(buffer); + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5e48965..18ec0a2 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -710,6 +710,33 @@ static HRESULT set_uav_desc_from_resource(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *buffer; + + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Buffer, (void **)&buffer))) + { + ERR("Resource of type BUFFER doesn't implement ID3D11Buffer.\n"); + return E_INVALIDARG; + } + + ID3D11Buffer_GetDesc(buffer, &buffer_desc); + ID3D11Buffer_Release(buffer); + + if (buffer_desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED) + { + desc->Format = DXGI_FORMAT_UNKNOWN; + desc->ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + desc->u.Buffer.FirstElement = 0; + desc->u.Buffer.NumElements = buffer_desc.ByteWidth / buffer_desc.StructureByteStride; + desc->u.Buffer.Flags = 0; + return S_OK; + } + + return E_INVALIDARG; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { D3D11_TEXTURE2D_DESC texture_desc;

1 0