mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #6317: Now winsound.PlaySound only accepts unicode with MvL's approval.

Browse source
This commit is contained in:
Hirokazu Yamamoto 2010-11-07 14:29:26 +00:00
parent be3da38e0a
commit 4ae5f138da
2 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
PC/winsound.c
View file

@ -73,8 +73,6 @@ static PyObject *
sound_playsound(PyObject *s, PyObject *args)
{
Py_UNICODE *wsound;
PyObject *osound;
const char *sound;
int flags;
int ok;
@ -95,31 +93,7 @@ sound_playsound(PyObject *s, PyObject *args)
Py_INCREF(Py_None);
return Py_None;
}
/* Drop the argument parsing error as narrow strings
are also valid. */
PyErr_Clear();
if (!PyArg_ParseTuple(args, "O&i:PlaySound",
PyUnicode_FSConverter, &osound, &flags))
return NULL;
if (flags & SND_ASYNC && flags & SND_MEMORY) {
/* Sidestep reference counting headache; unfortunately this also
prevent SND_LOOP from memory. */
PyErr_SetString(PyExc_RuntimeError, "Cannot play asynchronously from memory");
Py_DECREF(osound);
return NULL;
}
sound = PyBytes_AsString(osound);
Py_BEGIN_ALLOW_THREADS
ok = PlaySoundA(sound, NULL, flags);
Py_END_ALLOW_THREADS
if (!ok) {
PyErr_SetString(PyExc_RuntimeError, "Failed to play sound");
Py_DECREF(osound);
return NULL;
}
Py_DECREF(osound);
Py_INCREF(Py_None);
return Py_None;
return NULL;
}
static PyObject *