From 69387e19ef2c8f8f920de29087e42e52640db1ee Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sun, 11 Jan 2004 22:52:12 +0000 Subject: [PATCH] More cases of input parameters passed by reference without const. --- Mac/Modules/qt/_Qtmodule.c | 30 +++++++++++++++--------------- Mac/Modules/qt/qtscan.py | 3 +++ Mac/Modules/qt/qtsupport.py | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Mac/Modules/qt/_Qtmodule.c b/Mac/Modules/qt/_Qtmodule.c index b201021d6f8..50223eceed7 100644 --- a/Mac/Modules/qt/_Qtmodule.c +++ b/Mac/Modules/qt/_Qtmodule.c @@ -25835,18 +25835,18 @@ static PyObject *Qt_TuneSetHeader(PyObject *_self, PyObject *_args) PyObject *_res = NULL; ComponentResult _rv; TunePlayer tp; - unsigned long header; + unsigned long * header; #ifndef TuneSetHeader PyMac_PRECHECK(TuneSetHeader); #endif - if (!PyArg_ParseTuple(_args, "O&", - CmpInstObj_Convert, &tp)) + if (!PyArg_ParseTuple(_args, "O&s", + CmpInstObj_Convert, &tp, + &header)) return NULL; _rv = TuneSetHeader(tp, - &header); - _res = Py_BuildValue("ll", - _rv, - header); + header); + _res = Py_BuildValue("l", + _rv); return _res; } @@ -26149,21 +26149,21 @@ static PyObject *Qt_TuneSetHeaderWithSize(PyObject *_self, PyObject *_args) PyObject *_res = NULL; ComponentResult _rv; TunePlayer tp; - unsigned long header; + unsigned long * header; unsigned long size; #ifndef TuneSetHeaderWithSize PyMac_PRECHECK(TuneSetHeaderWithSize); #endif - if (!PyArg_ParseTuple(_args, "O&l", + if (!PyArg_ParseTuple(_args, "O&sl", CmpInstObj_Convert, &tp, + &header, &size)) return NULL; _rv = TuneSetHeaderWithSize(tp, - &header, + header, size); - _res = Py_BuildValue("ll", - _rv, - header); + _res = Py_BuildValue("l", + _rv); return _res; } @@ -27937,7 +27937,7 @@ static PyMethodDef Qt_methods[] = { {"NATask", (PyCFunction)Qt_NATask, 1, PyDoc_STR("(NoteAllocator na) -> (ComponentResult _rv)")}, {"TuneSetHeader", (PyCFunction)Qt_TuneSetHeader, 1, - PyDoc_STR("(TunePlayer tp) -> (ComponentResult _rv, unsigned long header)")}, + PyDoc_STR("(TunePlayer tp, unsigned long * header) -> (ComponentResult _rv)")}, {"TuneGetTimeBase", (PyCFunction)Qt_TuneGetTimeBase, 1, PyDoc_STR("(TunePlayer tp) -> (ComponentResult _rv, TimeBase tb)")}, {"TuneSetTimeScale", (PyCFunction)Qt_TuneSetTimeScale, 1, @@ -27969,7 +27969,7 @@ static PyMethodDef Qt_methods[] = { {"TuneSetSoundLocalization", (PyCFunction)Qt_TuneSetSoundLocalization, 1, PyDoc_STR("(TunePlayer tp, Handle data) -> (ComponentResult _rv)")}, {"TuneSetHeaderWithSize", (PyCFunction)Qt_TuneSetHeaderWithSize, 1, - PyDoc_STR("(TunePlayer tp, unsigned long size) -> (ComponentResult _rv, unsigned long header)")}, + PyDoc_STR("(TunePlayer tp, unsigned long * header, unsigned long size) -> (ComponentResult _rv)")}, {"TuneSetPartMix", (PyCFunction)Qt_TuneSetPartMix, 1, PyDoc_STR("(TunePlayer tp, unsigned long partNumber, long volume, long balance, long mixFlags) -> (ComponentResult _rv)")}, {"TuneGetPartMix", (PyCFunction)Qt_TuneGetPartMix, 1, diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py index 175a2205266..1006c6c7360 100644 --- a/Mac/Modules/qt/qtscan.py +++ b/Mac/Modules/qt/qtscan.py @@ -306,6 +306,9 @@ class MyScanner(Scanner): # It seems MusicMIDIPacket if never flagged with const but always used # for sending only. If that ever changes this needs to be fixed. ([('MusicMIDIPacket', '*', 'OutMode')], [('MusicMIDIPacket_ptr', '*', 'InMode')]), + + # QTMusic const-less input parameters + ([('unsigned_long', 'header', 'OutMode')], [('UnsignedLongPtr', 'header', 'InMode')]), ] if __name__ == "__main__": diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py index 098d30d6dfc..20304c98b60 100644 --- a/Mac/Modules/qt/qtsupport.py +++ b/Mac/Modules/qt/qtsupport.py @@ -211,6 +211,7 @@ VideoDigitizerError = Type("ComponentResult", "l") HandlerError = Type("HandlerError", "l") Ptr = InputOnlyType("Ptr", "s") StringPtr = Type("StringPtr", "s") +UnsignedLongPtr = Type("unsigned long *", "s") mcactionparams = InputOnlyType("void *", "s") QTParameterDialog = Type("QTParameterDialog", "l") QTAtomID = Type("QTAtomID", "l")