Added support for UWP

JavierIH · Feb 21, 2017 · 5e9e548 · 5e9e548
1 parent 964ff38
commit 5e9e548
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 143 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -126,7 +126,11 @@ configure_file(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/config.h.in
 # If Windows, set define for export dll functions
 add_definitions(-D${PROJECT_NAME_UPPER}_SOURCE)
 if(WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0601)
+    if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+        add_definitions(-D_WIN32_WINNT=0x0603)
+    else()
+        add_definitions(-D_WIN32_WINNT=0x0601)
+    endif()
 endif()
 # If INTERNAL_DEBUG = ON, define symbol for extensive debug messages
 if(INTERNAL_DEBUG)
@@ -164,6 +168,10 @@ if(MSVC OR MSVC_IDE)
         set_target_properties(${PROJECT_NAME} ${PROJECT_NAME}_static PROPERTIES RELWITHDEBINFO_POSTFIX -${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION})
         set_target_properties(${PROJECT_NAME} ${PROJECT_NAME}_static PROPERTIES DEBUG_POSTFIX d-${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION})
 
+        if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+            set_target_properties(${PROJECT_NAME} ${PROJECT_NAME}_static PROPERTIES VS_WINRT_COMPONENT "true")
+        endif()
+
         # Export symbols in DLL library
         target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME_UPPER}_DYN_LINK)
 

diff --git a/src/cpp/fastrtps.rc b/src/cpp/fastrtps.rc
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
@@ -108,7 +108,9 @@ RTPSParticipant* RTPSDomain::createParticipant(RTPSParticipantAttributes& PParam
 
     PParam.participantID = ID;
     int pid;
-#if defined(_WIN32)
+#if defined(__cplusplus_winrt)
+    pid = (int)GetCurrentProcessId();
+#elif defined(_WIN32)
     pid = (int)_getpid();
 #else
     pid = (int)getpid();

diff --git a/src/cpp/utils/StringMatching.cpp b/src/cpp/utils/StringMatching.cpp
@@ -19,7 +19,10 @@
 
 #include <fastrtps/utils/StringMatching.h>
 
-#if defined(_WIN32)
+#if defined(__cplusplus_winrt)
+#include <algorithm>
+#include <regex>
+#elif defined(_WIN32)
 #include "Shlwapi.h"
 #else
 #include <fnmatch.h>
@@ -38,7 +41,48 @@ StringMatching::~StringMatching() {
 	// TODO Auto-generated destructor stub
 }
 
-#if defined(_WIN32)
+#if defined(__cplusplus_winrt)
+void replace_all(std::string & subject, const std::string & search, const std::string & replace) {
+	size_t pos = 0;
+	while ((pos = subject.find(search, pos)) != std::string::npos) {
+		subject.replace(pos, search.length(), replace);
+		pos += replace.length();
+	}
+}
+
+bool StringMatching::matchString(const char* str1, const char* str2)
+{
+	std::string path(str1);
+	std::string spec(str2);
+
+	std::string base_path(path);
+	std::string base_spec(spec);
+
+	replace_all(base_spec, "*", ".*");
+	replace_all(base_spec, "?", ".");
+
+	std::regex base_spec_regex(base_spec);
+	std::smatch base_spec_match;
+	if (std::regex_match(path, base_spec_match, base_spec_regex))
+	{
+		return true;
+	}
+
+	replace_all(base_path, "*", ".*");
+	replace_all(base_path, "?", ".");
+
+	std::regex base_path_regex(base_path);
+	std::smatch base_path_match;
+
+	if (std::regex_match(spec, base_path_match, base_path_regex))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+#elif defined(_WIN32)
 bool StringMatching::matchString(const char* str1, const char* str2)
 {
 	 if(PathMatchSpec(str1,str2))