May 2019 - Wine-commits - list.winehq.org

Jactry Zeng : d3dcompiler: Implement D3DReadFileToBlob().
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 622422e67bfd9da487102aee4ca42681a24a8e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=622422e67bfd9da487102aee… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 7 22:42:24 2019 +0200 d3dcompiler: Implement D3DReadFileToBlob(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/blob.c | 50 ++++++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/tests/blob.c | 132 ++++++++++++++++++++++++++++-- 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index f22dc71..6c925af 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -466,9 +466,55 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) { - FIXME("filename %s, contents %p\n", debugstr_w(filename), contents); + struct d3dcompiler_blob *object; + SIZE_T data_size; + DWORD read_size; + HANDLE file; + HRESULT hr; - return E_NOTIMPL; + TRACE("filename %s, contents %p.\n", debugstr_w(filename), contents); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + data_size = GetFileSize(file, NULL); + if (data_size == INVALID_FILE_SIZE) + { + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + CloseHandle(file); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = d3dcompiler_blob_init(object, data_size))) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + CloseHandle(file); + heap_free(object); + return hr; + } + + if (!ReadFile(file, object->data, data_size, &read_size, NULL) || (read_size != data_size)) + { + WARN("Failed to read file contents.\n"); + CloseHandle(file); + heap_free(object->data); + heap_free(object); + return E_FAIL; + } + CloseHandle(file); + object->size = read_size; + + *contents = &object->ID3DBlob_iface; + + TRACE("Returning ID3DBlob %p.\n", *contents); + + return S_OK; } HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 68ff962..dabe0da 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/list.h" #include "wine/rbtree.h" +#include "wine/heap.h" #define COBJMACROS #include "windef.h" diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 443ed27..3e1a3aa 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -35,6 +35,7 @@ static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DReadFileToBlob)(const WCHAR *, ID3DBlob **); static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -740,7 +741,7 @@ static void test_get_blob_part2(void) ok(!refcount, "ID3DBlob has %u references left\n", refcount); } -static BOOL load_d3dcompiler(void) +static BOOL load_d3dcompiler_43(void) { HMODULE module; @@ -752,15 +753,134 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static BOOL load_d3dcompiler_47(void) +{ + HMODULE module; + + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) + return FALSE; + + pD3DReadFileToBlob = (void *)GetProcAddress(module, "D3DReadFileToBlob"); + return TRUE; +} + +static BOOL create_file(WCHAR *filename, const DWORD *data, DWORD data_size) +{ + static WCHAR temp_dir[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (data) + { + WriteFile(file, data, data_size, &written, NULL); + if (written != data_size) + { + CloseHandle(file); + DeleteFileW(filename); + return FALSE; + } + } + CloseHandle(file); + return TRUE; +} + +/* test_cso_data - fxc.exe file.hlsl /Fo file.cso */ +static const DWORD test_cso_data[] = +{ +#if 0 + struct PSInput + { + float4 value : SV_POSITION; + }; + + PSInput main(float4 position : POSITION) + { + PSInput result; + result.value = position; + return result; + } +#endif + 0xfffe0200, 0x0014fffe, 0x42415443, 0x0000001c, 0x00000023, 0xfffe0200, 0x00000000, 0x00000000, + 0x00000100, 0x0000001c, 0x325f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, + 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x0200001f, 0x80000000, + 0x900f0000, 0x02000001, 0xc00f0000, 0x90e40000, 0x0000ffff +}; + +static void test_D3DReadFileToBlob(void) +{ + WCHAR filename[MAX_PATH] = {'n','o','n','e','x','i','s','t','e','n','t',0}; + ID3DBlob *blob = NULL; + SIZE_T data_size; + DWORD *data; + HRESULT hr; + + hr = pD3DReadFileToBlob(filename, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + + if (0) + { + /* Crashes on Windows. */ + create_file(filename, test_cso_data, ARRAY_SIZE(test_cso_data)); + pD3DReadFileToBlob(filename, NULL); + DeleteFileW(filename); + } + + if (!create_file(filename, NULL, 0)) + { + win_skip("File creation failed.\n"); + return; + } + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(!data_size, "Got unexpected data size.\n"); + DeleteFileW(filename); + ID3D10Blob_Release(blob); + + if (!create_file(filename, test_cso_data, ARRAY_SIZE(test_cso_data))) + { + win_skip("File creation failed.\n"); + return; + } + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(data_size == ARRAY_SIZE(test_cso_data), "Got unexpected data size.\n"); + data = ID3D10Blob_GetBufferPointer(blob); + ok(!memcmp(data, test_cso_data, ARRAY_SIZE(test_cso_data)), "Got unexpected data.\n"); + DeleteFileW(filename); + ID3D10Blob_Release(blob); +} + START_TEST(blob) { - if (!load_d3dcompiler()) + if (load_d3dcompiler_43()) + { + test_create_blob(); + test_get_blob_part(); + test_get_blob_part2(); + } + else { win_skip("Could not load d3dcompiler_43.dll\n"); - return; } - test_create_blob(); - test_get_blob_part(); - test_get_blob_part2(); + if (load_d3dcompiler_47()) + { + test_D3DReadFileToBlob(); + } + else + { + win_skip("Could not load d3dcompiler_47.dll.\n"); + } }

1 0

Józef Kucia : d3d11: Report format support more accurately based on feature level.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 735b5ebd1e43d19d6fe763361682cb2c8aaf3a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=735b5ebd1e43d19d6fe76336… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 11:03:39 2019 +0200 d3d11: Report format support more accurately based on feature level. Our partial stub for CheckFormatSupport() is still quite inaccurate. For example, we might report SHADER_SAMPLE support for UINT formats. In the long term, wined3d should probably return the format support flags directly. Unfortunately, the current wined3d interface shared with d3d9 isn't well suited for returning fine-grained format support flags. 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/d3d10core/tests/d3d10core.c | 20 ++++++++++++++++++-- dlls/d3d11/device.c | 13 ++++++++++--- dlls/d3d11/tests/d3d11.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 32f9437..ecf1f38 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13390,7 +13390,7 @@ static void check_format_support(const unsigned int *format_support, } } -static void test_required_format_support(void) +static void test_format_support(void) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; ID3D10Device *device; @@ -13425,6 +13425,22 @@ static void test_required_format_support(void) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + ok(!(format_support[format] & D3D10_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x.\n", format); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x.\n", format); + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -18057,7 +18073,7 @@ START_TEST(d3d10core) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_test(test_required_format_support); + queue_test(test_format_support); queue_test(test_ddy); queue_test(test_shader_input_registers_limits); queue_test(test_unbind_shader_resource_view); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 751afc1..31292e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3378,6 +3378,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * struct d3d_device *device = impl_from_ID3D11Device2(iface); struct wined3d_device_creation_parameters params; enum wined3d_format_id wined3d_format; + D3D_FEATURE_LEVEL feature_level; struct wined3d *wined3d; unsigned int i; @@ -3410,6 +3411,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); + feature_level = device->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) @@ -3434,12 +3436,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; if (*format_support & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) { - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; } } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b56a04..e8c2f64 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18425,7 +18425,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE } } -static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) +static void test_format_support(const D3D_FEATURE_LEVEL feature_level) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; struct device_desc device_desc; @@ -18463,6 +18463,37 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (feature_level < D3D_FEATURE_LEVEL_10_0) + { + /* SHADER_SAMPLE_COMPARISON is never advertised as supported on feature level 9. */ + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON), + "Unexpected SHADER_SAMPLE_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + if (feature_level < D3D_FEATURE_LEVEL_10_1) + { + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x, feature level %#x.\n", + format, feature_level); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + } + check_format_support(format_support, feature_level, index_buffers, ARRAY_SIZE(index_buffers), D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -29365,7 +29396,7 @@ START_TEST(d3d11) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_for_each_feature_level(test_required_format_support); + queue_for_each_feature_level(test_format_support); queue_for_each_9_x_feature_level(test_fl9_draw); queue_test(test_ddy); queue_test(test_shader_input_registers_limits);

1 0

Henri Verbeet : wined3d: Get rid of a redundant initialisation in wined3d_device_set_implicit_swapchain ().
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 4f635833a8b94124b7b155e185237d51e934030d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f635833a8b94124b7b155e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:06 2019 +0430 wined3d: Get rid of a redundant initialisation in wined3d_device_set_implicit_swapchain(). 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, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a27251c..b2dbb40 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1153,8 +1153,6 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str goto err_out; device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); /* Clear the screen */

1 0

Henri Verbeet : wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain().
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 9a373586a36e3702414e2d50814db78d9c9fbbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a373586a36e3702414e2d50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:07 2019 +0430 wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dbb40..dcf05f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1151,23 +1151,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str { if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) goto err_out; - device_init_swapchain_state(device, swapchain); - TRACE("All defaults now set up.\n"); + device->d3d_initialized = TRUE; + } - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + device_init_swapchain_state(device, swapchain); - device->d3d_initialized = TRUE; + TRACE("All defaults now set up.\n"); - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); - } + /* Clear the screen. */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); return WINED3D_OK;

1 0

Józef Kucia : wined3d: Make the adapter responsible for initialising and de-initialising 3D.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 449925146108569e2fa0501f1c265f4e946160cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=449925146108569e2fa0501f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:18:08 2019 +0430 wined3d: Make the adapter responsible for initialising and de-initialising 3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 34 ++++++++++++++++++++++---- dlls/wined3d/adapter_vk.c | 14 +++++++++++ dlls/wined3d/device.c | 54 +++++++----------------------------------- dlls/wined3d/directx.c | 22 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 5 files changed, 77 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=449925146108569e2fa0…

1 0

Henri Verbeet : wined3d: Determine the ORM_BACKBUFFER depth/ stencil format in wined3d_adapter_gl_create_context().
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 1859ca857f94a8ca489a49d8d5d885651c0cf1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1859ca857f94a8ca489a49d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:09 2019 +0430 wined3d: Determine the ORM_BACKBUFFER depth/stencil format in wined3d_adapter_gl_create_context(). Instead of in wined3d_swapchain_cs_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context.c | 90 ++++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 3 +- dlls/wined3d/swapchain.c | 27 +------------ dlls/wined3d/wined3d_private.h | 8 ++-- 5 files changed, 67 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1859ca857f94a8ca489a…

1 0

Henri Verbeet : wined3d: Make the adapter responsible for context destruction and allocation.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 5ab6421dfedbc8678af4b67d7673db2721a13f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab6421dfedbc8678af4b67d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:10 2019 +0430 wined3d: Make the adapter responsible for context destruction and allocation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 48 ++++++++++++++- dlls/wined3d/adapter_vk.c | 28 ++++++++- dlls/wined3d/context.c | 132 +++++++++++++++++++---------------------- dlls/wined3d/directx.c | 30 +++++++++- dlls/wined3d/wined3d_private.h | 16 ++++- 5 files changed, 176 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ab6421dfedbc8678af4…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_texture().
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 6de183795502a852758a1c201c0fbe6d75356479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de183795502a852758a1c20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 28 ++++++++++++++-------------- dlls/wined3d/state.c | 3 ++- dlls/wined3d/surface.c | 18 +++++++++++------- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/view.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 3 ++- 6 files changed, 43 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de183795502a852758a…

1 0

Dmitry Timoshkov : mshtml: Implement HTMLStyleSheetRulesCollection::item.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: a6fbd07ac8b4478932b29f98a8767bd8bad3a170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fbd07ac8b4478932b29f98… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 14:45:11 2019 +0200 mshtml: Implement HTMLStyleSheetRulesCollection::item. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 188 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 16 ++++ dlls/mshtml/tests/elements.js | 19 +++++ 4 files changed, 223 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6fbd07ac8b4478932b2…

1 0

Nikolay Sivov : mfplat: Write attribute store when registering MFT.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: b0bd57f953da6a9ff1dc26e4fced73d901f2d646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0bd57f953da6a9ff1dc26e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:42 2019 +0300 mfplat: Write attribute store when registering MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 68 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 61521ce..4f634e0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -70,6 +70,7 @@ static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d', 'C','a','t','e','g','o','r','i','e','s',0}; static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; +static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR szGUIDFmt[] = { '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', @@ -166,46 +167,65 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT register_transform(CLSID *clsid, WCHAR *name, - UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, - UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types) +static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, + UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, + const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; + HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size; + DWORD size, ret; WCHAR str[250]; + UINT8 *blob; GUIDToString(buffer, clsid); sprintfW(str, reg_format, transform_keyW, buffer); - if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid)) - return E_FAIL; + if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) + hr = HRESULT_FROM_WIN32(ret); - size = (strlenW(name) + 1) * sizeof(WCHAR); - if (RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size)) - goto err; + if (SUCCEEDED(hr)) + { + size = (strlenW(name) + 1) * sizeof(WCHAR); + if ((ret = RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size))) + hr = HRESULT_FROM_WIN32(ret); + } - if (cinput && input_types) + if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - if (coutput && output_types) + if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - RegCloseKey(hclsid); - return S_OK; + if (SUCCEEDED(hr) && attributes) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlobSize(attributes, &size))) + { + if ((blob = heap_alloc(size))) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) + { + if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + hr = HRESULT_FROM_WIN32(ret); + } + heap_free(blob); + } + else + hr = E_OUTOFMEMORY; + } + } -err: RegCloseKey(hclsid); - return E_FAIL; + return hr; } static HRESULT register_category(CLSID *clsid, GUID *category) @@ -236,17 +256,13 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags { HRESULT hr; - TRACE("(%s, %s, %s, %x, %u, %p, %u, %p, %p)\n", debugstr_guid(&clsid), debugstr_guid(&category), - debugstr_w(name), flags, cinput, input_types, - coutput, output_types, attributes); - - if (attributes) - FIXME("attributes not yet supported.\n"); + TRACE("%s, %s, %s, %#x, %u, %p, %u, %p, %p.\n", debugstr_guid(&clsid), debugstr_guid(&category), + debugstr_w(name), flags, cinput, input_types, coutput, output_types, attributes); if (flags) FIXME("flags not yet supported.\n"); - hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types); + hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types, attributes); if(FAILED(hr)) ERR("Failed to write register transform\n");

1 0