oleaut32/tests: remove macros from test_VarCyCmpR8

[Austin English]

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 99df002..2547fae 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -3913,26 +3913,61 @@ static void test_VarCyCmp(void)
   MATHCMP(1.0, 2.0);   EXPECT_LT;
 }
 
-#define MATHCMPR8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \
-  hres = pVarCyCmpR8(cyLeft, right); out.int64 = hres
-
 static void test_VarCyCmpR8(void)
 {
-  MATHVARS1;
-  double right;
-
-  CHECKPTR(VarCyCmpR8);
-  MATHCMPR8(-1.0, -1.0); EXPECT_EQ;
-  MATHCMPR8(-1.0, 0.0);  EXPECT_LT;
-  MATHCMPR8(-1.0, 1.0);  EXPECT_LT;
-  MATHCMPR8(-1.0, 2.0);  EXPECT_LT;
-  MATHCMPR8(0.0, 1.0);   EXPECT_LT;
-  MATHCMPR8(0.0, 0.0);   EXPECT_EQ;
-  MATHCMPR8(0.0, -1.0);  EXPECT_GT;
-  MATHCMPR8(1.0, -1.0);  EXPECT_GT;
-  MATHCMPR8(1.0, 0.0);   EXPECT_GT;
-  MATHCMPR8(1.0, 1.0);   EXPECT_EQ;
-  MATHCMPR8(1.0, 2.0);   EXPECT_LT;
+  HRESULT hres;
+  CY cyLeft;
+  
+  pVarCyCmpR8 = (void*)GetProcAddress(hOleaut32, "VarCyCmpR8");
+  if (!pVarCyCmpR8)
+  {
+      win_skip("function VarCyCmpR8 not available, not testing it\n");
+      return;
+  }
+  
+  pVarCyFromR8(-1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, -1.0); 
+  ok(hres == VARCMP_EQ, "expected hres VARCMP_EQ, got hres=0x%08x\n", hres);
+    
+  pVarCyFromR8(-1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 0.0); 
+  ok(hres == VARCMP_LT, "expected hres VARCMP_LT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(-1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 1.0); 
+  ok(hres == VARCMP_LT, "expected hres VARCMP_LT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(-1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 2.0); 
+  ok(hres == VARCMP_LT, "expected hres VARCMP_LT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(0.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 1.0); 
+  ok(hres == VARCMP_LT, "expected hres VARCMP_LT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(0.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 0.0); 
+  ok(hres == VARCMP_EQ, "expected hres VARCMP_EQ, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(0.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, -1.0); 
+  ok(hres == VARCMP_GT, "expected hres VARCMP_GT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, -1.0); 
+  ok(hres == VARCMP_GT, "expected hres VARCMP_GT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 0.0); 
+  ok(hres == VARCMP_GT, "expected hres VARCMP_GT, got hres=0x%08x\n", hres);
+
+  pVarCyFromR8(1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 1.0); 
+  ok(hres == VARCMP_EQ, "expected hres VARCMP_EQ, got hres=0x%08x\n", hres);
+  
+  pVarCyFromR8(1.0, &cyLeft);
+  hres = pVarCyCmpR8(cyLeft, 2.0); 
+  ok(hres == VARCMP_LT, "expected hres VARCMP_LT, got hres=0x%08x\n", hres);
 }
 
 #undef MATHRND
-- 
1.6.4.4