gh-102255: Improve build support for Windows API partitions (GH-102256)

Add `MS_WINDOWS_DESKTOP`, `MS_WINDOWS_APPS`, `MS_WINDOWS_SYSTEM` and `MS_WINDOWS_GAMES` preprocessor definitions to allow switching off functionality missing from particular API partitions ("partitions" are used in Windows to identify overlapping subsets of APIs). CPython only officially supports `MS_WINDOWS_DESKTOP` and `MS_WINDOWS_SYSTEM` (APPS is included by normal desktop builds, but APPS without DESKTOP is not covered). Other configurations are a convenience for people building their own runtimes. `MS_WINDOWS_GAMES` is for the Xbox subset of the Windows API, which is also available on client OS, but is restricted compared to `MS_WINDOWS_DESKTOP`. These restrictions may change over time, as they relate to the build headers rather than the OS support, and so we assume that Xbox builds will use the latest available version of the GDK.

Author: maxbachmann

Include/internal/pycore_fileutils.h

@@ -251,6 +251,14 @@ extern int _Py_add_relfile(wchar_t *dirname,
 extern size_t _Py_find_basename(const wchar_t *filename);
 PyAPI_FUNC(wchar_t *) _Py_normpath(wchar_t *path, Py_ssize_t size);
 
+// The Windows Games API family does not provide these functions
+// so provide our own implementations. Remove them in case they get added
+// to the Games API family
+#if defined(MS_WINDOWS_GAMES) && !defined(MS_WINDOWS_DESKTOP)
+#include <winerror.h>
+
+extern HRESULT PathCchSkipRoot(const wchar_t *pszPath, const wchar_t **ppszRootEnd);
+#endif /* defined(MS_WINDOWS_GAMES) && !defined(MS_WINDOWS_DESKTOP) */
 
 // Macros to protect CRT calls against instant termination when passed an
 // invalid parameter (bpo-23524). IPH stands for Invalid Parameter Handler.

Lib/test/test_os.py

@@ -3084,11 +3084,13 @@ def test_device_encoding(self):
 class PidTests(unittest.TestCase):
  @unittest.skipUnless(hasattr(os, 'getppid'), "test needs os.getppid")
  def test_getppid(self):
- p = subprocess.Popen([sys.executable, '-c',
+ p = subprocess.Popen([sys._base_executable, '-c',
  'import os; print(os.getppid())'],
- stdout=subprocess.PIPE)
- stdout, _ = p.communicate()
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ stdout, error = p.communicate()
  # We are the parent of our subprocess
+ self.assertEqual(error, b'')
  self.assertEqual(int(stdout), os.getpid())
 
  def check_waitpid(self, code, exitcode, callback=None):

Misc/NEWS.d/next/Core and Builtins/2023-02-26-11-43-56.gh-issue-102255.cRnI5x.rst

@@ -0,0 +1 @@
+Improve build support for the Xbox. Patch by Max Bachmann.

Modules/_io/_iomodule.c

@@ -317,7 +317,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
  _PyIO_State *state = get_io_state(module);
  {
  PyObject *RawIO_class = (PyObject *)state->PyFileIO_Type;
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
  const PyConfig *config = _Py_GetConfig();
  if (!config->legacy_windows_stdio && _PyIO_get_console_type(path_or_fd) != '\0') {
  RawIO_class = (PyObject *)&PyWindowsConsoleIO_Type;
@@ -660,7 +660,7 @@ static PyTypeObject* static_types[] = {
 
  // PyRawIOBase_Type(PyIOBase_Type) subclasses
  &_PyBytesIOBuffer_Type,
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
  &PyWindowsConsoleIO_Type,
 #endif
 };
@@ -718,7 +718,7 @@ PyInit__io(void)
  }
 
  // Set type base classes
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
  PyWindowsConsoleIO_Type.tp_base = &PyRawIOBase_Type;
 #endif
 

Modules/_io/_iomodule.h

@@ -26,9 +26,9 @@ extern PyType_Spec fileio_spec;
 extern PyType_Spec stringio_spec;
 extern PyType_Spec textiowrapper_spec;
 
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
 extern PyTypeObject PyWindowsConsoleIO_Type;
-#endif /* MS_WINDOWS */
+#endif /* HAVE_WINDOWS_CONSOLE_IO */
 
 /* These functions are used as METH_NOARGS methods, are normally called
  * with args=NULL, and return a new reference.
@@ -178,7 +178,7 @@ find_io_state_by_def(PyTypeObject *type)
 
 extern _PyIO_State *_PyIO_get_module_state(void);
 
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
 extern char _PyIO_get_console_type(PyObject *);
 #endif
 

Modules/_io/clinic/winconsoleio.c.h

@@ -37,7 +37,9 @@
 #ifdef MS_WINDOWS
 /* can simulate truncate with Win32 API functions; see file_truncate */
 #define HAVE_FTRUNCATE
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 

Modules/_io/fileio.c

@@ -11,7 +11,7 @@
 #include "pycore_fileutils.h" // _Py_BEGIN_SUPPRESS_IPH
 #include "pycore_object.h" // _PyObject_GC_UNTRACK()
 
-#ifdef MS_WINDOWS
+#ifdef HAVE_WINDOWS_CONSOLE_IO
 
 #include "structmember.h" // PyMemberDef
 #ifdef HAVE_SYS_TYPES_H
@@ -22,7 +22,9 @@
 #endif
 #include <stddef.h> /* For offsetof */
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <fcntl.h>
 
@@ -1177,4 +1179,4 @@ PyTypeObject PyWindowsConsoleIO_Type = {
  0, /* tp_finalize */
 };
 
-#endif /* MS_WINDOWS */
+#endif /* HAVE_WINDOWS_CONSOLE_IO */

Modules/_io/winconsoleio.c

@@ -35,7 +35,9 @@ This software comes with no warranty. Use at your own risk.
 #endif
 
 #if defined(MS_WINDOWS)
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 
@@ -457,12 +459,12 @@ _locale__getdefaultlocale_impl(PyObject *module)
 
  PyOS_snprintf(encoding, sizeof(encoding), "cp%u", GetACP());
 
- if (GetLocaleInfo(LOCALE_USER_DEFAULT,
+ if (GetLocaleInfoA(LOCALE_USER_DEFAULT,
  LOCALE_SISO639LANGNAME,
  locale, sizeof(locale))) {
  Py_ssize_t i = strlen(locale);
  locale[i++] = '_';
- if (GetLocaleInfo(LOCALE_USER_DEFAULT,
+ if (GetLocaleInfoA(LOCALE_USER_DEFAULT,
  LOCALE_SISO3166CTRYNAME,
  locale+i, (int)(sizeof(locale)-i)))
  return Py_BuildValue("ss", locale, encoding);
@@ -474,7 +476,7 @@ _locale__getdefaultlocale_impl(PyObject *module)
 
  locale[0] = '0';
  locale[1] = 'x';
- if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTLANGUAGE,
+ if (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTLANGUAGE,
  locale+2, sizeof(locale)-2)) {
  return Py_BuildValue("ss", locale, encoding);
  }

Modules/_localemodule.c

@@ -12,7 +12,9 @@
  */
 
 #ifdef MS_WINDOWS
-# define WIN32_LEAN_AND_MEAN
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
 # include <windows.h>
 # include <winsock2.h>
 # include <process.h> /* getpid() */