September 2015 - Wine-Commits

Dmitry Timoshkov : widl: Add special handling for pointers to arrays in the typelib generator.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 7d1e3691abdec3a31a9b0cdd83f3f13a61ff063f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1e3691abdec3a31a9b0cdd8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:16:25 2015 +0800 widl: Add special handling for pointers to arrays in the typelib generator. --- tools/widl/write_msft.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 88f1546..26600e4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1128,9 +1128,12 @@ static int encode_var( if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; + } else if (is_array(ref)) { + type_t *element_type = type_alias_get_aliasee(type_array_get_element(ref)); + mix_field = get_type_vt(element_type) | VT_ARRAY | VT_BYREF; } else { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][target_type]; mix_field = ((typedata[0] >> 16) == 0x7fff)? 0x7fff: 0x7ffe;

1 0

Dmitry Timoshkov : oleaut32: Add support for handling VT_VARIANT|VT_ARRAY|VT_BYREF argument type.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 97ce5f4874ecd9b16a2dd8d0d64205aab6cba67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ce5f4874ecd9b16a2dd8d0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:17:04 2015 +0800 oleaut32: Add support for handling VT_VARIANT|VT_ARRAY|VT_BYREF argument type. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 6b89774..d200785 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1602,7 +1602,6 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f4bba71..650fa21 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7078,7 +7078,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } V_VT(&rgvarg[i]) = rgvt[i]; } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0) + else if ((rgvt[i] == (VT_VARIANT | VT_ARRAY) || rgvt[i] == (VT_VARIANT | VT_ARRAY | VT_BYREF)) && func_desc->cParamsOpt < 0) { SAFEARRAY *a; SAFEARRAYBOUND bound; @@ -7107,7 +7107,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( SafeArrayDestroy(a); break; } - V_ARRAY(&rgvarg[i]) = a; + if (rgvt[i] & VT_BYREF) + V_BYREF(&rgvarg[i]) = &a; + else + V_ARRAY(&rgvarg[i]) = a; V_VT(&rgvarg[i]) = rgvt[i]; } else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg))

1 0

Dmitry Timoshkov : oleaut32/tests: Add a test to show that support for coercion to arrays of variants is specific to vararg methods.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 462ef66105ef1b2d6a0e54cb96a85921fb84fb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ef66105ef1b2d6a0e54cb9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:17:10 2015 +0800 oleaut32/tests: Add a test to show that support for coercion to arrays of variants is specific to vararg methods. --- dlls/oleaut32/tests/tmarshal.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index d200785..488c0d7 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1534,6 +1534,30 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call Array with BSTR argument - type mismatch */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_ARRAY, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr); + SysFreeString(V_BSTR(&vararg[0])); + + /* call ArrayPtr with BSTR argument - type mismatch */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARRAYPTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr); + SysFreeString(V_BSTR(&vararg[0])); + /* call VariantCArray - test marshaling of variant arrays */ V_VT(&vararg[0]) = VT_I4; V_I4(&vararg[0]) = 1;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 099bd271b149539674e5c52b01214a2a9f4731e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bd271b149539674e5c52b0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Sep 9 22:12:22 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index c268efd..df2404f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-08-21 22:21+0300\n" +"PO-Revision-Date: 2015-09-09 22:11+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7456,16 +7456,12 @@ msgid "&Convert..." msgstr "&Konvertuoti..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objektas" +msgstr "%1 %2 &objektą" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%s &Object" -msgstr "&Objektas" +msgstr "%s &objektas" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Riccardo Bortolato : wined3d: Remove volume reference counting from public interface.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 9eb47678de27d2c6bdbedde3515f89c228ba86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb47678de27d2c6bdbedde35… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:21 2015 +0200 wined3d: Remove volume reference counting from public interface. --- dlls/wined3d/volume.c | 4 ++-- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6d62c5e..2daa55e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -460,14 +460,14 @@ static void volume_unload(struct wined3d_resource *resource) resource_unload(resource); } -ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) +static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) { TRACE("Forwarding to container %p.\n", volume->container); return wined3d_texture_incref(volume->container); } -ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) +static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { TRACE("Forwarding to container %p.\n", volume->container); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f2447da..6f770a9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -283,9 +283,7 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e2b9e1f..d3dde35 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,10 +2566,8 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);

1 0

Józef Kucia : d3d11: Implement d3d11_rendertarget_view_GetDesc().
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 818051c50f4eee1de3b1428acf1f946252d86922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818051c50f4eee1de3b1428ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:44 2015 +0200 d3d11: Implement d3d11_rendertarget_view_GetDesc(). --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 3 +- dlls/d3d11/view.c | 90 ++++++++++++++++++++++++---------------------- 3 files changed, 51 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=818051c50f4eee1de3b14…

1 0

Józef Kucia : d3d11/tests: Port test_create_rendertarget_view() from d3d10core.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 5b4d759e5578079a807c90886bc974d3959f33bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4d759e5578079a807c90886… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:47 2015 +0200 d3d11/tests: Port test_create_rendertarget_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 960bd75..15b9b19 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -883,6 +883,112 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_rendertarget_view(void) +{ + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D11_SUBRESOURCE_DATA data = {0}; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + D3D11_BUFFER_DESC buffer_desc; + ID3D11RenderTargetView *rtview; + ID3D11Device *device, *tmp; + ID3D11Texture2D *texture; + ID3D11Buffer *buffer; + IUnknown *iface; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &data, &buffer); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Buffer_GetDevice(buffer, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_BUFFER; + U(rtv_desc).Buffer.ElementOffset = 0; + U(rtv_desc).Buffer.ElementWidth = 64; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)buffer, &rtv_desc, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11RenderTargetView_GetDevice(rtview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Render target view should implement ID3D10RenderTargetView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11RenderTargetView_Release(rtview); + ID3D11Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + /* For texture resources it's allowed to specify NULL as desc */ + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + + ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); + ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(U(rtv_desc).Texture2D.MipSlice == 0, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + + hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Render target view should implement ID3D10RenderTargetView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -893,4 +999,5 @@ START_TEST(d3d11) test_texture3d_interfaces(); test_buffer_interfaces(); test_depthstencil_view_interfaces(); + test_create_rendertarget_view(); }

1 0

Hugh McMaster : regsvr32: Return the most recent error code, even if later DLLs succeed.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: e19a8fd706768aa2bcbeeec2f22ca991c4821ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19a8fd706768aa2bcbeeec2f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 9 20:43:52 2015 +1000 regsvr32: Return the most recent error code, even if later DLLs succeed. --- programs/regsvr32/regsvr32.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index a1b55a3..03d45fa 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -19,9 +19,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This version deliberately differs in error handling compared to the - * Windows version. */ #define WIN32_LEAN_AND_MEAN @@ -221,7 +218,7 @@ static WCHAR *parse_command_line(WCHAR *command_line) int wmain(int argc, WCHAR* argv[]) { - int i; + int i, res, ret = 0; BOOL CallRegister = TRUE; BOOL CallInstall = FALSE; BOOL Unregister = FALSE; @@ -286,7 +283,7 @@ int wmain(int argc, WCHAR* argv[]) if (argv[i]) { WCHAR *DllName = argv[i]; - int res = 0; + res = 0; DllFound = TRUE; if (CallInstall && Unregister) @@ -294,7 +291,10 @@ int wmain(int argc, WCHAR* argv[]) /* The Windows version stops processing the current file on the first error. */ if (res) + { + ret = res; continue; + } if (!CallInstall || (CallInstall && CallRegister)) { @@ -305,13 +305,19 @@ int wmain(int argc, WCHAR* argv[]) } if (res) + { + ret = res; continue; + } if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); if (res) + { + ret = res; continue; + } } } @@ -324,5 +330,6 @@ int wmain(int argc, WCHAR* argv[]) OleUninitialize(); - return 0; + /* return the most recent error code, even if later DLLs succeed */ + return ret; }

1 0

Józef Kucia : d3d11: Implement d3d11_rendertarget_view_GetDevice().
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 2b211cab69cd43a4aad7c6c6a6a9f342ce3a2161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b211cab69cd43a4aad7c6c6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 9 01:35:46 2015 +0200 d3d11: Implement d3d11_rendertarget_view_GetDevice(). --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/view.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cddef4d..8abd975 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -181,7 +181,7 @@ struct d3d_rendertarget_view struct wined3d_rendertarget_view *wined3d_view; D3D11_RENDER_TARGET_VIEW_DESC desc; ID3D11Resource *resource; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *resource, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 195cd73..3010bac 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -827,7 +827,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); ID3D11Resource_Release(view->resource); - ID3D10Device1_Release(view->device); + ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, view); @@ -839,7 +839,12 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDevice(ID3D11RenderTargetView *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = view->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_GetPrivateData(ID3D11RenderTargetView *iface, @@ -955,8 +960,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)view->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, @@ -1137,8 +1141,8 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_mutex_unlock(); view->resource = resource; ID3D11Resource_AddRef(resource); - view->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(view->device); + view->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(view->device); return S_OK; }

1 0

Piotr Caban : wine.inf: Add HKLM\System\Select\Current key.
by Alexandre Julliard Sept. 9, 2015

Sept. 9, 2015

Module: wine Branch: master Commit: 86d70c67b831f633b43f6b666719daef506141f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d70c67b831f633b43f6b666… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 9 10:21:46 2015 +0200 wine.inf: Add HKLM\System\Select\Current key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2025d9e..f30942a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -658,6 +658,7 @@ HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 +HKLM,System\Select,"Current",0x10003,1 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components

1 0