Ported variant tests to the new testing framework.

configure.ac

@@ -1257,6 +1257,7 @@ WINE_CONFIG_EXTRA_DIR(dlls/dinput/keyboard)
 WINE_CONFIG_EXTRA_DIR(dlls/dinput/mouse)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/tests)
+WINE_CONFIG_EXTRA_DIR(dlls/oleaut32/tests)
 WINE_CONFIG_EXTRA_DIR(dlls/user/dde)
 WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/user/tests)

dlls/oleaut32/Makefile.in

@@ -28,6 +28,8 @@ C_SRCS = \
 RC_SRCS = \
 	version.rc
 
+CTESTS = tests/vartest.c
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/oleaut32/tests/.cvsignore

+oleaut32_test.spec.c
+testlist.c
+vartest.ok

libtest/vartest.spec → dlls/oleaut32/tests/oleaut32_test.spec

-name	vartest
-mode	guiexe
+name	oleaut32_tests
+mode	cuiexe
 type	win32
 
 import	oleaut32.dll
+import	gdi32.dll
 import	kernel32.dll
 import	ntdll.dll

dlls/oleaut32/variant.c

@@ -1650,7 +1650,7 @@ static HRESULT WINAPI ValidateVariantType( VARTYPE vt )
             ( vt & VT_TYPEMASK ) == VT_NULL ||
 			( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
 		{
-			res = E_INVALIDARG;
+			res = DISP_E_BADVARTYPE;
 		}
 			
     }
@@ -1972,8 +1972,8 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 	      break;
 	  }
 	}
-	
-	V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
+
+        if (res == S_OK) V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
       }
     }
 

libtest/Makefile.in

@@ -5,7 +5,7 @@ TOPOBJDIR  = ..
 SRCDIR     = @srcdir@
 VPATH      = @srcdir@
 MODULE     = none
-PROGRAMS   = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
+PROGRAMS   = expand hello hello2 hello3 hello4 hello5 new rolex volinfo
 ALL_LIBS   = $(LIBWINE) $(LIBS)
 
 C_SRCS = \
@@ -17,7 +17,6 @@ C_SRCS = \
 	hello5.c \
 	new.c \
 	rolex.c \
-	vartest.c \
 	volinfo.c
 
 SPEC_SRCS = \
@@ -29,7 +28,6 @@ SPEC_SRCS = \
 	hello5.spec \
 	new.spec \
 	rolex.spec \
-	vartest.spec \
 	volinfo.spec
 
 RC_SRCS = \
@@ -79,11 +77,6 @@ rolex.spec.c: rolex.spec rolex.o $(WINEBUILD)
 rolex.so: rolex.o rolex.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o rolex.so $+ $(ALL_LIBS)
 
-vartest.spec.c: vartest.spec vartest.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym vartest.o -o vartest.spec.c -spec vartest.spec
-vartest.so: vartest.o vartest.spec.o
-	$(LDSHARED) $(LDDLLFLAGS) -o vartest.so $+ $(ALL_LIBS)
-
 volinfo.spec.c: volinfo.spec volinfo.o $(WINEBUILD)
 	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym volinfo.o -o volinfo.spec.c -spec volinfo.spec
 volinfo.so: volinfo.o volinfo.spec.o

libtest/vartest.readme

-The purpose of this program is validate the implementation 
-of the APIs related to VARIANTs. The validation is done
-by comparing the results given by the Windows implementation
-versus the Wine implementation.
-
-This program tests the creation/coercion/destruction of VARIANTs.
-
-This program was built in both Windows and Wine and the purpose
-of this program is to compare the output produced in both 
-environments. To facilitate that, the log of the output created 
-by the windows version of this program was added to CVS.
-
-If you modify this program, it might be wise to rebuild it in
-Windows, regenerate that output file and resubmit it to CVS.
-
-The output of the programs differ slightly from the one generated
-in Windows but most of the differences are caused by differences 
-in the way that printf interprets some escape sequences and the way
-floating point numbers are printed. See the notes in vartest.c for
-more information.
-