From 82b922a70d1b8eb82b34fa807f1756beff5aca7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sun, 16 Feb 2014 17:38:59 -0500 Subject: [PATCH] channels: rename custom CHANNEL_ENTRY_POINTS_EX to CHANNEL_ENTRY_POINTS_FREERDP to fix conflict --- channels/cliprdr/client/cliprdr_main.c | 6 +++--- channels/drdynvc/client/drdynvc_main.c | 6 +++--- channels/rail/client/rail_main.c | 6 +++--- channels/rdpdr/client/rdpdr_main.c | 2 +- channels/rdpdr/client/rdpdr_main.h | 2 +- channels/rdpsnd/client/rdpsnd_main.c | 4 ++-- include/freerdp/svc.h | 6 +++--- include/freerdp/utils/svc_plugin.h | 2 +- libfreerdp/core/client.c | 4 ++-- libfreerdp/utils/svc_plugin.c | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index d12e2aab6..77e4c9d8c 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -468,7 +468,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) { cliprdrPlugin* cliprdr; CliprdrClientContext* context; - CHANNEL_ENTRY_POINTS_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP* pEntryPointsEx; cliprdr = (cliprdrPlugin*) calloc(1, sizeof(cliprdrPlugin)); @@ -485,9 +485,9 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) cliprdr->plugin.event_callback = cliprdr_process_event; cliprdr->plugin.terminate_callback = cliprdr_process_terminate; - pEntryPointsEx = (CHANNEL_ENTRY_POINTS_EX*) pEntryPoints; + pEntryPointsEx = (CHANNEL_ENTRY_POINTS_FREERDP*) pEntryPoints; - if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_EX)) && + if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_FREERDP)) && (pEntryPointsEx->MagicNumber == FREERDP_CHANNEL_MAGIC_NUMBER)) { context = (CliprdrClientContext*) calloc(1, sizeof(CliprdrClientContext)); diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index fb3665d8d..03f0c7bea 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -411,7 +411,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) { drdynvcPlugin* _p; DrdynvcClientContext* context; - CHANNEL_ENTRY_POINTS_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP* pEntryPointsEx; _p = (drdynvcPlugin*) malloc(sizeof(drdynvcPlugin)); ZeroMemory(_p, sizeof(drdynvcPlugin)); @@ -428,9 +428,9 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) _p->plugin.event_callback = drdynvc_process_event; _p->plugin.terminate_callback = drdynvc_process_terminate; - pEntryPointsEx = (CHANNEL_ENTRY_POINTS_EX*) pEntryPoints; + pEntryPointsEx = (CHANNEL_ENTRY_POINTS_FREERDP*) pEntryPoints; - if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_EX)) && + if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_FREERDP)) && (pEntryPointsEx->MagicNumber == FREERDP_CHANNEL_MAGIC_NUMBER)) { context = (DrdynvcClientContext*) malloc(sizeof(DrdynvcClientContext)); diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 7dd557fec..a65e7d29c 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -505,7 +505,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) { railPlugin* rail; RailClientContext* context; - CHANNEL_ENTRY_POINTS_EX* pEntryPointsEx; + CHANNEL_ENTRY_POINTS_FREERDP* pEntryPointsEx; rail = (railPlugin*) malloc(sizeof(railPlugin)); ZeroMemory(rail, sizeof(railPlugin)); @@ -523,9 +523,9 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) rail->plugin.event_callback = rail_process_event; rail->plugin.terminate_callback = rail_process_terminate; - pEntryPointsEx = (CHANNEL_ENTRY_POINTS_EX*) pEntryPoints; + pEntryPointsEx = (CHANNEL_ENTRY_POINTS_FREERDP*) pEntryPoints; - if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_EX)) && + if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_FREERDP)) && (pEntryPointsEx->MagicNumber == FREERDP_CHANNEL_MAGIC_NUMBER)) { context = (RailClientContext*) malloc(sizeof(RailClientContext)); diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 441184a08..24610105a 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -561,7 +561,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) strcpy(rdpdr->channelDef.name, "rdpdr"); - CopyMemory(&(rdpdr->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_EX)); + CopyMemory(&(rdpdr->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP)); rdpdr->channelEntryPoints.pVirtualChannelInit(&rdpdr->InitHandle, &rdpdr->channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, rdpdr_virtual_channel_init_event); diff --git a/channels/rdpdr/client/rdpdr_main.h b/channels/rdpdr/client/rdpdr_main.h index b9a766590..37f22ac36 100644 --- a/channels/rdpdr/client/rdpdr_main.h +++ b/channels/rdpdr/client/rdpdr_main.h @@ -38,7 +38,7 @@ typedef struct rdpdr_plugin rdpdrPlugin; struct rdpdr_plugin { CHANNEL_DEF channelDef; - CHANNEL_ENTRY_POINTS_EX channelEntryPoints; + CHANNEL_ENTRY_POINTS_FREERDP channelEntryPoints; HANDLE thread; wStream* data_in; diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index bb1bbb535..63a5463fe 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -55,7 +55,7 @@ struct rdpsnd_plugin { CHANNEL_DEF channelDef; - CHANNEL_ENTRY_POINTS_EX channelEntryPoints; + CHANNEL_ENTRY_POINTS_FREERDP channelEntryPoints; HANDLE thread; wStream* data_in; @@ -1090,7 +1090,7 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) strcpy(rdpsnd->channelDef.name, "rdpsnd"); - CopyMemory(&(rdpsnd->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_EX)); + CopyMemory(&(rdpsnd->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP)); rdpsnd->log = WLog_Get("com.freerdp.channels.rdpsnd.client"); diff --git a/include/freerdp/svc.h b/include/freerdp/svc.h index 2f149a2b0..9520ae3f3 100644 --- a/include/freerdp/svc.h +++ b/include/freerdp/svc.h @@ -95,7 +95,7 @@ typedef int (FREERDP_CC * PVIRTUALCHANNELENTRY)(PCHANNEL_ENTRY_POINTS pEntryPoin #define FREERDP_CHANNEL_MAGIC_NUMBER 0x46524450 -struct _CHANNEL_ENTRY_POINTS_EX +struct _CHANNEL_ENTRY_POINTS_FREERDP { UINT32 cbSize; UINT32 protocolVersion; @@ -111,7 +111,7 @@ struct _CHANNEL_ENTRY_POINTS_EX void** ppInterface; /* channel callback interface, use for initialization */ PVIRTUALCHANNELEVENTPUSH pVirtualChannelEventPush; }; -typedef struct _CHANNEL_ENTRY_POINTS_EX CHANNEL_ENTRY_POINTS_EX; -typedef CHANNEL_ENTRY_POINTS_EX* PCHANNEL_ENTRY_POINTS_EX; +typedef struct _CHANNEL_ENTRY_POINTS_FREERDP CHANNEL_ENTRY_POINTS_FREERDP; +typedef CHANNEL_ENTRY_POINTS_FREERDP* PCHANNEL_ENTRY_POINTS_FREERDP; #endif /* FREERDP_SVC_H */ diff --git a/include/freerdp/utils/svc_plugin.h b/include/freerdp/utils/svc_plugin.h index a81628046..ddcdbe61a 100644 --- a/include/freerdp/utils/svc_plugin.h +++ b/include/freerdp/utils/svc_plugin.h @@ -40,7 +40,7 @@ typedef struct rdp_svc_plugin rdpSvcPlugin; struct rdp_svc_plugin { - CHANNEL_ENTRY_POINTS_EX channel_entry_points; + CHANNEL_ENTRY_POINTS_FREERDP channel_entry_points; CHANNEL_DEF channel_def; void (*connect_callback)(rdpSvcPlugin* plugin); diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index 6f0464b50..aae31a627 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -727,7 +727,7 @@ UINT FreeRDP_VirtualChannelEventPush(DWORD openHandle, wMessage* event) int freerdp_channels_client_load(rdpChannels* channels, rdpSettings* settings, void* entry, void* data) { int status; - CHANNEL_ENTRY_POINTS_EX EntryPoints; + CHANNEL_ENTRY_POINTS_FREERDP EntryPoints; CHANNEL_CLIENT_DATA* pChannelClientData; if (channels->clientDataCount + 1 >= CHANNEL_MAX_COUNT) @@ -739,7 +739,7 @@ int freerdp_channels_client_load(rdpChannels* channels, rdpSettings* settings, v pChannelClientData = &channels->clientDataList[channels->clientDataCount]; pChannelClientData->entry = (PVIRTUALCHANNELENTRY) entry; - ZeroMemory(&EntryPoints, sizeof(CHANNEL_ENTRY_POINTS_EX)); + ZeroMemory(&EntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP)); EntryPoints.cbSize = sizeof(EntryPoints); EntryPoints.protocolVersion = VIRTUAL_CHANNEL_VERSION_WIN2000; diff --git a/libfreerdp/utils/svc_plugin.c b/libfreerdp/utils/svc_plugin.c index 5bcce9224..720b79145 100644 --- a/libfreerdp/utils/svc_plugin.c +++ b/libfreerdp/utils/svc_plugin.c @@ -285,7 +285,7 @@ void svc_plugin_init(rdpSvcPlugin* plugin, CHANNEL_ENTRY_POINTS* pEntryPoints) * VirtualChannelInit at a time. So this should be safe. */ - CopyMemory(&(plugin->channel_entry_points), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_EX)); + CopyMemory(&(plugin->channel_entry_points), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP)); plugin->channel_entry_points.pVirtualChannelInit(&(plugin->InitHandle), &(plugin->channel_def), 1, VIRTUAL_CHANNEL_VERSION_WIN2000, svc_plugin_init_event);