September 2015 - Wine-commits

Alexandre Julliard : Import of upstream bugzilla release 4.4.10.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: master Commit: 4cbc7ece4add61eed2a0016d927cca4e43ef64a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4cbc7ece4add61eed2a00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:57:24 2015 +0900 Import of upstream bugzilla release 4.4.10. --- .htaccess | 17 +- .travis.yml | 8 + Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 107 ++++++- Bugzilla/Install/Requirements.pm | 12 +- Bugzilla/Search.pm | 15 +- Bugzilla/Template.pm | 2 + Bugzilla/User.pm | 14 +- Bugzilla/Util.pm | 12 +- Bugzilla/WebService/Bug.pm | 2 + Bugzilla/WebService/Bugzilla.pm | 2 +- Bugzilla/WebService/Server/JSONRPC.pm | 2 +- Bugzilla/WebService/Server/XMLRPC.pm | 9 + Bugzilla/WebService/User.pm | 2 - LICENSE | 373 ++++++++++++++++++++++ README | 146 ++++----- checksetup.pl | 5 +- docs/bugzilla.ent | 4 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 4 +- importxml.pl | 3 + relogin.cgi | 3 + t/003safesys.t | 11 +- taskgraph.json | 220 +++++++++++++ template/en/default/pages/release-notes.html.tmpl | 50 +++ 25 files changed, 901 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=4cbc7ece4add61eed…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: master Commit: caf6a1349e1d7e4a279eb8da2fb9308a2f7752a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=caf6a1349e1d7e4a279eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:58:22 2015 +0900 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.10.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: upstream Commit: 4cbc7ece4add61eed2a0016d927cca4e43ef64a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4cbc7ece4add61eed2a00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:57:24 2015 +0900 Import of upstream bugzilla release 4.4.10. --- .htaccess | 17 +- .travis.yml | 8 + Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 107 ++++++- Bugzilla/Install/Requirements.pm | 12 +- Bugzilla/Search.pm | 15 +- Bugzilla/Template.pm | 2 + Bugzilla/User.pm | 14 +- Bugzilla/Util.pm | 12 +- Bugzilla/WebService/Bug.pm | 2 + Bugzilla/WebService/Bugzilla.pm | 2 +- Bugzilla/WebService/Server/JSONRPC.pm | 2 +- Bugzilla/WebService/Server/XMLRPC.pm | 9 + Bugzilla/WebService/User.pm | 2 - LICENSE | 373 ++++++++++++++++++++++ README | 146 ++++----- checksetup.pl | 5 +- docs/bugzilla.ent | 4 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 4 +- importxml.pl | 3 + relogin.cgi | 3 + t/003safesys.t | 11 +- taskgraph.json | 220 +++++++++++++ template/en/default/pages/release-notes.html.tmpl | 50 +++ 25 files changed, 901 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=4cbc7ece4add61eed…

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateShaderResourceView().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 8972105ee5e1a642b17762797c39cb4a09008203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8972105ee5e1a642b17762797… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:47 2015 +0200 d3d11: Implement d3d11_device_CreateShaderResourceView(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 32 +++++++++++++++----------------- dlls/d3d11/view.c | 24 +++++++++++++++++++++++- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 93b82f9..e48befd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -202,8 +202,8 @@ struct d3d_shader_resource_view ID3D11Device *device; }; -HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ef12a33..dcaa49c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -119,9 +119,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *ifac static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device *iface, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11ShaderResourceView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_shader_resource_view *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + if (FAILED(hr = d3d_shader_resource_view_create(device, resource, desc, &object))) + return hr; + + *view = &object->ID3D11ShaderResourceView_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device *iface, @@ -147,7 +156,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic *view = &object->ID3D11RenderTargetView_iface; return S_OK; - } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, @@ -2113,28 +2121,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource))) { ERR("Resource does not implement ID3D11Resource.\n"); - HeapFree(GetProcessHeap(), 0, object); return E_FAIL; } - if (FAILED(hr = d3d_shader_resource_view_init(object, device, d3d11_resource, - (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) - { - WARN("Failed to initialize shader resource view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - ID3D11Resource_Release(d3d11_resource); - return hr; - } - + hr = d3d_shader_resource_view_create(device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc, + &object); ID3D11Resource_Release(d3d11_resource); + if (FAILED(hr)) + return hr; - TRACE("Created shader resource view %p.\n", object); *view = &object->ID3D10ShaderResourceView_iface; return S_OK; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 99b1be7..4b39cc8 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1449,7 +1449,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl d3d10_shader_resource_view_GetDesc, }; -HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, +static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; @@ -1493,6 +1493,28 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str return S_OK; } +HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) +{ + struct d3d_shader_resource_view *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) + { + WARN("Failed to initialize shader resource view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created shader resource view %p.\n", object); + *view = object; + + return S_OK; +} + struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) { if (!iface)

1 0

Józef Kucia : d3d11/tests: Port test_create_shader_resource_view() from d3d10core.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: eb45704ba88c2b0e59bf296a39c360d905a5d3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb45704ba88c2b0e59bf296a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:48 2015 +0200 d3d11/tests: Port test_create_shader_resource_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 15b9b19..8bf31dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -989,6 +989,102 @@ static void test_create_rendertarget_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_shader_resource_view(void) +{ + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D11ShaderResourceView *srview; + D3D11_BUFFER_DESC buffer_desc; + 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_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, NULL, &srview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = 0; + U(srv_desc).Buffer.ElementWidth = 64; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource 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; + ID3D11ShaderResourceView_GetDevice(srview, &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 = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 0; + 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_SHADER_RESOURCE; + 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); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); + + hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1000,4 +1096,5 @@ START_TEST(d3d11) test_buffer_interfaces(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); + test_create_shader_resource_view(); }

1 0

Jacek Caban : usp10: Added test of ScriptStringAnalyse call with 0 length string.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: efb1cf0299c23385f934fa9b3abc920bfca46611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1cf0299c23385f934fa9b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 10 12:46:47 2015 +0200 usp10: Added test of ScriptStringAnalyse call with 0 length string. --- dlls/usp10/tests/usp10.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b5d43f7..0db98d9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2547,6 +2547,12 @@ static void test_ScriptString(HDC hdc) &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); + /* Test that 0 length string returns E_INVALIDARG */ + hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, + ReqWidth, NULL, NULL, Dx, NULL, + &InClass, &ssa); + ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); + /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL,

1 0

Bruno Jesus : msvfw32: Trace only what matters in MCIWNDM_GETDEVICE.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 19d73d284745b3f24844ed5967f18ee2a9993f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d73d284745b3f24844ed596… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 10 00:48:05 2015 +0800 msvfw32: Trace only what matters in MCIWNDM_GETDEVICE. --- dlls/msvfw32/mciwnd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index e561b14..fc49973 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -1070,27 +1070,33 @@ end_of_mci_open: case MCIWNDM_GETDEVICEA: { + int len = 0; + char *str = (char *)lParam; MCI_SYSINFO_PARMSA mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandA(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an((LPSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an(str, len)); return 0; } case MCIWNDM_GETDEVICEW: { + int len = 0; + WCHAR *str = (WCHAR *)lParam; MCI_SYSINFO_PARMSW mci_sysinfo; - mci_sysinfo.lpstrReturn = (LPWSTR)lParam; + mci_sysinfo.lpstrReturn = str; mci_sysinfo.dwRetSize = wParam; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&mci_sysinfo); - TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn((LPWSTR)lParam, wParam)); + while(len < wParam && str[len]) len++; + TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn(str, len)); return 0; }

1 0

Marcus Meissner : ws2_32/tests: Fixed argument to GetComputerNameExW.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 5af9acadb6b5b162b137476482308e4e548b32db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af9acadb6b5b162b13747648… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Sep 9 21:47:14 2015 +0200 ws2_32/tests: Fixed argument to GetComputerNameExW. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fa1236e..2bcc92e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6313,7 +6313,7 @@ static void test_GetAddrInfoW(void) int i, ret; ADDRINFOW *result, *result2, *p, hint; WCHAR name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(WCHAR); if (!pGetAddrInfoW || !pFreeAddrInfoW) {

1 0

Dmitry Timoshkov : widl: Add special handling for pointers to arrays in the typelib generator.
by Alexandre Julliard 10 Sep '15

10 Sep '15

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/tests: Add another test for calling a varargs method.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 232f54aea2ff873305b437197f947da336b40038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232f54aea2ff873305b437197… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:16:32 2015 +0800 oleaut32/tests: Add another test for calling a varargs method. This time with passing SAFEARRAY as a reference. --- dlls/oleaut32/tests/tmarshal.c | 55 +++++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 3 ++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f18aecc..6b89774 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -874,6 +874,41 @@ static HRESULT WINAPI Widget_VarArg_Run( return S_OK; } +static HRESULT WINAPI Widget_VarArg_Ref_Run( + IWidget *iface, BSTR name, SAFEARRAY **params, VARIANT *result) +{ + static const WCHAR catW[] = { 'C','a','t',0 }; + static const WCHAR supermanW[] = { 'S','u','p','e','r','m','a','n',0 }; + LONG bound; + VARIANT *var; + BSTR bstr; + HRESULT hr; + + trace("VarArg_Ref_Run(%p,%p,%p)\n", name, params, result); + + ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + + hr = SafeArrayGetLBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayGetUBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayAccessData(*params, (void **)&var); + ok(hr == S_OK, "SafeArrayAccessData error %#x\n", hr); + + ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n", V_VT(&var[0])); + bstr = V_BSTR(&var[0]); + ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr)); + + hr = SafeArrayUnaccessData(*params); + ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -912,7 +947,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_put_prop_req_arg, Widget_pos_restrict, Widget_neg_restrict, - Widget_VarArg_Run + Widget_VarArg_Run, + Widget_VarArg_Ref_Run }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1554,6 +1590,23 @@ static void test_typelibmarshal(void) SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); + /* call VarArg_Ref_Run */ + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szCat); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 2; + 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])); + /* call Error */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index ff9cac3..680f4b4 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -182,6 +182,9 @@ library TestTypelib [id(DISPID_TM_VARARG_RUN), vararg] HRESULT VarArg_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) params, [out, retval] VARIANT *result); + + [id(DISPID_TM_VARARG_REF_RUN), vararg] + HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index d603a56..dfca216 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -45,6 +45,7 @@ #define DISPID_TM_NEG_RESTRICTED -26 #define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_TM_VARARG_RUN 28 +#define DISPID_TM_VARARG_REF_RUN 29 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0