From 6d6c5062aba72c8aa347f4ee10592be7598f4a78 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Mon, 19 Sep 2011 17:04:14 +0800 Subject: [PATCH] drdynvc: fix buffer pointer type. --- channels/drdynvc/drdynvc_main.c | 2 +- channels/drdynvc/drdynvc_main.h | 2 +- channels/drdynvc/drdynvc_types.h | 2 ++ channels/drdynvc/dvcman.c | 2 +- include/freerdp/dvc.h | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/channels/drdynvc/drdynvc_main.c b/channels/drdynvc/drdynvc_main.c index 26296f786..5fda6ac27 100644 --- a/channels/drdynvc/drdynvc_main.c +++ b/channels/drdynvc/drdynvc_main.c @@ -71,7 +71,7 @@ static int drdynvc_write_variable_uint(STREAM* stream, uint32 val) return cb; } -int drdynvc_write_data(drdynvcPlugin* drdynvc, uint32 ChannelId, char* data, uint32 data_size) +int drdynvc_write_data(drdynvcPlugin* drdynvc, uint32 ChannelId, uint8* data, uint32 data_size) { STREAM* data_out; uint32 pos = 0; diff --git a/channels/drdynvc/drdynvc_main.h b/channels/drdynvc/drdynvc_main.h index 2dc57429e..519c61d19 100644 --- a/channels/drdynvc/drdynvc_main.h +++ b/channels/drdynvc/drdynvc_main.h @@ -24,7 +24,7 @@ typedef struct drdynvc_plugin drdynvcPlugin; -int drdynvc_write_data(drdynvcPlugin* plugin, uint32 ChannelId, char* data, uint32 data_size); +int drdynvc_write_data(drdynvcPlugin* plugin, uint32 ChannelId, uint8* data, uint32 data_size); int drdynvc_push_event(drdynvcPlugin* plugin, RDP_EVENT* event); #endif diff --git a/channels/drdynvc/drdynvc_types.h b/channels/drdynvc/drdynvc_types.h index f62fee7f5..a08a60523 100644 --- a/channels/drdynvc/drdynvc_types.h +++ b/channels/drdynvc/drdynvc_types.h @@ -21,6 +21,8 @@ #define __DRDYNVC_TYPES_H #include "config.h" +#include +#include #include #ifdef WITH_DEBUG_DVC diff --git a/channels/drdynvc/dvcman.c b/channels/drdynvc/dvcman.c index 3fd28ad87..33d14c943 100644 --- a/channels/drdynvc/dvcman.c +++ b/channels/drdynvc/dvcman.c @@ -263,7 +263,7 @@ int dvcman_init(IWTSVirtualChannelManager* pChannelMgr) static int dvcman_write_channel(IWTSVirtualChannel* pChannel, uint32 cbSize, - char* pBuffer, + uint8* pBuffer, void* pReserved) { DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*)pChannel; diff --git a/include/freerdp/dvc.h b/include/freerdp/dvc.h index 32d3808f9..dfa487c28 100644 --- a/include/freerdp/dvc.h +++ b/include/freerdp/dvc.h @@ -73,7 +73,7 @@ struct _IWTSVirtualChannel /* Starts a write request on the channel. */ int (*Write) (IWTSVirtualChannel* pChannel, uint32 cbSize, - char* pBuffer, + uint8* pBuffer, void* pReserved); /* Closes the channel. */ int (*Close) (IWTSVirtualChannel* pChannel); @@ -118,7 +118,7 @@ struct _IWTSListenerCallback the associated listener. */ int (*OnNewChannelConnection) (IWTSListenerCallback* pListenerCallback, IWTSVirtualChannel* pChannel, - char* Data, + uint8* Data, int* pbAccept, IWTSVirtualChannelCallback** ppCallback); };