September 2015 - Wine-Commits

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Sept. 11, 2015

Sept. 11, 2015

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 Sept. 11, 2015

Sept. 11, 2015

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

Alexandre Julliard : Import of upstream bugzilla release 4.4.10.
by Alexandre Julliard Sept. 11, 2015

Sept. 11, 2015

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

Jacek Caban : usp10: Added test of ScriptStringAnalyse call with 0 length string.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

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

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

Sept. 10, 2015

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 Sept. 10, 2015

Sept. 10, 2015

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

Riccardo Bortolato : wined3d: Remove wined3d_surface_get_blt_status stub.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: e869ef5c0f5a11ab5981ecb1f4590fd592c711fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e869ef5c0f5a11ab5981ecb1f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:25 2015 +0200 wined3d: Remove wined3d_surface_get_blt_status stub. --- dlls/ddraw/surface.c | 16 +++++++--------- dlls/wined3d/surface.c | 15 --------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e815aa..fcdf04b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2945,18 +2945,16 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, Flags); - wined3d_mutex_lock(); - hr = wined3d_surface_get_blt_status(surface->wined3d_surface, Flags); - wined3d_mutex_unlock(); - switch(hr) + switch (Flags) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINEDDGBS_CANBLT: + case WINEDDGBS_ISBLTDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f01260c..f823e05 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,21 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf return &surface->resource; } -HRESULT CDECL wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags) -{ - TRACE("surface %p, flags %#x.\n", surface, flags); - - switch (flags) - { - case WINEDDGBS_CANBLT: - case WINEDDGBS_ISBLTDONE: - return WINED3D_OK; - - default: - return WINED3DERR_INVALIDCALL; - } -} - HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags) { TRACE("surface %p, flags %#x.\n", surface, flags); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6f770a9..26bd6dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) -@ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d3dde35..5739899 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); -HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);

1 0

Riccardo Bortolato : wined3d: Remove wined3d_surface_get_flip_status stub.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 825b141e5ae293fc7f0ba51de41ca6161cf09b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=825b141e5ae293fc7f0ba51de… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:26 2015 +0200 wined3d: Remove wined3d_surface_get_flip_status stub. --- dlls/ddraw/surface.c | 17 ++++++++--------- dlls/wined3d/surface.c | 17 ----------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fcdf04b..6b6ddb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3117,19 +3117,18 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, Flags); - wined3d_mutex_lock(); - hr = wined3d_surface_get_flip_status(surface->wined3d_surface, Flags); - wined3d_mutex_unlock(); + /* XXX: DDERR_INVALIDSURFACETYPE */ - switch(hr) + switch (Flags) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINEDDGFS_CANFLIP: + case WINEDDGFS_ISFLIPDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f823e05..999423d8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,23 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf return &surface->resource; } -HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags) -{ - TRACE("surface %p, flags %#x.\n", surface, flags); - - /* XXX: DDERR_INVALIDSURFACETYPE */ - - switch (flags) - { - case WINEDDGFS_CANFLIP: - case WINEDDGFS_ISFLIPDONE: - return WINED3D_OK; - - default: - return WINED3DERR_INVALIDCALL; - } -} - HRESULT CDECL wined3d_surface_is_lost(const struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 26bd6dd..9531dd3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) -@ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5739899..ac1e59e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); -HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0

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

Sept. 10, 2015

Module: wine Branch: master Commit: cdc8d9af86749f143d31259b5d41013e2d7ba9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc8d9af86749f143d31259b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:44 2015 +0200 d3d11: Implement d3d11_shader_resource_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 b5d0b72..420de97 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -199,7 +199,7 @@ struct d3d_shader_resource_view struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7410916..cac8c25 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1239,7 +1239,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); ID3D10Resource_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); @@ -1251,7 +1251,12 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = view->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface, @@ -1359,8 +1364,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR 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_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, @@ -1475,8 +1479,8 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str wined3d_mutex_unlock(); view->resource = resource; ID3D10Resource_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

Alexandre Julliard : gdi32: Add an intermediate pointer to avoid a compiler warning.
by Alexandre Julliard Sept. 10, 2015

Sept. 10, 2015

Module: wine Branch: master Commit: 58fe3afff527fd09cd729beea22e6ebfce82379a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fe3afff527fd09cd729beea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 19:47:24 2015 +0900 gdi32: Add an intermediate pointer to avoid a compiler warning. --- dlls/gdi32/bitblt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 762ca0f..08ebfd9 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -224,20 +224,21 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits /* helper to retrieve either both colors or only the background color for monochrome blits */ static void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) { + RGBQUAD *colors = info->bmiColors; COLORREF color = GetBkColor( hdc ); - info->bmiColors[count - 1].rgbRed = GetRValue( color ); - info->bmiColors[count - 1].rgbGreen = GetGValue( color ); - info->bmiColors[count - 1].rgbBlue = GetBValue( color ); - info->bmiColors[count - 1].rgbReserved = 0; + colors[count - 1].rgbRed = GetRValue( color ); + colors[count - 1].rgbGreen = GetGValue( color ); + colors[count - 1].rgbBlue = GetBValue( color ); + colors[count - 1].rgbReserved = 0; if (count > 1) { color = GetTextColor( hdc ); - info->bmiColors[0].rgbRed = GetRValue( color ); - info->bmiColors[0].rgbGreen = GetGValue( color ); - info->bmiColors[0].rgbBlue = GetBValue( color ); - info->bmiColors[0].rgbReserved = 0; + colors[0].rgbRed = GetRValue( color ); + colors[0].rgbGreen = GetGValue( color ); + colors[0].rgbBlue = GetBValue( color ); + colors[0].rgbReserved = 0; } info->bmiHeader.biClrUsed = count; }

1 0