snoop16_return fix

Rein Klazes rklazes at xs4all.nl
Thu May 27 03:32:53 CDT 2004


Hi,

Changelog:
	dlls/kernel	: snoop16.c
	Fix the missing tread ID of some snoop return traces.

Rein.
-- 
Rein Klazes
rklazes at xs4all.nl
-------------- next part --------------
--- wine/dlls/kernel/snoop16.c	2003-12-08 22:58:55.000000000 +0100
+++ mywine/dlls/kernel/snoop16.c	2004-05-27 10:06:41.000000000 +0200
@@ -323,12 +323,12 @@
 	}
 	context->Eip = LOWORD(ret->origreturn);
 	context->SegCs  = HIWORD(ret->origreturn);
+        DPRINTF("%04lx:RET  %s.%ld: %s(",
+                GetCurrentThreadId(),ret->dll->name,ret->ordinal,
+                ret->dll->funs[ret->ordinal].name);
 	if (ret->args) {
 		int	i,max;
 
-		DPRINTF("%04lx:RET  %s.%ld: %s(",
-                        GetCurrentThreadId(),ret->dll->name,ret->ordinal,
-                        ret->dll->funs[ret->ordinal].name);
 		max = ret->dll->funs[ret->ordinal].nrofargs;
 		if (max>16)
 			max=16;
@@ -339,18 +339,12 @@
 			DPRINTF("%04x%s",ret->args[i],i?",":"");
 		if (max!=ret->dll->funs[ret->ordinal].nrofargs)
 			DPRINTF(" ...");
-		DPRINTF(") retval = %04x:%04x ret=%04x:%04x\n",
-                        (WORD)context->Edx,(WORD)context->Eax,
-                        HIWORD(ret->origreturn),LOWORD(ret->origreturn)
-		);
 		HeapFree(GetProcessHeap(),0,ret->args);
 		ret->args = NULL;
-	} else
-		DPRINTF("RET  %s.%ld: %s() retval = %04x:%04x ret=%04x:%04x\n",
-			ret->dll->name,ret->ordinal,ret->dll->funs[ret->ordinal].name,
-                        (WORD)context->Edx,(WORD)context->Eax,
-                        HIWORD(ret->origreturn),LOWORD(ret->origreturn)
-		);
+	}
+        DPRINTF(") retval = %04x:%04x ret=%04x:%04x\n",
+                (WORD)context->Edx,(WORD)context->Eax,
+                HIWORD(ret->origreturn),LOWORD(ret->origreturn));
 	ret->origreturn = NULL; /* mark as empty */
 }
 #else	/* !__i386__ */


More information about the wine-patches mailing list