zeroc-ice 3.7.9.1 → 3.7.10

data/ext/ice/cpp/src/Ice/Network.h

@@ -19,9 +19,7 @@
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/EndpointTypes.h>
 
-#if defined(ICE_OS_UWP)
-#   include <ppltasks.h>
-#elif defined(_WIN32)
+#if defined(_WIN32)
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #  if !defined(__MINGW32__)
@@ -45,8 +43,7 @@ typedef int ssize_t;
 #elif defined(__APPLE__) && !defined(ICE_NO_CFSTREAM)
 #   define ICE_USE_CFSTREAM 1
 #elif defined(_WIN32)
-#  if defined(ICE_OS_UWP)
-#  elif !defined(ICE_NO_IOCP)
+#  if !defined(ICE_NO_IOCP)
 #     define ICE_USE_IOCP 1
 #  else
 #     define ICE_USE_SELECT 1
@@ -63,10 +60,6 @@ typedef int socklen_t;
 #   define SOCKET int
 #   define INVALID_SOCKET -1
 #   define SOCKET_ERROR -1
-#elif defined(ICE_OS_UWP)
-    typedef Platform::Object^ SOCKET;
-#   define INVALID_SOCKET nullptr
-#   define SOCKET_ERROR -1
 #endif
 
 #ifndef SHUT_RD
@@ -107,16 +100,6 @@ typedef int socklen_t;
 namespace IceInternal
 {
 
-//
-// Use Address struct or union depending on the platform
-//
-#ifdef ICE_OS_UWP
-struct ICE_API Address
-{
-    Windows::Networking::HostName^ host;
-    Platform::String^ port;
-};
-#else
 union Address
 {
     Address()
@@ -130,7 +113,6 @@ union Address
     sockaddr_in6 saIn6;
     sockaddr_storage saStorage;
 };
-#endif
 
 enum SocketOperation
 {
@@ -147,7 +129,7 @@ enum SocketOperation
 };
 
 //
-// AsyncInfo struct for Windows IOCP or UWP holds the result of
+// AsyncInfo struct for Windows IOCP holds the result of
 // asynchronous operations after it completed.
 //
 #if defined(ICE_USE_IOCP)
@@ -161,16 +143,6 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED
     DWORD count;
     DWORD error;
 };
-#elif defined(ICE_OS_UWP)
-struct ICE_API AsyncInfo
-{
-    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ completedHandler;
-    Windows::Foundation::IAsyncInfo^ operation;
-    int count;
-    int error;
-};
-
-delegate void SocketOperationCompletedHandler(int);
 #endif
 
 class ICE_API ReadyCallback : public virtual ::IceUtil::Shared
@@ -190,7 +162,7 @@ public:
     virtual ~NativeInfo();
 
     NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd)
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
         , _newFd(INVALID_SOCKET)
 #endif
     {
@@ -216,12 +188,6 @@ public:
     virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
     void initialize(HANDLE, ULONG_PTR);
     void completed(SocketOperation);
-#elif defined(ICE_OS_UWP)
-    virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
-    void queueAction(SocketOperation, Windows::Foundation::IAsyncAction^, bool = false);
-    void queueOperation(SocketOperation, Windows::Foundation::IAsyncOperation<unsigned int>^);
-    void setCompletedHandler(SocketOperationCompletedHandler^);
-    void completed(SocketOperation);
 #else
     bool newFd();
     void setNewFd(SOCKET);
@@ -235,22 +201,9 @@ protected:
 #if defined(ICE_USE_IOCP)
     HANDLE _handle;
     ULONG_PTR _key;
-#elif defined(ICE_OS_UWP)
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, Windows::Foundation::AsyncStatus, bool = false);
-    SocketOperationCompletedHandler^ _completedHandler;
 #else
     SOCKET _newFd;
 #endif
-
-private:
-
-#if defined(ICE_OS_UWP)
-    void queueActionCompleted(SocketOperation, AsyncInfo* asyncInfo, Windows::Foundation::IAsyncAction^,
-                              Windows::Foundation::AsyncStatus);
-    void queueOperationCompleted(SocketOperation, AsyncInfo* asyncInfo,
-                                 Windows::Foundation::IAsyncOperation<unsigned int>^,
-                                 Windows::Foundation::AsyncStatus);
-#endif
 };
 typedef IceUtil::Handle<NativeInfo> NativeInfoPtr;
 
@@ -302,7 +255,6 @@ ICE_API void setReuseAddress(SOCKET, bool);
 ICE_API Address doBind(SOCKET, const Address&, const std::string& intf = "");
 ICE_API void doListen(SOCKET, int);
 
-#ifndef ICE_OS_UWP
 ICE_API bool interrupted();
 ICE_API bool acceptInterrupted();
 ICE_API bool noBuffers();
@@ -324,40 +276,6 @@ ICE_API void createPipe(SOCKET fds[2]);
 ICE_API int getSocketErrno();
 
 ICE_API Address getNumericAddress(const std::string&);
-#else
-ICE_API void checkConnectErrorCode(const char*, int, HRESULT);
-ICE_API void checkErrorCode(const char*, int, HRESULT);
-
-//
-// UWP impose some restriction on operations that block when run from
-// STA thread and throws concurrency::invalid_operation. We cannot
-// directly call task::get or task::wait, this helper method is used to
-// workaround this limitation.
-//
-template<typename T>
-T runSync(Windows::Foundation::IAsyncOperation<T>^ operation)
-{
-    std::promise<T> p;
-    concurrency::create_task(operation).then(
-        [&p](concurrency::task<T> t)
-        {
-            try
-            {
-                p.set_value(t.get());
-            }
-            catch(...)
-            {
-                p.set_exception(std::current_exception());
-            }
-        },
-        concurrency::task_continuation_context::use_arbitrary());
-
-    return p.get_future().get();
-}
-
-ICE_API void runSync(Windows::Foundation::IAsyncAction^ action);
-
-#endif
 
 #if defined(ICE_USE_IOCP)
 ICE_API void doConnectAsync(SOCKET, const Address&, const Address&, AsyncInfo&);

data/ext/ice/cpp/src/Ice/NetworkF.h

@@ -12,11 +12,7 @@
 namespace IceInternal
 {
 
-#ifdef ICE_OS_UWP
-struct ICE_API Address;
-#else
 union Address;
-#endif
 
 }
 

data/ext/ice/cpp/src/Ice/NetworkProxy.cpp

@@ -17,8 +17,6 @@ NetworkProxy::~NetworkProxy()
     // Out of line to avoid weak vtable
 }
 
-#ifndef ICE_OS_UWP
-
 namespace
 {
 
@@ -287,8 +285,6 @@ HTTPNetworkProxy::getProtocolSupport() const
     return _protocol;
 }
 
-#endif
-
 NetworkProxyPtr
 IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSupport protocolSupport)
 {
@@ -297,27 +293,18 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu
     proxyHost = properties->getProperty("Ice.SOCKSProxyHost");
     if(!proxyHost.empty())
     {
-#ifdef ICE_OS_UWP
-        UNREFERENCED_PARAMETER(protocolSupport);
-        throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with UWP");
-#else
         if(protocolSupport == EnableIPv6)
         {
             throw Ice::InitializationException(__FILE__, __LINE__, "IPv6 only is not supported with SOCKS4 proxies");
         }
         int proxyPort = properties->getPropertyAsIntWithDefault("Ice.SOCKSProxyPort", 1080);
         return new SOCKSNetworkProxy(proxyHost, proxyPort);
-#endif
     }
 
     proxyHost = properties->getProperty("Ice.HTTPProxyHost");
     if(!proxyHost.empty())
     {
-#ifdef ICE_OS_UWP
-        throw Ice::InitializationException(__FILE__, __LINE__, "HTTP proxy not supported with UWP");
-#else
         return new HTTPNetworkProxy(proxyHost, properties->getPropertyAsIntWithDefault("Ice.HTTPProxyPort", 1080));
-#endif
     }
 
     return 0;

data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -41,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ObjectFactory.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/Plugin.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PluginF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/Process.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ProcessF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/Properties.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/PropertiesI.cpp

@@ -292,10 +292,7 @@ Ice::PropertiesI::load(const std::string& file)
 {
     StringConverterPtr stringConverter = getProcessStringConverter();
 
-//
-// UWP applications cannot access Windows registry.
-//
-#if defined (_WIN32) && !defined(ICE_OS_UWP)
+#if defined (_WIN32)
     if(file.find("HKCU\\") == 0 || file.find("HKLM\\") == 0)
     {
         HKEY key = file.find("HKCU\\") == 0 ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
@@ -700,13 +697,9 @@ void
 Ice::PropertiesI::loadConfig()
 {
     string value = getProperty("Ice.Config");
-#ifndef ICE_OS_UWP
-    //
-    // UWP cannot access environment variables
-    //
     if(value.empty() || value == "1")
     {
-#   ifdef _WIN32
+#ifdef _WIN32
         vector<wchar_t> v(256);
         DWORD ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], static_cast<DWORD>(v.size()));
         if(ret >= v.size())
@@ -722,15 +715,14 @@ Ice::PropertiesI::loadConfig()
         {
             value = "";
         }
-#   else
+#else
        const char* s = getenv("ICE_CONFIG");
        if(s && *s != '\0')
        {
            value = s;
        }
-#   endif
-    }
 #endif
+    }
 
     if(!value.empty())
     {

data/ext/ice/cpp/src/Ice/RemoteLogger.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -41,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/Router.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/RouterF.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/SHA1.cpp

@@ -4,24 +4,20 @@
 
 #include <Ice/SHA1.h>
 
-#ifndef ICE_OS_UWP
-#   if defined(_WIN32)
-#      include <Wincrypt.h>
-#      include <IceUtil/Exception.h>
-#   elif defined(__APPLE__)
-#      include <CommonCrypto/CommonDigest.h>
-#   else
-#      include <openssl/sha.h>
-#      // Ignore OpenSSL 3.0 deprecation warning
-#      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#   endif
+#if defined(_WIN32)
+#   include <Wincrypt.h>
+#   include <IceUtil/Exception.h>
+#elif defined(__APPLE__)
+#   include <CommonCrypto/CommonDigest.h>
+#else
+#   include <openssl/sha.h>
+#   // Ignore OpenSSL 3.0 deprecation warning
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 using namespace std;
 using namespace IceUtil;
 
-#ifndef ICE_OS_UWP
-
 namespace IceInternal
 {
 
@@ -30,7 +26,7 @@ class SHA1::Hasher
 public:
 
     Hasher();
-#   ifdef _WIN32
+#ifdef _WIN32
     ~Hasher();
 #endif
 
@@ -43,19 +39,19 @@ private:
     Hasher(const Hasher&);
     Hasher operator=(const Hasher&);
 
-#   if defined (_WIN32)
+#if defined (_WIN32)
     HCRYPTPROV _ctx;
     HCRYPTHASH _hash;
-#   elif defined(__APPLE__)
+#elif defined(__APPLE__)
     CC_SHA1_CTX _ctx;
-#   else
+#else
     SHA_CTX _ctx;
-#   endif
+#endif
 };
 
 }
 
-#   if defined(_WIN32)
+#if defined(_WIN32)
 
 namespace
 {
@@ -89,50 +85,50 @@ IceInternal::SHA1::Hasher::~Hasher()
         CryptReleaseContext(_ctx, 0);
     }
 }
-#   elif defined(__APPLE__)
+#elif defined(__APPLE__)
 IceInternal::SHA1::Hasher::Hasher()
 {
     CC_SHA1_Init(&_ctx);
 }
-#   else
+#else
 IceInternal::SHA1::Hasher::Hasher()
 {
     SHA1_Init(&_ctx);
 }
-#   endif
+#endif
 
 void
 IceInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
 {
-#   if defined(_WIN32)
+#if defined(_WIN32)
     if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0))
     {
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
-#   elif defined(__APPLE__)
+#elif defined(__APPLE__)
     CC_SHA1_Update(&_ctx, reinterpret_cast<const void*>(data), static_cast<CC_LONG>(length));
-#   else
+#else
     SHA1_Update(&_ctx, reinterpret_cast<const void*>(data), length);
-#   endif
+#endif
 }
 
 void
 IceInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
 {
-#   if defined(_WIN32)
+#if defined(_WIN32)
     md.resize(SHA_DIGEST_LENGTH);
     DWORD length = SHA_DIGEST_LENGTH;
     if(!CryptGetHashParam(_hash, HP_HASHVAL, &md[0], &length, 0))
     {
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
-#   elif defined(__APPLE__)
+#elif defined(__APPLE__)
     md.resize(CC_SHA1_DIGEST_LENGTH);
     CC_SHA1_Final(&md[0], &_ctx);
-#   else
+#else
     md.resize(SHA_DIGEST_LENGTH);
     SHA1_Final(&md[0], &_ctx);
-#   endif
+#endif
 }
 
 IceInternal::SHA1::SHA1() :
@@ -155,23 +151,11 @@ IceInternal::SHA1::finalize(std::vector<unsigned char>& md)
 {
     _hasher->finalize(md);
 }
-#endif
 
 void
 IceInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
 {
-#if defined(ICE_OS_UWP)
-    auto dataA =
-        ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(data), static_cast<unsigned int>(length));
-    auto hasher = Windows::Security::Cryptography::Core::HashAlgorithmProvider::OpenAlgorithm("SHA1");
-    auto hashed = hasher->HashData(Windows::Security::Cryptography::CryptographicBuffer::CreateFromByteArray(dataA));
-    auto reader = ::Windows::Storage::Streams::DataReader::FromBuffer(hashed);
-    md.resize(reader->UnconsumedBufferLength);
-    if(!md.empty())
-    {
-        reader->ReadBytes(::Platform::ArrayReference<unsigned char>(&md[0], static_cast<unsigned int>(md.size())));
-    }
-#elif defined(_WIN32)
+#if defined(_WIN32)
     SHA1 hasher;
     hasher.update(data, length);
     hasher.finalize(md);