mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced (IWTSPlugin*) casts with struct address return

Browse Source
This commit is contained in:
Armin Novak 2021-10-07 15:50:57 +02:00 committed by akallabeth
parent 6ac4cad8dd
commit 96cf17a45b
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channels/audin/client/audin_main.c
View File

@ -820,7 +820,7 @@ static UINT audin_load_device_plugin(AUDIN_PLUGIN* audin, const char* name, cons
return ERROR_INVALID_FUNCTION;
}
entryPoints.plugin = (IWTSPlugin*)audin;
entryPoints.plugin = &audin->iface;
entryPoints.pRegisterAudinDevice = audin_register_device_plugin;
entryPoints.args = args;
entryPoints.rdpcontext = audin->rdpcontext;
@ -1100,11 +1100,11 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
goto out;
}
error = pEntryPoints->RegisterPlugin(pEntryPoints, "audin", (IWTSPlugin*)audin);
error = pEntryPoints->RegisterPlugin(pEntryPoints, "audin", &audin->iface);
if (error == CHANNEL_RC_OK)
return error;
out:
audin_plugin_terminated((IWTSPlugin*)audin);
audin_plugin_terminated(&audin->iface);
return error;
}

2
channels/disp/client/disp_main.c
View File

@ -407,7 +407,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
context->handle = (void*)disp;
context->SendMonitorLayout = disp_send_monitor_layout;
disp->iface.pInterface = (void*)context;
error = pEntryPoints->RegisterPlugin(pEntryPoints, "disp", (IWTSPlugin*)disp);
error = pEntryPoints->RegisterPlugin(pEntryPoints, "disp", &disp->iface);
}
else
{

2
channels/echo/client/echo_main.c
View File

@ -209,7 +209,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
echo->iface.Disconnected = NULL;
echo->iface.Terminated = echo_plugin_terminated;
status = pEntryPoints->RegisterPlugin(pEntryPoints, "echo", (IWTSPlugin*)echo);
status = pEntryPoints->RegisterPlugin(pEntryPoints, "echo", &echo->iface);
}
return status;

2
channels/geometry/client/geometry_main.c
View File

@ -500,7 +500,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
context->handle = (void*)geometry;
geometry->iface.pInterface = (void*)context;
geometry->context = context;
error = pEntryPoints->RegisterPlugin(pEntryPoints, "geometry", (IWTSPlugin*)geometry);
error = pEntryPoints->RegisterPlugin(pEntryPoints, "geometry", &geometry->iface);
}
else
{

2
channels/rdpgfx/client/rdpgfx_main.c
View File

@ -2193,7 +2193,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
gfx->iface.Disconnected = NULL;
gfx->iface.Terminated = rdpgfx_plugin_terminated;
error = pEntryPoints->RegisterPlugin(pEntryPoints, "rdpgfx", (IWTSPlugin*)gfx);
error = pEntryPoints->RegisterPlugin(pEntryPoints, "rdpgfx", &gfx->iface);
}
return error;

2
channels/sshagent/client/sshagent_main.c
View File

@ -379,7 +379,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
sshagent->rdpcontext =
((freerdp*)((rdpSettings*)pEntryPoints->GetRdpSettings(pEntryPoints))->instance)
->context;
status = pEntryPoints->RegisterPlugin(pEntryPoints, "sshagent", (IWTSPlugin*)sshagent);
status = pEntryPoints->RegisterPlugin(pEntryPoints, "sshagent", &sshagent->iface);
}
return status;

2
channels/tsmf/client/tsmf_main.c
View File

@ -606,7 +606,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
goto error_init;
}
status = pEntryPoints->RegisterPlugin(pEntryPoints, "tsmf", (IWTSPlugin*)tsmf);
status = pEntryPoints->RegisterPlugin(pEntryPoints, "tsmf", &tsmf->iface);
}
if (status == CHANNEL_RC_OK)

5
channels/urbdrc/client/urbdrc_main.c
View File

@ -968,8 +968,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
urbdrc->iface.Initialize = urbdrc_plugin_initialize;
urbdrc->iface.Terminated = urbdrc_plugin_terminated;
urbdrc->vchannel_status = INIT_CHANNEL_IN;
status =
pEntryPoints->RegisterPlugin(pEntryPoints, URBDRC_CHANNEL_NAME, (IWTSPlugin*)urbdrc);
status = pEntryPoints->RegisterPlugin(pEntryPoints, URBDRC_CHANNEL_NAME, &urbdrc->iface);
if (status != CHANNEL_RC_OK)
goto fail;
@ -988,7 +987,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
if (!urbdrc->subsystem && !urbdrc_set_subsystem(urbdrc, "libusb"))
goto fail;
return urbdrc_load_udevman_addin((IWTSPlugin*)urbdrc, urbdrc->subsystem, args);
return urbdrc_load_udevman_addin(&urbdrc->iface, urbdrc->subsystem, args);
fail:
urbdrc_plugin_terminated(&urbdrc->iface);
return status;

2
channels/video/client/video_main.c
View File

@ -1135,7 +1135,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
videoPlugin->wtsPlugin.pInterface = (void*)videoContext;
videoPlugin->context = videoContext;
error = pEntryPoints->RegisterPlugin(pEntryPoints, "video", (IWTSPlugin*)videoPlugin);
error = pEntryPoints->RegisterPlugin(pEntryPoints, "video", &videoPlugin->wtsPlugin);
}
else
{