Skip to content

gh-152433: Windows: make dynload_win.c UWP compatible #152797

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

Open
thexai wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

gh-152433: Windows: make dynload_win.c UWP compatible #152797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2026-07-01-17-31-05.gh-issue-152433.dod-DF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
make ``dynload_win.c`` UWP compatible.
14 changes: 12 additions & 2 deletions Python/dynload_win.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,16 @@ _Py_CheckPython3(void)
static int python3_checked = 0;
static HANDLE hPython3;
#define MAXPATHLEN 512
wchar_t py3path[MAXPATHLEN+1];
if (python3_checked) {
return hPython3 != NULL;
}
python3_checked = 1;

#ifndef MS_WINDOWS_DESKTOP
// LoadPackagedLibrary doesn't accept absolute paths so load dll name from current app dir
hPython3 = LoadPackagedLibrary(PY3_DLLNAME, 0);
#else
wchar_t py3path[MAXPATHLEN + 1];
/* If there is a python3.dll next to the python3y.dll,
use that DLL */
if (PyWin_DLLhModule && GetModuleFileNameW(PyWin_DLLhModule, py3path, MAXPATHLEN)) {
Expand Down Expand Up @@ -202,6 +206,8 @@ _Py_CheckPython3(void)
hPython3 = LoadLibraryExW(py3path, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
}
}
#endif

return hPython3 != NULL;
#undef MAXPATHLEN
#endif /* PY3_DLLNAME */
Expand Down Expand Up @@ -299,14 +305,18 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
#endif

Py_BEGIN_ALLOW_THREADS
#ifndef MS_WINDOWS_DESKTOP
hDLL = LoadPackagedLibrary(wpathname, 0);
#else
/* bpo-36085: We use LoadLibraryEx with restricted search paths
to avoid DLL preloading attacks and enable use of the
AddDllDirectory function. We add SEARCH_DLL_LOAD_DIR to
ensure DLLs adjacent to the PYD are preferred. */
Py_BEGIN_ALLOW_THREADS
hDLL = LoadLibraryExW(wpathname, NULL,
LOAD_LIBRARY_SEARCH_DEFAULT_DIRS |
LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
#endif
Py_END_ALLOW_THREADS
PyMem_Free(wpathname);

Expand Down
Loading