August 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : include: Added Animate_IsPlaying define.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: e45ca0bebbbb5910f56a62322f8940d9e4c9bf52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e45ca0bebbbb5910f56a6232… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:02 2019 +0000 include: Added Animate_IsPlaying define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 88b9416..d8ba974 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4608,6 +4608,7 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', #define ACM_OPEN WINELIB_NAME_AW(ACM_OPEN) #define ACM_PLAY (WM_USER+101) #define ACM_STOP (WM_USER+102) +#define ACM_ISPLAYING (WM_USER+104) #define ACN_START 1 #define ACN_STOP 2 @@ -4635,7 +4636,8 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', (BOOL)SNDMSG(hwnd,ACM_OPENA,0,0) #define Animate_Seek(hwnd,frame) \ (BOOL)SNDMSG(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame)) - +#define Animate_IsPlaying(hwnd) \ + (BOOL)SNDMSG(hwnd, ACM_ISPLAYING, 0, 0) /************************************************************************** * IP Address control

1 0

Alistair Leslie-Hughes : include: Added missing MonthCal_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: c388eec1a93098b2efe3e8522a05b52aee445be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c388eec1a93098b2efe3e852… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:03 2019 +0000 include: Added missing MonthCal_* defines. Also defines struct MCGRIDINFO need for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index d8ba974..0f0d83c 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4790,6 +4790,11 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', #define GMR_VISIBLE 0 #define GMR_DAYSTATE 1 +#define MCMV_MONTH 0 +#define MCMV_YEAR 1 +#define MCMV_DECADE 2 +#define MCMV_CENTURY 3 +#define MCMV_MAX MCMV_CENTURY /* Month calendar's structures */ @@ -4826,6 +4831,21 @@ typedef struct tagNMDAYSTATE LPMONTHDAYSTATE prgDayState; } NMDAYSTATE, *LPNMDAYSTATE; +typedef struct tagMCGRIDINFO +{ + UINT cbSize; + DWORD dwPart; + DWORD dwFlags; + INT iCalendar; + INT iRow; + INT iCol; + BOOL bSelected; + SYSTEMTIME stStart; + SYSTEMTIME stEnd; + RECT rc; + WCHAR *pszName; + SIZE_T cchName; +} MCGRIDINFO, *PMCGRIDINFO; /* macros */ @@ -4875,7 +4895,24 @@ typedef struct tagNMDAYSTATE (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) - +#define MonthCal_SetCALID(hmc, calid) \ + SNDMSG(hmc, MCM_SETCALID, (WPARAM)(calid), 0) +#define MonthCal_GetCALID(hmc) \ + (CALID)SNDMSG(hmc, MCM_GETCALID, 0, 0) +#define MonthCal_GetCalendarCount(hmc) \ + (DWORD)SNDMSG(hmc, MCM_GETCALENDARCOUNT, 0, 0) +#define MonthCal_GetCurrentView(hmc) \ + (DWORD)SNDMSG(hmc, MCM_GETCURRENTVIEW, 0, 0) +#define MonthCal_SetCurrentView(hmc, view) \ + (BOOL)SNDMSG(hmc, MCM_SETCURRENTVIEW, 0, (LPARAM)view) +#define MonthCal_SizeRectToMin(hmc, prc) \ + SNDMSG(hmc, MCM_SIZERECTTOMIN, 0, (LPARAM)prc) +#define MonthCal_GetCalendarBorder(hmc) \ + (INT)SNDMSG(hmc, MCM_GETCALENDARBORDER, 0, 0) +#define MonthCal_SetCalendarBorder(hmc, reset, xy) \ + SNDMSG(hmc, MCM_SETCALENDARBORDER, (WPARAM)reset, (LPARAM)xy) +#define MonthCal_GetCalendarGridInfo(hmc, info) \ + (BOOL)SNDMSG(hmc, MCM_GETCALENDARGRIDINFO, 0, (LPARAM)(PMCGRIDINFO)info) /************************************************************************** * Date and time picker control

1 0

Alistair Leslie-Hughes : include: Added missing DateTime_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 10cc93371572a2382fef3051775747433492cf26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10cc93371572a2382fef3051… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:04 2019 +0000 include: Added missing DateTime_* defines. Also defines struct DATETIMEPICKERINFO needed for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 0f0d83c..f21d930 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5054,6 +5054,17 @@ typedef struct tagNMDATETIMEFORMATQUERYW DECL_WINELIB_TYPE_AW(NMDATETIMEFORMATQUERY) DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) +typedef struct tagDATETIMEPICKERINFO +{ + DWORD cbSize; + RECT rcCheck; + DWORD stateCheck; + RECT rcButton; + DWORD stateButton; + HWND hwndEdit; + HWND hwndUD; + HWND hwndDropDown; +} DATETIMEPICKERINFO, *LPDATETIMEPICKERINFO; #define GDT_ERROR -1 @@ -5089,6 +5100,14 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DateTime_GetIdealSize(hdp, sz) \ (BOOL) SNDMSG (hdp, DTM_GETIDEALSIZE, 0, (LPARAM)sz) +#define DateTime_SetMonthCalStyle(hdp, style) \ + SNDMSG(hdp, DTM_SETMCSTYLE, 0, (LPARAM)style) +#define DateTime_GetMonthCalStyle(hdp) \ + SNDMSG(hdp, DTM_GETMCSTYLE, 0, 0) +#define DateTime_GetDateTimePickerInfo(hdp, info) \ + SNDMSG(hdp, DTM_GETDATETIMEPICKERINFO, 0, (LPARAM)info) +#define DateTime_CloseMonthCal(hdp) \ + SNDMSG(hdp, DTM_CLOSEMONTHCAL, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Alistair Leslie-Hughes : include: Added missing ComboBox_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 6bd804a4591335c101003072baa248a81928b240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bd804a4591335c101003072… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 06:21:13 2019 +0000 include: Added missing ComboBox_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index f21d930..77b22b4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5295,6 +5295,10 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; ((INT)SNDMSG((hwnd), CB_GETMINVISIBLE, 0, 0)) #define ComboBox_SetMinVisible(hwnd, count) \ ((BOOL)SNDMSG((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) +#define ComboBox_SetCueBannerText(hwnd, text) \ + ((BOOL)SNDMSG((hwnd), CB_SETCUEBANNER, 0, (LPARAM)(text))) +#define ComboBox_GetCueBannerText(hwnd, text, cnt) \ + ((BOOL)SNDMSG((hwnd), CB_GETCUEBANNER, (WPARAM)(text), (LPARAM)(cnt))) /************************************************************************** * Edit control

1 0

Alistair Leslie-Hughes : include: Added missing Edit_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: b943b8c347493a6d28cec2d6aa8c65098454f332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b943b8c347493a6d28cec2d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 06:21:14 2019 +0000 include: Added missing Edit_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 77b22b4..0ad5614 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5336,6 +5336,14 @@ typedef struct _tagEDITBALLOONTIP (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, (WPARAM)(drawfocused), (LPARAM)(text)) #define Edit_GetCueBannerText(hwnd, buff, buff_size) \ (BOOL)SNDMSG((hwnd), EM_GETCUEBANNER, (WPARAM)(buff), (LPARAM)(buff_size)) +#define Edit_SetHilite(hwnd, start, end) \ + SNDMSG((hwnd), EM_SETHILITE, start, end) +#define Edit_GetHilite(hwnd) \ + ((DWORD)SNDMSG((hwnd), EM_GETHILITE, 0L, 0L)) +#define Edit_ShowBalloonTip(hwnd, tip) \ + (BOOL)SNDMSG((hwnd), EM_SHOWBALLOONTIP, 0, (LPARAM)(tip)) +#define Edit_HideBalloonTip(hwnd) \ + (BOOL)SNDMSG((hwnd), EM_HIDEBALLOONTIP, 0, 0) /************************************************************************** * Listbox control

1 0

Damjan Jovanovic : ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: aa2c84a9db064a16598c4198c435e2e5896dd059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2c84a9db064a16598c4198… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:21 2019 +0200 ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43286 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++--- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3b78f0d..a3c3780 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -878,10 +878,12 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) } } -error: /* Set the length of the returned control headers */ - control->len = (ptr == NULL ? 0 : (char*)ptr - (char*)cmsg_win); - return (ptr != NULL); + control->len = (char*)ptr - (char*)cmsg_win; + return 1; +error: + control->len = 0; + return 0; #else /* IP_PKTINFO */ control->len = 0; return 1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c7f736..03f4e68 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2108,8 +2108,6 @@ static void test_ip_pktinfo(void) /* Setup the server side socket */ rc=bind(s1, (struct sockaddr*)&s1addr, sizeof(s1addr)); ok(rc != SOCKET_ERROR, "bind() failed error: %d\n", WSAGetLastError()); - rc=setsockopt(s1, IPPROTO_IP, IP_PKTINFO, (const char*)&yes, sizeof(yes)); - ok(rc == 0, "failed to set IPPROTO_IP flag IP_PKTINFO!\n"); /* Build "client" side socket */ addrlen = sizeof(s2addr); @@ -2133,6 +2131,21 @@ static void test_ip_pktinfo(void) err=WSAGetLastError(); ok(rc == SOCKET_ERROR && err == WSAEFAULT, "WSARecvMsg() failed error: %d (ret = %d)\n", err, rc); + /* Test that when no control data arrives, a 0-length NULL-valued control buffer should succeed */ + SetLastError(0xdeadbeef); + rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + hdr.Control.buf = NULL; + hdr.Control.len = 0; + rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + ok(rc == 0, "WSARecvMsg() failed error: %d\n", WSAGetLastError()); + hdr.Control.buf = pktbuf; + + /* Now start IP_PKTINFO for future tests */ + rc=setsockopt(s1, IPPROTO_IP, IP_PKTINFO, (const char*)&yes, sizeof(yes)); + ok(rc == 0, "failed to set IPPROTO_IP flag IP_PKTINFO!\n"); + /* * Send a packet from the client to the server and test for specifying * a short control header.

1 0

Damjan Jovanovic : ws2_32: Implement IP_PKTINFO on *BSDs, which only have IP_RECVDSTADDR instead.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 0645e6c959a8b9e32387101fbe5b9f14d5a31807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0645e6c959a8b9e32387101f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:28 2019 +0200 ws2_32: Implement IP_PKTINFO on *BSDs, which only have IP_RECVDSTADDR instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a3c3780..0034787 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -698,8 +698,10 @@ static const int ws_ip_map[][2] = #endif MAP_OPTION( IP_TOS ), MAP_OPTION( IP_TTL ), -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) MAP_OPTION( IP_PKTINFO ), +#elif defined(IP_RECVDSTADDR) + { WS_IP_PKTINFO, IP_RECVDSTADDR }, #endif #ifdef IP_UNICAST_IF MAP_OPTION( IP_UNICAST_IF ), @@ -819,7 +821,7 @@ static const int ws_poll_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -837,11 +839,11 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } -#endif /* IP_PKTINFO */ +#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) { -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) WSACMSGHDR *cmsg_win = (WSACMSGHDR *) control->buf, *ptr; ULONG ctlsize = control->len; struct cmsghdr *cmsg_unix; @@ -855,6 +857,7 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) case IPPROTO_IP: switch(cmsg_unix->cmsg_type) { +#if defined(IP_PKTINFO) case IP_PKTINFO: { /* Convert the Unix IP_PKTINFO structure to the Windows version */ @@ -867,6 +870,19 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) (void*)&data_win, sizeof(data_win)); if (!ptr) goto error; } break; +#elif defined(IP_RECVDSTADDR) + case IP_RECVDSTADDR: + { + struct in_addr *addr_unix = (struct in_addr *) CMSG_DATA(cmsg_unix); + struct WS_in_pktinfo data_win; + + memcpy(&data_win.ipi_addr, &addr_unix->s_addr, 4); /* 4 bytes = 32 address bits */ + data_win.ipi_ifindex = 0; /* FIXME */ + ptr = fill_control_message(WS_IPPROTO_IP, WS_IP_PKTINFO, ptr, &ctlsize, + (void*)&data_win, sizeof(data_win)); + if (!ptr) goto error; + } break; +#endif /* IP_PKTINFO */ default: FIXME("Unhandled IPPROTO_IP message header type %d\n", cmsg_unix->cmsg_type); break; @@ -884,10 +900,10 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) error: control->len = 0; return 0; -#else /* IP_PKTINFO */ +#else /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ control->len = 0; return 1; -#endif /* IP_PKTINFO */ +#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ } #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ @@ -4310,7 +4326,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) case WS_IP_PKTINFO: #endif case WS_IP_TOS: @@ -5998,7 +6014,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) case WS_IP_PKTINFO: #endif case WS_IP_TOS:

1 0

Damjan Jovanovic : ws2_32: Avoid data corruption of WSAPROTOCOL_INFO in ws_protocol_info().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: c722d819eac5987bd0659c3e9b9fe2f4392cb501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c722d819eac5987bd0659c3e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:32 2019 +0200 ws2_32: Avoid data corruption of WSAPROTOCOL_INFO in ws_protocol_info(). WS_EnterSingleProtocol[A/W]() fills WSAPROTOCOL_INFO with zeroes, ovewriting what was already there, so in ws_protocol_info(), populate the address family, socket type and protocol only AFTER calling it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 16 +++++++++++----- dlls/ws2_32/tests/sock.c | 5 ++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0034787..d82172a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2328,6 +2328,9 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; + int address_family; + int socket_type; + int protocol; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); @@ -2338,9 +2341,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i status = wine_server_call( req ); if (!status) { - buffer->iAddressFamily = convert_af_u2w(reply->family); - buffer->iSocketType = convert_socktype_u2w(reply->type); - buffer->iProtocol = convert_proto_u2w(reply->protocol); + address_family = convert_af_u2w(reply->family); + socket_type = convert_socktype_u2w(reply->type); + protocol = convert_proto_u2w(reply->protocol); } } SERVER_END_REQ; @@ -2353,9 +2356,12 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i } if (unicode) - WS_EnterSingleProtocolW( buffer->iProtocol, buffer); + WS_EnterSingleProtocolW( protocol, buffer); else - WS_EnterSingleProtocolA( buffer->iProtocol, (WSAPROTOCOL_INFOA *)buffer); + WS_EnterSingleProtocolA( protocol, (WSAPROTOCOL_INFOA *)buffer); + buffer->iAddressFamily = address_family; + buffer->iSocketType = socket_type; + buffer->iProtocol = protocol; return TRUE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 03f4e68..e97cd38 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1668,9 +1668,8 @@ todo_wine "SO_PROTOCOL_INFO[A/W] comparison failed\n"); /* Remove IF when WSAEnumProtocols support IPV6 data */ - todo_wine_if (prottest[i].family == AF_INET6) - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n",

1 0

Martin Storsjo : msvcrt: Provide the fmaf function on i386.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: dec4c99ae7d62cc2ceb98c4f60ec05ec2072a3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec4c99ae7d62cc2ceb98c4f… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 31 00:08:49 2019 +0300 msvcrt: Provide the fmaf function on i386. This is one of the new -f suffixed C99 math functions that actually are available on all architectures, even on i386. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 32 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 3a5991f..bc281ca 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -242,7 +242,7 @@ @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf +@ cdecl fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9707211..dc887b7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2165,7 +2165,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9b7727e..c56d1a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1831,7 +1831,7 @@ @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf @ cdecl fma(double double double) msvcr120.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf +@ cdecl fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 63744e3..c29539e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -388,22 +388,6 @@ float CDECL MSVCRT_floorf( float x ) } /********************************************************************* - * fmaf (MSVCRT.@) - */ -float CDECL MSVCRT_fmaf( float x, float y, float z ) -{ -#ifdef HAVE_FMAF - float w = fmaf(x, y, z); -#else - float w = x * y + z; -#endif - if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; - return w; -} - -/********************************************************************* * frexpf (MSVCRT.@) */ float CDECL MSVCRT_frexpf( float x, int *exp ) @@ -896,6 +880,22 @@ double CDECL MSVCRT_fma( double x, double y, double z ) } /********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * fabs (MSVCRT.@) */ double CDECL MSVCRT_fabs( double x ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 567f200..e290c14 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2306,7 +2306,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf

1 0

Martin Storsjo : msvcrt: Provide the fmal function using the existing fma implementation.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 1010857a00298969c6ad61ffb231a558180d406e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1010857a00298969c6ad61ff… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 31 00:08:50 2019 +0300 msvcrt: Provide the fmal function using the existing fma implementation. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index bc281ca..9eb3059 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -243,7 +243,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma @ cdecl fmaf(float float float) ucrtbase.fmaf -@ stub fmal +@ cdecl fmal(double double double) ucrtbase.fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf @ cdecl fmaxl(double double) ucrtbase.fmaxl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dc887b7..26d6983 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2166,7 +2166,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma @ cdecl fmaf(float float float) MSVCRT_fmaf -@ stub fmal +@ cdecl fmal(double double double) MSVCRT_fma @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c56d1a9..3ca90c3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1832,7 +1832,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf @ cdecl fma(double double double) msvcr120.fma @ cdecl fmaf(float float float) msvcr120.fmaf -@ stub fmal +@ cdecl fmal(double double double) msvcr120.fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf @ cdecl fmaxl(double double) msvcr120.fmaxl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e290c14..6609683 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2307,7 +2307,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma @ cdecl fmaf(float float float) MSVCRT_fmaf -@ stub fmal +@ cdecl fmal(double double double) MSVCRT_fma @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax

1 0