Author: joncham
Date: 2007-02-11 11:10:36 -0500 (Sun, 11 Feb 2007)
New Revision: 72618
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/marshal.c
Log:
2007-02-11 Jonathan Chambers <[EMAIL PROTECTED]>
* marshal.c: Fix warnings and remember to call Release on
IUnknown of RCW.
Code is contributed under MIT/X11 license.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-02-11 15:59:17 UTC (rev 72617)
+++ trunk/mono/mono/metadata/ChangeLog 2007-02-11 16:10:36 UTC (rev 72618)
@@ -1,3 +1,10 @@
+2007-02-11 Jonathan Chambers <[EMAIL PROTECTED]>
+
+ * marshal.c: Fix warnings and remember to call Release on
+ IUnknown of RCW.
+
+ Code is contributed under MIT/X11 license.
+
2007-02-10 Miguel de Icaza <[EMAIL PROTECTED]>
* class-internals.h: Add MonoHandleRef definition, and
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2007-02-11 15:59:17 UTC (rev 72617)
+++ trunk/mono/mono/metadata/marshal.c 2007-02-11 16:10:36 UTC (rev 72618)
@@ -408,7 +408,6 @@
static int
cominterop_get_com_slot_for_method (MonoMethod* method)
{
- guint32 offset = 7;
guint32 slot = method->slot;
GPtrArray *ifaces;
MonoClass *ic = NULL;
@@ -6960,7 +6959,7 @@
switch (action) {
case MARSHAL_ACTION_CONV_IN: {
- guint32 pos_null = 0, pos_rcw = 0, pos_end = 0;
+ guint32 pos_null = 0;
*conv_arg_type = &mono_defaults.int_class->byval_arg;
conv_arg = mono_mb_add_local (mb,
&mono_defaults.int_class->byval_arg);
@@ -7113,8 +7112,7 @@
case MARSHAL_ACTION_MANAGED_CONV_OUT: {
if (t->byref && t->attrs & PARAM_ATTRIBUTE_OUT) {
static MonoMethod* AddRef = NULL;
- char *msg = NULL;
- guint32 pos_null = 0, pos_rcw = 0, pos_end = 0;
+ guint32 pos_null = 0;
if (!AddRef)
AddRef = mono_class_get_method_from_name
(mono_defaults.marshal_class, "AddRef", 1);
@@ -10114,8 +10112,6 @@
if (cominterop_object_is_rcw (object)) {
MonoClass *klass = NULL;
MonoRealProxy* real_proxy = NULL;
- MonoComInteropProxy* com_interop_proxy = NULL;
- MonoComObject* com_object = NULL;
if (!object)
return NULL;
klass = mono_object_class (object);
@@ -10598,6 +10594,7 @@
}
g_hash_table_foreach_remove (obj->itf_hash,
cominterop_finalizer, NULL);
+
ves_icall_System_Runtime_InteropServices_Marshal_ReleaseInternal
(obj->iunknown);
obj->itf_hash = obj->iunknown = NULL;
mono_cominterop_unlock ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches