Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-07 19:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

partial sync of oleaut32 to wine 1.1.28

Browse source 
svn path=/trunk/; revision=42861
This commit is contained in:
Christoph von Wittich 2009-08-22 17:29:38 +00:00
parent ac215ed75c
commit fa3224d6d5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/oleaut32/typelib.c
View file

@ -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;