forked from Mirrors/wine-wine
ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
a36abda773
commit
b7f3e26e89
|
@ -1063,6 +1063,10 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data,
|
||||||
prop->u.bVal = *data;
|
prop->u.bVal = *data;
|
||||||
TRACE("Read byte 0x%x\n", prop->u.bVal);
|
TRACE("Read byte 0x%x\n", prop->u.bVal);
|
||||||
break;
|
break;
|
||||||
|
case VT_BOOL:
|
||||||
|
StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal);
|
||||||
|
TRACE("Read bool %d\n", prop->u.boolVal);
|
||||||
|
break;
|
||||||
case VT_I2:
|
case VT_I2:
|
||||||
StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal);
|
StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal);
|
||||||
TRACE("Read short %d\n", prop->u.iVal);
|
TRACE("Read short %d\n", prop->u.iVal);
|
||||||
|
@ -1081,6 +1085,18 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data,
|
||||||
StorageUtl_ReadDWord(data, 0, &prop->u.ulVal);
|
StorageUtl_ReadDWord(data, 0, &prop->u.ulVal);
|
||||||
TRACE("Read ulong %d\n", prop->u.ulVal);
|
TRACE("Read ulong %d\n", prop->u.ulVal);
|
||||||
break;
|
break;
|
||||||
|
case VT_I8:
|
||||||
|
StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal);
|
||||||
|
TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart));
|
||||||
|
break;
|
||||||
|
case VT_UI8:
|
||||||
|
StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal);
|
||||||
|
TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart));
|
||||||
|
break;
|
||||||
|
case VT_R8:
|
||||||
|
memcpy(&prop->u.dblVal, data, sizeof(double));
|
||||||
|
TRACE("Read double %f\n", prop->u.dblVal);
|
||||||
|
break;
|
||||||
case VT_LPSTR:
|
case VT_LPSTR:
|
||||||
{
|
{
|
||||||
DWORD count;
|
DWORD count;
|
||||||
|
|
Loading…
Reference in New Issue