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

lostwages/ news/2006051501.xml wwn/wn20060515_ ...
by WineHQ May 16, 2006

May 16, 2006

ChangeSet ID: 24844 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/16 01:33:47 Added files: news : 2006051501.xml wwn : wn20060515_313.xml Log message: WWN #313 Patch: http://cvs.winehq.org/patch.py?id=24844 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006051501.xml Added 1.1 +0 -0 lostwages/wwn/wn20060515_313.xml

1 0

Robert Shearman : rpcrt4: Implement NdrSimpleStructMemorySize.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: b96d630022dc78e9458588044dc7b5e39c71c1f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b96d630022dc78e94585880… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:34:58 2006 +0100 rpcrt4: Implement NdrSimpleStructMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 48ec0b6..aaba7cc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1491,11 +1491,17 @@ void WINAPI NdrSimpleStructBufferSize(PM unsigned long WINAPI NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - /* unsigned size = *(LPWORD)(pFormat+2); */ - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + unsigned short size = *(LPWORD)(pFormat+2); + + TRACE("(%p,%p)\n", pStubMsg, pFormat); + + ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); + pStubMsg->MemorySize += size; + pStubMsg->Buffer += size; + if (pFormat[0] != RPC_FC_STRUCT) EmbeddedPointerMemorySize(pStubMsg, pFormat+4); - return 0; + return size; } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Fix the conformant struct functions to not call conformant array functions .
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 2aff761dfd184305f0d94d64427d799b2a5c16da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2aff761dfd184305f0d94d6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:35:31 2006 +0100 rpcrt4: Fix the conformant struct functions to not call conformant array functions. The conformance has to be the first thing in the buffer, in accordance with the DCE/RPC spec and to be compatible with the pointer layout format strings that MIDL generates. --- dlls/rpcrt4/ndr_marshall.c | 103 ++++++++++++++++++++++++++------------------ 1 files changed, 61 insertions(+), 42 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 20c3abb..48ec0b6 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2651,10 +2651,12 @@ unsigned char * WINAPI NdrConformantStr PFORMAT_STRING pFormat) { const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; - pFormat += sizeof(NDR_CSTRUCT_FORMAT); + PFORMAT_STRING pCArrayFormat; + ULONG esize; TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + pFormat += sizeof(NDR_CSTRUCT_FORMAT); if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) { ERR("invalid format type %x\n", pCStructFormat->type); @@ -2662,22 +2664,35 @@ unsigned char * WINAPI NdrConformantStr return NULL; } + pCArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + if (*pCArrayFormat != RPC_FC_CARRAY) + { + ERR("invalid array format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + esize = *(const WORD*)(pCArrayFormat+2); + + ComputeConformance(pStubMsg, pMemory + pCStructFormat->memory_size, + pCArrayFormat + 4, 0); + + WriteConformance(pStubMsg); + ALIGN_POINTER(pStubMsg->Buffer, pCStructFormat->alignment + 1); TRACE("memory_size = %d\n", pCStructFormat->memory_size); /* copy constant sized part of struct */ - memcpy(pStubMsg->Buffer, pMemory, pCStructFormat->memory_size); - pStubMsg->Buffer += pCStructFormat->memory_size; + pStubMsg->BufferMark = pStubMsg->Buffer; + memcpy(pStubMsg->Buffer, pMemory, pCStructFormat->memory_size + pStubMsg->MaxCount * esize); + pStubMsg->Buffer += pCStructFormat->memory_size + pStubMsg->MaxCount * esize; - if (pCStructFormat->offset_to_array_description) - { - PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + - pCStructFormat->offset_to_array_description; - NdrConformantArrayMarshall(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); - } if (pCStructFormat->type == RPC_FC_CPSTRUCT) EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); + + STD_OVERFLOW_CHECK(pStubMsg); + return NULL; } @@ -2690,16 +2705,29 @@ unsigned char * WINAPI NdrConformantStr unsigned char fMustAlloc) { const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; - pFormat += sizeof(NDR_CSTRUCT_FORMAT); + PFORMAT_STRING pCArrayFormat; + ULONG esize; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + pFormat += sizeof(NDR_CSTRUCT_FORMAT); if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) { ERR("invalid format type %x\n", pCStructFormat->type); RpcRaiseException(RPC_S_INTERNAL_ERROR); return NULL; } + pCArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + if (*pCArrayFormat != RPC_FC_CARRAY) + { + ERR("invalid array format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + esize = *(const WORD*)(pCArrayFormat+2); + + pCArrayFormat = ReadConformance(pStubMsg, pCArrayFormat + 4); ALIGN_POINTER(pStubMsg->Buffer, pCStructFormat->alignment + 1); @@ -2708,35 +2736,18 @@ unsigned char * WINAPI NdrConformantStr /* work out how much memory to allocate if we need to do so */ if (!*ppMemory || fMustAlloc) { - SIZE_T size = pCStructFormat->memory_size; - - if (pCStructFormat->offset_to_array_description) - { - unsigned char *buffer; - PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + - pCStructFormat->offset_to_array_description; - buffer = pStubMsg->Buffer; - pStubMsg->Buffer += pCStructFormat->memory_size; - size += NdrConformantArrayMemorySize(pStubMsg, pArrayFormat); - pStubMsg->Buffer = buffer; - } + SIZE_T size = pCStructFormat->memory_size + pStubMsg->MaxCount * esize; *ppMemory = NdrAllocate(pStubMsg, size); } /* now copy the data */ - memcpy(*ppMemory, pStubMsg->Buffer, pCStructFormat->memory_size); - pStubMsg->Buffer += pCStructFormat->memory_size; - if (pCStructFormat->offset_to_array_description) - { - PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + - pCStructFormat->offset_to_array_description; - unsigned char *pMemoryArray = *ppMemory + pCStructFormat->memory_size; - /* note that we pass fMustAlloc as 0 as we have already allocated the - * memory */ - NdrConformantArrayUnmarshall(pStubMsg, &pMemoryArray, pArrayFormat, 0); - } + pStubMsg->BufferMark = pStubMsg->Buffer; + memcpy(*ppMemory, pStubMsg->Buffer, pCStructFormat->memory_size + pStubMsg->MaxCount * esize); + pStubMsg->Buffer += pCStructFormat->memory_size + pStubMsg->MaxCount * esize; + if (pCStructFormat->type == RPC_FC_CPSTRUCT) EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + return NULL; } @@ -2748,29 +2759,37 @@ void WINAPI NdrConformantStructBufferSiz PFORMAT_STRING pFormat) { const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; - pFormat += sizeof(NDR_CSTRUCT_FORMAT); + PFORMAT_STRING pCArrayFormat; + ULONG esize; + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + pFormat += sizeof(NDR_CSTRUCT_FORMAT); if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) { ERR("invalid format type %x\n", pCStructFormat->type); RpcRaiseException(RPC_S_INTERNAL_ERROR); return; } + pCArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + if (*pCArrayFormat != RPC_FC_CARRAY) + { + ERR("invalid array format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + esize = *(const WORD*)(pCArrayFormat+2); + + pCArrayFormat = ComputeConformance(pStubMsg, pMemory + pCStructFormat->memory_size, pCArrayFormat+4, 0); + SizeConformance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, pCStructFormat->alignment + 1); TRACE("memory_size = %d\n", pCStructFormat->memory_size); - /* add constant sized part of struct to buffer size */ - pStubMsg->BufferLength += pCStructFormat->memory_size; + pStubMsg->BufferLength += pCStructFormat->memory_size + esize * pStubMsg->MaxCount; - if (pCStructFormat->offset_to_array_description) - { - PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + - pCStructFormat->offset_to_array_description; - NdrConformantArrayBufferSize(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); - } if (pCStructFormat->type == RPC_FC_CPSTRUCT) EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); }

1 0

Robert Shearman : rpcrt4: In NdrConformantBufferSize, SizeConformance should be called, not SizeVariance.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 4af0a6b805f5816163529aeec3f2e55e8ca42e53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4af0a6b805f5816163529ae… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:35:41 2006 +0100 rpcrt4: In NdrConformantBufferSize, SizeConformance should be called, not SizeVariance. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 6156e0f..20c3abb 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2089,7 +2089,7 @@ void WINAPI NdrConformantArrayBufferSize pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; - SizeVariance(pStubMsg); + SizeConformance(pStubMsg); ALIGN_LENGTH(pStubMsg->BufferLength, alignment);

1 0

Robert Shearman : rpcrt4: Save pStubMsg-> ActualCount in a local variable in the complex
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 2479aec4af44ea3498b7334111fdcbb06d5f5c5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2479aec4af44ea3498b7334… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:35:51 2006 +0100 rpcrt4: Save pStubMsg->ActualCount in a local variable in the complex array functions, before calling a function that could change it and cause the wrong number of loop iterations. --- dlls/rpcrt4/ndr_marshall.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3d34b8a..6156e0f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2283,7 +2283,7 @@ unsigned char * WINAPI NdrComplexArrayMa unsigned char *pMemory, PFORMAT_STRING pFormat) { - ULONG count, def; + ULONG i, count, def; BOOL variance_present; unsigned char alignment; @@ -2314,7 +2314,8 @@ unsigned char * WINAPI NdrComplexArrayMa ALIGN_POINTER(pStubMsg->Buffer, alignment); - for (count = 0; count < pStubMsg->ActualCount; count++) + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, NULL); STD_OVERFLOW_CHECK(pStubMsg); @@ -2330,7 +2331,7 @@ unsigned char * WINAPI NdrComplexArrayUn PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG count, esize; + ULONG i, count, esize; unsigned char alignment; unsigned char *pMemory; unsigned char *Buffer; @@ -2364,7 +2365,8 @@ unsigned char * WINAPI NdrComplexArrayUn ALIGN_POINTER(pStubMsg->Buffer, alignment); pMemory = *ppMemory; - for (count = 0; count < pStubMsg->ActualCount; count++) + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); return NULL; @@ -2377,7 +2379,7 @@ void WINAPI NdrComplexArrayBufferSize(PM unsigned char *pMemory, PFORMAT_STRING pFormat) { - ULONG count, def; + ULONG i, count, def; unsigned char alignment; BOOL variance_present; @@ -2408,7 +2410,8 @@ void WINAPI NdrComplexArrayBufferSize(PM ALIGN_LENGTH(pStubMsg->BufferLength, alignment); - for (count=0; count < pStubMsg->ActualCount; count++) + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) pMemory = ComplexBufferSize(pStubMsg, pMemory, pFormat, NULL); } @@ -2418,7 +2421,7 @@ void WINAPI NdrComplexArrayBufferSize(PM unsigned long WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - ULONG count, esize; + ULONG i, count, esize; unsigned char alignment; unsigned char *Buffer; unsigned long SavedMemorySize; @@ -2450,7 +2453,8 @@ unsigned long WINAPI NdrComplexArrayMemo MemorySize = esize * pStubMsg->MaxCount; - for (count = 0; count < pStubMsg->ActualCount; count++) + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) ComplexStructMemorySize(pStubMsg, pFormat); pStubMsg->MemorySize = SavedMemorySize; @@ -2466,7 +2470,7 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST unsigned char *pMemory, PFORMAT_STRING pFormat) { - ULONG count, def; + ULONG i, count, def; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -2486,7 +2490,8 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); TRACE("variance = %ld\n", pStubMsg->ActualCount); - for (count=0; count < pStubMsg->ActualCount; count++) + count = pStubMsg->ActualCount; + for (i = 0; i < count; i++) pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); }

1 0

Robert Shearman : rpcrt4: Dereference the memory for pointers in NdrNonEncapsulatedUnionUnmarshall.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 345c92643e3f1993412851fa0c895506d5f211a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=345c92643e3f1993412851f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:35:17 2006 +0100 rpcrt4: Dereference the memory for pointers in NdrNonEncapsulatedUnionUnmarshall. Pointers in a non-encapsulated union behave like embedded pointers, so don't rely on the NdrPointer* functions doing the right thing in this case and call the Pointer* functions directly. --- dlls/rpcrt4/ndr_marshall.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5681430..3d34b8a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3113,16 +3113,20 @@ unsigned char * WINAPI NdrNonEncapsulat NDR_MARSHALL m = NdrMarshaller[*desc & NDR_TABLE_MASK]; if (m) { + unsigned char *saved_buffer = NULL; switch(*desc) { case RPC_FC_RP: case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: - pMemory = *(void**)pMemory; + saved_buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; /* for pointer ID */ + PointerMarshall(pStubMsg, saved_buffer, *(unsigned char **)pMemory, desc); break; + default: + m(pStubMsg, pMemory, desc); } - m(pStubMsg, pMemory, desc); } else FIXME("no marshaller for embedded type %02x\n", *desc); } @@ -3210,6 +3214,7 @@ unsigned char * WINAPI NdrNonEncapsulat NDR_UNMARSHALL m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; if (m) { + unsigned char *saved_buffer = NULL; switch(*desc) { case RPC_FC_RP: @@ -3217,9 +3222,14 @@ unsigned char * WINAPI NdrNonEncapsulat case RPC_FC_OP: case RPC_FC_FP: **(void***)ppMemory = NULL; + ALIGN_POINTER(pStubMsg->Buffer, 4); + saved_buffer = pStubMsg->Buffer; + pStubMsg->Buffer += 4; /* for pointer ID */ + PointerUnmarshall(pStubMsg, saved_buffer, *(unsigned char ***)ppMemory, desc, fMustAlloc); break; + default: + m(pStubMsg, ppMemory, desc, fMustAlloc); } - return m(pStubMsg, (unsigned char **)*ppMemory, desc, fMustAlloc); } else FIXME("no marshaller for embedded type %02x\n", *desc); } @@ -3263,10 +3273,13 @@ void WINAPI NdrNonEncapsulatedUnionBuffe case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: - pMemory = *(void**)pMemory; + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + pStubMsg->BufferLength += 4; /* for pointer ID */ + PointerBufferSize(pStubMsg, *(unsigned char **)pMemory, desc); break; + default: + m(pStubMsg, pMemory, desc); } - m(pStubMsg, pMemory, desc); } else FIXME("no buffersizer for embedded type %02x\n", *desc); }

1 0

Robert Shearman : rpcrt4: Rename ComplexStructSize to ComplexStructMemorySize to reflect the fact that it increments the buffer .
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: f0aea2d5eebe07cdd6c63f04d7a9c08f869749b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0aea2d5eebe07cdd6c63f0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:35:07 2006 +0100 rpcrt4: Rename ComplexStructSize to ComplexStructMemorySize to reflect the fact that it increments the buffer. Replace the code in EmbeddedComplexSize that sizes non-encapsulated unions without using a memory sizer routine, since this function shouldn't touch the buffer. Add a new function EmbeddedComplexMemorySize and use it in some memory sizer routines where EmbeddedComplexSize was previously used. --- dlls/rpcrt4/ndr_marshall.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 678c38f..5681430 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1523,7 +1523,14 @@ unsigned long WINAPI EmbeddedComplexSize case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; case RPC_FC_NON_ENCAPSULATED_UNION: - return NdrNonEncapsulatedUnionMemorySize(pStubMsg, pFormat); + pFormat += 2; + if (pStubMsg->fHasNewCorrDesc) + pFormat += 6; + else + pFormat += 4; + + pFormat += *(const SHORT*)pFormat; + return *(const SHORT*)pFormat; default: FIXME("unhandled embedded type %02x\n", *pFormat); } @@ -1531,6 +1538,21 @@ unsigned long WINAPI EmbeddedComplexSize } +unsigned long WINAPI EmbeddedComplexMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + NDR_MEMORYSIZE m = NdrMemorySizer[*pFormat & NDR_TABLE_MASK]; + + if (!m) + { + FIXME("no memorysizer for data type=%02x\n", *pFormat); + return 0; + } + + return m(pStubMsg, pFormat); +} + + unsigned char * WINAPI ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, @@ -1776,7 +1798,7 @@ unsigned char * WINAPI ComplexFree(PMIDL return pMemory; } -unsigned long WINAPI ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long WINAPI ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { PFORMAT_STRING desc; @@ -1814,7 +1836,7 @@ unsigned long WINAPI ComplexStructSize(P size += pFormat[1]; pFormat += 2; desc = pFormat + *(const SHORT*)pFormat; - size += EmbeddedComplexSize(pStubMsg, desc); + size += EmbeddedComplexMemorySize(pStubMsg, desc); pFormat += 2; continue; case RPC_FC_PAD: @@ -1940,7 +1962,6 @@ unsigned long WINAPI NdrComplexStructMem unsigned size = *(const WORD*)(pFormat+2); PFORMAT_STRING conf_array = NULL; PFORMAT_STRING pointer_desc = NULL; - unsigned long saved_memory_size; TRACE("(%p,%p)\n", pStubMsg, pFormat); @@ -1952,9 +1973,7 @@ unsigned long WINAPI NdrComplexStructMem if (*(const WORD*)pFormat) pointer_desc = pFormat + *(const WORD*)pFormat; pFormat += 2; - saved_memory_size = pStubMsg->MemorySize; - ComplexStructSize(pStubMsg, pFormat); - pStubMsg->MemorySize = saved_memory_size; + ComplexStructMemorySize(pStubMsg, pFormat); if (conf_array) NdrConformantArrayMemorySize(pStubMsg, conf_array); @@ -2333,7 +2352,7 @@ unsigned char * WINAPI NdrComplexArrayUn pFormat = ReadVariance(pStubMsg, pFormat); Buffer = pStubMsg->Buffer; - esize = ComplexStructSize(pStubMsg, pFormat); + esize = ComplexStructMemorySize(pStubMsg, pFormat); pStubMsg->Buffer = Buffer; if (fMustAlloc || !*ppMemory) @@ -2426,13 +2445,13 @@ unsigned long WINAPI NdrComplexArrayMemo SavedMemorySize = pStubMsg->MemorySize; Buffer = pStubMsg->Buffer; - esize = ComplexStructSize(pStubMsg, pFormat); + esize = ComplexStructMemorySize(pStubMsg, pFormat); pStubMsg->Buffer = Buffer; MemorySize = esize * pStubMsg->MaxCount; for (count = 0; count < pStubMsg->ActualCount; count++) - ComplexStructSize(pStubMsg, pFormat); + ComplexStructMemorySize(pStubMsg, pFormat); pStubMsg->MemorySize = SavedMemorySize;

1 0

Robert Shearman : rpcrt4: Fix embedded pointers in arrays by taking into account the iteration when calculating the appropriate memory and buffer pointers .
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 788ce20deac20cb68ba1330de3dd95e92ab1c506 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=788ce20deac20cb68ba1330… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 15 13:34:47 2006 +0100 rpcrt4: Fix embedded pointers in arrays by taking into account the iteration when calculating the appropriate memory and buffer pointers. --- dlls/rpcrt4/ndr_marshall.c | 45 ++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0fbf0f3..678c38f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -981,6 +981,7 @@ unsigned char * WINAPI EmbeddedPointerMa unsigned char *Mark = pStubMsg->BufferMark; unsigned long Offset = pStubMsg->Offset; unsigned ofs, rep, count, stride, xofs; + unsigned i; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); @@ -1016,17 +1017,17 @@ unsigned char * WINAPI EmbeddedPointerMa pFormat += 8; break; } - /* ofs doesn't seem to matter in this context */ - while (rep) { + for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + xofs; + unsigned char *membase = pMemory + (i * stride); + unsigned char *bufbase = Mark + (i * stride); unsigned u; + /* ofs doesn't seem to matter in this context */ for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; - unsigned char *bufptr = Mark + *(const SHORT*)&info[2]; + unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); } - rep--; } pFormat += 8 * count; } @@ -1047,6 +1048,7 @@ unsigned char * WINAPI EmbeddedPointerUn unsigned char *Mark = pStubMsg->BufferMark; unsigned long Offset = pStubMsg->Offset; unsigned ofs, rep, count, stride, xofs; + unsigned i; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -1054,6 +1056,7 @@ unsigned char * WINAPI EmbeddedPointerUn pFormat += 2; while (pFormat[0] != RPC_FC_END) { + TRACE("pFormat[0] = 0x%x\n", pFormat[0]); switch (pFormat[0]) { default: FIXME("unknown repeat type %d\n", pFormat[0]); @@ -1083,16 +1086,17 @@ unsigned char * WINAPI EmbeddedPointerUn break; } /* ofs doesn't seem to matter in this context */ - while (rep) { + for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = *ppMemory + xofs; + unsigned char *membase = *ppMemory + (i * stride); + unsigned char *bufbase = Mark + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; - unsigned char *bufptr = Mark + *(const SHORT*)&info[2]; + unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; + *(void **)memptr = NULL; PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, fMustAlloc); } - rep--; } pFormat += 8 * count; } @@ -1109,8 +1113,12 @@ void WINAPI EmbeddedPointerBufferSize(PM { unsigned long Offset = pStubMsg->Offset; unsigned ofs, rep, count, stride, xofs; + unsigned i; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); + + if (pStubMsg->IgnoreEmbeddedPointers) return; + if (*pFormat != RPC_FC_PP) return; pFormat += 2; @@ -1144,15 +1152,14 @@ void WINAPI EmbeddedPointerBufferSize(PM break; } /* ofs doesn't seem to matter in this context */ - while (rep) { + for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + xofs; + unsigned char *membase = pMemory + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); } - rep--; } pFormat += 8 * count; } @@ -1167,8 +1174,10 @@ unsigned long WINAPI EmbeddedPointerMemo unsigned long Offset = pStubMsg->Offset; unsigned char *Mark = pStubMsg->BufferMark; unsigned ofs, rep, count, stride, xofs; + unsigned i; FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + if (*pFormat != RPC_FC_PP) return 0; pFormat += 2; @@ -1202,14 +1211,14 @@ unsigned long WINAPI EmbeddedPointerMemo break; } /* ofs doesn't seem to matter in this context */ - while (rep) { + for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; + unsigned char *bufbase = Mark + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { - unsigned char *bufptr = Mark + *(const SHORT*)&info[2]; + unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; PointerMemorySize(pStubMsg, bufptr, info+4); } - rep--; } pFormat += 8 * count; } @@ -1226,6 +1235,7 @@ void WINAPI EmbeddedPointerFree(PMIDL_ST { unsigned long Offset = pStubMsg->Offset; unsigned ofs, rep, count, stride, xofs; + unsigned i; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (*pFormat != RPC_FC_PP) return; @@ -1261,15 +1271,14 @@ void WINAPI EmbeddedPointerFree(PMIDL_ST break; } /* ofs doesn't seem to matter in this context */ - while (rep) { + for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + xofs; + unsigned char *membase = pMemory + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; PointerFree(pStubMsg, *(unsigned char**)memptr, info+4); } - rep--; } pFormat += 8 * count; }

1 0

Ivan Gyurdiev : wined3d: Shaders: share dump_param function, version functions.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 8b7401c39a47e8cfd402940cd8333ddc56266656 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b7401c39a47e8cfd402940… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun May 14 09:43:31 2006 -0400 wined3d: Shaders: share dump_param function, version functions. --- dlls/wined3d/baseshader.c | 152 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/pixelshader.c | 137 +----------------------------------- dlls/wined3d/vertexshader.c | 110 ++--------------------------- dlls/wined3d/wined3d_private.h | 17 ++++ 4 files changed, 174 insertions(+), 242 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8b7401c39a47e8cfd40…

1 0

Ivan Gyurdiev : wined3d: Fix incorrect sizeof.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 7757d7bc5ce1ec6f123a5d9166aecff2a8fec477 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7757d7bc5ce1ec6f123a5d9… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sun May 14 03:44:27 2006 -0400 wined3d: Fix incorrect sizeof. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9c0e851..af08451 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -202,7 +202,7 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Ca memory) just do the copy */ if (src->changed) { TRACE("Updating lights for light %ld\n", src->OriginalIndex); - memcpy(&src->OriginalParms, &realLight->OriginalParms, sizeof(PLIGHTINFOEL)); + memcpy(&src->OriginalParms, &realLight->OriginalParms, sizeof(src->OriginalParms)); } /* If 'enabledchanged' then its a LightEnable command */

1 0