February 2018 - Wine-Commits

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in pluginhost.c.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: b7e50ee92e41a1f75ba72bbb34e1295f74b173cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e50ee92e41a1f75ba72bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:36 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in pluginhost.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8a8b0aa..0ed1a77 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1660,7 +1660,7 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) return SUCCEEDED(hres); } -static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) +static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) { const PRUnichar *val; nsAString val_str; @@ -1669,7 +1669,7 @@ static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsres = get_elem_attr_value((nsIDOMElement*)elem, classidW, &val_str, &val); + nsres = get_elem_attr_value(elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) ret = parse_classid(val, clsid); @@ -1895,7 +1895,7 @@ static void install_codebase(const WCHAR *url) WARN("FAILED: %08x\n", hres); } -static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) +static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) { BOOL is_on_list = FALSE; install_entry_t *iter; @@ -1907,7 +1907,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsres = get_elem_attr_value((nsIDOMElement*)nselem, codebaseW, &val_str, &val); + nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); @@ -1958,7 +1958,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) IUri_Release(uri); } -static IUnknown *create_activex_object(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, CLSID *clsid) +static IUnknown *create_activex_object(HTMLDocumentNode *doc, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; @@ -2069,7 +2069,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container assert(!container->plugin_host); - unk = create_activex_object(doc, container->element.nselem, &clsid); + unk = create_activex_object(doc, container->element.dom_element, &clsid); if(!unk) return E_FAIL;

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in get_font_size.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 339a5156f75a95d71809b390db521c615a316b0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=339a5156f75a95d71809b390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:28:44 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in get_font_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 37cdcee..0db8821 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -262,7 +262,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMHTMLElement *elem = NULL; + nsIDOMElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -283,10 +283,10 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMHTMLElement_GetTagName(elem, &tag_str); + nsIDOMElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { @@ -305,7 +305,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) } nsAString_Finish(&tag_str); - nsIDOMHTMLElement_Release(elem); + nsIDOMElement_Release(elem); } if(*ret)

1 0

Jacek Caban : mshtml: Return element as ndIDOMElement from create_nselem.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 300c64603fb41fc93c838e0c1c72d9be5c6465fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=300c64603fb41fc93c838e0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:30:27 2018 +0100 mshtml: Return element as ndIDOMElement from create_nselem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 14 +++++++------- dlls/mshtml/htmlelem.c | 16 ++++------------ dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/txtrange.c | 10 +++++----- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 0db8821..6838433 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -324,7 +324,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; cpp_bool collapsed; - nsIDOMHTMLElement *elem; + nsIDOMElement *elem; nsIDOMRange *range; LONG range_cnt = 0; nsAString size_str; @@ -353,7 +353,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsAString_InitDepend(&size_str, sizeW); nsAString_InitDepend(&val_str, size); - nsIDOMHTMLElement_SetAttribute(elem, &size_str, &val_str); + nsIDOMElement_SetAttribute(elem, &size_str, &val_str); nsAString_Finish(&val_str); nsISelection_GetRangeAt(nsselection, 0, &range); @@ -372,7 +372,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Release(nsselection); nsIDOMRange_Release(range); - nsIDOMHTMLElement_Release(elem); + nsIDOMElement_Release(elem); nsAString_Finish(&size_str); @@ -1106,7 +1106,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, { nsAString href_str, ns_url; nsIHTMLEditor *html_editor; - nsIDOMHTMLElement *anchor_elem; + nsIDOMElement *anchor_elem; cpp_bool insert_link_at_caret; nsISelection *nsselection; BSTR url = NULL; @@ -1148,7 +1148,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsAString_InitDepend(&href_str, hrefW); nsAString_InitDepend(&ns_url, url); - nsIDOMHTMLElement_SetAttribute(anchor_elem, &href_str, &ns_url); + nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); nsAString_Finish(&href_str); nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); @@ -1161,7 +1161,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, &text_node); /* wrap the <a> tags around the text element */ - nsIDOMHTMLElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); + nsIDOMElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); nsIDOMText_Release(text_node); nsIDOMNode_Release(unused_node); } @@ -1184,7 +1184,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, } nsISelection_Release(nsselection); - nsIDOMHTMLElement_Release(anchor_elem); + nsIDOMElement_Release(anchor_elem); if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) SysFreeString(url); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8be0fe5..b0545a3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -269,9 +269,8 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } -HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement **ret) +HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { - nsIDOMElement *nselem; nsAString tag_str; nsresult nsres; @@ -281,26 +280,19 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement } nsAString_InitDepend(&tag_str, tag); - nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &tag_str, &nselem); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &tag_str, ret); nsAString_Finish(&tag_str); if(NS_FAILED(nsres)) { ERR("CreateElement failed: %08x\n", nsres); return E_FAIL; } - nsres = nsIDOMElement_QueryInterface(nselem, &IID_nsIDOMHTMLElement, (void**)ret); - nsIDOMElement_Release(nselem); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); - return E_FAIL; - } - return S_OK; } HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HRESULT hres; /* Use owner doc if called on document fragment */ @@ -312,7 +304,7 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re return hres; hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, TRUE, ret); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); return hres; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 6421440..90681e4 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -874,7 +874,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i HTMLDocumentNode *doc; IHTMLImgElement *img; HTMLElement *elem; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; LONG l; HRESULT hres; @@ -897,7 +897,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return hres; hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, FALSE, &elem); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) { ERR("HTMLElement_Create failed\n"); return hres; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index b0c35e5..43661b7 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -559,7 +559,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory IHTMLOptionElement **optelem) { HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HTMLDOMNode *node; HRESULT hres; @@ -580,7 +580,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory return hres; hres = get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE, &node); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index be60375..a0d9221 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -979,7 +979,7 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; +HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index aa40e4c..c54cbbb 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1661,7 +1661,7 @@ static HRESULT WINAPI RangeCommandTarget_QueryStatus(IOleCommandTarget *iface, c static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) { - nsIDOMHTMLElement *blockquote_elem, *p_elem; + nsIDOMElement *blockquote_elem, *p_elem; nsIDOMDocumentFragment *fragment; nsIDOMNode *tmp; @@ -1679,16 +1679,16 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) create_nselem(This->doc, pW, &p_elem); nsIDOMRange_ExtractContents(This->nsrange, &fragment); - nsIDOMHTMLElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); + nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); nsIDOMDocumentFragment_Release(fragment); nsIDOMNode_Release(tmp); - nsIDOMHTMLElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp); - nsIDOMHTMLElement_Release(p_elem); + nsIDOMElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp); + nsIDOMElement_Release(p_elem); nsIDOMNode_Release(tmp); nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)blockquote_elem); - nsIDOMHTMLElement_Release(blockquote_elem); + nsIDOMElement_Release(blockquote_elem); return S_OK; }

1 0

Michael Müller : shell32: Use manual redirection for RunDLL_CallEntry16.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 2723e9473cc67b723c654b1859c49a9ddd6b0539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2723e9473cc67b723c654b18… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 12 05:11:25 2018 +0000 shell32: Use manual redirection for RunDLL_CallEntry16. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/control.c | 22 ++++++++++++++++++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 748b2d2..88d0ae8 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -883,3 +883,25 @@ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, D FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } + +/************************************************************************* + * RunDLL_CallEntry16 [SHELL32.122] + * Manually relay this function to make Tages Protection v5 happy + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) +{ + static HMODULE shell16 = NULL; + static void (WINAPI *pRunDLL_CallEntry16)( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) = NULL; + + if (!pRunDLL_CallEntry16) + { + if (!shell16 && !(shell16 = LoadLibraryA( "shell.dll16" ))) + return; + if (!(pRunDLL_CallEntry16 = (void *)GetProcAddress( shell16, "RunDLL_CallEntry16" ))) + return; + } + + pRunDLL_CallEntry16( proc, hwnd, inst, cmdline, cmdshow ); +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 81fae6d..91e4f6b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -noname RunDLL_CallEntry16(long long ptr str long) 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Nikolay Sivov : comctl32/button: Merge theming logic.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f1cc2da207d00ea989b659221f77410fcd8b966e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1cc2da207d00ea989b65922… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:53 2018 +0300 comctl32/button: 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/button.c | 400 ++++++++++++++++++++++++++++++++++------ dlls/comctl32/theme_button.c | 423 ------------------------------------------- dlls/comctl32/theming.c | 7 - 4 files changed, 348 insertions(+), 483 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1cc2da207d00ea989b6…

1 0

Nikolay Sivov : comctl32/button: Invalidate on BM_SETSTATE.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f8eb74e10c450335eac706818df95d42514a7322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8eb74e10c450335eac70681… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:54 2018 +0300 comctl32/button: Invalidate on BM_SETSTATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 22 +++++++++++++++------- dlls/comctl32/tests/button.c | 10 +++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index c8f85d9..85aa47f 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -305,7 +305,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L POINT pt; LONG style = GetWindowLongW( hWnd, GWL_STYLE ); UINT btn_type = get_button_type( style ); - LONG state; + LONG state, new_state; HANDLE oldHbitmap; HTHEME theme; @@ -674,12 +674,21 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETSTATE: state = get_button_state( hWnd ); - if (wParam) - set_button_state( hWnd, state | BST_PUSHED ); - else - set_button_state( hWnd, state & ~BST_PUSHED ); + new_state = wParam ? BST_PUSHED : 0; + + if ((state ^ new_state) & BST_PUSHED) + { + if (wParam) + state |= BST_PUSHED; + else + state &= ~BST_PUSHED; - paint_button( hWnd, btn_type, ODA_SELECT ); + if (btn_type == BS_USERBUTTON) + BUTTON_NOTIFY_PARENT( hWnd, (state & BST_PUSHED) ? BN_HILITE : BN_UNHILITE ); + set_button_state( hWnd, state ); + + InvalidateRect( hWnd, NULL, FALSE ); + } break; case WM_NCHITTEST: @@ -1206,7 +1215,6 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ) break; default: - BUTTON_NOTIFY_PARENT( hwnd, BN_PAINT ); break; } } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 425e145..38446aa 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -350,8 +350,6 @@ static const struct message setstate_seq[] = { BM_SETSTATE, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_PAINT, sent|optional }, { 0 } }; @@ -372,8 +370,6 @@ static const struct message setstate_user_seq[] = { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_HILITE) }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { 0 } }; @@ -596,7 +592,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo = button[i].style == BS_USERBUTTON || button[i].style == BS_OWNERDRAW; + todo = button[i].style == BS_OWNERDRAW; ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstyle, "BM_SETSTYLE on a button", todo); style = GetWindowLongA(hwnd, GWL_STYLE); @@ -612,7 +608,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, TRUE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == BST_PUSHED, "expected state 0x0004, got %04x\n", state); @@ -626,7 +622,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, FALSE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == 0, "expected state 0, got %04x\n", state);

1 0

Zebediah Figura : winedbg: Remove a misplaced \n.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 67d7eb980e0d3caf98b9cc62437dfa854d467240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d7eb980e0d3caf98b9cc62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:06 2018 -0600 winedbg: Remove a misplaced \n. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 78a0493..970e81a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -581,7 +581,7 @@ void print_bare_address(const ADDRESS64* addr) memory_offset_to_string(hexbuf, addr->Offset, 32)); break; default: - dbg_printf("Unknown mode %x\n", addr->Mode); + dbg_printf("Unknown mode %x", addr->Mode); break; } }

1 0

Zebediah Figura : msvfw32/tests: Simplify swapped-case test.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f4ebb7d57d7f6a3870e4a40b6e2efbbc3c6748e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ebb7d57d7f6a3870e4a40b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 9 10:16:10 2018 -0600 msvfw32/tests: Simplify swapped-case test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 3fe6702..c6fe0f2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -303,18 +303,9 @@ static void test_ICInfo(void) found++; /* Test getting info with a different case - bug 41602 */ - if (fcc[0] & 0x20) - { - fcc[0] &= ~0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); - } - else - { - fcc[0] |= 0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); - } + fcc[0] ^= 0x20; + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); }

1 0

Henri Verbeet : ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on textures.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 46f20e419890b988a55089dc291d00221ff449ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f20e419890b988a55089dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:40 2018 +0330 ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on textures. Like buffers, WINED3D_RESOURCE_ACCESS_MAP is not currently enforced on 2D textures in wined3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e51f9d8..009ccc0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6011,7 +6011,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; wined3d_desc.depth = 1;

1 0

Henri Verbeet : ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 3bb34ac938e525497e55cb51016025259d00585f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb34ac938e525497e55cb51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:39 2018 +0330 ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Since ddraw buffers can always be mapped. WINED3D_RESOURCE_ACCESS_MAP is currently not enforced on buffers in wined3d, but we'd like to change that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d710b34..59ff83b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -632,7 +632,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df8531d..0ce5446 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -127,7 +127,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; else - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Nikolay Sivov : comctl32/static: Reuse existing system colors helper.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 1d5cc6efdfef9737d86d2ebfc588b821bab986ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5cc6efdfef9737d86d2ebf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:56 2018 +0300 comctl32/static: Reuse existing system colors helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 49127fa..d9e2fe3 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -55,8 +55,6 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; - /* offsets for GetWindowLong for static private information */ #define HFONT_GWL_OFFSET 0 #define HICON_GWL_OFFSET (sizeof(HFONT)) @@ -292,13 +290,6 @@ static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) return hBrush; } -static VOID STATIC_InitColours(void) -{ - color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); - color_3dshadow = GetSysColor(COLOR_3DSHADOW); - color_3dhighlight = GetSysColor(COLOR_3DHIGHLIGHT); -} - /*********************************************************************** * hasTextStyle * @@ -336,7 +327,6 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, ERR("Unknown style 0x%02x\n", style ); return -1; } - STATIC_InitColours(); break; case WM_NCDESTROY: @@ -391,7 +381,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, break; case WM_SYSCOLORCHANGE: - STATIC_InitColours(); + COMCTL32_RefreshSysColors(); STATIC_TryPaintFcn( hwnd, full_style ); break; @@ -644,27 +634,27 @@ static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FillRect( hdc, &rc, hBrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FillRect( hdc, &rc, hBrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FillRect( hdc, &rc, hBrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FrameRect( hdc, &rc, hBrush ); break; default:

1 0

Nikolay Sivov : comctl32/button: Invalidate on BM_SETCHECK.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 287c5a25b6ea35830bcb4b21b2a2adb8e2853232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287c5a25b6ea35830bcb4b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:55 2018 +0300 comctl32/button: Invalidate on BM_SETCHECK. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- dlls/comctl32/tests/button.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 85aa47f..2f5a5b3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -663,7 +663,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if ((state & 3) != wParam) { set_button_state( hWnd, (state & ~3) | wParam ); - paint_button( hWnd, btn_type, ODA_SELECT ); + InvalidateRect( hWnd, NULL, FALSE ); } if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38446aa..96b8bea 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -440,8 +440,7 @@ static const struct message setcheck_radio_redraw_seq[] = { WM_STYLECHANGED, sent|wparam|defwinproc, GWL_STYLE }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { 0 } }; @@ -661,7 +660,9 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETCHECK, BST_CHECKED, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || @@ -672,16 +673,10 @@ static void test_button_messages(void) button[i].style == BS_COMMANDLINK || button[i].style == BS_DEFCOMMANDLINK) { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_UNCHECKED, "expected check BST_UNCHECKED, got %04x\n", state); } else - { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", TRUE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_CHECKED, "expected check BST_CHECKED, got %04x\n", state); - } style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY | WS_VISIBLE);

1 0

Francois Gouget : testbot: Add a Munin plugin to monitor the TestBot activity.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: cb517f81bb7ac31c101b9bfdf38ecba7ccadc7b7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cb517f81bb7ac31c101b9bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:34:29 2018 +0100 testbot: Add a Munin plugin to monitor the TestBot activity. This will make it possible to compare current data to historic data for crucial parameters like the number of jobs and tasks per hour, the job completion time, each VM host's busy rate, etc. It will also make it possible to see if the reverts are progressively getting slower, or if on the contrary they got slower on a specific date, which would point to some change on the host, etc. Note that access to the new Munin web page requires an API key to limit who can query these statistics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 + testbot/scripts/MuninPlugin | 146 ++++++++ testbot/web/Munin.pl | 496 +++++++++++++++++++++++++ 4 files changed, 648 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=cb517f81bb7ac31c101…

1 0

Francois Gouget : testbot: Explicitly track new tasks on a per VM host basis.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: 6e8fd898fef19fde281f78353a31bef84886bc05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e8fd898fef19fde281f783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:34:25 2018 +0100 testbot: Explicitly track new tasks on a per VM host basis. The number of tasks that got run on a VM host (running.time.count) is not a proxy for the number of tasks that got created for that VM host since not all tasks get run, for instance if the build fails. Furthermore, when computing rates over short periods, the rate at which tasks get completed on a given VM host is not the same as the rate at which they get created, just as it is for jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 14 ++++++++++++-- testbot/web/Stats.pl | 6 +++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c76b21e..3016b14 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -367,10 +367,20 @@ sub GetStatistics($;$) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); - + my $HostStats; + if ($VMs->ItemExists($Task->VM->GetKey())) + { + my $Host = $Task->VM->GetHost(); + $HostStats = ($HostsStats->{items}->{$Host} ||= {}); + } + if ($CountsAsNew) + { + $GlobalStats->{"newtasks.count"}++; + $HostStats->{"newtasks.count"}++ if ($HostStats); + } next if (!$Task->Ended or $Task->Ended < $Cutoff); $GlobalStats->{"donetasks.count"}++; + $HostStats->{"donetasks.count"}++ if ($HostStats); # $Task->Started should really be set since $Task->Ended is if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 51a7227..806a366 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -264,15 +264,15 @@ sub GenerateBody($) print "<th>$DisplayHost</th>\n"; _AddRate($HostsStats->{items}->{$Host}, "reverting.time.count", $HostsStats); - _AddRate($HostsStats->{items}->{$Host}, "running.time.count", $HostsStats); + _AddRate($HostsStats->{items}->{$Host}, "newtasks.count", $HostsStats); } print "</tr></thead>\n"; print "<tbody>\n"; _GenStatsLine($HostsStats, "reverting.time.count", "Revert count", $SortedHosts); _GenStatsLine($HostsStats, "reverting.rate", "Revert rate", $SortedHosts); - _GenStatsLine($HostsStats, "running.time.count", "Task count", $SortedHosts); - _GenStatsLine($HostsStats, "running.rate", "Task rate", $SortedHosts); + _GenStatsLine($HostsStats, "newtasks.count", "Task count", $SortedHosts); + _GenStatsLine($HostsStats, "newtasks.rate", "Task rate", $SortedHosts); _GenStatsLine($HostsStats, "busy.elapsed", "Busy time", $SortedHosts, $NO_PERCENTAGE); _GenStatsLine($HostsStats, "busy.elapsed", "Busy \%", $SortedHosts);

1 0

Francois Gouget : testbot: Keep track of the completed jobs and tasks.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: c4b0e7ba117abd4ae8a5fafb19c203cb183f1063 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4b0e7ba117abd4ae8a5faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:33:59 2018 +0100 testbot: Keep track of the completed jobs and tasks. Over short periods the rate at which jobs and tasks are created does not necessarily match the one at which they are completed. We are already tracking the creation rates so we should track the completion rates too so they can be compared. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 4aed4ed..c76b21e 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -368,7 +368,9 @@ sub GetStatistics($;$) foreach my $Task (@{$Tasks->GetItems()}) { $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); + next if (!$Task->Ended or $Task->Ended < $Cutoff); + $GlobalStats->{"donetasks.count"}++; # $Task->Started should really be set since $Task->Ended is if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) @@ -393,12 +395,15 @@ sub GetStatistics($;$) } } - if (!$IsSpecialJob and $Job->Ended and $Job->Ended >= $Cutoff and - $Job->Status !~ /^(?:queued|running|canceled)$/) + if ($Job->Ended and $Job->Ended >= $Cutoff) { - my $Time = $Job->Ended - $Job->Submitted; - _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); - push @JobTimes, $Time; + $GlobalStats->{"donejobs.count"}++; + if (!$IsSpecialJob and $Job->Status !~ /^(?:queued|running|canceled)$/) + { + my $Time = $Job->Ended - $Job->Submitted; + _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); + push @JobTimes, $Time; + } } }

1 0

Francois Gouget : winetest: Fail tests units that spam the test report.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: 0aa7f8d0d9c6b5dad1076553fffdf1078886784b URL: https://source.winehq.org/git/tools.git/?a=commit;h=0aa7f8d0d9c6b5dad107655… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 00:59:49 2018 +0100 winetest: Fail tests units that spam the test report. To not exceed the maximum report size, each test unit must print less than 2.5KB of traces on average. So report tests that hog more than 10 times that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 10 +++++++++- winetest/winetest.conf | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 4cb31b0..9635f0a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxunitsize $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -435,6 +435,7 @@ while ($line = <IN> || "") # my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my $unitsize = 0; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); my (%pids, $rc, $summary, $broken); @@ -523,6 +524,11 @@ sub close_test_unit($) $todo ||= $s_todo; $skipped ||= $s_skipped; + if ($unitsize > $maxunitsize) + { + add_test_line("end", "The test prints too much data ($unitsize bytes)"); + $extra_failures++; + } if (!$broken and defined $rc) { # Check the exit code, particularly against failures reported @@ -563,6 +569,7 @@ sub close_test_unit($) } $dll = $unit = ""; + $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; $extra_failures = $broken = 0; @@ -572,6 +579,7 @@ sub close_test_unit($) $line =~ /^Test output:/ or mydie "no test header: $line"; while ($line = <IN>) { + $unitsize += length($line); next if ($line =~ /^\s*$/); chomp $line; $line =~ s/\r+$//; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index ba15514..84824a2 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -17,6 +17,9 @@ $maxfailedtests = 50; # Whether to accept test results from Win9x / NT4 versions $acceptprediluvianwin = 0; +# Maximum amount of traces for a test unit +$maxunitsize = 32 * 1024; + # Maximum size of the report file # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024;

1 0

Józef Kucia : wined3d: Add STATE_BLEND to debug_d3dstate().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: b688f6ee34725f2b1e8e699d4d189b0f1da4ebb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b688f6ee34725f2b1e8e699d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:27 2018 +0100 wined3d: Add STATE_BLEND to debug_d3dstate(). 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 48f72fe..c4d6e65 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4658,6 +4658,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_COLOR_KEY"; if (STATE_IS_STREAM_OUTPUT(state)) return "STATE_STREAM_OUTPUT"; + if (STATE_IS_BLEND(state)) + return "STATE_BLEND"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); }

1 0

Józef Kucia : wined3d: Create multisample textures.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 2fd86a17bb73b5e32b5e9e0208a8dd050388f7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd86a17bb73b5e32b5e9e02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:23 2018 +0100 wined3d: Create 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/d3d11/texture.c | 3 --- dlls/wined3d/directx.c | 5 ++++ dlls/wined3d/resource.c | 14 ++++++++++- dlls/wined3d/texture.c | 64 +++++++++++++++++++++++++++++++++---------------- 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 4d500c9..39d71cd 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -512,9 +512,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - if (desc->SampleDesc.Count > 1) - FIXME("Multisampled textures not implemented.\n"); - wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6dee5ed..c8f42fe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4246,6 +4246,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, } if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !wined3d_settings.multisample_textures) gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !gl_info->supported[ARB_TEXTURE_STORAGE_MULTISAMPLE]) + { + WARN("Disabling ARB_texture_multisample because immutable storage is not supported.\n"); + gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 61ff206..e318888 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -442,11 +442,23 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) { if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + { resource->draw_binding = WINED3D_LOCATION_DRAWABLE; + } else if (resource->multisample_type) - resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + { + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; + else + resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + } else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) + { resource->draw_binding = WINED3D_LOCATION_RB_RESOLVED; + } else + { resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; + } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 116b8db..5ff8a4f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -460,6 +460,13 @@ static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_tex { const struct wined3d_format *format = texture->resource.format; + /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) + * feature through type == MULTISAMPLE_XX and quality != 0. This could + * be mapped to GL_NV_framebuffer_multisample_coverage. + * + * AMD have a similar feature called Enhanced Quality Anti-Aliasing + * (EQAA), but it does not have an equivalent OpenGL extension. */ + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality * levels as the count of advertised multisample types for the texture * format. */ @@ -530,21 +537,31 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture *texture, GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) { - GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + unsigned int samples = wined3d_texture_get_gl_sample_count(texture); GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); + GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); - if (texture->target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, - width, height, texture->layer_count)); - checkGLcall("glTexStorage3D"); - } - else + switch (texture->target) { - GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, gl_internal_format, - width, height)); - checkGLcall("glTexStorage2D"); + case GL_TEXTURE_2D_ARRAY: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, texture->layer_count)); + break; + case GL_TEXTURE_2D_MULTISAMPLE: + GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, + gl_internal_format, width, height, GL_FALSE)); + break; + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, + gl_internal_format, width, height, texture->layer_count, GL_FALSE)); + break; + default: + GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, + gl_internal_format, width, height)); + break; } + + checkGLcall("allocate immutable storage"); } static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) @@ -1502,13 +1519,6 @@ static void wined3d_texture_prepare_rb(struct wined3d_texture *texture, if (texture->rb_multisample) return; - /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) - * feature through type == MULTISAMPLE_XX and quality != 0. This could - * be mapped to GL_NV_framebuffer_multisample_coverage. - * - * AMD have a similar feature called Enhanced Quality Anti-Aliasing - * (EQAA), but it does not have an equivalent OpenGL extension. */ - samples = wined3d_texture_get_gl_sample_count(texture); gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_multisample); @@ -2189,11 +2199,23 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[5] = 1.0f; } if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + { texture->target = GL_TEXTURE_CUBE_MAP_ARB; - else if (layer_count > 1) - texture->target = GL_TEXTURE_2D_ARRAY; + } + else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; + else + texture->target = GL_TEXTURE_2D_MULTISAMPLE; + } else - texture->target = GL_TEXTURE_2D; + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_ARRAY; + else + texture->target = GL_TEXTURE_2D; + } } texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f;

1 0

Józef Kucia : wined3d: Add registry setting to enable multisample textures.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 11dd0601c5184e58c708d7763b9f55e572d52e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dd0601c5184e58c708d776… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:22 2018 +0100 wined3d: Add registry setting to enable multisample textures. The registry key helps to add multisample textures support incrementally without breaking the current support for multisample renderbuffers. It might be also useful to have a possibility to disable multisample textures when they are the default code path for multisampling in wined3d. 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/directx.c | 2 ++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1be6d2b..6dee5ed 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4244,6 +4244,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, WARN("Disabling ARB_draw_indirect because ARB_base_instance is not supported.\n"); gl_info->supported[ARB_DRAW_INDIRECT] = FALSE; } + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !wined3d_settings.multisample_textures) + gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 28a34a7..d3d3f2d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -81,6 +81,7 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ + FALSE, /* Prefer multisample renderbuffers to multisample textures by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -284,6 +285,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); else memcpy(wined3d_settings.logo, buffer, len); } + if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &wined3d_settings.multisample_textures)) + ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf17a1c..f1f7530 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -391,6 +391,7 @@ struct wined3d_settings /* Memory tracking and object counting. */ UINT64 emulated_textureram; char *logo; + unsigned int multisample_textures; unsigned int sample_count; BOOL strict_draw_ordering; BOOL check_float_constants;

1 0

Józef Kucia : wined3d: Add support for multisample textures in context_dump_fbo_attachment().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 32e61de2825e1b01ac55195ecdf7b997d587e37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e61de2825e1b01ac55195e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:21 2018 +0100 wined3d: Add support for multisample textures in context_dump_fbo_attachment(). 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/context.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9a69921..e3e4834 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -238,9 +238,11 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } texture_type[] = { - {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, - {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, - {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array", EXT_TEXTURE_ARRAY}, + {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, + {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, + {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array" , EXT_TEXTURE_ARRAY}, + {GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BINDING_2D_MULTISAMPLE, "2d-ms", ARB_TEXTURE_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, "2d-array-ms", ARB_TEXTURE_MULTISAMPLE}, }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; @@ -307,6 +309,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt)); GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width)); GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_SAMPLES, &samples)); } else { @@ -336,13 +339,17 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_SAMPLES, &samples); + else + samples = 1; gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); } } - FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), - tex_type_str, name, width, height, fmt); + FIXME(" %s: %s texture %d, %dx%d, %d samples, format %#x.\n", + debug_fboattachment(attachment), tex_type_str, name, width, height, samples, fmt); checkGLcall("guess texture type"); }

1 0

Józef Kucia : wined3d: Avoid guessing texture target if OpenGL 4.5 is available.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 7221ccecdd902949aecb67f29e7abf17875dc5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7221ccecdd902949aecb67f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:20 2018 +0100 wined3d: Avoid guessing texture target if OpenGL 4.5 is available. 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/context.c | 65 ++++++++++++++++++++++++++++++++++---------------- dlls/wined3d/directx.c | 2 ++ 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccfe630..9a69921 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -289,39 +289,62 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G unsigned int i; tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) + if (gl_info->gl_ops.ext.p_glGetTextureParameteriv) { - if (!gl_info->supported[texture_type[i].extension]) - continue; + GL_EXTCALL(glGetTextureParameteriv(name, GL_TEXTURE_TARGET, &tex_target)); - gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); - while (gl_info->gl_ops.gl.p_glGetError()); - - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); - if (!gl_info->gl_ops.gl.p_glGetError()) + for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { - tex_target = texture_type[i].target; - tex_type_str = texture_type[i].str; - break; + if (texture_type[i].target == tex_target) + { + tex_type_str = texture_type[i].str; + break; + } } - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); + if (i == ARRAY_SIZE(texture_type)) + tex_type_str = wine_dbg_sprintf("%#x", tex_target); + + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height)); } - if (!tex_type_str) + else { - FIXME("Cannot find type of texture %d.\n", name); - return; - } + for (i = 0; i < ARRAY_SIZE(texture_type); ++i) + { + if (!gl_info->supported[texture_type[i].extension]) + continue; + + gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); + if (!gl_info->gl_ops.gl.p_glGetError()) + { + tex_target = texture_type[i].target; + tex_type_str = texture_type[i].str; + break; + } + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); + } + if (!tex_type_str) + { + FIXME("Cannot find type of texture %d.\n", name); + return; + } + + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + + gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); + } } FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), tex_type_str, name, width, height, fmt); - gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); - checkGLcall("Guess texture type"); + checkGLcall("guess texture type"); } else if (type == GL_NONE) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 000d0b7..1be6d2b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3270,6 +3270,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetShaderiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetShaderSource) /* OpenGL 2.0 */ USE_GL_FUNC(glGetStringi) /* OpenGL 3.0 */ + USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */ + USE_GL_FUNC(glGetTextureParameteriv) /* OpenGL 4.5 */ USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */

1 0

Alex Henrie : dhtmled.ocx: Add IOleObject interface to DHTMLEdit object.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 5c4fcde7057e6ff62f7e5b74db631e38fb01f11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4fcde7057e6ff62f7e5b74… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 8 23:55:55 2018 -0700 dhtmled.ocx: Add IOleObject interface to DHTMLEdit object. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 283 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 268 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4fcde7057e6ff62f7e…

1 0

Alexandre Julliard : winex11: Store only the pixmap size instead of the window rectangle in the GL drawable.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 99041a6fd369deeeb60ce1f11195414d16c9dc44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99041a6fd369deeeb60ce1f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 13:08:04 2018 +0100 winex11: Store only the pixmap size instead of the window rectangle in the GL drawable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 40 +++++++++++++++++++--------------------- dlls/winex11.drv/window.c | 7 ++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a7f5756..27f0154 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -259,7 +259,7 @@ struct gl_drawable Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ Colormap colormap; /* colormap used for the drawable */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ - RECT rect; /* drawable rect, relative to whole window drawable */ + SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ int swap_interval; BOOL refresh_swap_interval; }; @@ -1348,6 +1348,12 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) { XVisualInfo *visual = gl->format->visual; + RECT rect; + int width, height; + + GetClientRect( hwnd, &rect ); + width = min( max( 1, rect.right ), 65535 ); + height = min( max( 1, rect.bottom ), 65535 ); gl->drawable = 0; @@ -1389,8 +1395,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XInstallColormap(gdi_display, attrib.colormap); gl->type = DC_GL_CHILD_WIN; - gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, + gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, width, height, 0, visual->depth, InputOutput, visual->visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) @@ -1410,13 +1415,13 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) WARN("XComposite is not available, using GLXPixmap hack\n"); gl->type = DC_GL_PIXMAP_WIN; - gl->pixmap = XCreatePixmap( gdi_display, root_window, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - visual->depth ); + gl->pixmap = XCreatePixmap( gdi_display, root_window, width, height, visual->depth ); if (gl->pixmap) { gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); if (!gl->drawable) XFreePixmap( gdi_display, gl->pixmap ); + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; } } @@ -1442,9 +1447,6 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) gl->swap_interval = 1; gl->refresh_swap_interval = TRUE; gl->format = format; - GetClientRect( hwnd, &gl->rect ); - gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); - gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); if (!create_gl_drawable( hwnd, gl )) { @@ -1517,31 +1519,26 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { struct gl_drawable *gl; GLXDrawable glxp; Pixmap pix; - int mask = 0; XWindowChanges changes; - changes.width = min( max( 1, client_rect->right - client_rect->left ), 65535 ); - changes.height = min( max( 1, client_rect->bottom - client_rect->top ), 65535 ); + changes.width = min( max( 1, width ), 65535 ); + changes.height = min( max( 1, height ), 65535 ); if (!(gl = get_gl_drawable( hwnd, 0 ))) return; - if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; - if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; - TRACE( "setting drawable %lx size %dx%d\n", gl->drawable, changes.width, changes.height ); switch (gl->type) { case DC_GL_CHILD_WIN: - if (mask) XConfigureWindow( gdi_display, gl->window, mask, &changes ); + XConfigureWindow( gdi_display, gl->window, CWWidth | CWHeight, &changes ); break; case DC_GL_PIXMAP_WIN: - if (!mask) break; pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->format->visual->depth); if (!pix) goto done; @@ -1560,11 +1557,12 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r gl->pixmap = pix; gl->drawable = glxp; + gl->pixmap_size.cx = width; + gl->pixmap_size.cy = height; break; default: break; } - SetRect( &gl->rect, 0, 0, changes.width, changes.height ); done: release_gl_drawable( gl ); } @@ -3344,7 +3342,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) * copying */ pglFlush(); pglXCopySubBufferMESA( gdi_display, gl->drawable, 0, 0, - gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); + gl->pixmap_size.cx, gl->pixmap_size.cy ); break; } if (pglXSwapBuffersMscOML) @@ -3413,7 +3411,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) +void sync_gl_drawable( HWND hwnd, int width, int height ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a6101ad..8645ad9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2307,8 +2307,13 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (!data->whole_window) { + int width = data->client_rect.right - data->client_rect.left; + int height = data->client_rect.bottom - data->client_rect.top; + release_win_data( data ); - sync_gl_drawable( hwnd, visible_rect, rectClient ); + if (width != old_client_rect.right - old_client_rect.left || + height != old_client_rect.bottom - old_client_rect.top) + sync_gl_drawable( hwnd, width, height ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index eca0dc5..0b80276 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -579,7 +579,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, int width, int height ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Store the visual info in the OpenGL pixel format.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 9efcd61d010488f8ab34075ac55ce5acc8b4d38f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9efcd61d010488f8ab34075a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 09:42:53 2018 +0100 winex11: Store the visual info in the OpenGL pixel format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7401288..a7f5756 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -201,6 +201,7 @@ struct WineGLInfo { struct wgl_pixel_format { GLXFBConfig fbconfig; + XVisualInfo *visual; int fmt_id; int render_type; DWORD dwFlags; /* We store some PFD_* flags in here for emulated bitmap formats */ @@ -212,7 +213,6 @@ struct wgl_context BOOL has_been_current; BOOL sharing; BOOL gl3_context; - XVisualInfo *vis; const struct wgl_pixel_format *fmt; int numAttribs; /* This is needed for delaying wglCreateContextAttribsARB */ int attribList[16]; /* This is needed for delaying wglCreateContextAttribsARB */ @@ -259,7 +259,6 @@ struct gl_drawable Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ Colormap colormap; /* colormap used for the drawable */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ - XVisualInfo *visual; /* information about the GL visual */ RECT rect; /* drawable rect, relative to whole window drawable */ int swap_interval; BOOL refresh_swap_interval; @@ -1129,6 +1128,7 @@ static void init_pixel_formats( Display *display ) TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].fbconfig = cfgs[i]; + list[size].visual = visinfo; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].dwFlags = 0; @@ -1140,6 +1140,7 @@ static void init_pixel_formats( Display *display ) { TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].fbconfig = cfgs[i]; + list[size].visual = visinfo; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_FORMAT; @@ -1169,8 +1170,7 @@ static void init_pixel_formats( Display *display ) list[size].dwFlags = 0; size++; } - - if (visinfo) XFree(visinfo); + else if (visinfo) XFree(visinfo); } } @@ -1310,8 +1310,8 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex else ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, GL_TRUE, NULL); } - else if(context->vis) - ctx = pglXCreateContext(gdi_display, context->vis, shareList, GL_TRUE); + else if(context->fmt->visual) + ctx = pglXCreateContext(gdi_display, context->fmt->visual, shareList, GL_TRUE); else /* Create a GLX Context for a pbuffer */ ctx = pglXCreateNewContext(gdi_display, context->fmt->fbconfig, context->fmt->render_type, shareList, TRUE); @@ -1338,7 +1338,6 @@ static void free_gl_drawable( struct gl_drawable *gl ) default: break; } - if (gl->visual) XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); } @@ -1348,6 +1347,8 @@ static void free_gl_drawable( struct gl_drawable *gl ) */ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) { + XVisualInfo *visual = gl->format->visual; + gl->drawable = 0; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ @@ -1357,7 +1358,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) if (data) { gl->type = DC_GL_WINDOW; - gl->window = create_client_window( data, gl->visual ); + gl->window = create_client_window( data, visual ); if (gl->window) gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); release_win_data( data ); @@ -1379,10 +1380,10 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); XMapWindow( gdi_display, dummy_parent ); } - gl->colormap = XCreateColormap(gdi_display, dummy_parent, gl->visual->visual, - (gl->visual->class == PseudoColor || - gl->visual->class == GrayScale || - gl->visual->class == DirectColor) ? + gl->colormap = XCreateColormap(gdi_display, dummy_parent, visual->visual, + (visual->class == PseudoColor || + visual->class == GrayScale || + visual->class == DirectColor) ? AllocAll : AllocNone); attrib.colormap = gl->colormap; XInstallColormap(gdi_display, attrib.colormap); @@ -1390,7 +1391,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->type = DC_GL_CHILD_WIN; gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - 0, gl->visual->depth, InputOutput, gl->visual->visual, + 0, visual->depth, InputOutput, visual->visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); if (gl->window) { @@ -1411,7 +1412,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->type = DC_GL_PIXMAP_WIN; gl->pixmap = XCreatePixmap( gdi_display, root_window, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, - gl->visual->depth ); + visual->depth ); if (gl->pixmap) { gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); @@ -1432,6 +1433,8 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) { struct gl_drawable *gl, *prev; + if (!format->visual) return FALSE; + gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI * there is no way to query it, so we have to store it here. @@ -1439,20 +1442,12 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) gl->swap_interval = 1; gl->refresh_swap_interval = TRUE; gl->format = format; - gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); - if (!gl->visual) - { - HeapFree( GetProcessHeap(), 0, gl ); - return FALSE; - } - GetClientRect( hwnd, &gl->rect ); gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); if (!create_gl_drawable( hwnd, gl )) { - XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); return FALSE; } @@ -1547,7 +1542,8 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r break; case DC_GL_PIXMAP_WIN: if (!mask) break; - pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->visual->depth); + pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, + gl->format->visual->depth); if (!pix) goto done; glxp = pglXCreatePixmap(gdi_display, gl->format->fbconfig, pix, NULL ); if (!glxp) @@ -1610,7 +1606,6 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) { XDeleteContext( gdi_display, (XID)hwnd, gl_hwnd_context ); release_gl_drawable( gl ); - XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); __wine_set_pixel_format( hwnd, 0 ); return; @@ -1833,7 +1828,6 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { ret->hdc = hdc; ret->fmt = gl->format; - ret->vis = pglXGetVisualFromFBConfig(gdi_display, gl->format->fbconfig); ret->ctx = create_glxcontext(gdi_display, ret, NULL); list_add_head( &context_list, &ret->entry ); } @@ -1863,7 +1857,6 @@ static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx) LeaveCriticalSection( &context_section ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); - if (ctx->vis) XFree( ctx->vis ); return HeapFree( GetProcessHeap(), 0, ctx ); } @@ -2092,7 +2085,6 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg { ret->hdc = hdc; ret->fmt = gl->format; - ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ ret->gl3_context = TRUE; if (attribList) {

1 0

Nikolay Sivov : comctl32: Remove confusing comments.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 7625a1bb72f3dd91404ccd2afd5f0008d9752764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7625a1bb72f3dd91404ccd2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:27 2018 +0300 comctl32: Remove confusing comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 9 --------- dlls/comctl32/button.c | 9 --------- dlls/comctl32/comboex.c | 10 ---------- dlls/comctl32/datetime.c | 9 --------- dlls/comctl32/edit.c | 9 --------- dlls/comctl32/imagelist.c | 9 --------- dlls/comctl32/ipaddress.c | 10 ---------- dlls/comctl32/listview.c | 9 --------- dlls/comctl32/monthcal.c | 9 --------- dlls/comctl32/progress.c | 9 --------- dlls/comctl32/static.c | 9 --------- dlls/comctl32/status.c | 9 --------- dlls/comctl32/syslink.c | 9 --------- dlls/comctl32/trackbar.c | 10 ---------- dlls/comctl32/updown.c | 10 ---------- 15 files changed, 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7625a1bb72f3dd91404c…

1 0