February 2018 - Wine-commits

Alexandre Julliard : winex11: Implement refcounting of GL drawables.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 6dc30a2ed31091698f5a0cac47d0959780f08c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc30a2ed31091698f5a0cac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:34:28 2018 +0100 winex11: Implement refcounting of GL drawables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 251 +++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6dc30a2ed31091698f5a…

1 0

Alexandre Julliard : winex11: Hold a reference to the drawable from the GL context.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: ac4f2ac36f1b06f7bfe7647753dacbc4ce8522b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4f2ac36f1b06f7bfe76477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:41:45 2018 +0100 winex11: Hold a reference to the drawable from the GL context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 59 ++++++++++++++++++++++++++++-------- 2 files changed, 106 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac4f2ac36f1b06f7bfe7…

1 0

Alexandre Julliard : winex11: Use the client window support also for XComposite child windows.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 1ce36987eba0a9310f3e0ac6bd55148ededca7c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce36987eba0a9310f3e0ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:49:23 2018 +0100 winex11: Use the client window support also for XComposite child windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 62 ++++--------------------- dlls/winex11.drv/window.c | 116 +++++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 4 +- 3 files changed, 80 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ce36987eba0a9310f3e…

1 0

Alexandre Julliard : winex11: Get rid of the WineGLInfo structure.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 7bc327a1d13418d8da7ab47abc5fe11e1c8a4dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc327a1d13418d8da7ab47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 16:06:01 2018 +0100 winex11: Get rid of the WineGLInfo structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 145 +++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bc327a1d13418d8da7a…

1 0

Andrew Eikum : services: Fix reading past end of struct (Coverity).
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: b29157e1013681af8e0af924b7cd52ea2fce83e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29157e1013681af8e0af924… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Feb 12 07:54:33 2018 -0600 services: Fix reading past end of struct (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 7c3fa1e..5ecd660 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -821,6 +821,14 @@ DWORD __cdecl svcctl_ChangeServiceConfigW( return err; } +static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_entry *service) +{ + struct process_entry *process = service->process; + memcpy(status, &service->status, sizeof(service->status)); + status->dwProcessId = process ? process->process_id : 0; + status->dwServiceFlags = 0; +} + static void fill_notify(struct sc_notify_handle *notify) { SC_RPC_NOTIFY_PARAMS_LIST *list; @@ -834,8 +842,7 @@ static void fill_notify(struct sc_notify_handle *notify) cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); cparams->dwNotifyMask = notify->notify_mask; - memcpy(&cparams->ServiceStatus, &notify->service->service_entry->status, - sizeof(SERVICE_STATUS_PROCESS)); + fill_status_process(&cparams->ServiceStatus, notify->service->service_entry); cparams->dwNotificationStatus = ERROR_SUCCESS; cparams->dwNotificationTriggered = 1 << (cparams->ServiceStatus.dwCurrentState - SERVICE_STOPPED); cparams->pszServiceNames = NULL; @@ -1013,14 +1020,6 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, return err; } -static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_entry *service) -{ - struct process_entry *process = service->process; - memcpy(status, &service->status, sizeof(service->status)); - status->dwProcessId = process ? process->process_id : 0; - status->dwServiceFlags = 0; -} - DWORD __cdecl svcctl_QueryServiceStatusEx( SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel,

1 0

Zhiyi Zhang : urlmon: Do not canonicalize Unicode characters.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: ac066d3eee85fd6e3a27ca59b158c5e040d91727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac066d3eee85fd6e3a27ca59… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Fri Feb 9 23:22:51 2018 +0800 urlmon: Do not canonicalize Unicode characters. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 21 ++-- 2 files changed, 279 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac066d3eee85fd6e3a27…

1 0

Mark Jansen : include: Add ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION and related struct/enum.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 7960ce3ddd43e7776c06abdc18b6970487e2334b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7960ce3ddd43e7776c06abdc… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Tue Feb 6 16:07:41 2018 +0100 include: Add ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION and related struct/enum. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index a9d718a..04f00a6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5746,11 +5746,29 @@ typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION { typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; +typedef enum { + ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS +} ACTCTX_COMPATIBILITY_ELEMENT_TYPE; + +typedef struct _COMPATIBILITY_CONTEXT_ELEMENT { + GUID Id; + ACTCTX_COMPATIBILITY_ELEMENT_TYPE Type; +} COMPATIBILITY_CONTEXT_ELEMENT, *PCOMPATIBILITY_CONTEXT_ELEMENT; + +#if !defined(__WINESRC__) && (defined(_MSC_EXTENSIONS) || ((defined(__GNUC__) && __GNUC__ >= 3))) +typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { + DWORD ElementCount; + COMPATIBILITY_CONTEXT_ELEMENT Elements[]; +} ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; +#endif + typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation = 2, AssemblyDetailedInformationInActivationContext = 3, FileInformationInAssemblyOfAssemblyInActivationContext = 4, + CompatibilityInformationInActivationContext = 6, MaxActivationContextInfoClass, AssemblyDetailedInformationInActivationContxt = 3,

1 0

Mark Jansen : kernel32/tests: Add tests for the compatibility section in actctx.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 74862f2e96f7a5b3cc1c204824d99460f75aa96a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74862f2e96f7a5b3cc1c2048… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Tue Feb 6 16:10:20 2018 +0100 kernel32/tests: Add tests for the compatibility section in actctx. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 229 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74862f2e96f7a5b3cc1c…

1 0

Mark Jansen : ntdll: Parse manifest compatibility section.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 0f1cb96b694a38106464044285296e531f90bb67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f1cb96b694a381064640442… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Tue Feb 6 16:32:45 2018 +0100 ntdll: Parse manifest compatibility section. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 4 -- dlls/ntdll/actctx.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2cb856a..a182cfa 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2555,10 +2555,8 @@ static void test_no_compat(HANDLE handle, int line) CompatibilityInformationInActivationContext, &compat_info, sizeof(compat_info), &size); -todo_wine { ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); ok_(__FILE__, line)(size == sizeof(DWORD), "size mismatch (got %lu, expected 4)\n", size); -} ok_(__FILE__, line)(compat_info.ElementCount == 0, "unexpected ElementCount %u\n", compat_info.ElementCount); } @@ -2575,7 +2573,6 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect CompatibilityInformationInActivationContext, &compat_info, sizeof(compat_info), &size); -todo_wine { ok_(__FILE__, line)(b, "CompatibilityInformationInActivationContext failed\n"); ok_(__FILE__, line)(size == expected, "size mismatch (got %lu, expected %lu)\n", size, expected); ok_(__FILE__, line)(compat_info.ElementCount == num_compat, "unexpected ElementCount %u\n", compat_info.ElementCount); @@ -2591,7 +2588,6 @@ todo_wine { "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); } } -} static void test_compatibility(void) { diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index b978438..956f255 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -499,6 +499,8 @@ struct assembly unsigned int num_dlls; unsigned int allocated_dlls; struct entity_array entities; + COMPATIBILITY_CONTEXT_ELEMENT* compat_contexts; + ULONG num_compat_contexts; }; enum context_sections @@ -622,6 +624,12 @@ static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; static const WCHAR supportsmultilevelundoW[] = {'s','u','p','p','o','r','t','s','m','u','l','t','i','l','e','v','e','l','u','n','d','o',0}; static const WCHAR wantstomenumergeW[] = {'w','a','n','t','s','t','o','m','e','n','u','m','e','r','g','e',0}; +static const WCHAR compatibilityW[] = {'c','o','m','p','a','t','i','b','i','l','i','t','y',0}; +static const WCHAR compatibilityNSW[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','c','o','m','p','a','t','i','b','i','l','i','t','y','.','v','1',0}; +static const WCHAR applicationW[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; +static const WCHAR supportedOSW[] = {'s','u','p','p','o','r','t','e','d','O','S',0}; +static const WCHAR IdW[] = {'I','d',0}; + struct olemisc_entry { const WCHAR *name; @@ -792,6 +800,25 @@ static struct dll_redirect* add_dll_redirect(struct assembly* assembly) return &assembly->dlls[assembly->num_dlls++]; } +static PCOMPATIBILITY_CONTEXT_ELEMENT add_compat_context(struct assembly* assembly) +{ + void *ptr; + if (assembly->num_compat_contexts) + { + unsigned int new_count = assembly->num_compat_contexts + 1; + ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + assembly->compat_contexts, + new_count * sizeof(COMPATIBILITY_CONTEXT_ELEMENT) ); + } + else + { + ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(COMPATIBILITY_CONTEXT_ELEMENT) ); + } + if (!ptr) return NULL; + assembly->compat_contexts = ptr; + return &assembly->compat_contexts[assembly->num_compat_contexts++]; +} + static void free_assembly_identity(struct assembly_identity *ai) { RtlFreeHeap( GetProcessHeap(), 0, ai->name ); @@ -1075,6 +1102,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) RtlFreeHeap( GetProcessHeap(), 0, assembly->dlls ); RtlFreeHeap( GetProcessHeap(), 0, assembly->manifest.info ); RtlFreeHeap( GetProcessHeap(), 0, assembly->directory ); + RtlFreeHeap( GetProcessHeap(), 0, assembly->compat_contexts ); free_entity_array( &assembly->entities ); free_assembly_identity(&assembly->id); } @@ -2211,6 +2239,84 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl) +{ + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, ret = TRUE, error; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, applicationW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, supportedOSW)) + { + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + UNICODE_STRING str; + COMPATIBILITY_CONTEXT_ELEMENT* compat; + GUID compat_id; + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); + } + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + } + } + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + + return ret; +} + +static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, compatibilityW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, applicationW)) + { + ret = parse_compatibility_application_elem(xmlbuf, assembly, acl); + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; +} + static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, struct assembly* assembly, struct assembly_identity* expected_ai) @@ -2328,6 +2434,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, } } } + else if (xml_elem_cmp(&elem, compatibilityW, compatibilityNSW)) + { + ret = parse_compatibility_elem(xmlbuf, assembly, acl); + } else { WARN("unknown element %s\n", debugstr_xmlstr(&elem)); @@ -4987,6 +5097,34 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle } break; + case CompatibilityInformationInActivationContext: + { + /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci = buffer; + COMPATIBILITY_CONTEXT_ELEMENT *elements; + struct assembly *assembly = NULL; + ULONG num_compat_contexts = 0, n; + SIZE_T len; + + if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; + + if (actctx->num_assemblies) assembly = actctx->assemblies; + + if (assembly) + num_compat_contexts = assembly->num_compat_contexts; + len = sizeof(*acci) + num_compat_contexts * sizeof(COMPATIBILITY_CONTEXT_ELEMENT); + + if (retlen) *retlen = len; + if (!buffer || bufsize < len) return STATUS_BUFFER_TOO_SMALL; + + *acci = num_compat_contexts; + elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); + for (n = 0; n < num_compat_contexts; ++n) + { + elements[n] = assembly->compat_contexts[n]; + } + } + break; + default: FIXME( "class %u not implemented\n", class ); return STATUS_NOT_IMPLEMENTED;

1 0

Jacek Caban : mshtml: Store Gecko element both as nsIDOMElement and nsIDOMHTMLElement in HTMLElement.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 54a746f15568c811b3770ddab60d6954de9f8f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a746f15568c811b3770dda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:27:32 2018 +0100 mshtml: Store Gecko element both as nsIDOMElement and nsIDOMHTMLElement in HTMLElement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1bd4ec4..d843884 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5463,7 +5463,9 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen /* No AddRef, share reference with HTMLDOMNode */ assert((nsIDOMNode*)nselem == This->node.nsnode); - This->nselem = nselem; + This->dom_element = (nsIDOMElement*)nselem; + This->html_element = nselem; + This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5ed6264..21871c0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -780,6 +780,8 @@ typedef struct { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; nsIDOMHTMLElement *nselem; + nsIDOMElement *dom_element; + nsIDOMHTMLElement *html_element; HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0