pythongh-85283: Build winsound extension with limited C API (python#1…

…10978) Replace type->tp_name with PyType_GetQualName().
Glyphack · Jan 27, 2024 · 08b1645 · 08b1645
1 parent a132243
commit 08b1645
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 151 deletions.
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -932,7 +932,7 @@ Build Changes
 * Building CPython now requires a compiler with support for the C11 atomic
   library, GCC built-in atomic functions, or MSVC interlocked intrinsics.
 
-* The ``errno``, ``md5``, ``_ctypes_test``, ``_stat`` and
+* The ``errno``, ``md5``, ``winsound``, ``_ctypes_test``, ``_stat`` and
   ``_testimportmultiple`` C extensions are now built with the :ref:`limited C
   API <limited-c-api>`.
   (Contributed by Victor Stinner in :gh:`85283`.)

diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -385,7 +385,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(dont_inherit)
         STRUCT_FOR_ID(dst)
         STRUCT_FOR_ID(dst_dir_fd)
-        STRUCT_FOR_ID(duration)
         STRUCT_FOR_ID(e)
         STRUCT_FOR_ID(eager_start)
         STRUCT_FOR_ID(effective_ids)
@@ -431,7 +430,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(flush)
         STRUCT_FOR_ID(follow_symlinks)
         STRUCT_FOR_ID(format)
-        STRUCT_FOR_ID(frequency)
         STRUCT_FOR_ID(from_param)
         STRUCT_FOR_ID(fromlist)
         STRUCT_FOR_ID(fromtimestamp)
@@ -675,7 +673,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(sleep)
         STRUCT_FOR_ID(sock)
         STRUCT_FOR_ID(sort)
-        STRUCT_FOR_ID(sound)
         STRUCT_FOR_ID(source)
         STRUCT_FOR_ID(source_traceback)
         STRUCT_FOR_ID(src)

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
diff --git a/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst b/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst
@@ -1,3 +1,4 @@
-The ``errno``, ``md5``, ``_ctypes_test`` and ``_testimportmultiple`` C
-extensions are now built with the :ref:`limited C API <limited-c-api>`. Patch
-by Victor Stinner.
+The ``errno``, ``md5``, ``winsound``, ``_ctypes_test``, ``_stat`` and
+``_testimportmultiple`` C extensions are now built with the :ref:`limited C API
+<limited-c-api>`.
+Patch by Victor Stinner.
diff --git a/PC/clinic/winsound.c.h b/PC/clinic/winsound.c.h
diff --git a/PC/winsound.c b/PC/winsound.c
@@ -35,10 +35,8 @@
    winsound.PlaySound(None, 0)
 */
 
-// clinic/winsound.c.h uses internal pycore_modsupport.h API
-#ifndef Py_BUILD_CORE_BUILTIN
-#  define Py_BUILD_CORE_MODULE 1
-#endif
+// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
+#define Py_LIMITED_API 0x030d0000
 
 #include <Python.h>
 #include <windows.h>
@@ -100,9 +98,13 @@ winsound_PlaySound_impl(PyObject *module, PyObject *sound, int flags)
         }
         wsound = (wchar_t *)view.buf;
     } else if (PyBytes_Check(sound)) {
-        PyErr_Format(PyExc_TypeError,
-                     "'sound' must be str, os.PathLike, or None, not '%s'",
-                     Py_TYPE(sound)->tp_name);
+        PyObject *type_name = PyType_GetQualName(Py_TYPE(sound));
+        if (type_name != NULL) {
+            PyErr_Format(PyExc_TypeError,
+                         "'sound' must be str, os.PathLike, or None, not %S",
+                         type_name);
+            Py_DECREF(type_name);
+        }
         return NULL;
     } else {
         PyObject *obj = PyOS_FSPath(sound);