December 2015 - Wine-Commits

Sebastian Lackner : tools: Remove redundant check for request size in make_requests.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 6d2169649e7d6dd5eb84a7eb4ae1ca57db9daedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2169649e7d6dd5eb84a7eb4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 23 03:09:39 2015 +0100 tools: Remove redundant check for request size in make_requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_requests | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/make_requests b/tools/make_requests index bceef70..6e4a537 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -171,7 +171,6 @@ sub PARSE_REQUESTS() print SERVER_PROT "};\n"; print SERVER_PROT "struct ${name}_reply\n{\n"; print SERVER_PROT " struct reply_header __header;\n"; - die "request $name too large ($offset)" if ($offset > $max_req_size); $offset = 8; $state++; next;

1 0

André Hentschel : msvcrt: Don' t continue on demangle failure (Coverity).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 51098fcd94457b46945a03131c4cd1f049682d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51098fcd94457b46945a03131… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:35:04 2015 +0100 msvcrt: Don't continue on demangle failure (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index beaec4f..097f036 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1379,6 +1379,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

Jactry Zeng : riched32/tests: Test EM_GETTEXTRANGE with multibyte character.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 4871b0236bca93e33b8e89bbdf18471f264cbf4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4871b0236bca93e33b8e89bbd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:42 2015 +0800 riched32/tests: Test EM_GETTEXTRANGE with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index ff37750..e200ff3 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -566,6 +566,18 @@ static void test_EM_GETTEXTRANGE(void) ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

Hans Leidekker : dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: e10c48143aadc9fbec7677847d3d9eab66bf441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10c48143aadc9fbec7677847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:05:30 2015 +0100 dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 6 +++--- dlls/dnsapi/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/name.c | 21 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 4f6f1c8..de0ed1d 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -32,9 +32,9 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFlushResolverCacheEntry_A(str) +@ stdcall DnsFlushResolverCacheEntry_UTF8(str) +@ stdcall DnsFlushResolverCacheEntry_W(wstr) @ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index d4f716a..93528a2 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -93,6 +93,38 @@ VOID WINAPI DnsFlushResolverCache(void) FIXME(": stub\n"); } +/****************************************************************************** + * DnsFlushResolverCacheEntry_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_A( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_UTF8 [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_UTF8( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_w(entry) ); + if (!entry) return FALSE; + return TRUE; +} /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fba6955..3e54355 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -27,6 +27,8 @@ #include "wine/test.h" +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); + static const struct { LPCSTR name; @@ -202,8 +204,27 @@ static void test_DnsNameCompare_A( void ) ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); + test_DnsFlushResolverCacheEntry_A(); }

1 0

Hans Leidekker : wbemdisp: Calculate the object count returned from ISWbemObjectSet:: get_Count just once.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 4cce8cbd5f300edc59bc0d79fea5ee1f662b13df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cce8cbd5f300edc59bc0d79f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:06:57 2015 +0100 wbemdisp: Calculate the object count returned from ISWbemObjectSet::get_Count just once. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 3465eb1..d1f2609 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -356,6 +356,7 @@ struct objectset ISWbemObjectSet ISWbemObjectSet_iface; LONG refs; IEnumWbemClassObject *objectenum; + LONG count; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -517,20 +518,10 @@ static HRESULT WINAPI objectset_get_Count( LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; - - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; - - count = total - count; - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); - - *iCount = total; + *iCount = objectset->count; return S_OK; } @@ -567,6 +558,14 @@ static const ISWbemObjectSetVtbl objectset_vtbl = objectset_ItemIndex }; +static LONG get_object_count( IEnumWbemClassObject *iter ) +{ + LONG count = 0; + while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -578,6 +577,7 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW objectset->refs = 1; objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); + objectset->count = get_object_count( objectset->objectenum ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: dd04d232d3610bb5c8d7734ab3c38604091cb4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd04d232d3610bb5c8d7734ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:40 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 345437d..baa161b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -173,6 +173,8 @@ static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; +static const WCHAR prop_dhcpenabledW[] = + {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = @@ -475,6 +477,7 @@ static const struct column col_networkadapterconfig[] = { { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dhcpenabledW, CIM_BOOLEAN }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, @@ -867,6 +870,7 @@ struct record_networkadapterconfig { const struct array *defaultipgateway; const WCHAR *description; + int dhcpenabled; const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; @@ -2182,6 +2186,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec = (struct record_networkadapterconfig *)(table->data + offset); rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); + rec->dhcpenabled = -1; rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Riccardo Bortolato : ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority ().
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 97f0345f71679570d4eedb4ab750158d1a80001c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f0345f71679570d4eedb4ab… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Dec 21 18:38:39 2015 +0100 ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c303ed0..8a91d4b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2377,9 +2377,12 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) + || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) + || ((surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && !(surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_POSITIVEX))) { - WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); + WARN("Called on non-managed texture, mipmap sublevel or non +X toplevel surface, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; } else

1 0

André Hentschel : mmdevapi: Skip device if GetId fails (Coverity).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: bbc42a2341c9eb3181d3b9e845bb3c551667a95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc42a2341c9eb3181d3b9e84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:46 2015 +0100 mmdevapi: Skip device if GetId fails (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d50d206..e63a199 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1065,9 +1065,15 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { + HRESULT hr; WCHAR *str; dev = &MMDevice_head[i]->IMMDevice_iface; - IMMDevice_GetId(dev, &str); + hr = IMMDevice_GetId(dev, &str); + if (FAILED(hr)) + { + WARN("GetId failed: %08x\n", hr); + continue; + } if (str && !lstrcmpW(str, name)) {

1 0

Hans Leidekker : wbemprox: Set correct variant type if array property value is NULL.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 086a1a4ed2cf776c01130c02a13565fff9cbcf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1a4ed2cf776c01130c02a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:39 2015 +0100 wbemprox: Set correct variant type if array property value is NULL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7fedf89..53e1044 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -841,7 +841,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK; val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); - if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; + if (!val_ptr) vartype = VT_NULL; + else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; goto done; } switch (view->table->columns[column].type & COL_TYPE_MASK)

1 0

Hans Leidekker : qmgr: Use the full path for HTTP downloads.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 69d0764196506da7405a401c1feb0216b278ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d0764196506da7405a401c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:04:57 2015 +0100 qmgr: Use the full path for HTTP downloads. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 70d3a50..2525caf 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -477,7 +477,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; - WCHAR host[MAX_PATH], path[MAX_PATH]; + WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; BOOL ret; @@ -519,10 +519,8 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszHostName = host; uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); uc.nPort = 0; - uc.lpszUrlPath = path; - uc.dwUrlPathLength = sizeof(path)/sizeof(path[0]); - uc.lpszExtraInfo = NULL; - uc.dwExtraInfoLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) {

1 0