May 2006 - Wine-commits - list.winehq.org

Robert Shearman : rpcrt4: Use the buffer passed in as an argument and don' t increment
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: ababfdef82764d4d73f708f9642c893facfb1e3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ababfdef82764d4d73f708f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:13:45 2006 +0100 rpcrt4: Use the buffer passed in as an argument and don't increment the buffer in the MIDL_STUB_MESSAGE in the inner pointer marshalling/unmarshalling routines as these can be used for embedded pointers, which handle the allocating or finding of the buffer themselves. Do the incrementing in the outer NdrPointerMarshall/Unmarshall/BufferSize routines instead. --- dlls/rpcrt4/ndr_marshall.c | 55 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bbf9dd3..6c9e852 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -754,8 +754,7 @@ #endif case RPC_FC_UP: /* unique pointer */ case RPC_FC_OP: /* object pointer - same as unique here */ TRACE("writing %p to buffer\n", Pointer); - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, (unsigned long)Pointer); - pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(Buffer, (unsigned long)Pointer); break; case RPC_FC_FP: default: @@ -803,12 +802,12 @@ void WINAPI PointerUnmarshall(PMIDL_STUB pointer_id = ~0UL; break; case RPC_FC_UP: /* unique pointer */ - pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; + pointer_id = NDR_LOCAL_UINT32_READ(Buffer); + TRACE("pointer_id is 0x%08lx\n", pointer_id); break; case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ - pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; + pointer_id = NDR_LOCAL_UINT32_READ(Buffer); + TRACE("pointer_id is 0x%08lx\n", pointer_id); if (*pPointer) FIXME("free object pointer %p\n", *pPointer); break; @@ -855,7 +854,6 @@ void WINAPI PointerBufferSize(PMIDL_STUB break; case RPC_FC_OP: case RPC_FC_UP: - pStubMsg->BufferLength += 4; /* NULL pointer has no further representation */ if (!Pointer) return; @@ -1285,9 +1283,22 @@ unsigned char * WINAPI NdrPointerMarshal unsigned char *pMemory, PFORMAT_STRING pFormat) { + unsigned char *Buffer; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); - pStubMsg->BufferMark = pStubMsg->Buffer; + /* incremement the buffer here instead of in PointerMarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't write any additional pointer data to the wire */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + Buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; + } + else + Buffer = pStubMsg->Buffer; + PointerMarshall(pStubMsg, pStubMsg->Buffer, pMemory, pFormat); STD_OVERFLOW_CHECK(pStubMsg); @@ -1303,10 +1314,24 @@ unsigned char * WINAPI NdrPointerUnmarsh PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + unsigned char *Buffer; + TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); - pStubMsg->BufferMark = pStubMsg->Buffer; - PointerUnmarshall(pStubMsg, pStubMsg->Buffer, ppMemory, pFormat, fMustAlloc); + /* incremement the buffer here instead of in PointerUnmarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't read any additional pointer data from the + * buffer */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + Buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; + } + else + Buffer = pStubMsg->Buffer; + + PointerUnmarshall(pStubMsg, Buffer, ppMemory, pFormat, fMustAlloc); return NULL; } @@ -1319,6 +1344,16 @@ void WINAPI NdrPointerBufferSize(PMIDL_S PFORMAT_STRING pFormat) { TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + + /* incremement the buffer length here instead of in PointerBufferSize, + * as that is used by embedded pointers which already handle the buffer + * length, and shouldn't write anything more to the wire */ + if (*pFormat != RPC_FC_RP) + { + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + pStubMsg->BufferLength += 4; + } + PointerBufferSize(pStubMsg, pMemory, pFormat); }

1 0

Robert Shearman : rpcrt4: Move the writing and sizing of variances and conformances to common functions .
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 265045d251c0966fff6170168dbf84003a33444b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=265045d251c0966fff61701… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:13:15 2006 +0100 rpcrt4: Move the writing and sizing of variances and conformances to common functions. --- dlls/rpcrt4/ndr_marshall.c | 88 +++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 35 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index a4fa2d7..a3bdcf5 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -340,6 +340,34 @@ done: return pFormat+4; } +/* writes the conformance value to the buffer */ +static inline void WriteConformance(MIDL_STUB_MESSAGE *pStubMsg) +{ + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); + pStubMsg->Buffer += 4; +} + +/* writes the variance values to the buffer */ +static inline void WriteVariance(MIDL_STUB_MESSAGE *pStubMsg) +{ + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); + pStubMsg->Buffer += 4; +} + +/* requests buffer space for the conformance value */ +static inline void SizeConformance(MIDL_STUB_MESSAGE *pStubMsg) +{ + pStubMsg->BufferLength += 4; +} + +/* requests buffer space for the variance values */ +static inline void SizeVariance(MIDL_STUB_MESSAGE *pStubMsg) +{ + pStubMsg->BufferLength += 8; +} + PFORMAT_STRING ComputeConformanceOrVariance( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount) @@ -483,7 +511,6 @@ unsigned char *WINAPI NdrConformantStrin unsigned char *pszMessage, PFORMAT_STRING pFormat) { unsigned long len, esize; - unsigned char *c; TRACE("(pStubMsg == ^%p, pszMessage == ^%p, pFormat == ^%p)\n", pStubMsg, pszMessage, pFormat); @@ -510,15 +537,13 @@ unsigned char *WINAPI NdrConformantStrin assert( (pStubMsg->BufferLength >= (len*esize + 13)) && (pStubMsg->Buffer != NULL) ); - c = pStubMsg->Buffer; - memset(c, 0, 12); - NDR_LOCAL_UINT32_WRITE(c, len); /* max length: strlen + 1 (for '\0') */ - c += 8; /* offset: 0 */ - NDR_LOCAL_UINT32_WRITE(c, len); /* actual length: (same) */ - c += 4; - memcpy(c, pszMessage, len*esize); /* the string itself */ - c += len*esize; - pStubMsg->Buffer = c; + pStubMsg->MaxCount = pStubMsg->ActualCount = len; + pStubMsg->Offset = 0; + WriteConformance(pStubMsg); + WriteVariance(pStubMsg); + + memcpy(pStubMsg->Buffer, pszMessage, len*esize); /* the string itself */ + pStubMsg->Buffer += len*esize; STD_OVERFLOW_CHECK(pStubMsg); @@ -534,16 +559,19 @@ void WINAPI NdrConformantStringBufferSiz { TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); + SizeConformance(pStubMsg); + SizeVariance(pStubMsg); + assert(pFormat); if (*pFormat == RPC_FC_C_CSTRING) { - /* we need 12 octets for the [maxlen, offset, len] DWORDS, + 1 octet for '\0' */ + /* we need + 1 octet for '\0' */ TRACE("string=%s\n", debugstr_a((char*)pMemory)); - pStubMsg->BufferLength += strlen((char*)pMemory) + 13 + BUFFER_PARANOIA; + pStubMsg->BufferLength += strlen((char*)pMemory) + 1 + BUFFER_PARANOIA; } else if (*pFormat == RPC_FC_C_WSTRING) { - /* we need 12 octets for the [maxlen, offset, len] DWORDS, + 2 octets for L'\0' */ + /* we need + 2 octets for L'\0' */ TRACE("string=%s\n", debugstr_w((LPWSTR)pMemory)); - pStubMsg->BufferLength += strlenW((LPWSTR)pMemory)*2 + 14 + BUFFER_PARANOIA; + pStubMsg->BufferLength += strlenW((LPWSTR)pMemory)*2 + 2 + BUFFER_PARANOIA; } else { ERR("Unhandled string type: %#x\n", *pFormat); @@ -1914,8 +1942,7 @@ unsigned char * WINAPI NdrConformantArra pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, size); - pStubMsg->Buffer += 4; + WriteConformance(pStubMsg); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -1977,7 +2004,8 @@ void WINAPI NdrConformantArrayBufferSize pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; - pStubMsg->BufferLength += 4; + + SizeVariance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, alignment); @@ -2043,12 +2071,8 @@ unsigned char* WINAPI NdrConformantVaryi pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); - pStubMsg->Buffer += 4; - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); - pStubMsg->Buffer += 4; - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); - pStubMsg->Buffer += 4; + WriteConformance(pStubMsg); + WriteVariance(pStubMsg); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -2146,8 +2170,8 @@ void WINAPI NdrConformantVaryingArrayBuf /* compute length */ pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); - /* conformance + offset + variance */ - pStubMsg->BufferLength += 3 * sizeof(DWORD); + SizeConformance(pStubMsg); + SizeVariance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, alignment); @@ -2200,15 +2224,9 @@ unsigned char * WINAPI NdrComplexArrayMa pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); TRACE("variance = %ld\n", pStubMsg->ActualCount); - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); - pStubMsg->Buffer += 4; + WriteConformance(pStubMsg); if (variance_present) - { - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); - pStubMsg->Buffer += 4; - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); - pStubMsg->Buffer += 4; - } + WriteVariance(pStubMsg); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -2292,14 +2310,14 @@ void WINAPI NdrComplexArrayBufferSize(PM pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); TRACE("conformance = %ld\n", pStubMsg->MaxCount); - pStubMsg->BufferLength += sizeof(ULONG); + SizeConformance(pStubMsg); variance_present = IsConformanceOrVariancePresent(pFormat); pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); TRACE("variance = %ld\n", pStubMsg->ActualCount); if (variance_present) - pStubMsg->BufferLength += 2*sizeof(ULONG); + SizeVariance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, alignment);

1 0

Robert Shearman : rpcrt4: Correctly align the buffer to read/ write array data to.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 4b4192f3a58a3d2addc1f385114f91b377e61848 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b4192f3a58a3d2addc1f38… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:12:52 2006 +0100 rpcrt4: Correctly align the buffer to read/write array data to. --- dlls/rpcrt4/ndr_marshall.c | 46 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 567ae0b..a4fa2d7 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1906,6 +1906,8 @@ unsigned char * WINAPI NdrConformantArra PFORMAT_STRING pFormat) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); + unsigned char alignment = pFormat[1] + 1; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); @@ -1915,6 +1917,8 @@ unsigned char * WINAPI NdrConformantArra NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, size); pStubMsg->Buffer += 4; + ALIGN_POINTER(pStubMsg->Buffer, alignment); + memcpy(pStubMsg->Buffer, pMemory, size*esize); pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += size*esize; @@ -1935,6 +1939,8 @@ unsigned char * WINAPI NdrConformantArra unsigned char fMustAlloc) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); + unsigned char alignment = pFormat[1] + 1; + TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); @@ -1944,6 +1950,8 @@ unsigned char * WINAPI NdrConformantArra if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, size*esize); + ALIGN_POINTER(pStubMsg->Buffer, alignment); + memcpy(*ppMemory, pStubMsg->Buffer, size*esize); pStubMsg->BufferMark = pStubMsg->Buffer; @@ -1962,14 +1970,19 @@ void WINAPI NdrConformantArrayBufferSize PFORMAT_STRING pFormat) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); + unsigned char alignment = pFormat[1] + 1; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; + pStubMsg->BufferLength += 4; + + ALIGN_LENGTH(pStubMsg->BufferLength, alignment); /* conformance value plus array */ - pStubMsg->BufferLength += sizeof(DWORD) + size*esize; + pStubMsg->BufferLength += size*esize; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -2015,6 +2028,7 @@ unsigned char* WINAPI NdrConformantVaryi unsigned char* pMemory, PFORMAT_STRING pFormat ) { + unsigned char alignment = pFormat[1] + 1; DWORD esize = *(const WORD*)(pFormat+2); TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); @@ -2036,6 +2050,8 @@ unsigned char* WINAPI NdrConformantVaryi NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); pStubMsg->Buffer += 4; + ALIGN_POINTER(pStubMsg->Buffer, alignment); + memcpy(pStubMsg->Buffer, pMemory + pStubMsg->Offset, pStubMsg->ActualCount*esize); pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += pStubMsg->ActualCount*esize; @@ -2056,6 +2072,7 @@ unsigned char* WINAPI NdrConformantVaryi PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { + unsigned char alignment = pFormat[1] + 1; DWORD esize = *(const WORD*)(pFormat+2); TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2066,9 +2083,12 @@ unsigned char* WINAPI NdrConformantVaryi RpcRaiseException(RPC_S_INTERNAL_ERROR); return NULL; } + pFormat = ReadConformance(pStubMsg, pFormat); pFormat = ReadVariance(pStubMsg, pFormat); + ALIGN_POINTER(pStubMsg->Buffer, alignment); + if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); @@ -2109,6 +2129,7 @@ void WINAPI NdrConformantVaryingArrayFre void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { + unsigned char alignment = pFormat[1] + 1; DWORD esize = *(const WORD*)(pFormat+2); TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); @@ -2125,8 +2146,12 @@ void WINAPI NdrConformantVaryingArrayBuf /* compute length */ pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); - /* conformance + offset + variance + array */ - pStubMsg->BufferLength += 3*sizeof(DWORD) + pStubMsg->ActualCount*esize; + /* conformance + offset + variance */ + pStubMsg->BufferLength += 3 * sizeof(DWORD); + + ALIGN_LENGTH(pStubMsg->BufferLength, alignment); + + pStubMsg->BufferLength += pStubMsg->ActualCount*esize; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -2152,6 +2177,7 @@ unsigned char * WINAPI NdrComplexArrayMa { ULONG count, def; BOOL variance_present; + unsigned char alignment; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -2162,6 +2188,8 @@ unsigned char * WINAPI NdrComplexArrayMa return NULL; } + alignment = pFormat[1] + 1; + def = *(const WORD*)&pFormat[2]; pFormat += 4; @@ -2182,6 +2210,8 @@ unsigned char * WINAPI NdrComplexArrayMa pStubMsg->Buffer += 4; } + ALIGN_POINTER(pStubMsg->Buffer, alignment); + for (count = 0; count < pStubMsg->ActualCount; count++) pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, NULL); @@ -2199,6 +2229,7 @@ unsigned char * WINAPI NdrComplexArrayUn unsigned char fMustAlloc) { ULONG count, esize; + unsigned char alignment; unsigned char *pMemory; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2210,6 +2241,8 @@ unsigned char * WINAPI NdrComplexArrayUn return NULL; } + alignment = pFormat[1] + 1; + pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); @@ -2223,6 +2256,8 @@ unsigned char * WINAPI NdrComplexArrayUn memset(*ppMemory, 0, pStubMsg->MaxCount * esize); } + ALIGN_POINTER(pStubMsg->Buffer, alignment); + pMemory = *ppMemory; for (count = 0; count < pStubMsg->ActualCount; count++) pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); @@ -2238,6 +2273,7 @@ void WINAPI NdrComplexArrayBufferSize(PM PFORMAT_STRING pFormat) { ULONG count, def; + unsigned char alignment; BOOL variance_present; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -2249,6 +2285,8 @@ void WINAPI NdrComplexArrayBufferSize(PM return; } + alignment = pFormat[1] + 1; + def = *(const WORD*)&pFormat[2]; pFormat += 4; @@ -2263,6 +2301,8 @@ void WINAPI NdrComplexArrayBufferSize(PM if (variance_present) pStubMsg->BufferLength += 2*sizeof(ULONG); + ALIGN_LENGTH(pStubMsg->BufferLength, alignment); + for (count=0; count < pStubMsg->ActualCount; count++) pMemory = ComplexBufferSize(pStubMsg, pMemory, pFormat, NULL); }

1 0

Robert Shearman : rpcrt4: Correctly align the buffer before reading/ writing structure data.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 95d79e2c581d9ea734290c224c1cef1302b6358a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95d79e2c581d9ea734290c2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:12:30 2006 +0100 rpcrt4: Correctly align the buffer before reading/writing structure data. --- dlls/rpcrt4/ndr_marshall.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ac38bce..567ae0b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1321,6 +1321,8 @@ unsigned char * WINAPI NdrSimpleStructMa unsigned size = *(const WORD*)(pFormat+2); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); + memcpy(pStubMsg->Buffer, pMemory, size); pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += size; @@ -1344,6 +1346,8 @@ unsigned char * WINAPI NdrSimpleStructUn unsigned size = *(const WORD*)(pFormat+2); TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); + if (fMustAlloc) { *ppMemory = NdrAllocate(pStubMsg, size); memcpy(*ppMemory, pStubMsg->Buffer, size); @@ -1396,6 +1400,9 @@ void WINAPI NdrSimpleStructBufferSize(PM { unsigned size = *(const WORD*)(pFormat+2); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + + ALIGN_LENGTH(pStubMsg->BufferLength, pFormat[1] + 1); + pStubMsg->BufferLength += size; if (pFormat[0] != RPC_FC_STRUCT) EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat+4); @@ -1751,6 +1758,8 @@ unsigned char * WINAPI NdrComplexStructM TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); + pFormat += 4; if (*(const WORD*)pFormat) conf_array = pFormat + *(const WORD*)pFormat; pFormat += 2; @@ -1786,6 +1795,8 @@ unsigned char * WINAPI NdrComplexStructU TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); + if (fMustAlloc || !*ppMemory) { *ppMemory = NdrAllocate(pStubMsg, size); @@ -1819,6 +1830,8 @@ void WINAPI NdrComplexStructBufferSize(P TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + ALIGN_LENGTH(pStubMsg->BufferLength, pFormat[1] + 1); + pFormat += 4; if (*(const WORD*)pFormat) conf_array = pFormat + *(const WORD*)pFormat; pFormat += 2; @@ -2479,6 +2492,8 @@ unsigned char * WINAPI NdrConformantStr return NULL; } + ALIGN_POINTER(pStubMsg->Buffer, pCStructFormat->alignment + 1); + TRACE("memory_size = %d\n", pCStructFormat->memory_size); /* copy constant sized part of struct */ @@ -2516,6 +2531,8 @@ unsigned char * WINAPI NdrConformantStr return NULL; } + ALIGN_POINTER(pStubMsg->Buffer, pCStructFormat->alignment + 1); + TRACE("memory_size = %d\n", pCStructFormat->memory_size); /* work out how much memory to allocate if we need to do so */ @@ -2571,6 +2588,8 @@ void WINAPI NdrConformantStructBufferSiz return; } + ALIGN_LENGTH(pStubMsg->BufferLength, pCStructFormat->alignment + 1); + TRACE("memory_size = %d\n", pCStructFormat->memory_size); /* add constant sized part of struct to buffer size */

1 0

Robert Shearman : rpcrt4: Rename NonEncapsulatedUnionSize to NdrNonEncapsulatedUnionMemorySize.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 5616c4150c0ab97d5ecba67935fd86e492a5f48b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5616c4150c0ab97d5ecba67… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:12:20 2006 +0100 rpcrt4: Rename NonEncapsulatedUnionSize to NdrNonEncapsulatedUnionMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 836b6ca..ac38bce 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1427,20 +1427,6 @@ void WINAPI NdrSimpleStructFree(PMIDL_ST } -static long NonEncapsulatedUnionSize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) -{ - pFormat += 2; - if (pStubMsg->fHasNewCorrDesc) - pFormat += 6; - else - pFormat += 4; - - pFormat += *(const SHORT*)pFormat; - TRACE("size %d\n", *(const SHORT*)pFormat); - return *(const SHORT*)pFormat; -} - unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { @@ -1453,7 +1439,7 @@ unsigned long WINAPI EmbeddedComplexSize case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; case RPC_FC_NON_ENCAPSULATED_UNION: - return NonEncapsulatedUnionSize(pStubMsg, pFormat); + return NdrNonEncapsulatedUnionMemorySize(pStubMsg, pFormat); default: FIXME("unhandled embedded type %02x\n", *pFormat); } @@ -3109,8 +3095,15 @@ void WINAPI NdrNonEncapsulatedUnionBuffe unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("stub\n"); - return 0; + pFormat += 2; + if (pStubMsg->fHasNewCorrDesc) + pFormat += 6; + else + pFormat += 4; + + pFormat += *(const SHORT*)pFormat; + TRACE("size %d\n", *(const SHORT*)pFormat); + return *(const SHORT*)pFormat; } /***********************************************************************

1 0

Huw Davies : oleaut32: Correctly handle the case when the number of bytes in a BSTR is odd.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 40986cd729afbbcffa4afca1c7815ff2f5492793 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40986cd729afbbcffa4afca… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 10 12:41:32 2006 +0100 oleaut32: Correctly handle the case when the number of bytes in a BSTR is odd. --- dlls/oleaut32/tests/usrmarshal.c | 88 +++++++++++++++++++++++++++++++++----- dlls/oleaut32/usrmarshal.c | 21 +++++---- 2 files changed, 89 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index b0f3808..4433f50 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -227,20 +227,20 @@ static void test_marshal_LPSAFEARRAY(voi static void check_bstr(void *buffer, BSTR b) { DWORD *wireb = buffer; - DWORD len = SysStringLen(b); + DWORD len = SysStringByteLen(b); - ok(*wireb == len, "wv[0] %08lx\n", *wireb); + ok(*wireb == (len + 1) / 2, "wv[0] %08lx\n", *wireb); wireb++; - if(len) - ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); + if(b) + ok(*wireb == len, "wv[1] %08lx\n", *wireb); else ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); wireb++; - ok(*wireb == len, "wv[2] %08lx\n", *wireb); + ok(*wireb == (len + 1) / 2, "wv[2] %08lx\n", *wireb); if(len) { wireb++; - ok(!memcmp(wireb, b, len * 2), "strings differ\n"); + ok(!memcmp(wireb, b, (len + 1) & ~1), "strings differ\n"); } return; } @@ -250,7 +250,7 @@ static void test_marshal_BSTR(void) unsigned long size; MIDL_STUB_MESSAGE stubMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; - unsigned char *buffer; + unsigned char *buffer, *next; BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t','1',0}; DWORD len; @@ -271,14 +271,16 @@ static void test_marshal_BSTR(void) ok(size == 38, "size %ld\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); - BSTR_UserMarshal(&umcb.Flags, buffer, &b); + next = BSTR_UserMarshal(&umcb.Flags, buffer, &b); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); check_bstr(buffer, b); if (BSTR_UNMARSHAL_WORKS) { b2 = NULL; - BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); - ok(b2 != NULL, "NULL LPSAFEARRAY didn't unmarshal\n"); + next = BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + ok(b2 != NULL, "BSTR didn't unmarshal\n"); ok(!memcmp(b, b2, (len + 1) * 2), "strings differ\n"); BSTR_UserFree(&umcb.Flags, &b2); } @@ -291,11 +293,75 @@ static void test_marshal_BSTR(void) ok(size == 12, "size %ld\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); - BSTR_UserMarshal(&umcb.Flags, buffer, &b); + next = BSTR_UserMarshal(&umcb.Flags, buffer, &b); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); check_bstr(buffer, b); + if (BSTR_UNMARSHAL_WORKS) + { + b2 = NULL; + next = BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + ok(b2 == NULL, "NULL BSTR didn't unmarshal\n"); + BSTR_UserFree(&umcb.Flags, &b2); + } HeapFree(GetProcessHeap(), 0, buffer); + b = SysAllocStringByteLen("abc", 3); + *(((char*)b) + 3) = 'd'; + len = SysStringLen(b); + ok(len == 1, "get %ld\n", len); + len = SysStringByteLen(b); + ok(len == 3, "get %ld\n", len); + + size = BSTR_UserSize(&umcb.Flags, 0, &b); + ok(size == 16, "size %ld\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset(buffer, 0xcc, size); + next = BSTR_UserMarshal(&umcb.Flags, buffer, &b); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + check_bstr(buffer, b); + ok(buffer[15] == 'd', "buffer[15] %02x\n", buffer[15]); + + if (BSTR_UNMARSHAL_WORKS) + { + b2 = NULL; + next = BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + ok(b2 != NULL, "BSTR didn't unmarshal\n"); + ok(!memcmp(b, b2, len), "strings differ\n"); + BSTR_UserFree(&umcb.Flags, &b2); + } + HeapFree(GetProcessHeap(), 0, buffer); + SysFreeString(b); + + b = SysAllocStringByteLen("", 0); + len = SysStringLen(b); + ok(len == 0, "get %ld\n", len); + len = SysStringByteLen(b); + ok(len == 0, "get %ld\n", len); + + size = BSTR_UserSize(&umcb.Flags, 0, &b); + ok(size == 12, "size %ld\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + next = BSTR_UserMarshal(&umcb.Flags, buffer, &b); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + check_bstr(buffer, b); + + if (BSTR_UNMARSHAL_WORKS) + { + b2 = NULL; + next = BSTR_UserUnmarshal(&umcb.Flags, buffer, &b2); + ok(next == buffer + size, "got %p expect %p\n", next, buffer + size); + ok(b2 != NULL, "NULL LPSAFEARRAY didn't unmarshal\n"); + len = SysStringByteLen(b2); + ok(len == 0, "byte len %ld\n", len); + BSTR_UserFree(&umcb.Flags, &b2); + } + HeapFree(GetProcessHeap(), 0, buffer); + SysFreeString(b); } static void check_variant_header(DWORD *wirev, VARIANT *v, unsigned long size) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 002df90..dd397c0 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -152,7 +152,7 @@ unsigned long WINAPI BSTR_UserSize(unsig TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_LENGTH(Start, 3); - Start += sizeof(bstr_wire_t) + sizeof(OLECHAR) * (SysStringLen(*pstr)); + Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1); TRACE("returning %ld\n", Start); return Start; } @@ -160,19 +160,21 @@ unsigned long WINAPI BSTR_UserSize(unsig unsigned char * WINAPI BSTR_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, BSTR *pstr) { bstr_wire_t *header; + DWORD len = SysStringByteLen(*pstr); + TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_POINTER(Buffer, 3); header = (bstr_wire_t*)Buffer; - header->len = header->len2 = SysStringLen(*pstr); - if (header->len) + header->len = header->len2 = (len + 1) / 2; + if (*pstr) { - header->byte_len = header->len * sizeof(OLECHAR); - memcpy(header + 1, *pstr, header->byte_len); + header->byte_len = len; + memcpy(header + 1, *pstr, header->len * 2); } else - header->byte_len = 0xffffffff; /* special case for an empty string */ + header->byte_len = 0xffffffff; /* special case for a null bstr */ return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len; } @@ -187,14 +189,15 @@ unsigned char * WINAPI BSTR_UserUnmarsha if(header->len != header->len2) FIXME("len %08lx != len2 %08lx\n", header->len, header->len2); - if(header->len) - SysReAllocStringLen(pstr, (OLECHAR*)(header + 1), header->len); - else if (*pstr) + if(*pstr) { SysFreeString(*pstr); *pstr = NULL; } + if(header->byte_len != 0xffffffff) + *pstr = SysAllocStringByteLen((char*)(header + 1), header->byte_len); + if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len; }

1 0

Robert Shearman : ole32: Exception handling shouldn' t be needed around the call to IRpcStubBuffer_Invoke.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: af6d97ad36df10288f3f224ff6515e426a8db63c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af6d97ad36df10288f3f224… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:11:49 2006 +0100 ole32: Exception handling shouldn't be needed around the call to IRpcStubBuffer_Invoke. It should have its own exception handler to catch any exceptions that are raised. --- dlls/ole32/rpc.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d849c6e..4152198 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -43,9 +43,7 @@ #include "rpc.h" #include "winerror.h" #include "winreg.h" #include "wtypes.h" -#include "excpt.h" #include "wine/unicode.h" -#include "wine/exception.h" #include "compobj_private.h" @@ -114,13 +112,6 @@ struct dispatch_params HRESULT hr; /* hresult (out) */ }; -static WINE_EXCEPTION_FILTER(ole_filter) -{ - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return EXCEPTION_CONTINUE_SEARCH; - return EXCEPTION_EXECUTE_HANDLER; -} - static HRESULT WINAPI RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; @@ -510,15 +501,8 @@ HRESULT RPC_CreateServerChannel(IRpcChan void RPC_ExecuteCall(struct dispatch_params *params) { - __TRY - { - params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); - } - __EXCEPT(ole_filter) - { - params->hr = GetExceptionCode(); - } - __ENDTRY + params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); + IRpcStubBuffer_Release(params->stub); IRpcChannelBuffer_Release(params->chan); if (params->handle) SetEvent(params->handle);

1 0

Robert Shearman : rpcrt4: Remove unintuitive requirement to pass the required alignment boundary minus one into the alignment macros .
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 75fe824e89154686ada6703efc939130448c5914 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75fe824e89154686ada6703… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 10 13:12:07 2006 +0100 rpcrt4: Remove unintuitive requirement to pass the required alignment boundary minus one into the alignment macros. --- dlls/rpcrt4/ndr_marshall.c | 66 ++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 871bb57..836b6ca 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -90,9 +90,9 @@ # define NDR_LOCAL_UINT32_READ(pchar) \ LITTLE_ENDIAN_UINT32_READ(pchar) #endif -/* _Align must be the desired alignment minus 1, - * e.g. ALIGN_LENGTH(len, 3) to align on a dword boundary. */ -#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) +/* _Align must be the desired alignment, + * e.g. ALIGN_LENGTH(len, 4) to align on a dword boundary. */ +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align)-1)&~((_Align)-1)) #define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align)) #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) @@ -1494,10 +1494,10 @@ unsigned char * WINAPI ComplexMarshall(P pMemory += 4; break; case RPC_FC_ALIGNM4: - ALIGN_POINTER(pMemory, 3); + ALIGN_POINTER(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER(pMemory, 7); + ALIGN_POINTER(pMemory, 8); break; case RPC_FC_STRUCTPAD2: pMemory += 2; @@ -1560,10 +1560,10 @@ unsigned char * WINAPI ComplexUnmarshall pMemory += 4; break; case RPC_FC_ALIGNM4: - ALIGN_POINTER(pMemory, 3); + ALIGN_POINTER(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER(pMemory, 7); + ALIGN_POINTER(pMemory, 8); break; case RPC_FC_STRUCTPAD2: pMemory += 2; @@ -1620,10 +1620,10 @@ unsigned char * WINAPI ComplexBufferSize pMemory += 4; break; case RPC_FC_ALIGNM4: - ALIGN_POINTER(pMemory, 3); + ALIGN_POINTER(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER(pMemory, 7); + ALIGN_POINTER(pMemory, 8); break; case RPC_FC_STRUCTPAD2: pMemory += 2; @@ -1676,10 +1676,10 @@ unsigned char * WINAPI ComplexFree(PMIDL pMemory += 4; break; case RPC_FC_ALIGNM4: - ALIGN_POINTER(pMemory, 3); + ALIGN_POINTER(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER(pMemory, 7); + ALIGN_POINTER(pMemory, 8); break; case RPC_FC_STRUCTPAD2: pMemory += 2; @@ -1726,10 +1726,10 @@ unsigned long WINAPI ComplexStructSize(P size += 4; break; case RPC_FC_ALIGNM4: - ALIGN_LENGTH(size, 3); + ALIGN_LENGTH(size, 4); break; case RPC_FC_ALIGNM8: - ALIGN_LENGTH(size, 7); + ALIGN_LENGTH(size, 8); break; case RPC_FC_STRUCTPAD2: size += 2; @@ -2976,13 +2976,13 @@ static long unmarshall_discriminant(PMID case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); discriminant = *(USHORT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(USHORT); break; case RPC_FC_LONG: case RPC_FC_ULONG: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); discriminant = *(ULONG *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(ULONG); break; @@ -3252,7 +3252,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); *(USHORT *)pStubMsg->Buffer = *(USHORT *)pMemory; pStubMsg->Buffer += sizeof(USHORT); TRACE("value: 0x%04x\n", *(USHORT *)pMemory); @@ -3261,23 +3261,23 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: case RPC_FC_ENUM32: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); *(ULONG *)pStubMsg->Buffer = *(ULONG *)pMemory; pStubMsg->Buffer += sizeof(ULONG); TRACE("value: 0x%08lx\n", *(ULONG *)pMemory); break; case RPC_FC_FLOAT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(float) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); *(float *)pStubMsg->Buffer = *(float *)pMemory; pStubMsg->Buffer += sizeof(float); break; case RPC_FC_DOUBLE: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(double) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); *(double *)pStubMsg->Buffer = *(double *)pMemory; pStubMsg->Buffer += sizeof(double); break; case RPC_FC_HYPER: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); *(ULONGLONG *)pStubMsg->Buffer = *(ULONGLONG *)pMemory; pStubMsg->Buffer += sizeof(ULONGLONG); TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory)); @@ -3286,7 +3286,7 @@ static unsigned char *WINAPI NdrBaseType /* only 16-bits on the wire, so do a sanity check */ if (*(UINT *)pMemory > USHRT_MAX) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; pStubMsg->Buffer += sizeof(USHORT); TRACE("value: 0x%04x\n", *(UINT *)pMemory); @@ -3330,7 +3330,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); **(USHORT **)ppMemory = *(USHORT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(USHORT); TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); @@ -3339,31 +3339,31 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: case RPC_FC_ENUM32: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); **(ULONG **)ppMemory = *(ULONG *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(ULONG); TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); break; case RPC_FC_FLOAT: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(float) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); **(float **)ppMemory = *(float *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(float); TRACE("value: %f\n", **(float **)ppMemory); break; case RPC_FC_DOUBLE: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(double) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); **(double **)ppMemory = *(double*)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(double); TRACE("value: %f\n", **(double **)ppMemory); break; case RPC_FC_HYPER: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); **(ULONGLONG **)ppMemory = *(ULONGLONG *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(ULONGLONG); TRACE("value: %s\n", wine_dbgstr_longlong(**(ULONGLONG **)ppMemory)); break; case RPC_FC_ENUM16: - ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); /* 16-bits on the wire, but int in memory */ **(UINT **)ppMemory = *(USHORT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(USHORT); @@ -3400,29 +3400,29 @@ static void WINAPI NdrBaseTypeBufferSize case RPC_FC_SHORT: case RPC_FC_USHORT: case RPC_FC_ENUM16: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(USHORT) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(USHORT)); pStubMsg->BufferLength += sizeof(USHORT); break; case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONG) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONG)); pStubMsg->BufferLength += sizeof(ULONG); break; case RPC_FC_FLOAT: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(float) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(float)); pStubMsg->BufferLength += sizeof(float); break; case RPC_FC_DOUBLE: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(double) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(double)); pStubMsg->BufferLength += sizeof(double); break; case RPC_FC_HYPER: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONGLONG) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONGLONG)); pStubMsg->BufferLength += sizeof(ULONGLONG); break; case RPC_FC_ERROR_STATUS_T: - ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(error_status_t) - 1); + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(error_status_t)); pStubMsg->BufferLength += sizeof(error_status_t); break; default:

1 0

Huw Davies : oleaut32: Support VT_SAFEARRAY in the typelib marshaler.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 86d9457cdc0307e0594cd352c6c57c091e40d084 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86d9457cdc0307e0594cd35… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 10 12:11:22 2006 +0100 oleaut32: Support VT_SAFEARRAY in the typelib marshaler. Based on a patch by Rob Shearman. --- dlls/oleaut32/tmarshal.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0a6e939..139662d 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -42,6 +42,7 @@ #include "winreg.h" #include "winuser.h" #include "ole2.h" +#include "propidl.h" /* for LPSAFEARRAY_User* functions */ #include "typelib.h" #include "variant.h" #include "wine/debug.h" @@ -802,6 +803,17 @@ serialize_param( if (debugout) TRACE_(olerelay)("]"); 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: ERR("Unhandled marshal type %d.\n",tdesc->vt); return S_OK; @@ -1131,6 +1143,16 @@ deserialize_param( ); 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: ERR("No handler for VT type %d!\n",tdesc->vt); return S_OK;

1 0

Huw Davies : oleaut32: Add a function to grow the marshal state buffer to a specified size.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: d0bdf685f56414de7d4d1a0254d3d2d6ef88e67a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0bdf685f56414de7d4d1a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 10 11:55:37 2006 +0100 oleaut32: Add a function to grow the marshal state buffer to a specified size. --- dlls/oleaut32/tmarshal.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 249524a..0a6e939 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -68,19 +68,35 @@ static char *relaystr(WCHAR *in) { } static HRESULT -xbuf_add(marshal_state *buf, LPBYTE stuff, DWORD size) { - while (buf->size - buf->curoff < size) { - if (buf->base) { - buf->size += 100; - buf->base = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,buf->base,buf->size); - if (!buf->base) - return E_OUTOFMEMORY; - } else { - buf->base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,32); - buf->size = 32; - if (!buf->base) - return E_OUTOFMEMORY; - } +xbuf_resize(marshal_state *buf, DWORD newsize) +{ + if(buf->size >= newsize) + return S_FALSE; + + if(buf->base) + { + buf->base = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf->base, newsize); + if(!buf->base) + return E_OUTOFMEMORY; + } + else + { + buf->base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newsize); + if(!buf->base) + return E_OUTOFMEMORY; + } + return S_OK; +} + +static HRESULT +xbuf_add(marshal_state *buf, LPBYTE stuff, DWORD size) +{ + HRESULT hr; + + if(buf->size - buf->curoff < size) + { + hr = xbuf_resize(buf, buf->size + size + 100); + if(FAILED(hr)) return hr; } memcpy(buf->base+buf->curoff,stuff,size); buf->curoff += size;

1 0