Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP

Conflicts:
	libfreerdp/core/nego.c
	libfreerdp/core/peer.c
	winpr/libwinpr/synch/wait.c

diff --cc libfreerdp/core/nego.c
index 7f31759,716a2b7..d5c98ef
--- 1/libfreerdp/core/nego.c
--- 2/libfreerdp/core/nego.c
+++ b/libfreerdp/core/nego.c
@@@ -913,11 -897,11 +899,13 @@@ BOOL nego_send_negotiation_response(rdp
                Stream_Write_UINT8(s, TYPE_RDP_NEG_FAILURE);
                Stream_Write_UINT8(s, flags); /* flags */
                Stream_Write_UINT16(s, 8); /* RDP_NEG_DATA length (8) */
++
                /*
 -              * TODO: Check for other possibilities,
 -              *       like SSL_NOT_ALLOWED_BY_SERVER.
 -              */
 -              fprintf(stderr, "%s: client supports only Standard RDP Security\n", __FUNCTION__);
 +               * TODO: Check for other possibilities,
 +               *       like SSL_NOT_ALLOWED_BY_SERVER.
 +               */
 +              DEBUG_WARN( "%s: client supports only Standard RDP Security\n", __FUNCTION__);
++
                Stream_Write_UINT32(s, SSL_REQUIRED_BY_SERVER);
                length += 8;
                status = FALSE;

diff --cc winpr/libwinpr/synch/wait.c
index e553653,e24529c..bfc5f72
--- 1/winpr/libwinpr/synch/wait.c
--- 2/winpr/libwinpr/synch/wait.c
+++ b/winpr/libwinpr/synch/wait.c
@@@ -316,7 -261,20 +316,8 @@@ DWORD WaitForSingleObject(HANDLE hHandl
  
                event = (WINPR_EVENT*) Object;
  
 -              FD_ZERO(&rfds);
 -              FD_SET(event->pipe_fd[0], &rfds);
 -              ZeroMemory(&timeout, sizeof(timeout));
 -
 -              if ((dwMilliseconds != INFINITE) && (dwMilliseconds != 0))
 -              {
 -                      timeout.tv_sec = dwMilliseconds / 1000;
 -                      timeout.tv_usec = (dwMilliseconds % 1000) * 1000;
 -              }
 -
 -              status = select(event->pipe_fd[0] + 1, &rfds, NULL, NULL,
 -                              (dwMilliseconds == INFINITE) ? NULL : &timeout);
 +              status = waitOnFd(event->pipe_fd[0], dwMilliseconds);
+ 
                if (status < 0)
                {
                        fprintf(stderr, "WaitForSingleObject: event select() failure [%d] %s\n", errno, strerror(errno));