[ros-diffs] [reactos] 01/04: [ATL_APITEST] Add a test for CString.AllocSysString

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bccdcded28112a49e4d02…

commit bccdcded28112a49e4d02160cd0ca598595e10b7
Author: Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sun Dec 24 01:25:54 2017 +0100

    [ATL_APITEST] Add a test for CString.AllocSysString
---
 modules/rostests/apitests/atl/CString.cpp                 | 15 +++++++++------
 modules/rostests/apitests/atl/CString.inl                 | 15 +++++++++++++++
 modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj |  2 +-
 modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj   |  2 +-
 modules/rostests/apitests/atl/devenv/CString.vcxproj      |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/modules/rostests/apitests/atl/CString.cpp
b/modules/rostests/apitests/atl/CString.cpp
index 6f958dc825..c5f5a74b91 100644
--- a/modules/rostests/apitests/atl/CString.cpp
+++ b/modules/rostests/apitests/atl/CString.cpp
@@ -1,9 +1,9 @@
 /*
- * PROJECT:         ReactOS api tests
- * LICENSE:         LGPLv2.1+ - See COPYING.LIB in the top level directory
- * PURPOSE:         Test for CString
- * PROGRAMMERS:     Mark Jansen
- *                  Katayama Hirofumi MZ
+ * PROJECT:     ReactOS api tests
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Test for CString
+ * COPYRIGHT:   Copyright 2016-2017 Mark Jansen (mark.jansen(a)reactos.org)
+ *              Copyright 2017 Katayama Hirofumi MZ
  */
 
 #include <atlstr.h>
@@ -254,8 +254,11 @@ START_TEST(CString)
     test_load_strW();
     test_load_strA();
 
+    test_bstrW();
+    test_bstrA();
+
 #ifndef __REACTOS__
     printf("CString: %i tests executed (0 marked as todo, %i failures), %i
skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped);
-    return 0;
+    return g_tests_failed;
 #endif
 }
diff --git a/modules/rostests/apitests/atl/CString.inl
b/modules/rostests/apitests/atl/CString.inl
index cd016ade1d..1ec7be9dc6 100644
--- a/modules/rostests/apitests/atl/CString.inl
+++ b/modules/rostests/apitests/atl/CString.inl
@@ -424,3 +424,18 @@ TEST_NAMEX(load_str)
     CStringX str5(MAKEINTRESOURCEY(IDS_TEST2));
     ok(str5 == _X("I am a happy BSTR"), "The value was
'%s'\n", dbgstrx(str5));
 }
+
+TEST_NAMEX(bstr)
+{
+    CStringX str;
+
+    str = _X("Some test text here...");
+
+    BSTR bstr = str.AllocSysString();
+    ok(!!bstr, "Expected a valid pointer\n");
+    if (bstr)
+    {
+        ok(!wcscmp(bstr, L"Some test text here..."), "Expected 'Some
test text here...', got: '%S'\n", bstr);
+        ::SysFreeString(bstr);
+    }
+}
diff --git a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj
b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj
index 78c9e1de18..8053eea219 100644
--- a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj
+++ b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj
@@ -98,7 +98,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RegisterOutput>true</RegisterOutput>
+      <RegisterOutput>false</RegisterOutput>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj
b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj
index 92dd4ef597..f7e7549036 100644
--- a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj
+++ b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj
@@ -98,7 +98,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RegisterOutput>true</RegisterOutput>
+      <RegisterOutput>false</RegisterOutput>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/modules/rostests/apitests/atl/devenv/CString.vcxproj
b/modules/rostests/apitests/atl/devenv/CString.vcxproj
index 6a0eeff418..82dfc4687b 100644
--- a/modules/rostests/apitests/atl/devenv/CString.vcxproj
+++ b/modules/rostests/apitests/atl/devenv/CString.vcxproj
@@ -98,7 +98,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RegisterOutput>true</RegisterOutput>
+      <RegisterOutput>false</RegisterOutput>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">