[PATCH 0/2] MR2140: rpcrt4: Two fixes.

[PATCH 1/2] rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer().

[Dmitry Timoshkov]

From: Dmitry Timoshkov

---
 dlls/rpcrt4/cproxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index b2c86d54422..b51ba41a45f 100644
--- a/dlls/rpcrt4/cproxy.c
+++ b/dlls/rpcrt4/cproxy.c
@@ -586,7 +586,7 @@ void WINAPI NdrProxyFreeBuffer(void *This,
   {
     IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer,
                                  (RPCOLEMESSAGE*)pStubMsg->RpcMsg);
-    pStubMsg->fBufferValid = TRUE;
+    pStubMsg->fBufferValid = FALSE;
   }
   IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer);
   pStubMsg->pRpcChannelBuffer = NULL;

[PATCH 2/2] rpcrt4: Avoid casting an object to IUnknown.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Cast its interface member to IUnknown instead.
---
 dlls/rpcrt4/cproxy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index b51ba41a45f..80400422e41 100644
--- a/dlls/rpcrt4/cproxy.c
+++ b/dlls/rpcrt4/cproxy.c
@@ -332,7 +332,7 @@ HRESULT StdProxy_Construct(REFIID riid,
   This = calloc(1, sizeof(StdProxyImpl));
   if (!This) return E_OUTOFMEMORY;

-  if (!pUnkOuter) pUnkOuter = (IUnknown *)This;
+  if (!pUnkOuter) pUnkOuter = (IUnknown *)&This->IRpcProxyBuffer_iface;
   This->IRpcProxyBuffer_iface.lpVtbl = &StdProxy_Vtbl;
   This->PVtbl = vtbl->Vtbl;
   /* one reference for the proxy */

[PATCH 0/2] MR2140: rpcrt4: Two fixes. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH 0/2] MR2140: rpcrt4: Two fixes. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.