June 2020 - Wine-Commits - list.winehq.org

Anton Baskanov : amstream: Implement MediaStreamFilter::GetCurrentStreamTime.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 57b627fba69d633042201f7d9c26b2545afa186d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b627fba69d633042201f7d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jun 18 01:18:29 2020 +0700 amstream: Implement MediaStreamFilter::GetCurrentStreamTime. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 28 ++++++++- dlls/amstream/tests/amstream.c | 137 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 05a02e3f66..3dff686b21 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -174,6 +174,7 @@ struct filter IAMMediaStream **streams; IAMMediaStream *seekable_stream; FILTER_STATE state; + REFERENCE_TIME start_time; }; static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -295,6 +296,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start EnterCriticalSection(&filter->cs); + filter->start_time = start; set_state(filter, State_Running); LeaveCriticalSection(&filter->cs); @@ -614,11 +616,31 @@ static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface return E_NOTIMPL; } -static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pCurrentStreamTime) +static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pCurrentStreamTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + if (!time) + return E_POINTER; + + EnterCriticalSection(&filter->cs); + + if (filter->state != State_Running || !filter->clock) + { + *time = 0; + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + IReferenceClock_GetTime(filter->clock, time); + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME WaitStreamTime) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2bc1310a96..e1f6a15ad3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2641,6 +2641,87 @@ static const IMediaSeekingVtbl testsource_seeking_vtbl = testsource_seeking_GetPreroll, }; +struct testclock +{ + IReferenceClock IReferenceClock_iface; + LONG refcount; + LONGLONG time; + HRESULT get_time_hr; +}; + +static inline struct testclock *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct testclock, IReferenceClock_iface); +} + +static HRESULT WINAPI testclock_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IReferenceClock) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + IReferenceClock_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI testclock_AddRef(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedIncrement(&clock->refcount); +} + +static ULONG WINAPI testclock_Release(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedDecrement(&clock->refcount); +} + +static HRESULT WINAPI testclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + if (SUCCEEDED(clock->get_time_hr)) + *time = clock->time; + return clock->get_time_hr; +} + +static HRESULT WINAPI testclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static IReferenceClockVtbl testclock_vtbl = +{ + testclock_QueryInterface, + testclock_AddRef, + testclock_Release, + testclock_GetTime, + testclock_AdviseTime, + testclock_AdvisePeriodic, + testclock_Unadvise, +}; + +static void testclock_init(struct testclock *clock) +{ + memset(clock, 0, sizeof(*clock)); + clock->IReferenceClock_iface.lpVtbl = &testclock_vtbl; +} + static void test_audiostream_get_format(void) { static const WAVEFORMATEX pin_format = @@ -4330,6 +4411,61 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_current_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 11111101, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4383,6 +4519,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); }

1 0

Dmitry Timoshkov : ieframe: Implement IPersistStorage::GetClassID().
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 500a813579d1747d70e08f13de5b9644ec3ee839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=500a813579d1747d70e08f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 18 14:39:00 2020 +0800 ieframe: Implement IPersistStorage::GetClassID(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/persist.c | 10 ++++++++-- dlls/ieframe/tests/webbrowser.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index bef5ef7344..a0a7c94fbe 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -56,8 +56,14 @@ static ULONG WINAPI PersistStorage_Release(IPersistStorage *iface) static HRESULT WINAPI PersistStorage_GetClassID(IPersistStorage *iface, CLSID *pClassID) { WebBrowser *This = impl_from_IPersistStorage(iface); - FIXME("(%p)->(%p)\n", This, pClassID); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClassID); + + if (!pClassID) + return E_INVALIDARG; + + *pClassID = This->version == 1 ? CLSID_WebBrowser_V1: CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI PersistStorage_IsDirty(IPersistStorage *iface) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 898d0e6805..95d5fc4988 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2220,6 +2220,25 @@ static void test_EnumVerbs(IWebBrowser2 *wb) IEnumOLEVERB_Release(enum_verbs); } +static void test_Persist(IWebBrowser2 *wb, int version) +{ + IPersist *persist; + GUID guid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); + ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + + hr = IPersist_GetClassID(persist, &guid); + ok(hr == S_OK, "GetClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&guid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + else + ok(IsEqualGUID(&guid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + + IPersist_Release(persist); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3741,6 +3760,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); + test_Persist(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3849,6 +3869,7 @@ static void test_WebBrowserV1(void) test_ready_state(READYSTATE_UNINITIALIZED, BUSY_FAIL); test_ClassInfo(wb); test_EnumVerbs(wb); + test_Persist(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Paul Gofman : winex11.drv: Handle X error from vkGetRandROutputDisplayEXT().
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 6f9d20806e821ab07c8adf81ae6630fae94b00ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9d20806e821ab07c8adf81… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 18 17:28:50 2020 +0300 winex11.drv: Handle X error from vkGetRandROutputDisplayEXT(). Nvidia implementation of vkGetRandROutputDisplayEXT() generates X exception when rrOutput is from different provider (or if rrOutput is just invalid). That can happen on certain multiple GPU configurations, on which Wine is currently unable to initialize display driver and thus create any window. According to Vulkan spec, vkGetRandROutputDisplayEXT is supposed to just return VK_NULL_HANDLE if there is no corresponding VkDisplayKHR. But it is probably better to workaround the problem to avoid long standing regression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49407 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f61a5b190e..b1a43e48ea 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -756,9 +756,11 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + XSync( gdi_display, FALSE ); + if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) );

1 0

Alexandre Julliard : ntdll: Move the thread get/set information functions to the Unix library.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: e84ec36a620a4922ddcb9cdce9ddabc2573ee1da URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84ec36a620a4922ddcb9cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 12:37:50 2020 +0200 ntdll: Move the thread get/set information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/process.c | 7 - dlls/ntdll/thread.c | 436 +-------------------------------------- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- dlls/ntdll/unix/thread.c | 440 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 73 +++++-- dlls/ntdll/unixlib.h | 8 +- 13 files changed, 514 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e84ec36a620a4922ddcb…

1 0

Aaro Altonen : include: Add ConnectionEventsVt definition.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: a436833c4157fdc2b399f4a87b132753cc08067f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a436833c4157fdc2b399f4a8… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Jun 17 15:36:13 2020 +0300 include: Add ConnectionEventsVt definition. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msado15_backcompat.idl | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 5ea9f51c1f..e5d0f5ecfe 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -47,6 +47,7 @@ interface Property; interface Recordset15; interface Recordset20; interface Recordset21; +interface ConnectionEventsVt; dispinterface ConnectionEvents; dispinterface RecordsetEvents; @@ -1581,6 +1582,70 @@ interface _Command : Command25 [out, retval] VARIANT_BOOL *named_parameters); }; +[ + uuid(00000402-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ConnectionEventsVt : IUnknown +{ + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + [ uuid(00000400-0000-0010-8000-00aa006d2ea4) ]

1 0

Paul Gofman : netio.sys: Implement wsk_accept() function.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 2d7a304c4524095b10458a3e5f8af1273894ebf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7a304c4524095b10458a3e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 17 20:21:59 2020 +0300 netio.sys: Implement wsk_accept() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 220 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d7a304c4524095b1045…

1 0

Alexandre Julliard : ntdll: Move the remaining process functions to the Unix library.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 44a230937b6dc320aad8b18828060e3e916eee03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a230937b6dc320aad8b188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 09:05:30 2020 +0200 ntdll: Move the remaining process functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 3 - dlls/ntdll/process.c | 234 ++--------------------------------------- dlls/ntdll/unix/loader.c | 5 + dlls/ntdll/unix/process.c | 95 +++++++++++++++-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 35 ++++++ dlls/ntdll/unixlib.h | 10 +- include/winternl.h | 3 + 8 files changed, 145 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44a230937b6dc320aad8…

1 0

Alexandre Julliard : ntdll: Move the directory change functions to the Unix library.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 78532a0c09c33a24715ae5ff7f446f1de488a24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78532a0c09c33a24715ae5ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 15:08:02 2020 +0200 ntdll: Move the directory change functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 283 +---------------------------------------------- dlls/ntdll/unix/file.c | 135 ++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unixlib.h | 6 +- 4 files changed, 144 insertions(+), 281 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78532a0c09c33a24715a…

1 0

Louis Lenders : ws2_32: Add FreeAddrInfoEx.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 6d1fea9711d5062fdcfe5043091451c8aec56023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d1fea9711d5062fdcfe5043… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jun 17 00:43:22 2020 +0200 ws2_32: Add FreeAddrInfoEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48256 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8744602564..402ee86d96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7268,6 +7268,24 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoEx (WS2_32.@) + */ +void WINAPI FreeAddrInfoEx(ADDRINFOEXA *ai) +{ + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXA *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } +} + /*********************************************************************** * FreeAddrInfoExW (WS2_32.@) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index d3c1e6214a..87e0bdfa2f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoEx(ptr) @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExCancel(ptr) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 43c277fa0c..5a444dcb5f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -177,7 +177,11 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoEx(ADDRINFOEXA*); void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); +#ifdef UNICODE +#define FreeAddrInfoEx FreeAddrInfoExW +#endif int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);

1 0

Alexandre Julliard : ntdll: Move the volume information functions to the Unix library.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: wine Branch: master Commit: 7e3d265469996efc7e720685be9b2c524eb7434b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e3d265469996efc7e720685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 14:45:32 2020 +0200 ntdll: Move the volume information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 610 +---------------------------------------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/file.c | 442 +++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unixlib.h | 7 +- 5 files changed, 453 insertions(+), 609 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3d265469996efc7e72…

1 0