Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-103092: Isolate winsound #103249

Merged
merged 5 commits into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adapt the :mod:`winsound` extension module to :pep:`687`.
47 changes: 22 additions & 25 deletions PC/winsound.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,31 +204,13 @@ static struct PyMethodDef sound_methods[] =

#define ADD_DEFINE(CONST) do { \
if (PyModule_AddIntConstant(module, #CONST, CONST) < 0) { \
goto error; \
return -1; \
} \
} while (0)


static struct PyModuleDef winsoundmodule = {
PyModuleDef_HEAD_INIT,
"winsound",
sound_module_doc,
-1,
sound_methods,
NULL,
NULL,
NULL,
NULL
};

PyMODINIT_FUNC
PyInit_winsound(void)
static int
exec_module(PyObject *module)
{
PyObject *module = PyModule_Create(&winsoundmodule);
if (module == NULL) {
return NULL;
}

ADD_DEFINE(SND_ASYNC);
ADD_DEFINE(SND_NODEFAULT);
ADD_DEFINE(SND_NOSTOP);
Expand All @@ -248,9 +230,24 @@ PyInit_winsound(void)

#undef ADD_DEFINE

return module;
return 0;
}

static PyModuleDef_Slot sound_slots[] = {
{Py_mod_exec, exec_module},
{0, NULL}
};

error:
Py_DECREF(module);
return NULL;
static struct PyModuleDef winsoundmodule = {
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "winsound",
.m_doc = sound_module_doc,
.m_methods = sound_methods,
.m_slots = sound_slots,
};

PyMODINIT_FUNC
PyInit_winsound(void)
{
return PyModuleDef_Init(&winsoundmodule);
}