September 2018 - Wine-commits

Alex Henrie : msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: b917cc66f4f7b786e7f19f63ab0c0819a5455222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b917cc66f4f7b786e7f19f63… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:58:21 2018 -0600 msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7ea80a3..b4f11d8 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);

1 0

Zebediah Figura : quartz/tests: Test interfaces exposed by the filter graph.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 45e618162dcaabb8ad5642186d150e1aecb2d573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e618162dcaabb8ad564218… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:09 2018 -0500 quartz/tests: Test interfaces exposed by the filter graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 37304d6..82f895f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -76,6 +76,46 @@ static IFilterGraph2 *create_graph(void) return ret; } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IFilterGraph2 *graph = create_graph(); + + check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph2, TRUE); + check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphConfig, TRUE); + check_interface(graph, &IID_IGraphVersion, TRUE); + check_interface(graph, &IID_IMediaControl, TRUE); + check_interface(graph, &IID_IMediaEvent, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaPosition, TRUE); + check_interface(graph, &IID_IMediaSeeking, TRUE); + check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoWindow, TRUE); + + check_interface(graph, &IID_IBaseFilter, FALSE); + + IFilterGraph2_Release(graph); +} + static void test_basic_video(IFilterGraph2 *graph) { IBasicVideo* pbv; @@ -1827,6 +1867,7 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_interfaces(); test_render_run(avifile); test_render_run(mpegfile); test_enum_filters();

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_Add/ RemoveFilter().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: e0b98935d4ea939093b6268647450d0ec8982de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b98935d4ea939093b62686… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:10 2018 -0500 quartz/tests: Add some tests for IFilterGraph_Add/RemoveFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 52 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 82f895f..7425e29 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1166,6 +1166,7 @@ struct testfilter LONG ref; IFilterGraph *graph; WCHAR *name; + IReferenceClock *clock; IEnumPins IEnumPins_iface; struct testpin *pins; @@ -1314,8 +1315,15 @@ static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FIL static HRESULT WINAPI testfilter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) { - if (winetest_debug > 1) trace("%p->SetSyncSource(%p)\n", iface, clock); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IBaseFilter(iface); + if (winetest_debug > 1) trace("%p->SetSyncSource(%p)\n", filter, clock); + + if (filter->clock) + IReferenceClock_Release(filter->clock); + if (clock) + IReferenceClock_AddRef(clock); + filter->clock = clock; + return S_OK; } static HRESULT WINAPI testfilter_GetSyncSource(IBaseFilter *iface, IReferenceClock **clock) @@ -1863,6 +1871,45 @@ static void test_control_delegation(void) IFilterGraph2_Release(graph); } +static void test_add_remove_filter(void) +{ + static const WCHAR defaultid[] = {'0','0','0','1',0}; + static const WCHAR testid[] = {'t','e','s','t','i','d',0}; + struct testfilter filter; + + IFilterGraph2 *graph = create_graph(); + HRESULT hr; + + testfilter_init(&filter, NULL, 0); + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, testid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); + ok(!lstrcmpW(filter.name, testid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + + hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!filter.graph, "Got graph %p.\n", filter.graph); +todo_wine + ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); + ok(!filter.clock, "Got clock %p,\n", filter.clock); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); + ok(!lstrcmpW(filter.name, defaultid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + + /* test releasing the filter graph while filters are still connected */ + hr = IFilterGraph2_Release(graph); + ok(!hr, "Got outstanding refcount %d.\n", hr); + ok(!filter.graph, "Got graph %p.\n", filter.graph); +todo_wine + ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); + ok(!filter.clock, "Got clock %p.\n", filter.clock); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1875,6 +1922,7 @@ START_TEST(filtergraph) test_graph_builder_render(); test_aggregate_filter_graph(); test_control_delegation(); + test_add_remove_filter(); CoUninitialize(); test_render_with_multithread();

1 0

Zebediah Figura : quartz/filtergraph: Unset the name of a removed filter.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 9ed4b1f7f8080430733990213b97503ba15788f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed4b1f7f808043073399021… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:11 2018 -0500 quartz/filtergraph: Unset the name of a removed filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9d34bd4..7f22475 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -681,7 +681,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IEnumPins_Release(penumpins); } - hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, entry->name); + hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, NULL); if (SUCCEEDED(hr)) { IBaseFilter_SetSyncSource(pFilter, NULL); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7425e29..4d49772 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1890,7 +1890,6 @@ static void test_add_remove_filter(void) hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); -todo_wine ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); ok(!filter.clock, "Got clock %p,\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); @@ -1904,7 +1903,6 @@ todo_wine hr = IFilterGraph2_Release(graph); ok(!hr, "Got outstanding refcount %d.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); -todo_wine ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); ok(!filter.clock, "Got clock %p.\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref);

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_FindFilterByName().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 5f0bb5bd34efc9f20f812b63e7444d7b522a8d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0bb5bd34efc9f20f812b63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:12 2018 -0500 quartz/tests: Add some tests for IFilterGraph_FindFilterByName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4d49772..2374e2f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1878,15 +1878,25 @@ static void test_add_remove_filter(void) struct testfilter filter; IFilterGraph2 *graph = create_graph(); + IBaseFilter *ret_filter; HRESULT hr; testfilter_init(&filter, NULL, 0); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + ok(!ret_filter, "Got filter %p.\n", ret_filter); + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, testid); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); ok(!lstrcmpW(filter.name, testid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_filter == &filter.IBaseFilter_iface, "Got filter %p.\n", ret_filter); + IBaseFilter_Release(ret_filter); + hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); @@ -1894,11 +1904,20 @@ static void test_add_remove_filter(void) ok(!filter.clock, "Got clock %p,\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + ok(!ret_filter, "Got filter %p.\n", ret_filter); + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); ok(!lstrcmpW(filter.name, defaultid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + hr = IFilterGraph2_FindFilterByName(graph, defaultid, &ret_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_filter == &filter.IBaseFilter_iface, "Got filter %p.\n", ret_filter); + IBaseFilter_Release(ret_filter); + /* test releasing the filter graph while filters are still connected */ hr = IFilterGraph2_Release(graph); ok(!hr, "Got outstanding refcount %d.\n", hr);

1 0

Zebediah Figura : quartz/tests: Get rid of test_graph_builder().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 2da49669f9071d6c33e55719cce5353ba592f0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da49669f9071d6c33e55719… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:13 2018 -0500 quartz/tests: Get rid of test_graph_builder(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 64 ----------------------------------------- 1 file changed, 64 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2374e2f..5035f80 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,69 +760,6 @@ static void test_render_with_multithread(void) CoUninitialize(); } -static void test_graph_builder(void) -{ - HRESULT hr; - IGraphBuilder *pgraph; - IBaseFilter *pF = NULL; - IBaseFilter *pF2 = NULL; - IPin *pIn = NULL; - IEnumPins *pEnum = NULL; - PIN_DIRECTION dir; - static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; - static const WCHAR fooBarW[] = {'f','o','o','B','a','r',0}; - - pgraph = (IGraphBuilder *)create_graph(); - - /* create video filter */ - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (LPVOID*)&pF); - ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - - hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); - ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); - - /* add the two filters to the graph */ - hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); - ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); - - /* find the pins */ - hr = IBaseFilter_EnumPins(pF, &pEnum); - ok(hr == S_OK, "IBaseFilter_EnumPins failed for pF: %x\n", hr); - ok(pEnum != NULL, "pEnum is NULL\n"); - hr = IEnumPins_Next(pEnum, 1, &pIn, NULL); - ok(hr == S_OK, "IEnumPins_Next failed for pF: %x\n", hr); - ok(pIn != NULL, "pIn is NULL\n"); - hr = IPin_QueryDirection(pIn, &dir); - ok(hr == S_OK, "IPin_QueryDirection failed: %x\n", hr); - ok(dir == PINDIR_INPUT, "pin has wrong direction\n"); - - hr = IGraphBuilder_FindFilterByName(pgraph, fooBarW, &pF2); - ok(hr == VFW_E_NOT_FOUND, "IGraphBuilder_FindFilterByName returned %x\n", hr); - ok(pF2 == NULL, "IGraphBuilder_FindFilterByName returned %p\n", pF2); - hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, &pF2); - ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned %x\n", hr); - ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); - hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); - ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, NULL, pIn); - ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, pIn, NULL); - ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, pIn, pIn); - ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); - - if (pIn) IPin_Release(pIn); - if (pEnum) IEnumPins_Release(pEnum); - if (pF) IBaseFilter_Release(pF); - if (pF2) IBaseFilter_Release(pF2); - IGraphBuilder_Release(pgraph); -} - struct testpin { IPin IPin_iface; @@ -1935,7 +1872,6 @@ START_TEST(filtergraph) test_render_run(avifile); test_render_run(mpegfile); test_enum_filters(); - test_graph_builder(); test_graph_builder_render(); test_aggregate_filter_graph(); test_control_delegation();

1 0

Jacek Caban : winhttp: Modify index only if query_headers succeeded.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: f76208879e073226a8c55dff9ed4d52497538840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f76208879e073226a8c55dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 16:17:46 2018 +0200 winhttp: Modify index only if query_headers succeeded. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 3 +-- dlls/winhttp/tests/winhttp.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 80694da..72cebdd 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -766,7 +766,6 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID set_last_error( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } - if (index) *index += 1; if (level & WINHTTP_QUERY_FLAG_NUMBER) { if (!buffer || sizeof(int) > *buflen) @@ -813,6 +812,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } *buflen = len; } + if (ret && index) *index += 1; return ret; } @@ -902,7 +902,6 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support query_headers( request, level, NULL, NULL, &size, &index ); if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) break; - index--; if (!(buffer = heap_alloc( size ))) return FALSE; if (!query_headers( request, level, NULL, buffer, &size, &index )) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1c72c07..5f0935f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -33,6 +33,7 @@ #include <httprequestid.h> #include "wine/test.h" +#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -42,6 +43,22 @@ static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q', static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR *a2w(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static int strcmp_wa(const WCHAR *str1, const char *stra) +{ + WCHAR *str2 = a2w(stra); + int r = lstrcmpW(str1, str2); + heap_free(str2); + return r; +} + static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2736,9 +2753,12 @@ static void test_basic_authentication(int port) static void test_multi_authentication(int port) { static const WCHAR multiauthW[] = {'/','m','u','l','t','i','a','u','t','h',0}; + static const WCHAR www_authenticateW[] = + {'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0}; static const WCHAR getW[] = {'G','E','T',0}; HINTERNET ses, con, req; - DWORD supported, first, target; + DWORD supported, first, target, size, index; + WCHAR buf[512]; BOOL ret; ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); @@ -2764,6 +2784,22 @@ static void test_multi_authentication(int port) ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + index = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, buf, &size, &index); + ok(ret, "expected success\n"); + ok(!strcmp_wa(buf, "Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); + ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); + ok(index == 1, "index = %u\n", index); + + index = 0; + size = 0xdeadbeef; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, NULL, &size, &index); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "WinHttpQueryHeaders returned %x(%u)\n", ret, GetLastError()); + ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %u\n", size); + ok(index == 0, "index = %u\n", index); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3087,6 +3123,7 @@ static void test_bad_header( int port ) content_typeW, buffer, &len, &index ); ok( ret, "failed to query headers %u\n", GetLastError() ); ok( !lstrcmpW( buffer, text_htmlW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( index == 1, "index = %u\n", index ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Jacek Caban : winhttp: Set last error in WinHttpQueryAuthSchemes when no auth scheme is found.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 6435f844dde0fa2f97944378c59392e8befdba8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6435f844dde0fa2f97944378… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 16:18:22 2018 +0200 winhttp: Set last error in WinHttpQueryAuthSchemes when no auth scheme is found. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 72cebdd..33d8682 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -965,6 +965,7 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW *target = WINHTTP_AUTH_TARGET_PROXY; ret = TRUE; } + else set_last_error( ERROR_INVALID_OPERATION ); release_object( &request->hdr ); if (ret) set_last_error( ERROR_SUCCESS ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5f0935f..9138d6a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2441,7 +2441,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "unexpected success\n"); - todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); ok(supported == 0xdeadbeef, "got %x\n", supported); ok(first == 0xdeadbeef, "got %x\n", first); ok(target == 0xdeadbeef, "got %x\n", target); @@ -2528,7 +2528,7 @@ static void test_basic_authentication(int port) ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); ok(supported == 0xdeadbeef, "got %x\n", supported); ok(first == 0xdeadbeef, "got %x\n", first); ok(target == 0xdeadbeef, "got %x\n", target);

1 0

Alexandre Julliard : ntoskrnl/tests: Fix error check that fails on Windows.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 4100bac563439be185d4b866bf4352192e2589a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4100bac563439be185d4b866… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 19:21:17 2018 +0200 ntoskrnl/tests: Fix error check that fails on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index fe070d4..5675818 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -230,8 +230,9 @@ static void test_driver3(void) ret = StartServiceA(service, 0, NULL); ok(!ret, "driver3 should fail to start\n"); -todo_wine - ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || + ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || + GetLastError() == ERROR_INVALID_FUNCTION || + GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || GetLastError() == ERROR_FILE_NOT_FOUND /* Win7 */, "got %u\n", GetLastError()); DeleteService(service);

1 0

Józef Kucia : dbghelp: Fix memory leak in SymInitializeW() (Coverity).
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: b3717a92d11c84819ce934da39bc8f9c85582c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3717a92d11c84819ce934da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 19 12:26:56 2018 +0200 dbghelp: Fix memory leak in SymInitializeW() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 5685c25..a085cd1 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)

1 0