Fixed (ICE-5058) - WinRT port Platform::AccessDeniedException

2 files changed, 24 insertions, 2 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 177eb58e8a0..f3022d2880a 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -35,8 +35,18 @@ socketErrorToString(int error)
         return "unknown error";
     }
 #ifdef ICE_OS_WINRT
-    return IceUtil::wstringToString(
-        static_cast<Windows::Networking::Sockets::SocketErrorStatus>(error).ToString()->Data());
+    if(error == E_ACCESSDENIED)
+    {
+        ostringstream os;
+        os << "access to a resource or feature is denied, ensure that you have requested the appropriate\n";
+        os << "capability and made the required declarations in the package manifest of your app.";
+        return os.str();
+    }
+    else
+    {
+        return IceUtil::wstringToString(
+            static_cast<Windows::Networking::Sockets::SocketErrorStatus>(error).ToString()->Data());
+    }
 #else
     return IceUtilInternal::errorToString(error);
 #endif
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 7754e708c62..5c4767d533f 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -2093,6 +2093,12 @@ IceInternal::createPipe(SOCKET fds[2])
 void
 IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr, HostName^ host)
 {
+    if(herr == E_ACCESSDENIED)
+    {
+        SocketException ex(file, line);
+        ex.error = static_cast<int>(herr);
+        throw ex;
+    }
     SocketErrorStatus error = SocketError::GetStatus(herr);
     if(error == SocketErrorStatus::ConnectionRefused)
     {
@@ -2129,6 +2135,12 @@ IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr, Hos
 void
 IceInternal::checkErrorCode(const char* file, int line, HRESULT herr)
 {
+    if(herr == E_ACCESSDENIED)
+    {
+        SocketException ex(file, line);
+        ex.error = static_cast<int>(herr);
+        throw ex;
+    }
     SocketErrorStatus error = SocketError::GetStatus(herr);
     if(error == SocketErrorStatus::NetworkDroppedConnectionOnReset ||
        error == SocketErrorStatus::SoftwareCausedConnectionAbort ||