February 2018 - Wine-commits

Jacek Caban : mshtml: Handle non-HTML element in IHTMLSelectElement: add implementation.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: a4ad2cf82505c1458419103b66cfd02d41f7ccf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ad2cf82505c1458419103b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:26 2018 +0100 mshtml: Handle non-HTML element in IHTMLSelectElement:add implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5a116a7..8f33941 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -425,6 +425,11 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem return E_INVALIDARG; } + if(!element_obj->html_element) { + FIXME("Not HTML element\n"); + return E_NOTIMPL; + } + nsvariant = create_nsvariant(); if(!nsvariant) return E_FAIL; @@ -444,7 +449,7 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem } if(NS_SUCCEEDED(nsres)) - nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->nselem, (nsIVariant*)nsvariant); + nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->html_element, (nsIVariant*)nsvariant); nsIWritableVariant_Release(nsvariant); if(NS_FAILED(nsres)) { ERR("Add failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Added support for non-HTML elements.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: b947229fa92e53aa7fa2f6c9b57cdfdd868164cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b947229fa92e53aa7fa2f6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:04 2018 +0100 mshtml: Added support for non-HTML elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 5 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cc6f542..06e91bc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5570,7 +5570,6 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n assert((nsIDOMNode*)html_element == This->node.nsnode); nsIDOMHTMLElement_Release(html_element); } - This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); @@ -5578,24 +5577,26 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; - nsAString class_name_str; - const PRUnichar *class_name; + nsIDOMElement *nselem; + nsAString tag_name_str; + const PRUnichar *tag_name; const tag_desc_t *tag; HTMLElement *elem; nsresult nsres; HRESULT hres; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_FAILED(nsres)) + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("no nsIDOMElement iface\n"); return E_FAIL; + } - nsAString_Init(&class_name_str, NULL); - nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); + nsAString_Init(&tag_name_str, NULL); + nsIDOMElement_GetTagName(nselem, &tag_name_str); - nsAString_GetData(&class_name_str, &class_name); + nsAString_GetData(&tag_name_str, &tag_name); - tag = get_tag_desc(class_name); + tag = get_tag_desc(tag_name); if(tag) { hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); }else if(use_generic) { @@ -5611,10 +5612,10 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g } } - TRACE("%s ret %p\n", debugstr_w(class_name), elem); + TRACE("%s ret %p\n", debugstr_w(tag_name), elem); - nsIDOMHTMLElement_Release(nselem); - nsAString_Finish(&class_name_str); + nsIDOMElement_Release(nselem); + nsAString_Finish(&tag_name_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0d9221..de200cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -779,9 +779,8 @@ typedef struct { IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; - nsIDOMHTMLElement *nselem; - nsIDOMElement *dom_element; - nsIDOMHTMLElement *html_element; + nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ + nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0

Jacek Caban : mshtml: Added SVG elements tests.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 886dfed9bae0b98edb094ce052b5fec00eccc8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=886dfed9bae0b98edb094ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:16 2018 +0100 mshtml: Added SVG elements tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f9d2690..efdd856 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -152,7 +152,9 @@ typedef enum { ET_LINK, ET_LABEL, ET_BUTTON, - ET_AREA + ET_AREA, + ET_SVG, + ET_CIRCLE } elem_type_t; static const IID * const none_iids[] = { @@ -520,7 +522,9 @@ static const elem_type_info_t elem_type_infos[] = { {"LINK", link_iids, &DIID_DispHTMLLinkElement, &CLSID_HTMLLinkElement}, {"LABEL", label_iids, &DIID_DispHTMLLabelElement, &CLSID_HTMLLabelElement}, {"BUTTON", button_iids, &DIID_DispHTMLButtonElement, &CLSID_HTMLButtonElement}, - {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement} + {"AREA", area_iids, &DIID_DispHTMLAreaElement, &CLSID_HTMLAreaElement}, + {"svg", elem_iids, NULL}, + {"circle", elem_iids, NULL} }; static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -9415,6 +9419,35 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLDOMNode *svg_node, *circle_node; + + test_elem_set_innerhtml((IUnknown*)parent, + "<svg width=\"100\" height=\"100\" id=\"svgid\">" + "<circle cx=\"50\" cy=\"50\" r=\"40\" fill=\"black\" />" + "</svg>"); + svg_node = get_first_child((IUnknown*)parent); + if(compat_mode < COMPAT_IE9) { + todo_wine + ok(!svg_node, "svg_node != NULL\n"); + if(svg_node) + IHTMLDOMNode_Release(svg_node); + return; + } + ok(svg_node != NULL, "svg_node = NULL\n"); + test_elem_type((IUnknown*)svg_node, ET_SVG); + + circle_node = get_first_child((IUnknown*)svg_node); + ok(circle_node != NULL, "circle_node = NULL\n"); + if(!circle_node) + return; + test_elem_type((IUnknown*)circle_node, ET_CIRCLE); + + IHTMLDOMNode_Release(circle_node); + IHTMLDOMNode_Release(svg_node); +}; + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9425,6 +9458,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) test_textarea_element(doc, div); test_form_element(doc, div); + test_svg_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Michael Müller : include: Add run level information enum and structure to winnt.h.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 0a7d627ca3d4bb864a33d093edceea08ffbce05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7d627ca3d4bb864a33d093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 13 02:58:12 2018 +0000 include: Add run level information enum and structure to winnt.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04f00a6..855d2a8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5763,16 +5763,33 @@ typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { } ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; #endif +typedef enum { + ACTCTX_RUN_LEVEL_UNSPECIFIED = 0, + ACTCTX_RUN_LEVEL_AS_INVOKER, + ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE, + ACTCTX_RUN_LEVEL_REQUIRE_ADMIN, + ACTCTX_RUN_LEVEL_NUMBERS +} ACTCTX_REQUESTED_RUN_LEVEL; + +typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { + DWORD ulFlags; + ACTCTX_REQUESTED_RUN_LEVEL RunLevel; + DWORD UiAccess; +} ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + +typedef const struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION *PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation = 2, AssemblyDetailedInformationInActivationContext = 3, FileInformationInAssemblyOfAssemblyInActivationContext = 4, + RunlevelInformationInActivationContext = 5, CompatibilityInformationInActivationContext = 6, + ActivationContextManifestResourceName = 7, MaxActivationContextInfoClass, - - AssemblyDetailedInformationInActivationContxt = 3, - FileInformationInAssemblyOfAssemblyInActivationContxt = 4 + AssemblyDetailedInformationInActivationContxt = AssemblyDetailedInformationInActivationContext, + FileInformationInAssemblyOfAssemblyInActivationContxt = FileInformationInAssemblyOfAssemblyInActivationContext } ACTIVATION_CONTEXT_INFO_CLASS; #define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1

1 0

Nikolay Sivov : comctl32: Introduce ComboBox control.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: c9e98034b37f44d505ba406f94031d02e226a176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e98034b37f44d505ba406f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:36 2018 +0300 comctl32: Introduce ComboBox control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/combo.c | 2116 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/tests/misc.c | 1 + dlls/user32/class.c | 1 - 6 files changed, 2121 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9e98034b37f44d505ba…

1 0

Nikolay Sivov : comctl32/combo: Merge theming logic.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 694602eab1dc2236dc91d93f6d7328699f0cede7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=694602eab1dc2236dc91d93f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:37 2018 +0300 comctl32/combo: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/combo.c | 173 +++++++++++++++++------- dlls/comctl32/theme_combo.c | 319 -------------------------------------------- dlls/comctl32/theming.c | 5 - 4 files changed, 126 insertions(+), 372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=694602eab1dc2236dc91…

1 0

Hermes Belusca-Maito : shlwapi: Make SHCreateWorkerWindowA/ W 64-bit compatible.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 2c163225730e880a1506cb8c02b296cee47c6c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c163225730e880a1506cb8c… Author: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> Date: Mon Feb 12 23:33:58 2018 +0100 shlwapi: Make SHCreateWorkerWindowA/W 64-bit compatible. Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 24 +++++++++++------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 334607e..903df91 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2575,14 +2575,14 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ @@ -2604,8 +2604,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); - - if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); + if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); } return hWnd; @@ -2864,28 +2863,28 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); - return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); + return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; - wc.cbWndExtra = 4; + wc.cbWndExtra = sizeof(LONG_PTR); wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2899,9 +2898,8 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - - if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); + SetWindowLongPtrW(hWnd, 0, wnd_extra); + if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); } return hWnd; diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 6b6ead2..134bb47 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -254,7 +254,7 @@ 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler 256 stdcall -ordinal IUnknown_GetSite(ptr ptr ptr) -257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) +257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) @@ -275,7 +275,7 @@ 275 stub -noname RegisterGlobalHotkeyA 276 stdcall -ordinal WhichPlatform() 277 stub -noname SHDialogBox -278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) +278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -ordinal SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr)

1 0

Anton Romanov : wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 9445c6b6598f5465ccf7026819f10f5f36f12e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9445c6b6598f5465ccf70268… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Mon Feb 12 13:26:08 2018 -0800 wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/oleobj.c | 52 +------ dlls/wmp/tests/oleobj.c | 70 ++++++++- dlls/wmp/wmp_private.h | 16 ++ 5 files changed, 491 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9445c6b6598f5465ccf7…

1 0

Józef Kucia : wined3d: Avoid raw blits when resolving multisample textures.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 53ddba5305b9eb4280214227d8a23703cef77f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ddba5305b9eb4280214227… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:18 2018 +0100 wined3d: Avoid raw blits when resolving multisample textures. 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/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df0481f..00bc4e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3778,7 +3778,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; - BOOL scale, convert; + BOOL scale, convert, resolve; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -3844,6 +3844,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst scale = src_rect->right - src_rect->left != dst_rect->right - dst_rect->left || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top; convert = src_texture->resource.format->id != dst_texture->resource.format->id; + resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; dst_ds_flags = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -3954,7 +3955,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert)) + else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) { blit_op = WINED3D_BLIT_OP_RAW_BLIT; }

1 0

Józef Kucia : wined3d: Implement multisample resolve for typed resources.
by Alexandre Julliard 13 Feb '18

13 Feb '18

Module: wine Branch: master Commit: 2f42f5c911a0dff865a41af4ad78d2fc5244d1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f42f5c911a0dff865a41af4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:19 2018 +0100 wined3d: Implement multisample resolve for typed 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 | 72 +++++++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 +++ 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7881bca..3961f55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,27 +1926,23 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->state.viewport; } -static void resolve_depth_buffer(struct wined3d_state *state) +static void resolve_depth_buffer(struct wined3d_device *device) { - struct wined3d_texture *dst_texture = state->textures[0]; + const struct wined3d_state *state = &device->state; struct wined3d_rendertarget_view *src_view; - RECT src_rect, dst_rect; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; - if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!(dst_texture = state->textures[0])) return; - - if (!(src_view = state->fb->depth_stencil)) + dst_resource = &dst_texture->resource; + if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) return; - if (src_view->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Not supported on buffer resources.\n"); + if (!(src_view = state->fb->depth_stencil)) return; - } - SetRect(&dst_rect, 0, 0, dst_texture->resource.width, dst_texture->resource.height); - SetRect(&src_rect, 0, 0, src_view->width, src_view->height); - wined3d_texture_blt(dst_texture, 0, &dst_rect, texture_from_resource(src_view->resource), - src_view->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + wined3d_device_resolve_sub_resource(device, dst_resource, 0, + src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); } void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state) @@ -2033,7 +2029,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { TRACE("RESZ multisampled depth buffer resolve triggered.\n"); - resolve_depth_buffer(&device->state); + resolve_depth_buffer(device); } } @@ -4305,6 +4301,52 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } +void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id) +{ + struct wined3d_texture *dst_texture, *src_texture; + unsigned int dst_level, src_level; + RECT dst_rect, src_rect; + + TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " + "src_resource %p, src_sub_resource_idx %u, format %s.\n", + device, dst_resource, dst_sub_resource_idx, + src_resource, src_sub_resource_idx, debug_d3dformat(format_id)); + + if (wined3d_format_is_typeless(dst_resource->format) + || wined3d_format_is_typeless(src_resource->format)) + { + FIXME("Unhandled multisample resolve, dst_format %s, src_format %s, format %s.\n", + debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id), + debug_d3dformat(format_id)); + return; + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid destination resource type %s.\n", debug_d3dresourcetype(dst_resource->type)); + return; + } + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid source resource type %s.\n", debug_d3dresourcetype(src_resource->type)); + return; + } + + dst_texture = texture_from_resource(dst_resource); + src_texture = texture_from_resource(src_resource); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + SetRect(&dst_rect, 0, 0, wined3d_texture_get_level_width(dst_texture, dst_level), + wined3d_texture_get_level_height(dst_texture, dst_level)); + src_level = src_sub_resource_idx % src_texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), + wined3d_texture_get_level_height(src_texture, src_level)); + wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); +} + HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c1b5e3..035746d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) +@ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d551d8..ed7445e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2342,6 +2342,10 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); +void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);

1 0