wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

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

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

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

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

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

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

Józef Kucia : wined3d: Use correct data type for immediate constants.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 033df637578ba76201a7ab6d4de1f506108f27b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033df637578ba76201a7ab6d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:26 2017 +0200 wined3d: Use correct data type for immediate constants. In order to generate correct GLSL for image 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/wined3d/glsl_shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39d2276..6a4d32a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2723,7 +2723,8 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) + enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2948,7 +2949,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2965,13 +2966,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; case WINED3D_IMMCONST_VEC4: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -3003,7 +3004,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -3247,7 +3248,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3294,7 +3295,8 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, glsl_dst->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, + glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3586,7 +3588,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0

Gijs Vermeulen : msvcrt: Add vf[w]printf_p & vf[w]printf_p_l.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 7f9c2dabc3e9920c46019948b77f45bd717693d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c2dabc3e9920c46019948b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Oct 13 20:23:29 2017 +0200 msvcrt: Add vf[w]printf_p & vf[w]printf_p_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 8 ++--- dlls/msvcr110/msvcr110.spec | 8 ++--- dlls/msvcr120/msvcr120.spec | 8 ++--- dlls/msvcr120_app/msvcr120_app.spec | 8 ++--- dlls/msvcr80/msvcr80.spec | 8 ++--- dlls/msvcr90/msvcr90.spec | 8 ++--- dlls/msvcrt/file.c | 68 +++++++++++++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/msvcrt/msvcrt.spec | 8 ++--- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 99 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f9c2dabc3e9920c46019…

1 0

Nikolay Sivov : dwrite/tests: Fix object instance leak (Valgrind).
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: e3a29a6c1d3f4655ccee888588f7449487f1778d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a29a6c1d3f4655ccee88858… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 11:55:39 2017 +0300 dwrite/tests: Fix object instance leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4adb022..c28f27a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7924,6 +7924,9 @@ static void test_inmemory_file_loader(void) IDWriteFontFileStream_Release(stream); IDWriteFontFace_Release(fontface); + ref = IDWriteInMemoryFontFileLoader_Release(inmemory); + ok(ref == 0, "loader not released, %u.\n", ref); + ref = IDWriteFactory5_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Hans Leidekker : secur32: Don' t allocate a context handle in AcceptSecurityContext if new and passed in context are the same.
by Alexandre Julliard 16 Oct '17

16 Oct '17

Module: wine Branch: master Commit: 4467fd6d232cd715cd63b1ebf74c6013e19563b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4467fd6d232cd715cd63b1ebf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 16 10:08:49 2017 +0200 secur32: Don't allocate a context handle in AcceptSecurityContext if new and passed in context are the same. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 06a3674..dba6754 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -399,7 +399,8 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( ret = package->provider->fnTableW.AcceptSecurityContext( cred, phContext ? &myCtxt : NULL, pInput, fContextReq, TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); - if (ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt);

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017