Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2009-11-20 Zoltan Varga <vargaz@gmail.com>

	* libtest.c (mono_test_marshal_bool_in): Use 'short' as the type of the
	variant bool argument.

	* marshalbool.cs: Pass -1 as the 'expected' argument instead of 0xffff, which
	causes sign extensions issues on some platforms.

svn path=/trunk/mono/; revision=146610
  • Loading branch information...
commit c7eb61b25e192516a2ee6f7a2798e484a98d7e12 1 parent dc0d168
@vargaz vargaz authored
View
8 mono/tests/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-20 Zoltan Varga <vargaz@gmail.com>
+
+ * libtest.c (mono_test_marshal_bool_in): Use 'short' as the type of the
+ variant bool argument.
+
+ * marshalbool.cs: Pass -1 as the 'expected' argument instead of 0xffff, which
+ causes sign extensions issues on some platforms.
+
2009-11-19 Zoltan Varga <vargaz@gmail.com>
* dtest.cs: Add a test for AssemblyMirror.GetName ().
View
2  mono/tests/libtest.c
@@ -3952,7 +3952,7 @@ mono_test_Winx64_struct5_ret_managed (managed_struct5_ret_delegate func)
LIBTEST_API int STDCALL
mono_test_marshal_bool_in (int arg, unsigned int expected, unsigned int bDefaultMarsh, unsigned int bBoolCustMarsh,
- char bI1CustMarsh, unsigned char bU1CustMarsh, unsigned short bVBCustMarsh)
+ char bI1CustMarsh, unsigned char bU1CustMarsh, short bVBCustMarsh)
{
switch (arg) {
case 1:
View
5 mono/tests/marshalbool.cs
@@ -154,11 +154,12 @@ unsafe public static int test_0_U1_In_Native ()
unsafe public static int test_0_VariantBool_In_Native ()
{
int ret;
+ int m1 = -1;
ret = mono_test_marshal_bool_in (5, 0, false, false, false, false, false);
if (ret != 0)
return 0x0100 + ret;
- ret = mono_test_marshal_bool_in (5, 0xFFFF, false, false, false, false, true);
+ ret = mono_test_marshal_bool_in (5, (uint)m1, false, false, false, false, true);
if (ret != 0)
return 0x0200 + ret;
@@ -166,7 +167,7 @@ unsafe public static int test_0_VariantBool_In_Native ()
bool* ptestVal = &testVal;
Marshal.WriteByte ((IntPtr)ptestVal, 0x22);
- ret = mono_test_marshal_bool_in (5, 0xFFFF, false, false, false, false, testVal);
+ ret = mono_test_marshal_bool_in (5, (uint)m1, false, false, false, false, testVal);
if (ret != 0)
return 0x0300 + ret;
Please sign in to comment.
Something went wrong with that request. Please try again.