Skip to content

[NUI][WIP] Migrate DllImport to LibraryImport in NUI modules #7513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hinohie wants to merge 1 commit into
base: DevelNUI
Choose a base branch
from
Draft

[NUI][WIP] Migrate DllImport to LibraryImport in NUI modules #7513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/Tizen.NUI/src/internal/Application/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ protected override void Dispose(DisposeTypes type)
}
protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
{
Interop.Application.DeleteApplication(swigCPtr);
Interop.Application.DeleteApplication(swigCPtr.Handle);
}

public enum BatteryStatus
Expand Down Expand Up @@ -1788,9 +1788,9 @@ public bool AddIdle(System.Delegate func)
{
rootIdleCallback = RootIdleCallback;
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(rootIdleCallback);
System.IntPtr ip2 = Interop.Application.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));
System.IntPtr ip2 = Interop.Application.MakeCallback((new System.Runtime.InteropServices.HandleRef(this, ip)).Handle);

bool ret = Interop.Application.AddIdle(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));
bool ret = Interop.Application.AddIdle(SwigCPtr.Handle, (new System.Runtime.InteropServices.HandleRef(this, ip2)).Handle);
NDalicPINVOKE.ThrowExceptionIfExists();
if (!ret)
{
Expand Down Expand Up @@ -1905,7 +1905,7 @@ public static Application New(string[] args, string stylesheet, NUIApplication.W

public static Application New(int argc, string stylesheet, NUIApplication.WindowMode windowMode, Rectangle positionSize)
{
Application ret = new Application(Interop.Application.New(argc, stylesheet, (int)windowMode, Rectangle.getCPtr(positionSize)), true);
Application ret = new Application(Interop.Application.New(argc, stylesheet, (int)windowMode, Rectangle.getCPtr(positionSize).Handle), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand Down Expand Up @@ -1954,7 +1954,7 @@ public static Application New(string[] args, string stylesheet, NUIApplication.W
// It will be removed until dali APIs are prepared.
using Rectangle initRectangle = new Rectangle(0, 0, 0, 0);

Application ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, (int)windowMode, Rectangle.getCPtr(initRectangle), (int)type), true);
Application ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, (int)windowMode, Rectangle.getCPtr(initRectangle).Handle, (int)type), true);
return ret;
}

Expand All @@ -1968,7 +1968,7 @@ public static Application New(string[] args, string stylesheet, NUIApplication.W
argc = args.Length;
argvStr = string.Join(" ", args);

ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, (int)windowMode, Rectangle.getCPtr(positionSize), useUIThread), true);
ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, (int)windowMode, Rectangle.getCPtr(positionSize).Handle, useUIThread), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
catch (Exception exception)
Expand All @@ -1992,7 +1992,7 @@ public static Application New(string[] args, string stylesheet, bool useUIThread
argc = args.Length;
argvStr = string.Join(" ", args);

ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, useUIThread, WindowData.getCPtr(windowData)), true);
ret = new Application(Interop.Application.New(argc, argvStr, stylesheet, useUIThread, WindowData.getCPtr(windowData).Handle), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
catch (Exception exception)
Expand All @@ -2011,14 +2011,14 @@ public Application() : this(Interop.Application.NewApplication(), true)
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

public Application(Application application) : this(Interop.Application.NewApplication(Application.getCPtr(application)), true)
public Application(Application application) : this(Interop.Application.NewApplication(Application.getCPtr(application).Handle), true)
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

public Application Assign(Application application)
{
Application ret = new Application(Interop.Application.Assign(SwigCPtr, Application.getCPtr(application)), false);
Application ret = new Application(Interop.Application.Assign(SwigCPtr.Handle, Application.getCPtr(application).Handle), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand All @@ -2031,13 +2031,13 @@ public void MainLoop()

public void Lower()
{
Interop.Application.Lower(SwigCPtr);
Interop.Application.Lower(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

public void Quit()
{
Interop.Application.Quit(SwigCPtr);
Interop.Application.Quit(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand All @@ -2048,7 +2048,7 @@ public Window GetWindow()
return window;
}

var nativeWindow = Interop.Application.GetWindow(SwigCPtr);
var nativeWindow = Interop.Application.GetWindow(SwigCPtr.Handle);
window = Registry.GetManagedBaseHandleFromNativePtr(nativeWindow) as Window;
if (window != null)
{
Expand Down Expand Up @@ -2076,27 +2076,27 @@ public static string GetResourcePath()

public string GetLanguage()
{
string ret = Interop.Application.GetLanguage(SwigCPtr);
string ret = Interop.Application.GetLanguage(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public string GetRegion()
{
string ret = Interop.Application.GetRegion(SwigCPtr);
string ret = Interop.Application.GetRegion(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}

public void FlushUpdateMessages()
{
Interop.Application.FlushUpdateMessages(SwigCPtr);
Interop.Application.FlushUpdateMessages(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

public void SetApplicationLocale(string locale)
{
Interop.Application.SetApplicationLocale(SwigCPtr, locale);
Interop.Application.SetApplicationLocale(SwigCPtr.Handle, locale);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
8 changes: 4 additions & 4 deletions src/Tizen.NUI/src/internal/Application/ApplicationControlSignal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public bool Empty()

public uint GetConnectionCount()
{
uint ret = Interop.ApplicationControlSignal.GetConnectionCount(SwigCPtr);
uint ret = Interop.ApplicationControlSignal.GetConnectionCount(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand All @@ -46,7 +46,7 @@ public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
{
Interop.ApplicationControlSignal.Connect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.ApplicationControlSignal.Connect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
Expand All @@ -55,14 +55,14 @@ public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
{
Interop.ApplicationControlSignal.Disconnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.ApplicationControlSignal.Disconnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}

public void Emit(Application arg1, System.IntPtr arg2)
{
Interop.ApplicationControlSignal.Emit(SwigCPtr, Application.getCPtr(arg1), arg2);
Interop.ApplicationControlSignal.Emit(SwigCPtr.Handle, Application.getCPtr(arg1).Handle, arg2);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
8 changes: 4 additions & 4 deletions src/Tizen.NUI/src/internal/Application/ApplicationSignal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public bool Empty()

public uint GetConnectionCount()
{
uint ret = Interop.ApplicationSignal.GetConnectionCount(SwigCPtr);
uint ret = Interop.ApplicationSignal.GetConnectionCount(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand All @@ -48,7 +48,7 @@ public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
{
Interop.ApplicationSignal.Connect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.ApplicationSignal.Connect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
Expand All @@ -57,14 +57,14 @@ public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
{
Interop.ApplicationSignal.Disconnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.ApplicationSignal.Disconnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}

public void Emit(Application arg)
{
Interop.ApplicationSignal.Emit(SwigCPtr, Application.getCPtr(arg));
Interop.ApplicationSignal.Emit(SwigCPtr.Handle, Application.getCPtr(arg).Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
8 changes: 4 additions & 4 deletions src/Tizen.NUI/src/internal/Application/WatchBoolSignal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public bool Empty()

public uint GetConnectionCount()
{
uint ret = Interop.Watch.WatchBoolSignalGetConnectionCount(SwigCPtr);
uint ret = Interop.Watch.WatchBoolSignalGetConnectionCount(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand All @@ -46,7 +46,7 @@ public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
Interop.Watch.WatchBoolSignalConnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.Watch.WatchBoolSignalConnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
Expand All @@ -55,14 +55,14 @@ public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
Interop.Watch.WatchBoolSignalDisconnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.Watch.WatchBoolSignalDisconnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}

public void Emit(Application arg1, bool arg2)
{
Interop.Watch.WatchBoolSignalEmit(SwigCPtr, Application.getCPtr(arg1), arg2);
Interop.Watch.WatchBoolSignalEmit(SwigCPtr.Handle, Application.getCPtr(arg1).Handle, arg2);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
8 changes: 4 additions & 4 deletions src/Tizen.NUI/src/internal/Application/WatchTimeSignal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public bool Empty()

public uint GetConnectionCount()
{
uint ret = Interop.Watch.WatchTimeSignalGetConnectionCount(SwigCPtr);
uint ret = Interop.Watch.WatchTimeSignalGetConnectionCount(SwigCPtr.Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
Expand All @@ -46,7 +46,7 @@ public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
Interop.Watch.WatchTimeSignalConnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.Watch.WatchTimeSignalConnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
Expand All @@ -55,14 +55,14 @@ public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
Interop.Watch.WatchTimeSignalDisconnect(SwigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
Interop.Watch.WatchTimeSignalDisconnect(SwigCPtr.Handle, ip);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}

public void Emit(Application arg1, WatchTime arg2)
{
Interop.Watch.WatchTimeSignalEmit(SwigCPtr, Application.getCPtr(arg1), WatchTime.getCPtr(arg2));
Interop.Watch.WatchTimeSignalEmit(SwigCPtr.Handle, Application.getCPtr(arg1).Handle, WatchTime.getCPtr(arg2).Handle);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}

Expand Down
Loading
Loading