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

Gijs Vermeulen : iphlpapi: Fix unused variable warning.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 7096ab45444d7b7cbb926b5a51af0cbc46960ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096ab45444d7b7cbb926b5a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 3 19:02:04 2020 +0200 iphlpapi: Fix unused variable warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 52bd6593b0..f0b412c3a6 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2744,7 +2744,6 @@ DWORD build_tcp6_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE DWORD *size ) { MIB_TCP6TABLE *table; - MIB_TCP6ROW_OWNER_MODULE row; DWORD ret = NO_ERROR, count = 16, table_size, row_size; if (!(table_size = get_tcp6_table_sizes( class, count, &row_size ))) @@ -2757,6 +2756,7 @@ DWORD build_tcp6_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE #ifdef __linux__ { + MIB_TCP6ROW_OWNER_MODULE row; FILE *fp; if ((fp = fopen( "/proc/net/tcp6", "r" )))

1 0

Gijs Vermeulen : iphlpapi: Silence unused function warning for sockaddr_in6_to_WS_storage.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 4c445127da4b480f54009625bdb7b26d5fc31740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c445127da4b480f54009625… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 3 18:24:11 2020 +0200 iphlpapi: Silence unused function warning for sockaddr_in6_to_WS_storage. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9ee85caeb3..b8ae327a13 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1248,6 +1248,8 @@ static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct socka sizeof(SOCKADDR_STORAGE) - FIELD_OFFSET( SOCKADDR_IN, sin_zero) ); } +#if defined(HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6) || \ + (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)) static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src ) { SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst; @@ -1260,6 +1262,7 @@ static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sock memset( (char *)s + sizeof(SOCKADDR_IN6), 0, sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); } +#endif #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */

1 0

Nikolay Sivov : mfreadwrite: Handle async reads when flush is in progress.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: eb927dbb31330eeebe4b404dd1f013859b03e02f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb927dbb31330eeebe4b404d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 19:25:09 2020 +0300 mfreadwrite: Handle async reads when flush is in progress. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index a8df4da763..df921307e9 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1658,29 +1658,46 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind return hr; } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, - DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags, + unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - struct source_reader *reader = impl_from_IMFSourceReader(iface); struct source_reader_async_command *command; HRESULT hr; - TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + if (actual_index || stream_flags || timestamp || sample) + return E_INVALIDARG; - if (reader->async_callback) + EnterCriticalSection(&reader->cs); + + if (reader->flags & SOURCE_READER_FLUSHING) + hr = MF_E_NOTACCEPTING; + else { - if (actual_index || stream_flags || timestamp || sample) - return E_INVALIDARG; + if (SUCCEEDED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_READ, &command))) + { + command->stream_index = index; + command->flags = flags; - if (FAILED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_READ, &command))) - return hr; + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + } + } + + LeaveCriticalSection(&reader->cs); - command->stream_index = index; - command->flags = flags; + return hr; +} - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); - IUnknown_Release(&command->IUnknown_iface); - } +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + if (reader->async_callback) + hr = source_reader_read_sample_async(reader, index, flags, actual_index, stream_flags, timestamp, sample); else hr = source_reader_read_sample(reader, index, flags, actual_index, stream_flags, timestamp, sample);

1 0

Nikolay Sivov : mfreadwrite: Use default queue so submit flush commands.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: e81d2cf5bc32f2c8682fb61bf8243494b341b6db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e81d2cf5bc32f2c8682fb61b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 19:25:08 2020 +0300 mfreadwrite: Use default queue so submit flush commands. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 74aa2dc557..a8df4da763 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1715,8 +1715,7 @@ static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned command->stream_index = stream_index; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, - &command->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); return hr;

1 0

Rémi Bernon : winedbg: Remove the use of gdb specific register length.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: fd6ea955d48727631fbb3de4f785d595d63da8fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6ea955d48727631fbb3de4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:51 2020 +0200 winedbg: Remove the use of gdb specific register length. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 +++++------ programs/winedbg/be_arm64.c | 70 ++++++++++----------- programs/winedbg/be_cpu.h | 5 +- programs/winedbg/be_i386.c | 86 ++++++++++++------------- programs/winedbg/be_ppc.c | 146 +++++++++++++++++++++---------------------- programs/winedbg/be_x86_64.c | 118 +++++++++++++++++----------------- programs/winedbg/gdbproxy.c | 50 ++------------- 7 files changed, 236 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd6ea955d48727631fbb…

1 0

Nikolay Sivov : mfreadwrite: Block recurring flush calls in async mode when flush is pending.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: ee7b31729355c5faa538269a7f93c1d5633a604c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7b31729355c5faa538269a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 19:25:11 2020 +0300 mfreadwrite: Block recurring flush calls in async mode when flush is pending. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 3 +++ dlls/mfreadwrite/tests/mfplat.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 17d274ebc8..e46b6003eb 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1710,6 +1710,9 @@ static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned unsigned int stream_index; HRESULT hr; + if (reader->flags & SOURCE_READER_FLUSHING) + return MF_E_INVALIDREQUEST; + switch (index) { case MF_SOURCE_READER_FIRST_VIDEO_STREAM: diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index e03d74981a..c35cfa3c0c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -951,6 +951,13 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* Flush() arguments validation. */ + hr = IMFSourceReader_Flush(reader, 123); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, NULL); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + IMFSourceReader_Release(reader); }

1 0

Nikolay Sivov : mfreadwrite: Move source shutdown mode to reader flags.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 42edc14e04ab8c5c2991c7a8e1dc3248a6c32f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=42edc14e04ab8c5c2991c7a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 19:25:10 2020 +0300 mfreadwrite: Move source shutdown mode to reader flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index df921307e9..17d274ebc8 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -134,6 +134,7 @@ struct source_reader_async_command enum source_reader_flags { SOURCE_READER_FLUSHING = 0x1, + SOURCE_READER_SHUTDOWN_ON_RELEASE = 0x2, }; struct source_reader @@ -148,7 +149,6 @@ struct source_reader DWORD first_audio_stream_index; DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; - BOOL shutdown_on_release; unsigned int flags; enum media_source_state source_state; struct media_stream *streams; @@ -1186,7 +1186,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { if (reader->async_callback) IMFSourceReaderCallback_Release(reader->async_callback); - if (reader->shutdown_on_release) + if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); @@ -1917,6 +1917,8 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; object->refcount = 1; list_init(&object->responses); + if (shutdown_on_release) + object->flags |= SOURCE_READER_SHUTDOWN_ON_RELEASE; object->source = source; IMFMediaSource_AddRef(object->source); InitializeCriticalSection(&object->cs);

1 0

Nikolay Sivov : mfreadwrite: Add stream index validation for Flush().
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: 10c6120910ad74e1f49626456b2bccb56f993bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c6120910ad74e1f4962645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 19:25:07 2020 +0300 mfreadwrite: Add stream index validation for Flush(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 98 +++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 19885ef61e..74aa2dc557 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -131,6 +131,11 @@ struct source_reader_async_command unsigned int stream_index; }; +enum source_reader_flags +{ + SOURCE_READER_FLUSHING = 0x1, +}; + struct source_reader { IMFSourceReader IMFSourceReader_iface; @@ -144,6 +149,7 @@ struct source_reader DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; BOOL shutdown_on_release; + unsigned int flags; enum media_source_state source_state; struct media_stream *streams; DWORD stream_count; @@ -1000,38 +1006,23 @@ static void source_reader_release_responses(struct source_reader *reader, struct static void source_reader_flush_stream(struct source_reader *reader, DWORD stream_index) { - struct media_stream *stream = stream_index == MF_SOURCE_READER_ALL_STREAMS ? NULL : &reader->streams[stream_index]; - unsigned int i; + struct media_stream *stream = &reader->streams[stream_index]; source_reader_release_responses(reader, stream); - if (stream) - { - if (stream->decoder) - IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); - - stream->requests = 0; - } - else - { - for (i = 0; i < reader->stream_count; i++) - { - if (reader->streams[i].decoder) - IMFTransform_ProcessMessage(reader->streams[i].decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); - - reader->streams[i].requests = 0; - } - } + if (stream->decoder) + IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + stream->requests = 0; } static HRESULT source_reader_flush(struct source_reader *reader, unsigned int index) { unsigned int stream_index; - - EnterCriticalSection(&reader->cs); + HRESULT hr = S_OK; if (index == MF_SOURCE_READER_ALL_STREAMS) { - source_reader_flush_stream(reader, index); + for (stream_index = 0; stream_index < reader->stream_count; ++stream_index) + source_reader_flush_stream(reader, stream_index); } else { @@ -1047,12 +1038,13 @@ static HRESULT source_reader_flush(struct source_reader *reader, unsigned int in stream_index = index; } - source_reader_flush_stream(reader, stream_index); + if (stream_index < reader->stream_count) + source_reader_flush_stream(reader, stream_index); + else + hr = MF_E_INVALIDSTREAMNUMBER; } - LeaveCriticalSection(&reader->cs); - - return S_OK; + return hr; } static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) @@ -1125,7 +1117,10 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; case SOURCE_READER_ASYNC_FLUSH: + EnterCriticalSection(&reader->cs); source_reader_flush(reader, command->stream_index); + reader->flags &= ~SOURCE_READER_FLUSHING; + LeaveCriticalSection(&reader->cs); IMFSourceReaderCallback_OnFlush(reader->async_callback, command->stream_index); break; @@ -1692,28 +1687,57 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, return hr; } +static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned int index) +{ + struct source_reader_async_command *command; + unsigned int stream_index; + HRESULT hr; + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + stream_index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + stream_index = reader->first_audio_stream_index; + break; + default: + stream_index = index; + } + + reader->flags |= SOURCE_READER_FLUSHING; + + if (stream_index != MF_SOURCE_READER_ALL_STREAMS && stream_index >= reader->stream_count) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_FLUSH, &command))) + return hr; + + command->stream_index = stream_index; + + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, + &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + + return hr; +} + static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - struct source_reader_async_command *command; HRESULT hr; TRACE("%p, %#x.\n", iface, index); - if (reader->async_callback) - { - if (FAILED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_FLUSH, &command))) - return hr; - - command->stream_index = index; + EnterCriticalSection(&reader->cs); - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, - &command->IUnknown_iface); - IUnknown_Release(&command->IUnknown_iface); - } + if (reader->async_callback) + hr = source_reader_flush_async(reader, index); else hr = source_reader_flush(reader, index); + LeaveCriticalSection(&reader->cs); + return hr; }

1 0

Zebediah Figura : msvfw32: Fix a debug trace.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: b5a19fd1b670dcdcb6ff5c95abe4ad8d7d49fafd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a19fd1b670dcdcb6ff5c95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 17:05:59 2020 -0500 msvfw32: Fix a debug trace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 346dbade43..e3a3300e5a 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -322,7 +322,7 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) info->fccType = ret_type; info->fccHandler = ret_handler; MultiByteToWideChar(CP_ACP, 0, s + 10, -1, info->szDriver, ARRAY_SIZE(info->szDriver)); - TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 8), debugstr_a(s + 10)); + TRACE("Returning codec %s, driver %s.\n", debugstr_an(s, 9), debugstr_a(s + 10)); return TRUE; } }

1 0

Gijs Vermeulen : iphlpapi: Fix unused function warning for get_ipv6_addr_scope_table & find_ipv6_addr_scope.
by Alexandre Julliard April 3, 2020

April 3, 2020

Module: wine Branch: master Commit: a294767e328ff717347563e0bddf46ba719977f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a294767e328ff717347563e0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 3 19:02:03 2020 +0200 iphlpapi: Fix unused function warning for get_ipv6_addr_scope_table & find_ipv6_addr_scope. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 68 ++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5fff824372..52bd6593b0 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2652,6 +2652,7 @@ static int compare_udp6_rows(const void *a, const void *b) return rowA->dwLocalPort - rowB->dwLocalPort; } +#ifdef __linux__ struct ipv6_addr_scope { IN6_ADDR addr; @@ -2662,56 +2663,48 @@ static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) { struct ipv6_addr_scope *table = NULL; unsigned int table_size = 0; + char buf[512], *ptr; + FILE *fp; if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) return NULL; -#ifdef __linux__ + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) { - FILE *fp; - char buf[512], *ptr; + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; - if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) - goto failed; + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; - while ((ptr = fgets( buf, sizeof(buf), fp ))) + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) { - WORD a[8]; - DWORD scope; - struct ipv6_addr_scope *new_table; - struct ipv6_addr_scope *entry; - unsigned int i; - - if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", - &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) - continue; - - table_size++; - if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) - { - fclose(fp); - goto failed; - } - - table = new_table; - entry = &table[table_size - 1]; + fclose(fp); + goto failed; + } - i = 0; - while (i < 8) - { - entry->addr.u.Word[i] = htons(a[i]); - i++; - } + table = new_table; + entry = &table[table_size - 1]; - entry->scope = htons(scope); + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; } - fclose(fp); + entry->scope = htons(scope); } -#else - FIXME( "not implemented\n" ); - goto failed; -#endif + + fclose(fp); *size = table_size; return table; @@ -2745,6 +2738,7 @@ static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_s return -1; } +#endif DWORD build_tcp6_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, DWORD *size )

1 0