September 2015 - Wine-Commits

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

Sept. 8, 2015

Module: wine Branch: master Commit: f7c923b1cb557698896db84f80ef5aa661af3369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c923b1cb557698896db84f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:46 2015 +0200 d3d11: Implement d3d11_depthstencil_view_GetDesc(). --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 12 +++++++- dlls/d3d11/view.c | 74 +++++++++++++++++++++++++++------------------- 3 files changed, 56 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c923b1cb557698896db…

1 0

Józef Kucia : d3d11: Rename wined3d_resource_from_resource() to wined3d_resource_from_d3d10_resource().
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: 916b1564d3e17304e3e1f4a6fc9c4eea96b142c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916b1564d3e17304e3e1f4a6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:44 2015 +0200 d3d11: Rename wined3d_resource_from_resource() to wined3d_resource_from_d3d10_resource(). --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 10 +++++----- dlls/d3d11/utils.c | 2 +- dlls/d3d11/view.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5549c9c..6c88747 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -63,7 +63,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; +struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e62e3e9..069c565 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1139,8 +1139,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); - wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); - wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_src_box.left = src_box->left; wined3d_src_box.top = src_box->top; wined3d_src_box.front = src_box->front; @@ -1161,8 +1161,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface, TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst_resource, src_resource); - wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); - wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource); wined3d_mutex_unlock(); @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac wined3d_box.back = box->back; } - wined3d_resource = wined3d_resource_from_resource(resource); + wined3d_resource = wined3d_resource_from_d3d10_resource(resource); wined3d_mutex_lock(); wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3d1da1f..514b147 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -502,7 +502,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc return d3d10_resource_misc_flags; } -struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) +struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 331808b..0d20314 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -693,7 +693,7 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); @@ -957,7 +957,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); @@ -1158,7 +1158,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL;

1 0

Józef Kucia : d3d11/tests: Add test for depth stencil view interfaces.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: f5e7018dbfa473f9507cd14846e97b82ccb70b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e7018dbfa473f9507cd1484… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:48 2015 +0200 d3d11/tests: Add test for depth stencil view interfaces. --- dlls/d3d11/tests/d3d11.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 817ca9c..960bd75 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -815,6 +815,74 @@ static void test_buffer_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_depthstencil_view_interfaces(void) +{ + D3D10_DEPTH_STENCIL_VIEW_DESC d3d10_dsv_desc; + D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc; + ID3D10DepthStencilView *d3d10_dsview; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DepthStencilView *dsview; + ID3D11Texture2D *texture; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + 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); + + dsv_desc.Format = texture_desc.Format; + dsv_desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; + dsv_desc.Flags = 0; + U(dsv_desc).Texture2D.MipSlice = 0; + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&d3d10_dsview); + ID3D11DepthStencilView_Release(dsview); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Depth stencil view should implement ID3D10DepthStencilView.\n"); + + if (FAILED(hr)) + { + win_skip("Depth stencil view does not implement ID3D10DepthStencilView.\n"); + goto done; + } + + ID3D10DepthStencilView_GetDesc(d3d10_dsview, &d3d10_dsv_desc); + ok(d3d10_dsv_desc.Format == dsv_desc.Format, "Got unexpected format %#x.\n", d3d10_dsv_desc.Format); + ok(d3d10_dsv_desc.ViewDimension == (D3D10_DSV_DIMENSION)dsv_desc.ViewDimension, + "Got unexpected view dimension %u.\n", d3d10_dsv_desc.ViewDimension); + ok(U(d3d10_dsv_desc).Texture2D.MipSlice == U(dsv_desc).Texture2D.MipSlice, + "Got unexpected mip slice %u.\n", U(d3d10_dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(d3d10_dsview); + +done: + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -824,4 +892,5 @@ START_TEST(d3d11) test_create_texture3d(); test_texture3d_interfaces(); test_buffer_interfaces(); + test_depthstencil_view_interfaces(); }

1 0

Gerald Pfeifer : d3d8: Avoid shift overflow in render_state_test_data_init.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: 604c2c1da0498a3e4c2bf5fcbd071c8ea5541b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=604c2c1da0498a3e4c2bf5fcb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 7 23:08:41 2015 +0200 d3d8: Avoid shift overflow in render_state_test_data_init. --- dlls/d3d8/tests/stateblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index e09ae6d..3ad9c1c 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1270,7 +1270,7 @@ static void render_state_test_data_init(struct render_state_data *data) data->states[idx++] = TRUE; /* ALPHABLENDENABLE */ data->states[idx++] = TRUE; /* FOGENABLE */ data->states[idx++] = TRUE; /* SPECULARENABLE */ - data->states[idx++] = 1 << 31; /* FOGCOLOR */ + data->states[idx++] = 1u << 31; /* FOGCOLOR */ data->states[idx++] = D3DFOG_EXP; /* FOGTABLEMODE */ data->states[idx++] = to_dword(0.1f); /* FOGSTART */ data->states[idx++] = to_dword(0.8f); /* FOGEND */

1 0

Alistair Leslie-Hughes : dwmapi: Add DwmUpdateThumbnailProperties stub.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: e28d6b2fb099795d2472a97d7ab0bfe868e90421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28d6b2fb099795d2472a97d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 2 11:20:24 2015 +1000 dwmapi: Add DwmUpdateThumbnailProperties stub. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 11 +++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index e83ee22..531f279 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -42,4 +42,4 @@ @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) -@ stub DwmUpdateThumbnailProperties +@ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 08373b9..a776cfe 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -250,3 +250,12 @@ HRESULT WINAPI DwmDetachMilContent(HWND hwnd) FIXME("(%p) stub\n", hwnd); return E_NOTIMPL; } + +/********************************************************************** + * DwmUpdateThumbnailProperties (DWMAPI.@) + */ +HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUMBNAIL_PROPERTIES *props) +{ + FIXME("(%p, %p) stub\n", thumbnail, props); + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index 3c5ed8f..035c831 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -107,6 +107,16 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +typedef struct _DWM_THUMBNAIL_PROPERTIES +{ + DWORD dwFlags; + RECT rcDestination; + RECT rcSource; + BYTE opacity; + BOOL fVisible; + BOOL fSourceClientAreaOnly; +} DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -121,6 +131,7 @@ DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); +DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *); #ifdef __cplusplus }

1 0

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

Sept. 8, 2015

Module: wine Branch: master Commit: c003e94371fab17b3e2da9b580816529d0dc1610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c003e94371fab17b3e2da9b58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:47 2015 +0200 d3d11: Implement d3d11_device_CreateDepthStencilView(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 29 ++++++++++++++--------------- dlls/d3d11/view.c | 24 +++++++++++++++++++++++- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6a134a3..c5593d7 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -166,8 +166,8 @@ struct d3d_depthstencil_view ID3D11Device *device; }; -HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device, - ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN; struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fad8fa3..d6065b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -143,9 +143,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **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_depthstencil_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_depthstencil_view_create(device, resource, desc, &object))) + return hr; + + *view = &object->ID3D11DepthStencilView_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *iface, @@ -2153,27 +2162,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic memcpy(&d3d11_desc.u, &desc->u, sizeof(d3d11_desc.u)); } - 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_depthstencil_view_init(object, device, d3d11_resource, desc ? &d3d11_desc : NULL))) - { - WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - ID3D11Resource_Release(d3d11_resource); - return hr; - } - + hr = d3d_depthstencil_view_create(device, d3d11_resource, desc ? &d3d11_desc : NULL, &object); ID3D11Resource_Release(d3d11_resource); + if (FAILED(hr)) + return hr; - TRACE("Created depthstencil view %p.\n", object); *view = &object->ID3D10DepthStencilView_iface; return S_OK; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 12db8e9..cff0948 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -687,7 +687,7 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_rendertarg } } -HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device, +static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device, ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) { struct wined3d_rendertarget_view_desc wined3d_desc; @@ -735,6 +735,28 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 return S_OK; } +HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) +{ + struct d3d_depthstencil_view *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_depthstencil_view_init(object, device, resource, desc))) + { + WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created depthstencil view %p.\n", object); + *view = object; + + return S_OK; +} + struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) { if (!iface)

1 0

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

Sept. 8, 2015

Module: wine Branch: master Commit: 07ce357505cccc0e9d97fd908e5db4ebb7af03e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ce357505cccc0e9d97fd908… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:45 2015 +0200 d3d11: Implement d3d11_depthstencil_view_GetResource(). The intent is to eventually eliminate wined3d_resource_from_d3d10_resource(). --- dlls/d3d11/buffer.c | 8 ++++++++ dlls/d3d11/d3d11_private.h | 7 +++++-- dlls/d3d11/device.c | 13 ++++++++++++- dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 22 ++++++++++++++++++++++ dlls/d3d11/view.c | 38 +++++++++++++++++++++----------------- 6 files changed, 76 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07ce357505cccc0e9d97f…

1 0

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

Sept. 8, 2015

Module: wine Branch: master Commit: 41740bec89f8fbc1796e8aa07eea763b34e631cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41740bec89f8fbc1796e8aa07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 8 01:12:43 2015 +0200 d3d11: Implement d3d11_depthstencil_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 c737273..5549c9c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -160,7 +160,7 @@ struct d3d_depthstencil_view struct wined3d_rendertarget_view *wined3d_view; D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3d_device *device, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2d9e5d8..331808b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -418,7 +418,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci wined3d_mutex_lock(); wined3d_rendertarget_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); @@ -430,7 +430,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDevice(ID3D11DepthStencilView *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = view->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_GetPrivateData(ID3D11DepthStencilView *iface, @@ -537,8 +542,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc 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_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, @@ -709,8 +713,8 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 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

Stefan Dösinger : wined3d: Remove wined3d_backbuffer_type.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: 2936e4ac54b14cc09c5b20b06b17fdb0545374b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2936e4ac54b14cc09c5b20b06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 7 23:50:34 2015 +0200 wined3d: Remove wined3d_backbuffer_type. --- dlls/d3d8/device.c | 5 +++-- dlls/d3d8/swapchain.c | 5 +++-- dlls/d3d9/device.c | 5 +++-- dlls/d3d9/swapchain.c | 5 +++-- dlls/dxgi/swapchain.c | 6 ++---- dlls/wined3d/swapchain.c | 6 +++--- include/wine/wined3d.h | 9 +-------- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 455c764..e899b34 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -732,6 +732,8 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) @@ -741,8 +743,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 70b7fb0..8efdd0a 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -120,6 +120,8 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + if (!backbuffer) { WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); @@ -127,8 +129,7 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, } wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); surface_impl = wined3d_resource_get_parent(wined3d_resource); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 01a6d9e..3a0376d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -754,6 +754,8 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, swapchain, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); @@ -764,8 +766,7 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT return D3DERR_INVALIDCALL; } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index b26a482..c995afb 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -160,6 +160,8 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + if (!backbuffer) { WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); @@ -167,8 +169,7 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, } wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); surface_impl = wined3d_resource_get_parent(wined3d_resource); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 10ae26d..366bdb9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,8 +152,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs); - if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, - buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO))) + if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, buffer_idx))) { LeaveCriticalSection(&dxgi_cs); return DXGI_ERROR_INVALID_CALL; @@ -235,8 +234,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); for (i = 0; i < wined3d_desc.backbuffer_count; ++i) { - texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - i, WINED3D_BACKBUFFER_TYPE_MONO); + texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, i); parent = wined3d_texture_get_parent(texture); IUnknown_AddRef(parent); if (IUnknown_Release(parent)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8fb9f6a..b37bbb9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -178,10 +178,10 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc } struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT back_buffer_idx, enum wined3d_backbuffer_type type) + UINT back_buffer_idx) { - TRACE("swapchain %p, back_buffer_idx %u, type %#x.\n", - swapchain, back_buffer_idx, type); + TRACE("swapchain %p, back_buffer_idx %u.\n", + swapchain, back_buffer_idx); /* Return invalid if there is no backbuffer array, otherwise it will * crash when ddraw is used (there swapchain->back_buffers is always diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c77cfe..7d4e5a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -503,13 +503,6 @@ enum wined3d_patch_edge_style WINED3D_PATCH_EDGE_CONTINUOUS = 1, }; -enum wined3d_backbuffer_type -{ - WINED3D_BACKBUFFER_TYPE_MONO = 0, - WINED3D_BACKBUFFER_TYPE_LEFT = 1, - WINED3D_BACKBUFFER_TYPE_RIGHT = 2, -}; - enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD = 1, @@ -2512,7 +2505,7 @@ HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct w void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type); + UINT backbuffer_idx); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Thomas Faller : kernel32/tests: Fix uninitialized memory of a test case.
by Alexandre Julliard Sept. 8, 2015

Sept. 8, 2015

Module: wine Branch: master Commit: 98aa8528d53365f497b9b6ef9b471aec420b1177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98aa8528d53365f497b9b6ef9… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Mon Sep 7 15:09:35 2015 +0200 kernel32/tests: Fix uninitialized memory of a test case. --- dlls/kernel32/tests/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 838d79c..c4de194 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -851,7 +851,8 @@ static void test_GetSystemTimes(void) sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); ok( !NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, - sizeof(*sppi), &ReturnLength), + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors, + &ReturnLength), "NtQuerySystemInformation failed\n" ); for (i = 0; i < sbi.NumberOfProcessors; i++)

1 0