Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding...

diff --cc include/freerdp/server/rdpdr.h
index 6054b21,af9c3c4..5fe1426
--- 1/include/freerdp/server/rdpdr.h
--- 2/include/freerdp/server/rdpdr.h
+++ b/include/freerdp/server/rdpdr.h
@@@ -90,53 -43,12 +90,57 @@@ struct _rdpdr_server_contex
        psRdpdrStop Stop;
  
        RdpdrServerPrivate* priv;
 +
 +      /* Server self-defined pointer. */
 +      void* data;
 +
 +      /* Server supported redirections. Set by server. */
 +      BOOL supportsDrives;
 +      BOOL supportsPorts;
 +      BOOL supportsPrinters;
 +      BOOL supportsSmartcards;
 +
 +      /*** Drive APIs called by the server. ***/
 +      psRdpdrDriveCreateDirectory DriveCreateDirectory;
 +      psRdpdrDriveDeleteDirectory DriveDeleteDirectory;
 +      psRdpdrDriveQueryDirectory DriveQueryDirectory;
 +      psRdpdrDriveOpenFile DriveOpenFile;
 +      psRdpdrDriveReadFile DriveReadFile;
 +      psRdpdrDriveWriteFile DriveWriteFile;
 +      psRdpdrDriveCloseFile DriveCloseFile;
 +      psRdpdrDriveDeleteFile DriveDeleteFile;
 +      psRdpdrDriveRenameFile DriveRenameFile;
 +
 +      /*** Drive callbacks registered by the server. ***/
 +      psRdpdrOnDriveCreate OnDriveCreate;
 +      psRdpdrOnDriveDelete OnDriveDelete;
 +      psRdpdrOnDriveCreateDirectoryComplete OnDriveCreateDirectoryComplete;
 +      psRdpdrOnDriveDeleteDirectoryComplete OnDriveDeleteDirectoryComplete;
 +      psRdpdrOnDriveQueryDirectoryComplete OnDriveQueryDirectoryComplete;
 +      psRdpdrOnDriveOpenFileComplete OnDriveOpenFileComplete;
 +      psRdpdrOnDriveReadFileComplete OnDriveReadFileComplete;
 +      psRdpdrOnDriveWriteFileComplete OnDriveWriteFileComplete;
 +      psRdpdrOnDriveCloseFileComplete OnDriveCloseFileComplete;
 +      psRdpdrOnDriveDeleteFileComplete OnDriveDeleteFileComplete;
 +      psRdpdrOnDriveRenameFileComplete OnDriveRenameFileComplete;
 +
 +      /*** Port callbacks registered by the server. ***/
 +      psRdpdrOnPortCreate OnPortCreate;
 +      psRdpdrOnPortDelete OnPortDelete;
 +
 +      /*** Printer callbacks registered by the server. ***/
 +      psRdpdrOnPrinterCreate OnPrinterCreate;
 +      psRdpdrOnPrinterDelete OnPrinterDelete;
 +
 +      /*** Smartcard callbacks registered by the server. ***/
 +      psRdpdrOnSmartcardCreate OnSmartcardCreate;
 +      psRdpdrOnSmartcardDelete OnSmartcardDelete;
  };
  
+ #ifdef __cplusplus
+  extern "C" {
+ #endif
+ 
  FREERDP_API RdpdrServerContext* rdpdr_server_context_new(HANDLE vcm);
  FREERDP_API void rdpdr_server_context_free(RdpdrServerContext* context);