Fix Interop error

 - Fix wrong signature
 - Fix wrong string return

Change-Id: I3b68732a3093f9249dc5e4143405b084e2c79dda

diff --git a/src/ElmSharp/Interop/Interop.Elementary.Entry.cs b/src/ElmSharp/Interop/Interop.Elementary.Entry.cs
index 23285a7..b858d5a 100644 (file)
--- a/src/ElmSharp/Interop/Interop.Elementary.Entry.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.Entry.cs
@@ -349,8 +349,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_entry_anchor_hover_end(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_entry_anchor_hover_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_entry_anchor_hover_style_get")]
+        internal static extern IntPtr _elm_entry_anchor_hover_style_get(IntPtr obj);
+
+        internal static string elm_entry_anchor_hover_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_entry_anchor_hover_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_entry_anchor_hover_style_set(IntPtr obj, string style);
@@ -382,10 +387,15 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_entry_selection_handler_disabled_set(IntPtr obj, bool disabled);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_entry_selection_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_entry_selection_get")]
+        internal static extern IntPtr _elm_entry_selection_get(IntPtr obj);
+
+        internal static string elm_entry_selection_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_entry_selection_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
-        internal static extern string elm_entry_select_region_set(IntPtr obj, int start, int end);
+        internal static extern void elm_entry_select_region_set(IntPtr obj, int start, int end);
     }
 }
\ No newline at end of file

diff --git a/src/ElmSharp/Interop/Interop.Elementary.GenGridView.cs b/src/ElmSharp/Interop/Interop.Elementary.GenGridView.cs
index d4bfebb..b9acd01 100644 (file)
--- a/src/ElmSharp/Interop/Interop.Elementary.GenGridView.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.GenGridView.cs
@@ -141,8 +141,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern IntPtr elm_gengrid_last_item_get(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_gengrid_item_cursor_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_gengrid_item_cursor_get")]
+        internal static extern IntPtr _elm_gengrid_item_cursor_get(IntPtr obj);
+
+        internal static string elm_gengrid_item_cursor_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_gengrid_item_cursor_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_gengrid_item_cursor_set(IntPtr obj, string cursor);
@@ -150,8 +155,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_gengrid_item_cursor_unset(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_gengrid_item_cursor_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_gengrid_item_cursor_style_get")]
+        internal static extern IntPtr _elm_gengrid_item_cursor_style_get(IntPtr obj);
+
+        internal static string elm_gengrid_item_cursor_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_gengrid_item_cursor_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_gengrid_item_cursor_style_set(IntPtr obj, string cursor);
@@ -168,8 +178,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_gengrid_item_tooltip_unset(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_gengrid_item_tooltip_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_gengrid_item_tooltip_style_get")]
+        internal static extern IntPtr _elm_gengrid_item_tooltip_style_get(IntPtr obj);
+
+        internal static string elm_gengrid_item_tooltip_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_gengrid_item_tooltip_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_gengrid_item_tooltip_style_set(IntPtr obj, string style);

diff --git a/src/ElmSharp/Interop/Interop.Elementary.GenListView.cs b/src/ElmSharp/Interop/Interop.Elementary.GenListView.cs
index 2205899..bfb326f 100644 (file)
--- a/src/ElmSharp/Interop/Interop.Elementary.GenListView.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.GenListView.cs
@@ -190,8 +190,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern IntPtr elm_genlist_selected_item_get(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_genlist_item_cursor_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_genlist_item_cursor_get")]
+        internal static extern IntPtr _elm_genlist_item_cursor_get(IntPtr obj);
+
+        internal static string elm_genlist_item_cursor_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_genlist_item_cursor_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_genlist_item_cursor_set(IntPtr obj, string cursor);
@@ -205,8 +210,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_genlist_item_cursor_engine_only_set(IntPtr obj, bool engineOnly);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_genlist_item_cursor_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_genlist_item_cursor_style_get")]
+        internal static extern IntPtr _elm_genlist_item_cursor_style_get(IntPtr obj);
+
+        internal static string elm_genlist_item_cursor_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_genlist_item_cursor_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_genlist_item_cursor_style_set(IntPtr obj, string style);
@@ -226,8 +236,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_genlist_item_tooltip_unset(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_genlist_item_tooltip_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_genlist_item_tooltip_style_get")]
+        internal static extern IntPtr _elm_genlist_item_tooltip_style_get(IntPtr obj);
+
+        internal static string elm_genlist_item_tooltip_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_genlist_item_tooltip_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_genlist_item_tooltip_style_set(IntPtr obj, string style);

diff --git a/src/ElmSharp/Interop/Interop.Elementary.Win.cs b/src/ElmSharp/Interop/Interop.Elementary.Win.cs
old mode 100755 (executable)
new mode 100644 (file)
index 3b86ee2..f0d2412
--- a/src/ElmSharp/Interop/Interop.Elementary.Win.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.Win.cs
@@ -76,8 +76,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_role_set(IntPtr obj, string role);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_win_focus_highlight_style_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_win_focus_highlight_style_get")]
+        internal static extern IntPtr _elm_win_focus_highlight_style_get(IntPtr obj);
+
+        internal static string elm_win_focus_highlight_style_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_win_focus_highlight_style_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_focus_highlight_style_set(IntPtr obj, string style);
@@ -273,8 +278,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_focus_highlight_animate_set(IntPtr obj, bool animate);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_win_icon_name_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_win_icon_name_get")]
+        internal static extern IntPtr _elm_win_icon_name_get(IntPtr obj);
+
+        internal static string elm_win_icon_name_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_win_icon_name_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_icon_name_set(IntPtr obj, string iconName);
@@ -315,8 +325,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_norender_push(IntPtr obj);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_win_profile_get(IntPtr obj);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_win_profile_get")]
+        internal static extern IntPtr _elm_win_profile_get(IntPtr obj);
+
+        internal static string elm_win_profile_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_elm_win_profile_get(obj));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_win_profile_set(IntPtr obj, string profile);

diff --git a/src/ElmSharp/Interop/Interop.Elementary.cs b/src/ElmSharp/Interop/Interop.Elementary.cs
old mode 100755 (executable)
new mode 100644 (file)
index d0b17d4..601f8ee
--- a/src/ElmSharp/Interop/Interop.Elementary.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.cs
@@ -88,8 +88,7 @@ internal static partial class Interop
 
         internal static string elm_config_profile_get()
         {
-            var str = _elm_config_profile_get();
-            return Marshal.PtrToStringAnsi(str);
+            return Marshal.PtrToStringAnsi(_elm_config_profile_get());
         }
 
         [DllImport(Libraries.Elementary)]
@@ -176,10 +175,10 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern IntPtr elm_conformant_add(IntPtr obj);
 
-        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_part_text_get", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true, CharSet = CharSet.Ansi)]
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_part_text_get")]
         internal static extern IntPtr _elm_object_part_text_get(IntPtr obj, IntPtr part);
 
-        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_part_text_get", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true, CharSet = CharSet.Ansi)]
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_part_text_get")]
         internal static extern IntPtr _elm_object_part_text_get(IntPtr obj, string part);
 
         [DllImport(Libraries.Elementary)]
@@ -188,13 +187,12 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_object_tooltip_unset(IntPtr obj);
 
-        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_tooltip_style_get", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true, CharSet = CharSet.Ansi)]
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_tooltip_style_get")]
         internal static extern IntPtr _elm_object_tooltip_style_get(IntPtr obj);
 
         internal static string elm_object_tooltip_style_get(IntPtr obj)
         {
-            var style = _elm_object_tooltip_style_get(obj);
-            return Marshal.PtrToStringAnsi(style);
+            return Marshal.PtrToStringAnsi(_elm_object_tooltip_style_get(obj));
         }
 
         [DllImport(Libraries.Elementary)]
@@ -235,14 +233,12 @@ internal static partial class Interop
 
         internal static string elm_object_part_text_get(IntPtr obj, string part)
         {
-            var text = _elm_object_part_text_get(obj, part);
-            return Marshal.PtrToStringAnsi(text);
+            return Marshal.PtrToStringAnsi(_elm_object_part_text_get(obj, part));
         }
 
         internal static string elm_object_part_text_get(IntPtr obj)
         {
-            var text = _elm_object_part_text_get(obj, IntPtr.Zero);
-            return Marshal.PtrToStringAnsi(text);
+            return Marshal.PtrToStringAnsi(_elm_object_part_text_get(obj, IntPtr.Zero));
         }
 
         [DllImport(Libraries.Elementary)]
@@ -282,13 +278,12 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_layout_text_set(IntPtr obj, string part, string text);
 
-        [DllImport(Libraries.Elementary, EntryPoint = "elm_layout_text_get", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true, CharSet = CharSet.Ansi)]
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_layout_text_get")]
         internal static extern IntPtr _elm_layout_text_get(IntPtr obj, string part);
 
         internal static string elm_layout_text_get(IntPtr obj, string part)
         {
-            var text = _elm_layout_text_get(obj, part);
-            return Marshal.PtrToStringAnsi(text);
+            return Marshal.PtrToStringAnsi(_elm_layout_text_get(obj, part));
         }
 
         [DllImport(Libraries.Elementary)]
@@ -324,8 +319,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_layout_box_remove_all(IntPtr obj, string part, bool clear);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_layout_data_get(IntPtr obj, string key);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_layout_data_get")]
+        internal static extern IntPtr _elm_layout_data_get(IntPtr obj, string key);
+
+        internal static string elm_layout_data_get(IntPtr obj, string key)
+        {
+            return Marshal.PtrToStringAnsi(_elm_layout_data_get(obj, key));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void elm_layout_text_valign_set(IntPtr obj, string part, double valign);
@@ -360,13 +360,12 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_object_style_set(IntPtr obj, string style);
 
-        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_style_get", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true, CharSet = CharSet.Ansi)]
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_object_style_get")]
         internal static extern IntPtr _elm_object_style_get(IntPtr obj);
 
         internal static string elm_object_style_get(IntPtr obj)
         {
-            var text = _elm_object_style_get(obj);
-            return Marshal.PtrToStringAnsi(text);
+            return Marshal.PtrToStringAnsi(_elm_object_style_get(obj));
         }
 
         [DllImport(Libraries.Elementary)]
@@ -433,7 +432,7 @@ internal static partial class Interop
         internal static extern void elm_theme_overlay_add(IntPtr theme, string path);
 
         [DllImport(Libraries.Elementary)]
-        internal static extern string elm_language_set(string lang);
+        internal static extern void elm_language_set(string lang);
 
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_policy_set(uint policy, int value);
@@ -536,8 +535,13 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern bool edje_object_part_box_prepend(IntPtr obj, string part, IntPtr child);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string edje_object_part_state_get(IntPtr obj, string part, out double value);
+        [DllImport(Libraries.Elementary, EntryPoint = "edje_object_part_state_get")]
+        internal static extern IntPtr _edje_object_part_state_get(IntPtr obj, string part, out double value);
+
+        internal static string edje_object_part_state_get(IntPtr obj, string part, out double value)
+        {
+            return Marshal.PtrToStringAnsi(_edje_object_part_state_get(obj, part, out value));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern void edje_object_signal_callback_add(IntPtr obj, string emission, string source, Edje_Signal_Cb func, IntPtr data);
@@ -754,14 +758,24 @@ internal static partial class Interop
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_layout_part_cursor_engine_only_set(IntPtr obj, string part, bool engineOnly);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_layout_part_cursor_get(IntPtr obj, string part);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_layout_part_cursor_get")]
+        internal static extern IntPtr _elm_layout_part_cursor_get(IntPtr obj, string part);
+
+        internal static string elm_layout_part_cursor_get(IntPtr obj, string part)
+        {
+            return Marshal.PtrToStringAnsi(_elm_layout_part_cursor_get(obj, part));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_layout_part_cursor_set(IntPtr obj, string part, string cursor);
 
-        [DllImport(Libraries.Elementary)]
-        internal static extern string elm_layout_part_cursor_style_get(IntPtr obj, string part);
+        [DllImport(Libraries.Elementary, EntryPoint = "elm_layout_part_cursor_style_get")]
+        internal static extern IntPtr _elm_layout_part_cursor_style_get(IntPtr obj, string part);
+
+        internal static string elm_layout_part_cursor_style_get(IntPtr obj, string part)
+        {
+            return Marshal.PtrToStringAnsi(_elm_layout_part_cursor_style_get(obj, part));
+        }
 
         [DllImport(Libraries.Elementary)]
         internal static extern bool elm_layout_part_cursor_style_set(IntPtr obj, string part, string style);

diff --git a/src/ElmSharp/Interop/Interop.Evas.cs b/src/ElmSharp/Interop/Interop.Evas.cs
old mode 100755 (executable)
new mode 100644 (file)
index f37ae6f..60e3d16
--- a/src/ElmSharp/Interop/Interop.Evas.cs
+++ b/src/ElmSharp/Interop/Interop.Evas.cs
@@ -465,8 +465,13 @@ internal static partial class Interop
         [DllImport(Libraries.Evas)]
         internal static extern void evas_image_cache_set(IntPtr obj, int size);
 
-        [DllImport(Libraries.Evas)]
-        internal static extern string evas_load_error_str(LoadError error);
+        [DllImport(Libraries.Evas, EntryPoint = "evas_load_error_str")]
+        internal static extern IntPtr _evas_load_error_str(LoadError error);
+
+        internal static string evas_load_error_str(LoadError error)
+        {
+            return Marshal.PtrToStringAnsi(_evas_load_error_str(error));
+        }
 
         [DllImport(Libraries.Evas)]
         internal static extern IntPtr evas_object_data_del(IntPtr obj, string key);
@@ -579,11 +584,16 @@ internal static partial class Interop
         [DllImport(Libraries.Evas)]
         internal static extern IntPtr evas_smart_class_new(IntPtr obj);
 
-        [DllImport(Libraries.Evas)]
-        internal static extern string evas_device_name_get(IntPtr obj);
+        [DllImport(Libraries.Evas, EntryPoint = "evas_device_name_get")]
+        internal static extern IntPtr _evas_device_name_get(IntPtr obj);
+
+        internal static string evas_device_name_get(IntPtr obj)
+        {
+            return Marshal.PtrToStringAnsi(_evas_device_name_get(obj));
+        }
 
         [DllImport(Libraries.Evas)]
-        internal static extern string evas_font_path_global_clear();
+        internal static extern void evas_font_path_global_clear();
 
         [DllImport(Libraries.Evas)]
         internal static extern IntPtr evas_object_above_get(IntPtr obj);