github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Declare unified module interface and use it in modules

Browse Source 
This fixes loading modules compiled with a C++ compiler. Remote thandle
type, it's unused. Use tintptr for module data. Don't cast pointers to
long, they won't fit on Win64.
This commit is contained in:
Pavel Roskin
2016-07-08 05:09:09 +00:00
parent 2c13ef5c6d
commit ace7d2c822
6 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mc/mc.c
+6 -4
View File
@@ -81,7 +81,7 @@ lib_mod_set_param(struct mod *mod, const char *name, char *value)
}
/******************************************************************************/
struct mod *EXPORT_CC
tintptr EXPORT_CC
mod_init(void)
{
struct mod *mod;
@@ -89,20 +89,22 @@ mod_init(void)
mod = (struct mod *)g_malloc(sizeof(struct mod), 1);
mod->size = sizeof(struct mod);
mod->version = CURRENT_MOD_VER;
mod->handle = (long)mod;
mod->handle = (tintptr) mod;
mod->mod_connect = lib_mod_connect;
mod->mod_start = lib_mod_start;
mod->mod_event = lib_mod_event;
mod->mod_signal = lib_mod_signal;
mod->mod_end = lib_mod_end;
mod->mod_set_param = lib_mod_set_param;
return mod;
return (tintptr) mod;
}
/******************************************************************************/
int EXPORT_CC
mod_exit(struct mod *mod)
mod_exit(tintptr handle)
{
struct mod *mod = (struct mod *) handle;
if (mod == 0)
{
return 0;