diff --git a/libfreerdp/gdi/region.c b/libfreerdp/gdi/region.c index 903959c60..d7da38a08 100644 --- a/libfreerdp/gdi/region.c +++ b/libfreerdp/gdi/region.c @@ -398,8 +398,8 @@ BOOL gdi_RgnToCRect(const HGDI_RGN rgn, INT32* left, INT32* top, INT32* right, I * @param bottom y2 */ -INLINE BOOL gdi_CRgnToCRect(INT32 x, INT32 y, INT32 w, INT32 h, INT32* left, INT32* top, - INT32* right, INT32* bottom) +BOOL gdi_CRgnToCRect(INT32 x, INT32 y, INT32 w, INT32 h, INT32* left, INT32* top, INT32* right, + INT32* bottom) { BOOL rc = TRUE; *left = x; diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index 29835238b..965992b79 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -504,8 +504,8 @@ BOOL GetCommState(HANDLE hFile, LPDCB lpDCB) lpLocalDcb->fAbortOnError = (handflow.ControlHandShake & SERIAL_ERROR_ABORT) != 0; /* lpLocalDcb->fDummy2 not used */ lpLocalDcb->wReserved = 0; /* must be zero */ - lpLocalDcb->XonLim = handflow.XonLimit; - lpLocalDcb->XoffLim = handflow.XoffLimit; + lpLocalDcb->XonLim = WINPR_ASSERTING_INT_CAST(WORD, handflow.XonLimit); + lpLocalDcb->XoffLim = WINPR_ASSERTING_INT_CAST(WORD, handflow.XoffLimit); SERIAL_LINE_CONTROL lineControl = { 0 }; if (!CommDeviceIoControl(pComm, IOCTL_SERIAL_GET_LINE_CONTROL, NULL, 0, &lineControl, diff --git a/winpr/libwinpr/comm/comm_ioctl.c b/winpr/libwinpr/comm/comm_ioctl.c index 1dfe5985b..979f1e7b8 100644 --- a/winpr/libwinpr/comm/comm_ioctl.c +++ b/winpr/libwinpr/comm/comm_ioctl.c @@ -701,7 +701,7 @@ int comm_ioctl_tcsetattr(int fd, int optional_actions, const struct termios* ter winpr_strerror(errno, buffer, sizeof(buffer)), errno); return rrc; } - // NOLINTNEXTLINE(bugprone-suspicious-memory-comparison) + // NOLINTNEXTLINE(bugprone-suspicious-memory-comparison,cert-exp42-c,cert-flp37-c) } while ((memcmp(¤tState, termios_p, sizeof(struct termios)) != 0) && (count++ < 2)); return 0;