summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-11-05 18:38:50 -0700
committerGitHub <noreply@github.com>2021-11-06 01:38:50 +0000
commit5017306c8732b3ceda878db13088f8c2cf0c5e71 (patch)
tree72db0fb65048bf6857ad2d2a8673f36b3a616064
parent5fdf7912cace245b2272b4fff982603b553ff5e0 (diff)
downloadcpython-git-5017306c8732b3ceda878db13088f8c2cf0c5e71.tar.gz
bpo-45720: Drop references to shlwapi.dll on Windows (GH-29417)
(cherry picked from commit 804ea41211b042fa20c3cd8c0457bbfa3873128a) Co-authored-by: Steve Dower <steve.dower@python.org> Co-authored-by: Steve Dower <steve.dower@python.org>
-rw-r--r--Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst3
-rw-r--r--PC/getpathp.c1
-rw-r--r--PCbuild/pythoncore.vcxproj2
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst b/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst
new file mode 100644
index 0000000000..315759b07e
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst
@@ -0,0 +1,3 @@
+Internal reference to :file:`shlwapi.dll` was dropped to help improve
+startup time. This DLL will no longer be loaded at the start of every Python
+process.
diff --git a/PC/getpathp.c b/PC/getpathp.c
index dc5b201d14..7c0eeab5db 100644
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -91,7 +91,6 @@
#include <windows.h>
#include <pathcch.h>
-#include <shlwapi.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 2625d0293d..9a40905fe0 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -106,7 +106,7 @@
<PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
- <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>