[cinvoke-svn] r77 - trunk/cinvoke/test

[will]

Author: will
Date: 2006-07-07 01:12:55 -0400 (Fri, 07 Jul 2006)
New Revision: 77

Modified:
   trunk/cinvoke/test/lib.c
   trunk/cinvoke/test/runtests.c
Log:
test fixes


Modified: trunk/cinvoke/test/lib.c
===================================================================
--- trunk/cinvoke/test/lib.c    2006-07-07 04:38:40 UTC (rev 76)
+++ trunk/cinvoke/test/lib.c    2006-07-07 05:12:55 UTC (rev 77)
@@ -80,5 +80,5 @@
 }
 DLLEXPORT void test11(int (CDECL *f)(int, int, long, long, int, int,
 int, long long)) {
-       printf("test9: %d (want 1)\n", f(1, 2, 3, 4, 5, 6, 0x77777777, 
0x88888888888888LL));
+       printf("test11: %d (want 1)\n", f(1, 2, 3, 4, 5, 6, 0x77777777, 
0x88888888888888LL));
 }

Modified: trunk/cinvoke/test/runtests.c
===================================================================
--- trunk/cinvoke/test/runtests.c       2006-07-07 04:38:40 UTC (rev 76)
+++ trunk/cinvoke/test/runtests.c       2006-07-07 05:12:55 UTC (rev 77)
@@ -320,7 +320,20 @@
 
 void cbfunc2(CInvFunction *f, void *parameters[], void *returnout,
        void *userdata) {
-       printf("userdata=%p (want 0xBB)\n", userdata);
+#ifdef _WIN32
+       char buf[20];
+       _i64toa(*(long long *)parameters[7], buf, 16);
+       printf("args=%d %d %ld %ld %d %d %x %s"
+       " (want 1 2 3 4 5 6 77777777 88888888888888)\n",
+               *(int *)parameters[0],
+               *(int *)parameters[1],
+               *(long *)parameters[2],
+               *(long *)parameters[3],
+               *(int *)parameters[4],
+               *(int *)parameters[5],
+               *(int *)parameters[6],
+               buf);
+#else
        printf("args=%d %d %ld %ld %d %d %x %llx"
        " (want 1 2 3 4 5 6 77777777 88888888888888)\n",
                *(int *)parameters[0],
@@ -331,7 +344,8 @@
                *(int *)parameters[5],
                *(int *)parameters[6],
                *(long long *)parameters[7]);
-
+#endif
+       printf("userdata=%p (want 0xBB)\n", userdata);
        *(int *)returnout = 1;
 }