Huw Davies : rpcrt4: Fix the argument size of conformant arrays.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 26c2953e58bc8f04ba0aa9933b286ad58041df0a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=26c2953e58bc8f04ba0aa993...

Author: Huw Davies 
Date:   Fri Jun 16 10:32:27 2006 +0100

rpcrt4: Fix the argument size of conformant arrays.

---

dlls/rpcrt4/ndr_stubless.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 189af5c..56e8eff 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1014,6 +1014,26 @@ LONG_PTR __cdecl call_server_func(SERVER
 }
 #endif

+static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)
+{
+    DWORD size;
+    switch(*pFormat)
+    {
+    case RPC_FC_CARRAY:
+        size = *(const WORD*)(pFormat + 2);
+        ComputeConformance(pStubMsg, NULL, pFormat + 4, 0);
+        size *= pStubMsg->MaxCount;
+        break;
+    default:
+        FIXME("Unhandled type %02x\n", *pFormat);
+        /* fallthrough */
+    case RPC_FC_RP:
+        size = sizeof(void *);
+        break;
+    }
+    return size;
+}
+
 /* FIXME: need to free some stuff in here too */
 long WINAPI NdrStubCall2(
     struct IRpcStubBuffer * pThis,
@@ -1367,8 +1387,13 @@ #endif
                             else if (pParam->param_attributes.IsOut &&
                                      !pParam->param_attributes.IsByValue)
                             {
-                                *(void **)pArg = NdrAllocate(&stubMsg, sizeof(void *));
-                                **(void ***)pArg = 0;
+                                DWORD size = calc_arg_size(&stubMsg, pTypeFormat);
+
+                                if(size)
+                                {
+                                    *(void **)pArg = NdrAllocate(&stubMsg, size);
+                                    memset(*(void **)pArg, 0, size);
+                                }
                             }
                             break;
                         case STUBLESS_CALCSIZE: