September 2018 - Wine-Devel

[PATCH 3/4] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW.
by Dmitry Timoshkov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0675..c6e9f1eb52 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -512,10 +512,10 @@ static void test_db(MSIHANDLE hinst) { r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - } - r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, NULL); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

5 5

[PATCH 1/2] comctl32/listbox: Fix InitStorage heap extension
by Gabriel Ivăncescu Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Only increase the item array if we actually have to. Previously, sending 1 to nb_items repeatedly would always increase the array by LB_ARRAY_GRANULARITY, even if there was plenty of space. dlls/comctl32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..9cd89ff 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -673,16 +673,20 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = nb_items + LB_ARRAY_GRANULARITY - 1; + item = HeapAlloc(GetProcessHeap(), 0, + (n - n % LB_ARRAY_GRANULARITY) * sizeof(*item)); } if (!item) -- 1.9.1

2 3

[PATCH] d2d1: Implement CreateBitmapFromDxgiSurface().
by Nikolay Sivov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d779fb0a97..d20377b5c2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1825,9 +1825,33 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicCol static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { - FIXME("iface %p, surface %p, desc %p, bitmap %p stub!\n", iface, surface, desc, bitmap); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d_bitmap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, surface %p, desc %p, bitmap %p.\n", iface, surface, desc, bitmap); + + if (!desc) + { + DXGI_SURFACE_DESC surface_desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + return hr; + } + + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = surface_desc.Format; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + desc = &bitmap_desc; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(context, &IID_IDXGISurface, surface, desc, &object))) + *bitmap = &object->ID2D1Bitmap1_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, -- 2.18.0

2 1

[PATCH 2/2] msi/tests: Add a test for repetitive MsiGetActiveDatabase calls.
by Dmitry Timoshkov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c9ec82fd93..cd6cb0c378 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -281,7 +281,7 @@ static void test_db(MSIHANDLE hinst) VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; - MSIHANDLE hdb, view, rec, rec2, suminfo; + MSIHANDLE hdb, hdb2, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; UINT r, count, type, i; @@ -312,6 +312,17 @@ static void test_db(MSIHANDLE hinst) ok(hinst, sz == strlen(buffer), "got size %u\n", sz); ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer); + /* Test MsiGetActiveDatabase + MsiDatabaseIsTablePersistent once again */ + hdb2 = MsiGetActiveDatabase(hinst); + ok(hinst, hdb2, "MsiGetActiveDatabase failed\n"); + ok(hinst, hdb2 != hdb, "db handles should be different\n"); + + r = MsiDatabaseIsTablePersistentA(hdb2, "Test"); + ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + + r = MsiCloseHandle(hdb2); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(rec2); ok(hinst, !r, "got %u\n", r); -- 2.17.1

3 2

[PATCH 1/2] msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW. (v2)
by Dmitry Timoshkov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0675..c9ec82fd93 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -510,12 +510,14 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { + WCHAR emptyW[1] = { 0 }; + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - } - r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

3 2

[PATCH 01/10] opcservices/uri: Fix IsEqual() to work with OPC URI objects.
by Nikolay Sivov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/tests/opcservices.c | 15 ++++++++++++--- dlls/opcservices/uri.c | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 17b7609739..a0621760b4 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -521,7 +521,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret = FALSE; + BOOL ret; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); @@ -529,11 +529,20 @@ static void test_rel_part_uri(void) hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri2); ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); ok(source_uri != source_uri2, "Unexpected instance.\n"); + + hr = IOpcUri_IsEqual(source_uri, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + ret = 123; + hr = IOpcUri_IsEqual(source_uri, NULL, &ret); + ok(is_root ? hr == E_POINTER : hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(is_root ? ret == 123 : !ret, "Unexpected result.\n"); + + ret = FALSE; hr = IOpcUri_IsEqual(source_uri, (IUri *)source_uri2, &ret); - todo_wine { ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); ok(ret, "Expected equal uris.\n"); - } + hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); ok(hr == (is_root ? E_NOINTERFACE : S_OK), "Unexpected hr %#x, %s.\n", hr, rel_part_uri_tests[i].uri); if (unk) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index ddb2c05daf..fa5ddbcde8 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -312,7 +312,21 @@ static HRESULT WINAPI opc_uri_IsEqual(IOpcPartUri *iface, IUri *comparand, BOOL TRACE("iface %p, comparand %p, is_equal %p.\n", iface, comparand, is_equal); - return IUri_IsEqual(uri->uri, comparand, is_equal); + if (!is_equal) + return E_POINTER; + + if (!comparand) + { + if (uri->is_part_uri) + { + *is_equal = FALSE; + return S_OK; + } + + return E_POINTER; + } + + return IUri_IsEqual(comparand, uri->uri, is_equal); } static HRESULT WINAPI opc_uri_GetRelationshipsPartUri(IOpcPartUri *iface, IOpcPartUri **part_uri) -- 2.18.0

1 9

[PATCH resend] msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie Sept. 19, 2018

Sept. 19, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3a50..b4f11d8ef4 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3(a)YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size); -- 2.19.0

2 1

[PATCH] dbghelp: Fix memory leak in SymInitializeW() (Coverity).
by Józef Kucia Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 5685c25cd076..a085cd140ef7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -298,7 +298,8 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); - if (process_find_by_handle(hProcess)){ + if (process_find_by_handle(hProcess)) + { WARN("the symbols for this process have already been initialized!\n"); /* MSDN says to only call this function once unless SymCleanup() has been called since the last call. @@ -307,15 +308,15 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP return TRUE; } - pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); - if (!pcs) return FALSE; - - pcs->handle = hProcess; - IsWow64Process(GetCurrentProcess(), &wow64); if (!IsWow64Process(hProcess, &child_wow64)) return FALSE; + + pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); + if (!pcs) return FALSE; + + pcs->handle = hProcess; pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; if (UserSearchPath) -- 2.16.4

1 0

[PATCH] urlmon/tests: Add IsEqual test for custom IUri implementation.
by Nikolay Sivov Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 240 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7580a1302d..3c5e27c8d9 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -8515,7 +8515,225 @@ static void test_IUri_HasProperty(void) { } } +struct custom_uri { + IUri IUri_iface; + IUri *uri; +}; + +static inline struct custom_uri* impl_from_IUri(IUri *iface) +{ + return CONTAINING_RECORD(iface, struct custom_uri, IUri_iface); +} + +static HRESULT WINAPI custom_uri_QueryInterface(IUri *iface, REFIID iid, void **out) +{ + if (IsEqualIID(iid, &IID_IUri) || IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IUri_AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI custom_uri_AddRef(IUri *iface) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_AddRef(uri->uri); +} + +static ULONG WINAPI custom_uri_Release(IUri *iface) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_Release(uri->uri); +} + +static HRESULT WINAPI custom_uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY property, BSTR *value, DWORD flags) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetPropertyBSTR(uri->uri, property, value, flags); +} + +static HRESULT WINAPI custom_uri_GetPropertyLength(IUri *iface, Uri_PROPERTY property, DWORD *length, DWORD flags) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetPropertyLength(uri->uri, property, length, flags); +} + +static HRESULT WINAPI custom_uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY property, DWORD *value, DWORD flags) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetPropertyDWORD(uri->uri, property, value, flags); +} + +static HRESULT WINAPI custom_uri_HasProperty(IUri *iface, Uri_PROPERTY property, BOOL *has_property) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_HasProperty(uri->uri, property, has_property); +} + +static HRESULT WINAPI custom_uri_GetAbsoluteUri(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetAuthority(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetDisplayUri(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetDomain(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetExtension(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetFragment(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetHost(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetPassword(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetPath(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetPathAndQuery(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetQuery(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetRawUri(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetAbsoluteUri(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetSchemeName(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetSchemeName(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetUserInfo(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetUserInfo(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetUserName(IUri *iface, BSTR *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetUserName(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetHostType(IUri *iface, DWORD *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetHostType(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetPort(IUri *iface, DWORD *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetPort(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetScheme(IUri *iface, DWORD *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetScheme(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetZone(IUri *iface, DWORD *value) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetZone(uri->uri, value); +} + +static HRESULT WINAPI custom_uri_GetProperties(IUri *iface, DWORD *flags) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_GetProperties(uri->uri, flags); +} + +static HRESULT WINAPI custom_uri_IsEqual(IUri *iface, IUri *pUri, BOOL *is_equal) +{ + struct custom_uri *uri = impl_from_IUri(iface); + return IUri_IsEqual(uri->uri, pUri, is_equal); +} + +static const IUriVtbl custom_uri_vtbl = +{ + custom_uri_QueryInterface, + custom_uri_AddRef, + custom_uri_Release, + custom_uri_GetPropertyBSTR, + custom_uri_GetPropertyLength, + custom_uri_GetPropertyDWORD, + custom_uri_HasProperty, + custom_uri_GetAbsoluteUri, + custom_uri_GetAuthority, + custom_uri_GetDisplayUri, + custom_uri_GetDomain, + custom_uri_GetExtension, + custom_uri_GetFragment, + custom_uri_GetHost, + custom_uri_GetPassword, + custom_uri_GetPath, + custom_uri_GetPathAndQuery, + custom_uri_GetQuery, + custom_uri_GetRawUri, + custom_uri_GetSchemeName, + custom_uri_GetUserInfo, + custom_uri_GetUserName, + custom_uri_GetHostType, + custom_uri_GetPort, + custom_uri_GetScheme, + custom_uri_GetZone, + custom_uri_GetProperties, + custom_uri_IsEqual, +}; + static void test_IUri_IsEqual(void) { + struct custom_uri custom_uri; IUri *uriA, *uriB; BOOL equal; HRESULT hres; @@ -8537,9 +8755,21 @@ static void test_IUri_IsEqual(void) { hres = IUri_IsEqual(uriA, uriB, NULL); ok(hres == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, E_POINTER); + equal = FALSE; + hres = IUri_IsEqual(uriA, uriA, &equal); + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + ok(equal, "Error: Expected equal URIs.\n"); + + equal = FALSE; + hres = IUri_IsEqual(uriA, uriB, &equal); + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + ok(equal, "Error: Expected equal URIs.\n"); + IUri_Release(uriA); IUri_Release(uriB); + custom_uri.IUri_iface.lpVtbl = &custom_uri_vtbl; + for(i = 0; i < ARRAY_SIZE(equality_tests); ++i) { uri_equality test = equality_tests[i]; LPWSTR uriA_W, uriB_W; @@ -8561,6 +8791,16 @@ static void test_IUri_IsEqual(void) { ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); } + + custom_uri.uri = uriB; + + equal = -1; + hres = IUri_IsEqual(uriA, &custom_uri.IUri_iface, &equal); + todo_wine { + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); + } + if(uriA) IUri_Release(uriA); if(uriB) IUri_Release(uriB); -- 2.18.0

2 1

[PATCH 1/4] testbot: Rename the patch analyzer to GetPatchImpacts().
by Francois Gouget Sept. 19, 2018

Sept. 19, 2018

The returned structure is called $Impacts everywhere so this makes the naming more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/web/Submit.pl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 11b41c67a..d9bedb533 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpact($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName, "nounit"); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index fd1b8467c..38a801260 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpact($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile, "nounits"); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7049694aa..4a1761afb 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,7 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); use List::Util qw(min max); @@ -249,7 +249,7 @@ sub _HandleFile($$$) =pod =over 12 -=item C<GetPatchImpact()> +=item C<GetPatchImpacts()> Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or @@ -258,7 +258,7 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$$) +sub GetPatchImpacts($;$$) { my ($PatchFileName, $NoUnits, $PastImpacts) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 390b1611c..a052c5a8c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -133,8 +133,8 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; my $PastImpacts; - $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild}) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 621b01728..fe101042c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -597,7 +597,7 @@ sub DetermineFileType($$) my ($ErrMessage, $ExeBase, $TestUnit); if ($FileType eq "unknown") { - my $Impacts = GetPatchImpact($FileName); + my $Impacts = GetPatchImpacts($FileName); if ($Impacts->{UnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; @@ -781,7 +781,7 @@ sub OnSubmit($) if ($FileType eq "patch") { my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - $Impacts = GetPatchImpact($TmpStagingFullPath); + $Impacts = GetPatchImpacts($TmpStagingFullPath); } my $BuildStep; -- 2.18.0

1 3