From fa3224d6d57338c58e109c1a5afd5dc248f51e97 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 22 Aug 2009 17:29:38 +0000 Subject: [PATCH] partial sync of oleaut32 to wine 1.1.28 svn path=/trunk/; revision=42861 --- reactos/dll/win32/oleaut32/typelib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/oleaut32/typelib.c b/reactos/dll/win32/oleaut32/typelib.c index 1f104f80f16..e87095b8360 100644 --- a/reactos/dll/win32/oleaut32/typelib.c +++ b/reactos/dll/win32/oleaut32/typelib.c @@ -3052,7 +3052,7 @@ static WORD SLTG_ReadString(const char *ptr, BSTR *pBstr) bytelen = *(const WORD*)ptr; if(bytelen == 0xffff) return 2; len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); - *pBstr = SysAllocStringLen(NULL, len - 1); + *pBstr = SysAllocStringLen(NULL, len); if (*pBstr) len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, *pBstr, len); return bytelen + 2; @@ -5874,6 +5874,12 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, *vt |= VT_ARRAY; hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt); break; + case VT_INT: + *vt |= VT_I4; + break; + case VT_UINT: + *vt |= VT_UI4; + break; default: *vt |= tdesc->vt; break;