April 2015 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Implement color keying in arbfp_blit.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 2d56694445a58ee94d8ac46eac569bec3f53f161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56694445a58ee94d8ac46ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:53 2015 +0200 wined3d: Implement color keying in arbfp_blit. --- dlls/wined3d/arb_program_shader.c | 68 +++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 51 +++++++++++++++++++---------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++-- 4 files changed, 99 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d56694445a58ee94d8ac…

1 0

Stefan Dösinger : wined3d: Implement color keying in the glsl fragment pipeline.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 5d51c97d07b57307912267996586d05528f652a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d51c97d07b57307912267996… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:54 2015 +0200 wined3d: Implement color keying in the glsl fragment pipeline. --- dlls/ddraw/tests/ddraw1.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw2.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw4.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw7.c | 22 ++++++---------------- dlls/wined3d/arb_program_shader.c | 25 +++++++++---------------- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 +++ dlls/wined3d/texture.c | 18 ++++++++++++------ dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 10 +++++++--- 12 files changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d51c97d07b5730791226…

1 0

Stefan Dösinger : wined3d: Match blitter and fragment processing color keying capabilities.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: f4b6874491df5b4d89012231cd9e7813c7d0e105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b6874491df5b4d89012231c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:15 2015 +0200 wined3d: Match blitter and fragment processing color keying capabilities. This is necessary if e.g. the nvts or ffp fragment processing pipeline is selected for debugging purposes on a GPU that otherwise supports the ARB program blitter. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/surface.c | 22 +++++++++++++++------- dlls/wined3d/utils.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d7d975..e7c5ea2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7716,7 +7716,8 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -7727,8 +7728,14 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (!d3d_info->shader_color_key) + { + /* The conversion modifies the alpha channel so the color key might no longer match. */ + TRACE("Color keying not supported with converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: break; default: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1539476..01048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4378,7 +4378,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, + WINED3D_BLIT_OP_COLOR_BLIT, NULL, WINED3D_POOL_DEFAULT, 0, check_format, NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5bcbfd4..5094af3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1050,7 +1050,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const struct wined3d_device *device = resource->device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_DEPTH_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); if (!blitter) { @@ -3445,7 +3445,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st struct wined3d_device *device = s->resource.device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format); if (!blitter) { @@ -3463,6 +3463,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain *src_swapchain, *dst_swapchain; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", @@ -3591,7 +3592,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (!device->blitter->blit_supported(gl_info, d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { @@ -4318,14 +4319,20 @@ static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) } } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (d3d_info->shader_color_key) + { + TRACE("Color keying requires converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) return FALSE; @@ -4447,7 +4454,8 @@ static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } -static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -5367,7 +5375,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } - if (arbfp_blit.blit_supported(&device->adapter->gl_info, blit_op, + if (arbfp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d9f88a..2f21b29 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4194,7 +4194,8 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -4208,7 +4209,7 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { - if (blitters[i]->blit_supported(gl_info, blit_op, + if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op, src_rect, src_usage, src_pool, src_format, dst_rect, dst_usage, dst_pool, dst_format)) return blitters[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 155b171..7747c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1340,7 +1340,8 @@ struct blit_shader HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key); void (*unset_shader)(const struct wined3d_gl_info *gl_info); - BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, + BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_surface *dst_surface, @@ -1353,7 +1354,8 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) DECLSPEC_HIDDEN;

1 0

Mark Harmstone : comctl32: Fix drawing of buddy background for updown controls.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: b0a9fb6b0d52d2251b91b3e1d676bb65f485809b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9fb6b0d52d2251b91b3e1d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 31 23:39:07 2015 +0100 comctl32: Fix drawing of buddy background for updown controls. --- dlls/comctl32/updown.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 28dd5e3..d188408 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -366,12 +366,18 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) */ static BOOL UPDOWN_DrawBuddyBackground (const UPDOWN_INFO *infoPtr, HDC hdc) { - RECT br; + RECT br, r; HTHEME buddyTheme = GetWindowTheme (infoPtr->Buddy); if (!buddyTheme) return FALSE; - GetClientRect (infoPtr->Buddy, &br); - MapWindowPoints (infoPtr->Buddy, infoPtr->Self, (POINT*)&br, 2); + GetWindowRect (infoPtr->Buddy, &br); + MapWindowPoints (NULL, infoPtr->Self, (POINT*)&br, 2); + GetClientRect (infoPtr->Self, &r); + + if (infoPtr->dwStyle & UDS_ALIGNLEFT) + br.left = r.left; + else if (infoPtr->dwStyle & UDS_ALIGNRIGHT) + br.right = r.right; /* FIXME: take disabled etc. into account */ DrawThemeBackground (buddyTheme, hdc, 0, 0, &br, NULL); return TRUE;

1 0

Mark Harmstone : uxtheme: Fix colour errors in UXTHEME_StretchBlt.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: c6b4b4b93e6c6bccda06aacd557537a51bec836e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b4b4b93e6c6bccda06aacd5… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 07:43:36 2015 +0100 uxtheme: Fix colour errors in UXTHEME_StretchBlt. --- dlls/uxtheme/draw.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 19df3c8..8a9397d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -293,22 +293,33 @@ static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginD 255, /* SourceConstantAlpha */ AC_SRC_ALPHA /* AlphaFormat */ }; + + BOOL ret = TRUE; + int old_stretch_mode; + POINT old_brush_org; + + old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); + SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); + if (transparent == ALPHABLEND_BINARY) { /* Ensure we don't pass any negative values to TransparentBlt */ - return TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), transcolor); - } - if ((transparent == ALPHABLEND_NONE) || + } else if ((transparent == ALPHABLEND_NONE) || !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunc)) { - return StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); } - return TRUE; + + SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); + SetStretchBltMode(hdcDst, old_stretch_mode); + + return ret; } /***********************************************************************

1 0

Andrew Eikum : shell32: Allocate returned array in IKnownFolderManager:: GetFolderIds.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: e4868d563574853d40ca04adfc28db1c19ca9dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4868d563574853d40ca04adf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:33 2015 -0500 shell32: Allocate returned array in IKnownFolderManager::GetFolderIds. --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d853274..731ea2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4178,7 +4178,8 @@ static HRESULT WINAPI foldermanager_GetFolderIds( TRACE("%p, %p\n", ppKFId, pCount); - *ppKFId = fm->ids; + *ppKFId = CoTaskMemAlloc(fm->num_ids * sizeof(KNOWNFOLDERID)); + memcpy(*ppKFId, fm->ids, fm->num_ids * sizeof(KNOWNFOLDERID)); *pCount = fm->num_ids; return S_OK; }

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: f58c11767a39b2ace8c6bc9422d1e9e9f9a9886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c11767a39b2ace8c6bc942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:37 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 451 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 50 ++--- 2 files changed, 451 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f58c11767a39b2ace8c6b…

1 0

Bruno Jesus : secur32: Don' t try to set an empty target name in schan_InitializeSecurityContextW.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: 0fbbb1297d4fc14e71ff76379ba0b80382e97edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbbb1297d4fc14e71ff76379… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 23:54:36 2015 -0300 secur32: Don't try to set an empty target name in schan_InitializeSecurityContextW. Based on original patch by Nikos Mavrogiannopoulos. --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 12d4c8d..c6cc4d1 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -825,7 +825,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (pszTargetName) + if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); char *target = HeapAlloc( GetProcessHeap(), 0, len );

1 0

Bruno Jesus : ws2_32/tests: Add tests about retrieving the local address of an interface bound socket.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: dcfde9a9df991940cb3bbecabef87cc7cd78732a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfde9a9df991940cb3bbecab… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 9 00:09:15 2015 -0300 ws2_32/tests: Add tests about retrieving the local address of an interface bound socket. --- dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5f25471..8690579 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4165,6 +4165,7 @@ static void test_getsockname(void) int sa_get_len = sa_set_len; static const unsigned char null_padding[] = {0,0,0,0,0,0,0,0}; int ret; + struct hostent *h; if(WSAStartup(MAKEWORD(2,0), &wsa)){ trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); @@ -4212,6 +4213,39 @@ static void test_getsockname(void) "getsockname did not zero the sockaddr_in structure\n"); closesocket(sock); + + h = gethostbyname(""); + if (h && h->h_length == 4) /* this test is only meaningful in IPv4 */ + { + int i; + for (i = 0; h->h_addr_list[i]; i++) + { + char ipstr[32]; + struct in_addr ip; + ip.s_addr = *(ULONG *) h->h_addr_list[i]; + + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket failed with %d\n", GetLastError()); + + memset(&sa_set, 0, sizeof(sa_set)); + sa_set.sin_family = AF_INET; + sa_set.sin_addr.s_addr = ip.s_addr; + /* The same address we bind must be the same address we get */ + ret = bind(sock, (struct sockaddr*)&sa_set, sizeof(sa_set)); + ok(ret == 0, "bind failed with %d\n", GetLastError()); + sa_get_len = sizeof(sa_get); + ret = getsockname(sock, (struct sockaddr*)&sa_get, &sa_get_len); + ok(ret == 0, "getsockname failed with %d\n", GetLastError()); + strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); + trace("testing bind on interface %s\n", ipstr); +todo_wine + ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, + "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr)); + + closesocket(sock); + } + } + WSACleanup(); }

1 0

Bruno Jesus : ws2_32: Restore the local socket address that was bound with filter for getsockname ().
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: 61ed82fc8685af0cf55de4b547a38e3e5893dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed82fc8685af0cf55de4b54… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 9 00:09:29 2015 -0300 ws2_32: Restore the local socket address that was bound with filter for getsockname(). --- dlls/ws2_32/socket.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6903909..bfcc755 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3218,6 +3218,61 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) return res; } +/* When binding to an UDP address with filter support the getsockname call on the socket + * will always return 0.0.0.0 instead of the filtered interface address. This function + * checks if the socket is interface-bound on UDP and return the correct address. + * This is required because applications often do a bind() with port zero followed by a + * getsockname() to retrieve the port and address acquired. + */ +static void interface_bind_check(int fd, struct sockaddr_in *addr) +{ +#if !defined(IP_BOUND_IF) && !defined(LINUX_BOUND_IF) + return; +#else + int ifindex; + socklen_t len = sizeof(ifindex); + + /* Check for IPv4, address 0.0.0.0 and UDP socket */ + if (addr->sin_family != AF_INET || addr->sin_addr.s_addr != 0) + return; + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &ifindex, &len) || ifindex != SOCK_DGRAM) + return; + + ifindex = -1; + len = sizeof(ifindex); +#if defined(IP_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); +#elif defined(LINUX_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); + if (ifindex > 0) ifindex = ntohl(ifindex); +#endif + if (ifindex > 0) + { + PIP_ADAPTER_INFO adapters, adapter; + DWORD adap_size; + + if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) + return; + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) + { + /* Search the IPv4 adapter list for the appropriate bound interface */ + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + in_addr_t adapter_addr; + if (adapter->Index != ifindex) continue; + + adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); + addr->sin_addr.s_addr = adapter_addr; + TRACE("reporting interface address from adapter %d\n", ifindex); + break; + } + } + HeapFree(GetProcessHeap(), 0, adapters); + } +#endif +} + /*********************************************************************** * getsockname (WS2_32.6) */ @@ -3255,8 +3310,17 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) } else { - res = 0; - TRACE("=> %s\n", debugstr_sockaddr(name)); + interface_bind_check(fd, (struct sockaddr_in*) &uaddr); + if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) + { + /* The buffer was too small */ + SetLastError(WSAEFAULT); + } + else + { + res = 0; + TRACE("=> %s\n", debugstr_sockaddr(name)); + } } release_sock_fd( s, fd ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8690579..8b69cf6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4238,7 +4238,6 @@ static void test_getsockname(void) ok(ret == 0, "getsockname failed with %d\n", GetLastError()); strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); trace("testing bind on interface %s\n", ipstr); -todo_wine ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr));

1 0