Imported Upstream version 1.0.0.9127upstream/1.0.0.9127

14 files changed, 23 insertions, 23 deletions

diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
index d035021bb9..59d4cd8cd4 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test1
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp
index df3233fa50..df3233fa50 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
index ab47c6f2e7..e970ec526e 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test2
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp
index b2bc301128..b2bc301128 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
index 645b86719d..f1b76fb819 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test3
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp
index b78b0540dc..b78b0540dc 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
index 3cd7f72b98..815b2b069c 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test4
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp
index 15d0a386d1..15d0a386d1 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
index 50147e9bf3..730ec60649 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test5
@@ -20,7 +20,7 @@ target_link_libraries(paltest_waitformultipleobjectsex_test5
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test5_helper
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp
index 274780a216..caa0206a11 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp
@@ -64,7 +64,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Open the event to tell test thread we are ready. */
-    if (_snprintf(szEventName, MAX_LONGPATH-1, "%s%d", szcHelperProcessReadyEvName, dwProcessId) < 0)
+    if (sprintf_s(szEventName, MAX_LONGPATH-1, "%s%d", szcHelperProcessReadyEvName, dwProcessId) < 0)
     {
         Fail ("helper.main: Insufficient event name string length for pid=%d\n", dwProcessId);
     }
@@ -81,7 +81,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Open the event to let test thread tell us to exit. */
-    if (_snprintf(szEventName, MAX_LONGPATH-1, "%s%d", szcHelperProcessFinishEvName, dwProcessId) < 0)
+    if (sprintf_s(szEventName, MAX_LONGPATH-1, "%s%d", szcHelperProcessFinishEvName, dwProcessId) < 0)
     {
         Fail ("helper.main: Insufficient event name string length for pid=%d\n", dwProcessId);
     }
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp
index d19978c103..a0216494ba 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp
@@ -176,7 +176,7 @@ Setup()
         }
 
         /* Create the event to let helper process tell us it is ready. */
-        if (_snprintf(szEventName, MAX_PATH-1, "%s%d",
+        if (sprintf_s(szEventName, MAX_PATH-1, "%s%d",
             szcHelperProcessReadyEvName, helper_process[i].pi.dwProcessId) < 0)
         {
             Fail ("test5.Setup: Insufficient event name string length for %s\n", szcHelperProcessReadyEvName);
@@ -194,7 +194,7 @@ Setup()
         }
 
         /* Create the event to tell helper process to exit. */
-        if (_snprintf(szEventName, MAX_PATH-1, "%s%d",
+        if (sprintf_s(szEventName, MAX_PATH-1, "%s%d",
             szcHelperProcessFinishEvName, helper_process[i].pi.dwProcessId) < 0)
         {
             Fail ("test5.Setup: Insufficient event name string length for %s\n", szcHelperProcessFinishEvName);
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
index ce75cadbff..01331821a8 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test6
@@ -20,7 +20,7 @@ target_link_libraries(paltest_waitformultipleobjectsex_test6
 
 
 set(HELPERSOURCES
-  child6.c
+  child6.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test6_child
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp
index 1a95815ddf..a53b6c9727 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp
@@ -80,11 +80,11 @@ int __cdecl main(int argc, char **argv)
         }
     }
 
-    _snprintf(szEventName, 128, "%s_Event", szTestName);
+    sprintf_s(szEventName, 128, "%s_Event", szTestName);
     szEventName[127] = 0;
-    _snprintf(szMutexName, 128, "%s_Mutex", szTestName);
+    sprintf_s(szMutexName, 128, "%s_Mutex", szTestName);
     szMutexName[127] = 0;
-    _snprintf(szSemName, 128, "%s_Semaphore", szTestName);
+    sprintf_s(szSemName, 128, "%s_Semaphore", szTestName);
     szSemName[127] = 0;
 
     iRet = MultiByteToWideChar(CP_ACP, 0, szEventName, strlen(szEventName)+1, wszEventName, 128);
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp
index 399d2c3bff..d5e3137899 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.c
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp
@@ -156,14 +156,14 @@ DWORD PALAPI TestThread(PVOID pArg)
         
     dwThreadNum = (DWORD)pArg;
 
-    _snprintf (szTestName, 128, "Test6_%u", dwThreadNum);
+    sprintf_s (szTestName, 128, "Test6_%u", dwThreadNum);
     szTestName[127] = 0;
 
-    _snprintf(szEventName, 128, "%s_Event", szTestName);
+    sprintf_s(szEventName, 128, "%s_Event", szTestName);
     szEventName[127] = 0;
-    _snprintf(szMutexName, 128, "%s_Mutex", szTestName);
+    sprintf_s(szMutexName, 128, "%s_Mutex", szTestName);
     szMutexName[127] = 0;
-    _snprintf(szSemName, 128, "%s_Semaphore", szTestName);
+    sprintf_s(szSemName, 128, "%s_Semaphore", szTestName);
     szSemName[127] = 0;
 
     iRet = MultiByteToWideChar(CP_ACP, 0, szEventName, strlen(szEventName)+1, wszEventName, 128);
@@ -323,7 +323,7 @@ DWORD PALAPI TestThread(PVOID pArg)
             si.cb = sizeof(si);
             ZeroMemory ( &pi, sizeof(pi) );
         
-            _snprintf (szCmd, 128, "child6 -event %s", szTestName);
+            sprintf_s (szCmd, 128, "child6 -event %s", szTestName);
             szCmd[127] = 0;
 
             bRet = CreateProcessA(NULL, szCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
@@ -363,7 +363,7 @@ DWORD PALAPI TestThread(PVOID pArg)
             si.cb = sizeof(si);
             ZeroMemory ( &pi, sizeof(pi) );
 
-            _snprintf (szCmd, 128, "child6 -semaphore %s", szTestName);
+            sprintf_s (szCmd, 128, "child6 -semaphore %s", szTestName);
             szCmd[127] = 0;
         
             bRet = CreateProcessA(NULL, szCmd, NULL, NULL, FALSE, 
@@ -423,7 +423,7 @@ DWORD PALAPI TestThread(PVOID pArg)
             si.cb = sizeof(si);
             ZeroMemory ( &pi, sizeof(pi) );            
             
-            _snprintf (szCmd, 128, "child6 -mutex %s -exitcode %d", szTestName, iDesiredExitCode);
+            sprintf_s (szCmd, 128, "child6 -mutex %s -exitcode %d", szTestName, iDesiredExitCode);
             szCmd[127] = 0;
         
             bRet = CreateProcessA(NULL, szCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
@@ -527,7 +527,7 @@ DWORD PALAPI TestThread(PVOID pArg)
             si.cb = sizeof(si);
             ZeroMemory ( &pi, sizeof(pi) );
         
-            _snprintf (szCmd, 128, "child6 -mutex_and_named_event %s", szTestName);
+            sprintf_s (szCmd, 128, "child6 -mutex_and_named_event %s", szTestName);
             szCmd[127] = 0;
 
             bRet = CreateProcessA(NULL, szCmd, NULL, NULL, FALSE,