Some of the types are signed 8 bit ints. Fixed.

diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index 14aac9c318feadfb7babb2ca54c7f851531c3f9e..bb442b51f9bff52142643608273b716e10b9b7d8 100644 (file)
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -786,7 +786,7 @@ static PyObject *wasteObj_WEGetOffset(_self, _args)
        _rv = WEGetOffset(&thePoint,
                          &edge,
                          _self->ob_itself);
-       _res = Py_BuildValue("lb",
+       _res = Py_BuildValue("lB",
                             _rv,
                             edge);
        return _res;
@@ -825,7 +825,7 @@ static PyObject *wasteObj_WEFindWord(_self, _args)
        WEEdge edge;
        SInt32 wordStart;
        SInt32 wordEnd;
-       if (!PyArg_ParseTuple(_args, "lb",
+       if (!PyArg_ParseTuple(_args, "lB",
                              &offset,
                              &edge))
                return NULL;
@@ -849,7 +849,7 @@ static PyObject *wasteObj_WEFindLine(_self, _args)
        WEEdge edge;
        SInt32 lineStart;
        SInt32 lineEnd;
-       if (!PyArg_ParseTuple(_args, "lb",
+       if (!PyArg_ParseTuple(_args, "lB",
                              &offset,
                              &edge))
                return NULL;
@@ -873,7 +873,7 @@ static PyObject *wasteObj_WEFindParagraph(_self, _args)
        WEEdge edge;
        SInt32 paragraphStart;
        SInt32 paragraphEnd;
-       if (!PyArg_ParseTuple(_args, "lb",
+       if (!PyArg_ParseTuple(_args, "lB",
                              &offset,
                              &edge))
                return NULL;
@@ -927,7 +927,7 @@ static PyObject *wasteObj_WEGetAlignment(_self, _args)
        if (!PyArg_ParseTuple(_args, ""))
                return NULL;
        _rv = WEGetAlignment(_self->ob_itself);
-       _res = Py_BuildValue("b",
+       _res = Py_BuildValue("B",
                             _rv);
        return _res;
 }
@@ -938,7 +938,7 @@ static PyObject *wasteObj_WESetAlignment(_self, _args)
 {
        PyObject *_res = NULL;
        WEAlignment alignment;
-       if (!PyArg_ParseTuple(_args, "b",
+       if (!PyArg_ParseTuple(_args, "B",
                              &alignment))
                return NULL;
        WESetAlignment(alignment,
@@ -2273,7 +2273,7 @@ void initwaste()
        waste_Error = PyMac_GetOSErrException();
        if (waste_Error == NULL ||
            PyDict_SetItemString(d, "Error", waste_Error) != 0)
-               Py_FatalError("can't initialize waste.Error");
+               return;
        WEO_Type.ob_type = &PyType_Type;
        Py_INCREF(&WEO_Type);
        if (PyDict_SetItemString(d, "WEOType", (PyObject *)&WEO_Type) != 0)
@@ -2285,7 +2285,7 @@ void initwaste()
 
                callbackdict = PyDict_New();
                if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0)
-                       Py_FatalError("can't initialize Waste.callbackdict");
+                       return;
                upp_new_handler = NewWENewObjectProc(my_new_handler);
                upp_dispose_handler = NewWEDisposeObjectProc(my_dispose_handler);
                upp_draw_handler = NewWEDrawObjectProc(my_draw_handler);

diff --git a/Mac/Modules/waste/wastesupport.py b/Mac/Modules/waste/wastesupport.py
index e2268eee7e9c21772d908f091f97a606ee707cba..7b2ff139c6367a33adbf44d514345381afa276b3 100644 (file)
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -37,8 +37,8 @@ OptStScrpHandle = OpaqueByValueType("StScrpHandle", "OptResObj")
 
 WEStyleMode = Type("WEStyleMode", "H")
 WEActionKind = Type("WEActionKind", "h")
-WEAlignment = Type("WEAlignment", "b")
-WEEdge = Type("WEEdge", "b")
+WEAlignment = Type("WEAlignment", "B")
+WEEdge = Type("WEEdge", "B")
 WEDirection = Type("WEDirection", "h")
 WESoupHandle = OpaqueByValueType("WESoupHandle", "ResObj")
 WEFontTableHandle = OpaqueByValueType("WEFontTableHandle", "ResObj")