diff --git a/build-windows/libpEpAdapter.vcxproj b/build-windows/libpEpAdapter.vcxproj
index 0471158..2c6db44 100644
--- a/build-windows/libpEpAdapter.vcxproj
+++ b/build-windows/libpEpAdapter.vcxproj
@@ -58,8 +58,9 @@
Level3
Disabled
- WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)
false
+ $(ProjectDir)src;
Windows
@@ -73,8 +74,9 @@
MaxSpeed
true
true
- WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ WIN32;_LIB;_EXPORT_PEP_ENGINE_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)
false
+ $(ProjectDir)src;
Windows
@@ -86,31 +88,13 @@
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/build-windows/libpEpAdapter.vcxproj.filters b/build-windows/libpEpAdapter.vcxproj.filters
index 1b95d5f..2409e1a 100644
--- a/build-windows/libpEpAdapter.vcxproj.filters
+++ b/build-windows/libpEpAdapter.vcxproj.filters
@@ -18,75 +18,432 @@
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
Source Files
-
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
diff --git a/src/group_manager_api.cc b/src/group_manager_api.cc
index 1e5b735..11b4721 100644
--- a/src/group_manager_api.cc
+++ b/src/group_manager_api.cc
@@ -21,7 +21,7 @@ shared_ptr grp_drv_engine;
DYNAMIC_API PEP_STATUS adapter_group_init()
{
- PEP_STATUS status;
+ PEP_STATUS status = PEP_STATUS_OK;
try {
const string lm_dummy_db_filename = "groups.db";
#ifdef WIN32
@@ -123,8 +123,7 @@ DYNAMIC_API PEP_STATUS adapter_group_query_groups(PEP_SESSION session, identity_
return status;
}
-DYNAMIC_API PEP_STATUS
-adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
+DYNAMIC_API PEP_STATUS adapter_group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager)
{
pEpLog("called");
PEP_STATUS status = adapter_grp_manager.group_query_manager(session, group, manager);
diff --git a/src/group_manager_api.h b/src/group_manager_api.h
index 2925220..354f585 100644
--- a/src/group_manager_api.h
+++ b/src/group_manager_api.h
@@ -79,8 +79,7 @@ DYNAMIC_API PEP_STATUS adapter_group_create(
* @warning For recipients to accept the dissolution, the sender/manager key used must be a key that they
* have a trust entry for.
*/
-DYNAMIC_API PEP_STATUS
-adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
+DYNAMIC_API PEP_STATUS adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager);
/**
*
diff --git a/src/message_cache.cc b/src/message_cache.cc
index e83bad3..27fc35a 100644
--- a/src/message_cache.cc
+++ b/src/message_cache.cc
@@ -96,7 +96,7 @@ namespace pEp {
if (!src)
return nullptr;
- char *dst = ::strdup(src);
+ char *dst = ::_strdup(src);
assert(dst);
if (!dst)
throw std::bad_alloc();
diff --git a/src/pEpLog.cc b/src/pEpLog.cc
index 04458d6..733c517 100644
--- a/src/pEpLog.cc
+++ b/src/pEpLog.cc
@@ -78,7 +78,7 @@ namespace pEp {
string decorate_centered(const string& msg, char decoration)
{
stringstream tmp;
- int max_len = line_width - 10;
+ size_t max_len = line_width - 10;
// truncate msg
string msg_truncated = msg;
if (msg.length() >= max_len) {
@@ -115,7 +115,7 @@ namespace pEp {
void pEpLogger::log(const string& msg, Utils::Color col) const
{
std::stringstream msg_;
- msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]";
+ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]";
msg_ << " - ";
msg_ << this->get_classname() << "[" << this->get_instancename() << "]";
msg_ << " - " << msg;
diff --git a/src/pEpLog.hh b/src/pEpLog.hh
index ecff7ed..74b6fd4 100644
--- a/src/pEpLog.hh
+++ b/src/pEpLog.hh
@@ -49,7 +49,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
- msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
+ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \
@@ -67,7 +67,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
- msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
+ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
@@ -85,7 +85,7 @@
do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \
- msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
+ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
@@ -176,7 +176,7 @@ namespace pEp {
#define pEpLogClass(msg) \
do { \
std::stringstream msg_; \
- msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \
+ msg_ << "[" << _getpid() << " " << std::this_thread::get_id() << "]"; \
msg_ << " - " << this->m4gic_logger_n4me.get_classname(); \
msg_ << "[" << this->m4gic_logger_n4me.get_instancename() << "]"; \
msg_ << "::" << __FUNCTION__; \
diff --git a/src/std_utils.cc b/src/std_utils.cc
index 9aa006a..138fff8 100644
--- a/src/std_utils.cc
+++ b/src/std_utils.cc
@@ -118,6 +118,7 @@ namespace pEp {
return ss.str();
}
+#ifndef WIN32
void path_ensure_not_existing(const string &path)
{
while (path_exists(path)) {
@@ -125,7 +126,6 @@ namespace pEp {
}
}
-#ifndef WIN32
void dir_create(const string &dirname, const mode_t mode)
{
if (mkdir(dirname.c_str(), mode) != 0) {