diff --git a/Solutions/win32-dll/win32-dll.vcxproj b/Solutions/win32-dll/win32-dll.vcxproj
index 4c8270a24..e8fba8257 100644
--- a/Solutions/win32-dll/win32-dll.vcxproj
+++ b/Solutions/win32-dll/win32-dll.vcxproj
@@ -217,7 +217,7 @@
Windows
true
- MSVCRTD.lib;msvcprtd.lib;atls.lib;shlwapi.lib;iphlpapi.lib;vcruntimed.lib;ucrtd.lib;wininet.lib;crypt32.lib;version.lib;kernel32.lib;user32.lib;advapi32.lib;ole32.lib;uuid.lib
+ MSVCRTD.lib;msvcprtd.lib;atls.lib;shlwapi.lib;iphlpapi.lib;vcruntimed.lib;ucrtd.lib;crypt32.lib;version.lib;kernel32.lib;user32.lib;advapi32.lib;ole32.lib;uuid.lib
runtimeobject.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
@@ -301,7 +301,7 @@
true
true
true
- MSVCRT.lib;msvcprt.lib;atls.lib;shlwapi.lib;iphlpapi.lib;vcruntime.lib;ucrt.lib;wininet.lib;crypt32.lib;version.lib;kernel32.lib;user32.lib;advapi32.lib;ole32.lib;uuid.lib
+ MSVCRT.lib;msvcprt.lib;atls.lib;shlwapi.lib;iphlpapi.lib;vcruntime.lib;ucrt.lib;crypt32.lib;version.lib;kernel32.lib;user32.lib;advapi32.lib;ole32.lib;uuid.lib
runtimeobject.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
diff --git a/Solutions/win32-lib/win32-lib.vcxproj b/Solutions/win32-lib/win32-lib.vcxproj
index eed7aae4d..2ad7d4112 100644
--- a/Solutions/win32-lib/win32-lib.vcxproj
+++ b/Solutions/win32-lib/win32-lib.vcxproj
@@ -284,7 +284,7 @@
Windows
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
false
@@ -352,7 +352,7 @@
Windows
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
false
@@ -430,7 +430,7 @@
true
true
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
@@ -506,7 +506,7 @@
true
true
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
diff --git a/Solutions/win32-mini-dll/win32-mini-dll.vcxproj b/Solutions/win32-mini-dll/win32-mini-dll.vcxproj
index ce42cf020..82f3ff8b4 100644
--- a/Solutions/win32-mini-dll/win32-mini-dll.vcxproj
+++ b/Solutions/win32-mini-dll/win32-mini-dll.vcxproj
@@ -240,7 +240,7 @@
Windows
true
- uuid.lib;wininet.lib;crypt32.lib;version.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;version.lib;%(AdditionalDependencies)
runtimeobject.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
@@ -268,7 +268,7 @@
true
- wininet.lib;user32.lib;shell32.lib;Advapi32.lib;Ole32.lib
+ user32.lib;shell32.lib;Advapi32.lib;Ole32.lib
%(AdditionalLibraryDirectories)
@@ -357,7 +357,7 @@
true
true
true
- uuid.lib;wininet.lib;crypt32.lib;version.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;version.lib;%(AdditionalDependencies)
runtimeobject.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
@@ -385,7 +385,7 @@
true
- wininet.lib;user32.lib;shell32.lib;Advapi32.lib;Ole32.lib
+ user32.lib;shell32.lib;Advapi32.lib;Ole32.lib
%(AdditionalLibraryDirectories)
diff --git a/Solutions/win32-mini-lib/win32-mini-lib.vcxproj b/Solutions/win32-mini-lib/win32-mini-lib.vcxproj
index e720328fd..61761b748 100644
--- a/Solutions/win32-mini-lib/win32-mini-lib.vcxproj
+++ b/Solutions/win32-mini-lib/win32-mini-lib.vcxproj
@@ -321,7 +321,7 @@
Windows
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
false
@@ -427,7 +427,7 @@
Windows
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
false
@@ -534,7 +534,7 @@
true
true
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
@@ -642,7 +642,7 @@
true
true
true
- uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)
+ uuid.lib;crypt32.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll
diff --git a/lib/http/HttpClientFactory.cpp b/lib/http/HttpClientFactory.cpp
index 7a8b1c33f..2a08c1987 100644
--- a/lib/http/HttpClientFactory.cpp
+++ b/lib/http/HttpClientFactory.cpp
@@ -16,8 +16,6 @@
#if defined(MATSDK_PAL_WIN32)
#ifdef _WINRT_DLL
#include "http/HttpClient_WinRt.hpp"
- #elif defined(HAVE_MAT_WININET_HTTP_CLIENT)
- #include "http/HttpClient_WinInet.hpp"
#endif
#elif defined(MATSDK_PAL_CPP11)
#if TARGET_OS_IPHONE || (defined(__APPLE__) && defined(APPLE_HTTP))
@@ -42,13 +40,13 @@ namespace MAT_NS_BEGIN {
LOG_TRACE("Creating HttpClient_WinRt");
return std::make_shared();
}
-#elif defined(HAVE_MAT_WININET_HTTP_CLIENT)
- /* Win32 WinInet HTTP client */
- std::shared_ptr HttpClientFactory::Create() {
- LOG_TRACE("Creating HttpClient_WinInet");
- return std::make_shared();
+#else
+ /* Win32 desktop - no default HTTP client; caller must supply their own IHttpClient */
+ std::shared_ptr HttpClientFactory::Create()
+ {
+ LOG_TRACE("No default HTTP client available for Win32 desktop");
+ return nullptr;
}
-
#endif
#elif defined(HAVE_MAT_CURL_HTTP_CLIENT)
std::shared_ptr HttpClientFactory::Create() {
diff --git a/lib/http/HttpClientFactory.hpp b/lib/http/HttpClientFactory.hpp
index c96bc2ab0..64c2a7393 100644
--- a/lib/http/HttpClientFactory.hpp
+++ b/lib/http/HttpClientFactory.hpp
@@ -23,12 +23,6 @@ class HttpClientFactory
} MAT_NS_END
-// TODO: [maxgolov] - remove this once there is a better way to pass HTTP client configuration
-#if defined(MATSDK_PAL_WIN32) && !defined(_WINRT_DLL)
-#define HAVE_MAT_WININET_HTTP_CLIENT
-#include "http/HttpClient_WinInet.hpp"
-#endif
-
#endif // HAVE_MAT_DEFAULT_HTTP_CLIENT
#endif // HTTPCLIENTFACTORY_HPP