Francois Gouget : oleaut32/tests: Use NUMPRS_HEX_OCT instead of hardcoding its value.

Alexandre Julliard julliard at winehq.org
Mon Jul 26 15:30:28 CDT 2021


Module: wine
Branch: master
Commit: 6e8586ca1b64bb11ef540685e795fbffa7211bca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6e8586ca1b64bb11ef540685e795fbffa7211bca

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Jul 26 18:22:35 2021 +0200

oleaut32/tests: Use NUMPRS_HEX_OCT instead of hardcoding its value.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oleaut32/tests/vartest.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 73df13fe5c9..2bb53939821 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -1505,7 +1505,7 @@ static void test_VarParseNumFromStrEn(void)
 
   /* VB hex */
   CONVERT("&HF800", NUMPRS_HEX_OCT);
-  EXPECT(4,NUMPRS_HEX_OCT,0x40,6,4,0);
+  EXPECT(4,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,6,4,0);
   EXPECTRGB(0,15);
   EXPECTRGB(1,8);
   EXPECTRGB(2,0);
@@ -1514,7 +1514,7 @@ static void test_VarParseNumFromStrEn(void)
 
   /* VB hex lower case and leading zero */
   CONVERT("&h0abcdef", NUMPRS_HEX_OCT);
-  EXPECT(6,NUMPRS_HEX_OCT,0x40,9,4,0);
+  EXPECT(6,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,9,4,0);
   EXPECTRGB(0,10);
   EXPECTRGB(1,11);
   EXPECTRGB(2,12);
@@ -1525,7 +1525,7 @@ static void test_VarParseNumFromStrEn(void)
 
   /* VB oct */
   CONVERT("&O300", NUMPRS_HEX_OCT);
-  EXPECT(3,NUMPRS_HEX_OCT,0x40,5,3,0);
+  EXPECT(3,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,5,3,0);
   EXPECTRGB(0,3);
   EXPECTRGB(1,0);
   EXPECTRGB(2,0);
@@ -1533,7 +1533,7 @@ static void test_VarParseNumFromStrEn(void)
 
   /* VB oct lower case and leading zero */
   CONVERT("&o0777", NUMPRS_HEX_OCT);
-  EXPECT(3,NUMPRS_HEX_OCT,0x40,6,3,0);
+  EXPECT(3,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,6,3,0);
   EXPECTRGB(0,7);
   EXPECTRGB(1,7);
   EXPECTRGB(2,7);
@@ -1541,7 +1541,7 @@ static void test_VarParseNumFromStrEn(void)
 
   /* VB oct char bigger than 7 */
   CONVERT("&o128", NUMPRS_HEX_OCT);
-  EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0);
+  EXPECT(2,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,4,3,0);
   EXPECTRGB(0,1);
   EXPECTRGB(1,2);
   EXPECTRGB(3,FAILDIG);




More information about the wine-cvs mailing list