July 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : schedsvc: Fix xml buffer leak (Valgrind).
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 78a3870398d4805a9e6e4ad26d22e4067e8a0b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a3870398d4805a9e6e4ad26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 13:12:06 2017 +0300 schedsvc: Fix xml buffer leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8031d06486761b1068a5b4fa8572d08efdfb8f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 8be8c0d..c34b485 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -259,9 +259,10 @@ static int detect_encoding(const void *buffer, DWORD size) static HRESULT read_xml(const WCHAR *name, WCHAR **xml) { + char *src, *buff; HANDLE hfile; DWORD size, attrs; - char *src; + HRESULT hr = S_OK; int cp; attrs = GetFileAttributesW(name); @@ -275,7 +276,7 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return HRESULT_FROM_WIN32(GetLastError()); size = GetFileSize(hfile, NULL); - src = heap_alloc(size + 2); + buff = src = heap_alloc(size + 2); if (!src) { CloseHandle(hfile); @@ -300,9 +301,13 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); *xml = heap_alloc(size * sizeof(WCHAR)); - if (!*xml) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, src, -1, *xml, size); - return S_OK; + if (*xml) + MultiByteToWideChar(cp, 0, src, -1, *xml, size); + else + hr = E_OUTOFMEMORY; + heap_free(buff); + + return hr; } HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml)

1 0

Hans Leidekker : winhttp: Fix a memory leak in insert_header (Valgrind).
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 1128581e5909134e40544bfbc1479ce706774c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1128581e5909134e40544bfbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:19 2017 +0100 winhttp: Fix a memory leak in insert_header (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 08603e565bca3a64cf70b46b2b8cd8412fda37b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e3c0fb4..fc04794 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -368,25 +368,21 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in static BOOL insert_header( request_t *request, header_t *header ) { - DWORD count; + DWORD count = request->num_headers + 1; header_t *hdrs; - count = request->num_headers + 1; - if (count > 1) + if (request->headers) hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); else - hdrs = heap_alloc_zero( sizeof(header_t) * count ); - - if (hdrs) - { - request->headers = hdrs; - request->headers[count - 1].field = strdupW( header->field ); - request->headers[count - 1].value = strdupW( header->value ); - request->headers[count - 1].is_request = header->is_request; - request->num_headers++; - return TRUE; - } - return FALSE; + hdrs = heap_alloc_zero( sizeof(header_t) ); + if (!hdrs) return FALSE; + + request->headers = hdrs; + request->headers[count - 1].field = strdupW( header->field ); + request->headers[count - 1].value = strdupW( header->value ); + request->headers[count - 1].is_request = header->is_request; + request->num_headers = count; + return TRUE; } static BOOL delete_header( request_t *request, DWORD index )

1 0

Nikolay Sivov : dwrite: Fix file object leak.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 39cd8654c22c5bb90c03732b83b1b680a36229d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39cd8654c22c5bb90c03732b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:34 2017 +0300 dwrite: Fix file object leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5d863597d2d9614b98f8623c50c5c376e253003) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9ddce0..6c95f1b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2371,6 +2371,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec } } } + IDWriteFontFile_Release(file); if (!found_font) return DWRITE_E_NOFONT;

1 0

Huw Davies : shell32: Avoid leaking icon handles.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: f5691b8a0e7b1442c943162cc668ef7ec26dd30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5691b8a0e7b1442c943162cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:39 2017 +0100 shell32: Avoid leaking icon handles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 524e316a144c6d605908ddbe39487644065c4364) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c3284a2..7beb479 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -305,10 +305,12 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI * gets small/big icon by number from a file */ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) -{ HICON hiconLarge=0; +{ + HICON hiconLarge=0; HICON hiconSmall=0; HICON hiconLargeShortcut; HICON hiconSmallShortcut; + int ret; PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); @@ -327,6 +329,8 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); hiconLarge = hiconLargeShortcut; hiconSmall = hiconSmallShortcut; } @@ -339,8 +343,12 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) } } - return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags); + ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags ); + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); + return ret; } + /***************************************************************************** * SIC_Initialize [internal] */

1 0

Nikolay Sivov : shell32: Fix string leak.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: ff5a6fc7343db6ab063e4f95967484c656546004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5a6fc7343db6ab063e4f959… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 23 18:29:08 2017 +0300 shell32: Fix string leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f74e1b1fb1d9033385375b93152484734753dc14) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 543e012..1a02c83 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -99,7 +99,6 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); - LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; WCHAR *hwndQCText; @@ -222,7 +221,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { + LPOLESTR strs = NULL; ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break; @@ -235,8 +236,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); - if (!(This->options & ACO_AUTOSUGGEST)) + if (!(This->options & ACO_AUTOSUGGEST)) { + CoTaskMemFree(strs); break; + } } if (This->options & ACO_AUTOSUGGEST) { @@ -246,6 +249,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, filled = TRUE; } + + CoTaskMemFree(strs); } if (This->options & ACO_AUTOSUGGEST) {

1 0

Józef Kucia : dxgi: Fix HMODULE leak in register_d3d10core_layers().
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: f1f6aff7437e3b8f4fb5d050fdd8a704089a8a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f6aff7437e3b8f4fb5d050f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:53 2017 +0200 dxgi: Fix HMODULE leak in register_d3d10core_layers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb7c0b72bb5ad677dffe8faf4e2ac4a5ac13b7a9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/dxgi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 8a39d93..30f8abf 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -111,7 +111,8 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) hr = d3d11core_register_layers(); if (FAILED(hr)) { - ERR("Failed to register d3d11 layers, returning %#x\n", hr); + ERR("Failed to register d3d11 layers, returning %#x.\n", hr); + FreeLibrary(mod); wined3d_mutex_unlock(); return hr; }

1 0

Alex Henrie : ddraw: Validate the "surface" pointer before creating the surface in CreateSurface().
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: d09cb43d6ae46cba5bbdb585f342eb788f81f802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09cb43d6ae46cba5bbdb585f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:15 2017 +0100 ddraw: Validate the "surface" pointer before creating the surface in CreateSurface(). And thereby avoid leaking the surface on the error path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 062f1ae7524ef0049bbb8579bd6d03e6eca0be16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 128 +++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 10bba4e..9091a1d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2802,6 +2802,18 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2817,23 +2829,12 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2864,6 +2865,18 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2879,23 +2892,12 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2927,6 +2929,18 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + DDSD_to_DDSD2(surface_desc, &surface_desc2); if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { @@ -2943,22 +2957,11 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; } @@ -2990,6 +2993,18 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) @@ -3003,22 +3018,11 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; }

1 0

Bruno Jesus : ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: f7cd7975db76470397850523f31e6d3733130326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cd7975db76470397850523f… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 02:38:15 2017 -0300 ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 914e401aa9d5401893c3807d51e3f19fc7a7ab38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6ff524..340551a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4905,68 +4905,54 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - case WS_SIO_FLUSH: - FIXME("SIO_FLUSH: stub.\n"); - break; + case WS_SIO_FLUSH: + FIXME("SIO_FLUSH: stub.\n"); + break; - case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - { - static const GUID connectex_guid = WSAID_CONNECTEX; - static const GUID disconnectex_guid = WSAID_DISCONNECTEX; - static const GUID acceptex_guid = WSAID_ACCEPTEX; - static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; - static const GUID transmitfile_guid = WSAID_TRANSMITFILE; - static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; - static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; - static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; - - if ( IsEqualGUID(&connectex_guid, in_buff) ) - { - *(LPFN_CONNECTEX *)out_buff = WS2_ConnectEx; - break; - } - else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) - { - *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; - break; - } - else if ( IsEqualGUID(&acceptex_guid, in_buff) ) - { - *(LPFN_ACCEPTEX *)out_buff = WS2_AcceptEx; - break; - } - else if ( IsEqualGUID(&getaccepexsockaddrs_guid, in_buff) ) - { - *(LPFN_GETACCEPTEXSOCKADDRS *)out_buff = WS2_GetAcceptExSockaddrs; - break; - } - else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) - { - *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; - break; - } - else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) - { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); - } - else if ( IsEqualGUID(&wsarecvmsg_guid, in_buff) ) - { - *(LPFN_WSARECVMSG *)out_buff = WS2_WSARecvMsg; - break; + case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: + { +#define EXTENSION_FUNCTION(x, y) { x, y, #y }, + static const struct + { + GUID guid; + void *func_ptr; + const char *name; + } guid_funcs[] = { + EXTENSION_FUNCTION(WSAID_CONNECTEX, WS2_ConnectEx) + EXTENSION_FUNCTION(WSAID_DISCONNECTEX, WS2_DisconnectEx) + EXTENSION_FUNCTION(WSAID_ACCEPTEX, WS2_AcceptEx) + EXTENSION_FUNCTION(WSAID_GETACCEPTEXSOCKADDRS, WS2_GetAcceptExSockaddrs) + EXTENSION_FUNCTION(WSAID_TRANSMITFILE, WS2_TransmitFile) + /* EXTENSION_FUNCTION(WSAID_TRANSMITPACKETS, WS2_TransmitPackets) */ + EXTENSION_FUNCTION(WSAID_WSARECVMSG, WS2_WSARecvMsg) + EXTENSION_FUNCTION(WSAID_WSASENDMSG, WSASendMsg) + }; +#undef EXTENSION_FUNCTION + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + { + if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) + { + found = TRUE; + break; + } } - else if ( IsEqualGUID(&wsasendmsg_guid, in_buff) ) + + if (found) { - *(LPFN_WSASENDMSG *)out_buff = WSASendMsg; + TRACE("-> got %s\n", guid_funcs[i].name); + *(void **)out_buff = guid_funcs[i].func_ptr; break; } - else - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); status = WSAEOPNOTSUPP; break; - } - case WS_SIO_KEEPALIVE_VALS: - { + } + case WS_SIO_KEEPALIVE_VALS: + { struct tcp_keepalive *k; int keepalive, keepidle, keepintvl;

1 0

Kimmo Myllyvirta : ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 5d41fd0bb4a16c05eba6b83f5630e2e311f0ec5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d41fd0bb4a16c05eba6b83f5… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Wed Jul 12 03:17:18 2017 +0000 ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32334704e882eb225b4738a34d46c6407af12514) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 340551a..513cbfc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4944,6 +4944,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { TRACE("-> got %s\n", guid_funcs[i].name); *(void **)out_buff = guid_funcs[i].func_ptr; + total = sizeof(void *); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8df3f5c..d7e7fff 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7434,6 +7434,7 @@ static void test_ConnectEx(void) goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { @@ -7441,6 +7442,8 @@ static void test_ConnectEx(void) goto end; } + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError());

1 0

Michael Stefaniuc : Release 2.0.2
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 3b2fae0161aa15155cf76631a965ad0ad136b795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2fae0161aa15155cf76631a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 3 22:59:53 2017 +0200 Release 2.0.2 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 383 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 6 + VERSION | 2 +- configure | 18 +-- 4 files changed, 212 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b2fae0161aa15155cf76…

1 0