Update to the new GLib init API

frida-clr.vcxproj

@@ -148,7 +148,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Application.cpp" />
+    <ClCompile Include="src\Runtime.cpp" />
     <ClCompile Include="src\Device.cpp" />
     <ClCompile Include="src\Marshal.cpp" />
     <ClCompile Include="src\DeviceManager.cpp" />
@@ -157,7 +157,7 @@
     <ClCompile Include="src\Session.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\Application.hpp" />
+    <ClInclude Include="src\Runtime.hpp" />
     <ClInclude Include="src\Device.hpp" />
     <ClInclude Include="src\Marshal.hpp" />
     <ClInclude Include="src\DeviceManager.hpp" />

frida-clr.vcxproj.filters

@@ -18,9 +18,6 @@
     <ClCompile Include="src\DeviceManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Application.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Marshal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -36,6 +33,9 @@
     <ClCompile Include="src\Script.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Runtime.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Marshal.hpp">
@@ -50,14 +50,14 @@
     <ClInclude Include="src\Process.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\Application.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\Session.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Script.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\Runtime.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

src/Device.cpp

@@ -1,8 +1,8 @@
 #include "Device.hpp"
 
-#include "Application.hpp"
 #include "Marshal.hpp"
 #include "Process.hpp"
+#include "Runtime.hpp"
 #include "Session.hpp"
 
 using System::Windows::Threading::DispatcherPriority;
@@ -16,7 +16,7 @@ namespace Frida
       dispatcher (dispatcher),
       icon (nullptr)
   {
-    Application::ref ();
+    Runtime::Ref ();
 
     selfHandle = new msclr::gcroot<Device ^> (this);
     onLostHandler = gcnew EventHandler (this, &Device::OnLost);
@@ -47,7 +47,7 @@ namespace Frida
       g_object_unref (handle);
       handle = NULL;
 
-      Application::unref ();
+      Runtime::Unref ();
     }
   }
 

src/DeviceManager.cpp

@@ -1,8 +1,8 @@
 #include "DeviceManager.hpp"
 
-#include "Application.hpp"
 #include "Device.hpp"
 #include "Marshal.hpp"
+#include "Runtime.hpp"
 
 using System::Windows::Threading::DispatcherPriority;
 
@@ -13,7 +13,7 @@ namespace Frida
   DeviceManager::DeviceManager (Dispatcher ^ dispatcher)
     : dispatcher (dispatcher)
   {
-    Application::ref ();
+    Runtime::Ref ();
 
     handle = frida_device_manager_new ();
 
@@ -42,7 +42,7 @@ namespace Frida
       g_object_unref (handle);
       handle = NULL;
 
-      Application::unref ();
+      Runtime::Unref ();
     }
   }
 

src/Process.cpp

@@ -1,7 +1,7 @@
 #include "Process.hpp"
 
-#include "Application.hpp"
 #include "Marshal.hpp"
+#include "Runtime.hpp"
 
 namespace Frida
 {
@@ -10,7 +10,7 @@ namespace Frida
       smallIcon (nullptr),
       largeIcon (nullptr)
   {
-    Application::ref ();
+    Runtime::Ref ();
   }
 
   Process::~Process ()
@@ -39,7 +39,7 @@ namespace Frida
       g_object_unref (handle);
       handle = NULL;
 
-      Application::unref ();
+      Runtime::Unref ();
     }
   }
 

src/Application.cpp → src/Runtime.cpp

@@ -1,34 +1,38 @@
-#include "Application.hpp"
+#include "Runtime.hpp"
 
 #include <frida-core.h>
 
 namespace Frida
 {
-  volatile int Application::refCount = 0;
+  volatile int Runtime::refCount = 0;
 
-  void Application::ref ()
+  void Runtime::Ref ()
   {
     g_atomic_int_inc (&refCount);
+    glib_init ();
     frida_init ();
   }
 
-  void Application::unref ()
+  void Runtime::Unref ()
   {
     if (g_atomic_int_dec_and_test (&refCount))
+    {
       frida_deinit ();
+      glib_deinit ();
+    }
   }
 
   class Assembly
   {
   public:
     Assembly ()
     {
-      Application::ref ();
+      Runtime::Ref ();
     }
 
     ~Assembly ()
     {
-      Application::unref ();
+      Runtime::Unref ();
     }
   };
   static Assembly assembly;

src/Application.hpp → src/Runtime.hpp

@@ -2,11 +2,11 @@
 
 namespace Frida
 {
-  class Application
+  class Runtime
   {
   public:
-    static void ref ();
-    static void unref ();
+    static void Ref ();
+    static void Unref ();
 
   private:
     static volatile int refCount;

src/Script.cpp

@@ -1,7 +1,7 @@
 #include "Script.hpp"
 
-#include "Application.hpp"
 #include "Marshal.hpp"
+#include "Runtime.hpp"
 
 using System::Windows::Threading::DispatcherPriority;
 
@@ -13,7 +13,7 @@ namespace Frida
     : handle (handle),
       dispatcher (dispatcher)
   {
-    Application::ref ();
+    Runtime::Ref ();
 
     selfHandle = new msclr::gcroot<Script ^> (this);
     onMessageHandler = gcnew ScriptMessageHandler (this, &Script::OnMessage);
@@ -39,7 +39,7 @@ namespace Frida
       g_object_unref (handle);
       handle = NULL;
 
-      Application::unref ();
+      Runtime::Unref ();
     }
   }
 

src/Session.cpp

@@ -1,7 +1,7 @@
 #include "Session.hpp"
 
-#include "Application.hpp"
 #include "Marshal.hpp"
+#include "Runtime.hpp"
 #include "Script.hpp"
 
 using System::Windows::Threading::DispatcherPriority;
@@ -14,7 +14,7 @@ namespace Frida
     : handle (handle),
       dispatcher (dispatcher)
   {
-    Application::ref ();
+    Runtime::Ref ();
 
     selfHandle = new msclr::gcroot<Session ^> (this);
     onDetachedHandler = gcnew EventHandler (this, &Session::OnDetached);
@@ -40,7 +40,7 @@ namespace Frida
       g_object_unref (handle);
       handle = NULL;
 
-      Application::unref ();
+      Runtime::Unref ();
     }
   }