[PATCH 0/2] MR4989: oleaut32/tests: Add tests for VarBstrFromR4.

[Daniel Lehman (＠dlehman25)]

part of a larger series that will remove the todos

VarBstrFrom* calls into msvcrt but oleaut32's string representation differs slightly

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4989

[PATCH 1/2] oleaut32/tests: Add tests for VarBstrFromR8.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/oleaut32/tests/vartype.c | 92 +++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 9426272d7be..27348b4866e 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -4576,6 +4576,97 @@ static void test_VarBstrFromR4(void)
   }
 }
 
+struct r8_test
+{
+  double val;
+  const wchar_t *expect;
+  BOOL todo;
+};
+
+static void test_VarBstrFromR8(void)
+{
+  static const struct r8_test tests_en[] =
+  {
+    { 0.5, L"0.5" },
+    { 0.05, L"0.05" },
+    { 0.005, L"0.005" },
+    { 0.0005, L"0.0005" },
+    { 0.00005, L"0.00005", TRUE },
+    { 0.000005, L"0.000005", TRUE },
+
+    { 1.0e8, L"100000000" },
+    { 1.0e12, L"1000000000000" },
+    { 1.0e14, L"100000000000000" },
+    { 999999999999999.0, L"999999999999999" },
+    { 1000000000000000.0, L"1E+15" },
+    { 1200000000000000.0, L"1.2E+15" },
+    { 1.0e15, L"1E+15" },
+
+    { 1.000e16, L"1E+16" },
+    { 1.234e16, L"1.234E+16" },
+
+    { 0.0, NULL }
+  };
+  static const struct r8_test tests_es[] =
+  {
+    { 0.5, L"0,5" },
+    { 0.05, L"0,05" },
+    { 0.005, L"0,005" },
+    { 0.0005, L"0,0005" },
+    { 0.00005, L"0,00005", TRUE },
+    { 0.000005, L"0,000005", TRUE },
+
+    { 1.0e8, L"100000000" },
+    { 1.0e12, L"1000000000000" },
+    { 1.0e14, L"100000000000000" },
+    { 999999999999999.0, L"999999999999999" },
+    { 1000000000000000.0, L"1E+15" },
+    { 1200000000000000.0, L"1,2E+15", TRUE },
+    { 1.0e15, L"1E+15" },
+
+    { 1.000e16, L"1E+16" },
+    { 1.234e16, L"1,234E+16", TRUE },
+
+    { 0.0, NULL }
+  };
+  const struct r8_test *cur;
+  HRESULT hres;
+  BSTR bstr;
+  LCID lcid;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+  cur = tests_en;
+  while (cur->expect)
+  {
+    bstr = NULL;
+    hres = VarBstrFromR8(cur->val, lcid, 0, &bstr);
+    ok(hres == S_OK, "got hres 0x%08lx\n", hres);
+    if (bstr)
+    {
+      todo_wine_if(cur->todo)
+      ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr);
+      SysFreeString(bstr);
+    }
+    ++cur;
+  }
+
+  lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT);
+  cur = tests_es;
+  while (cur->expect)
+  {
+    bstr = NULL;
+    hres = VarBstrFromR8(cur->val, lcid, 0, &bstr);
+    ok(hres == S_OK, "got hres 0x%08lx\n", hres);
+    if (bstr)
+    {
+      todo_wine_if(cur->todo)
+      ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr);
+      SysFreeString(bstr);
+    }
+    ++cur;
+  }
+}
+
 static void _BSTR_DATE(DATE dt, const char *str, int line)
 {
   LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
@@ -6325,6 +6416,7 @@ START_TEST(vartype)
 
   test_VarBstrFromI4();
   test_VarBstrFromR4();
+  test_VarBstrFromR8();
   test_VarBstrFromDate();
   test_VarBstrFromCy();
   test_VarBstrFromDec();
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/4989

[PATCH 2/2] oleaut32/tests: Add tests for VarBstrFromR4.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/oleaut32/tests/vartype.c | 89 +++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 27348b4866e..e567f5a5fed 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -4521,8 +4521,65 @@ static void test_VarBstrFromI4(void)
   }
 }
 
+struct r4_test
+{
+  float val;
+  const wchar_t *expect;
+  BOOL todo;
+};
+
 static void test_VarBstrFromR4(void)
 {
+  static const struct r4_test tests_en[] =
+  {
+    { 0.5, L"0.5" },
+    { 0.05, L"0.05" },
+    { 0.005, L"0.005" },
+    { 0.0005, L"0.0005" },
+    { 0.00005, L"0.00005", TRUE },
+    { 0.000005, L"0.000005", TRUE },
+
+    { 1.0e8, L"1E+08" },
+    { 1.0e12, L"1E+12" },
+    { 1.0e14, L"1E+14" },
+    { 999999999999999.0, L"1E+15" },
+    { 1000000000000000.0, L"1E+15" },
+    { 1200000000000000.0, L"1.2E+15" },
+    { 1.0e15, L"1E+15" },
+
+    { 1.000e16, L"1E+16" },
+    { 1.234e16, L"1.234E+16" },
+    { M_PI, L"3.141593" },
+    { 37.86626157, L"37.86626" },
+    { 137.86626157, L"137.8663" },
+    { 1137.86626157, L"1137.866" },
+
+    { 0.0, NULL }
+  };
+  static const struct r4_test tests_es[] =
+  {
+    { 0.5, L"0,5" },
+    { 0.05, L"0,05" },
+    { 0.005, L"0,005" },
+    { 0.0005, L"0,0005" },
+    { 0.00005, L"0,00005", TRUE },
+    { 0.000005, L"0,000005", TRUE },
+
+    { 1.0e8, L"1E+08" },
+    { 1.0e12, L"1E+12" },
+    { 1.0e14, L"1E+14" },
+    { 999999999999999.0, L"1E+15" },
+    { 1000000000000000.0, L"1E+15" },
+    { 1200000000000000.0, L"1,2E+15", TRUE },
+    { 1.0e15, L"1E+15" },
+
+    { 1.000e16, L"1E+16" },
+    { 1.234e16, L"1,234E+16", TRUE },
+    { M_PI, L"3,141593" },
+
+    { 0.0, NULL }
+  };
+  const struct r4_test *cur;
   static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' };
   static const WCHAR szZero[] = {'0', '\0'};
   static const WCHAR szOneHalf_English[] = { '0','.','5','\0' };    /* uses period */
@@ -4574,6 +4631,38 @@ static void test_VarBstrFromR4(void)
     ok(memcmp(bstr, szOneHalf_Spanish, sizeof(szOneHalf_Spanish)) == 0, "Spanish locale failed (got %s)\n", wtoascii(bstr));
     SysFreeString(bstr);
   }
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+  cur = tests_en;
+  while (cur->expect)
+  {
+    bstr = NULL;
+    hres = VarBstrFromR4(cur->val, lcid, 0, &bstr);
+    ok(hres == S_OK, "got hres 0x%08lx\n", hres);
+    if (bstr)
+    {
+      todo_wine_if(cur->todo)
+      ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr);
+      SysFreeString(bstr);
+    }
+    ++cur;
+  }
+
+  lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT);
+  cur = tests_es;
+  while (cur->expect)
+  {
+    bstr = NULL;
+    hres = VarBstrFromR4(cur->val, lcid, 0, &bstr);
+    ok(hres == S_OK, "got hres 0x%08lx\n", hres);
+    if (bstr)
+    {
+      todo_wine_if(cur->todo)
+      ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr);
+      SysFreeString(bstr);
+    }
+    ++cur;
+  }
 }
 
 struct r8_test
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4989