wfreerdp-server: merged upstream

diff --cc include/freerdp/peer.h
index ac87635,470df19..da65c00
--- 1/include/freerdp/peer.h
--- 2/include/freerdp/peer.h
+++ b/include/freerdp/peer.h
@@@ -72,12 -72,11 +72,12 @@@ struct rdp_freerdp_pee
        psPeerSendChannelData SendChannelData;
        psPeerReceiveChannelData ReceiveChannelData;
  
-       uint32 ack_frame_id;
-       boolean local;
-       boolean connected;
-       boolean activated;
-       boolean authenticated;
 +      int pId;
+       UINT32 ack_frame_id;
+       BOOL local;
+       BOOL connected;
+       BOOL activated;
+       BOOL authenticated;
        SEC_WINNT_AUTH_IDENTITY identity;
  };
  

diff --cc server/Windows/CMakeLists.txt
index 130d899,dfe2f97..33a5e46
--- 1/server/Windows/CMakeLists.txt
--- 2/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@@ -51,7 -53,9 +53,10 @@@ if(WITH_WIN8
        set(${MODULE_PREFIX}_LIBS d3d11 dxgi dxguid)\r
  endif()\r
  \r
- if(WITH_MONOLITHIC_BUILD)
++
+ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-channels-server)\r
+ \r
+ if(MONOLITHIC_BUILD)\r
        set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp)\r
  else()
  \r

diff --cc server/Windows/wf_info.c
Simple merge

diff --cc server/Windows/wf_info.h
Simple merge

diff --cc server/Windows/wf_input.c
Simple merge

diff --cc server/Windows/wf_input.h
index 63c0471,8409cfd..f6a472d
--- 1/server/Windows/wf_input.h
--- 2/server/Windows/wf_input.h
+++ b/server/Windows/wf_input.h
@@@ -22,15 -22,9 +22,15 @@@
  
  #include "wf_interface.h"
  
- void wf_peer_keyboard_event(rdpInput* input, uint16 flags, uint16 code);
- void wf_peer_unicode_keyboard_event(rdpInput* input, uint16 flags, uint16 code);
- void wf_peer_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y);
- void wf_peer_extended_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y);
+ void wf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
+ void wf_peer_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code);
+ void wf_peer_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
+ void wf_peer_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y);
  
 +//dummy versions
 +void wf_peer_keyboard_event_dummy(rdpInput* input, uint16 flags, uint16 code);
 +void wf_peer_unicode_keyboard_event_dummy(rdpInput* input, uint16 flags, uint16 code);
 +void wf_peer_mouse_event_dummy(rdpInput* input, uint16 flags, uint16 x, uint16 y);
 +void wf_peer_extended_mouse_event_dummy(rdpInput* input, uint16 flags, uint16 x, uint16 y);
 +
  #endif /* WF_INPUT_H */

diff --cc server/Windows/wf_interface.c
index 4096a19,3a50a9d..fc5512a
--- 1/server/Windows/wf_interface.c
--- 2/server/Windows/wf_interface.c
+++ b/server/Windows/wf_interface.c
@@@ -26,8 -24,6 +26,7 @@@
  #include <winpr/tchar.h>
  #include <winpr/windows.h>
  #include <freerdp/utils/tcp.h>
- //#include <libfreerdp\core\listener.h>
 +#include <freerdp\listener.h>
  
  #include "wf_peer.h"
  #include "wf_settings.h"
@@@ -79,10 -68,9 +78,10 @@@ DWORD WINAPI wf_server_main_loop(LPVOI
                if (max_fds == 0)
                        break;
  
 +              
                select(max_fds + 1, &rfds_set, NULL, NULL, NULL);
-               
-               if (instance->CheckFileDescriptor(instance) != true)
+ 
+               if (instance->CheckFileDescriptor(instance) != TRUE)
                {
                        printf("Failed to check FreeRDP file descriptor\n");
                        break;

diff --cc server/Windows/wf_interface.h
index 8cc3277,16d4be6..a3b89ef
--- 1/server/Windows/wf_interface.h
--- 2/server/Windows/wf_interface.h
+++ b/server/Windows/wf_interface.h
@@@ -29,12 -28,8 +29,13 @@@
  
  #include <freerdp/freerdp.h>
  #include <freerdp/codec/rfx.h>
+ #include <freerdp/server/rdpsnd.h>
  
 +#define WF_SRV_CALLBACK_EVENT_CONNECT 1
 +#define WF_SRV_CALLBACK_EVENT_DISCONNECT 2
 +#define WF_SRV_CALLBACK_EVENT_ACTIVATE 4
 +#define WF_SRV_CALLBACK_EVENT_AUTH 8
 +
  typedef struct wf_info wfInfo;
  typedef struct wf_peer_context wfPeerContext;
  
@@@ -100,22 -93,4 +104,17 @@@ FREERDP_API BOOL wfreerdp_server_stop(w
  FREERDP_API wfServer* wfreerdp_server_new();
  FREERDP_API void wfreerdp_server_free(wfServer* server);
  
- //FREERDP_API void wfreerdp_server_register_connect_event(cbConEvent cb);
- //FREERDP_API void wfreerdp_server_register_disconnect_event(cbConEvent cb);
 +FREERDP_API BOOL wfreerdp_server_is_running(wfServer* server);
 +
 +FREERDP_API UINT32 wfreerdp_server_num_peers();
 +FREERDP_API UINT32 wfreerdp_server_get_peer_hostname(int pId, wchar_t * dstStr);
 +FREERDP_API BOOL wfreerdp_server_peer_is_local(int pId);
 +FREERDP_API BOOL wfreerdp_server_peer_is_connected(int pId);
 +FREERDP_API BOOL wfreerdp_server_peer_is_activated(int pId);
 +FREERDP_API BOOL wfreerdp_server_peer_is_authenticated(int pId);
 +
- //void wfreerdp_server_peer_connect_event(int pId);
- //void wfreerdp_server_peer_disconnect_event(int pId);
- 
 +FREERDP_API void wfreerdp_server_register_callback_event(cbCallback cb);
 +
 +void wfreerdp_server_peer_callback_event(int pId, UINT32 eType);
 +
  #endif /* WF_INTERFACE_H */

diff --cc server/Windows/wf_peer.c
index e6154d0,54dcb6b..77ffb53
--- 1/server/Windows/wf_peer.c
--- 2/server/Windows/wf_peer.c
+++ b/server/Windows/wf_peer.c
@@@ -97,15 -115,13 +116,15 @@@ BOOL wf_peer_activate(freerdp_peer* cli
        printf("PeerActivate\n");\r
  \r
        wfi = context->info;\r
-       client->activated = true;\r
+       client->activated = TRUE;\r
        wf_update_peer_activate(wfi, context);\r
  \r
-       return true;\r
 +      wfreerdp_server_peer_callback_event(((rdpContext*) context)->peer->pId, WF_SRV_CALLBACK_EVENT_ACTIVATE);\r
 +\r
+       return TRUE;\r
  }\r
  \r
- boolean wf_peer_logon(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, boolean automatic)\r
+ BOOL wf_peer_logon(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, BOOL automatic)\r
  {\r
        printf("PeerLogon\n");\r
  \r
@@@ -115,12 -131,10 +134,12 @@@
                        identity->User, identity->Domain, identity->Password);\r
        }\r
  \r
-       return true;\r
 +\r
 +      wfreerdp_server_peer_callback_event(((rdpContext*) client->context)->peer->pId, WF_SRV_CALLBACK_EVENT_AUTH);\r
+       return TRUE;\r
  }\r
  \r
- void wf_peer_synchronize_event(rdpInput* input, uint32 flags)\r
+ void wf_peer_synchronize_event(rdpInput* input, UINT32 flags)\r
  {\r
  \r
  }\r
@@@ -287,12 -288,9 +306,16 @@@ DWORD WINAPI wf_peer_main_loop(LPVOID l
                                break;\r
                }\r
  \r
 +              //force disconnect\r
 +              if(wfi->force_all_disconnect == TRUE)\r
 +              {\r
 +                      printf("Forcing Disconnect -> ");\r
 +                      break;\r
 +              }\r
++\r
+               /* FIXME: we should wait on this, instead of calling it every time */\r
+               if (WTSVirtualChannelManagerCheckFileDescriptor(context->vcm) != TRUE)\r
+                       break;\r
        }\r
  \r
        printf("Client %s disconnected.\n", client->local ? "(local)" : client->hostname);\r

diff --cc server/Windows/wf_update.c
index 21454dd,95768fc..ad0b502
--- 1/server/Windows/wf_update.c
--- 2/server/Windows/wf_update.c
+++ b/server/Windows/wf_update.c
@@@ -110,12 -104,12 +110,12 @@@ DWORD WINAPI wf_update_thread(LPVOID lp
  
  void wf_update_encode(wfInfo* wfi)
  {
 -      
 +
        RFX_RECT rect;
        long height, width;
-       uint8* pDataBits = NULL;
+       BYTE* pDataBits = NULL;
        int stride;
 -      
 +
        SURFACE_BITS_COMMAND* cmd;
  
        wf_info_find_invalid_region(wfi);
@@@ -133,8 -127,9 +133,9 @@@
  
        //printf("x:%d y:%d w:%d h:%d\n", wfi->invalid.left, wfi->invalid.top, width, height);
  
+       stream_clear(wfi->s);
        rfx_compose_message(wfi->rfx_context, wfi->s, &rect, 1,
 -                      pDataBits, width, height, stride);
 +              pDataBits, width, height, stride);
  
        wfi->frame_idx = wfi->rfx_context->frame_idx;