ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Support VT_SAFEARRAY in the typelib marshaler. 

Based on a patch by Rob Shearman.
This commit is contained in:
Huw Davies 2006-05-10 12:11:22 +01:00 committed by Alexandre Julliard
parent d0bdf685f5
commit 86d9457cdc
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/oleaut32/tmarshal.c
View File

@ -42,6 +42,7 @@
#include "winuser.h" #include "winuser.h"
#include "ole2.h" #include "ole2.h"
#include "propidl.h" /* for LPSAFEARRAY_User* functions */
#include "typelib.h" #include "typelib.h"
#include "variant.h" #include "variant.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -802,6 +803,17 @@ serialize_param(
if (debugout) TRACE_(olerelay)("]"); if (debugout) TRACE_(olerelay)("]");
return S_OK; return S_OK;
} }
case VT_SAFEARRAY: {
if (writeit)
{
unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
unsigned long size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg);
xbuf_resize(buf, size);
LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg);
buf->curoff = size;
}
return S_OK;
}
default: default:
ERR("Unhandled marshal type %d.\n",tdesc->vt); ERR("Unhandled marshal type %d.\n",tdesc->vt);
return S_OK; return S_OK;
@ -1131,6 +1143,16 @@ deserialize_param(
); );
return S_OK; return S_OK;
} }
case VT_SAFEARRAY: {
if (readit)
{
unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
unsigned char *buffer;
buffer = LPSAFEARRAY_UserUnmarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg);
buf->curoff = buffer - buf->base;
}
return S_OK;
}
default: default:
ERR("No handler for VT type %d!\n",tdesc->vt); ERR("No handler for VT type %d!\n",tdesc->vt);
return S_OK; return S_OK;