February 2019 - Wine-commits

Józef Kucia : vkd3d: Do not advertise tiled resource support.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: a2f38f88e253ce92ac518bd64fb6713073f32c49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a2f38f88e253ce92ac518bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:28 2019 +0100 vkd3d: Do not advertise tiled resource support. Tiled resources are not implemented yet. 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/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 438e189..eeed42e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -961,6 +961,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, else device->feature_options.TiledResourcesTier = D3D12_TILED_RESOURCES_TIER_3; + /* FIXME: Implement tiled resources. */ + if (device->feature_options.TiledResourcesTier) + { + WARN("Tiled resources are not implemented yet.\n"); + device->feature_options.TiledResourcesTier = D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED; + } + if (device->vk_info.device_limits.maxPerStageDescriptorSamplers <= 16) device->feature_options.ResourceBindingTier = D3D12_RESOURCE_BINDING_TIER_1; else if (device->vk_info.device_limits.maxPerStageDescriptorUniformBuffers <= 14)

1 0

Józef Kucia : tests: Add test for D3D12_FEATURE_FORMAT_INFO.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: 7829461d6d475bbac11dd291bec8922f59bcc82c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7829461d6d475bbac11dd29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:29 2019 +0100 tests: Add test for D3D12_FEATURE_FORMAT_INFO. 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/d3d12.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 70d7362..259f0ca 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -966,6 +966,7 @@ static void test_check_feature_support(void) D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; + D3D12_FEATURE_DATA_FORMAT_INFO format_info; ID3D12Device *device; ULONG refcount; HRESULT hr; @@ -1079,6 +1080,30 @@ static void test_check_feature_support(void) ok(feature_levels.MaxSupportedFeatureLevel == 0x3000, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); + /* Format info. */ + memset(&format_info, 0, sizeof(format_info)); + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format); + todo ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + + memset(&format_info, 0, sizeof(format_info)); + format_info.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", format_info.Format); + todo ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + + memset(&format_info, 0, sizeof(format_info)); + format_info.Format = DXGI_FORMAT_R24G8_TYPELESS; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + todo ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == DXGI_FORMAT_R24G8_TYPELESS, "Got unexpected format %#x.\n", format_info.Format); + todo ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); + /* GPU virtual address */ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT,

1 0

Józef Kucia : vkd3d: Ignore barriers with unexpected sub-resource index.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: 552f7b8eebf7c3c84e08e6ef1e4018055b0af5fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=552f7b8eebf7c3c84e08e6e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:30 2019 +0100 vkd3d: Ignore barriers with unexpected sub-resource index. For planar formats. 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/command.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 65eee1b..22a568f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3207,6 +3207,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } else { + /* FIXME: Some formats in D3D12 are planar. Each plane is a separate sub-resource. */ + if (sub_resource_idx >= d3d12_resource_desc_get_sub_resource_count(&resource->desc)) + { + FIXME("Unhandled sub-resource idx %u.\n", sub_resource_idx); + continue; + } + vk_barrier.subresourceRange.baseMipLevel = sub_resource_idx % resource->desc.MipLevels; vk_barrier.subresourceRange.levelCount = 1; vk_barrier.subresourceRange.baseArrayLayer = sub_resource_idx / resource->desc.MipLevels;

1 0

Józef Kucia : vkd3d: Return the same value for MaxGPUVirtualAddressBitsPerResource.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: f98866f7d8f107870e72494c08e87e821f6207c3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f98866f7d8f107870e72494… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:31 2019 +0100 vkd3d: Return the same value for MaxGPUVirtualAddressBitsPerResource. 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/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index eeed42e..df59a49 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -981,7 +981,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.ROVsSupported = FALSE; /* GL_INTEL_conservative_rasterization, no Vulkan equivalent. */ device->feature_options.ConservativeRasterizationTier = D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED; - device->feature_options.MaxGPUVirtualAddressBitsPerResource = sizeof(D3D12_GPU_VIRTUAL_ADDRESS) * 8; + device->feature_options.MaxGPUVirtualAddressBitsPerResource = 40; /* FIXME */ device->feature_options.StandardSwizzle64KBSupported = FALSE; device->feature_options.CrossNodeSharingTier = D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED; device->feature_options.CrossAdapterRowMajorTextureSupported = FALSE; @@ -1942,6 +1942,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: { + const D3D12_FEATURE_DATA_D3D12_OPTIONS *options = &device->feature_options; D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; if (feature_data_size != sizeof(*data)) @@ -1950,9 +1951,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Returning 40 GPU virtual address bits.\n"); - data->MaxGPUVirtualAddressBitsPerResource = 40; - data->MaxGPUVirtualAddressBitsPerProcess = 40; + data->MaxGPUVirtualAddressBitsPerResource = options->MaxGPUVirtualAddressBitsPerResource; + data->MaxGPUVirtualAddressBitsPerProcess = options->MaxGPUVirtualAddressBitsPerResource; return S_OK; }

1 0

Józef Kucia : vkd3d: Trace decoded driver versions.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: 52e44b55334bec429c3193773c4cad46bdc1e8c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52e44b55334bec429c31937… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:27 2019 +0100 vkd3d: Trace decoded driver versions. 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/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b71d442..438e189 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -576,6 +576,8 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, const VkPhysicalDeviceProperties *vk_device_properties, const struct vkd3d_vk_instance_procs *vk_procs) { + const uint32_t driver_version = vk_device_properties->driverVersion; + const uint32_t api_version = vk_device_properties->apiVersion; VkPhysicalDeviceMemoryProperties memory_properties; VkQueueFamilyProperties *queue_properties; unsigned int i, j; @@ -583,9 +585,11 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, TRACE("Device name: %s.\n", vk_device_properties->deviceName); TRACE("Vendor ID: %#x, Device ID: %#x.\n", vk_device_properties->vendorID, vk_device_properties->deviceID); - TRACE("Driver version: %#x.\n", vk_device_properties->driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(vk_device_properties->apiVersion), - VK_VERSION_MINOR(vk_device_properties->apiVersion), VK_VERSION_PATCH(vk_device_properties->apiVersion)); + TRACE("Driver version: %#x (%u.%u.%u, %u.%u.%u.%u).\n", driver_version, + VK_VERSION_MAJOR(driver_version), VK_VERSION_MINOR(driver_version), VK_VERSION_PATCH(driver_version), + driver_version >> 22, (driver_version >> 14) & 0xff, (driver_version >> 6) & 0xff, driver_version & 0x3f); + TRACE("API version: %u.%u.%u.\n", + VK_VERSION_MAJOR(api_version), VK_VERSION_MINOR(api_version), VK_VERSION_PATCH(api_version)); VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL)); TRACE("Queue families [%u]:\n", count);

1 0

Alistair Leslie-Hughes : comdlg32: Improve Printer Setup dialog.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 211fd67ace14089d7326e415c752e458e3092bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=211fd67ace14089d7326e415… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 7 00:41:55 2019 +0000 comdlg32: Improve Printer Setup dialog. Reset the tab order to be more like Windows, add Help button. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 21 ++++++------ po/ar.po | 84 +++++++++++++++++++++++------------------------ po/bg.po | 84 +++++++++++++++++++++++------------------------ po/ca.po | 84 +++++++++++++++++++++++------------------------ po/cs.po | 84 +++++++++++++++++++++++------------------------ po/da.po | 84 +++++++++++++++++++++++------------------------ po/de.po | 84 +++++++++++++++++++++++------------------------ po/el.po | 84 +++++++++++++++++++++++------------------------ po/en.po | 84 +++++++++++++++++++++++------------------------ po/en_US.po | 84 +++++++++++++++++++++++------------------------ po/eo.po | 84 +++++++++++++++++++++++------------------------ po/es.po | 84 +++++++++++++++++++++++------------------------ po/fa.po | 84 +++++++++++++++++++++++------------------------ po/fi.po | 84 +++++++++++++++++++++++------------------------ po/fr.po | 84 +++++++++++++++++++++++------------------------ po/he.po | 84 +++++++++++++++++++++++------------------------ po/hi.po | 84 +++++++++++++++++++++++------------------------ po/hr.po | 84 +++++++++++++++++++++++------------------------ po/hu.po | 84 +++++++++++++++++++++++------------------------ po/it.po | 84 +++++++++++++++++++++++------------------------ po/ja.po | 84 +++++++++++++++++++++++------------------------ po/ko.po | 84 +++++++++++++++++++++++------------------------ po/lt.po | 84 +++++++++++++++++++++++------------------------ po/ml.po | 84 +++++++++++++++++++++++------------------------ po/nb_NO.po | 84 +++++++++++++++++++++++------------------------ po/nl.po | 84 +++++++++++++++++++++++------------------------ po/or.po | 84 +++++++++++++++++++++++------------------------ po/pa.po | 84 +++++++++++++++++++++++------------------------ po/pl.po | 84 +++++++++++++++++++++++------------------------ po/pt_BR.po | 84 +++++++++++++++++++++++------------------------ po/pt_PT.po | 84 +++++++++++++++++++++++------------------------ po/rm.po | 84 +++++++++++++++++++++++------------------------ po/ro.po | 84 +++++++++++++++++++++++------------------------ po/ru.po | 84 +++++++++++++++++++++++------------------------ po/si.po | 84 +++++++++++++++++++++++------------------------ po/sk.po | 84 +++++++++++++++++++++++------------------------ po/sl.po | 84 +++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 84 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 84 +++++++++++++++++++++++------------------------ po/sv.po | 84 +++++++++++++++++++++++------------------------ po/te.po | 84 +++++++++++++++++++++++------------------------ po/th.po | 84 +++++++++++++++++++++++------------------------ po/tr.po | 84 +++++++++++++++++++++++------------------------ po/uk.po | 84 +++++++++++++++++++++++------------------------ po/wa.po | 84 +++++++++++++++++++++++------------------------ po/wine.pot | 84 +++++++++++++++++++++++------------------------ po/zh_CN.po | 84 +++++++++++++++++++++++------------------------ po/zh_TW.po | 84 +++++++++++++++++++++++------------------------ 48 files changed, 1985 insertions(+), 1984 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=211fd67ace14089d7326…

1 0

Alistair Leslie-Hughes : mfplat: Implement MFGetSystemTime.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 7907ccfdcb39b30dc49c96c411332534525b6ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7907ccfdcb39b30dc49c96c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 12 04:00:08 2019 +0000 mfplat: Implement MFGetSystemTime. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46300 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 +++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c3465..7e1736c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -248,6 +248,17 @@ HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) return S_OK; } +MFTIME WINAPI MFGetSystemTime(void) +{ + MFTIME mf; + + TRACE("()\n"); + + GetSystemTimeAsFileTime( (FILETIME*)&mf ); + + return mf; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c828aea..349b926 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -98,7 +98,7 @@ @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader -@ stub MFGetSystemTime +@ stdcall MFGetSystemTime() @ stub MFGetTimerPeriodicity @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass diff --git a/include/mfidl.idl b/include/mfidl.idl index 124ae3c..6c81694 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -313,6 +313,7 @@ cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") +cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") [ object,

1 0

Isira Seneviratne : view: Move open dialog filter string to resource file and add extensions.
by Alexandre Julliard 13 Feb '19

13 Feb '19

1 0

Piotr Caban : kernel32/tests: Test that copy-on-write file mapping is not modifying the file.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 864919a2ea9df830d809e905cc0ad7cd5727fd2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=864919a2ea9df830d809e905… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 13 11:43:20 2019 +0100 kernel32/tests: Test that copy-on-write file mapping is not modifying the file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 01c698d..78bc17a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -4236,6 +4236,7 @@ static void test_mappings(void) { char temp_path[MAX_PATH]; char file_name[MAX_PATH]; + DWORD data, num_bytes; HANDLE hfile; GetTempPathA(MAX_PATH, temp_path); @@ -4248,6 +4249,13 @@ static void test_mappings(void) test_mapping( hfile, SEC_COMMIT, FALSE ); + /* test that file was not modified */ + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + ok(ReadFile(hfile, &data, sizeof(data), &num_bytes, NULL), "ReadFile failed\n"); + ok(num_bytes == sizeof(data), "num_bytes = %d\n", num_bytes); + todo_wine + ok(!data, "data = %x\n", data); + CloseHandle( hfile ); hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0);

1 0

Paul Gofman : d3d9/tests: Add test for buffer read / write.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 8863da8f3c6c397a86b2522ba734a06e5e994b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8863da8f3c6c397a86b2522b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 12 19:20:55 2019 +0300 d3d9/tests: Add test for buffer read / write. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2217569..f2bb3a4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13187,6 +13187,107 @@ static void test_multiply_transform(void) DestroyWindow(window); } +static void test_vertex_buffer_read_write(void) +{ + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + unsigned int i; + float *data; + HWND window; + HRESULT hr; + + static const struct vec3 tri[] = + { + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(tri), + D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, tri, sizeof(tri)); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Draw using the buffer to make wined3d create BO. */ + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*tri)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + data[i] = 3.0f; + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + ok(data[i] == 3.0f, "Got unexpected value %.8e, i %u.\n", data[i], i); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + todo_wine ok(data[i] == 3.0f, "Got unexpected value %.8e, i %u.\n", data[i], i); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + todo_wine ok(data[i] == 3.0f, "Got unexpected value %.8e, i %u.\n", data[i], i); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + data[i] = 4.0f; + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(tri), (void **)&data, D3DLOCK_NOOVERWRITE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 3; ++i) + ok(data[i] == 4.0f, "Got unexpected value %.8e, i %u.\n", data[i], i); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13312,6 +13413,7 @@ START_TEST(device) test_device_caps(); test_resource_access(); test_multiply_transform(); + test_vertex_buffer_read_write(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0