September 2018 - Wine-Commits

Gabriel Ivăncescu : user32/listbox: Update the size in SetColumnWidth before calling UpdatePage.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 84ac7e1571dc1e11211edccddafe9d1e290ea27e URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ac7e1571dc1e11211edccd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 5 18:51:51 2018 +0300 user32/listbox: Update the size in SetColumnWidth before calling UpdatePage. Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 05fcc44..c8bd148 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1262,12 +1262,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; }

1 0

Józef Kucia : d3d11: Normalize D3D11_BLEND_DESC.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 66996c602d61f1c5ec1040a5a3526480a6b8744c URL: https://source.winehq.org/git/wine.git/?a=commit;h=66996c602d61f1c5ec1040a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:55 2018 +0200 d3d11: Normalize D3D11_BLEND_DESC. 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/state.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d4c3bef..9848690 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -328,12 +328,24 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC { j = desc->IndependentBlendEnable ? i : 0; tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + if (tmp_desc.RenderTarget[i].BlendEnable) + { + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + } + else + { + tmp_desc.RenderTarget[i].SrcBlend = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlend = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOp = D3D11_BLEND_OP_ADD; + tmp_desc.RenderTarget[i].SrcBlendAlpha = D3D11_BLEND_ONE; + tmp_desc.RenderTarget[i].DestBlendAlpha = D3D11_BLEND_ZERO; + tmp_desc.RenderTarget[i].BlendOpAlpha = D3D11_BLEND_OP_ADD; + } tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL)

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: get_cssText implementation.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 78b8ee543f73934121b3a8e126c1c27336ca8ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78b8ee543f73934121b3a8e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:45:03 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::get_cssText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 29 ++++++++++------------------- dlls/mshtml/tests/style.c | 9 ++++++++- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2e2777a..d6ea37d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2472,26 +2472,10 @@ static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - nsAString text_str; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - /* FIXME: Gecko style formatting is different than IE (uppercase). */ - nsAString_Init(&text_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *text; - - nsAString_GetData(&text_str, &text); - *p = *text ? SysAllocString(text) : NULL; - }else { - FIXME("GetCssStyle failed: %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&text_str); - return S_OK; + return IHTMLCSSStyleDeclaration_get_cssText(&This->IHTMLCSSStyleDeclaration_iface, p); } static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, LONG v) @@ -5802,8 +5786,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclarati static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* NOTE: Quicks mode should use different formatting (uppercase, no ';' at the end of rule). */ + nsAString_Init(&text_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); + return return_nsstr(nsres, &text_str, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cursor(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index b33cd01..cbd3257 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -380,10 +380,17 @@ static void test_set_csstext(IHTMLStyle *style) SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_get_cssText(css_style, &str); + ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + todo_wine_if(compat_mode < COMPAT_IE9) + ok(!strcmp_wa(str, compat_mode >= COMPAT_IE9 ? "float: left;" : "FLOAT: left"), + "cssFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL); ok(hres == S_OK, "put_cssText failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: put_cssStyle implementation.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 45f8c03cc73a84201db8e5e7570d62fa518bde7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f8c03cc73a84201db8e5e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 14:44:50 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::put_cssStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++------------- dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fbdf633..2e2777a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2463,20 +2463,10 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - nsAString text_str; - nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_InitDepend(&text_str, v); - nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); - nsAString_Finish(&text_str); - if(NS_FAILED(nsres)) { - FIXME("SetCssStyle failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + return IHTMLCSSStyleDeclaration_put_cssText(&This->IHTMLCSSStyleDeclaration_iface, v); } static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) @@ -5793,8 +5783,20 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_pageBreakAfter(IHTMLCSSStyleDe static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&text_str, v); + nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + FIXME("SetCssStyle failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclaration *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ca1909c..b33cd01 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -355,7 +355,9 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char * static void test_set_csstext(IHTMLStyle *style) { + IHTMLCSSStyleDeclaration *css_style; VARIANT v; + BSTR str; HRESULT hres; test_style_set_csstext(style, "background-color: black;"); @@ -365,6 +367,27 @@ static void test_set_csstext(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "black"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); + ok(hres == S_OK || broken(!is_ie9plus && hres == E_NOINTERFACE), + "Could not get IHTMLCSSStyleDeclaration interface: %08x\n", hres); + if(FAILED(hres)) + return; + + str = a2bstr("float: left;"); + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, str); + ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL); + ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + + IHTMLCSSStyleDeclaration_Release(css_style); } static void test_style2(IHTMLStyle2 *style2)

1 0

André Hentschel : api-ms-win-core-stringloader-l1-1-1 : Add dll.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 82f0bb3754cac4ee0483a3a29fc45f8fd4af55ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f0bb3754cac4ee0483a3a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 14:07:08 2018 +0200 api-ms-win-core-stringloader-l1-1-1: Add dll. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-stringloader-l1-1-1.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index c9ab5af..6961193 100755 --- a/configure +++ b/configure @@ -1000,6 +1000,7 @@ enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 enable_api_ms_win_core_stringansi_l1_1_0 +enable_api_ms_win_core_stringloader_l1_1_1 enable_api_ms_win_core_synch_ansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 @@ -19095,6 +19096,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-string-l1-1-0 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-stringloader-l1-1-1 enable_api_ms_win_core_stringloader_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-synch-ansi-l1-1-0 enable_api_ms_win_core_synch_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 diff --git a/configure.ac b/configure.ac index 69f641d..f8af8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -2953,6 +2953,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-stringloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-0) diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in new file mode 100644 index 0000000..a390a74 --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-stringloader-l1-1-1.dll diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec new file mode 100644 index 0000000..a60736e --- /dev/null +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec @@ -0,0 +1,2 @@ +@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringW(long long ptr long) user32.LoadStringW diff --git a/tools/make_specfiles b/tools/make_specfiles index 24514fc..d69563b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -366,6 +366,7 @@ my @dll_groups = [ "user32", "api-ms-win-core-stringansi-l1-1-0", + "api-ms-win-core-stringloader-l1-1-1", "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0",

1 0

Dmitry Timoshkov : wininet: Remove unused parameter from create_netconn().
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 24f3d50cccfeabcc16282a1411cfe2040b682fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f3d50cccfeabcc16282a14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 5 11:36:38 2018 +0800 wininet: Remove unused parameter from create_netconn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 75784da..b7be993 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4739,7 +4739,6 @@ static void http_process_keep_alive(http_request_t *req) static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { - const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; netconn_t *netconn = NULL; DWORD res; @@ -4794,7 +4793,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, + res = create_netconn(request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 498a79b..8d4266a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -428,7 +428,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN; -DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; +DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index bab046f..ccdb881 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -340,7 +340,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t return ERROR_SUCCESS; } -DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +DWORD create_netconn(server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) { netconn_t *netconn; int result;

1 0

Józef Kucia : wined3d: Add support for A8_UNORM render targets.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: b457352f0c38a2c8d52fa84dcbcf1668ba4883bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b457352f0c38a2c8d52fa84d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:02:01 2018 +0200 wined3d: Add support for A8_UNORM render targets. Not supported in core contexts yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 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/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d75cbc1..6f13f91 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,7 +1531,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_LEGACY_CONTEXT, NULL}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0,

1 0

Józef Kucia : wined3d: Try to avoid allocating sysmem for GPU buffers with initial data.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: eec2f1db5d1b209cf214ff0e7e70ce13a855e21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec2f1db5d1b209cf214ff0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:02:00 2018 +0200 wined3d: Try to avoid allocating sysmem for GPU buffers with initial data. 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/buffer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 639a145..f381b2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1379,9 +1379,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - return E_OUTOFMEMORY; - TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); @@ -1394,6 +1391,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * the buffer to provide the same behavior to the application. */ TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + buffer->locations = WINED3D_LOCATION_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on @@ -1418,6 +1416,12 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_USE_BO; } + if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + } + if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n");

1 0

Józef Kucia : d3d11/tests: Add test for staging buffers.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 8abb76f4b159437bcb22f99bab13cdb07c559998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abb76f4b159437bcb22f99b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:59 2018 +0200 d3d11/tests: Add test for staging buffers. 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 | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e43b2f3..c470e24 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28102,6 +28102,72 @@ static void test_depth_clip(void) release_test_context(&test_context); } +static void test_staging_buffers(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *dst_buffer, *src_buffer; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + float data[16], value; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + resource_data.pSysMem = data; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &src_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == data[i], "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)src_buffer, 0, NULL, data, 0, 0); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_buffer, (ID3D11Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(dst_buffer); + ID3D11Buffer_Release(src_buffer); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28249,6 +28315,7 @@ START_TEST(d3d11) queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); + queue_test(test_staging_buffers); run_queued_tests(); }

1 0

Józef Kucia : wined3d: Allow wined3d_device_update_sub_resource() only on GPU accessible resources.
by Alexandre Julliard Sept. 7, 2018

Sept. 7, 2018

Module: wine Branch: master Commit: 490c6d548abab55ea0a3913d55eecd26f01d1949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=490c6d548abab55ea0a3913d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 6 22:01:57 2018 +0200 wined3d: Allow wined3d_device_update_sub_resource() only on GPU accessible resources. wined3d_device_update_sub_resource() should work only on D3D11_USAGE_DEFAULT resources. 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/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96b8d3c..f6a0b39 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4229,6 +4229,12 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (flags) FIXME("Ignoring flags %#x.\n", flags); + if (!(resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + WARN("Resource %p is not GPU accessible.\n", resource); + return; + } + if (resource->type == WINED3D_RTYPE_BUFFER) { if (sub_resource_idx > 0)

1 0