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

[PATCH 3/3] ws2_32: avoid data corruption of WSAPROTOCOL_INFO in ws_protocol_info()
by Damjan Jovanovic 01 Aug '19

01 Aug '19

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. This bug was found through Python's test suite, in particular its test.test_socket.TestSocketSharing unit test. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/socket.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

2 1

[PATCH 2/3] ws2_32: implement IP_PKTINFO on *BSDs, which only have IP_RECVDSTADDR instead.
by Damjan Jovanovic 01 Aug '19

01 Aug '19

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/socket.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)

2 1

[PATCH 1/3] ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive
by Damjan Jovanovic 01 Aug '19

01 Aug '19

Wine's WSARecvFrom() cannot distinguish between: 1. truncation during conversion of cmsghdrs from *nix to Windows, which is an error. 2. a NULL WSAMSG.Control.buf passed in by the application, which is valid when there is no control data to convert. Wine always treats it as case (1) and reports an error. Closes bug 43286. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/socket.c | 8 +++++--- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-)

2 1

[PATCH 13/13] include : Added missing Edit_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 8b4f0ecd70..50d2c9c9b7 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 -- 2.17.1

2 1

[PATCH 12/13] include : Added missing ComboBox_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index ff11258fd2..8b4f0ecd70 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 -- 2.17.1

2 1

[PATCH 11/13] include : Added missing DateTime_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Also defines struct DATETIMEPICKERINFO needed for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 07f4612c3e..ff11258fd2 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) -- 2.17.1

1 0

[PATCH 10/13] include : Added missing MonthCal_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Also defines struct MCGRIDINFO need for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 38aaeef1c9..07f4612c3e 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 -- 2.17.1

1 0

[PATCH 09/13] include : Added Animate_IsPlaying define.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index d9a50242a3..38aaeef1c9 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 -- 2.17.1

1 0

[PATCH 08/13] include : Added missing ListView_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 1557af2abe..d9a50242a3 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3333,6 +3333,9 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_GETTOOLTIPS (LVM_FIRST+78) #define LVM_GETUNICODEFORMAT (CCM_GETUNICODEFORMAT) #define LVM_SETUNICODEFORMAT (CCM_SETUNICODEFORMAT) +#define LVM_GETGROUPSTATE (LVM_FIRST + 92) +#define LVM_GETFOCUSEDGROUP (LVM_FIRST + 93) +#define LVM_GETGROUPRECT (LVM_FIRST + 98) #define LVM_SETSELECTEDCOLUMN (LVM_FIRST + 140) #define LVM_SETTILEWIDTH (LVM_FIRST + 141) #define LVM_SETVIEW (LVM_FIRST + 142) @@ -3342,6 +3345,8 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_GETGROUPINFO (LVM_FIRST + 149) #define LVM_REMOVEGROUP (LVM_FIRST + 150) #define LVM_MOVEGROUP (LVM_FIRST + 151) +#define LVM_GETGROUPCOUNT (LVM_FIRST + 152) +#define LVM_GETGROUPINFOBYINDEX (LVM_FIRST + 153) #define LVM_MOVEITEMTOGROUP (LVM_FIRST + 154) #define LVM_SETGROUPMETRICS (LVM_FIRST + 155) #define LVM_GETGROUPMETRICS (LVM_FIRST + 156) @@ -4157,6 +4162,25 @@ typedef struct NMLVSCROLL (BOOL)SNDMSG((hwnd), LVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define ListView_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), LVM_GETUNICODEFORMAT, 0, 0) +#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ + SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) +#define ListView_SetGroupState(hwnd, group, masks, states) \ +{ LVGROUP level; level.cbSize = sizeof(level); level.mask = LVGF_STATE; \ + level.stateMask = masks; level.state = states; \ + SNDMSG((hwnd), LVM_SETGROUPINFO, (WPARAM)(group), (LPARAM)(LVGROUP *)&level); } +#define ListView_IsItemVisible(hwnd, index) \ + (UINT)SNDMSG((hwnd), LVM_ISITEMVISIBLE, (WPARAM)(index), (LPARAM)0) +#define ListView_GetGroupState(hwnd, group, mask) \ + (UINT)SNDMSG((hwnd), LVM_GETGROUPSTATE, (WPARAM)(group), (LPARAM)(mask)) +#define ListView_GetFocusedGroup(hwnd) \ + SNDMSG((hwnd), LVM_GETFOCUSEDGROUP, 0, 0) +#define ListView_GetGroupRect(hwnd, group, type, rc) \ + SNDMSG((hwnd), LVM_GETGROUPRECT, (WPARAM)(group), \ + ((rc) ? (((RECT*)(rc))->top = type), (LPARAM)(RECT*)(rc) : (LPARAM)(RECT*)NULL)) +#define ListView_GetGroupCount(hwnd) \ + SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) +#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ + SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) /* Tab Control */ -- 2.17.1

1 0

[PATCH 07/13] include : Added Pager_* defines.
by Alistair Leslie-Hughes 01 Aug '19

01 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 399a3972d4..1557af2abe 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2313,6 +2313,34 @@ typedef struct INT iHeight; } NMPGCALCSIZE, *LPNMPGCALCSIZE; +#define Pager_SetChild(hwnd, child) \ + SNDMSG((hwnd), PGM_SETCHILD, 0, (LPARAM)(child)) +#define Pager_RecalcSize(hwnd) \ + SNDMSG((hwnd), PGM_RECALCSIZE, 0, 0) +#define Pager_ForwardMouse(hwnd, forward) \ + SNDMSG((hwnd), PGM_FORWARDMOUSE, (WPARAM)(forward), 0) +#define Pager_SetBkColor(hwnd, clr) \ + (COLORREF)SNDMSG((hwnd), PGM_SETBKCOLOR, 0, (LPARAM)(clr)) +#define Pager_GetBkColor(hwnd) \ + (COLORREF)SNDMSG((hwnd), PGM_GETBKCOLOR, 0, 0) +#define Pager_SetBorder(hwnd, border) \ + (INT)SNDMSG((hwnd), PGM_SETBORDER, 0, (LPARAM)(border)) +#define Pager_GetBorder(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETBORDER, 0, 0) +#define Pager_SetPos(hwnd, pos) \ + (INT)SNDMSG((hwnd), PGM_SETPOS, 0, (LPARAM)(pos)) +#define Pager_GetPos(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETPOS, 0, 0) +#define Pager_SetButtonSize(hwnd, size) \ + (INT)SNDMSG((hwnd), PGM_SETBUTTONSIZE, 0, (LPARAM)(size)) +#define Pager_GetButtonSize(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETBUTTONSIZE, 0, 0) +#define Pager_GetButtonState(hwnd, button) \ + (DWORD)SNDMSG((hwnd), PGM_GETBUTTONSTATE, 0, (LPARAM)(button)) +#define Pager_GetDropTarget(hwnd, dt) \ + SNDMSG((hwnd), PGM_GETDROPTARGET, 0, (LPARAM)(dt)) +#define Pager_SetScrollInfo(hwnd, timeout, lines, pixels) \ + SNDMSG((hwnd), PGM_SETSCROLLINFO, timeout, MAKELONG(lines, pixels)) /* Treeview control */ -- 2.17.1

1 0