September 2019 - Wine-commits

Zebediah Figura : wineqtdecoder: Use strmbase_source_init().
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 2732d74d99d53cbdf60adf0d5e89680dff1f5b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2732d74d99d53cbdf60adf0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:12 2019 -0500 wineqtdecoder: Use strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 48 ++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e7597e1..3931452 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -790,10 +790,8 @@ static void free_source_pin(QTOutPin *pin) LeaveCriticalSection(pin->pin.pin.pCritSec); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } /* @@ -1446,38 +1444,28 @@ static const OutputQueueFuncTable output_OutputQueueFuncTable = { OutputQueueImpl_ThreadProc }; -static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video) +static HRESULT QT_AddPin(QTSplitter *filter, const PIN_INFO *pin_info, + const AM_MEDIA_TYPE *mt, BOOL video) { - HRESULT hr; - IPin **target; + QTOutPin *pin; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return E_OUTOFMEMORY; if (video) - target = (IPin**)&This->pVideo_Pin; + filter->pVideo_Pin = pin; else - target = (IPin**)&This->pAudio_Pin; - - if (*target != NULL) - { - FIXME("We already have a %s pin\n",(video)?"video":"audio"); - return E_FAIL; - } + filter->pAudio_Pin = pin; - hr = BaseOutputPin_Construct(&QT_OutputPin_Vtbl, sizeof(QTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)target); - if (SUCCEEDED(hr)) - { - QTOutPin *pin = (QTOutPin*)*target; - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; - pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; - - BaseFilterImpl_IncrementPinVersion(&This->filter); + strmbase_source_init(&pin->pin, &QT_OutputPin_Vtbl, piOutput, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + BaseFilterImpl_IncrementPinVersion(&filter->filter); - hr = OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); - } - else - ERR("Failed with error %x\n", hr); - return hr; + return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, + THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); } static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface)

1 0

Zebediah Figura : strmbase: Get rid of the no longer used pin constructor and destructor helpers.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 0a105660613211c8d3ab7026572078b333e9e91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a105660613211c8d3ab7026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:13 2019 -0500 strmbase: Get rid of the no longer used pin constructor and destructor helpers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 67 ------------------------------------------------- include/wine/strmbase.h | 6 ----- 2 files changed, 73 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4478855..1386f6b 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -731,31 +731,6 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) -{ - BaseOutputPin * pPinImpl; - - *ppPin = NULL; - - if (pPinInfo->dir != PINDIR_OUTPUT) - { - ERR("Pin direction(%x) != PINDIR_OUTPUT\n", pPinInfo->dir); - return E_INVALIDARG; - } - - assert(outputpin_size >= sizeof(BaseOutputPin)); - assert(vtbl->pfnAttemptConnection); - - pPinImpl = CoTaskMemAlloc(outputpin_size); - - if (!pPinImpl) - return E_OUTOFMEMORY; - - strmbase_source_init(pPinImpl, OutputPin_Vtbl, pPinInfo, vtbl, pCritSec); - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; -} - void strmbase_source_cleanup(BaseOutputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); @@ -764,13 +739,6 @@ void strmbase_source_cleanup(BaseOutputPin *pin) pin->pAllocator = NULL; } -HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) -{ - strmbase_source_cleanup(This); - CoTaskMemFree(This); - return S_OK; -} - /*** Input Pin implementation ***/ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) @@ -1090,34 +1058,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; } -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* vtbl, - LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, IPin ** ppPin) -{ - BaseInputPin * pPinImpl; - - *ppPin = NULL; - - assert(inputpin_size >= sizeof(BaseInputPin)); - assert(vtbl->base.pfnCheckMediaType); - - if (pPinInfo->dir != PINDIR_INPUT) - { - ERR("Pin direction(%x) != PINDIR_INPUT\n", pPinInfo->dir); - return E_INVALIDARG; - } - - pPinImpl = CoTaskMemAlloc(inputpin_size); - - if (!pPinImpl) - return E_OUTOFMEMORY; - - strmbase_sink_init(pPinImpl, InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator); - - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; -} - void strmbase_sink_cleanup(BaseInputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); @@ -1126,10 +1066,3 @@ void strmbase_sink_cleanup(BaseInputPin *pin) pin->pAllocator = NULL; pin->pin.IPin_iface.lpVtbl = NULL; } - -HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) -{ - strmbase_sink_cleanup(This); - CoTaskMemFree(This); - return S_OK; -} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d23231e..6bd00e1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -132,8 +132,6 @@ HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocato HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); -HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); -HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); void strmbase_source_cleanup(BaseOutputPin *pin); void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs); @@ -148,10 +146,6 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* pBaseInputFuncsTable, - LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); -HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This); void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, IMemAllocator *allocator); void strmbase_sink_cleanup(BaseInputPin *pin);

1 0

Zebediah Figura : qcap/avimux: Use strmbase pin methods directly.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 85e559fadb4b5c67438bb0979427f8b48df75ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e559fadb4b5c67438bb097… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:14 2019 -0500 qcap/avimux: Use strmbase pin methods directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 260 ++++++----------------------------------------------- 1 file changed, 26 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85e559fadb4b5c67438b…

1 0

Zebediah Figura : strmbase: Store the filter as a strmbase_filter pointer in the BasePin structure.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 28a511554c7b81cfc766d7f91edae0785b69e41f URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a511554c7b81cfc766d7f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:15 2019 -0500 strmbase: Store the filter as a strmbase_filter pointer in the BasePin structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 22 ++++---- dlls/qcap/avimux.c | 115 ++++++++++++++-------------------------- dlls/qcap/smartteefilter.c | 44 +++++++-------- dlls/qcap/vfwcapture.c | 8 +-- dlls/quartz/avisplit.c | 12 ++--- dlls/quartz/filesource.c | 9 +--- dlls/quartz/mpegsplit.c | 12 ++--- dlls/quartz/parser.c | 32 +++++------ dlls/quartz/parser.h | 3 +- dlls/quartz/pin.c | 43 ++++++--------- dlls/quartz/pin.h | 4 +- dlls/quartz/waveparser.c | 15 ++---- dlls/strmbase/pin.c | 82 +++++++++++++--------------- dlls/strmbase/renderer.c | 10 +--- dlls/strmbase/transform.c | 18 ++----- dlls/winegstreamer/gstdemux.c | 59 +++++++++++---------- dlls/wineqtdecoder/qtsplitter.c | 73 +++++++++---------------- include/wine/strmbase.h | 29 +++++----- 18 files changed, 232 insertions(+), 358 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28a511554c7b81cfc766…

1 0

Zebediah Figura : strmbase: Get rid of the "pCritSec" member of BasePin.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: aa88c5d65b5a2606301ed3c61e83636f25ee2e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa88c5d65b5a2606301ed3c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 5 19:02:16 2019 -0500 strmbase: Get rid of the "pCritSec" member of BasePin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/parser.c | 20 ++++++++--------- dlls/quartz/pin.c | 49 ++++++++++++++++++++-------------------- dlls/strmbase/pin.c | 50 ++++++++++++++++++++--------------------- dlls/strmbase/renderer.c | 8 +++---- dlls/winegstreamer/gstdemux.c | 14 +++++------- dlls/wineqtdecoder/qtsplitter.c | 18 +++++++-------- include/wine/strmbase.h | 1 - 8 files changed, 78 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa88c5d65b5a2606301e…

1 0

Alistair Leslie-Hughes : httpapi/tests: Assign to correct type (Coverity).
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 5c17a0b07c471fada324b414b5a0b963acb14392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c17a0b07c471fada324b414… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 6 02:16:32 2019 +0000 httpapi/tests: Assign to correct type (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ff5884d..5da7101 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -74,7 +74,7 @@ static const char simple_req[] = "User-Agent: WINE\r\n" "\r\n"; -static int create_client_socket(void) +static SOCKET create_client_socket(void) { struct sockaddr_in sockaddr = { @@ -82,7 +82,7 @@ static int create_client_socket(void) .sin_port = htons(50000), .sin_addr.S_un.S_addr = inet_addr("127.0.0.1"), }; - int s = socket(AF_INET, SOCK_STREAM, 0), ret; + SOCKET s = socket(AF_INET, SOCK_STREAM, 0), ret; ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); ok(!ret, "Failed to connect socket, error %u.\n", GetLastError()); return s;

1 0

Alistair Leslie-Hughes : http.sys: Allocate enough memory including the NULL. (Coverity).
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 446bc4689f7bf37c6085c8102e2606cc631cecef URL: https://source.winehq.org/git/wine.git/?a=commit;h=446bc4689f7bf37c6085c810… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 6 02:16:33 2019 +0000 http.sys: Allocate enough memory including the NULL. (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b2400a2..b5d5a21 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1064,7 +1064,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (!(addr.sin_port = htons(strtol(strchr(params->url + 7, ':') + 1, &endptr, 10))) || *endptr != '/') return STATUS_INVALID_PARAMETER; - if (!(url = heap_alloc(strlen(params->url)))) + if (!(url = heap_alloc(strlen(params->url)+1))) return STATUS_NO_MEMORY; strcpy(url, params->url);

1 0

Dmitry Timoshkov : localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 64a5720d25a8fa10d2d73bc2e4ce152cbc50608d URL: https://source.winehq.org/git/wine.git/?a=commit;h=64a5720d25a8fa10d2d73bc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 12:00:59 2019 +0800 localspl: AddMonitor should create registry entry for a monitor before initializing it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd1981..29c5433 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,14 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; @@ -1537,7 +1529,20 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + { + RegDeleteKeyW(hroot, mi2w->pName); + res = FALSE; + } + else + { + monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + } } + RegCloseKey(hentry); }

1 0

Rémi Bernon : winex11.drv: Only call XWarpPointer if we can get exclusive pointer grab.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 74efb3e872aebf57a42d62b52e149ae26f320c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74efb3e872aebf57a42d62b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:03 2019 +0200 winex11.drv: Only call XWarpPointer if we can get exclusive pointer grab. XWarpPointer will always succeed, regardless of grabs, so if the pointer is already grabbed, by some other application, we should not ask to warp it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fff6fc7..8d1dc5e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1467,8 +1467,21 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) return FALSE; } + if (!clipping_cursor && + XGrabPointer( data->display, root_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ) != GrabSuccess) + { + WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y ); + return FALSE; + } + XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, pos.x, pos.y ); data->warp_serial = NextRequest( data->display ); + + if (!clipping_cursor) + XUngrabPointer( data->display, CurrentTime ); + XNoOp( data->display ); XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ TRACE( "warped to %d,%d serial %lu\n", x, y, data->warp_serial );

1 0

Alex Henrie : iphlpapi: Implement ParseNetworkString for IPv4 addresses and services.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: faf354cd45e23f6cb8f82dee3fdf340647299b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf354cd45e23f6cb8f82dee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:15 2019 -0600 iphlpapi: Implement ParseNetworkString for IPv4 addresses and services. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45560 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index abc7152..c5857f2 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -243,7 +243,7 @@ @ stdcall NotifyUnicastIpAddressChange(long ptr ptr long ptr) #@ stub NTPTimeToNTFileTime #@ stub NTTimeToNTPTime -#@ stub ParseNetworkString +@ stdcall ParseNetworkString(wstr long ptr ptr ptr) @ stub _PfAddFiltersToInterface(a)24 @ stub _PfAddGlobalFilterToInterface(a)8 @ stdcall _PfBindInterfaceToIPAddress(a)12(long long ptr) PfBindInterfaceToIPAddress diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f1aa0d1..1f823b4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -46,6 +46,7 @@ #include "winsock2.h" #include "winternl.h" #include "ws2ipdef.h" +#include "windns.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" @@ -54,6 +55,7 @@ #include "ifdef.h" #include "netioapi.h" #include "tcpestats.h" +#include "ip2string.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3333,3 +3335,62 @@ DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index, return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * ParseNetworkString (IPHLPAPI.@) + */ +DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, + NET_ADDRESS_INFO *info, USHORT *port, BYTE *prefix_len) +{ + IN_ADDR temp_addr4; + USHORT temp_port = 0; + NTSTATUS status; + + TRACE("(%s, %d, %p, %p, %p)\n", debugstr_w(str), type, info, port, prefix_len); + + if (!str) + return ERROR_INVALID_PARAMETER; + + if (type & NET_STRING_IPV4_ADDRESS) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && !temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = 0; + } + if (port) *port = 0; + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + if (type & NET_STRING_IPV4_SERVICE) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = temp_port; + } + if (port) *port = ntohs(temp_port); + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + + if (info) info->Format = NET_ADDRESS_FORMAT_UNSPECIFIED; + + if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE)) + { + FIXME("Unimplemented type 0x%x\n", type); + return ERROR_NOT_SUPPORTED; + } + + return ERROR_INVALID_PARAMETER; +}

1 0