Fix GetScales bug

widget_service_get_supported_sizes API and
widget_service_get_supported_size_types API alloc new array
for returning pointer when c# receieve pointer from native,
it cannnot know it's size so, we need to marshalling it manually

Change-Id: I1a3324349cf4a065b7d693b39815e1d2f9a0c5e8
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/src/Tizen.Applications.WidgetControl/Interop/Interop.Libc.cs b/src/Tizen.Applications.WidgetControl/Interop/Interop.Libc.cs
new file mode 100644 (file)
index 0000000..979589f
--- /dev/null
+++ b/src/Tizen.Applications.WidgetControl/Interop/Interop.Libc.cs
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Libc
+    {
+        [DllImport(Libraries.Libc, EntryPoint = "free", CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int Free(IntPtr ptr);
+    }
+}

diff --git a/src/Tizen.Applications.WidgetControl/Interop/Interop.Libraries.cs b/src/Tizen.Applications.WidgetControl/Interop/Interop.Libraries.cs
index e447fa6..3b5ec29 100755 (executable)
--- a/src/Tizen.Applications.WidgetControl/Interop/Interop.Libraries.cs
+++ b/src/Tizen.Applications.WidgetControl/Interop/Interop.Libraries.cs
@@ -18,6 +18,7 @@ internal static partial class Interop
 {
     internal static partial class Libraries
     {
-       public const string WidgetService = "libwidget_service.so.1";
+        public const string WidgetService = "libwidget_service.so.1";
+        public const string Libc = "libc.so.6";
     }
 }

diff --git a/src/Tizen.Applications.WidgetControl/Interop/Interop.WidgetService.cs b/src/Tizen.Applications.WidgetControl/Interop/Interop.WidgetService.cs
index b49e859..995814c 100755 (executable)
--- a/src/Tizen.Applications.WidgetControl/Interop/Interop.WidgetService.cs
+++ b/src/Tizen.Applications.WidgetControl/Interop/Interop.WidgetService.cs
@@ -92,10 +92,10 @@ internal static partial class Interop
         internal static extern string GetPkgId(string widgetId);
 
         [DllImport(Libraries.WidgetService, EntryPoint = "widget_service_get_supported_sizes")]
-        internal static extern ErrorCode GetSupportedSizes(string widgetId, ref int cnt, out int[] w, out int[] h);
+        internal static extern ErrorCode GetSupportedSizes(string widgetId, ref int cnt, out IntPtr w, out IntPtr h);
 
         [DllImport(Libraries.WidgetService, EntryPoint = "widget_service_get_supported_size_types")]
-        internal static extern ErrorCode GetSupportedSizeTypes(string widgetId, ref int cnt, out int[] types);
+        internal static extern ErrorCode GetSupportedSizeTypes(string widgetId, ref int cnt, out IntPtr types);
 
         [DllImport(Libraries.WidgetService, EntryPoint = "widget_service_get_preview_image_path")]
         internal static extern string GetPreviewImagePath(string widgetId, int sizeType);

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs b/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs
index 9407e0d..f8bbc41 100755 (executable)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications/WidgetControl.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using Tizen.Applications;
+using System.Runtime.InteropServices;
 
 namespace Tizen.Applications
 {
@@ -25,6 +26,7 @@ namespace Tizen.Applications
     /// </summary>
     public class WidgetControl : IDisposable
     {
+        protected static readonly string LogTag = "WidgetControl";
         /// <summary>
         /// Class for the widget instance.
         /// </summary>
@@ -467,14 +469,22 @@ namespace Tizen.Applications
         /// <exception cref="UnauthorizedAccessException">Thrown when an application does not have the privilege to access this method.</exception>
         public IEnumerable<Scale> GetScales()
         {
-            int[] w = new int[100];
-            int[] h = new int[100];
-            int[] types = new int[100];
+            IntPtr wPtr;
+            IntPtr hPtr;
+            IntPtr typesPtr;
+            int[] w;
+            int[] h;
+            int[] types;
             int cnt1 = 100;
             int cnt2 = 100;
             IList<Scale> scales = new List<Scale>();
+            Interop.WidgetService.ErrorCode err = Interop.WidgetService.GetSupportedSizes(Id, ref cnt1, out wPtr, out hPtr);
 
-            Interop.WidgetService.ErrorCode err = Interop.WidgetService.GetSupportedSizes(Id, ref cnt1, out w, out h);
+            if (cnt1 == 0)
+            {
+                Log.Error(LogTag, "No supported size :" + Id);
+                return null;
+            }
 
             switch (err)
             {
@@ -487,9 +497,15 @@ namespace Tizen.Applications
                 case Interop.WidgetService.ErrorCode.PermissionDenied:
                     throw new UnauthorizedAccessException();
             }
+            w = new int[cnt1];
+            Marshal.Copy(wPtr, w, 0, cnt1);
+            Interop.Libc.Free(wPtr);
 
-            err = Interop.WidgetService.GetSupportedSizeTypes(Id, ref cnt2, out types);
+            h = new int[cnt1];
+            Marshal.Copy(hPtr, h, 0, cnt1);
+            Interop.Libc.Free(hPtr);
 
+            err = Interop.WidgetService.GetSupportedSizeTypes(Id, ref cnt2, out typesPtr);
             switch (err)
             {
                 case Interop.WidgetService.ErrorCode.InvalidParameter:
@@ -503,7 +519,14 @@ namespace Tizen.Applications
             }
 
             if (cnt1 != cnt2)
+            {
+                Log.Error(LogTag, "Count not match cnt1 :" + cnt1 + ", cnt2 :" + cnt2);
                 return null;
+            }
+
+            types = new int[cnt2];
+            Marshal.Copy(typesPtr, types, 0, cnt2);
+            Interop.Libc.Free(typesPtr);
 
             for (int i = 0; i < cnt1; i++)
             {