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

Mark Harmstone : uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: a1c3b30f491f978206e5caa2f03f636e9c2d85d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c3b30f491f978206e5caa2f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 9 23:45:51 2015 +0100 uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail. --- dlls/uxtheme/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 146649e..9dffbdd 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -210,7 +210,7 @@ HRESULT WINAPI GetThemeString(HTHEME hTheme, int iPartId, int iStateId, if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

1 0

Marcus Meissner : wininet: Avoid memory leak in error exit (Coverity).
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c1c06a9093d98c22256c649934dee0bc9c8e62bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c06a9093d98c22256c64993… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 9 18:59:57 2015 +0200 wininet: Avoid memory leak in error exit (Coverity). --- dlls/wininet/cookie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index af9dcdf..4784b33 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -341,8 +341,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) UnlockUrlCacheEntryStream(cookie, 0); cookie_container = get_cookie_container(domain, path, TRUE); - if(!cookie_container) + if(!cookie_container) { + heap_free(str); return FALSE; + } GetSystemTimeAsFileTime(&time); for(pbeg=str; pbeg && *pbeg; name=data=NULL) {

1 0

Stefan Dösinger : wined3d: Implement color keying in arbfp_blit.
by Alexandre Julliard April 10, 2015

April 10, 2015

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

Mark Harmstone : uxtheme: Fix colour errors in UXTHEME_StretchBlt.
by Alexandre Julliard April 9, 2015

April 9, 2015

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

Mark Harmstone : comctl32: Fix drawing of buddy background for updown controls.
by Alexandre Julliard April 9, 2015

April 9, 2015

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

Jianqiu Zhang : include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 047698bf7d0d7e38dc4cf971745ef93c4b786de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047698bf7d0d7e38dc4cf9717… Author: Jianqiu Zhang <zhangjianqiu13(a)gmail.com> Date: Mon Mar 30 11:18:17 2015 +0800 include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION. --- include/winioctl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winioctl.h b/include/winioctl.h index fb78821..269f771 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -439,6 +439,20 @@ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { WCHAR FileSystemName[1]; } FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; +/*FileFsControlInformation = 6 */ +/* + unknown + */ + +/*FileFsFullSizeInformation = 7 */ +typedef struct _FILE_FS_FULL_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; + typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { LARGE_INTEGER Timeout; ULONG NameLength;

1 0

Andrew Eikum : shell32: Allocate returned array in IKnownFolderManager:: GetFolderIds.
by Alexandre Julliard April 9, 2015

April 9, 2015

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

Bruno Jesus : secur32: Don' t try to set an empty target name in schan_InitializeSecurityContextW.
by Alexandre Julliard April 9, 2015

April 9, 2015

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

Mark Harmstone : include: Add SM_CXPADDEDBORDER to winuser.h.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: cb8545ab98fae56e89b88be3dfdc7c717297d8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8545ab98fae56e89b88be3d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 23:41:52 2015 +0100 include: Add SM_CXPADDEDBORDER to winuser.h. --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 3d9b937..e9804a9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -982,6 +982,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define SM_SERVERR2 89 #define SM_CMETRICS 90 #define SM_MOUSEHORIZONTALWHEELPRESENT 91 +#define SM_CXPADDEDBORDER 92 #define SM_REMOTESESSION 0x1000 #define SM_SHUTTINGDOWN 0x2000

1 0

Bruno Jesus : ws2_32: Restore the local socket address that was bound with filter for getsockname ().
by Alexandre Julliard April 9, 2015

April 9, 2015

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