From 2dbc1a0b87606503214ac88975583aeb192c9afa Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 14 Mar 2016 13:19:08 +0100 Subject: [PATCH] Reverted WTS API changes. --- channels/cliprdr/client/cliprdr_main.c | 6 ++---- channels/drdynvc/client/drdynvc_main.c | 6 ++---- channels/encomsp/client/encomsp_main.c | 6 ++---- channels/rail/client/rail_main.c | 6 ++---- channels/rdpdr/client/rdpdr_main.c | 5 ++--- channels/rdpsnd/client/rdpsnd_main.c | 5 ++--- channels/remdesk/client/remdesk_main.c | 6 ++---- libfreerdp/core/client.c | 12 ++++++------ winpr/include/winpr/wtsapi.h | 2 +- 9 files changed, 21 insertions(+), 33 deletions(-) diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index da81b08..21fb784 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -1257,7 +1257,7 @@ static UINT cliprdr_virtual_channel_event_terminated(cliprdrPlugin* cliprdr) return CHANNEL_RC_OK; } -static UINT VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, +static VOID VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { @@ -1269,7 +1269,7 @@ static UINT VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, if (!cliprdr) { WLog_ERR(TAG, "error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1291,8 +1291,6 @@ static UINT VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, } if (error && cliprdr->context->rdpcontext) setChannelError(cliprdr->context->rdpcontext, error, "cliprdr_virtual_channel_init_event reported an error"); - - return error; } /* cliprdr is always built-in */ diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 26419ad..ee052ad 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -1501,7 +1501,7 @@ static UINT drdynvc_virtual_channel_event_terminated(drdynvcPlugin* drdynvc) return CHANNEL_RC_OK; } -static UINT VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, +static VOID VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { @@ -1513,7 +1513,7 @@ static UINT VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, if (!drdynvc) { WLog_ERR(TAG, "drdynvc_virtual_channel_init_event: error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1535,8 +1535,6 @@ static UINT VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, } if (error && drdynvc->rdpcontext) setChannelError(drdynvc->rdpcontext, error, "drdynvc_virtual_channel_init_event reported an error"); - - return error; } /** diff --git a/channels/encomsp/client/encomsp_main.c b/channels/encomsp/client/encomsp_main.c index af1d4b1..239954c 100644 --- a/channels/encomsp/client/encomsp_main.c +++ b/channels/encomsp/client/encomsp_main.c @@ -1259,7 +1259,7 @@ static UINT encomsp_virtual_channel_event_terminated(encomspPlugin* encomsp) return CHANNEL_RC_OK; } -static UINT VCAPITYPE encomsp_virtual_channel_init_event(LPVOID pInitHandle, +static VOID VCAPITYPE encomsp_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { @@ -1271,7 +1271,7 @@ static UINT VCAPITYPE encomsp_virtual_channel_init_event(LPVOID pInitHandle, if (!encomsp) { WLog_ERR(TAG, "encomsp_virtual_channel_init_event: error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1295,8 +1295,6 @@ static UINT VCAPITYPE encomsp_virtual_channel_init_event(LPVOID pInitHandle, if (error && encomsp->rdpcontext) setChannelError(encomsp->rdpcontext, error, "encomsp_virtual_channel_init_event reported an error"); - - return error; } /* encomsp is always built-in */ diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 1ba1b23..618227b 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -776,7 +776,7 @@ static void rail_virtual_channel_event_terminated(railPlugin* rail) free(rail); } -static UINT VCAPITYPE rail_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) +static VOID VCAPITYPE rail_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { railPlugin* rail; UINT error = CHANNEL_RC_OK; @@ -786,7 +786,7 @@ static UINT VCAPITYPE rail_virtual_channel_init_event(LPVOID pInitHandle, UINT e if (!rail) { WLog_ERR(TAG, "rail_virtual_channel_init_event: error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -808,8 +808,6 @@ static UINT VCAPITYPE rail_virtual_channel_init_event(LPVOID pInitHandle, UINT e if(error && rail->rdpcontext) setChannelError(rail->rdpcontext, error, "rail_virtual_channel_init_event reported an error"); - - return error; } /* rail is always built-in */ diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 8f614c6..cf41c7c 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -1720,7 +1720,7 @@ static void rdpdr_virtual_channel_event_terminated(rdpdrPlugin* rdpdr) free(rdpdr); } -static UINT VCAPITYPE rdpdr_virtual_channel_init_event(LPVOID pInitHandle, UINT event, +static VOID VCAPITYPE rdpdr_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { rdpdrPlugin* rdpdr; @@ -1731,7 +1731,7 @@ static UINT VCAPITYPE rdpdr_virtual_channel_init_event(LPVOID pInitHandle, UINT if (!rdpdr) { WLog_ERR(TAG, "error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1759,7 +1759,6 @@ static UINT VCAPITYPE rdpdr_virtual_channel_init_event(LPVOID pInitHandle, UINT if (error && rdpdr->rdpcontext) setChannelError(rdpdr->rdpcontext, error, "rdpdr_virtual_channel_init_event reported an error"); - return error; } /* rdpdr is always built-in */ diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index c6a6767..2133339 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -1450,7 +1450,7 @@ static void rdpsnd_virtual_channel_event_terminated(rdpsndPlugin* rdpsnd) free(rdpsnd); } -static UINT VCAPITYPE rdpsnd_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) +static VOID VCAPITYPE rdpsnd_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { rdpsndPlugin* plugin; UINT error = CHANNEL_RC_OK; @@ -1460,7 +1460,7 @@ static UINT VCAPITYPE rdpsnd_virtual_channel_init_event(LPVOID pInitHandle, UINT if (!plugin) { WLog_ERR(TAG, "rdpsnd_virtual_channel_init_event: error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1481,7 +1481,6 @@ static UINT VCAPITYPE rdpsnd_virtual_channel_init_event(LPVOID pInitHandle, UINT } if (error && plugin->rdpcontext) setChannelError(plugin->rdpcontext, error, "rdpsnd_virtual_channel_init_event reported an error"); - return error; } /* rdpsnd is always built-in */ diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 5c5d462..7e34d59 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -1066,7 +1066,7 @@ static void remdesk_virtual_channel_event_terminated(remdeskPlugin* remdesk) free(remdesk); } -static UINT VCAPITYPE remdesk_virtual_channel_init_event(LPVOID pInitHandle, +static VOID VCAPITYPE remdesk_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength) { @@ -1078,7 +1078,7 @@ static UINT VCAPITYPE remdesk_virtual_channel_init_event(LPVOID pInitHandle, if (!remdesk) { WLog_ERR(TAG, "error no match"); - return CHANNEL_RC_BAD_INIT_HANDLE; + return; } switch (event) @@ -1099,8 +1099,6 @@ static UINT VCAPITYPE remdesk_virtual_channel_init_event(LPVOID pInitHandle, } if (error && remdesk->rdpcontext) setChannelError(remdesk->rdpcontext, error, "remdesk_virtual_channel_init_event reported an error"); - - return error; } /* remdesk is always built-in */ diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index fa7a16d..31cd499 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -213,10 +213,10 @@ UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance) pChannelClientData = &channels->clientDataList[index]; if (pChannelClientData->pChannelInitEventProc) - error = pChannelClientData->pChannelInitEventProc( + pChannelClientData->pChannelInitEventProc( pChannelClientData->pInitHandle, CHANNEL_EVENT_INITIALIZED, 0, 0); - if (CHANNEL_RC_OK != error) + if (CHANNEL_RC_OK != getChannelError(instance->context)) break; } @@ -252,9 +252,9 @@ UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance) pChannelOpenData = &channels->openDataList[index]; - error = pChannelClientData->pChannelInitEventProc(pChannelClientData->pInitHandle, + pChannelClientData->pChannelInitEventProc(pChannelClientData->pInitHandle, CHANNEL_EVENT_CONNECTED, hostname, hostnameLength); - if (error != CHANNEL_RC_OK) + if (getChannelError(instance->context) != CHANNEL_RC_OK) goto fail; name = (char*) malloc(9); @@ -473,10 +473,10 @@ UINT freerdp_channels_disconnect(rdpChannels* channels, freerdp* instance) pChannelClientData = &channels->clientDataList[index]; if (pChannelClientData->pChannelInitEventProc) - error = pChannelClientData->pChannelInitEventProc( + pChannelClientData->pChannelInitEventProc( pChannelClientData->pInitHandle, CHANNEL_EVENT_DISCONNECTED, 0, 0); - if (error != CHANNEL_RC_OK) + if (getChannelError(instance->context) != CHANNEL_RC_OK) goto fail; pChannelOpenData = &channels->openDataList[index]; diff --git a/winpr/include/winpr/wtsapi.h b/winpr/include/winpr/wtsapi.h index df11e57..4b83c5e 100644 --- a/winpr/include/winpr/wtsapi.h +++ b/winpr/include/winpr/wtsapi.h @@ -116,7 +116,7 @@ typedef struct tagCHANNEL_PDU_HEADER #define VCEXPORT __export #endif -typedef UINT VCAPITYPE CHANNEL_INIT_EVENT_FN(LPVOID pInitHandle, +typedef VOID VCAPITYPE CHANNEL_INIT_EVENT_FN(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength); typedef CHANNEL_INIT_EVENT_FN *PCHANNEL_INIT_EVENT_FN; -- 2.7.4