wine-devel October 2018

wine-devel@winehq.org

60 participants
608 discussions

[PATCH v3 1/2] shell32/autocomplete: Use the optional IACList interface and IACList::Expand, if available
by Gabriel Ivăncescu 17 Oct '18

17 Oct '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Use strpbrkW and a helper function, and make it return TRUE when it expands, which will be useful in the future. Also avoid (extremely rare?) reference leak when E_OUTOFMEMORY is returned. dlls/shell32/autocomplete.c | 70 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 11e9317..dfe7638 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -2,6 +2,7 @@ * AutoComplete interfaces implementation. * * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> + * Copyright 2018 Gabriel Ivăncescu <gabrielopcode(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,6 +69,7 @@ typedef struct WCHAR *txtbackup; WCHAR *quickComplete; IEnumString *enumstr; + IACList *aclist; AUTOCOMPLETEOPTIONS options; WCHAR no_fwd_char; } IAutoCompleteImpl; @@ -221,6 +223,49 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) return 0; } +static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) +{ + WCHAR c = last_delim[1]; + last_delim[1] = '\0'; + IACList_Expand(ac->aclist, txt); + last_delim[1] = c; + return TRUE; +} + +static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) +{ + /* call IACList::Expand only when needed, if the + new txt and old_txt require different expansions */ + WCHAR c, *p, *last_delim, *old_txt = ac->txtbackup; + size_t i = 0; + + /* '/' is allowed as a delim for unix paths */ + static const WCHAR delims[] = { '\\', '/', 0 }; + + /* skip the shared prefix */ + while ((c = tolowerW(txt[i])) == tolowerW(old_txt[i])) + { + if (c == '\0') return FALSE; + i++; + } + + /* they differ at this point, check for a delim further in txt */ + for (last_delim = NULL, p = &txt[i]; (p = strpbrkW(p, delims)) != NULL; p++) + last_delim = p; + if (last_delim) return do_aclist_expand(ac, txt, last_delim); + + /* txt has no delim after i, check for a delim further in old_txt */ + if (strpbrkW(&old_txt[i], delims)) + { + /* scan backwards to find the first delim before txt[i] (if any) */ + while (i--) + if (strchrW(delims, txt[i])) + return do_aclist_expand(ac, txt, &txt[i]); + } + + return FALSE; +} + static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR *str, HWND hwnd) { DWORD sel_start; @@ -268,6 +313,17 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); + /* Reset it here to simplify the logic in aclist_expand for + empty strings, since it tracks changes using txtbackup, + and Reset needs to be called before IACList::Expand */ + IEnumString_Reset(ac->enumstr); + if (ac->aclist) + { + aclist_expand(ac, text); + if (text[len - 1] == '\\' || text[len - 1] == '/') + flag = autoappend_flag_no; + } + /* Set txtbackup to point to text itself (which must not be released) */ heap_free(ac->txtbackup); ac->txtbackup = text; @@ -277,7 +333,6 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); } - IEnumString_Reset(ac->enumstr); for (cpt = 0;;) { LPOLESTR strs = NULL; @@ -607,6 +662,8 @@ static ULONG WINAPI IAutoComplete2_fnRelease( heap_free(This->txtbackup); if (This->enumstr) IEnumString_Release(This->enumstr); + if (This->aclist) + IACList_Release(This->aclist); heap_free(This); } return refCount; @@ -663,6 +720,17 @@ static HRESULT WINAPI IAutoComplete2_fnInit( return E_NOINTERFACE; } + /* Prevent txtbackup from ever being NULL to simplify aclist_expand */ + if ((This->txtbackup = heap_alloc_zero(sizeof(WCHAR))) == NULL) + { + IEnumString_Release(This->enumstr); + This->enumstr = NULL; + return E_OUTOFMEMORY; + } + + if (FAILED (IUnknown_QueryInterface (punkACL, &IID_IACList, (LPVOID*)&This->aclist))) + This->aclist = NULL; + This->initialized = TRUE; This->hwndEdit = hwndEdit; -- 1.9.1

2 4

[PATCH 1/4] rpcrt4/tests: Use publicly defined NDR constants.
by Zebediah Figura 17 Oct '18

17 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 21baba7..586a7ef 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -35,6 +35,7 @@ #include "rpcdce.h" #include "rpcproxy.h" #include "midles.h" +#include "ndrtypes.h" static int my_alloc_called; static int my_free_called; @@ -154,17 +155,17 @@ static void test_ndr_simple_type(void) StubMsg.BufferLength = 16; StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); l = 0xcafebabe; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 4, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)StubMsg.BufferStart == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)(StubMsg.BufferStart + 4) == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, 8 /* FC_LONG */); + NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(l2 == l, "%d\n", l2); @@ -230,7 +231,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); @@ -240,7 +241,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + 16, "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); @@ -250,19 +251,19 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); size = srcsize; - if(formattypes[1] & 0x10) size += 4; + if (formattypes[1] & FC_POINTER_DEREF) size += 4; StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -275,7 +276,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, /* reset the buffer and call with must alloc */ StubMsg.Buffer = StubMsg.BufferStart; - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -291,7 +292,7 @@ todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); } my_alloc_called = 0; - if(formattypes[0] != 0x11 /* FC_RP */) + if (formattypes[0] != FC_RP) { /* now pass the address of a NULL ptr */ mem = NULL; @@ -314,14 +315,15 @@ todo_wine { StubMsg.IsClient = 0; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - if (formattypes[2] == 0xd /* FC_ENUM16 */) + if (formattypes[2] == FC_ENUM16) ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); else ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - if (formattypes[2] != 0xd /* FC_ENUM16 */) { + if (formattypes[2] != FC_ENUM16) + { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; } -- 2.7.4

2 7

[PATCH] wbemprox: Return NULL signature when there are no input parameters
by Piotr Caban 17 Oct '18

17 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/class.c | 14 +++++++++++--- dlls/wbemprox/tests/query.c | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-)

2 1

[PATCH 2/2] include: Register interface proxies for IUPnPNAT
by Alistair Leslie-Hughes 17 Oct '18

17 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34711 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/natupnp.idl | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/natupnp.idl b/include/natupnp.idl index 83b48a3..0ba546f 100644 --- a/include/natupnp.idl +++ b/include/natupnp.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ object, - uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1), + uuid(6f10711f-729b-41e5-93b8-f21d0f818df1), dual, pointer_default(unique) ] @@ -93,7 +93,7 @@ interface IStaticPortMappingCollection : IDispatch [ object, - uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C), + uuid(4fc80282-23b6-4378-9a27-cd8f17c9400c), dual, pointer_default(unique) ] @@ -185,24 +185,6 @@ interface INATEventManager : IDispatch }; [ - object, - uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), - dual, - pointer_default(unique) -] -interface IUPnPNAT : IDispatch -{ - [propget, id(1)] - HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); - - [propget, id(2)] - HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); - - [propget, id(3)] - HRESULT NATEventManager ([out, retval] INATEventManager **manager); -}; - -[ id(2), uuid(1c565858-f302-471e-b409-f180aa4abec6), version(1.0) @@ -212,6 +194,25 @@ library NATUPNPLib importlib("stdole2.tlb"); [ + object, + uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), + dual, + oleautomation, + pointer_default(unique) + ] + interface IUPnPNAT : IDispatch + { + [propget, id(1)] + HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); + + [propget, id(2)] + HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); + + [propget, id(3)] + HRESULT NATEventManager ([out, retval] INATEventManager **manager); + }; + + [ vi_progid("HNetCfg.NATUPnP"), progid("HNetCfg.NATUPnP.1"), threading(apartment), -- 1.9.1

2 1

[PATCH 1/2] hnetcfg: Add test for IProvideClassInfo interface
by Alistair Leslie-Hughes 17 Oct '18

17 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/port.c | 5 +++++ dlls/hnetcfg/tests/policy.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index f497bcb..7f3f6c5 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -629,6 +629,11 @@ static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void { *object = iface; } + else if(IsEqualGUID( riid, &IID_IProvideClassInfo)) + { + TRACE("IProvideClassInfo not supported."); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 61175f9..3fa8348 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -167,11 +167,15 @@ static void test_IUPnPNAT(void) IStaticPortMappingCollection *static_ports; IDynamicPortMappingCollection *dync_ports; INATEventManager *manager; + IProvideClassInfo *provider; HRESULT hr; hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); ok(hr == S_OK, "got: %08x\n", hr); + hr = IUPnPNAT_QueryInterface(nat, &IID_IProvideClassInfo, (void**)&provider); + ok(hr == E_NOINTERFACE, "got: %08x\n", hr); + hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); todo_wine ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) -- 1.9.1

1 0

[PATCH 1/6] d2d1: Use default NULL argument in SetBlendState call
by Daniel Ansorregui 17 Oct '18

17 Oct '18

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d2d1/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ff5caac5d8..2593413661 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -131,8 +131,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - vp.TopLeftX = 0; vp.TopLeftY = 0; vp.Width = render_target->pixel_size.width; @@ -180,7 +178,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, device, 0); } if (opacity_brush) -- 2.17.1

4 9

[PATCH] wined3d: Avoid accessing the device after deactivation some more.
by Henri Verbeet 16 Oct '18

16 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Apparently I got "lucky" running the tests yesterday. Today, ddraw's test_killfocus() was consistently crashing on this. --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70d43e07e39..b90df20a7da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5315,9 +5315,13 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { - UINT i; + unsigned int i = device->swapchain_count; - for (i = 0; i < device->swapchain_count; i++) + /* Deactivating the implicit swapchain may cause the application + * (e.g. Deus Ex: GOTY) to destroy the device, so take care to + * deactivate the implicit swapchain last, and to avoid accessing the + * "device" pointer afterwards. */ + while (i--) wined3d_swapchain_activate(device->swapchains[i], wparam); } else if (message == WM_SYSCOMMAND) -- 2.11.0

1 0

[PATCH] jscript: Allow trailing comma in object literals.
by Jacek Caban 16 Oct '18

16 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 8 ++++++++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH] mshtml: Try to avoid use_event_quirks in call_event_handlers if possible.
by Jacek Caban 16 Oct '18

16 Oct '18

It may cause an unintended lock on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)

1 0

[Bugzilla] Update bug statuses descriptions.
by Andrey Gusev 16 Oct '18

16 Oct '18

For https://bugs.winehq.org/show_bug.cgi?id=39470 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- template/en/default/pages/fields.html.tmpl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index f7437a0..d015fb9 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -90,6 +90,22 @@ either marked [% display_value("bug_status", "ASSIGNED") FILTER html %] or [% display_value("bug_status", "RESOLVED") FILTER html %]. </dd> + + <dt> + [% display_value("bug_status", "NEEDINFO") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an unclear description or the reporter didn't + provide a requested information. In such case, after some time a [% terms.bug %] can be closed as + [% display_value("resolution", "ABANDONED") FILTER html %]. + </dd> + + <dt> + [% display_value("bug_status", "STAGED") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an experimental patches for testing before integration into the development branch. + </dd> </dl> </td> @@ -186,13 +202,12 @@ </dd> <dt> - [% display_value("resolution", "UPSTREAM") FILTER html %] + [% display_value("resolution", "NOTOURBUG") FILTER html %] </dt> <dd> The problem is not a [% terms.bug %] in Wine, but in some upstream software Wine depends on or broken packages in distributions. - Note: Most other bug trackers call this "NOTOURBUG". </dd> </dl> </td> -- 2.17.2

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
61
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-devel October 2018