Skip to content

W
wine-cw
Commit 24dd931a authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

oleaut32: Handle bstr length of -1 in typelibs.

parent bf680011
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 7 deletions
dlls/oleaut32/typelib.c
View file @ 24dd931a
...@@ -1367,12 +1367,13 @@ static void *TLB_CopyTypeDesc( TYPEDESC *dest, const TYPEDESC *src, void *buffer ...@@ -1367,12 +1367,13 @@ static void *TLB_CopyTypeDesc( TYPEDESC *dest, const TYPEDESC *src, void *buffer
* *
* Functions for reading MSFT typelibs (those created by CreateTypeLib2) * Functions for reading MSFT typelibs (those created by CreateTypeLib2)
*/ */
/* read function */ static inline unsigned int MSFT_Tell(TLBContext *pcx)
static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where )
{ {
TRACE_(typelib)("pos=0x%08x len=0x%08lx 0x%08x 0x%08x 0x%08lx\n", return pcx->pos;
pcx->pos, count, pcx->oStart, pcx->length, where); }
static inline void MSFT_Seek(TLBContext *pcx, long where)
{
if (where != DO_NOT_SEEK) if (where != DO_NOT_SEEK)
{ {
where += pcx->oStart; where += pcx->oStart;
...@@ -1384,6 +1385,15 @@ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) ...@@ -1384,6 +1385,15 @@ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where )
} }
pcx->pos = where; pcx->pos = where;
} }
}
/* read function */
static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where )
{
TRACE_(typelib)("pos=0x%08x len=0x%08lx 0x%08x 0x%08x 0x%08lx\n",
pcx->pos, count, pcx->oStart, pcx->length, where);
MSFT_Seek(pcx, where);
if (pcx->pos + count > pcx->length) count = pcx->length - pcx->pos; if (pcx->pos + count > pcx->length) count = pcx->length - pcx->pos;
memcpy( buffer, (char *)pcx->mapping + pcx->pos, count ); memcpy( buffer, (char *)pcx->mapping + pcx->pos, count );
pcx->pos += count; pcx->pos += count;
...@@ -1561,8 +1571,16 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) ...@@ -1561,8 +1571,16 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx )
char * ptr; char * ptr;
MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK );
if(size < 0) { if(size < 0) {
FIXME("BSTR length = %d?\n", size); char next;
} else { DWORD origPos = MSFT_Tell(pcx), nullPos;
do {
MSFT_Read(&next, 1, pcx, DO_NOT_SEEK);
} while (next);
nullPos = MSFT_Tell(pcx);
size = nullPos - origPos;
MSFT_Seek(pcx, origPos);
}
ptr=TLB_Alloc(size);/* allocate temp buffer */ ptr=TLB_Alloc(size);/* allocate temp buffer */
MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */
V_BSTR(pVar)=SysAllocStringLen(NULL,size); V_BSTR(pVar)=SysAllocStringLen(NULL,size);
...@@ -1571,7 +1589,6 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) ...@@ -1571,7 +1589,6 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx )
while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; while(size--) V_UNION(pVar, bstrVal[size])=ptr[size];
TLB_Free(ptr); TLB_Free(ptr);
} }
}
size=-4; break; size=-4; break;
/* FIXME: this will not work AT ALL when the variant contains a pointer */ /* FIXME: this will not work AT ALL when the variant contains a pointer */
case VT_DISPATCH : case VT_DISPATCH :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment