A couple of DCOM fixes

Mike Hearn mh at codeweavers.com
Mon Jun 21 17:16:53 CDT 2004


Hi, there were a couple of minor mistakes in my last two patches. This
fixes them.

Mike Hearn <mh at codeweavers.com>
* Don't ERR on a used connection being destroyed
* Don't print an extra newline in the olerelay code

Index: dlls/oleaut32/tmarshal.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tmarshal.c,v
retrieving revision 1.25
diff -u -p -r1.25 tmarshal.c
--- dlls/oleaut32/tmarshal.c    17 Jun 2004 23:03:26 -0000      1.25
+++ dlls/oleaut32/tmarshal.c    21 Jun 2004 22:13:01 -0000
@@ -1151,7 +1151,7 @@ xCall(LPVOID retptr, int method, TMProxy
     }
  
     if (relaydeb) {
-       TRACE_(olerelay)("\n->");
+       TRACE_(olerelay)("->");
        if (iname)
            TRACE_(olerelay)("%s:",relaystr(iname));
        if (fname)
@@ -1339,7 +1339,7 @@ xCall(LPVOID retptr, int method, TMProxy
            xargs += _argsize(elem->tdesc.vt);
        }
     }
-    if (relaydeb) TRACE_(olerelay)(")\n\n");
+    if (relaydeb) TRACE_(olerelay)(")\n");
     HeapFree(GetProcessHeap(),0,buf.base);
     return status;
 }
Index: dlls/rpcrt4/rpc_binding.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/rpc_binding.c,v
retrieving revision 1.27
diff -u -p -r1.27 rpc_binding.c
--- dlls/rpcrt4/rpc_binding.c   17 Jun 2004 19:54:34 -0000      1.27
+++ dlls/rpcrt4/rpc_binding.c   21 Jun 2004 22:13:02 -0000
@@ -120,7 +120,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo
 RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection)
 {
   TRACE("connection: %p\n", Connection);
-  if (Connection->Used) ERR("connection is still in use\n");
  
   RPCRT4_CloseConnection(Connection);
   RPCRT4_strfree(Connection->Endpoint);





More information about the wine-patches mailing list