[WIP] bpo-32592: Drop support for Windows Vista

Doc/library/time.rst

@@ -293,14 +293,6 @@ Functions
    The reference point of the returned value is undefined, so that only the
    difference between the results of consecutive calls is valid.
 
-   On Windows versions older than Vista, :func:`monotonic` detects
-   :c:func:`GetTickCount` integer overflow (32 bits, roll-over after 49.7 days).
-   It increases an internal epoch (reference time) by 2\ :sup:`32` each time
-   that an overflow is detected.  The epoch is stored in the process-local state
-   and so the value of :func:`monotonic` may be different in two Python
-   processes running for more than 49 days. On more recent versions of Windows
-   and on other operating systems, :func:`monotonic` is system-wide.
-
    .. versionadded:: 3.3
    .. versionchanged:: 3.5
       The function is now always available.

Doc/using/windows.rst

@@ -29,7 +29,8 @@ Supported Versions
 
 As specified in :pep:`11`, a Python release only supports a Windows platform
 while Microsoft considers the platform under extended support. This means that
-Python |version| supports Windows Vista and newer. If you require Windows XP
+Python |version| supports Windows 7 and newer. If you require Windows Vista
+support then please install Python 3.6. If you require Windows XP
 support then please install Python 3.4.
 
 Installation Steps

Include/internal/condvar.h

@@ -34,58 +34,13 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/* options */
-/* non-emulated condition variables are provided for those that want
- * to target Windows Vista.  Modify this macro to enable them.
- */
-#ifndef _PY_EMULATED_WIN_CV
-#define _PY_EMULATED_WIN_CV 1  /* use emulated condition variables */
-#endif
-
-/* fall back to emulation if not targeting Vista */
-#if !defined NTDDI_VISTA || NTDDI_VERSION < NTDDI_VISTA
-#undef _PY_EMULATED_WIN_CV
-#define _PY_EMULATED_WIN_CV 1
-#endif
-
-#if _PY_EMULATED_WIN_CV
-
-typedef CRITICAL_SECTION PyMUTEX_T;
-
-/* The ConditionVariable object.  From XP onwards it is easily emulated
-   with a Semaphore.
-   Semaphores are available on Windows XP (2003 server) and later.
-   We use a Semaphore rather than an auto-reset event, because although
-   an auto-resent event might appear to solve the lost-wakeup bug (race
-   condition between releasing the outer lock and waiting) because it
-   maintains state even though a wait hasn't happened, there is still
-   a lost wakeup problem if more than one thread are interrupted in the
-   critical place.  A semaphore solves that, because its state is
-   counted, not Boolean.
-   Because it is ok to signal a condition variable with no one
-   waiting, we need to keep track of the number of
-   waiting threads.  Otherwise, the semaphore's state could rise
-   without bound.  This also helps reduce the number of "spurious wakeups"
-   that would otherwise happen.
- */
-
-typedef struct _PyCOND_T
-{
-    HANDLE sem;
-    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
-} PyCOND_T;
-
-#else /* !_PY_EMULATED_WIN_CV */
-
-/* Use native Win7 primitives if build target is Win7 or higher */
+/* Use native Win7 primitives */
 
 /* SRWLOCK is faster and better than CriticalSection */
 typedef SRWLOCK PyMUTEX_T;
 
 typedef CONDITION_VARIABLE  PyCOND_T;
 
-#endif /* _PY_EMULATED_WIN_CV */
-
 #endif /* _POSIX_THREADS, NT_THREADS */
 
 #endif /* Py_INTERNAL_CONDVAR_H */

Misc/NEWS.d/next/Windows/2018-01-18-10-39-37.bpo-32592.EPqtd6.rst

@@ -0,0 +1,3 @@
+Drop support for Windows Vista. Windows Vista extended support ended in
+April 2017. As stated in :pep:`11`, Python 3.7 drops support for Windows
+Vista and now requires Windows 7 or newer.

Modules/posixmodule.c

@@ -11153,22 +11153,7 @@ os_cpu_count_impl(PyObject *module)
 {
     int ncpu = 0;
 #ifdef MS_WINDOWS
-    /* Vista is supported and the GetMaximumProcessorCount API is Win7+
-       Need to fallback to Vista behavior if this call isn't present */
-    HINSTANCE hKernel32;
-    hKernel32 = GetModuleHandleW(L"KERNEL32");
-
-    static DWORD(CALLBACK *_GetMaximumProcessorCount)(WORD) = NULL;
-    *(FARPROC*)&_GetMaximumProcessorCount = GetProcAddress(hKernel32,
-        "GetMaximumProcessorCount");
-    if (_GetMaximumProcessorCount != NULL) {
-        ncpu = _GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS);
-    }
-    else {
-        SYSTEM_INFO sysinfo;
-        GetSystemInfo(&sysinfo);
-        ncpu = sysinfo.dwNumberOfProcessors;
-    }
+    ncpu = GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS);
 #elif defined(__hpux)
     ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
 #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)

PC/pyconfig.h

@@ -132,8 +132,8 @@ WIN32 is still required for the locale module.
 #endif /* MS_WIN64 */
 
 /* set the version macros for the windows headers */
-/* Python 3.5+ requires Windows Vista or greater */
-#define Py_WINVER 0x0600 /* _WIN32_WINNT_VISTA */
+/* Python 3.7+ requires Windows 7 or greater */
+#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */
 #define Py_NTDDI NTDDI_VISTA
 
 /* We only set these values when building Python - we don't want to force

PC/pyshellext.cpp

@@ -1,5 +1,5 @@
-// Support back to Vista
-#define _WIN32_WINNT _WIN32_WINNT_VISTA
+// Support back to Windows 7
+#define _WIN32_WINNT _WIN32_WINNT_WIN7
 #include <sdkddkver.h>
 
 // Use WRL to define a classic COM class
@@ -602,4 +602,4 @@ STDAPI_(BOOL) DllMain(_In_opt_ HINSTANCE hinst, DWORD reason, _In_opt_ void*) {
         DisableThreadLibraryCalls(hinst);
     }
     return TRUE;
-}
+}

PCbuild/readme.txt

@@ -14,7 +14,7 @@ Building Python using Microsoft Visual C++
 ------------------------------------------
 
 This directory is used to build CPython for Microsoft Windows NT version
-6.0 or higher (Windows Vista, Windows Server 2008, or later) on 32 and 64
+6.1 or higher (Windows 7 or later) on 32 and 64
 bit platforms.  Using this directory requires an installation of
 Microsoft Visual Studio 2017 (MSVC 14.1) with the *Python workload* and
 its optional *Python native development* component selected. (For