October 2017 - Wine-commits

Józef Kucia : d3d11/tests: Add test for immediate constant UAV stores.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: c534ba589eac2900cd645227b2afe5f83ff6d225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c534ba589eac2900cd645227b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:27 2017 +0200 d3d11/tests: Add test for immediate constant UAV stores. 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 | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f39e1ad..8df683e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15883,6 +15883,109 @@ static void test_cs_uav_store(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_uav_store_immediate_constant(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + ID3D11UnorderedAccessView *uav; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11ComputeShader *cs; + ID3D11Device *device; + ID3D11Buffer *buffer; + float float_data; + int int_data; + HRESULT hr; + + static const DWORD cs_store_int_code[] = + { +#if 0 + RWBuffer<int> u; + + [numthreads(1, 1, 1)] + void main() + { + u[0] = 42; + } +#endif + 0x43425844, 0x7246d785, 0x3f4ccbd6, 0x6a7cdbc0, 0xe2b58c72, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400089c, 0x0011e000, 0x00000000, 0x00003333, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a, 0x0100003e, + }; + static const DWORD cs_store_float_code[] = + { +#if 0 + RWBuffer<float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[0] = 1.0; + } +#endif + 0x43425844, 0x525eea68, 0xc4cd5716, 0xc588f9c4, 0x0da27c5a, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const unsigned int zero[4] = {0}; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, 1024, NULL); + + uav_desc.Format = DXGI_FORMAT_R32_SINT; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = 1; + U(uav_desc).Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_store_int_code, sizeof(cs_store_int_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_buffer_readback(buffer, &rb); + int_data = get_readback_color(&rb, 0, 0); + ok(int_data == 42, "Got unexpected value %u.\n", int_data); + release_resource_readback(&rb); + + ID3D11ComputeShader_Release(cs); + ID3D11UnorderedAccessView_Release(uav); + uav_desc.Format = DXGI_FORMAT_R32_FLOAT; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_store_float_code, sizeof(cs_store_float_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_buffer_readback(buffer, &rb); + float_data = get_readback_float(&rb, 0, 0); + ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); + release_resource_readback(&rb); + + ID3D11Buffer_Release(buffer); + ID3D11ComputeShader_Release(cs); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_ps_cs_uav_binding(void) { static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; @@ -21261,6 +21364,7 @@ START_TEST(d3d11) test_stencil_separate(); test_uav_load(); test_cs_uav_store(); + test_uav_store_immediate_constant(); test_ps_cs_uav_binding(); test_atomic_instructions(); test_sm4_ret_instruction();

1 0

Stefan Dösinger : d3d8/tests: Use a borderless window for test_cursor_pos.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 8daf3fb5e0577f4f9c3d803e7019ae280d319884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daf3fb5e0577f4f9c3d803e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 12 17:14:29 2017 +0200 d3d8/tests: Use a borderless window for test_cursor_pos. The mouse positions are wrong on KDE otherwise, even for the initial SetCursorPos call that doesn't go through d3d8/9. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2c0565a..b35de66 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1052,7 +1052,7 @@ static void test_cursor_pos(void) wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d8_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d8_test_cursor_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + window = CreateWindowA("d3d8_test_cursor_wc", "d3d8_test", WS_POPUP | WS_SYSMENU, 0, 0, 320, 240, NULL, NULL, NULL, NULL); ShowWindow(window, SW_SHOW); d3d8 = Direct3DCreate8(D3D_SDK_VERSION);

1 0

Stefan Dösinger : d3d9/tests: Use a borderless window for test_cursor_pos.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 56b223adfa8c4f403f827644371af0090e798caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b223adfa8c4f403f8276443… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 12 17:14:30 2017 +0200 d3d9/tests: Use a borderless window for test_cursor_pos. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b24136a..3580a22 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4723,7 +4723,7 @@ static void test_cursor_pos(void) wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d9_test_cursor_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + window = CreateWindowA("d3d9_test_cursor_wc", "d3d9_test", WS_POPUP | WS_SYSMENU, 0, 0, 320, 240, NULL, NULL, NULL, NULL); ShowWindow(window, SW_SHOW); d3d9 = Direct3DCreate9(D3D_SDK_VERSION);

1 0

Hugh McMaster : regedit: Correctly import hex values with no data.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 84dda235365fbd0a705a9e7e229fb7744e85b0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84dda235365fbd0a705a9e7e2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 16 10:27:25 2017 +0000 regedit: Correctly import hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 ++++ programs/regedit/tests/regedit.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 508a8a3..a70a6d1 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -885,6 +885,9 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; + if (!*line) + goto set_value; + if (!convert_hex_csv_to_hex(parser, &line)) goto invalid; @@ -896,6 +899,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) prepare_hex_string_data(parser); +set_value: set_state(parser, SET_VALUE); return line; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b1f30b2..334360b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -662,10 +662,10 @@ static void test_basic_import(void) "\"Wine22h\"=hex:\n" "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); - verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); - verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); @@ -1077,10 +1077,10 @@ static void test_basic_import_unicode(void) "\"Wine22h\"=hex:\n" "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); - verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); - verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0);

1 0

Hugh McMaster : reg/tests: Correctly import hex values with no data.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: c02dd08f910fb684e88b02fcb9d75564c8636e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02dd08f910fb684e88b02fcb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 16 10:27:25 2017 +0000 reg/tests: Correctly import hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 4 ++++ programs/reg/tests/reg.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index d2b4cdc..8350fa7 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -785,6 +785,9 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; + if (!*line) + goto set_value; + if (!convert_hex_csv_to_hex(parser, &line)) goto invalid; @@ -796,6 +799,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) prepare_hex_string_data(parser); +set_value: set_state(parser, SET_VALUE); return line; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 42e6a97..e0ff5f0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2322,10 +2322,10 @@ static void test_import(void) "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); - verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); - verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); @@ -3830,10 +3830,10 @@ static void test_unicode_import(void) "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); - verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); - verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0);

1 0

Huw Davies : dwrite: Avoid using RegQueryInfoKey().
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 625293289c7cf37e052e0407350fcf73c190d487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625293289c7cf37e052e04073… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 16 10:11:17 2017 +0100 dwrite: Avoid using RegQueryInfoKey(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1916bf2..cab220a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3825,8 +3825,8 @@ struct system_fontfile_enumerator HKEY hkey; int index; - WCHAR *value; - DWORD max_val_count; + WCHAR *filename; + DWORD filename_size; }; static inline struct system_fontfile_enumerator *impl_from_IDWriteFontFileEnumerator(IDWriteFontFileEnumerator* iface) @@ -3863,7 +3863,7 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * if (!ref) { IDWriteFactory5_Release(enumerator->factory); RegCloseKey(enumerator->hkey); - heap_free(enumerator->value); + heap_free(enumerator->filename); heap_free(enumerator); } @@ -3894,77 +3894,69 @@ static HRESULT create_local_file_reference(IDWriteFactory5 *factory, const WCHAR static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - DWORD ret, type, val_count, count; - WCHAR *value, *filename; - HRESULT hr; *file = NULL; - if (enumerator->index < 0) - return E_FAIL; - - ret = RegQueryInfoKeyW(enumerator->hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &val_count, &count, NULL, NULL); - if (ret != ERROR_SUCCESS) + if (enumerator->index < 0 || !enumerator->filename || !*enumerator->filename) return E_FAIL; - val_count++; - value = heap_alloc( val_count * sizeof(value[0]) ); - filename = heap_alloc(count); - if (!value || !filename) { - heap_free(value); - heap_free(filename); - return E_OUTOFMEMORY; - } - - ret = RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, (BYTE*)filename, &count); - if (ret) { - heap_free(value); - heap_free(filename); - return E_FAIL; - } - - hr = create_local_file_reference(enumerator->factory, filename, file); - - heap_free(value); - heap_free(filename); - return hr; + return create_local_file_reference(enumerator->factory, enumerator->filename, file); } static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); + WCHAR name_buf[256], *name = name_buf; + DWORD name_count, max_name_count = sizeof(name_buf) / sizeof(*name_buf), type, data_size; + HRESULT hr = S_OK; + LONG r; *current = FALSE; enumerator->index++; - if (!enumerator->value) { - if (RegQueryInfoKeyW(enumerator->hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &enumerator->max_val_count, NULL, NULL, NULL)) - return E_FAIL; - - enumerator->max_val_count++; - if (!(enumerator->value = heap_alloc(enumerator->max_val_count * sizeof(*enumerator->value)))) - return E_OUTOFMEMORY; - } - /* iterate until we find next string value */ for (;;) { - DWORD type = 0, count, val_count; + do { + name_count = max_name_count; + data_size = enumerator->filename_size - sizeof(*enumerator->filename); + + r = RegEnumValueW(enumerator->hkey, enumerator->index, name, &name_count, + NULL, &type, (BYTE *)enumerator->filename, &data_size); + if (r == ERROR_MORE_DATA) { + if (name_count >= max_name_count) { + if (name != name_buf) heap_free(name); + max_name_count *= 2; + name = heap_alloc(max_name_count * sizeof(*name)); + if (!name) return E_OUTOFMEMORY; + } + if (data_size > enumerator->filename_size - sizeof(*enumerator->filename)) { + heap_free(enumerator->filename); + enumerator->filename_size = max(data_size + sizeof(*enumerator->filename), enumerator->filename_size * 2); + enumerator->filename = heap_alloc(enumerator->filename_size); + if (!enumerator->filename) { + hr = E_OUTOFMEMORY; + goto err; + } + } + } + } while (r == ERROR_MORE_DATA); - val_count = enumerator->max_val_count; - *enumerator->value = 0; - if (RegEnumValueW(enumerator->hkey, enumerator->index, enumerator->value, &val_count, - NULL, &type, NULL, &count)) + if (r != ERROR_SUCCESS) { + enumerator->filename[0] = 0; break; - if (type == REG_SZ && *enumerator->value && *enumerator->value != '@') { + } + enumerator->filename[data_size / sizeof(*enumerator->filename)] = 0; + if (type == REG_SZ && *name != '@') { *current = TRUE; break; } enumerator->index++; } - TRACE("index = %d, current = %d\n", enumerator->index, *current); - return S_OK; + +err: + if (name != name_buf) heap_free(name); + return hr; } static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = @@ -3995,13 +3987,19 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory5 *factory, IDWri enumerator->ref = 1; enumerator->factory = factory; enumerator->index = -1; - enumerator->value = NULL; - enumerator->max_val_count = 0; + enumerator->filename_size = MAX_PATH * sizeof(*enumerator->filename); + enumerator->filename = heap_alloc(enumerator->filename_size); + if (!enumerator->filename) { + heap_free(enumerator); + return E_OUTOFMEMORY; + } + IDWriteFactory5_AddRef(factory); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, fontslistW, 0, GENERIC_READ, &enumerator->hkey)) { ERR("failed to open fonts list key\n"); IDWriteFactory5_Release(factory); + heap_free(enumerator->filename); heap_free(enumerator); return E_FAIL; }

1 0

Alexandre Julliard : server: Avoid potential double free (Coverity).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: af238f5653a4dd1656eb2027d1605e8088613772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af238f5653a4dd1656eb2027d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 15:28:38 2017 +0200 server: Avoid potential double free (Coverity). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index f9f50ed..d9bff4b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -507,13 +507,13 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; } - free( buffer ); if (!(shared = alloc_object( &shared_map_ops ))) goto error; shared->fd = (struct fd *)grab_object( mapping->fd ); shared->file = file; list_add_head( &shared_map_list, &shared->entry ); mapping->shared = shared; + free( buffer ); return 1; error:

1 0

Nikolay Sivov : qedit/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 81eb827c98fa7a5016f802e92b2d9148a572f62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81eb827c98fa7a5016f802e92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 16:03:43 2017 +0300 qedit/tests: Fix some leaks in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index b1011fc..94c018e 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -106,6 +106,9 @@ static void test_timeline(void) hr = IAMTimelineObj_GetTimelineNoRef(obj, &timeline2); ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); ok(!timeline2, "Expected NULL got %p\n", timeline2); + + IAMTimelineObj_Release(obj); + IAMTimeline_Release(timeline); } static void test_timelineobj_interfaces(void)

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusImage deserialization for bitmaps.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 81459d652629b29eb19e4c14ba240034a0f3c4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=81459d652629b29eb19e4c14b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:21 2017 +0300 gdiplus/metafile: Implement EmfPlusImage deserialization for bitmaps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 117 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 95445e8..f659ccf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpImage *image; GpImageAttributes *image_attributes; void *object; } u; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index de208a8..2fc741e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + typedef struct EmfPlusARGB { BYTE Blue; @@ -246,6 +248,13 @@ typedef struct EmfPlusRegion BYTE RegionNode[1]; } EmfPlusRegion; +typedef struct EmfPlusPalette +{ + DWORD PaletteStyleFlags; + DWORD PaletteCount; + BYTE PaletteEntries[1]; +} EmfPlusPalette; + typedef enum { BitmapDataTypePixel, @@ -367,6 +376,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypeImage: + GdipDisposeImage(object->u.image); + break; case ObjectTypeImageAttributes: GdipDisposeImageAttributes(object->u.image_attributes); break; @@ -1446,6 +1458,108 @@ static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE metafile->objtable[id].u.object = object; } +static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_size, GpImage **image) +{ + EmfPlusImage *data = (EmfPlusImage *)record_data; + GpStatus status; + + *image = NULL; + + if (data_size < FIELD_OFFSET(EmfPlusImage, ImageData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusImage, ImageData); + + switch (data->Type) + { + case ImageDataTypeBitmap: + { + EmfPlusBitmap *bitmapdata = &data->ImageData.bitmap; + + if (data_size <= FIELD_OFFSET(EmfPlusBitmap, BitmapData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusBitmap, BitmapData); + + switch (bitmapdata->Type) + { + case BitmapDataTypePixel: + { + ColorPalette *palette; + BYTE *scan0; + + if (bitmapdata->PixelFormat & PixelFormatIndexed) + { + EmfPlusPalette *palette_obj = (EmfPlusPalette *)bitmapdata->BitmapData; + UINT palette_size = FIELD_OFFSET(EmfPlusPalette, PaletteEntries); + + if (data_size <= palette_size) + return InvalidParameter; + palette_size += palette_obj->PaletteCount * sizeof(EmfPlusARGB); + + if (data_size < palette_size) + return InvalidParameter; + data_size -= palette_size; + + palette = (ColorPalette *)bitmapdata->BitmapData; + scan0 = (BYTE *)bitmapdata->BitmapData + palette_size; + } + else + { + palette = NULL; + scan0 = bitmapdata->BitmapData; + } + + if (data_size < bitmapdata->Height * bitmapdata->Stride) + return InvalidParameter; + + status = GdipCreateBitmapFromScan0(bitmapdata->Width, bitmapdata->Height, bitmapdata->Stride, + bitmapdata->PixelFormat, scan0, (GpBitmap **)image); + if (status == Ok && palette) + { + status = GdipSetImagePalette(*image, palette); + if (status != Ok) + { + GdipDisposeImage(*image); + *image = NULL; + } + } + break; + } + case BitmapDataTypeCompressed: + { + IWICImagingFactory *factory; + IWICStream *stream; + HRESULT hr; + + if (WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory) != S_OK) + return GenericError; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + IWICImagingFactory_Release(factory); + if (hr != S_OK) + return GenericError; + + if (IWICStream_InitializeFromMemory(stream, bitmapdata->BitmapData, data_size) == S_OK) + status = GdipCreateBitmapFromStream((IStream *)stream, (GpBitmap **)image); + else + status = GenericError; + + IWICStream_Release(stream); + break; + } + default: + WARN("Invalid bitmap type %d.\n", bitmapdata->Type); + return InvalidParameter; + } + break; + } + default: + FIXME("image type %d not supported.\n", data->Type); + return NotImplemented; + } + + return status; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1488,6 +1602,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypeImage: + status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); + break; case ObjectTypeImageAttributes: { EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeDrawImagePoints record playback.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 440efc8244da18cb8a9bbd441645468fdbcba087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440efc8244da18cb8a9bbd441… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:22 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeDrawImagePoints record playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 89 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2fc741e..fa4bafd 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -328,6 +328,18 @@ typedef struct EmfPlusRectF float Height; } EmfPlusRectF; +typedef struct EmfPlusPointR7 +{ + BYTE X; + BYTE Y; +} EmfPlusPointR7; + +typedef struct EmfPlusPoint +{ + short X; + short Y; +} EmfPlusPoint; + typedef struct EmfPlusPointF { float X; @@ -343,10 +355,10 @@ typedef struct EmfPlusDrawImagePoints DWORD count; union { - /*EmfPlusPointR pointR; - EmfPlusPoint point;*/ - EmfPlusPointF pointF; - } PointData[3]; + EmfPlusPointR7 pointsR[3]; + EmfPlusPoint points[3]; + EmfPlusPointF pointsF[3]; + } PointData; } EmfPlusDrawImagePoints; typedef struct EmfPlusDrawPath @@ -2084,6 +2096,68 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); } + case EmfPlusRecordTypeDrawImagePoints: + { + EmfPlusDrawImagePoints *draw = (EmfPlusDrawImagePoints *)header; + static const UINT fixed_part_size = FIELD_OFFSET(EmfPlusDrawImagePoints, PointData) - + FIELD_OFFSET(EmfPlusDrawImagePoints, ImageAttributesID); + BYTE image = flags & 0xff; + GpPointF points[3]; + unsigned int i; + UINT size; + + if (image >= EmfPlusObjectTableSize || real_metafile->objtable[image].type != ObjectTypeImage) + return InvalidParameter; + + if (dataSize <= fixed_part_size) + return InvalidParameter; + dataSize -= fixed_part_size; + + if (draw->ImageAttributesID >= EmfPlusObjectTableSize || + real_metafile->objtable[draw->ImageAttributesID].type != ObjectTypeImageAttributes) + return InvalidParameter; + + if (draw->count != 3) + return InvalidParameter; + + if ((flags >> 13) & 1) /* E */ + FIXME("image effects are not supported.\n"); + + if ((flags >> 11) & 1) /* P */ + size = sizeof(EmfPlusPointR7) * draw->count; + else if ((flags >> 14) & 1) /* C */ + size = sizeof(EmfPlusPoint) * draw->count; + else + size = sizeof(EmfPlusPointF) * draw->count; + + if (dataSize != size) + return InvalidParameter; + + if ((flags >> 11) & 1) /* P */ + { + points[0].X = draw->PointData.pointsR[0].X; + points[0].Y = draw->PointData.pointsR[0].Y; + for (i = 1; i < 3; i++) + { + points[i].X = points[i-1].X + draw->PointData.pointsR[i].X; + points[i].Y = points[i-1].Y + draw->PointData.pointsR[i].Y; + } + } + else if ((flags >> 14) & 1) /* C */ + { + for (i = 0; i < 3; i++) + { + points[i].X = draw->PointData.points[i].X; + points[i].Y = draw->PointData.points[i].Y; + } + } + else + memcpy(points, draw->PointData.pointsF, sizeof(points)); + + return GdipDrawImagePointsRect(real_metafile->playback_graphics, real_metafile->objtable[image].u.image, + points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, + real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; @@ -2982,12 +3056,7 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, draw_image_record->SrcRect.Width = units_to_pixels(srcwidth, srcUnit, metafile->image.xres); draw_image_record->SrcRect.Height = units_to_pixels(srcheight, srcUnit, metafile->image.yres); draw_image_record->count = 3; - draw_image_record->PointData[0].pointF.X = points[0].X; - draw_image_record->PointData[0].pointF.Y = points[0].Y; - draw_image_record->PointData[1].pointF.X = points[1].X; - draw_image_record->PointData[1].pointF.Y = points[1].Y; - draw_image_record->PointData[2].pointF.X = points[2].X; - draw_image_record->PointData[2].pointF.Y = points[2].Y; + memcpy(draw_image_record->PointData.pointsF, points, 3 * sizeof(*points)); METAFILE_WriteRecords(metafile); return Ok; }

1 0