Alexandre Julliard : rpcrt4: Fix handling of complex types of return values on the server side.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1c632ffe8e6f153b1d2f413d8d16daad82c3e4c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1c632ffe8e6f153b1d2f413d8d...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Jun 10 15:11:40 2011 +0200

rpcrt4: Fix handling of complex types of return values on the server side.

---

 dlls/rpcrt4/ndr_stubless.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 0f54211..436dccf 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1078,10 +1078,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg,
 
             TRACE("\tbase type: 0x%02x\n", *pTypeFormat);
 
-            /* make a note of the address of the return value parameter for later */
-            if (pParam->param_attributes.IsReturn)
-                retval_ptr = (LONG_PTR *)pArg;
-
             switch (phase)
             {
                 case STUBLESS_MARSHAL:
@@ -1222,6 +1218,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg,
             current_offset += sizeof(NDR_PARAM_OIF_OTHER);
         }
         TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg);
+
+        /* make a note of the address of the return value parameter for later */
+        if (pParam->param_attributes.IsReturn) retval_ptr = (LONG_PTR *)pArg;
     }
 
     return retval_ptr;