work on freerdp

2 files changed, 408 insertions, 1 deletions

diff --git a/freerdp/xrdp-freerdp.c b/freerdp/xrdp-freerdp.c
index 099020b3..c3dbe745 100644
--- a/freerdp/xrdp-freerdp.c
+++ b/freerdp/xrdp-freerdp.c
@@ -41,6 +41,7 @@ int DEFAULT_CC
 lib_mod_connect(struct mod* mod)
 {
   LIB_DEBUG(mod, "in lib_mod_connect");
+  mod->inst->rdp_connect(mod->inst);
   LIB_DEBUG(mod, "out lib_mod_connect");
   return 0;
 }
@@ -79,25 +80,426 @@ lib_mod_end(struct mod* mod)
 int DEFAULT_CC
 lib_mod_set_param(struct mod* mod, char* name, char* value)
 {
+  g_writeln("lib_mod_set_param: name [%s] value [%s]", name, value);
+  if (g_strcmp(name, "hostname") == 0)
+  {
+    g_strncpy(mod->settings->hostname, value, sizeof(mod->settings->hostname));
+  }
+  else if (g_strcmp(name, "ip") == 0)
+  {
+    g_strncpy(mod->settings->server, value, sizeof(mod->settings->server));
+  }
+  else if (g_strcmp(name, "port") == 0)
+  {
+    mod->settings->tcp_port_rdp = g_atoi(value);
+  }
+  else if (g_strcmp(name, "keylayout") == 0)
+  {
+    mod->settings->keyboard_layout = g_atoi(value);
+  }
+  else if (g_strcmp(name, "name") == 0)
+  {
+  }
+  else if (g_strcmp(name, "lib") == 0)
+  {
+  }
+  else
+  {
+    g_writeln("lib_mod_set_param: unknown name [%s] value [%s]", name, value);
+  }
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_error(rdpInst * inst, const char * text)
+{
+  g_writeln("ui_error:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_warning(rdpInst * inst, const char * text)
+{
+  g_writeln("ui_warning:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_unimpl(rdpInst * inst, const char * text)
+{
+  g_writeln("ui_unimpl:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_begin_update(rdpInst * inst)
+{
+  g_writeln("ui_begin_update:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_end_update(rdpInst * inst)
+{
+  g_writeln("ui_end_update:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_desktop_save(rdpInst * inst, int offset, int x, int y,
+  int cx, int cy)
+{
+  g_writeln("ui_desktop_save:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_desktop_restore(rdpInst * inst, int offset, int x, int y,
+  int cx, int cy)
+{
+  g_writeln("ui_desktop_restore:");
+}
+
+/******************************************************************************/
+RD_HBITMAP DEFAULT_CC
+ui_create_bitmap(rdpInst * inst, int width, int height, uint8 * data)
+{
+  g_writeln("ui_create_bitmap:");
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_paint_bitmap(rdpInst * inst, int x, int y, int cx, int cy, int width,
+  int height, uint8 * data)
+{
+  g_writeln("ui_paint_bitmap:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_destroy_bitmap(rdpInst * inst, RD_HBITMAP bmp)
+{
+  g_writeln("ui_destroy_bitmap:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_line(rdpInst * inst, uint8 opcode, int startx, int starty, int endx,
+  int endy, RD_PEN * pen)
+{
+  g_writeln("ui_line:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_rect(rdpInst * inst, int x, int y, int cx, int cy, int color)
+{
+  g_writeln("ui_rect:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_polygon(rdpInst * inst, uint8 opcode, uint8 fillmode, RD_POINT * point,
+  int npoints, RD_BRUSH * brush, int bgcolor, int fgcolor)
+{
+  g_writeln("ui_polygon:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_polyline(rdpInst * inst, uint8 opcode, RD_POINT * points, int npoints,
+  RD_PEN * pen)
+{
+  g_writeln("ui_polyline:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_ellipse(rdpInst * inst, uint8 opcode, uint8 fillmode, int x, int y,
+  int cx, int cy, RD_BRUSH * brush, int bgcolor, int fgcolor)
+{
+  g_writeln("ui_ellipse:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_start_draw_glyphs(rdpInst * inst, int bgcolor, int fgcolor)
+{
+  g_writeln("ui_start_draw_glyphs:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_draw_glyph(rdpInst * inst, int x, int y, int cx, int cy,
+  RD_HGLYPH glyph)
+{
+  g_writeln("ui_draw_glyph:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_end_draw_glyphs(rdpInst * inst, int x, int y, int cx, int cy)
+{
+  g_writeln("ui_end_draw_glyphs:");
+}
+
+/******************************************************************************/
+uint32 DEFAULT_CC
+ui_get_toggle_keys_state(rdpInst * inst)
+{
+  g_writeln("ui_get_toggle_keys_state:");
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_bell(rdpInst * inst)
+{
+  g_writeln("ui_bell:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_destblt(rdpInst * inst, uint8 opcode, int x, int y, int cx, int cy)
+{
+  g_writeln("ui_destblt:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_patblt(rdpInst * inst, uint8 opcode, int x, int y, int cx, int cy,
+  RD_BRUSH * brush, int bgcolor, int fgcolor)
+{
+  g_writeln("ui_patblt:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_screenblt(rdpInst * inst, uint8 opcode, int x, int y, int cx, int cy,
+  int srcx, int srcy)
+{
+  g_writeln("ui_screenblt:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_memblt(rdpInst * inst, uint8 opcode, int x, int y, int cx, int cy,
+  RD_HBITMAP src, int srcx, int srcy)
+{
+  g_writeln("ui_memblt:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_triblt(rdpInst * inst, uint8 opcode, int x, int y, int cx, int cy,
+  RD_HBITMAP src, int srcx, int srcy, RD_BRUSH * brush, int bgcolor, int fgcolor)
+{
+  g_writeln("ui_triblt:");
+}
+
+/******************************************************************************/
+RD_HGLYPH DEFAULT_CC
+ui_create_glyph(rdpInst * inst, int width, int height, uint8 * data)
+{
+  g_writeln("ui_create_glyph:");
   return 0;
 }
 
 /******************************************************************************/
+void DEFAULT_CC
+ui_destroy_glyph(rdpInst * inst, RD_HGLYPH glyph)
+{
+  g_writeln("ui_destroy_glyph:");
+}
+
+/******************************************************************************/
+int DEFAULT_CC
+ui_select(rdpInst * inst, int rdp_socket)
+{
+  g_writeln("ui_select:");
+  return 1;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_clip(rdpInst * inst, int x, int y, int cx, int cy)
+{
+  g_writeln("ui_set_clip:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_reset_clip(rdpInst * inst)
+{
+  g_writeln("ui_reset_clip:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_resize_window(rdpInst * inst)
+{
+  g_writeln("ui_resize_window:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_cursor(rdpInst * inst, RD_HCURSOR cursor)
+{
+  g_writeln("ui_set_cursor:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_destroy_cursor(rdpInst * inst, RD_HCURSOR cursor)
+{
+  g_writeln("ui_destroy_cursor:");
+}
+
+/******************************************************************************/
+RD_HCURSOR DEFAULT_CC
+ui_create_cursor(rdpInst * inst, unsigned int x, unsigned int y,
+  int width, int height, uint8 * andmask, uint8 * xormask, int bpp)
+{
+  g_writeln("ui_create_cursor:");
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_null_cursor(rdpInst * inst)
+{
+  g_writeln("ui_set_null_cursor:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_default_cursor(rdpInst * inst)
+{
+  g_writeln("ui_set_default_cursor:");
+}
+
+/******************************************************************************/
+RD_HPALETTE DEFAULT_CC
+ui_create_colormap(rdpInst * inst, RD_PALETTE * colors)
+{
+  g_writeln("ui_create_colormap:");
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_move_pointer(rdpInst * inst, int x, int y)
+{
+  g_writeln("ui_move_pointer:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_colormap(rdpInst * inst, RD_HPALETTE map)
+{
+  g_writeln("ui_set_colormap:");
+}
+
+/******************************************************************************/
+RD_HBITMAP DEFAULT_CC
+ui_create_surface(rdpInst * inst, int width, int height, RD_HBITMAP old)
+{
+  g_writeln("ui_create_surface:");
+  return 0;
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_set_surface(rdpInst * inst, RD_HBITMAP surface)
+{
+  g_writeln("ui_set_surface:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_destroy_surface(rdpInst * inst, RD_HBITMAP surface)
+{
+  g_writeln("ui_destroy_surface:");
+}
+
+/******************************************************************************/
+void DEFAULT_CC
+ui_channel_data(rdpInst * inst, int chan_id, char * data, int data_size,
+  int flags, int total_size)
+{
+  g_writeln("ui_channel_data:");
+}
+
+/******************************************************************************/
 struct mod* EXPORT_CC
 mod_init(void)
 {
   struct mod* mod;
 
+  freerdp_global_init();
   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 = (tbus)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;
+  mod->settings = (struct rdp_set*)g_malloc(sizeof(struct rdp_set), 1);
+  mod->inst = freerdp_new(mod->settings);
+  if (mod->inst == 0)
+  {
+    return 0;
+  }
+  mod->inst->ui_error = ui_error;
+  mod->inst->ui_warning = ui_warning;
+  mod->inst->ui_unimpl = ui_unimpl;
+  mod->inst->ui_begin_update = ui_begin_update;
+  mod->inst->ui_end_update = ui_end_update;
+
+  mod->inst->ui_desktop_save = ui_desktop_save;
+  mod->inst->ui_desktop_restore = ui_desktop_restore;
+  mod->inst->ui_create_bitmap = ui_create_bitmap;
+  mod->inst->ui_paint_bitmap = ui_paint_bitmap;
+  mod->inst->ui_destroy_bitmap = ui_destroy_bitmap;
+  mod->inst->ui_line = ui_line;
+  mod->inst->ui_rect = ui_rect;
+  mod->inst->ui_polygon = ui_polygon;
+  mod->inst->ui_polyline = ui_polyline;
+  mod->inst->ui_ellipse = ui_ellipse;
+  mod->inst->ui_start_draw_glyphs = ui_start_draw_glyphs;
+  mod->inst->ui_draw_glyph = ui_draw_glyph;
+  mod->inst->ui_end_draw_glyphs = ui_end_draw_glyphs;
+  mod->inst->ui_get_toggle_keys_state = ui_get_toggle_keys_state;
+  mod->inst->ui_bell = ui_bell;
+  mod->inst->ui_destblt = ui_destblt;
+  mod->inst->ui_patblt = ui_patblt;
+  mod->inst->ui_screenblt = ui_screenblt;
+  mod->inst->ui_memblt = ui_memblt;
+  mod->inst->ui_triblt = ui_triblt;
+  mod->inst->ui_create_glyph = ui_create_glyph;
+  mod->inst->ui_destroy_glyph = ui_destroy_glyph;
+  mod->inst->ui_select = ui_select;
+  mod->inst->ui_set_clip = ui_set_clip;
+  mod->inst->ui_reset_clip = ui_reset_clip;
+  mod->inst->ui_resize_window = ui_resize_window;
+  mod->inst->ui_set_cursor = ui_set_cursor;
+  mod->inst->ui_destroy_cursor = ui_destroy_cursor;
+  mod->inst->ui_create_cursor = ui_create_cursor;
+  mod->inst->ui_set_null_cursor = ui_set_null_cursor;
+  mod->inst->ui_set_default_cursor = ui_set_default_cursor;
+  mod->inst->ui_create_colormap = ui_create_colormap;
+  mod->inst->ui_move_pointer = ui_move_pointer;
+  mod->inst->ui_set_colormap = ui_set_colormap;
+  mod->inst->ui_create_surface = ui_create_surface;
+  mod->inst->ui_set_surface = ui_set_surface;
+  mod->inst->ui_destroy_surface = ui_destroy_surface;
+  mod->inst->ui_channel_data = ui_channel_data;
+
   return mod;
 }
 
@@ -109,6 +511,9 @@ mod_exit(struct mod* mod)
   {
     return 0;
   }
+  freerdp_free(mod->inst);
+  g_free(mod->settings);
   g_free(mod);
+  freerdp_global_finish();
   return 0;
 }
diff --git a/freerdp/xrdp-freerdp.h b/freerdp/xrdp-freerdp.h
index afcafc4a..c6628056 100644
--- a/freerdp/xrdp-freerdp.h
+++ b/freerdp/xrdp-freerdp.h
@@ -97,4 +97,6 @@ struct mod
   int width;
   int height;
   int bpp;
+  struct rdp_set* settings;
+  struct rdp_inst* inst;
 };