NFreeRDP: added connection dialog

4 files changed, 46 insertions, 37 deletions

diff --git a/FreeRDP/Codec/Rfx.cs b/FreeRDP/Codec/Rfx.cs
index cc456d0..5f9a38f 100644
--- a/FreeRDP/Codec/Rfx.cs
+++ b/FreeRDP/Codec/Rfx.cs
@@ -37,14 +37,14 @@ namespace FreeRDP
 			PALETTE4_PLANER = 6,
 			PALETTE8 = 7
 		}
-		
-		[DllImport("libfreerdp-codec")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr rfx_context_new();
-	
-		[DllImport("libfreerdp-codec")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void rfx_context_free(IntPtr handle);
-		
-		[DllImport("libfreerdp-codec")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void rfx_context_set_pixel_format(IntPtr handle, RFX_PIXEL_FORMAT format);
 		
 		public Rfx()
diff --git a/FreeRDP/Core/FreeRDP.cs b/FreeRDP/Core/FreeRDP.cs
index 1b8050a..deea319 100644
--- a/FreeRDP/Core/FreeRDP.cs
+++ b/FreeRDP/Core/FreeRDP.cs
@@ -22,13 +22,22 @@ using System.Runtime.InteropServices;
 
 namespace FreeRDP
 {
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate void pContextNew(freerdp* instance, rdpContext* context);
+
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate void pContextFree(freerdp* instance, rdpContext* context);
-		
+	
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate bool pPreConnect(freerdp* instance);
+
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate bool pPostConnect(freerdp* instance);
 	
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate bool pAuthenticate(freerdp* instance, IntPtr username, IntPtr password, IntPtr domain);
+
+	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 	public unsafe delegate bool pVerifyCertificate(freerdp* instance, IntPtr subject, IntPtr issuer, IntPtr fingerprint);
 	
 	[StructLayout(LayoutKind.Sequential)]
diff --git a/FreeRDP/Core/RDP.cs b/FreeRDP/Core/RDP.cs
index d845045..ff12bed 100644
--- a/FreeRDP/Core/RDP.cs
+++ b/FreeRDP/Core/RDP.cs
@@ -25,40 +25,40 @@ namespace FreeRDP
 {	
 	public unsafe class RDP
 	{		
-		[DllImport("libfreerdp-core")]
+		[DllImport("libfreerdp", CallingConvention=CallingConvention.Cdecl)]
 		public static extern void freerdp_context_new(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_context_free(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int freerdp_connect(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int freerdp_disconnect(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int freerdp_check_fds(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern freerdp* freerdp_new();
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_free(freerdp* instance);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_input_send_synchronize_event(IntPtr input, UInt32 flags);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_input_send_keyboard_event(IntPtr input, UInt16 flags, UInt16 code);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_input_send_unicode_keyboard_event(IntPtr input, UInt16 flags, UInt16 code);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_input_send_mouse_event(IntPtr input, UInt16 flags, UInt16 x, UInt16 y);
-		
-		[DllImport("libfreerdp-core")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void freerdp_input_send_extended_mouse_event(IntPtr input, UInt16 flags, UInt16 x, UInt16 y);
 		
 		public int Port { get { return (int) settings->port; } set { settings->port = (UInt32) value; } }
diff --git a/FreeRDP/Utils/Memory.cs b/FreeRDP/Utils/Memory.cs
index 3301509..a597cf2 100644
--- a/FreeRDP/Utils/Memory.cs
+++ b/FreeRDP/Utils/Memory.cs
@@ -24,16 +24,16 @@ namespace FreeRDP
 {
 	public unsafe class Memory
 	{
-		[DllImport("libfreerdp-utils")]
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr xmalloc(UIntPtr size);
-		
-		[DllImport("libfreerdp-utils")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr xzalloc(UIntPtr size);
-		
-		[DllImport("libfreerdp-utils")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr xrealloc(IntPtr ptr, UIntPtr size);
-		
-		[DllImport("libfreerdp-utils")]
+
+		[DllImport("libfreerdp", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void xfree(IntPtr ptr);
 		
 		public Memory()