Commit 574a52e5 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

ole32: Add VT_I1 to the list of supported variant types.

parent eeb550c0
...@@ -2907,8 +2907,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) ...@@ -2907,8 +2907,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt)
{ {
case VT_EMPTY: case VT_EMPTY:
case VT_NULL: case VT_NULL:
case VT_I1:
case VT_I2: case VT_I2:
case VT_I4: case VT_I4:
case VT_I8:
case VT_R4: case VT_R4:
case VT_R8: case VT_R8:
case VT_CY: case VT_CY:
...@@ -2920,7 +2922,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) ...@@ -2920,7 +2922,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt)
case VT_UI1: case VT_UI1:
case VT_UI2: case VT_UI2:
case VT_UI4: case VT_UI4:
case VT_I8:
case VT_UI8: case VT_UI8:
case VT_LPSTR: case VT_LPSTR:
case VT_LPWSTR: case VT_LPWSTR:
...@@ -2933,8 +2934,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) ...@@ -2933,8 +2934,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt)
case VT_BLOB_OBJECT: case VT_BLOB_OBJECT:
case VT_CF: case VT_CF:
case VT_CLSID: case VT_CLSID:
case VT_I1|VT_VECTOR:
case VT_I2|VT_VECTOR: case VT_I2|VT_VECTOR:
case VT_I4|VT_VECTOR: case VT_I4|VT_VECTOR:
case VT_I8|VT_VECTOR:
case VT_R4|VT_VECTOR: case VT_R4|VT_VECTOR:
case VT_R8|VT_VECTOR: case VT_R8|VT_VECTOR:
case VT_CY|VT_VECTOR: case VT_CY|VT_VECTOR:
...@@ -2946,7 +2949,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) ...@@ -2946,7 +2949,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt)
case VT_UI1|VT_VECTOR: case VT_UI1|VT_VECTOR:
case VT_UI2|VT_VECTOR: case VT_UI2|VT_VECTOR:
case VT_UI4|VT_VECTOR: case VT_UI4|VT_VECTOR:
case VT_I8|VT_VECTOR:
case VT_UI8|VT_VECTOR: case VT_UI8|VT_VECTOR:
case VT_LPSTR|VT_VECTOR: case VT_LPSTR|VT_VECTOR:
case VT_LPWSTR|VT_VECTOR: case VT_LPWSTR|VT_VECTOR:
...@@ -2979,8 +2981,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ ...@@ -2979,8 +2981,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */
{ {
case VT_EMPTY: case VT_EMPTY:
case VT_NULL: case VT_NULL:
case VT_I1:
case VT_I2: case VT_I2:
case VT_I4: case VT_I4:
case VT_I8:
case VT_R4: case VT_R4:
case VT_R8: case VT_R8:
case VT_CY: case VT_CY:
...@@ -2991,7 +2995,6 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ ...@@ -2991,7 +2995,6 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */
case VT_UI1: case VT_UI1:
case VT_UI2: case VT_UI2:
case VT_UI4: case VT_UI4:
case VT_I8:
case VT_UI8: case VT_UI8:
case VT_FILETIME: case VT_FILETIME:
break; break;
......
...@@ -56,7 +56,7 @@ static const struct valid_mapping ...@@ -56,7 +56,7 @@ static const struct valid_mapping
{ PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */
{ PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */
{ PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */
{ PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO }, /* VT_I1 */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */
{ PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */
{ PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */
{ PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */
......
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