wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Fabian Maurer : comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: e2245bcd3ca6c9851a51be1ebdaaa49c1a1fdee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2245bcd3ca6c9851a51be1eb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Mar 17 17:38:05 2017 +0300 comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> 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/commctrl.c | 39 --------------------- dlls/comctl32/taskdialog.c | 76 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/misc.c | 19 ---------- dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++ 6 files changed, 136 insertions(+), 58 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 27f9741..e1a6812 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ string.c \ syslink.c \ tab.c \ + taskdialog.c \ theme_button.c \ theme_combo.c \ theme_dialog.c \ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 2a4cd42..d3ba314 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1622,45 +1622,6 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD } /*********************************************************************** - * TaskDialogIndirect [COMCTL32.@] - */ -HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnButton, - int *pnRadioButton, BOOL *pfVerificationFlagChecked) -{ - UINT uType = 0; - INT ret; - FIXME("%p, %p, %p, %p\n", pTaskConfig, pnButton, pnRadioButton, pfVerificationFlagChecked); - - if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_YESNOCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON) - uType |= MB_YESNO; - else - if (pTaskConfig->dwCommonButtons & TDCBF_RETRY_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_RETRYCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_OKCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON) - uType |= MB_OK; - ret = MessageBoxW(pTaskConfig->hwndParent, pTaskConfig->pszMainInstruction, - pTaskConfig->pszWindowTitle, uType); - FIXME("dwCommonButtons=%x uType=%x ret=%x\n", pTaskConfig->dwCommonButtons, uType, ret); - - if (pnButton) *pnButton = ret; - if (pnRadioButton) *pnRadioButton = pTaskConfig->nDefaultButton; - if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; - return S_OK; -} - -/*********************************************************************** * LoadIconWithScaleDown [COMCTL32.@] */ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, int cy, HICON *icon) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c new file mode 100644 index 0000000..15824d3 --- /dev/null +++ b/dlls/comctl32/taskdialog.c @@ -0,0 +1,76 @@ +/* + * Task dialog control + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "commctrl.h" +#include "winerror.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskdialog); + +/*********************************************************************** + * TaskDialogIndirect [COMCTL32.@] + */ +HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *button, + int *radio_button, BOOL *verification_flag_checked) +{ + UINT type = 0; + INT ret; + + TRACE("%p, %p, %p, %p\n", taskconfig, button, radio_button, verification_flag_checked); + + if (taskconfig->dwCommonButtons & TDCBF_YES_BUTTON && + taskconfig->dwCommonButtons & TDCBF_NO_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_YESNOCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_YES_BUTTON && + taskconfig->dwCommonButtons & TDCBF_NO_BUTTON) + type |= MB_YESNO; + else + if (taskconfig->dwCommonButtons & TDCBF_RETRY_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_RETRYCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_OK_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_OKCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_OK_BUTTON) + type |= MB_OK; + + ret = MessageBoxW(taskconfig->hwndParent, taskconfig->pszMainInstruction, + taskconfig->pszWindowTitle, type); + + FIXME("dwCommonButtons=%x type=%x ret=%x\n", taskconfig->dwCommonButtons, type, ret); + + if (button) *button = ret; + if (radio_button) *radio_button = taskconfig->nDefaultButton; + if (verification_flag_checked) *verification_flag_checked = TRUE; + + return S_OK; +} diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index cb2fdf3..5faf1f8 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ subclass.c \ syslink.c \ tab.c \ + taskdialog.c \ toolbar.c \ tooltips.c \ trackbar.c \ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5cc6c29..a6939bd 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -200,24 +200,6 @@ static void test_Alloc(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); } -static void test_TaskDialogIndirect(void) -{ - HINSTANCE hinst; - void *ptr, *ptr2; - - hinst = LoadLibraryA("comctl32.dll"); - - ptr = GetProcAddress(hinst, "TaskDialogIndirect"); - if (!ptr) - { - win_skip("TaskDialogIndirect not exported by name\n"); - return; - } - - ptr2 = GetProcAddress(hinst, (const CHAR*)345); - ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr); -} - static void test_LoadIconWithScaleDown(void) { static const WCHAR nonexisting_fileW[] = {'n','o','n','e','x','i','s','t','i','n','g','.','i','c','o',0}; @@ -402,7 +384,6 @@ START_TEST(misc) return; test_builtin_classes(); - test_TaskDialogIndirect(); test_LoadIconWithScaleDown(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c new file mode 100644 index 0000000..8a9d164 --- /dev/null +++ b/dlls/comctl32/tests/taskdialog.c @@ -0,0 +1,58 @@ +/* Unit tests for the task dialog control. + * + * Copyright 2017 Fabian Maurer for the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/test.h" +#include "v6util.h" + +static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); + +START_TEST(taskdialog) +{ + ULONG_PTR ctx_cookie; + void *ptr_ordinal; + HINSTANCE hinst; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + /* Check if task dialogs are available */ + hinst = LoadLibraryA("comctl32.dll"); + + pTaskDialogIndirect = (void *)GetProcAddress(hinst, "TaskDialogIndirect"); + if (!pTaskDialogIndirect) + { + win_skip("TaskDialogIndirect not exported by name\n"); + unload_v6_module(ctx_cookie, hCtx); + return; + } + + ptr_ordinal = GetProcAddress(hinst, (const char *)345); + ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", + ptr_ordinal, pTaskDialogIndirect); + + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Nikolay Sivov : xmllite/reader: Return same string for local and qualified names for attributes when appropriate.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 253f233e52a94283cf884004d11dc8c39b1a8d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=253f233e52a94283cf884004d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 16:46:13 2017 +0300 xmllite/reader: Return same string for local and qualified names for attributes when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 67 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ca8602c..b28a4b1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -230,6 +230,12 @@ struct reader_position UINT line_position; }; +enum attribute_flags +{ + ATTRIBUTE_NS_DEFINITION = 0x1, + ATTRIBUTE_DEFAULT_NS_DEFINITION = 0x2, +}; + struct attribute { struct list entry; @@ -238,6 +244,7 @@ struct attribute strval qname; strval value; struct reader_position position; + unsigned int flags; }; struct element @@ -398,7 +405,7 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *qname, - strval *value, const struct reader_position *position) + strval *value, const struct reader_position *position, unsigned int flags) { struct attribute *attr; @@ -413,6 +420,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn attr->qname = qname ? *qname : *localname; attr->value = *value; attr->position = *position; + attr->flags = flags; list_add_tail(&reader->attrs, &attr->entry); reader->attr_count++; @@ -1179,7 +1187,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* ([A-Za-z0-9._] | '-') */ @@ -1257,7 +1265,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1301,7 +1309,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1774,7 +1782,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, NULL, &name, NULL, &pub, &position); + hr = reader_add_attr(reader, NULL, &name, NULL, &pub, &position, 0); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1785,7 +1793,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, NULL, &name, NULL, &sys, &position); + hr = reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); if (FAILED(hr)) return hr; return S_OK; @@ -1799,7 +1807,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, NULL, &name, NULL, &sys, &position); + return reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); } return S_FALSE; @@ -2179,17 +2187,17 @@ static HRESULT reader_parse_attribute(xmlreader *reader) { struct reader_position position = reader->position; strval prefix, local, qname, value; - BOOL ns = FALSE, nsdef = FALSE; + enum attribute_flags flags = 0; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; if (strval_eq(reader, &prefix, &strval_xmlns)) - ns = TRUE; + flags |= ATTRIBUTE_NS_DEFINITION; if (strval_eq(reader, &qname, &strval_xmlns)) - ns = nsdef = TRUE; + flags |= ATTRIBUTE_DEFAULT_NS_DEFINITION; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2197,11 +2205,11 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; - if (ns) - reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + if (flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) + reader_push_ns(reader, &local, &value, !!(flags & ATTRIBUTE_DEFAULT_NS_DEFINITION)); TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &prefix, &local, &qname, &value, &position); + return reader_add_attr(reader, &prefix, &local, &qname, &value, &position, flags); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2982,6 +2990,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + struct attribute *attribute = This->attr; struct element *element; UINT length; @@ -3013,6 +3022,22 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = element->localname.len; } break; + case XmlNodeType_Attribute: + if (attribute->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) + { + *name = xmlnsW; + *len = 5; + } else if (attribute->prefix.len) + { + *name = This->strvalues[StringValue_QualifiedName].str; + *len = This->strvalues[StringValue_QualifiedName].len; + } + else + { + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + } + break; default: *name = This->strvalues[StringValue_QualifiedName].str; *len = This->strvalues[StringValue_QualifiedName].len; @@ -3156,6 +3181,18 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U *name = element->localname.str; *len = element->localname.len; break; + case XmlNodeType_Attribute: + if (This->attr->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) + { + *name = xmlnsW; + *len = 5; + } + else + { + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + } + break; default: *name = This->strvalues[StringValue_LocalName].str; *len = This->strvalues[StringValue_LocalName].len; @@ -3246,11 +3283,9 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, case XmlNodeType_Attribute: { const strval *local = &reader->strvalues[StringValue_LocalName]; - const strval *prefix = &reader->strvalues[StringValue_Prefix]; /* For namespace definition attributes return values from namespace list */ - if (((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || - strval_eq(reader, prefix, &strval_xmlns))) + if (reader->attr->flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) { struct ns *ns;

1 0

Nikolay Sivov : xmllite/reader: For elements without a prefix return same string for both local and qualified names.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d7057a34b3e6e8a89e489eee9fdbf6fbe9289fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7057a34b3e6e8a89e489eee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 16:46:12 2017 +0300 xmllite/reader: For elements without a prefix return same string for both local and qualified names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 17 ++++++++++++----- dlls/xmllite/tests/reader.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5ba787e..ca8602c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -490,6 +490,7 @@ static void reader_clear_elements(xmlreader *reader) } list_init(&reader->elements); reader_free_strvalued(reader, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); reader->is_empty_element = FALSE; } @@ -2227,10 +2228,11 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* skip '/>' */ reader_skipn(reader, 2); + reader_free_strvalued(reader, &element->qname); reader_free_strvalued(reader, &element->localname); element->prefix = *prefix; - element->qname = *qname; + reader_strvaldup(reader, qname, &element->qname); reader_strvaldup(reader, local, &element->localname); element->position = position; reader_mark_ns_nodes(reader, element); @@ -2980,6 +2982,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *element; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -2998,14 +3001,18 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam break; case XmlNodeType_Element: case XmlNodeType_EndElement: - if (!This->is_empty_element) + element = reader_get_element(This); + if (element->prefix.len) { - struct element *element = reader_get_element(This); *name = element->qname.str; *len = element->qname.len; - break; } - /* fallthrough */ + else + { + *name = element->localname.str; + *len = element->localname.len; + } + break; default: *name = This->strvalues[StringValue_QualifiedName].str; *len = This->strvalues[StringValue_QualifiedName].len; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8660bb8..82880ae 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1494,6 +1494,8 @@ static void test_read_element(void) i = 0; while (IXmlReader_Read(reader, &type) == S_OK) { + UINT count; + ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement || type == XmlNodeType_Text, "Unexpected node type %d\n", type); @@ -1502,10 +1504,44 @@ static void test_read_element(void) ok(hr == S_OK, "got %08x\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); - if (type == XmlNodeType_Element) + if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) + { + const WCHAR *prefix; + + prefix = NULL; + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(prefix != NULL, "got %p\n", prefix); + + if (!*prefix) + { + const WCHAR *local, *qname; + + local = NULL; + hr = IXmlReader_GetLocalName(reader, &local, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(local != NULL, "got %p\n", local); + + qname = NULL; + hr = IXmlReader_GetQualifiedName(reader, &qname, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(qname != NULL, "got %p\n", qname); + + ok(local == qname, "expected same pointer\n"); + } + } + + if (type == XmlNodeType_EndElement) { - UINT count = 0; + count = 1; + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 0, "got %u\n", count); + } + if (type == XmlNodeType_Element) + { + count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/reader: Always return local name from element structure.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 1e015f1e14f6eb6e682253e240ea1c1914aee1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e015f1e14f6eb6e682253e24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 16:46:11 2017 +0300 xmllite/reader: Always return local name from element structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 72 ++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 41a6fb8..5ba787e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -419,6 +419,15 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn return S_OK; } +/* Returns current element, doesn't check if reader is actually positioned on it. */ +static struct element *reader_get_element(xmlreader *reader) +{ + if (reader->is_empty_element) + return &reader->empty_element; + + return LIST_ENTRY(list_head(&reader->elements), struct element, entry); +} + /* This one frees stored string value if needed */ static void reader_free_strvalued(xmlreader *reader, strval *v) { @@ -480,6 +489,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); + reader_free_strvalued(reader, &reader->empty_element.localname); reader->is_empty_element = FALSE; } @@ -2212,13 +2222,18 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* empty element */ if ((reader->is_empty_element = !reader_cmp(reader, endW))) { + struct element *element = &reader->empty_element; + /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element.prefix = *prefix; - reader->empty_element.localname = *local; - reader->empty_element.qname = *qname; - reader->empty_element.position = position; - reader_mark_ns_nodes(reader, &reader->empty_element); + + reader_free_strvalued(reader, &element->localname); + + element->prefix = *prefix; + element->qname = *qname; + reader_strvaldup(reader, local, &element->localname); + element->position = position; + reader_mark_ns_nodes(reader, element); return S_OK; } @@ -2983,12 +2998,9 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam break; case XmlNodeType_Element: case XmlNodeType_EndElement: - /* empty elements are not added to the stack */ if (!This->is_empty_element) { - struct element *element; - - element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + struct element *element = reader_get_element(This); *name = element->qname.str; *len = element->qname.len; break; @@ -3114,6 +3126,7 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *element; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -3132,17 +3145,10 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U break; case XmlNodeType_Element: case XmlNodeType_EndElement: - /* empty elements are not added to the stack */ - if (!This->is_empty_element) - { - struct element *element; - - element = LIST_ENTRY(list_head(&This->elements), struct element, entry); - *name = element->localname.str; - *len = element->localname.len; - break; - } - /* fallthrough */ + element = reader_get_element(This); + *name = element->localname.str; + *len = element->localname.len; + break; default: *name = This->strvalues[StringValue_LocalName].str; *len = This->strvalues[StringValue_LocalName].len; @@ -3327,11 +3333,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb { case XmlNodeType_Element: case XmlNodeType_EndElement: - if (This->is_empty_element) - element = &This->empty_element; - else - element = LIST_ENTRY(list_head(&This->elements), struct element, entry); - + element = reader_get_element(This); *line_number = element->position.line_number; break; case XmlNodeType_Attribute: @@ -3363,11 +3365,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po { case XmlNodeType_Element: case XmlNodeType_EndElement: - if (This->is_empty_element) - element = &This->empty_element; - else - element = LIST_ENTRY(list_head(&This->elements), struct element, entry); - + element = reader_get_element(This); *line_position = element->position.line_position; break; case XmlNodeType_Attribute: @@ -3519,32 +3517,24 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader = IMalloc_Alloc(imalloc, sizeof(*reader)); else reader = heap_alloc(sizeof(*reader)); - if(!reader) return E_OUTOFMEMORY; + if (!reader) + return E_OUTOFMEMORY; + memset(reader, 0, sizeof(*reader)); reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; - reader->input = NULL; reader->state = XmlReadState_Closed; reader->instate = XmlReadInState_Initial; reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; - reader->resolver = NULL; - reader->mlang = NULL; - reader->position.line_number = 0; - reader->position.line_position = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); reader->nodetype = XmlNodeType_None; list_init(&reader->attrs); - reader->attr_count = 0; - reader->attr = NULL; list_init(&reader->nsdef); list_init(&reader->ns); list_init(&reader->elements); - reader->depth = 0; reader->max_depth = 256; - reader->is_empty_element = FALSE; - memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty;

1 0

Francois Gouget : ddraw: Make ddraw_destroy_swapchain() static.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d2aa533b9c00b205c657ce5853ab932a0179a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2aa533b9c00b205c657ce585… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 16 15:38:31 2017 +0100 ddraw: Make ddraw_destroy_swapchain() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b72ec6e..5f90a75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -361,7 +361,7 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) return ddraw1_AddRef(&This->IDirectDraw_iface); } -void ddraw_destroy_swapchain(struct ddraw *ddraw) +static void ddraw_destroy_swapchain(struct ddraw *ddraw) { TRACE("Destroying the swapchain.\n"); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 48b6c70..7d640f7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -127,7 +127,6 @@ struct ddraw HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) DECLSPEC_HIDDEN; -void ddraw_destroy_swapchain(struct ddraw *ddraw) DECLSPEC_HIDDEN; HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) DECLSPEC_HIDDEN; void ddraw_update_lost_surfaces(struct ddraw *ddraw) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Modify resource locations in wined3d_surface_blt( ) instead of the blitters.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d85d977a354203e93d373120578dddb5e3799cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85d977a354203e93d3731205… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:19 2017 +0100 wined3d: Modify resource locations in wined3d_surface_blt() instead of the blitters. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ---- dlls/wined3d/surface.c | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3f0388a..b23f2c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7794,7 +7794,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_color_key alpha_test_key; @@ -7850,9 +7849,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ if (wined3d_settings.strict_draw_ordering || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f142d91..12ed35a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2785,8 +2785,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2810,9 +2808,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); - - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } const struct blit_shader ffp_blit = { @@ -3761,6 +3756,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blitter->blit_surface(device, blit_op, context, src_surface, src_rect, dst_surface, dst_rect, color_key, filter); context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, + dst_texture->resource.draw_binding); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, + ~dst_texture->resource.draw_binding); + return WINED3D_OK; } }

1 0

Henri Verbeet : wined3d: Only copy source/ destination rectangles when needed in arbfp_blit_surface().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d5527c2d1cc08b1877a824004da22fc4326ac223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5527c2d1cc08b1877a824004… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:18 2017 +0100 wined3d: Only copy source/destination rectangles when needed in arbfp_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 60bfbe3..3f0388a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7790,16 +7790,15 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - RECT src_rect = *src_rect_in; - RECT dst_rect = *dst_rect_in; struct wined3d_color_key alpha_test_key; + RECT s, d; /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -7815,8 +7814,10 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; - src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; + s = *src_rect; + s.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.top; + s.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.bottom; + src_rect = &s; } else wined3d_texture_load(src_texture, context, FALSE); @@ -7824,7 +7825,11 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ context_apply_blit_state(context, device); if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + { + d = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &d); + dst_rect = &d; + } if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { @@ -7837,7 +7842,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ arbfp_blit_set(device->blit_priv, context, src_surface, color_key); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info);

1 0

Henri Verbeet : wined3d: Pass a context to blit_shader.blit_surface().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 717225bf9bbbf19fdc101039348256352595379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=717225bf9bbbf19fdc1010393… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:17 2017 +0100 wined3d: Pass a context to blit_shader.blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 ++-------- dlls/wined3d/surface.c | 28 +++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66adf0f..60bfbe3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7789,22 +7789,18 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, +static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_context *context; RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; struct wined3d_color_key alpha_test_key; - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (surface_get_sub_resource(src_surface)->locations @@ -7850,8 +7846,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index aa85698..f142d91 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2780,16 +2780,15 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, return WINED3D_OK; } -static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, +static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + const struct wined3d_gl_info *gl_info = context->gl_info; /* Blit from offscreen surface to render target */ struct wined3d_color_key old_blt_key = src_texture->async.src_blt_color_key; @@ -2799,9 +2798,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - gl_info = context->gl_info; - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); @@ -2811,8 +2807,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - context_release(context); - /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); @@ -3466,10 +3460,10 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); } -static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, +static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { /* FIXME: Remove error returns from surface_blt_cpu. */ ERR("Blit method not implemented by cpu_blit.\n"); @@ -3761,8 +3755,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format); if (blitter) { - blitter->blit_surface(device, blit_op, filter, src_surface, - src_rect, dst_surface, dst_rect, color_key); + struct wined3d_context *context; + + context = context_acquire(device, dst_texture, dst_sub_resource_idx); + blitter->blit_surface(device, blit_op, context, src_surface, + src_rect, dst_surface, dst_rect, color_key, filter); + context_release(context); return WINED3D_OK; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b5134a..64e669b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1880,10 +1880,10 @@ struct blit_shader const RECT *rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, float depth, DWORD stencil); - void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, + void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key); + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Create and destroy surface DCs through the CS.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: ad46b67674b694cae8341f14fdc9253896c58783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad46b67674b694cae8341f14f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:16 2017 +0100 wined3d: Create and destroy surface DCs through the CS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 98 ---------------------------- dlls/wined3d/texture.c | 143 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 122 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad46b67674b694cae8341…

1 0

Henri Verbeet : wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d9d5dcee2b166e28eacc417970747e24fe97b9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d5dcee2b166e28eacc41797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:15 2017 +0100 wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod(). It's not safe to call device_invalidate_state() outside the CS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a1aba36..ddc128c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1140,13 +1140,16 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) if (texture->lod != lod) { + struct wined3d_device *device = texture->resource.device; + wined3d_resource_wait_idle(&texture->resource); texture->lod = lod; texture->texture_rgb.base_level = ~0u; texture->texture_srgb.base_level = ~0u; if (texture->resource.bind_count) - device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); + wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, + device->state.sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } return old;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017