November 2018 - Wine-Commits

Józef Kucia : tests: Add test for trying to map external vkd3d resource.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: 9058193365c1a2d723bf0fc2dd73ca3265b82bc9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9058193365c1a2d723bf0fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:32 2018 +0100 tests: Add test for trying to map external vkd3d resource. 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> --- tests/vkd3d_api.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index e0912c5..ff5704d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -816,7 +816,62 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, return vk_memory; } -static void test_vulkan_resource_present_state(void) +static void test_external_resource_map(void) +{ + struct vkd3d_image_resource_create_info resource_create_info; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + ID3D12Resource *vk_resource; + VkDeviceMemory vk_memory; + ID3D12Device *device; + VkDevice vk_device; + VkImage vk_image; + ULONG refcount; + HRESULT hr; + void *ptr; + + device = create_device(); + ok(device, "Failed to create device.\n"); + + vk_image = create_vulkan_image(device, 32, 32, + VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + vk_memory = allocate_vulkan_image_memory(device, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; + resource_create_info.vk_image = vk_image; + resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_create_info.desc.Alignment = 0; + resource_create_info.desc.Width = 32; + resource_create_info.desc.Height = 32; + resource_create_info.desc.DepthOrArraySize = 1; + resource_create_info.desc.MipLevels = 1; + resource_create_info.desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_create_info.desc.SampleDesc.Count = 1; + resource_create_info.desc.SampleDesc.Quality = 0; + resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_create_info.desc.Flags = 0; + resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; + hr = vkd3d_create_image_resource(device, &resource_create_info, &vk_resource); + ok(hr == S_OK, "Failed to create D3D12 resource for Vulkan image, hr %#x.\n", hr); + + ptr = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(vk_resource, 0, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (void *)0xdeadbeef, "Pointer was modified %p.\n", ptr); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); + ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + ID3D12Resource_Release(vk_resource); + vk_device = vkd3d_get_vk_device(device); + vkDestroyImage(vk_device, vk_image, NULL); + vkFreeMemory(vk_device, vk_memory, NULL); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void test_external_resource_present_state(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -989,6 +1044,7 @@ START_TEST(vkd3d_api) run_test(test_device_parent); run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); - run_test(test_vulkan_resource_present_state); + run_test(test_external_resource_map); + run_test(test_external_resource_present_state); run_test(test_formats); }

1 0

Józef Kucia : vkd3d: Validate sub-resource index in d3d12_resource_Unmap().
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: 361e5f627436aad94a12faffe711d5f4df617498 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=361e5f627436aad94a12faf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:28 2018 +0100 vkd3d: Validate sub-resource index in d3d12_resource_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> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80e7319..f4619ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -885,11 +885,19 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s const D3D12_RANGE *written_range) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; TRACE("iface %p, sub_resource %u, written_range %p.\n", iface, sub_resource, written_range); + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return; + } + if (!resource->map_count) { WARN("Resource %p is not mapped.\n", resource);

1 0

Józef Kucia : vkd3d: Validate sub-resource index in d3d12_resource_Map().
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: 91c11eed03d320e8713e0566854d02e47c1cc4f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91c11eed03d320e8713e056… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:27 2018 +0100 vkd3d: Validate sub-resource index in d3d12_resource_Map(). 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> --- libs/vkd3d/resource.c | 8 ++++++++ libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index be8bbed..80e7319 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -811,6 +811,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT const D3D12_RANGE *read_range, void **data) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; VkResult vr; HRESULT hr; @@ -826,6 +827,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT return E_INVALIDARG; } + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return E_INVALIDARG; + } + if (d3d12_resource_is_texture(resource)) { /* Textures seem to be mappable only on UMA adapters. */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d6c821b..daa60cb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -861,6 +861,11 @@ static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOU return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; } +static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D12_RESOURCE_DESC *desc) +{ + return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; +} + enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d: Assign "heap" and "heap_offset" in more appropriate places.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: vkd3d Branch: master Commit: dc36ab41e3a3cea15694b94f26bfbe0eb192514f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc36ab41e3a3cea15694b94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:26 2018 +0100 vkd3d: Assign "heap" and "heap_offset" in more appropriate places. Initializes all fields of struct d3d12_resource in d3d12_resource_init(). 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> --- libs/vkd3d/resource.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78101a5..be8bbed 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1138,6 +1138,9 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap_flags = heap_flags; resource->initial_state = initial_state; + resource->heap = NULL; + resource->heap_offset = 0; + resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1201,9 +1204,6 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return hr; } - object->heap = NULL; - object->heap_offset = 0; - TRACE("Created committed resource %p.\n", object); *resource = object; @@ -1243,8 +1243,15 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); - if (vr < 0) + if (vr == VK_SUCCESS) + { + resource->heap = heap; + resource->heap_offset = heap_offset; + } + else + { WARN("Failed to bind memory, vr %d.\n", vr); + } return hresult_from_vk_result(vr); } @@ -1266,9 +1273,6 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return hr; } - object->heap = heap; - object->heap_offset = heap_offset; - TRACE("Created placed resource %p.\n", object); *resource = object;

1 0

Francois Gouget : testbot: Add support for Wine's PARENTSRC.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: tools Branch: master Commit: 27463129bb40d2a17dcbd85a73a68de703677a2c URL: https://source.winehq.org/git/tools.git/?a=commit;h=27463129bb40d2a17dcbd85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 13 16:43:47 2018 +0100 testbot: Add support for Wine's PARENTSRC. This lets the TestBot take into account that modifying the source in a 'PARENTSRC' module affects the code of other modules. This impacts the time it takes to rebuild Wine and the tests to be rerun with the test=module option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6009264..f72cef5 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -60,13 +60,14 @@ sub UpdateWineData($) mkdir "$DataDir/latest" if (!-d "$DataDir/latest"); - my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; - return $ErrMessage if ($? != 0); + my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt' && egrep '^PARENTSRC *=' dlls/*/Makefile.in programs/*/Makefile.in >'$DataDir/latest/wine-parentsrc.txt'`; + return $? != 0 ? $ErrMessage : undef; } my $_TimeStamp; my $_WineFiles; my $_TestList; +my $_WineParentDirs; =pod =over 12 @@ -111,6 +112,21 @@ sub _LoadWineFiles() } close($fh); } + + $_WineParentDirs = {}; + $FileName = "$DataDir/latest/wine-parentsrc.txt"; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) + { + if ($Line =~ m~^\w+/([^/]+)/Makefile\.in:PARENTSRC *= *\.\./([^/\s]+)~) + { + my ($Child, $Parent) = ($1, $2); + $_WineParentDirs->{$Parent}->{$Child} = 1; + } + } + close($fh); + } } @@ -212,11 +228,14 @@ sub _HandleFile($$$) } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { - my ($Root, $Dir, $File) = ($1, $2, $3); + my ($Root, $PatchedDir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) + { + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + } $Impacts->{PatchedModules} = 1; - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") {

1 0

Baruch Rutman : winmm: Attempt only once to load the default joystick driver.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: ebae298aa4d2711fef35d4ac60c6012438f36d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebae298aa4d2711fef35d4ac… Author: Baruch Rutman <peterooch(a)gmail.com> Date: Fri Nov 9 00:45:19 2018 +0200 winmm: Attempt only once to load the default joystick driver. Signed-off-by: Baruch Rutman <peterooch(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 8a52942..5a12b36 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -68,12 +68,21 @@ static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; */ static BOOL JOY_LoadDriver(DWORD dwJoyID) { - if (dwJoyID >= MAXJOYSTICK) + static BOOL winejoystick_missing = FALSE; + + if (dwJoyID >= MAXJOYSTICK || winejoystick_missing) return FALSE; if (JOY_Sticks[dwJoyID].hDriver) return TRUE; JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID); + + if (!JOY_Sticks[dwJoyID].hDriver) + { + /* The default driver is missing, don't attempt to load it again */ + winejoystick_missing = TRUE; + } + return (JOY_Sticks[dwJoyID].hDriver != 0); }

1 0

Józef Kucia : ddraw: Validate "dwSize" when setting viewports.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: 709f596b6b3c3deb52c2869a50c83cb23740f56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=709f596b6b3c3deb52c2869a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 12 15:13:03 2018 +0100 ddraw: Validate "dwSize" when setting viewports. 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/ddraw/viewport.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index fad079f..6f8f33b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -309,6 +309,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE if (!vp) return DDERR_INVALIDPARAMS; + if (vp->dwSize != sizeof(*vp)) + { + WARN("Invalid D3DVIEWPORT size %u.\n", vp->dwSize); + return DDERR_INVALIDPARAMS; + } + if (TRACE_ON(ddraw)) { TRACE(" getting D3DVIEWPORT :\n"); @@ -343,13 +349,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE } viewport->use_vp2 = 0; - memset(&viewport->viewports.vp1, 0, sizeof(viewport->viewports.vp1)); - memcpy(&viewport->viewports.vp1, vp, vp->dwSize); + viewport->viewports.vp1 = *vp; /* Empirical testing on a couple of d3d1 games showed that these values * should be ignored. */ - viewport->viewports.vp1.dvMinZ = 0.0; - viewport->viewports.vp1.dvMaxZ = 1.0; + viewport->viewports.vp1.dvMinZ = 0.0f; + viewport->viewports.vp1.dvMaxZ = 1.0f; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { @@ -950,6 +955,12 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI if (!vp) return DDERR_INVALIDPARAMS; + if (vp->dwSize != sizeof(*vp)) + { + WARN("Invalid D3DVIEWPORT2 size %u.\n", vp->dwSize); + return DDERR_INVALIDPARAMS; + } + if (TRACE_ON(ddraw)) { TRACE(" getting D3DVIEWPORT2 :\n"); @@ -984,8 +995,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI } viewport->use_vp2 = 1; - memset(&viewport->viewports.vp2, 0, sizeof(viewport->viewports.vp2)); - memcpy(&viewport->viewports.vp2, vp, vp->dwSize); + viewport->viewports.vp2 = *vp; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) {

1 0

Józef Kucia : ddraw: Do not return unset viewport from GetViewport().
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: f4865564ec7c2b15e93ed2221e272ee36379e09d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4865564ec7c2b15e93ed222… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 12 15:13:05 2018 +0100 ddraw: Do not return unset viewport from GetViewport(). 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/ddraw/ddraw_private.h | 9 ++++++++- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/viewport.c | 42 ++++++++++++++++++++++++++++-------------- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 495cb8b..b035a7e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -474,6 +474,13 @@ struct d3d_material void material_activate(struct d3d_material *material) DECLSPEC_HIDDEN; struct d3d_material *d3d_material_create(struct ddraw *ddraw) DECLSPEC_HIDDEN; +enum ddraw_viewport_version +{ + DDRAW_VIEWPORT_VERSION_NONE, + DDRAW_VIEWPORT_VERSION_1, + DDRAW_VIEWPORT_VERSION_2, +}; + /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 *****************************************************************************/ @@ -491,7 +498,7 @@ struct d3d_viewport DWORD num_lights; DWORD map_lights; - int use_vp2; + enum ddraw_viewport_version version; union { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7d8ccec..59d07b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1260,7 +1260,7 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport_GetViewport(viewport, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1ae7ffe..8b9b249 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1435,11 +1435,11 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport2_GetViewport(viewport2, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); - todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); desc.vp2.dwSize = sizeof(desc.vp2) + 1; hr = IDirect3DViewport2_GetViewport2(viewport2, &desc.vp2); todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 28d7240..443c78b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1591,11 +1591,11 @@ static void test_viewport_object(void) todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); desc.vp1.dwSize = sizeof(desc.vp1); hr = IDirect3DViewport3_GetViewport(viewport3, &desc.vp1); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); ok(desc.vp1.dwSize == sizeof(desc.vp1), "Got unexpected dwSize %u.\n", desc.vp1.dwSize); hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); - todo_wine ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); - todo_wine ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); + ok(hr == D3DERR_VIEWPORTDATANOTSET, "Got unexpected hr %#x.\n", hr); + ok(desc.vp2.dwSize == sizeof(desc.vp2), "Got unexpected dwSize %u.\n", desc.vp2.dwSize); desc.vp2.dwSize = sizeof(desc.vp2) + 1; hr = IDirect3DViewport3_GetViewport2(viewport3, &desc.vp2); todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 6f8f33b..8cc60f1 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -69,7 +69,7 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights) } /* And copy the values in the structure used by the device */ - if (This->use_vp2) + if (This->version == DDRAW_VIEWPORT_VERSION_2) { vp.dwX = This->viewports.vp2.dwX; vp.dwY = This->viewports.vp2.dwY; @@ -259,10 +259,17 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE if (!vp) return DDERR_INVALIDPARAMS; + if (viewport->version == DDRAW_VIEWPORT_VERSION_NONE) + { + WARN("Viewport data was not set.\n"); + return D3DERR_VIEWPORTDATANOTSET; + } + wined3d_mutex_lock(); size = vp->dwSize; - if (!viewport->use_vp2) + memset(vp, 0, size); + if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); } @@ -275,10 +282,10 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE vp1.dwY = viewport->viewports.vp2.dwY; vp1.dwWidth = viewport->viewports.vp2.dwWidth; vp1.dwHeight = viewport->viewports.vp2.dwHeight; - vp1.dvMaxX = 0.0; - vp1.dvMaxY = 0.0; - vp1.dvScaleX = 0.0; - vp1.dvScaleY = 0.0; + vp1.dvMaxX = 0.0f; + vp1.dvMaxY = 0.0f; + vp1.dvScaleX = 0.0f; + vp1.dvScaleY = 0.0f; vp1.dvMinZ = viewport->viewports.vp2.dvMinZ; vp1.dvMaxZ = viewport->viewports.vp2.dvMaxZ; memcpy(vp, &vp1, size); @@ -348,7 +355,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE } } - viewport->use_vp2 = 0; + viewport->version = DDRAW_VIEWPORT_VERSION_1; viewport->viewports.vp1 = *vp; /* Empirical testing on a couple of d3d1 games showed that these values @@ -906,9 +913,16 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI if (!vp) return DDERR_INVALIDPARAMS; + if (viewport->version == DDRAW_VIEWPORT_VERSION_NONE) + { + WARN("Viewport data was not set.\n"); + return D3DERR_VIEWPORTDATANOTSET; + } + wined3d_mutex_lock(); size = vp->dwSize; - if (viewport->use_vp2) + memset(vp, 0, size); + if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size); } @@ -921,10 +935,10 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI vp2.dwY = viewport->viewports.vp1.dwY; vp2.dwWidth = viewport->viewports.vp1.dwWidth; vp2.dwHeight = viewport->viewports.vp1.dwHeight; - vp2.dvClipX = 0.0; - vp2.dvClipY = 0.0; - vp2.dvClipWidth = 0.0; - vp2.dvClipHeight = 0.0; + vp2.dvClipX = 0.0f; + vp2.dvClipY = 0.0f; + vp2.dvClipWidth = 0.0f; + vp2.dvClipHeight = 0.0f; vp2.dvMinZ = viewport->viewports.vp1.dvMinZ; vp2.dvMaxZ = viewport->viewports.vp1.dvMaxZ; memcpy(vp, &vp2, size); @@ -994,7 +1008,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI } } - viewport->use_vp2 = 1; + viewport->version = DDRAW_VIEWPORT_VERSION_2; viewport->viewports.vp2 = *vp; if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) @@ -1175,6 +1189,6 @@ void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw) viewport->IDirect3DViewport3_iface.lpVtbl = &d3d_viewport_vtbl; viewport->ref = 1; viewport->ddraw = ddraw; - viewport->use_vp2 = 0xff; + viewport->version = DDRAW_VIEWPORT_VERSION_NONE; list_init(&viewport->light_list); }

1 0

Józef Kucia : ddraw: Do not use unset viewport in viewport_activate().
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: ecad1995a0c13ec39673412adcc6f05e47ea51bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecad1995a0c13ec39673412a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 12 15:13:06 2018 +0100 ddraw: Do not use unset viewport in viewport_activate(). 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/ddraw/viewport.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 8cc60f1..e6f8621 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -68,6 +68,12 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights) } } + if (This->version == DDRAW_VIEWPORT_VERSION_NONE) + { + TRACE("Viewport data was not set.\n"); + return; + } + /* And copy the values in the structure used by the device */ if (This->version == DDRAW_VIEWPORT_VERSION_2) {

1 0

Michael Stefaniuc : atl100/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: 0c28ca8d50e02af1fedfec3a171a31b094cd9864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c28ca8d50e02af1fedfec3a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 12 20:29:05 2018 +0100 atl100/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index eecf079..bdd3c57 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -304,8 +304,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(scrrun_dll_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(scrrun_dll_suffixW)/sizeof(WCHAR), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(scrrun_dll_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +320,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n");

1 0