Skip to content

gh-152433: Windows: _ctypes module: improve UWP compatibility #152792

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
+8 −2
Open

gh-152433: Windows: _ctypes module: improve UWP compatibility #152792

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-00-52.gh-issue-152433.kSd1bW.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``_ctypes`` module: improve UWP compatibility.
9 changes: 7 additions & 2 deletions Modules/_ctypes/callproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,8 +1082,7 @@ void _ctypes_extend_error(PyObject *exc_class, const char *fmt, ...)
}


#ifdef MS_WIN32

#ifdef MS_WINDOWS_DESKTOP
static PyObject *
GetComError(ctypes_state *st, HRESULT errcode, GUID *riid, IUnknown *pIunk)
{
Expand Down Expand Up @@ -1337,9 +1336,11 @@ PyObject *_ctypes_callproc(ctypes_state *st,

#ifdef MS_WIN32
if (iid && pIunk) {
#ifdef MS_WINDOWS_DESKTOP
if (*(int *)resbuf & 0x80000000)
retval = GetComError(st, *(HRESULT *)resbuf, iid, pIunk);
else
#endif
retval = PyLong_FromLong(*(int *)resbuf);
} else if (flags & FUNCFLAG_HRESULT) {
if (*(int *)resbuf & 0x80000000)
Expand Down Expand Up @@ -1417,10 +1418,14 @@ static PyObject *load_library(PyObject *self, PyObject *args)
return NULL;

Py_BEGIN_ALLOW_THREADS
#ifndef MS_WINDOWS_DESKTOP
hMod = LoadPackagedLibrary(name, 0);
#else
/* bpo-36085: Limit DLL search directories to avoid pre-loading
* attacks and enable use of the AddDllDirectory function.
*/
hMod = LoadLibraryExW(name, NULL, (DWORD)load_flags);
#endif
err = hMod ? 0 : GetLastError();
Py_END_ALLOW_THREADS

Expand Down
Loading