zooba · Mar 9, 2023 · Feb 24, 2023 · Feb 25, 2023 · Feb 25, 2023 · Feb 25, 2023
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
@@ -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
 

diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
@@ -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>
 

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.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);
     }

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
@@ -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() */

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -42,6 +42,12 @@ enum {
 #define FLOAT FLOAT_
 #define INT INT_
 #define LONG LONG_
+
+/* This can already be defined on Windows to set the character set
+   the Windows header files treat as default */
+#ifdef UNICODE
+#undef UNICODE
+#endif
 #endif
 
 /* Pickle opcodes. These must be kept updated with pickle.py.

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
@@ -59,6 +59,12 @@
 # endif
 #endif
 
+/* the deprecated posix apis are not available on xbox */
+#ifdef MS_WINDOWS_GAMES
+#  define dup _dup
+#  define dup2 _dup2
+#endif
+
 #if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__DragonFly__)
 # define FD_DIR "/dev/fd"
 #else

diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c
@@ -77,6 +77,10 @@
 #  include <process.h>            // getpid()
 #endif
 
+#ifdef MS_WINDOWS_NON_DESKTOP
+#  include <windows.h>
+#endif
+
 /* Period parameters -- These are all magic.  Don't change. */
 #define N 624
 #define M 397

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -28,6 +28,10 @@
 /* Include symbols from _socket module */
 #include "socketmodule.h"
 
+#ifdef MS_WINDOWS_GAMES
+#  include <wincrypt.h>
+#endif
+
 #include "_ssl.h"
 
 /* Redefined below for Windows debug builds after important #includes */

diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
@@ -5,7 +5,9 @@
 
 /* Windows socket errors (WSA*)  */
 #ifdef MS_WINDOWS
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 /* The following constants were added to errno.h in VS2010 but have
    preferred WSA equivalents. */

diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -12,6 +12,9 @@
 #ifdef MS_WINDOWS
 #  include <windows.h>            // GetFullPathNameW(), MAX_PATH
 #  include <pathcch.h>
+#  ifdef MS_WINDOWS_GAMES
+#    define wcsicmp _wcsicmp
+#  endif
 #endif
 
 #ifdef __APPLE__
@@ -228,10 +231,17 @@ getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
     if (path) {
 #ifdef MS_WINDOWS
         const wchar_t *ext;
+#ifdef MS_WINDOWS_GAMES
+        ext = (cchPath >= 4) ? path + cchPath - 4 : NULL;
+#endif
         DWORD attr = GetFileAttributesW(path);
         r = (attr != INVALID_FILE_ATTRIBUTES) &&
             !(attr & FILE_ATTRIBUTE_DIRECTORY) &&
+#ifdef MS_WINDOWS_GAMES
+            (ext != NULL) &&
+#else
             SUCCEEDED(PathCchFindExtension(path, cchPath + 1, &ext)) &&
+#endif
             (CompareStringOrdinal(ext, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL)
             ? Py_True : Py_False;
 #else
@@ -746,10 +756,12 @@ static int
 library_to_dict(PyObject *dict, const char *key)
 {
 #ifdef MS_WINDOWS
+#ifdef Py_ENABLE_SHARED
     extern HMODULE PyWin_DLLhModule;
     if (PyWin_DLLhModule) {
         return winmodule_to_dict(dict, key, PyWin_DLLhModule);
     }
+#endif
 #elif defined(WITH_NEXT_FRAMEWORK)
     static char modPath[MAXPATHLEN + 1];
     static int modPathInitialized = -1;

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -36,6 +36,11 @@
 # endif /* HAVE_FCNTL_H */
 #endif
 
+/* the deprecated posix apis are not available on xbox */
+#ifdef MS_WINDOWS_GAMES
+#  define lseek _lseek
+#endif
+
 #ifdef MS_WINDOWS
 #include <windows.h>
 static int
@@ -502,7 +507,7 @@ mmap_resize_method(mmap_object *self,
         CloseHandle(self->map_handle);
         /* if the file mapping still exists, it cannot be resized. */
         if (self->tagname) {
-            self->map_handle = OpenFileMapping(FILE_MAP_WRITE, FALSE,
+            self->map_handle = OpenFileMappingA(FILE_MAP_WRITE, FALSE,
                                     self->tagname);
             if (self->map_handle) {
                 PyErr_SetFromWindowsErr(ERROR_USER_MAPPED_FILE);
@@ -531,7 +536,7 @@ mmap_resize_method(mmap_object *self,
 
         /* create a new file mapping and map a new view */
         /* FIXME: call CreateFileMappingW with wchar_t tagname */
-        self->map_handle = CreateFileMapping(
+        self->map_handle = CreateFileMappingA(
             self->file_handle,
             NULL,
             PAGE_READWRITE,
@@ -1514,12 +1519,12 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
     off_lo = (DWORD)(offset & 0xFFFFFFFF);
     /* For files, it would be sufficient to pass 0 as size.
        For anonymous maps, we have to pass the size explicitly. */
-    m_obj->map_handle = CreateFileMapping(m_obj->file_handle,
-                                          NULL,
-                                          flProtect,
-                                          size_hi,
-                                          size_lo,
-                                          m_obj->tagname);
+    m_obj->map_handle = CreateFileMappingA(m_obj->file_handle,
+                                           NULL,
+                                           flProtect,
+                                           size_hi,
+                                           size_lo,
+                                           m_obj->tagname);
     if (m_obj->map_handle != NULL) {
         m_obj->data = (char *) MapViewOfFile(m_obj->map_handle,
                                              dwDesiredAccess,

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -18,7 +18,9 @@
 #  include <pathcch.h>
 #  include <lmcons.h>             // UNLEN
 #  include "osdefs.h"             // SEP
-#  define HAVE_SYMLINK
+#  ifndef MS_WINDOWS_NON_DESKTOP
+#    define HAVE_SYMLINK
+#  endif
 #endif
 
 #ifdef __VXWORKS__
@@ -312,7 +314,7 @@ corresponding Unix manual entries for more information on calls.");
 #  include <sys/syscall.h>
 #endif
 
-#if defined(MS_WINDOWS)
+#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_NON_DESKTOP)
 #  define TERMSIZE_USE_CONIO
 #elif defined(HAVE_SYS_IOCTL_H)
 #  include <sys/ioctl.h>
@@ -322,29 +324,35 @@ corresponding Unix manual entries for more information on calls.");
 #  if defined(TIOCGWINSZ)
 #    define TERMSIZE_USE_IOCTL
 #  endif
-#endif /* MS_WINDOWS */
+#endif /* MS_WINDOWS && !MS_WINDOWS_NON_DESKTOP */
 
 /* Various compilers have only certain posix functions */
 /* XXX Gosh I wish these were all moved into pyconfig.h */
 #if defined(__WATCOMC__) && !defined(__QNX__)           /* Watcom compiler */
 #  define HAVE_OPENDIR    1
 #  define HAVE_SYSTEM     1
 #  include <process.h>
-#else
-#  ifdef _MSC_VER
-     /* Microsoft compiler */
+#elif defined( _MSC_VER)
+  /* Microsoft compiler */
+#  ifndef MS_WINDOWS_NON_DESKTOP
 #    define HAVE_GETPPID    1
 #    define HAVE_GETLOGIN   1
 #    define HAVE_SPAWNV     1
 #    define HAVE_EXECV      1
 #    define HAVE_WSPAWNV    1
 #    define HAVE_WEXECV     1
-#    define HAVE_PIPE       1
 #    define HAVE_SYSTEM     1
 #    define HAVE_CWAIT      1
-#    define HAVE_FSYNC      1
-#    define fsync _commit
-#  endif  /* _MSC_VER */
+#  endif /* !MS_WINDOWS_NON_DESKTOP */
+#  define HAVE_PIPE       1
+#  define HAVE_FSYNC      1
+#  define fsync _commit
+#  ifdef MS_WINDOWS_GAMES
+#    define dup2 _dup2
+#    define umask _umask
+#    define close _close
+#    define isatty _isatty
+#  endif
 #endif  /* ! __WATCOMC__ || __QNX__ */
 
 /*[clinic input]
@@ -4471,9 +4479,18 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
         *p = L'\\';
     }
 
+#ifdef MS_WINDOWS_GAMES
+    /* this does not handle persistent local storage */
+    ret = E_FAIL;
+    if ((wcsncmp(buffer, L"G:\\", 3) == 0) || (wcsncmp(buffer, L"D:\\", 3) == 0) || (wcsncmp(buffer, L"T:\\", 3) == 0)) {
+        end = buffer + 3;
+        ret = S_OK;
+    }
+#else
     Py_BEGIN_ALLOW_THREADS
     ret = PathCchSkipRoot(buffer, &end);
     Py_END_ALLOW_THREADS
+#endif
     if (FAILED(ret)) {
         result = Py_BuildValue("sO", "", path->object);
     } else if (end != buffer) {
@@ -8385,9 +8402,9 @@ os_getuid_impl(PyObject *module)
 #endif /* HAVE_GETUID */
 
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_NON_DESKTOP)
 #define HAVE_KILL
-#endif /* MS_WINDOWS */
+#endif /* MS_WINDOWS && !MS_WINDOWS_NON_DESKTOP */
 
 #ifdef HAVE_KILL
 /*[clinic input]
@@ -13886,7 +13903,7 @@ os_set_inheritable_impl(PyObject *module, int fd, int inheritable)
 }
 
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_NON_DESKTOP)
 /*[clinic input]
 os.get_handle_inheritable -> bool
     handle: intptr_t
@@ -13931,7 +13948,7 @@ os_set_handle_inheritable_impl(PyObject *module, intptr_t handle,
     }
     Py_RETURN_NONE;
 }
-#endif /* MS_WINDOWS */
+#endif /* !MS_WINDOWS && !MS_WINDOWS_NON_DESKTOP */
 
 /*[clinic input]
 os.get_blocking -> bool

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -57,8 +57,14 @@ extern void bzero(void *, int);
 #endif
 
 #ifdef MS_WINDOWS
-#  define WIN32_LEAN_AND_MEAN
-#  include <winsock.h>
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  ifdef MS_WINDOWS_GAMES
+#    include <winsock2.h>
+#  else
+#    include <winsock.h>
+#  endif
 #else
 #  define SOCKET int
 #endif

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -30,7 +30,9 @@
 #  include <i86.h>
 #else
 #  ifdef MS_WINDOWS
-#    define WIN32_LEAN_AND_MEAN
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
 #  endif /* MS_WINDOWS */
 #endif /* !__WATCOMC__ || __QNX__ */

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
@@ -5,6 +5,12 @@
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_runtime.h"       // _PyRuntime
 
+/* the deprecated posix apis are not available on xbox */
+#ifdef MS_WINDOWS_GAMES
+#  define isatty _isatty
+#  define fileno _fileno
+#endif
+
 #if defined(HAVE_GETC_UNLOCKED) && !defined(_Py_MEMORY_SANITIZER)
 /* clang MemorySanitizer doesn't yet understand getc_unlocked. */
 #define GETC(f) getc_unlocked(f)

diff --git a/Objects/object.c b/Objects/object.c
@@ -22,6 +22,11 @@
 #  error "Py_LIMITED_API macro must not be defined"
 #endif
 
+/* the deprecated posix apis are not available on xbox */
+#ifdef MS_WINDOWS_GAMES
+#  define fileno _fileno
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -8,6 +8,10 @@
 #include <stdlib.h>               // malloc()
 #include <stdbool.h>
 
+/* the deprecated posix apis are not available on xbox */
+#ifdef MS_WINDOWS_GAMES
+#  define fileno _fileno
+#endif
 
 #undef  uint
 #define uint pymem_uint