Skip to content

Remove hard dependency on wininet.dll from mip_ClientTelemetry #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Moyin-B merged 3 commits into from
May 12, 2026
Merged

Remove hard dependency on wininet.dll from mip_ClientTelemetry #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e0aaa7
Remove hard dependency on wininet.dll from mip_ClientTelemetry
Moyin-B Apr 21, 2026
c7f3c56
remove wininet.lib as AdditionalDependencies in vcxproj files
Moyin-B Apr 29, 2026
c00a36b
Remove HttpClient_WinInet from desktop.vcxitems build
Moyin-B May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Solutions/win32-dll/win32-dll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>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</AdditionalDependencies>
<AdditionalDependencies>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</AdditionalDependencies>
<AdditionalDependencies Condition="'$(DisableWinRT)'!='true'">runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
Expand Down Expand Up @@ -301,7 +301,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>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</AdditionalDependencies>
<AdditionalDependencies>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</AdditionalDependencies>
<AdditionalDependencies Condition="'$(DisableWinRT)'!='true'">runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
Expand Down
8 changes: 4 additions & 4 deletions Solutions/win32-lib/win32-lib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<LinkStatus>false</LinkStatus>
Expand Down Expand Up @@ -352,7 +352,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<LinkStatus>false</LinkStatus>
Expand Down Expand Up @@ -430,7 +430,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<ForceFileOutput>
Expand Down Expand Up @@ -506,7 +506,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<ForceFileOutput>
Expand Down
8 changes: 4 additions & 4 deletions Solutions/win32-mini-dll/win32-mini-dll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalDependencies Condition="'$(DisableWinRT)'!='true'">runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
Expand Down Expand Up @@ -268,7 +268,7 @@
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
<Lib>
<AdditionalDependencies>wininet.lib;user32.lib;shell32.lib;Advapi32.lib;Ole32.lib</AdditionalDependencies>
<AdditionalDependencies>user32.lib;shell32.lib;Advapi32.lib;Ole32.lib</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<Bscmake>
Expand Down Expand Up @@ -357,7 +357,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalDependencies Condition="'$(DisableWinRT)'!='true'">runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
Expand Down Expand Up @@ -385,7 +385,7 @@
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
<Lib>
<AdditionalDependencies>wininet.lib;user32.lib;shell32.lib;Advapi32.lib;Ole32.lib</AdditionalDependencies>
<AdditionalDependencies>user32.lib;shell32.lib;Advapi32.lib;Ole32.lib</AdditionalDependencies>
Comment thread
AlvaroPalmaAsteMicrosoft marked this conversation as resolved.
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
Expand Down
8 changes: 4 additions & 4 deletions Solutions/win32-mini-lib/win32-mini-lib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<LinkStatus>false</LinkStatus>
Expand Down Expand Up @@ -427,7 +427,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<LinkStatus>false</LinkStatus>
Expand Down Expand Up @@ -534,7 +534,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<ForceFileOutput>
Expand Down Expand Up @@ -642,7 +642,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>uuid.lib;wininet.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>uuid.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs Condition="'$(DisableWinRT)'!='true'">api-ms-win-core-winrt-l1-1-0.dll;api-ms-win-core-winrt-string-l1-1-0.dll</DelayLoadDLLs>
<ForceFileOutput>
Expand Down
14 changes: 6 additions & 8 deletions lib/http/HttpClientFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -42,13 +40,13 @@ namespace MAT_NS_BEGIN {
LOG_TRACE("Creating HttpClient_WinRt");
return std::make_shared<HttpClient_WinRt>();
}
#elif defined(HAVE_MAT_WININET_HTTP_CLIENT)
/* Win32 WinInet HTTP client */
std::shared_ptr<IHttpClient> HttpClientFactory::Create() {
LOG_TRACE("Creating HttpClient_WinInet");
return std::make_shared<HttpClient_WinInet>();
#else
/* Win32 desktop - no default HTTP client; caller must supply their own IHttpClient */
std::shared_ptr<IHttpClient> 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<IHttpClient> HttpClientFactory::Create() {
Expand Down
6 changes: 0 additions & 6 deletions lib/http/HttpClientFactory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions lib/pal/desktop/desktop.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
<ProjectCapability Include="SourceItemsFromImports" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\http\HttpClient_WinInet.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\http\HttpClient_WinInet.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)NetworkDetector.cpp">
<AdditionalIncludeDirectories>..\..;..\..\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
</ClCompile>
Expand Down
4 changes: 0 additions & 4 deletions lib/pal/desktop/desktop.vcxitems.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\http\HttpClient_WinInet.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)WindowsDesktopDeviceInformationImpl.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)WindowsDesktopNetworkInformationImpl.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)WindowsDesktopSystemInformationImpl.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)NetworkDetector.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\http\HttpClient_WinInet.cpp" />
</ItemGroup>
<ItemGroup Condition="exists('$(MSBuildThisFileDirectory)..\..\modules\utc\')">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\modules\utc\desktop\UtcHelpers.cpp" />
Expand Down