Fix warning in LPTSTRTestNative (#10973)

* Fix warning in LPTSTRTestNative and add support for wcsncmp in xplatform.h

diff --git a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
index bc3fa07..15b6038 100755 (executable)
--- a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
+++ b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
@@ -100,24 +100,24 @@ extern "C" DLL_EXPORT LPWSTR MarshalPointer_Out(/*[out]*/ LPWSTR *s)
     return ReturnString();
 }
 
-typedef LPTSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/*[in,out]*/ LPTSTR s);
-extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCTSTR  s)
+typedef LPWSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/*[in,out]*/ LPWSTR s);
+extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCWSTR  s)
 {
-    LPTSTR ret = d((LPTSTR)s);
-    LPTSTR expectedret =(LPTSTR)W("Native");
-    LPTSTR expectedstr = (LPTSTR)W("m");
+    LPWSTR ret = d((LPWSTR)s);
+    LPWSTR expectedret =(LPWSTR)W("Native");
+    LPWSTR expectedstr = (LPWSTR)W("m");
 
-       size_t lenret = _tcslen(ret);
-       size_t lenexpectedret = _tcslen(expectedret);
-    if((lenret != lenexpectedret)||(_tcsncmp(ret,expectedret,lenret)!=0))
+       size_t lenret = wcslen(ret);
+       size_t lenexpectedret = wcslen(expectedret);
+    if((lenret != lenexpectedret)||(wcsncmp(ret,expectedret,lenret)!=0))
     {
         printf("Error in ReverseP_MarshalStrB_InOut, Returned value didn't match\n");
         return FALSE;
     }
 
-       size_t lenstr = _tcslen(s);
-       size_t lenexpectedstr = _tcslen(expectedstr);
-    if((lenstr != lenexpectedstr)||(_tcsncmp(s,expectedstr,lenstr)!=0))
+       size_t lenstr = wcslen(s);
+       size_t lenexpectedstr = wcslen(expectedstr);
+    if((lenstr != lenexpectedstr)||(wcsncmp(s,expectedstr,lenstr)!=0))
     {
         printf("Error in ReverseP_MarshalStrB_InOut, Changed value didn't reflect on native side.\n");
         return FALSE;
@@ -126,25 +126,25 @@ extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut(Test_Del_Marshal
     return TRUE;
 }
 
-typedef LPTSTR (__cdecl * Test_Del_MarshalStrB_Out)(/*[out]*/ LPTSTR * s);
+typedef LPWSTR (__cdecl * Test_Del_MarshalStrB_Out)(/*[out]*/ LPWSTR * s);
 extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_Out(Test_Del_MarshalStrB_Out d)
 {
-    LPTSTR s;
-    LPTSTR ret = d((LPTSTR*)&s);
-    LPTSTR expectedret = (LPTSTR)W("Native");
-    LPTSTR expectedstr = (LPTSTR)W("Managed");
-
-    size_t lenret = _tcslen(ret);
-       size_t lenexpectedret = _tcslen(expectedret);
-    if((lenret != lenexpectedret)||(_tcsncmp(ret,expectedret,lenret)!=0))
+    LPWSTR s;
+    LPWSTR ret = d((LPWSTR*)&s);
+    LPWSTR expectedret = (LPWSTR)W("Native");
+    LPWSTR expectedstr = (LPWSTR)W("Managed");
+
+    size_t lenret = wcslen(ret);
+       size_t lenexpectedret = wcslen(expectedret);
+    if((lenret != lenexpectedret)||(wcsncmp(ret,expectedret,lenret)!=0))
     {
         printf("Error in ReverseP_MarshalStrB_Out, Returned value didn't match\n");
         return FALSE;
     }
 
-       size_t lenstr = _tcslen(s);
-       size_t lenexpectedstr = _tcslen(expectedstr);
-    if((lenstr != lenexpectedstr)||(_tcsncmp(s,expectedstr,lenstr)!=0))
+       size_t lenstr = wcslen(s);
+       size_t lenexpectedstr = wcslen(expectedstr);
+    if((lenstr != lenexpectedstr)||(wcsncmp(s,expectedstr,lenstr)!=0))
     {
         printf("Error in ReverseP_MarshalStrB_Out, Changed value didn't reflect on native side.\n");
         return FALSE;

diff --git a/tests/src/Interop/common/xplatform.h b/tests/src/Interop/common/xplatform.h
index 36c4e56..370ebe8 100644 (file)
--- a/tests/src/Interop/common/xplatform.h
+++ b/tests/src/Interop/common/xplatform.h
@@ -194,7 +194,9 @@ int wcsncpy_s(LPWSTR strDestination, size_t size1, LPCWSTR strSource)
 
 }
 
-int wmemcmp(LPWSTR str1, LPWSTR str2,size_t len)
+#define wcsncmp wmemcmp
+
+int wmemcmp(LPCWSTR str1, LPCWSTR str2,size_t len)
 {
        // < 0 str1 less than str2
        // 0  str1 identical to str2