September 2018 - Wine-Commits

Gabriel Ivăncescu : shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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

Nikolay Sivov : xmllite/writer: Improve namespaces handling in WriteStartElement().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: a86e2a4a3f52708edb2996a5e9319b1e1e563b80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a86e2a4a3f52708edb2996a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 11 13:17:06 2018 +0300 xmllite/writer: Improve namespaces handling in WriteStartElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 156 ++++++++++++++++++++++---------------------- dlls/xmllite/writer.c | 48 ++++++++++---- 2 files changed, 112 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a86e2a4a3f52708edb29…

1 0

Michael Stefaniuc : riched20: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 90aea35b9e59f6e700968e9033076627315b9697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90aea35b9e59f6e700968e90… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 10 22:49:39 2018 +0200 riched20: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 11 +++++------ dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 4 ++-- dlls/riched20/reader.c | 4 ++-- dlls/riched20/richole.c | 6 +++--- dlls/riched20/style.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- dlls/riched20/writer.c | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 12f1fa6..2571ce9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -518,8 +518,8 @@ void ME_RTFCharAttrHook(RTF_Info *info) RTFFont *f = RTFGetFont(info, info->rtfParam); if (f) { - MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, sizeof(fmt.szFaceName)/sizeof(WCHAR)); - fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; + MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, ARRAY_SIZE(fmt.szFaceName)); + fmt.szFaceName[ARRAY_SIZE(fmt.szFaceName)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4); @@ -5272,10 +5272,9 @@ static BOOL isurlneutral( WCHAR c ) /* Some shortcuts */ if (isalnum( c )) return FALSE; - if (c > neutral_chars[sizeof(neutral_chars) / sizeof(neutral_chars[0]) - 1]) return FALSE; + if (c > neutral_chars[ARRAY_SIZE( neutral_chars ) - 1]) return FALSE; - return !!bsearch( &c, neutral_chars, sizeof(neutral_chars) / sizeof(neutral_chars[0]), - sizeof(c), wchar_comp ); + return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ), sizeof(c), wchar_comp ); } /** @@ -5408,7 +5407,7 @@ static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, i unsigned int i; ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE, FALSE); - for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) + for (i = 0; i < ARRAY_SIZE(prefixes); i++) { if (nChars < prefixes[i].length) continue; if (!memcmp(prefixes[i].text, bufferW, prefixes[i].length * sizeof(WCHAR))) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fcc4e10..44cf3cb 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -536,7 +536,7 @@ int ME_GetParaBorderWidth(const ME_Context* c, int flags) int idx = (flags >> 8) & 0xF; int width; - if (idx >= sizeof(border_details) / sizeof(border_details[0])) + if (idx >= ARRAY_SIZE(border_details)) { FIXME("Unsupported border value %d\n", idx); return 0; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8f35342..fcd7936 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -206,7 +206,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* This is not base-26 (or 27) as zeros don't count unless they are leading zeros. It's simplest to start with the least significant letter, so first calculate how many letters are needed. */ - for (i = 0, total = 0; i < sizeof(letter_base) / sizeof(letter_base[0]); i++) + for (i = 0, total = 0; i < ARRAY_SIZE( letter_base ); i++) { total += letter_base[i]; if (num < total) break; @@ -228,7 +228,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) case PFN_UCROMAN: if (!num) num = 1; - for (i = 0; i < sizeof(roman_base) / sizeof(roman_base[0]); i++) + for (i = 0; i < ARRAY_SIZE( roman_base ); i++) { if (i > 0) { diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 339ca04..8410241 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2596,13 +2596,13 @@ RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) RTFFlushCPOutputBuffer(info); while (length) { - int fit = min(length, sizeof(info->OutputBuffer) / sizeof(WCHAR) - info->dwOutputCount); + int fit = min(length, ARRAY_SIZE(info->OutputBuffer) - info->dwOutputCount); memmove(info->OutputBuffer + info->dwOutputCount, string, fit * sizeof(WCHAR)); info->dwOutputCount += fit; length -= fit; string += fit; - if (sizeof(info->OutputBuffer) / sizeof(WCHAR) == info->dwOutputCount) + if (ARRAY_SIZE(info->OutputBuffer) == info->dwOutputCount) RTFFlushUnicodeOutputBuffer(info); } } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5e..11b9920 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -97,7 +97,7 @@ void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -633,7 +633,7 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) if (ITextFont_GetName(font, &str) == S_OK) { fmt.dwMask |= CFM_FACE; - lstrcpynW(fmt.szFaceName, str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, str, ARRAY_SIZE(fmt.szFaceName)); SysFreeString(str); } @@ -817,7 +817,7 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop fmt.wWeight = value->l; break; case FONT_NAME: - lstrcpynW(fmt.szFaceName, value->str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, value->str, ARRAY_SIZE(fmt.szFaceName)); break; default: FIXME("unhandled font property %d\n", propid); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 97e98a7..c3f3fc3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -41,7 +41,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); } return TRUE; } @@ -61,7 +61,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); /* copy the rest of the 2A structure to 2W */ CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e3a70f0..1855825 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -260,7 +260,7 @@ static void layout_row( ME_DisplayItem *start, const ME_DisplayItem *end ) TRACE("%d runs\n", num_runs); if (!num_runs) return; - if (num_runs > sizeof(buf) / (sizeof(buf[0]) * 5)) + if (num_runs > ARRAY_SIZE( buf ) / 5) vis_to_log = heap_alloc( num_runs * sizeof(int) * 5 ); log_to_vis = vis_to_log + num_runs; @@ -766,7 +766,7 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) ME_Run *run; ME_DisplayItem *di; SCRIPT_ITEM buf[16], *items = buf; - int items_passed = sizeof( buf ) / sizeof( buf[0] ), num_items, cur_item; + int items_passed = ARRAY_SIZE( buf ), num_items, cur_item; SCRIPT_CONTROL control = { LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0 }; SCRIPT_STATE state = { 0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0 }; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b1e99d6..2bd97d8 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -760,7 +760,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { CFE_STRIKEOUT, "\\strike", "\\strike0" }, }; - for (i = 0; i < sizeof(effects) / sizeof(effects[0]); i++) + for (i = 0; i < ARRAY_SIZE( effects ); i++) { if ((old_fmt->dwEffects ^ fmt->dwEffects) & effects[i].effect) strcat( props, fmt->dwEffects & effects[i].effect ? effects[i].on : effects[i].off );

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reduce the strlen calls because they are redundant.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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

Nikolay Sivov : xmllite/writer: Add support for namespace definitions in WriteElementString().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: 8eb054f3285b2b2985ba6da2775ebc26c42e04e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eb054f3285b2b2985ba6da2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 11 13:17:05 2018 +0300 xmllite/writer: Add support for namespace definitions in WriteElementString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 127 +++++++++++++++++++++++------- dlls/xmllite/writer.c | 184 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 264 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8eb054f3285b2b2985ba…

1 0

Nikolay Sivov : opcservices: Output content types URI.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

Module: wine Branch: master Commit: bc33dbcc12081691167fdd01e7b719cd598b1b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc33dbcc12081691167fdd01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 11 13:17:07 2018 +0300 opcservices: Output content types URI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 2c2ef7c..66cc49a 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -831,6 +831,8 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) static HRESULT opc_package_write_contenttypes(struct zip_archive *archive, IXmlWriter *writer) { + static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', + 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; static const WCHAR typesW[] = {'T','y','p','e','s',0}; IStream *content; @@ -843,7 +845,7 @@ static HRESULT opc_package_write_contenttypes(struct zip_archive *archive, IXmlW hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); if (SUCCEEDED(hr)) hr = IXmlWriter_WriteEndDocument(writer); if (SUCCEEDED(hr))

1 0

Józef Kucia : iphlpapi: Fix FILE leak in get_ipv6_addr_scope_table() (Coverity).
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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

Józef Kucia : d3d11/tests: Test D3D11_BLEND_DESC normalization.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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

Henri Verbeet : ddraw/tests: Rewrite FindDevice().
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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

Józef Kucia : wined3d: Add support for 1D UAVs in shaders.
by Alexandre Julliard Sept. 11, 2018

Sept. 11, 2018

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