Dmitry Timoshkov : ole32: Revert part of 3cb0c81336.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5e7251b9377d37c17968b82147b1b2eb3e7b3a7b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5e7251b9377d37c17968b82147...

Author: Dmitry Timoshkov 
Date:   Fri Apr 18 18:10:11 2014 +0900

ole32: Revert part of 3cb0c81336.

VT_INT|VT_VECTOR and VT_UINT|VT_VECTOR are not supposed to be supported
by PropVariantClear and PropVariantCopy.

---

dlls/ole32/ole2.c              |    4 ----
 dlls/ole32/tests/propvariant.c |    4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index ed454cd..1228138 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2892,8 +2892,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt)
     case VT_UI2|VT_VECTOR:
     case VT_UI4|VT_VECTOR:
     case VT_UI8|VT_VECTOR:
-    case VT_INT|VT_VECTOR:
-    case VT_UINT|VT_VECTOR:
     case VT_LPSTR|VT_VECTOR:
     case VT_LPWSTR|VT_VECTOR:
     case VT_FILETIME|VT_VECTOR:
@@ -3123,8 +3121,6 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest,      /* [out] */
             case VT_ERROR:    elemSize = sizeof(pvarSrc->u.scode); break;
             case VT_I8:       elemSize = sizeof(pvarSrc->u.hVal); break;
             case VT_UI8:      elemSize = sizeof(pvarSrc->u.uhVal); break;
-            case VT_INT:      elemSize = sizeof(pvarSrc->u.lVal); break;
-            case VT_UINT:     elemSize = sizeof(pvarSrc->u.ulVal); break;
             case VT_CY:       elemSize = sizeof(pvarSrc->u.cyVal); break;
             case VT_DATE:     elemSize = sizeof(pvarSrc->u.date); break;
             case VT_FILETIME: elemSize = sizeof(pvarSrc->u.filetime); break;
diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c
index 78c1ad0..9863ced 100644
--- a/dlls/ole32/tests/propvariant.c
+++ b/dlls/ole32/tests/propvariant.c
@@ -64,8 +64,8 @@ static const struct valid_mapping
     { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO  }, /* VT_UI4 */
     { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */
     { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */
-    { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO  }, /* VT_INT */
-    { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO  }, /* VT_UINT */
+    { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO  }, /* VT_INT */
+    { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO  }, /* VT_UINT */
     { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */
     { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */
     { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */