March 2019 - Wine-devel - list.winehq.org

[PATCH] shell32: In SHRestricted add missing slash
by Fabian Maurer 12 Mar '19

12 Mar '19

Credits for this fix goes to the ReactOS devs See https://jira.reactos.org/browse/CORE-15666 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shpolicy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index 62e6ab5760..a05c7e96fd 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -854,6 +854,7 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) } lstrcpyA(regstr, strRegistryPolicyA); + lstrcatA(regstr, "\\"); lstrcatA(regstr, p->appstr); /* return 0 and don't set the cache if any registry errors occur */ -- 2.21.0

1 0

[PATCH 6/6] d3dx9: Merge the d3dx_effect_SetMatrixTransposePointerArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9a4d1965d7..b12127b35b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix_transpose(&param->members[i], matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *string) { @@ -3537,10 +3502,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); + if (param && count <= param->element_count) + { + unsigned int i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix_transpose(&param->members[i], matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Merge the d3dx_effect_SetMatrixTransposeArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b302e0ac69..9a4d1965d7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix_transpose(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3495,10 +3457,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3 const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix_transpose(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Merge the d3dx_effect_SetMatrixTranspose() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f8ca61452e..b302e0ac69 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,39 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - set_matrix_transpose(param, matrix); - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3454,10 +3421,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + set_matrix_transpose(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Merge the d3dx_effect_GetMatrixTransposePointerArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 70 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ccae8ad35..f8ca61452e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1632,44 +1632,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], matrix[i], TRUE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *string) { @@ -3601,10 +3563,40 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], matrix[i], TRUE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) -- 2.20.1

2 1

[PATCH 2/6] d3dx9: Merge the d3dx_effect_GetMatrixTransposeArray() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7e74eb026e..5ccae8ad35 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1597,45 +1597,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], &matrix[i], TRUE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3589,10 +3550,41 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3 D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], &matrix[i], TRUE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetMatrixTranspose() helper
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 65 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e5dfbd71d..7e74eb026e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1559,41 +1559,6 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_transpose(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (matrix && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - get_matrix(param, matrix, FALSE); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix, TRUE); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) { @@ -3576,10 +3541,38 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHAN D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); - return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); + if (matrix && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + get_matrix(param, matrix, FALSE); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix, TRUE); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH] quartz: : Remove an unused return variable (coccinelle)
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/memallocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 477c63ae05..4e366f3146 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -196,7 +196,6 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { BaseMemAllocator *This = impl_from_IMemAllocator(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, pProps); @@ -206,7 +205,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO } LeaveCriticalSection(This->pCritSect); - return hr; + return S_OK; } static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) -- 2.20.1

1 0

[PATCH] shell32: Remove unused return variables (coccinelle)
by Michael Stefaniuc 12 Mar '19

12 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 36b0c5d7bc..bd9b8725bb 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -923,13 +923,12 @@ static HRESULT WINAPI IAutoComplete2_fnEnable( BOOL fEnable) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); This->enabled = fEnable; - return hr; + return S_OK; } /****************************************************************************** @@ -1063,13 +1062,12 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( DWORD *pdwFlag) { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - HRESULT hr = S_OK; TRACE("(%p) -> (%p)\n", This, pdwFlag); *pdwFlag = This->options; - return hr; + return S_OK; } /************************************************************************** -- 2.20.1

1 0

[PATCH] ws2_32: Handle EISCONN from sendmsg
by Rob Hughes (BLOOMBERG/ LONDON) 12 Mar '19

12 Mar '19

When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rhughes37(a)bloomberg.net> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338ee8..c75a7047ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,11 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; } -- 2.19.1

2 1