November 2015 - Wine-Commits

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_cs_exec_set_depth_stencil_view().
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: bb70c73205a35e03366897c8b6181bb8b9348bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb70c73205a35e03366897c8b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:36 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_cs_exec_set_depth_stencil_view(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3c4ea8c..316ccb8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -430,7 +430,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const surface_modify_ds_location(prev_surface, WINED3D_LOCATION_DISCARDED, prev->width, prev->height); if (prev_surface == device->onscreen_depth_stencil) { - wined3d_surface_decref(device->onscreen_depth_stencil); + wined3d_texture_decref(device->onscreen_depth_stencil->container); device->onscreen_depth_stencil = NULL; } }

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_uninit_3d().
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: ff3f729e88041d3c1f39c6f1b37e4d7b43d7160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3f729e88041d3c1f39c6f1b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:38 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_uninit_3d(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index caf1c32..241c52b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1102,7 +1102,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { surface = device->onscreen_depth_stencil; device->onscreen_depth_stencil = NULL; - wined3d_surface_decref(surface); + wined3d_texture_decref(surface->container); } if (device->fb.depth_stencil)

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in swapchain_gl_present().
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: e15e2569a8f91fdedd4b7e55f326ca2e4a122503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15e2569a8f91fdedd4b7e55f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:40 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in swapchain_gl_present(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e965bda..e45fe17 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -583,7 +583,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT fb->depth_stencil->width, fb->depth_stencil->height); if (ds == swapchain->device->onscreen_depth_stencil) { - wined3d_surface_decref(swapchain->device->onscreen_depth_stencil); + wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); swapchain->device->onscreen_depth_stencil = NULL; } }

1 0

Vincent Povirk : comdlg32: Initially focus filename text box.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: d0fac61c6dae28ef1608c1d39c979002e1c5994b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fac61c6dae28ef1608c1d39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 5 14:23:26 2015 -0600 comdlg32: Initially focus filename text box. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d66655a..f9a7707 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2065,7 +2065,10 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) if(This->filterspec_count) events_OnTypeChange(This); - return TRUE; + if ((hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME))) + SetFocus(hitem); + + return FALSE; } static LRESULT on_wm_size(FileDialogImpl *This)

1 0

Riccardo Bortolato : wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_reset().
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: b6c7cd972013c7bffc0c13e398412e5da09c560f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7cd972013c7bffc0c13e39… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Nov 5 16:00:39 2015 +0100 wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() in wined3d_device_reset(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 241c52b..2960e08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4525,7 +4525,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->onscreen_depth_stencil) { - wined3d_surface_decref(device->onscreen_depth_stencil); + wined3d_texture_decref(device->onscreen_depth_stencil->container); device->onscreen_depth_stencil = NULL; }

1 0

Vincent Povirk : makedep: Fix install rule for .idl files.
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: d37f41218997befd1f5bf99accfa5b784ed972d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f41218997befd1f5bf99ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 4 13:05:17 2015 -0600 makedep: Fix install rule for .idl files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7ce6a0a..c96bf46 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2104,7 +2104,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); if (source->file->flags & FLAG_INSTALL) { - strarray_add( &make->install_dev_rules, xstrdup( source->filename )); + strarray_add( &make->install_dev_rules, xstrdup( source->name )); strarray_add( &make->install_dev_rules, strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); if (source->file->flags & FLAG_IDL_HEADER)

1 0

Józef Kucia : wined3d: Remove wined3d_texture_{map, unmap}().
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 01c3fac140fbb78dde42ad1a344d0618783b285d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c3fac140fbb78dde42ad1a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:41 2015 +0100 wined3d: Remove wined3d_texture_{map,unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 ----------------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4380e5f..1d5bec7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1547,23 +1547,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct return WINED3D_OK; } -HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) -{ - TRACE("texture %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", - texture, sub_resource_idx, map_desc, box, flags); - - return texture->resource.resource_ops->resource_sub_resource_map(&texture->resource, sub_resource_idx, - map_desc, box, flags); -} - -HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - - return texture->resource.resource_ops->resource_sub_resource_unmap(&texture->resource, sub_resource_idx); -} - HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc) { struct wined3d_resource *sub_resource; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7067e08..a7e625d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -276,8 +276,6 @@ @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) -@ cdecl wined3d_texture_map(ptr long ptr ptr long) -@ cdecl wined3d_texture_unmap(ptr long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c9258a..2deb450 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2554,10 +2554,7 @@ HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture * HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD flags, const struct wined3d_color_key *color_key); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); -HRESULT __cdecl wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); -HRESULT __cdecl wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Alexandre Julliard : widl: Disable a noisy warning.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 87dacc4e11d4c6976add0754fa1b3afcd3a8fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dacc4e11d4c6976add0754f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 23:21:50 2015 +0900 widl: Disable a noisy warning. This could be re-enabled once there's a mechanism to avoid the warning when building the corresponding test case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7396944..8b65ead 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -504,10 +504,11 @@ static int ctl2_alloc_guid( offset = ctl2_find_guid(typelib, hash_key, &guid->guid); if (offset != -1) { - warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, - guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], - guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + if (pedantic) + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); return -1; }

1 0

Józef Kucia : d3d11/tests: Add test for resource mapping.
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: 7fbf33f1a4c43b13d5878458aecd1a3742317e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf33f1a4c43b13d5878458a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:13 2015 +0100 d3d11/tests: Add test for resource mapping. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 22bf187..453fb52 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2443,6 +2443,148 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_resource_map(void) +{ + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + D3D11_TEXTURE3D_DESC texture3d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture3D *texture3d; + ID3D11Texture2D *texture2d; + ID3D11Buffer *buffer; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + DWORD data; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + 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 = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 1024, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 1024, "Got unexpected depth pitch %u.\n", mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffer, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 1024, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 1024, "Got unexpected depth pitch %u.\n", mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)buffer, 0); + + refcount = ID3D11Buffer_Release(buffer); + ok(!refcount, "Buffer has %u references left.\n", refcount); + + texture2d_desc.Width = 512; + texture2d_desc.Height = 512; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_STAGING; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + texture2d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 512, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 512 * 512, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture2d, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 512, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 512 * 512, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture2d, 0); + + refcount = ID3D11Texture2D_Release(texture2d); + ok(!refcount, "2D texture has %u references left.\n", refcount); + + texture3d_desc.Width = 64; + texture3d_desc.Height = 64; + texture3d_desc.Depth = 64; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_STAGING; + texture3d_desc.BindFlags = 0; + texture3d_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &texture3d); + ok(SUCCEEDED(hr), "Failed to create 3d texture, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 1, D3D11_MAP_READ, 0, &mapped_subresource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); + todo_wine ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + if (FAILED(hr)) goto done; + ok(mapped_subresource.RowPitch == 4 * 64, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 64 * 64, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + *((DWORD *)mapped_subresource.pData) = 0xdeadbeef; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture3d, 0); + + memset(&mapped_subresource, 0, sizeof(mapped_subresource)); + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture3d, 0, D3D11_MAP_READ, 0, &mapped_subresource); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ok(mapped_subresource.RowPitch == 4 * 64, "Got unexpected row pitch %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 4 * 64 * 64, "Got unexpected depth pitch %u.\n", + mapped_subresource.DepthPitch); + data = *((DWORD *)mapped_subresource.pData); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)texture3d, 0); + +done: + refcount = ID3D11Texture3D_Release(texture3d); + ok(!refcount, "3D texture has %u references left.\n", refcount); + + ID3D11DeviceContext_Release(context); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -2465,4 +2607,5 @@ START_TEST(d3d11) test_create_predicate(); test_device_removed_reason(); test_private_data(); + test_resource_map(); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSSetViewports().
by Alexandre Julliard Nov. 5, 2015

Nov. 5, 2015

Module: wine Branch: master Commit: c390d78618c963bf891d0ebcd18ad5676c4dc7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c390d78618c963bf891d0ebcd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:14 2015 +0100 d3d11: Implement d3d11_immediate_context_RSSetViewports(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ca8b0ef..f655a3e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -482,7 +482,33 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %u, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); + + if (viewport_count > 1) + FIXME("Multiple viewports not implemented.\n"); + + if (!viewport_count) + return; + + if (viewports[0].TopLeftX != (UINT)viewports[0].TopLeftX + || viewports[0].TopLeftY != (UINT)viewports[0].TopLeftY + || viewports[0].Width != (UINT)viewports[0].Width + || viewports[0].Height != (UINT)viewports[0].Height) + FIXME("Floating-point viewports not implemented.\n"); + + wined3d_vp.x = viewports[0].TopLeftX; + wined3d_vp.y = viewports[0].TopLeftY; + wined3d_vp.width = viewports[0].Width; + wined3d_vp.height = viewports[0].Height; + wined3d_vp.min_z = viewports[0].MinDepth; + wined3d_vp.max_z = viewports[0].MaxDepth; + + wined3d_mutex_lock(); + wined3d_device_set_viewport(device->wined3d_device, &wined3d_vp); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext *iface,

1 0