diff options
| author | Brian Curtin <brian@python.org> | 2012-05-13 11:19:23 -0500 |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-05-13 11:19:23 -0500 |
| commit | 24c2b4159481ae98df26a6dc727e4405d3d95b1d (patch) | |
| tree | 1d4e9a544c7a38d47eca636f32738ce97f5b2d91 /Python/dynload_win.c | |
| parent | 8bad7bed5c43f8bbd989a94d83b1e70e6d048796 (diff) | |
| download | cpython-24c2b4159481ae98df26a6dc727e4405d3d95b1d.tar.gz | |
Fix #13210. Port the Windows build from VS2008 to VS2010.
Diffstat (limited to 'Python/dynload_win.c')
| -rw-r--r-- | Python/dynload_win.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 9c48a2de4f..25b6680b3b 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -12,8 +12,10 @@ #include <windows.h> // "activation context" magic - see dl_nt.c... +#if HAVE_SXS extern ULONG_PTR _Py_ActivateActCtx(); void _Py_DeactivateActCtx(ULONG_PTR cookie); +#endif const char *_PyImport_DynLoadFiletab[] = { #ifdef _DEBUG @@ -191,18 +193,24 @@ dl_funcptr _PyImport_GetDynLoadWindows(const char *shortname, { HINSTANCE hDLL = NULL; unsigned int old_mode; +#if HAVE_SXS ULONG_PTR cookie = 0; +#endif /* Don't display a message box when Python can't load a DLL */ old_mode = SetErrorMode(SEM_FAILCRITICALERRORS); +#if HAVE_SXS cookie = _Py_ActivateActCtx(); +#endif /* We use LoadLibraryEx so Windows looks for dependent DLLs in directory of pathname first. */ /* XXX This call doesn't exist in Windows CE */ hDLL = LoadLibraryExW(wpathname, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); +#if HAVE_SXS _Py_DeactivateActCtx(cookie); +#endif /* restore old error mode settings */ SetErrorMode(old_mode); |