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

Paul Vriens : wined3d: Correctly define the number of possible parameters.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: ba438d4f5d9672cf69f2b76ba6effdcf3d4d9fe1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba438d4f5d9672cf69f2b76… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue May 16 08:44:43 2006 +0200 wined3d: Correctly define the number of possible parameters. --- dlls/wined3d/vertexshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 13bc981..7325032 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1123,8 +1123,8 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ const DWORD* pToken = This->baseShader.function; const SHADER_OPCODE* curOpcode = NULL; /** functions parameters */ - WINED3DSHADERVECTOR* p[4]; - WINED3DSHADERVECTOR* p_send[4]; + WINED3DSHADERVECTOR* p[6]; + WINED3DSHADERVECTOR* p_send[6]; DWORD i; /** init temporary register */

1 0

Robert Shearman : rpcrt4: Implement fixed array functions.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: 0f7e4a877a11039cb67c2abba7f40f78abc2fccc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f7e4a877a11039cb67c2ab… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:57:21 2006 +0100 rpcrt4: Implement fixed array functions. --- dlls/rpcrt4/ndr_marshall.c | 167 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 161 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c947ec5..312af8f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3188,6 +3188,20 @@ void WINAPI NdrConformantVaryingStructFr EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } +typedef struct +{ + unsigned char type; + unsigned char alignment; + unsigned short total_size; +} NDR_SMFARRAY_FORMAT; + +typedef struct +{ + unsigned char type; + unsigned char alignment; + unsigned long total_size; +} NDR_LGFARRAY_FORMAT; + /*********************************************************************** * NdrFixedArrayMarshall [RPCRT4.@] */ @@ -3195,7 +3209,37 @@ unsigned char * WINAPI NdrFixedArrayMar unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; + unsigned long total_size; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pSmFArrayFormat->type != RPC_FC_SMFARRAY) && + (pSmFArrayFormat->type != RPC_FC_LGFARRAY)) + { + ERR("invalid format type %x\n", pSmFArrayFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + ALIGN_POINTER(pStubMsg->Buffer, pSmFArrayFormat->alignment + 1); + + if (pSmFArrayFormat->type == RPC_FC_SMFARRAY) + { + total_size = pSmFArrayFormat->total_size; + pFormat = (unsigned char *)(pSmFArrayFormat + 1); + } + else + { + const NDR_LGFARRAY_FORMAT *pLgFArrayFormat = (const NDR_LGFARRAY_FORMAT *)pFormat; + total_size = pLgFArrayFormat->total_size; + pFormat = (unsigned char *)(pLgFArrayFormat + 1); + } + memcpy(pStubMsg->Buffer, pMemory, total_size); + pStubMsg->Buffer += total_size; + + pFormat = EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); + return NULL; } @@ -3207,7 +3251,40 @@ unsigned char * WINAPI NdrFixedArrayUnm PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; + unsigned long total_size; + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if ((pSmFArrayFormat->type != RPC_FC_SMFARRAY) && + (pSmFArrayFormat->type != RPC_FC_LGFARRAY)) + { + ERR("invalid format type %x\n", pSmFArrayFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + ALIGN_POINTER(pStubMsg->Buffer, pSmFArrayFormat->alignment + 1); + + if (pSmFArrayFormat->type == RPC_FC_SMFARRAY) + { + total_size = pSmFArrayFormat->total_size; + pFormat = (unsigned char *)(pSmFArrayFormat + 1); + } + else + { + const NDR_LGFARRAY_FORMAT *pLgFArrayFormat = (const NDR_LGFARRAY_FORMAT *)pFormat; + total_size = pLgFArrayFormat->total_size; + pFormat = (unsigned char *)(pLgFArrayFormat + 1); + } + + if (fMustAlloc || !*ppMemory) + *ppMemory = NdrAllocate(pStubMsg, total_size); + memcpy(*ppMemory, pStubMsg->Buffer, total_size); + pStubMsg->Buffer += total_size; + + pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + return NULL; } @@ -3218,7 +3295,35 @@ void WINAPI NdrFixedArrayBufferSize(PMID unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; + unsigned long total_size; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pSmFArrayFormat->type != RPC_FC_SMFARRAY) && + (pSmFArrayFormat->type != RPC_FC_LGFARRAY)) + { + ERR("invalid format type %x\n", pSmFArrayFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + ALIGN_LENGTH(pStubMsg->BufferLength, pSmFArrayFormat->alignment + 1); + + if (pSmFArrayFormat->type == RPC_FC_SMFARRAY) + { + total_size = pSmFArrayFormat->total_size; + pFormat = (unsigned char *)(pSmFArrayFormat + 1); + } + else + { + const NDR_LGFARRAY_FORMAT *pLgFArrayFormat = (const NDR_LGFARRAY_FORMAT *)pFormat; + total_size = pLgFArrayFormat->total_size; + pFormat = (unsigned char *)(pLgFArrayFormat + 1); + } + pStubMsg->BufferLength += total_size; + + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } /*********************************************************************** @@ -3227,8 +3332,38 @@ void WINAPI NdrFixedArrayBufferSize(PMID unsigned long WINAPI NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("stub\n"); - return 0; + const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; + unsigned long total_size; + + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if ((pSmFArrayFormat->type != RPC_FC_SMFARRAY) && + (pSmFArrayFormat->type != RPC_FC_LGFARRAY)) + { + ERR("invalid format type %x\n", pSmFArrayFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return 0; + } + + ALIGN_POINTER(pStubMsg->Buffer, pSmFArrayFormat->alignment + 1); + + if (pSmFArrayFormat->type == RPC_FC_SMFARRAY) + { + total_size = pSmFArrayFormat->total_size; + pFormat = (unsigned char *)(pSmFArrayFormat + 1); + } + else + { + const NDR_LGFARRAY_FORMAT *pLgFArrayFormat = (const NDR_LGFARRAY_FORMAT *)pFormat; + total_size = pLgFArrayFormat->total_size; + pFormat = (unsigned char *)(pLgFArrayFormat + 1); + } + pStubMsg->Buffer += total_size; + pStubMsg->MemorySize += total_size; + + EmbeddedPointerMemorySize(pStubMsg, pFormat); + + return total_size; } /*********************************************************************** @@ -3238,7 +3373,27 @@ void WINAPI NdrFixedArrayFree(PMIDL_STUB unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pSmFArrayFormat->type != RPC_FC_SMFARRAY) && + (pSmFArrayFormat->type != RPC_FC_LGFARRAY)) + { + ERR("invalid format type %x\n", pSmFArrayFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + if (pSmFArrayFormat->type == RPC_FC_SMFARRAY) + pFormat = (unsigned char *)(pSmFArrayFormat + 1); + else + { + const NDR_LGFARRAY_FORMAT *pLgFArrayFormat = (const NDR_LGFARRAY_FORMAT *)pFormat; + pFormat = (unsigned char *)(pLgFArrayFormat + 1); + } + + EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Remove the BUFFER_PARANOIA overestimates for string memory sizes.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: c27db4cde6e5515ae69617df63ca60b26413c6b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c27db4cde6e5515ae69617d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:57:04 2006 +0100 rpcrt4: Remove the BUFFER_PARANOIA overestimates for string memory sizes. --- dlls/rpcrt4/ndr_marshall.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1bf3811..c947ec5 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -43,8 +43,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define BUFFER_PARANOIA 20 - #if defined(__i386__) # define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \ (*((UINT32 *)(pchar)) = (uint32)) @@ -581,12 +579,12 @@ void WINAPI NdrConformantStringBufferSiz if (*pFormat == RPC_FC_C_CSTRING) { /* we need + 1 octet for '\0' */ TRACE("string=%s\n", debugstr_a((char*)pMemory)); - pStubMsg->BufferLength += strlen((char*)pMemory) + 1 + BUFFER_PARANOIA; + pStubMsg->BufferLength += strlen((char*)pMemory) + 1; } else if (*pFormat == RPC_FC_C_WSTRING) { /* we need + 2 octets for L'\0' */ TRACE("string=%s\n", debugstr_w((LPWSTR)pMemory)); - pStubMsg->BufferLength += strlenW((LPWSTR)pMemory)*2 + 2 + BUFFER_PARANOIA; + pStubMsg->BufferLength += strlenW((LPWSTR)pMemory)*2 + 2; } else { ERR("Unhandled string type: %#x\n", *pFormat); @@ -652,7 +650,7 @@ unsigned char *WINAPI NdrConformantStrin len = pStubMsg->ActualCount; if (fMustAlloc || !*ppMemory) - *ppMemory = NdrAllocate(pStubMsg, len*esize + BUFFER_PARANOIA); + *ppMemory = NdrAllocate(pStubMsg, len*esize); memcpy(*ppMemory, pStubMsg->Buffer, len*esize);

1 0

Robert Shearman : rpcrt4: Implement computing of conformance from a correlation descriptor for conformant strings .
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: 4c0b0e0069e910082734b0a279e92f734c579fdd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c0b0e0069e910082734b0a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:57:13 2006 +0100 rpcrt4: Implement computing of conformance from a correlation descriptor for conformant strings. --- dlls/rpcrt4/ndr_marshall.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4f5d336..1bf3811 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -530,19 +530,18 @@ finish_conf: unsigned char *WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage, PFORMAT_STRING pFormat) { - unsigned long len, esize; + unsigned long esize; TRACE("(pStubMsg == ^%p, pszMessage == ^%p, pFormat == ^%p)\n", pStubMsg, pszMessage, pFormat); - assert(pFormat); if (*pFormat == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((char*)pszMessage)); - len = strlen((char*)pszMessage)+1; + pStubMsg->ActualCount = strlen((char*)pszMessage)+1; esize = 1; } else if (*pFormat == RPC_FC_C_WSTRING) { TRACE("string=%s\n", debugstr_w((LPWSTR)pszMessage)); - len = strlenW((LPWSTR)pszMessage)+1; + pStubMsg->ActualCount = strlenW((LPWSTR)pszMessage)+1; esize = 2; } else { @@ -551,19 +550,16 @@ unsigned char *WINAPI NdrConformantStrin return NULL; } - if (pFormat[1] != RPC_FC_PAD) { - FIXME("sized string format=%d\n", pFormat[1]); - } - - assert( (pStubMsg->BufferLength >= (len*esize + 13)) && (pStubMsg->Buffer != NULL) ); - - pStubMsg->MaxCount = pStubMsg->ActualCount = len; + if (pFormat[1] == RPC_FC_STRING_SIZED) + pFormat = ComputeConformance(pStubMsg, pszMessage, pFormat + 2, 0); + else + pStubMsg->MaxCount = pStubMsg->ActualCount; pStubMsg->Offset = 0; WriteConformance(pStubMsg); WriteVariance(pStubMsg); - memcpy(pStubMsg->Buffer, pszMessage, len*esize); /* the string itself */ - pStubMsg->Buffer += len*esize; + memcpy(pStubMsg->Buffer, pszMessage, pStubMsg->ActualCount*esize); /* the string itself */ + pStubMsg->Buffer += pStubMsg->ActualCount*esize; STD_OVERFLOW_CHECK(pStubMsg); @@ -582,7 +578,6 @@ void WINAPI NdrConformantStringBufferSiz SizeConformance(pStubMsg); SizeVariance(pStubMsg); - assert(pFormat); if (*pFormat == RPC_FC_C_CSTRING) { /* we need + 1 octet for '\0' */ TRACE("string=%s\n", debugstr_a((char*)pMemory)); @@ -597,10 +592,6 @@ void WINAPI NdrConformantStringBufferSiz ERR("Unhandled string type: %#x\n", *pFormat); /* FIXME: raise an exception */ } - - if (pFormat[1] != RPC_FC_PAD) { - FIXME("sized string format=%d\n", pFormat[1]); - } } /************************************************************************ @@ -658,10 +649,6 @@ unsigned char *WINAPI NdrConformantStrin esize = 0; } - if (pFormat[1] != RPC_FC_PAD) { - FIXME("sized string format=%d\n", pFormat[1]); - } - len = pStubMsg->ActualCount; if (fMustAlloc || !*ppMemory)

1 0

Robert Shearman : rpcrt4: Fix conformant varying structs to comply to the DCE/RPC spec.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: 124acc9b67fddfb149d43e2ac4379d44f0ba9f58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=124acc9b67fddfb149d43e2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:56:55 2006 +0100 rpcrt4: Fix conformant varying structs to comply to the DCE/RPC spec. --- dlls/rpcrt4/ndr_marshall.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4b7f6e0..4f5d336 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2894,15 +2894,21 @@ unsigned char * WINAPI NdrConformantVar } WriteConformance(pStubMsg); - WriteVariance(pStubMsg); ALIGN_POINTER(pStubMsg->Buffer, pCVStructFormat->alignment + 1); TRACE("memory_size = %d\n", pCVStructFormat->memory_size); + /* write constant sized part */ pStubMsg->BufferMark = pStubMsg->Buffer; - memcpy(pStubMsg->Buffer, pMemory, pCVStructFormat->memory_size + pStubMsg->MaxCount * esize); - pStubMsg->Buffer += pCVStructFormat->memory_size + pStubMsg->MaxCount * esize; + memcpy(pStubMsg->Buffer, pMemory, pCVStructFormat->memory_size); + pStubMsg->Buffer += pCVStructFormat->memory_size; + + WriteVariance(pStubMsg); + + /* write array part */ + memcpy(pStubMsg->Buffer, pMemory + pCVStructFormat->memory_size, pStubMsg->ActualCount * esize); + pStubMsg->Buffer += pStubMsg->ActualCount * esize; EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); @@ -2942,7 +2948,6 @@ unsigned char * WINAPI NdrConformantVar case RPC_FC_CVARRAY: esize = *(const WORD*)(pCVArrayFormat+2); pCVArrayFormat = ReadConformance(pStubMsg, pCVArrayFormat + 4); - pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); break; case RPC_FC_C_CSTRING: esize = sizeof(char); @@ -2975,10 +2980,17 @@ unsigned char * WINAPI NdrConformantVar *ppMemory = NdrAllocate(pStubMsg, size); } - /* now copy the data */ + /* copy the constant data */ pStubMsg->BufferMark = pStubMsg->Buffer; - memcpy(*ppMemory, pStubMsg->Buffer, pCVStructFormat->memory_size + pStubMsg->MaxCount * esize); - pStubMsg->Buffer += pCVStructFormat->memory_size + pStubMsg->MaxCount * esize; + memcpy(*ppMemory, pStubMsg->Buffer, pCVStructFormat->memory_size); + pStubMsg->Buffer += pCVStructFormat->memory_size; + + pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); + + /* copy the array data */ + memcpy(*ppMemory + pCVStructFormat->memory_size, pStubMsg->Buffer, + pStubMsg->ActualCount * esize); + pStubMsg->Buffer += pStubMsg->ActualCount * esize; if (cvarray_type == RPC_FC_C_CSTRING) TRACE("string=%s\n", debugstr_a((char *)(*ppMemory + pCVStructFormat->memory_size))); @@ -3050,13 +3062,14 @@ void WINAPI NdrConformantVaryingStructBu } SizeConformance(pStubMsg); - SizeVariance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, pCVStructFormat->alignment + 1); TRACE("memory_size = %d\n", pCVStructFormat->memory_size); - pStubMsg->BufferLength += pCVStructFormat->memory_size + esize * pStubMsg->MaxCount; + pStubMsg->BufferLength += pCVStructFormat->memory_size; + SizeVariance(pStubMsg); + pStubMsg->BufferLength += esize * pStubMsg->MaxCount; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -3071,7 +3084,6 @@ unsigned long WINAPI NdrConformantVaryin PFORMAT_STRING pCVArrayFormat; ULONG esize; unsigned char cvarray_type; - ULONG size; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -3091,7 +3103,6 @@ unsigned long WINAPI NdrConformantVaryin case RPC_FC_CVARRAY: esize = *(const WORD*)(pCVArrayFormat+2); pCVArrayFormat = ReadConformance(pStubMsg, pCVArrayFormat + 4); - pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); break; case RPC_FC_C_CSTRING: esize = sizeof(char); @@ -3117,13 +3128,15 @@ unsigned long WINAPI NdrConformantVaryin TRACE("memory_size = %d\n", pCVStructFormat->memory_size); - size = pCVStructFormat->memory_size + pStubMsg->MaxCount * esize; - pStubMsg->Buffer += size; - pStubMsg->MemorySize += size; + pStubMsg->Buffer += pCVStructFormat->memory_size; + pCVArrayFormat = ReadVariance(pStubMsg, pCVArrayFormat); + pStubMsg->Buffer += pCVStructFormat->memory_size + pStubMsg->ActualCount * esize; + + pStubMsg->MemorySize += pCVStructFormat->memory_size + pStubMsg->MaxCount * esize; EmbeddedPointerMemorySize(pStubMsg, pFormat); - return size; + return pCVStructFormat->memory_size + pStubMsg->MaxCount * esize; } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Don't duplicate the conformance calculating code, just use the
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: e6120f20296481d450ca9221aaa3b5b10c82c4ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6120f20296481d450ca922… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:56:27 2006 +0100 rpcrt4: Don't duplicate the conformance calculating code, just use the common ComputeConformance function to store the result in pStubMsg->MaxCount (as this is what callback function store the conformance value into anyway). --- dlls/rpcrt4/ndr_marshall.c | 58 ++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 40 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7b3cc02..4b7f6e0 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3386,46 +3386,15 @@ static PFORMAT_STRING get_arm_offset_fro } static PFORMAT_STRING get_non_encapsulated_union_arm(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char *pMemory, + ULONG value, PFORMAT_STRING pFormat) { - ULONG value; - - pFormat = ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, - 0, &value); - TRACE("got switch value %lx\n", value); pFormat += *(const SHORT*)pFormat; pFormat += 2; return get_arm_offset_from_union_arm_selector(pStubMsg, value, pFormat); } -static unsigned char *get_conformance_address(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char *pMemory, - PFORMAT_STRING pFormat) -{ - short ofs = *(short *)&pFormat[2]; - LPVOID ptr = NULL; - - switch (pFormat[0] & 0xf0) - { - case RPC_FC_NORMAL_CONFORMANCE: - ptr = pMemory; - break; - default: - FIXME("Conformance type %x\n", pFormat[0]); - return NULL; - } - - if(pFormat[1]) - { - FIXME("Conformance op %x\n", pFormat[1]); - return NULL; - } - - return (unsigned char *)ptr + ofs; -} - /*********************************************************************** * NdrNonEncapsulatedUnionMarshall [RPCRT4.@] */ @@ -3433,18 +3402,21 @@ unsigned char * WINAPI NdrNonEncapsulat unsigned char *pMemory, PFORMAT_STRING pFormat) { - unsigned char *discriminant; unsigned short type; + unsigned char switch_type; TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); pFormat++; - /* Marshall discriminant */ - discriminant = get_conformance_address(pStubMsg, pMemory, pFormat + 1); - NdrBaseTypeMarshall(pStubMsg, discriminant, pFormat); + switch_type = *pFormat; pFormat++; - pFormat = get_non_encapsulated_union_arm(pStubMsg, pMemory, pFormat); + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, 0); + TRACE("got switch value 0x%lx\n", pStubMsg->MaxCount); + /* Marshall discriminant */ + NdrBaseTypeMarshall(pStubMsg, (unsigned char *)&pStubMsg->MaxCount, &switch_type); + + pFormat = get_non_encapsulated_union_arm(pStubMsg, pStubMsg->MaxCount, pFormat); if(!pFormat) return NULL; @@ -3591,14 +3563,20 @@ void WINAPI NdrNonEncapsulatedUnionBuffe PFORMAT_STRING pFormat) { unsigned short type; + unsigned char switch_type; + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + pFormat++; + switch_type = *pFormat; pFormat++; + + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, 0); + TRACE("got switch value 0x%lx\n", pStubMsg->MaxCount); /* Add discriminant size */ - NdrBaseTypeBufferSize(pStubMsg, pMemory, pFormat); - pFormat++; + NdrBaseTypeBufferSize(pStubMsg, (unsigned char *)&pStubMsg->MaxCount, &switch_type); - pFormat = get_non_encapsulated_union_arm(pStubMsg, pMemory, pFormat); + pFormat = get_non_encapsulated_union_arm(pStubMsg, pStubMsg->MaxCount, pFormat); if(!pFormat) return;

1 0

Robert Shearman : rpcrt4: Implement conformant varying struct functions.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: ecdd09b1b2c42966645fb2d358f96205c7dc12fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecdd09b1b2c42966645fb2d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:56:37 2006 +0100 rpcrt4: Implement conformant varying struct functions. --- dlls/rpcrt4/ndr_marshall.c | 317 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 310 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ecdd09b1b2c42966645…

1 0

Robert Shearman : rpcrt4: Implement more conformance operations and more types.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: 63aaf8dbd7fc1ebcd2acb112066062b1ceddd9a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63aaf8dbd7fc1ebcd2acb11… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 16:56:45 2006 +0100 rpcrt4: Implement more conformance operations and more types. --- dlls/rpcrt4/ndr_marshall.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index aaba7cc..a0da609 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -459,9 +459,11 @@ PFORMAT_STRING ComputeConformanceOrVaria case RPC_FC_USHORT: data = *(USHORT*)ptr; break; + case RPC_FC_CHAR: case RPC_FC_SMALL: data = *(CHAR*)ptr; break; + case RPC_FC_BYTE: case RPC_FC_USMALL: data = *(UCHAR*)ptr; break; @@ -479,6 +481,18 @@ done_conf_grab: case RPC_FC_DEREFERENCE: /* already handled */ break; + case RPC_FC_ADD_1: + *pCount = data + 1; + break; + case RPC_FC_SUB_1: + *pCount = data - 1; + break; + case RPC_FC_MULT_2: + *pCount = data * 2; + break; + case RPC_FC_DIV_2: + *pCount = data / 2; + break; default: FIXME("unknown conformance op %d\n", pFormat[1]); goto finish_conf;

1 0

Jacek Caban : shdocvw: Don't release IOleInPlaceSite in DoVerb.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: f69328e2df56df695b120fe39f7838fea25379d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f69328e2df56df695b120fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 15 21:06:13 2006 +0200 shdocvw: Don't release IOleInPlaceSite in DoVerb. --- dlls/shdocvw/oleobject.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c7a9470..0b7188c 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -282,10 +282,6 @@ static HRESULT WINAPI OleObject_DoVerb(I &This->pos_rect, &This->clip_rect, &This->frameinfo); - - if(iVerb == OLEIVERB_INPLACEACTIVATE) - IOleInPlaceSite_Release(This->inplace); - SetWindowPos(This->shell_embedding_hwnd, NULL, This->pos_rect.left, This->pos_rect.top, This->pos_rect.right-This->pos_rect.left, @@ -306,7 +302,6 @@ static HRESULT WINAPI OleObject_DoVerb(I TRACE("OLEIVERB_SHOW\n"); IOleInPlaceSite_OnUIActivate(This->inplace); - IOleInPlaceSite_Release(This->inplace); if(This->frame) IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem);

1 0

Stefan Dösinger : wined3d: Unset the ddraw primary when it is released.
by Alexandre Julliard 16 May '06

16 May '06

Module: wine Branch: refs/heads/master Commit: f7d89201c13499e2e1b0c5fbf1fa2e356036e081 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7d89201c13499e2e1b0c5f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 15 20:49:36 2006 +0200 wined3d: Unset the ddraw primary when it is released. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d56777f..5b7198c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -65,6 +65,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; TRACE("(%p) : cleaning up\n", This); if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ ENTER_GL(); @@ -84,6 +85,8 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release } IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); + if(iface == device->ddraw_primary) + device->ddraw_primary = NULL; TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This);

1 0