From: Mike McDonald <Mike.McDonald@software.dell.com>
Date: Tue, 20 Jan 2015 13:09:00 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding... 
X-Git-Tag: 2.0.0-beta1+android10~458^2~27^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b184a7531fd8bdb4f5341b0a69684f35e96b4cca;p=platform%2Fupstream%2Ffreerdp.git

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

b184a7531fd8bdb4f5341b0a69684f35e96b4cca
diff --cc include/freerdp/server/rdpdr.h
index 6054b21,af9c3c4..5fe1426
--- a/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);