Fixed WINRT build

5 files changed, 15 insertions, 6 deletions

diff --git a/cpp/include/Glacier2/.headers b/cpp/include/Glacier2/.headers
index ae4bceeb510..cbaad3665f3 100644
--- a/cpp/include/Glacier2/.headers
+++ b/cpp/include/Glacier2/.headers
@@ -1,5 +1,6 @@
 SDK_HEADERS = \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Application.h \
+ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\CryptPermissionsVerifierPlugin.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Glacier2.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Metrics.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PermissionsVerifier.h \
diff --git a/cpp/include/Ice/.headers b/cpp/include/Ice/.headers
index 5c12a9b20a8..d42770912ab 100644
--- a/cpp/include/Ice/.headers
+++ b/cpp/include/Ice/.headers
@@ -80,6 +80,7 @@ SDK_HEADERS = \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyFactoryF.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyHandle.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReferenceF.h \
+ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RemoteLogger.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RequestHandlerF.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ResponseHandlerF.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Router.h \
diff --git a/cpp/include/IceGrid/.headers b/cpp/include/IceGrid/.headers
index 4a607cc9705..ee7a0fc5f48 100644
--- a/cpp/include/IceGrid/.headers
+++ b/cpp/include/IceGrid/.headers
@@ -1,11 +1,13 @@
 SDK_HEADERS = \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Admin.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Descriptor.h \
+ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Discovery.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FileParser.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceGrid.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Locator.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Observer.h \
+ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PluginFacade.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Query.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Registry.h \
  $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReplicaGroupFilter.h \
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
index 1b6404252dd..1ad9e5b6e10 100644
--- a/cpp/src/Ice/winrt/Makefile.mak
+++ b/cpp/src/Ice/winrt/Makefile.mak
@@ -54,6 +54,7 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\LocalObject.obj \
 		  $(ARCH)\$(CONFIG)\LocatorInfo.obj \
 		  $(ARCH)\$(CONFIG)\Locator.obj \
+		  $(ARCH)\$(CONFIG)\LoggerAdminI.obj \
 		  $(ARCH)\$(CONFIG)\LoggerI.obj \
 		  $(ARCH)\$(CONFIG)\Logger.obj \
 		  $(ARCH)\$(CONFIG)\LoggerUtil.obj \
@@ -89,6 +90,7 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\Proxy.obj \
 		  $(ARCH)\$(CONFIG)\ReferenceFactory.obj \
 		  $(ARCH)\$(CONFIG)\Reference.obj \
+		  $(ARCH)\$(CONFIG)\RemoteLogger.obj \
 		  $(ARCH)\$(CONFIG)\RetryQueue.obj \
 		  $(ARCH)\$(CONFIG)\RequestHandler.obj \
 		  $(ARCH)\$(CONFIG)\ResponseHandler.obj \
@@ -152,8 +154,9 @@ SLICE_CORE_SRCS	= $(slicedir)\Ice\BuiltinSequences.ice \
 		  $(slicedir)\Ice\PropertiesF.ice \
 		  $(slicedir)\Ice\Properties.ice \
 		  $(slicedir)\Ice\PropertiesAdmin.ice \
-		  $(slicedir)\Ice\RouterF.ice \
+		  $(slicedir)\Ice\RemoteLogger.ice \
 		  $(slicedir)\Ice\Router.ice \
+		  $(slicedir)\Ice\RouterF.ice \
 		  $(slicedir)\Ice\ServantLocatorF.ice \
 		  $(slicedir)\Ice\ServantLocator.ice \
 		  $(slicedir)\Ice\SliceChecksumDict.ice \
@@ -274,6 +277,7 @@ clean::
 	-del /q $(SOURCE_DIR)\Process.cpp $(HDIR)\Process.h
 	-del /q $(SOURCE_DIR)\PropertiesF.cpp $(HDIR)\PropertiesF.h
 	-del /q $(SOURCE_DIR)\Properties.cpp $(HDIR)\Properties.h
+	-del /q $(SOURCE_DIR)\RemoteLogger.cpp $(HDIR)\RemoteLogger.h
 	-del /q $(SOURCE_DIR)\RouterF.cpp $(HDIR)\RouterF.h
 	-del /q $(SOURCE_DIR)\Router.cpp $(HDIR)\Router.h
 	-del /q $(SOURCE_DIR)\ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
diff --git a/cpp/src/IceUtil/SHA1.cpp b/cpp/src/IceUtil/SHA1.cpp
index 31a5e459fad..cfa9d70040b 100644
--- a/cpp/src/IceUtil/SHA1.cpp
+++ b/cpp/src/IceUtil/SHA1.cpp
@@ -32,8 +32,8 @@ IceUtil::SHA1::SHA1() :
     {
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
-    
-    if(!CryptCreateHash(_ctx, CALG_SHA1, 0, 0, &_hash)) 
+
+    if(!CryptCreateHash(_ctx, CALG_SHA1, 0, 0, &_hash))
     {
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
@@ -45,7 +45,7 @@ IceUtil::SHA1::~SHA1()
     {
         CryptDestroyHash(_hash);
     }
-    
+
     if(_ctx)
     {
         CryptReleaseContext(_ctx, 0);
@@ -67,7 +67,7 @@ void
 IceUtil::SHA1::update(const unsigned char* data, size_t length)
 {
 #   if defined(_WIN32)
-    if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0)) 
+    if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0))
     {
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
@@ -102,7 +102,8 @@ void
 IceUtil::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
 {
 #if defined(ICE_OS_WINRT)
-    auto dataA = ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(data), length);
+    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);