September 2018 - Wine-commits

Józef Kucia : iphlpapi: Fix FILE leak in get_ipv6_addr_scope_table() (Coverity).
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: be3a3ad825a8b64e585630b0e30de7165be5b6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3a3ad825a8b64e585630b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 11 13:01:23 2018 +0200 iphlpapi: Fix FILE leak in get_ipv6_addr_scope_table() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 994e1fe..84d28ee 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2686,6 +2686,8 @@ static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) entry->scope = htons(scope); } + + fclose(fp); } #else FIXME( "not implemented\n" );

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 74c0c0574ea720c8278d312dcff77aaba0bdb699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c0c0574ea720c8278d312d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:31 2018 +0300 shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf. The quickComplete format can have more than one % argument, or stuff like %*.* or %1234s, which can be exploited since the format string can be read from the registry, so handle it manually instead of using sprintf. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4ec7387..587d41f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,32 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) +{ + /* Replace the first %s directly without using snprintf, to avoid + exploits since the format string can be retrieved from the registry */ + WCHAR *base = dst; + UINT args = 0; + while (*qc != '\0') + { + if (qc[0] == '%') + { + if (args < 1 && qc[1] == 's') + { + memcpy(dst, str, str_len * sizeof(WCHAR)); + dst += str_len; + qc += 2; + args++; + continue; + } + qc += (qc[1] == '%'); + } + *dst++ = *qc++; + } + *dst = '\0'; + return dst - base; +} + static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; @@ -109,7 +135,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; WCHAR hwndText[255]; - WCHAR *hwndQCText; RECT r; BOOL control, filled, displayall = FALSE; int cpt, height, sel; @@ -138,11 +163,16 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = heap_alloc((lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); - sel = sprintfW(hwndQCText, This->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - heap_free(hwndQCText); + WCHAR *buf; + size_t len = strlenW(hwndText); + size_t sz = strlenW(This->quickComplete) + 1 + len; + if ((buf = heap_alloc(sz * sizeof(WCHAR)))) + { + len = format_quick_complete(buf, This->quickComplete, hwndText, len); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageW(hwnd, EM_SETSEL, 0, len); + heap_free(buf); + } } ShowWindow(This->hwndListBox, SW_HIDE);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Handle heap_alloc failure.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 97006eb6619e27edabd4ab2c8181207e10c09ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97006eb6619e27edabd4ab2c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:32 2018 +0300 shell32/autocomplete: Handle heap_alloc failure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 587d41f..6a77ddb 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -210,7 +210,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, int len; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = heap_alloc((len + 1)*sizeof(WCHAR)); + if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) + return 0; SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); @@ -329,7 +330,8 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (sel < 0) break; len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = heap_alloc((len + 1)*sizeof(WCHAR)); + if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) + break; SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reduce the strlen calls because they are redundant.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: a435fbc646a9f9d3f6b56eab66d17eacd8cd7be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a435fbc646a9f9d3f6b56eab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:33 2018 +0300 shell32/autocomplete: Reduce the strlen calls because they are redundant. We can retrieve the length of the string from the SendMessage calls already. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6a77ddb..4160235 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -212,13 +212,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) return 0; - SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); + len = SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg)); + SendMessageW(hwnd, EM_SETSEL, len, len); heap_free(msg); } else { + UINT len; SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)This->txtbackup); - SendMessageW(hwnd, EM_SETSEL, lstrlenW(This->txtbackup), lstrlenW(This->txtbackup)); + len = strlenW(This->txtbackup); + SendMessageW(hwnd, EM_SETSEL, len, len); } } return 0; @@ -332,9 +334,9 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) break; - SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); + len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg)); + SendMessageW(This->hwndEdit, EM_SETSEL, 0, len); ShowWindow(hwnd, SW_HIDE); heap_free(msg); break;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Don' t call ShowWindow unless auto-suggest listbox is enabled.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: cd8d3c6de6c120ef24bf5c7a4b83f28c1fbeb90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8d3c6de6c120ef24bf5c7a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:34 2018 +0300 shell32/autocomplete: Don't call ShowWindow unless auto-suggest listbox is enabled. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4160235..a76a01f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -144,7 +144,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, switch (uMsg) { case CB_SHOWDROPDOWN: - ShowWindow(This->hwndListBox, SW_HIDE); + if (This->options & ACO_AUTOSUGGEST) + ShowWindow(This->hwndListBox, SW_HIDE); break; case WM_KILLFOCUS: if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) @@ -175,7 +176,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } } - ShowWindow(This->hwndListBox, SW_HIDE); + if (This->options & ACO_AUTOSUGGEST) + ShowWindow(This->hwndListBox, SW_HIDE); return 0; case VK_LEFT: case VK_RIGHT: @@ -310,7 +312,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } default: return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } return 0; @@ -362,6 +363,8 @@ static void create_listbox(IAutoCompleteImpl *This) This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); } + else + This->options &= ~ACO_AUTOSUGGEST; } /**************************************************************************

1 0

Gabriel Ivăncescu : shell32/autocomplete: Get rid of control and filled BOOLs and simplify the code.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 7f659eb5f9a99161169c0b34979fac2050f62512 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f659eb5f9a99161169c0b34… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 10 22:09:35 2018 +0300 shell32/autocomplete: Get rid of control and filled BOOLs and simplify the code. There's no need to have filled, since cpt can already provide the same information. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index a76a01f..6f97665 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -136,7 +136,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, HRESULT hr; WCHAR hwndText[255]; RECT r; - BOOL control, filled, displayall = FALSE; + BOOL displayall = FALSE; int cpt, height, sel; if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -162,8 +162,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, switch(wParam) { case VK_RETURN: /* If quickComplete is set and control is pressed, replace the string */ - control = GetKeyState(VK_CONTROL) & 0x8000; - if (control && This->quickComplete) { + if (This->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) + { WCHAR *buf; size_t len = strlenW(hwndText); size_t sz = strlenW(This->quickComplete) + 1 + len; @@ -249,7 +249,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; IEnumString_Reset(This->enumstr); - filled = FALSE; for(cpt = 0;;) { LPOLESTR strs = NULL; ULONG fetched; @@ -259,7 +258,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; if (!strncmpiW(hwndText, strs, len)) { - if (!filled && (This->options & ACO_AUTOAPPEND)) { + if (cpt == 0 && (This->options & ACO_AUTOAPPEND)) { WCHAR buffW[255]; strcpyW(buffW, hwndText); @@ -272,19 +271,17 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } } - if (This->options & ACO_AUTOSUGGEST) { + if (This->options & ACO_AUTOSUGGEST) SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - cpt++; - } - filled = TRUE; + cpt++; } CoTaskMemFree(strs); } if (This->options & ACO_AUTOSUGGEST) { - if (filled) { + if (cpt) { height = SendMessageW(This->hwndListBox, LB_GETITEMHEIGHT, 0, 0); SendMessageW(This->hwndListBox, LB_CARETOFF, 0, 0); GetWindowRect(hwnd, &r);

1 0

Józef Kucia : d3d11/tests: Test D3D11_BLEND_DESC normalization.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 45495960fd51c2406d47728a9ba0de8cab7f63ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=45495960fd51c2406d47728a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 11 13:48:07 2018 +0200 d3d11/tests: Test D3D11_BLEND_DESC normalization. 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 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c470e24..94e7a8e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4914,12 +4914,6 @@ static void test_create_blend_state(void) desc.AlphaToCoverageEnable = FALSE; desc.IndependentBlendEnable = FALSE; desc.RenderTarget[0].BlendEnable = FALSE; - desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; - desc.RenderTarget[0].DestBlend = D3D11_BLEND_ZERO; - desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; - desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; - desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO; - desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; expected_refcount = get_refcount(device) + 1;

1 0

Józef Kucia : d3d10core/tests: Test D3D10_BLEND_DESC normalization.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 365cb779ac18ded3f213af8837d7c885f60ef7f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365cb779ac18ded3f213af88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 11 13:48:08 2018 +0200 d3d10core/tests: Test D3D10_BLEND_DESC normalization. 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 | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e675c12..11eede7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3984,18 +3984,9 @@ static void test_create_blend_state(void) hr = ID3D10Device_CreateBlendState(device, NULL, &blend_state1); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - blend_desc.AlphaToCoverageEnable = FALSE; - blend_desc.SrcBlend = D3D10_BLEND_ONE; - blend_desc.DestBlend = D3D10_BLEND_ZERO; - blend_desc.BlendOp = D3D10_BLEND_OP_ADD; - blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; - blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + memset(&blend_desc, 0, sizeof(blend_desc)); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - blend_desc.BlendEnable[i] = FALSE; blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; - } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1); @@ -4013,6 +4004,31 @@ static void test_create_blend_state(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + ID3D10BlendState_GetDesc(blend_state1, &blend_desc); + ok(blend_desc.AlphaToCoverageEnable == FALSE, + "Got unexpected alpha to coverage enable %#x.\n", blend_desc.AlphaToCoverageEnable); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, + "Got unexpected src blend %#x.\n", blend_desc.SrcBlend); + ok(blend_desc.DestBlend == D3D10_BLEND_ZERO, + "Got unexpected dest blend %#x.\n", blend_desc.DestBlend); + ok(blend_desc.BlendOp == D3D10_BLEND_OP_ADD, + "Got unexpected blend op %#x.\n", blend_desc.BlendOp); + ok(blend_desc.SrcBlendAlpha == D3D10_BLEND_ONE, + "Got unexpected src blend alpha %#x.\n", blend_desc.SrcBlendAlpha); + ok(blend_desc.DestBlendAlpha == D3D10_BLEND_ZERO, + "Got unexpected dest blend alpha %#x.\n", blend_desc.DestBlendAlpha); + ok(blend_desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, + "Got unexpected blend op alpha %#x.\n", blend_desc.BlendOpAlpha); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + ok(blend_desc.BlendEnable[i] == FALSE, + "Got unexpected blend enable %#x for render target %u.\n", + blend_desc.BlendEnable[i], i); + ok(blend_desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, + "Got unexpected render target write mask %#x for render target %u.\n", + blend_desc.RenderTargetWriteMask[i], i); + } + /* Not available on all Windows versions. */ check_interface(blend_state1, &IID_ID3D10BlendState1, TRUE, TRUE);

1 0

Józef Kucia : wined3d: Add support for 1D UAVs in shaders.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 453e47d9100104f71cf685daf1382e8500331131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453e47d9100104f71cf685da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 11 14:18:09 2018 +0200 wined3d: Add support for 1D UAVs in shaders. 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a1fe54..64c8b77 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2679,6 +2679,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont image_type = "imageBuffer"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + image_type = "image1D"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: image_type = "image2D"; break; @@ -2687,6 +2691,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont image_type = "image3D"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + image_type = "image1DArray"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: image_type = "image2DArray"; break;

1 0

Henri Verbeet : ddraw/tests: Rewrite FindDevice().
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 8a66164f89e37ecb99a32c9953646063efa5142a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a66164f89e37ecb99a32c99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 18:57:25 2018 +0430 ddraw/tests: Rewrite FindDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 138 ---------------------------------------------- dlls/ddraw/tests/ddraw1.c | 106 +++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 106 +++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++++ 4 files changed, 316 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a66164f89e37ecb99a3…

1 0