Ported to Universal Header 2.0.1f (i.e. CW6)

32 files changed, 423 insertions, 394 deletions

diff --git a/Mac/Lib/toolbox/AppleEvents.py b/Mac/Lib/toolbox/AppleEvents.py
index 5114c72..272c446 100644
--- a/Mac/Lib/toolbox/AppleEvents.py
+++ b/Mac/Lib/toolbox/AppleEvents.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:AppleEvents.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:AppleEvents.h'
 
 typeBoolean = 'bool'
 typeChar = 'TEXT'
diff --git a/Mac/Lib/toolbox/Controls.py b/Mac/Lib/toolbox/Controls.py
index af1747f..5ebe9c4 100644
--- a/Mac/Lib/toolbox/Controls.py
+++ b/Mac/Lib/toolbox/Controls.py
@@ -1,11 +1,26 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Controls.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
 
 pushButProc = 0
 checkBoxProc = 1
 radioButProc = 2
 scrollBarProc = 16
 popupMenuProc = 1008
+kControlUsesOwningWindowsFontVariant = 1 << 3
 useWFont = 8
+kControlNoPart = 0
+kControlLabelPart = 1
+kControlMenuPart = 2
+kControlTrianglePart = 4
+kControlButtonPart = 10
+kControlCheckBoxPart = 11
+kControlRadioButtonPart = 11
+kControlUpButtonPart = 20
+kControlDownButtonPart = 21
+kControlPageUpPart = 22
+kControlPageDownPart = 23
+kControlIndicatorPart = 129
+kControlDisabledPart = 254
+kControlInactivePart = 255
 inLabel = 1
 inMenu = 2
 inTriangle = 4
@@ -16,19 +31,12 @@ inDownButton = 21
 inPageUp = 22
 inPageDown = 23
 inThumb = 129
-kNoHiliteControlPart = 0
-kInLabelControlPart = 1
-kInMenuControlPart = 2
-kInTriangleControlPart = 4
-kInButtonControlPart = 10
-kInCheckBoxControlPart = 11
-kInUpButtonControlPart = 20
-kInDownButtonControlPart = 21
-kInPageUpControlPart = 22
-kInPageDownControlPart = 23
-kInIndicatorControlPart = 129
-kReservedControlPart = 254
-kControlInactiveControlPart = 255
+kControlCheckboxUncheckedValue = 0
+kControlCheckboxCheckedValue = 1
+kControlCheckboxMixedValue = 2
+kControlRadioButtonUncheckedValue = 0
+kControlRadioButtonCheckedValue = 1
+kControlRadioButtonMixedValue = 2
 popupFixedWidth = 1 << 0
 popupVariableWidth = 1 << 1
 popupUseAddResMenu = 1 << 2
@@ -46,6 +54,10 @@ popupTitleCenterJust = 0x00000001
 popupTitleRightJust = 0x000000FF
 hAxisOnly = 1
 vAxisOnly = 2
+cFrameColor = 0
+cBodyColor = 1
+cTextColor = 2
+cThumbColor = 3
 drawCntl = 0
 testCntl = 1
 calcCRgns = 2
@@ -58,7 +70,19 @@ autoTrack = 8
 calcCntlRgn = 10
 calcThumbRgn = 11
 drawThumbOutline = 12
-cFrameColor = 0
-cBodyColor = 1
-cTextColor = 2
-cThumbColor = 3
+kDrawControlEntireControl = 0
+kDrawControlIndicatorOnly = 129
+kDragControlEntireControl = 0
+kNoHiliteControlPart = 0
+kInLabelControlPart = 1
+kInMenuControlPart = 2
+kInTriangleControlPart = 4
+kInButtonControlPart = 10
+kInCheckBoxControlPart = 11
+kInUpButtonControlPart = 20
+kInDownButtonControlPart = 21
+kInPageUpControlPart = 22
+kInPageDownControlPart = 23
+kInIndicatorControlPart = 129
+kReservedControlPart = 254
+kControlInactiveControlPart = 255
diff --git a/Mac/Lib/toolbox/Dialogs.py b/Mac/Lib/toolbox/Dialogs.py
index 66fea6b..572c609 100644
--- a/Mac/Lib/toolbox/Dialogs.py
+++ b/Mac/Lib/toolbox/Dialogs.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Dialogs.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Dialogs.h'
 
 ctrlItem = 4
 btnCtrl = 0
@@ -16,7 +16,6 @@ cancel = 2
 stopIcon = 0
 noteIcon = 1
 cautionIcon = 2
-kIDODialogItem = 24
 overlayDITL = 0
 appendDITLRight = 1
 appendDITLBottom = 2
diff --git a/Mac/Lib/toolbox/Events.py b/Mac/Lib/toolbox/Events.py
index 3d4ff94..0ff095a 100644
--- a/Mac/Lib/toolbox/Events.py
+++ b/Mac/Lib/toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Events.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h'
 
 nullEvent = 0
 mouseDown = 1
@@ -36,6 +36,9 @@ shiftKey = 0x0200
 alphaLock = 0x0400
 optionKey = 0x0800
 controlKey = 0x1000
+rightShiftKey = 0x2000
+rightOptionKey = 0x4000
+rightControlKey = 0x8000
 networkEvt = 10
 driverEvt = 11
 app1Evt = 12
diff --git a/Mac/Lib/toolbox/Menus.py b/Mac/Lib/toolbox/Menus.py
index 3729810..c063ab5 100644
--- a/Mac/Lib/toolbox/Menus.py
+++ b/Mac/Lib/toolbox/Menus.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Menus.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Menus.h'
 
 noMark = 0
 mDrawMsg = 0
diff --git a/Mac/Lib/toolbox/QuickDraw.py b/Mac/Lib/toolbox/QuickDraw.py
index e0a8ff1..f9a6b8c 100644
--- a/Mac/Lib/toolbox/QuickDraw.py
+++ b/Mac/Lib/toolbox/QuickDraw.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDraw.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDraw.h'
 
 invalColReq = -1
 srcCopy = 0
@@ -18,6 +18,7 @@ notPatOr = 13
 notPatXor = 14
 notPatBic = 15
 grayishTextOr = 49
+hilitetransfermode = 50
 blend = 32
 addPin = 33
 addOver = 34
@@ -28,6 +29,12 @@ subOver = 38
 adMin = 39
 ditherCopy = 64
 transparent = 36
+italicBit = 1
+ulineBit = 2
+outlineBit = 3
+shadowBit = 4
+condenseBit = 5
+extendBit = 6
 normalBit = 0
 inverseBit = 1
 redBit = 4
@@ -75,7 +82,7 @@ allDevices = 1 << allDevicesBit
 kNoConstraint = 0
 kVerticalConstraint = 1
 kHorizontalConstraint = 2
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDrawText.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDrawText.h'
 
 leftCaret = 0
 rightCaret = -1
diff --git a/Mac/Lib/toolbox/Resources.py b/Mac/Lib/toolbox/Resources.py
index 7d51d6d..1c4d890 100644
--- a/Mac/Lib/toolbox/Resources.py
+++ b/Mac/Lib/toolbox/Resources.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Resources.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Resources.h'
 
 resSysHeap = 64
 resPurgeable = 32
diff --git a/Mac/Lib/toolbox/Sound.py b/Mac/Lib/toolbox/Sound.py
index 515d024..f7216c5 100644
--- a/Mac/Lib/toolbox/Sound.py
+++ b/Mac/Lib/toolbox/Sound.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Sound.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Sound.h'
 
 soundListRsrc = 'snd '
 rate44khz = 0xAC440000L
diff --git a/Mac/Lib/toolbox/Windows.py b/Mac/Lib/toolbox/Windows.py
index 9a615cd..ca6f602 100644
--- a/Mac/Lib/toolbox/Windows.py
+++ b/Mac/Lib/toolbox/Windows.py
@@ -1,5 +1,11 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Windows.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Windows.h'
 
+kStandardWindowDefinition = 0
+kRoundWindowDefinition = 1
+kFloatingWindowDefinition = 124
+kModalDialogVariantCode = 1
+kMovableModalDialogVariantCode = 5
+kSideFloaterVariantCode = 8
 documentProc = 0
 dBoxProc = 1
 plainDBox = 2
@@ -19,6 +25,8 @@ floatSideZoomProc = 1997
 floatSideZoomGrowProc = 1999
 dialogKind = 2
 userKind = 8
+kDialogWindowKind = 2
+kApplicationWindowKind = 8
 inDesk = 0
 inMenuBar = 1
 inSysWindow = 2
@@ -36,11 +44,6 @@ wDispose = 4
 wGrow = 5
 wDrawGIcon = 6
 deskPatID = 16
-wContentColor = 0
-wFrameColor = 1
-wTextColor = 2
-wHiliteColor = 3
-wTitleBarColor = 4
 wNoHit = 0
 wInContent = 1
 wInDrag = 2
@@ -48,3 +51,8 @@ wInGrow = 3
 wInGoAway = 4
 wInZoomIn = 5
 wInZoomOut = 6
+wContentColor = 0
+wFrameColor = 1
+wTextColor = 2
+wHiliteColor = 3
+wTitleBarColor = 4
diff --git a/Mac/Modules/ae/aegen.py b/Mac/Modules/ae/aegen.py
index 49f891e..070f8a0 100644
--- a/Mac/Modules/ae/aegen.py
+++ b/Mac/Modules/ae/aegen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:AppleEvents.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:AppleEvents.h'
 
 f = AEFunction(OSErr, 'AECreateDesc',
     (DescType, 'typeCode', InMode),
diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 6af76a5..ed37de0 100644
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -86,113 +86,141 @@ static void CtlObj_dealloc(self)
 	PyMem_DEL(self);
 }
 
-static PyObject *CtlObj_SetControlTitle(_self, _args)
+static PyObject *CtlObj_DisposeControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	Str255 title;
-	if (!PyArg_ParseTuple(_args, "O&",
-	                      PyMac_GetStr255, title))
+	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	SetControlTitle(_self->ob_itself,
-	                title);
+	DisposeControl(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_GetControlTitle(_self, _args)
+static PyObject *CtlObj_ShowControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	Str255 title;
-	if (!PyArg_ParseTuple(_args, "O&",
-	                      PyMac_GetStr255, title))
+	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	GetControlTitle(_self->ob_itself,
-	                title);
+	ShowControl(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_DisposeControl(_self, _args)
+static PyObject *CtlObj_HideControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	DisposeControl(_self->ob_itself);
+	HideControl(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_HideControl(_self, _args)
+static PyObject *CtlObj_Draw1Control(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	HideControl(_self->ob_itself);
+	Draw1Control(_self->ob_itself);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_ShowControl(_self, _args)
+static PyObject *CtlObj_HiliteControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	if (!PyArg_ParseTuple(_args, ""))
+	ControlPartCode hiliteState;
+	if (!PyArg_ParseTuple(_args, "h",
+	                      &hiliteState))
 		return NULL;
-	ShowControl(_self->ob_itself);
+	HiliteControl(_self->ob_itself,
+	              hiliteState);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_Draw1Control(_self, _args)
+static PyObject *CtlObj_TrackControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	if (!PyArg_ParseTuple(_args, ""))
+	ControlPartCode _rv;
+	Point thePoint;
+	if (!PyArg_ParseTuple(_args, "O&",
+	                      PyMac_GetPoint, &thePoint))
 		return NULL;
-	Draw1Control(_self->ob_itself);
-	Py_INCREF(Py_None);
-	_res = Py_None;
+	_rv = TrackControl(_self->ob_itself,
+	                   thePoint,
+	                   (ControlActionUPP)0);
+	_res = Py_BuildValue("h",
+	                     _rv);
 	return _res;
 }
 
-static PyObject *CtlObj_HiliteControl(_self, _args)
+static PyObject *CtlObj_DragControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short hiliteState;
-	if (!PyArg_ParseTuple(_args, "h",
-	                      &hiliteState))
+	Point startPt;
+	Rect limitRect;
+	Rect slopRect;
+	DragConstraint axis;
+	if (!PyArg_ParseTuple(_args, "O&O&O&h",
+	                      PyMac_GetPoint, &startPt,
+	                      PyMac_GetRect, &limitRect,
+	                      PyMac_GetRect, &slopRect,
+	                      &axis))
 		return NULL;
-	HiliteControl(_self->ob_itself,
-	              hiliteState);
+	DragControl(_self->ob_itself,
+	            startPt,
+	            &limitRect,
+	            &slopRect,
+	            axis);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
+static PyObject *CtlObj_TestControl(_self, _args)
+	ControlObject *_self;
+	PyObject *_args;
+{
+	PyObject *_res = NULL;
+	ControlPartCode _rv;
+	Point thePt;
+	if (!PyArg_ParseTuple(_args, "O&",
+	                      PyMac_GetPoint, &thePt))
+		return NULL;
+	_rv = TestControl(_self->ob_itself,
+	                  thePt);
+	_res = Py_BuildValue("h",
+	                     _rv);
+	return _res;
+}
+
 static PyObject *CtlObj_MoveControl(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short h;
-	short v;
+	SInt16 h;
+	SInt16 v;
 	if (!PyArg_ParseTuple(_args, "hh",
 	                      &h,
 	                      &v))
@@ -210,8 +238,8 @@ static PyObject *CtlObj_SizeControl(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short w;
-	short h;
+	SInt16 w;
+	SInt16 h;
 	if (!PyArg_ParseTuple(_args, "hh",
 	                      &w,
 	                      &h))
@@ -224,17 +252,33 @@ static PyObject *CtlObj_SizeControl(_self, _args)
 	return _res;
 }
 
-static PyObject *CtlObj_SetControlValue(_self, _args)
+static PyObject *CtlObj_SetControlTitle(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short theValue;
-	if (!PyArg_ParseTuple(_args, "h",
-	                      &theValue))
+	Str255 title;
+	if (!PyArg_ParseTuple(_args, "O&",
+	                      PyMac_GetStr255, title))
 		return NULL;
-	SetControlValue(_self->ob_itself,
-	                theValue);
+	SetControlTitle(_self->ob_itself,
+	                title);
+	Py_INCREF(Py_None);
+	_res = Py_None;
+	return _res;
+}
+
+static PyObject *CtlObj_GetControlTitle(_self, _args)
+	ControlObject *_self;
+	PyObject *_args;
+{
+	PyObject *_res = NULL;
+	Str255 title;
+	if (!PyArg_ParseTuple(_args, "O&",
+	                      PyMac_GetStr255, title))
+		return NULL;
+	GetControlTitle(_self->ob_itself,
+	                title);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -245,7 +289,7 @@ static PyObject *CtlObj_GetControlValue(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short _rv;
+	SInt16 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
 	_rv = GetControlValue(_self->ob_itself);
@@ -254,17 +298,17 @@ static PyObject *CtlObj_GetControlValue(_self, _args)
 	return _res;
 }
 
-static PyObject *CtlObj_SetControlMinimum(_self, _args)
+static PyObject *CtlObj_SetControlValue(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short minValue;
+	SInt16 newValue;
 	if (!PyArg_ParseTuple(_args, "h",
-	                      &minValue))
+	                      &newValue))
 		return NULL;
-	SetControlMinimum(_self->ob_itself,
-	                  minValue);
+	SetControlValue(_self->ob_itself,
+	                newValue);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -275,7 +319,7 @@ static PyObject *CtlObj_GetControlMinimum(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short _rv;
+	SInt16 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
 	_rv = GetControlMinimum(_self->ob_itself);
@@ -284,17 +328,17 @@ static PyObject *CtlObj_GetControlMinimum(_self, _args)
 	return _res;
 }
 
-static PyObject *CtlObj_SetControlMaximum(_self, _args)
+static PyObject *CtlObj_SetControlMinimum(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short maxValue;
+	SInt16 newMinimum;
 	if (!PyArg_ParseTuple(_args, "h",
-	                      &maxValue))
+	                      &newMinimum))
 		return NULL;
-	SetControlMaximum(_self->ob_itself,
-	                  maxValue);
+	SetControlMinimum(_self->ob_itself,
+	                  newMinimum);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
@@ -305,7 +349,7 @@ static PyObject *CtlObj_GetControlMaximum(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short _rv;
+	SInt16 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
 	_rv = GetControlMaximum(_self->ob_itself);
@@ -314,32 +358,32 @@ static PyObject *CtlObj_GetControlMaximum(_self, _args)
 	return _res;
 }
 
-static PyObject *CtlObj_SetControlReference(_self, _args)
+static PyObject *CtlObj_SetControlMaximum(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	long data;
-	if (!PyArg_ParseTuple(_args, "l",
-	                      &data))
+	SInt16 newMaximum;
+	if (!PyArg_ParseTuple(_args, "h",
+	                      &newMaximum))
 		return NULL;
-	SetControlReference(_self->ob_itself,
-	                    data);
+	SetControlMaximum(_self->ob_itself,
+	                  newMaximum);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_GetControlReference(_self, _args)
+static PyObject *CtlObj_GetControlVariant(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	long _rv;
+	SInt16 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	_rv = GetControlReference(_self->ob_itself);
-	_res = Py_BuildValue("l",
+	_rv = GetControlVariant(_self->ob_itself);
+	_res = Py_BuildValue("h",
 	                     _rv);
 	return _res;
 }
@@ -358,125 +402,81 @@ static PyObject *CtlObj_SetControlAction(_self, _args)
 	return _res;
 }
 
-static PyObject *CtlObj_DragControl(_self, _args)
+static PyObject *CtlObj_SetControlReference(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	Point startPt;
-	Rect limitRect;
-	Rect slopRect;
-	short axis;
-	if (!PyArg_ParseTuple(_args, "O&O&O&h",
-	                      PyMac_GetPoint, &startPt,
-	                      PyMac_GetRect, &limitRect,
-	                      PyMac_GetRect, &slopRect,
-	                      &axis))
+	SInt32 data;
+	if (!PyArg_ParseTuple(_args, "l",
+	                      &data))
 		return NULL;
-	DragControl(_self->ob_itself,
-	            startPt,
-	            &limitRect,
-	            &slopRect,
-	            axis);
+	SetControlReference(_self->ob_itself,
+	                    data);
 	Py_INCREF(Py_None);
 	_res = Py_None;
 	return _res;
 }
 
-static PyObject *CtlObj_TestControl(_self, _args)
-	ControlObject *_self;
-	PyObject *_args;
-{
-	PyObject *_res = NULL;
-	short _rv;
-	Point thePt;
-	if (!PyArg_ParseTuple(_args, "O&",
-	                      PyMac_GetPoint, &thePt))
-		return NULL;
-	_rv = TestControl(_self->ob_itself,
-	                  thePt);
-	_res = Py_BuildValue("h",
-	                     _rv);
-	return _res;
-}
-
-static PyObject *CtlObj_GetControlVariant(_self, _args)
+static PyObject *CtlObj_GetControlReference(_self, _args)
 	ControlObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short _rv;
+	SInt32 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
-	_rv = GetControlVariant(_self->ob_itself);
-	_res = Py_BuildValue("h",
-	                     _rv);
-	return _res;
-}
-
-static PyObject *CtlObj_TrackControl(_self, _args)
-	ControlObject *_self;
-	PyObject *_args;
-{
-	PyObject *_res = NULL;
-	short _rv;
-	Point thePoint;
-	if (!PyArg_ParseTuple(_args, "O&",
-	                      PyMac_GetPoint, &thePoint))
-		return NULL;
-	_rv = TrackControl(_self->ob_itself,
-	                   thePoint,
-	                   (ControlActionUPP)0);
-	_res = Py_BuildValue("h",
+	_rv = GetControlReference(_self->ob_itself);
+	_res = Py_BuildValue("l",
 	                     _rv);
 	return _res;
 }
 
 static PyMethodDef CtlObj_methods[] = {
-	{"SetControlTitle", (PyCFunction)CtlObj_SetControlTitle, 1,
-	 "(Str255 title) -> None"},
-	{"GetControlTitle", (PyCFunction)CtlObj_GetControlTitle, 1,
-	 "(Str255 title) -> None"},
 	{"DisposeControl", (PyCFunction)CtlObj_DisposeControl, 1,
 	 "() -> None"},
-	{"HideControl", (PyCFunction)CtlObj_HideControl, 1,
-	 "() -> None"},
 	{"ShowControl", (PyCFunction)CtlObj_ShowControl, 1,
 	 "() -> None"},
+	{"HideControl", (PyCFunction)CtlObj_HideControl, 1,
+	 "() -> None"},
 	{"Draw1Control", (PyCFunction)CtlObj_Draw1Control, 1,
 	 "() -> None"},
 	{"HiliteControl", (PyCFunction)CtlObj_HiliteControl, 1,
-	 "(short hiliteState) -> None"},
+	 "(ControlPartCode hiliteState) -> None"},
+	{"TrackControl", (PyCFunction)CtlObj_TrackControl, 1,
+	 "(Point thePoint) -> (ControlPartCode _rv)"},
+	{"DragControl", (PyCFunction)CtlObj_DragControl, 1,
+	 "(Point startPt, Rect limitRect, Rect slopRect, DragConstraint axis) -> None"},
+	{"TestControl", (PyCFunction)CtlObj_TestControl, 1,
+	 "(Point thePt) -> (ControlPartCode _rv)"},
 	{"MoveControl", (PyCFunction)CtlObj_MoveControl, 1,
-	 "(short h, short v) -> None"},
+	 "(SInt16 h, SInt16 v) -> None"},
 	{"SizeControl", (PyCFunction)CtlObj_SizeControl, 1,
-	 "(short w, short h) -> None"},
-	{"SetControlValue", (PyCFunction)CtlObj_SetControlValue, 1,
-	 "(short theValue) -> None"},
+	 "(SInt16 w, SInt16 h) -> None"},
+	{"SetControlTitle", (PyCFunction)CtlObj_SetControlTitle, 1,
+	 "(Str255 title) -> None"},
+	{"GetControlTitle", (PyCFunction)CtlObj_GetControlTitle, 1,
+	 "(Str255 title) -> None"},
 	{"GetControlValue", (PyCFunction)CtlObj_GetControlValue, 1,
-	 "() -> (short _rv)"},
-	{"SetControlMinimum", (PyCFunction)CtlObj_SetControlMinimum, 1,
-	 "(short minValue) -> None"},
+	 "() -> (SInt16 _rv)"},
+	{"SetControlValue", (PyCFunction)CtlObj_SetControlValue, 1,
+	 "(SInt16 newValue) -> None"},
 	{"GetControlMinimum", (PyCFunction)CtlObj_GetControlMinimum, 1,
-	 "() -> (short _rv)"},
-	{"SetControlMaximum", (PyCFunction)CtlObj_SetControlMaximum, 1,
-	 "(short maxValue) -> None"},
+	 "() -> (SInt16 _rv)"},
+	{"SetControlMinimum", (PyCFunction)CtlObj_SetControlMinimum, 1,
+	 "(SInt16 newMinimum) -> None"},
 	{"GetControlMaximum", (PyCFunction)CtlObj_GetControlMaximum, 1,
-	 "() -> (short _rv)"},
-	{"SetControlReference", (PyCFunction)CtlObj_SetControlReference, 1,
-	 "(long data) -> None"},
-	{"GetControlReference", (PyCFunction)CtlObj_GetControlReference, 1,
-	 "() -> (long _rv)"},
+	 "() -> (SInt16 _rv)"},
+	{"SetControlMaximum", (PyCFunction)CtlObj_SetControlMaximum, 1,
+	 "(SInt16 newMaximum) -> None"},
+	{"GetControlVariant", (PyCFunction)CtlObj_GetControlVariant, 1,
+	 "() -> (SInt16 _rv)"},
 	{"SetControlAction", (PyCFunction)CtlObj_SetControlAction, 1,
 	 "() -> None"},
-	{"DragControl", (PyCFunction)CtlObj_DragControl, 1,
-	 "(Point startPt, Rect limitRect, Rect slopRect, short axis) -> None"},
-	{"TestControl", (PyCFunction)CtlObj_TestControl, 1,
-	 "(Point thePt) -> (short _rv)"},
-	{"GetControlVariant", (PyCFunction)CtlObj_GetControlVariant, 1,
-	 "() -> (short _rv)"},
-	{"TrackControl", (PyCFunction)CtlObj_TrackControl, 1,
-	 "(Point thePoint) -> (short _rv)"},
+	{"SetControlReference", (PyCFunction)CtlObj_SetControlReference, 1,
+	 "(SInt32 data) -> None"},
+	{"GetControlReference", (PyCFunction)CtlObj_GetControlReference, 1,
+	 "() -> (SInt32 _rv)"},
 	{NULL, NULL, 0}
 };
 
@@ -517,11 +517,11 @@ static PyObject *Ctl_NewControl(_self, _args)
 	Rect boundsRect;
 	Str255 title;
 	Boolean visible;
-	short value;
-	short min;
-	short max;
-	short procID;
-	long refCon;
+	SInt16 value;
+	SInt16 min;
+	SInt16 max;
+	SInt16 procID;
+	SInt32 refCon;
 	if (!PyArg_ParseTuple(_args, "O&O&O&bhhhhl",
 	                      WinObj_Convert, &theWindow,
 	                      PyMac_GetRect, &boundsRect,
@@ -553,7 +553,7 @@ static PyObject *Ctl_GetNewControl(_self, _args)
 {
 	PyObject *_res = NULL;
 	ControlHandle _rv;
-	short controlID;
+	SInt16 controlID;
 	WindowPtr owner;
 	if (!PyArg_ParseTuple(_args, "hO&",
 	                      &controlID,
@@ -617,7 +617,7 @@ static PyObject *Ctl_FindControl(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short _rv;
+	ControlPartCode _rv;
 	Point thePoint;
 	WindowPtr theWindow;
 	ControlHandle theControl;
@@ -636,9 +636,9 @@ static PyObject *Ctl_FindControl(_self, _args)
 
 static PyMethodDef Ctl_methods[] = {
 	{"NewControl", (PyCFunction)Ctl_NewControl, 1,
-	 "(WindowPtr theWindow, Rect boundsRect, Str255 title, Boolean visible, short value, short min, short max, short procID, long refCon) -> (ControlHandle _rv)"},
+	 "(WindowPtr theWindow, Rect boundsRect, Str255 title, Boolean visible, SInt16 value, SInt16 min, SInt16 max, SInt16 procID, SInt32 refCon) -> (ControlHandle _rv)"},
 	{"GetNewControl", (PyCFunction)Ctl_GetNewControl, 1,
-	 "(short controlID, WindowPtr owner) -> (ControlHandle _rv)"},
+	 "(SInt16 controlID, WindowPtr owner) -> (ControlHandle _rv)"},
 	{"KillControls", (PyCFunction)Ctl_KillControls, 1,
 	 "(WindowPtr theWindow) -> None"},
 	{"DrawControls", (PyCFunction)Ctl_DrawControls, 1,
@@ -646,7 +646,7 @@ static PyMethodDef Ctl_methods[] = {
 	{"UpdateControls", (PyCFunction)Ctl_UpdateControls, 1,
 	 "(WindowPtr theWindow) -> None"},
 	{"FindControl", (PyCFunction)Ctl_FindControl, 1,
-	 "(Point thePoint, WindowPtr theWindow) -> (short _rv, ControlHandle theControl)"},
+	 "(Point thePoint, WindowPtr theWindow) -> (ControlPartCode _rv, ControlHandle theControl)"},
 	{NULL, NULL, 0}
 };
 
diff --git a/Mac/Modules/ctl/ctlgen.py b/Mac/Modules/ctl/ctlgen.py
index 85fc6c7..683e26b 100644
--- a/Mac/Modules/ctl/ctlgen.py
+++ b/Mac/Modules/ctl/ctlgen.py
@@ -1,32 +1,20 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Controls.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
 
 f = Function(ControlRef, 'NewControl',
     (WindowRef, 'theWindow', InMode),
     (Rect_ptr, 'boundsRect', InMode),
     (ConstStr255Param, 'title', InMode),
     (Boolean, 'visible', InMode),
-    (short, 'value', InMode),
-    (short, 'min', InMode),
-    (short, 'max', InMode),
-    (short, 'procID', InMode),
-    (long, 'refCon', InMode),
+    (SInt16, 'value', InMode),
+    (SInt16, 'min', InMode),
+    (SInt16, 'max', InMode),
+    (SInt16, 'procID', InMode),
+    (SInt32, 'refCon', InMode),
 )
 functions.append(f)
 
-f = Method(void, 'SetControlTitle',
-    (ControlRef, 'theControl', InMode),
-    (ConstStr255Param, 'title', InMode),
-)
-methods.append(f)
-
-f = Method(void, 'GetControlTitle',
-    (ControlRef, 'theControl', InMode),
-    (Str255, 'title', InMode),
-)
-methods.append(f)
-
 f = Function(ControlRef, 'GetNewControl',
-    (short, 'controlID', InMode),
+    (SInt16, 'controlID', InMode),
     (WindowRef, 'owner', InMode),
 )
 functions.append(f)
@@ -41,12 +29,12 @@ f = Function(void, 'KillControls',
 )
 functions.append(f)
 
-f = Method(void, 'HideControl',
+f = Method(void, 'ShowControl',
     (ControlRef, 'theControl', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'ShowControl',
+f = Method(void, 'HideControl',
     (ControlRef, 'theControl', InMode),
 )
 methods.append(f)
@@ -61,113 +49,125 @@ f = Method(void, 'Draw1Control',
 )
 methods.append(f)
 
-f = Method(void, 'HiliteControl',
-    (ControlRef, 'theControl', InMode),
-    (short, 'hiliteState', InMode),
-)
-methods.append(f)
-
 f = Function(void, 'UpdateControls',
     (WindowRef, 'theWindow', InMode),
     (RgnHandle, 'updateRgn', InMode),
 )
 functions.append(f)
 
-f = Method(void, 'MoveControl',
+f = Method(void, 'HiliteControl',
     (ControlRef, 'theControl', InMode),
-    (short, 'h', InMode),
-    (short, 'v', InMode),
+    (ControlPartCode, 'hiliteState', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SizeControl',
+f = Method(ControlPartCode, 'TrackControl',
     (ControlRef, 'theControl', InMode),
-    (short, 'w', InMode),
-    (short, 'h', InMode),
+    (Point, 'thePoint', InMode),
+    (FakeType('(ControlActionUPP)0'), 'actionProc', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SetControlValue',
+f = Method(void, 'DragControl',
     (ControlRef, 'theControl', InMode),
-    (short, 'theValue', InMode),
+    (Point, 'startPt', InMode),
+    (Rect_ptr, 'limitRect', InMode),
+    (Rect_ptr, 'slopRect', InMode),
+    (DragConstraint, 'axis', InMode),
 )
 methods.append(f)
 
-f = Method(short, 'GetControlValue',
+f = Method(ControlPartCode, 'TestControl',
     (ControlRef, 'theControl', InMode),
+    (Point, 'thePt', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SetControlMinimum',
+f = Function(ControlPartCode, 'FindControl',
+    (Point, 'thePoint', InMode),
+    (WindowRef, 'theWindow', InMode),
+    (ExistingControlHandle, 'theControl', OutMode),
+)
+functions.append(f)
+
+f = Method(void, 'MoveControl',
     (ControlRef, 'theControl', InMode),
-    (short, 'minValue', InMode),
+    (SInt16, 'h', InMode),
+    (SInt16, 'v', InMode),
 )
 methods.append(f)
 
-f = Method(short, 'GetControlMinimum',
+f = Method(void, 'SizeControl',
     (ControlRef, 'theControl', InMode),
+    (SInt16, 'w', InMode),
+    (SInt16, 'h', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SetControlMaximum',
+f = Method(void, 'SetControlTitle',
     (ControlRef, 'theControl', InMode),
-    (short, 'maxValue', InMode),
+    (ConstStr255Param, 'title', InMode),
 )
 methods.append(f)
 
-f = Method(short, 'GetControlMaximum',
+f = Method(void, 'GetControlTitle',
     (ControlRef, 'theControl', InMode),
+    (Str255, 'title', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SetControlReference',
+f = Method(SInt16, 'GetControlValue',
     (ControlRef, 'theControl', InMode),
-    (long, 'data', InMode),
 )
 methods.append(f)
 
-f = Method(long, 'GetControlReference',
+f = Method(void, 'SetControlValue',
     (ControlRef, 'theControl', InMode),
+    (SInt16, 'newValue', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'SetControlAction',
+f = Method(SInt16, 'GetControlMinimum',
     (ControlRef, 'theControl', InMode),
-    (FakeType('(ControlActionUPP)0'), 'actionProc', InMode),
 )
 methods.append(f)
 
-f = Method(void, 'DragControl',
+f = Method(void, 'SetControlMinimum',
     (ControlRef, 'theControl', InMode),
-    (Point, 'startPt', InMode),
-    (Rect_ptr, 'limitRect', InMode),
-    (Rect_ptr, 'slopRect', InMode),
-    (short, 'axis', InMode),
+    (SInt16, 'newMinimum', InMode),
 )
 methods.append(f)
 
-f = Method(short, 'TestControl',
+f = Method(SInt16, 'GetControlMaximum',
     (ControlRef, 'theControl', InMode),
-    (Point, 'thePt', InMode),
 )
 methods.append(f)
 
-f = Function(short, 'FindControl',
-    (Point, 'thePoint', InMode),
-    (WindowRef, 'theWindow', InMode),
-    (ExistingControlHandle, 'theControl', OutMode),
+f = Method(void, 'SetControlMaximum',
+    (ControlRef, 'theControl', InMode),
+    (SInt16, 'newMaximum', InMode),
 )
-functions.append(f)
+methods.append(f)
 
-f = Method(short, 'GetControlVariant',
+f = Method(SInt16, 'GetControlVariant',
     (ControlRef, 'theControl', InMode),
 )
 methods.append(f)
 
-f = Method(short, 'TrackControl',
+f = Method(void, 'SetControlAction',
     (ControlRef, 'theControl', InMode),
-    (Point, 'thePoint', InMode),
     (FakeType('(ControlActionUPP)0'), 'actionProc', InMode),
 )
 methods.append(f)
 
+f = Method(void, 'SetControlReference',
+    (ControlRef, 'theControl', InMode),
+    (SInt32, 'data', InMode),
+)
+methods.append(f)
+
+f = Method(SInt32, 'GetControlReference',
+    (ControlRef, 'theControl', InMode),
+)
+methods.append(f)
+
diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index 9846631..245a725 100644
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -29,6 +29,8 @@ ControlRef = ControlHandle
 ExistingControlHandle = OpaqueByValueType(OBJECTTYPE, "CtlObj_WhichControl", "BUG")
 
 RgnHandle = FakeType("theWindow->visRgn") # XXX
+ControlPartCode = Type("ControlPartCode", "h")
+DragConstraint = Type("DragConstraint", "h")
 
 includestuff = includestuff + """
 #include <%s>""" % MACHEADERFILE + """
diff --git a/Mac/Modules/dlg/dlggen.py b/Mac/Modules/dlg/dlggen.py
index c6ae362..80650fd 100644
--- a/Mac/Modules/dlg/dlggen.py
+++ b/Mac/Modules/dlg/dlggen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Dialogs.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Dialogs.h'
 
 f = Function(DialogRef, 'NewDialog',
     (NullStorage, 'wStorage', InMode),
diff --git a/Mac/Modules/evt/Evtmodule.c b/Mac/Modules/evt/Evtmodule.c
index 7169b59..7732d09 100644
--- a/Mac/Modules/evt/Evtmodule.c
+++ b/Mac/Modules/evt/Evtmodule.c
@@ -39,26 +39,12 @@ extern PyObject *WinObj_WhichWindow(WindowPtr);
 
 static PyObject *Evt_Error;
 
-static PyObject *Evt_GetDblTime(_self, _args)
-	PyObject *_self;
-	PyObject *_args;
-{
-	PyObject *_res = NULL;
-	long _rv;
-	if (!PyArg_ParseTuple(_args, ""))
-		return NULL;
-	_rv = GetDblTime();
-	_res = Py_BuildValue("l",
-	                     _rv);
-	return _res;
-}
-
 static PyObject *Evt_GetCaretTime(_self, _args)
 	PyObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	long _rv;
+	UInt32 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
 	_rv = GetCaretTime();
@@ -72,7 +58,7 @@ static PyObject *Evt_SetEventMask(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short value;
+	MacOSEventMask value;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &value))
 		return NULL;
@@ -82,13 +68,27 @@ static PyObject *Evt_SetEventMask(_self, _args)
 	return _res;
 }
 
+static PyObject *Evt_GetDblTime(_self, _args)
+	PyObject *_self;
+	PyObject *_args;
+{
+	PyObject *_res = NULL;
+	UInt32 _rv;
+	if (!PyArg_ParseTuple(_args, ""))
+		return NULL;
+	_rv = GetDblTime();
+	_res = Py_BuildValue("l",
+	                     _rv);
+	return _res;
+}
+
 static PyObject *Evt_GetNextEvent(_self, _args)
 	PyObject *_self;
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
 	Boolean _rv;
-	short eventMask;
+	MacOSEventMask eventMask;
 	EventRecord theEvent;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &eventMask))
@@ -107,9 +107,9 @@ static PyObject *Evt_WaitNextEvent(_self, _args)
 {
 	PyObject *_res = NULL;
 	Boolean _rv;
-	short eventMask;
+	MacOSEventMask eventMask;
 	EventRecord theEvent;
-	unsigned long sleep;
+	UInt32 sleep;
 	if (!PyArg_ParseTuple(_args, "hl",
 	                      &eventMask,
 	                      &sleep))
@@ -130,7 +130,7 @@ static PyObject *Evt_EventAvail(_self, _args)
 {
 	PyObject *_res = NULL;
 	Boolean _rv;
-	short eventMask;
+	MacOSEventMask eventMask;
 	EventRecord theEvent;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &eventMask))
@@ -219,7 +219,7 @@ static PyObject *Evt_TickCount(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	unsigned long _rv;
+	UInt32 _rv;
 	if (!PyArg_ParseTuple(_args, ""))
 		return NULL;
 	_rv = TickCount();
@@ -234,8 +234,8 @@ static PyObject *Evt_PostEvent(_self, _args)
 {
 	PyObject *_res = NULL;
 	OSErr _err;
-	short eventNum;
-	long eventMsg;
+	MacOSEventKind eventNum;
+	UInt32 eventMsg;
 	if (!PyArg_ParseTuple(_args, "hl",
 	                      &eventNum,
 	                      &eventMsg))
@@ -254,7 +254,7 @@ static PyObject *Evt_OSEventAvail(_self, _args)
 {
 	PyObject *_res = NULL;
 	Boolean _rv;
-	short mask;
+	MacOSEventMask mask;
 	EventRecord theEvent;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &mask))
@@ -273,7 +273,7 @@ static PyObject *Evt_GetOSEvent(_self, _args)
 {
 	PyObject *_res = NULL;
 	Boolean _rv;
-	short mask;
+	MacOSEventMask mask;
 	EventRecord theEvent;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &mask))
@@ -291,8 +291,8 @@ static PyObject *Evt_FlushEvents(_self, _args)
 	PyObject *_args;
 {
 	PyObject *_res = NULL;
-	short whichMask;
-	short stopMask;
+	MacOSEventMask whichMask;
+	MacOSEventMask stopMask;
 	if (!PyArg_ParseTuple(_args, "hh",
 	                      &whichMask,
 	                      &stopMask))
@@ -352,18 +352,18 @@ static PyObject *Evt_SystemEvent(_self, _args)
 }
 
 static PyMethodDef Evt_methods[] = {
-	{"GetDblTime", (PyCFunction)Evt_GetDblTime, 1,
-	 "() -> (long _rv)"},
 	{"GetCaretTime", (PyCFunction)Evt_GetCaretTime, 1,
-	 "() -> (long _rv)"},
+	 "() -> (UInt32 _rv)"},
 	{"SetEventMask", (PyCFunction)Evt_SetEventMask, 1,
-	 "(short value) -> None"},
+	 "(MacOSEventMask value) -> None"},
+	{"GetDblTime", (PyCFunction)Evt_GetDblTime, 1,
+	 "() -> (UInt32 _rv)"},
 	{"GetNextEvent", (PyCFunction)Evt_GetNextEvent, 1,
-	 "(short eventMask) -> (Boolean _rv, EventRecord theEvent)"},
+	 "(MacOSEventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"},
 	{"WaitNextEvent", (PyCFunction)Evt_WaitNextEvent, 1,
-	 "(short eventMask, unsigned long sleep) -> (Boolean _rv, EventRecord theEvent)"},
+	 "(MacOSEventMask eventMask, UInt32 sleep) -> (Boolean _rv, EventRecord theEvent)"},
 	{"EventAvail", (PyCFunction)Evt_EventAvail, 1,
-	 "(short eventMask) -> (Boolean _rv, EventRecord theEvent)"},
+	 "(MacOSEventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"},
 	{"GetMouse", (PyCFunction)Evt_GetMouse, 1,
 	 "() -> (Point mouseLoc)"},
 	{"Button", (PyCFunction)Evt_Button, 1,
@@ -375,15 +375,15 @@ static PyMethodDef Evt_methods[] = {
 	{"GetKeys", (PyCFunction)Evt_GetKeys, 1,
 	 "() -> (KeyMap theKeys)"},
 	{"TickCount", (PyCFunction)Evt_TickCount, 1,
-	 "() -> (unsigned long _rv)"},
+	 "() -> (UInt32 _rv)"},
 	{"PostEvent", (PyCFunction)Evt_PostEvent, 1,
-	 "(short eventNum, long eventMsg) -> None"},
+	 "(MacOSEventKind eventNum, UInt32 eventMsg) -> None"},
 	{"OSEventAvail", (PyCFunction)Evt_OSEventAvail, 1,
-	 "(short mask) -> (Boolean _rv, EventRecord theEvent)"},
+	 "(MacOSEventMask mask) -> (Boolean _rv, EventRecord theEvent)"},
 	{"GetOSEvent", (PyCFunction)Evt_GetOSEvent, 1,
-	 "(short mask) -> (Boolean _rv, EventRecord theEvent)"},
+	 "(MacOSEventMask mask) -> (Boolean _rv, EventRecord theEvent)"},
 	{"FlushEvents", (PyCFunction)Evt_FlushEvents, 1,
-	 "(short whichMask, short stopMask) -> None"},
+	 "(MacOSEventMask whichMask, MacOSEventMask stopMask) -> None"},
 	{"SystemClick", (PyCFunction)Evt_SystemClick, 1,
 	 "(EventRecord theEvent, WindowPtr theWindow) -> None"},
 	{"SystemTask", (PyCFunction)Evt_SystemTask, 1,
diff --git a/Mac/Modules/evt/evtgen.py b/Mac/Modules/evt/evtgen.py
index deac64e..1ca2962 100644
--- a/Mac/Modules/evt/evtgen.py
+++ b/Mac/Modules/evt/evtgen.py
@@ -1,34 +1,34 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Events.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h'
 
-f = Function(long, 'GetDblTime',
+f = Function(UInt32, 'GetCaretTime',
 )
 functions.append(f)
 
-f = Function(long, 'GetCaretTime',
+f = Function(void, 'SetEventMask',
+    (MacOSEventMask, 'value', InMode),
 )
 functions.append(f)
 
-f = Function(void, 'SetEventMask',
-    (short, 'value', InMode),
+f = Function(UInt32, 'GetDblTime',
 )
 functions.append(f)
 
 f = Function(Boolean, 'GetNextEvent',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'WaitNextEvent',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
-    (unsigned_long, 'sleep', InMode),
+    (UInt32, 'sleep', InMode),
     (RgnHandle, 'mouseRgn', InMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'EventAvail',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
@@ -55,31 +55,31 @@ f = Function(void, 'GetKeys',
 )
 functions.append(f)
 
-f = Function(unsigned_long, 'TickCount',
+f = Function(UInt32, 'TickCount',
 )
 functions.append(f)
 
 f = Function(OSErr, 'PostEvent',
-    (short, 'eventNum', InMode),
-    (long, 'eventMsg', InMode),
+    (MacOSEventKind, 'eventNum', InMode),
+    (UInt32, 'eventMsg', InMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'OSEventAvail',
-    (short, 'mask', InMode),
+    (MacOSEventMask, 'mask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'GetOSEvent',
-    (short, 'mask', InMode),
+    (MacOSEventMask, 'mask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(void, 'FlushEvents',
-    (short, 'whichMask', InMode),
-    (short, 'stopMask', InMode),
+    (MacOSEventMask, 'whichMask', InMode),
+    (MacOSEventMask, 'stopMask', InMode),
 )
 functions.append(f)
 
diff --git a/Mac/Modules/evt/evtscan.py b/Mac/Modules/evt/evtscan.py
index 70a9df9..dc3b6ce 100644
--- a/Mac/Modules/evt/evtscan.py
+++ b/Mac/Modules/evt/evtscan.py
@@ -34,7 +34,8 @@ class MyScanner(Scanner):
 
 	def makeblacklistnames(self):
 		return [
-			"KeyTranslate"
+			"KeyTranslate",
+			"GetEventMask",		# I cannot seem to find this routine...
 			]
 
 	def makeblacklisttypes(self):
diff --git a/Mac/Modules/evt/evtsupport.py b/Mac/Modules/evt/evtsupport.py
index 0a6950b..39ddaa9 100644
--- a/Mac/Modules/evt/evtsupport.py
+++ b/Mac/Modules/evt/evtsupport.py
@@ -27,6 +27,8 @@ from macsupport import *
 RgnHandle = FakeType("(RgnHandle)0") # XXX
 
 KeyMap = ArrayOutputBufferType("KeyMap")
+MacOSEventKind = Type("MacOSEventKind", "h")
+MacOSEventMask = Type("MacOSEventMask", "h")
 
 includestuff = includestuff + """
 #include <%s>""" % MACHEADERFILE + """
diff --git a/Mac/Modules/menu/Menumodule.c b/Mac/Modules/menu/Menumodule.c
index bb1cb79..3712691 100644
--- a/Mac/Modules/menu/Menumodule.c
+++ b/Mac/Modules/menu/Menumodule.c
@@ -382,7 +382,7 @@ static PyObject *MenuObj_GetItemStyle(_self, _args)
 {
 	PyObject *_res = NULL;
 	short item;
-	unsigned char chStyle;
+	Style chStyle;
 	if (!PyArg_ParseTuple(_args, "h",
 	                      &item))
 		return NULL;
@@ -558,7 +558,7 @@ static PyMethodDef MenuObj_methods[] = {
 	{"SetItemStyle", (PyCFunction)MenuObj_SetItemStyle, 1,
 	 "(short item, short chStyle) -> None"},
 	{"GetItemStyle", (PyCFunction)MenuObj_GetItemStyle, 1,
-	 "(short item) -> (unsigned char chStyle)"},
+	 "(short item) -> (Style chStyle)"},
 	{"CalcMenuSize", (PyCFunction)MenuObj_CalcMenuSize, 1,
 	 "() -> None"},
 	{"CountMItems", (PyCFunction)MenuObj_CountMItems, 1,
diff --git a/Mac/Modules/menu/menugen.py b/Mac/Modules/menu/menugen.py
index c3f9636..2445d1e 100644
--- a/Mac/Modules/menu/menugen.py
+++ b/Mac/Modules/menu/menugen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Menus.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Menus.h'
 
 f = Function(short, 'GetMBarHeight',
 )
@@ -174,7 +174,7 @@ methods.append(f)
 f = Method(void, 'GetItemStyle',
     (MenuRef, 'theMenu', InMode),
     (short, 'item', InMode),
-    (unsigned_char, 'chStyle', OutMode),
+    (Style, 'chStyle', OutMode),
 )
 methods.append(f)
 
diff --git a/Mac/Modules/qd/qdgen.py b/Mac/Modules/qd/qdgen.py
index 612b9e7..cc12de4 100644
--- a/Mac/Modules/qd/qdgen.py
+++ b/Mac/Modules/qd/qdgen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDraw.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDraw.h'
 
 f = Function(void, 'OpenPort',
     (GrafPtr, 'port', InMode),
@@ -713,7 +713,7 @@ f = Function(short, 'QDError',
 )
 functions.append(f)
 
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDrawText.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDrawText.h'
 
 f = Function(void, 'TextFont',
     (short, 'font', InMode),
diff --git a/Mac/Modules/qd/qdscan.py b/Mac/Modules/qd/qdscan.py
index 48766f2..0e03d77 100644
--- a/Mac/Modules/qd/qdscan.py
+++ b/Mac/Modules/qd/qdscan.py
@@ -78,6 +78,7 @@ class MyScanner(Scanner):
 			'ColorSearchProcPtr',
 			'ColorSearchUPP',
 			'ConstPatternParam',
+			'Pattern_ptr',
 			'Cursor_ptr',
 			'DeviceLoopDrawingProcPtr',
 			'DeviceLoopFlags',
diff --git a/Mac/Modules/res/Resmodule.c b/Mac/Modules/res/Resmodule.c
index 024d4d2..3c5b23d 100644
--- a/Mac/Modules/res/Resmodule.c
+++ b/Mac/Modules/res/Resmodule.c
@@ -1183,25 +1183,6 @@ static PyObject *Res_FSpCreateResFile(_self, _args)
 	return _res;
 }
 
-static PyObject *Res_TempInsertROMMap(_self, _args)
-	PyObject *_self;
-	PyObject *_args;
-{
-	PyObject *_res = NULL;
-	Boolean tempResLoad;
-	if (!PyArg_ParseTuple(_args, "b",
-	                      &tempResLoad))
-		return NULL;
-	TempInsertROMMap(tempResLoad);
-	{
-		OSErr _err = ResError();
-		if (_err != noErr) return PyMac_Error(_err);
-	}
-	Py_INCREF(Py_None);
-	_res = Py_None;
-	return _res;
-}
-
 static PyObject *Res_Resource(_self, _args)
 	PyObject *_self;
 	PyObject *_args;
@@ -1293,8 +1274,6 @@ static PyMethodDef Res_methods[] = {
 	 "(FSSpec spec, SignedByte permission) -> (short _rv)"},
 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
 	 "(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None"},
-	{"TempInsertROMMap", (PyCFunction)Res_TempInsertROMMap, 1,
-	 "(Boolean tempResLoad) -> None"},
 	{"Resource", (PyCFunction)Res_Resource, 1,
 	 "Convert a string to a resource object.\n\nThe created resource object is actually just a handle.\nApply AddResource() to write it to a resource file.\n"},
 	{NULL, NULL, 0}
diff --git a/Mac/Modules/res/resgen.py b/Mac/Modules/res/resgen.py
index b5e15de..28b9015 100644
--- a/Mac/Modules/res/resgen.py
+++ b/Mac/Modules/res/resgen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Resources.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Resources.h'
 
 f = ResFunction(short, 'InitResources',
 )
@@ -275,8 +275,3 @@ f = ResMethod(Handle, 'GetNextFOND',
 )
 resmethods.append(f)
 
-f = ResFunction(void, 'TempInsertROMMap',
-    (Boolean, 'tempResLoad', InMode),
-)
-functions.append(f)
-
diff --git a/Mac/Modules/res/resscan.py b/Mac/Modules/res/resscan.py
index ba860b4..9420a03 100644
--- a/Mac/Modules/res/resscan.py
+++ b/Mac/Modules/res/resscan.py
@@ -40,6 +40,7 @@ class ResourcesScanner(Scanner):
 		return [
 			"ReadPartialResource",
 			"WritePartialResource",
+			"TempInsertROMMap",
 ##			"RmveResource",		# RemoveResource
 ##			"SizeResource",		# GetResourceSizeOnDisk
 ##			"MaxSizeRsrc",		# GetMaxResourceSize
diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index 62e9d85..fbc8ff2 100644
--- a/Mac/Modules/snd/Sndmodule.c
+++ b/Mac/Modules/snd/Sndmodule.c
@@ -496,15 +496,14 @@ static PyObject *Snd_Comp3to1(_self, _args)
 	char *buffer__out__;
 	long buffer__len__;
 	int buffer__in_len__;
-	char *state__in__;
-	char state__out__[128];
-	int state__len__;
+	StateBlock *state__in__;
+	StateBlock state__out__;
 	int state__in_len__;
 	unsigned long numChannels;
 	unsigned long whichChannel;
 	if (!PyArg_ParseTuple(_args, "s#s#ll",
 	                      &buffer__in__, &buffer__in_len__,
-	                      &state__in__, &state__in_len__,
+	                      (char **)&state__in__, &state__in_len__,
 	                      &numChannels,
 	                      &whichChannel))
 		return NULL;
@@ -514,19 +513,18 @@ static PyObject *Snd_Comp3to1(_self, _args)
 		goto buffer__error__;
 	}
 	buffer__len__ = buffer__in_len__;
-	if (state__in_len__ != 128)
+	if (state__in_len__ != sizeof(StateBlock))
 	{
-		PyErr_SetString(PyExc_TypeError, "buffer length should be 128");
+		PyErr_SetString(PyExc_TypeError, "buffer length should be sizeof(StateBlock)");
 		goto state__error__;
 	}
-	state__len__ = state__in_len__;
 	Comp3to1(buffer__in__, buffer__out__, (long)buffer__len__,
-	         state__in__, state__out__,
+	         state__in__, &state__out__,
 	         numChannels,
 	         whichChannel);
 	_res = Py_BuildValue("s#s#",
 	                     buffer__out__, (int)buffer__len__,
-	                     state__out__, (int)128);
+	                     (char *)&state__out__, (int)sizeof(StateBlock));
  state__error__: ;
 	free(buffer__out__);
  buffer__error__: ;
@@ -542,15 +540,14 @@ static PyObject *Snd_Exp1to3(_self, _args)
 	char *buffer__out__;
 	long buffer__len__;
 	int buffer__in_len__;
-	char *state__in__;
-	char state__out__[128];
-	int state__len__;
+	StateBlock *state__in__;
+	StateBlock state__out__;
 	int state__in_len__;
 	unsigned long numChannels;
 	unsigned long whichChannel;
 	if (!PyArg_ParseTuple(_args, "s#s#ll",
 	                      &buffer__in__, &buffer__in_len__,
-	                      &state__in__, &state__in_len__,
+	                      (char **)&state__in__, &state__in_len__,
 	                      &numChannels,
 	                      &whichChannel))
 		return NULL;
@@ -560,19 +557,18 @@ static PyObject *Snd_Exp1to3(_self, _args)
 		goto buffer__error__;
 	}
 	buffer__len__ = buffer__in_len__;
-	if (state__in_len__ != 128)
+	if (state__in_len__ != sizeof(StateBlock))
 	{
-		PyErr_SetString(PyExc_TypeError, "buffer length should be 128");
+		PyErr_SetString(PyExc_TypeError, "buffer length should be sizeof(StateBlock)");
 		goto state__error__;
 	}
-	state__len__ = state__in_len__;
 	Exp1to3(buffer__in__, buffer__out__, (long)buffer__len__,
-	        state__in__, state__out__,
+	        state__in__, &state__out__,
 	        numChannels,
 	        whichChannel);
 	_res = Py_BuildValue("s#s#",
 	                     buffer__out__, (int)buffer__len__,
-	                     state__out__, (int)128);
+	                     (char *)&state__out__, (int)sizeof(StateBlock));
  state__error__: ;
 	free(buffer__out__);
  buffer__error__: ;
@@ -588,15 +584,14 @@ static PyObject *Snd_Comp6to1(_self, _args)
 	char *buffer__out__;
 	long buffer__len__;
 	int buffer__in_len__;
-	char *state__in__;
-	char state__out__[128];
-	int state__len__;
+	StateBlock *state__in__;
+	StateBlock state__out__;
 	int state__in_len__;
 	unsigned long numChannels;
 	unsigned long whichChannel;
 	if (!PyArg_ParseTuple(_args, "s#s#ll",
 	                      &buffer__in__, &buffer__in_len__,
-	                      &state__in__, &state__in_len__,
+	                      (char **)&state__in__, &state__in_len__,
 	                      &numChannels,
 	                      &whichChannel))
 		return NULL;
@@ -606,19 +601,18 @@ static PyObject *Snd_Comp6to1(_self, _args)
 		goto buffer__error__;
 	}
 	buffer__len__ = buffer__in_len__;
-	if (state__in_len__ != 128)
+	if (state__in_len__ != sizeof(StateBlock))
 	{
-		PyErr_SetString(PyExc_TypeError, "buffer length should be 128");
+		PyErr_SetString(PyExc_TypeError, "buffer length should be sizeof(StateBlock)");
 		goto state__error__;
 	}
-	state__len__ = state__in_len__;
 	Comp6to1(buffer__in__, buffer__out__, (long)buffer__len__,
-	         state__in__, state__out__,
+	         state__in__, &state__out__,
 	         numChannels,
 	         whichChannel);
 	_res = Py_BuildValue("s#s#",
 	                     buffer__out__, (int)buffer__len__,
-	                     state__out__, (int)128);
+	                     (char *)&state__out__, (int)sizeof(StateBlock));
  state__error__: ;
 	free(buffer__out__);
  buffer__error__: ;
@@ -634,15 +628,14 @@ static PyObject *Snd_Exp1to6(_self, _args)
 	char *buffer__out__;
 	long buffer__len__;
 	int buffer__in_len__;
-	char *state__in__;
-	char state__out__[128];
-	int state__len__;
+	StateBlock *state__in__;
+	StateBlock state__out__;
 	int state__in_len__;
 	unsigned long numChannels;
 	unsigned long whichChannel;
 	if (!PyArg_ParseTuple(_args, "s#s#ll",
 	                      &buffer__in__, &buffer__in_len__,
-	                      &state__in__, &state__in_len__,
+	                      (char **)&state__in__, &state__in_len__,
 	                      &numChannels,
 	                      &whichChannel))
 		return NULL;
@@ -652,19 +645,18 @@ static PyObject *Snd_Exp1to6(_self, _args)
 		goto buffer__error__;
 	}
 	buffer__len__ = buffer__in_len__;
-	if (state__in_len__ != 128)
+	if (state__in_len__ != sizeof(StateBlock))
 	{
-		PyErr_SetString(PyExc_TypeError, "buffer length should be 128");
+		PyErr_SetString(PyExc_TypeError, "buffer length should be sizeof(StateBlock)");
 		goto state__error__;
 	}
-	state__len__ = state__in_len__;
 	Exp1to6(buffer__in__, buffer__out__, (long)buffer__len__,
-	        state__in__, state__out__,
+	        state__in__, &state__out__,
 	        numChannels,
 	        whichChannel);
 	_res = Py_BuildValue("s#s#",
 	                     buffer__out__, (int)buffer__len__,
-	                     state__out__, (int)128);
+	                     (char *)&state__out__, (int)sizeof(StateBlock));
  state__error__: ;
 	free(buffer__out__);
  buffer__error__: ;
@@ -776,13 +768,13 @@ static PyMethodDef Snd_methods[] = {
 	{"MACEVersion", (PyCFunction)Snd_MACEVersion, 1,
 	 "() -> (NumVersion _rv)"},
 	{"Comp3to1", (PyCFunction)Snd_Comp3to1, 1,
-	 "(Buffer buffer, Buffer state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, Buffer state)"},
+	 "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
 	{"Exp1to3", (PyCFunction)Snd_Exp1to3, 1,
-	 "(Buffer buffer, Buffer state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, Buffer state)"},
+	 "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
 	{"Comp6to1", (PyCFunction)Snd_Comp6to1, 1,
-	 "(Buffer buffer, Buffer state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, Buffer state)"},
+	 "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
 	{"Exp1to6", (PyCFunction)Snd_Exp1to6, 1,
-	 "(Buffer buffer, Buffer state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, Buffer state)"},
+	 "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
 	{"GetSysBeepVolume", (PyCFunction)Snd_GetSysBeepVolume, 1,
 	 "() -> (long level)"},
 	{"SetSysBeepVolume", (PyCFunction)Snd_SetSysBeepVolume, 1,
diff --git a/Mac/Modules/snd/sndgen.py b/Mac/Modules/snd/sndgen.py
index a980338..827b263 100644
--- a/Mac/Modules/snd/sndgen.py
+++ b/Mac/Modules/snd/sndgen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Sound.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Sound.h'
 
 f = SndFunction(void, 'SetSoundVol',
     (short, 'level', InMode),
@@ -100,7 +100,7 @@ functions.append(f)
 
 f = SndFunction(void, 'Comp3to1',
     (InOutBuffer, 'buffer', InOutMode),
-    (InOutBuf128, 'state', InOutMode),
+    (StateBlock, 'state', InOutMode),
     (unsigned_long, 'numChannels', InMode),
     (unsigned_long, 'whichChannel', InMode),
 )
@@ -108,7 +108,7 @@ functions.append(f)
 
 f = SndFunction(void, 'Exp1to3',
     (InOutBuffer, 'buffer', InOutMode),
-    (InOutBuf128, 'state', InOutMode),
+    (StateBlock, 'state', InOutMode),
     (unsigned_long, 'numChannels', InMode),
     (unsigned_long, 'whichChannel', InMode),
 )
@@ -116,7 +116,7 @@ functions.append(f)
 
 f = SndFunction(void, 'Comp6to1',
     (InOutBuffer, 'buffer', InOutMode),
-    (InOutBuf128, 'state', InOutMode),
+    (StateBlock, 'state', InOutMode),
     (unsigned_long, 'numChannels', InMode),
     (unsigned_long, 'whichChannel', InMode),
 )
@@ -124,7 +124,7 @@ functions.append(f)
 
 f = SndFunction(void, 'Exp1to6',
     (InOutBuffer, 'buffer', InOutMode),
-    (InOutBuf128, 'state', InOutMode),
+    (StateBlock, 'state', InOutMode),
     (unsigned_long, 'numChannels', InMode),
     (unsigned_long, 'whichChannel', InMode),
 )
diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py
index 8201b2c..ae52593 100644
--- a/Mac/Modules/snd/sndscan.py
+++ b/Mac/Modules/snd/sndscan.py
@@ -43,6 +43,9 @@ class SoundScanner(Scanner):
 			'GetSoundPreference',
 			'SetSoundPreference',
 			'GetCompressionInfo',
+			# And 3.1 calls, ditto...
+			'SndGetInfo',
+			'SndSetInfo',
 
 			]
 
@@ -89,8 +92,11 @@ class SoundScanner(Scanner):
 			 [("InOutBuffer", "buffer", "InOutMode")]),
 			
 			# Ditto
-			([("void_ptr", "inState", "InMode"), ("void", "outState", "OutMode")],
-			 [("InOutBuf128", "state", "InOutMode")]),
+##			([("void_ptr", "inState", "InMode"), ("void", "outState", "OutMode")],
+##			 [("InOutBuf128", "state", "InOutMode")]),
+			([("StateBlockPtr", "inState", "InMode"), ("StateBlockPtr", "outState", "InMode")],
+			 [("StateBlock", "state", "InOutMode")]),
+
 			]
 
 if __name__ == "__main__":
diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index af1908a..97a23ad 100644
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -81,7 +81,8 @@ SndCompletionUPP = SndCompletionProcPtr
 
 NumVersion = OpaqueByValueType('NumVersion', 'NumVer')
 
-InOutBuf128 = FixedInputOutputBufferType(128)
+##InOutBuf128 = FixedInputOutputBufferType(128)
+StateBlock = StructInputOutputBufferType('StateBlock')
 
 AudioSelectionPtr = FakeType('0') # XXX
 
diff --git a/Mac/Modules/win/wingen.py b/Mac/Modules/win/wingen.py
index f0f7633..25931e8 100644
--- a/Mac/Modules/win/wingen.py
+++ b/Mac/Modules/win/wingen.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Windows.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Windows.h'
 
 f = Function(void, 'InitWindows',
 )
diff --git a/Tools/bgen/bgen/macsupport.py b/Tools/bgen/bgen/macsupport.py
index f17bb96..6d226d4 100644
--- a/Tools/bgen/bgen/macsupport.py
+++ b/Tools/bgen/bgen/macsupport.py
@@ -16,6 +16,11 @@ ScriptCode = Type("ScriptCode", "h")
 Size = Type("Size", "l")
 Style = Type("Style", "b")
 
+UInt16 = Type("UInt16", "h")
+SInt16 = Type("SInt16", "h")
+UInt32 = Type("UInt32", "l")
+SInt32 = Type("SInt32", "l")
+
 # Pascal strings
 ConstStr255Param = OpaqueArrayType("Str255", "PyMac_BuildStr255", "PyMac_GetStr255")
 Str255 = OpaqueArrayType("Str255", "PyMac_BuildStr255", "PyMac_GetStr255")
diff --git a/Tools/bgen/bgen/scantools.py b/Tools/bgen/bgen/scantools.py
index 3d546d8..09d6f35 100644
--- a/Tools/bgen/bgen/scantools.py
+++ b/Tools/bgen/bgen/scantools.py
@@ -30,7 +30,7 @@ except ImportError:
 #CREATOR = 'KAHL'		# Guido's favorite text editor on the Mac
 #INCLUDEDIR = "D:Development:THINK C:Mac #includes:Apple #includes:"
 CREATOR = 'MPCC'		# Jack's favorite text editor on the Mac
-INCLUDEDIR = "Moes:CW5 GOLD Ä:Metrowerks C/C++ Ä:Headers Ä:Universal Headers 2.0a3 Ä:"
+INCLUDEDIR = "Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:"
 
 
 Error = "scantools.Error"
@@ -309,7 +309,10 @@ class Scanner:
 				except IOError:
 					pass
 		# If not on the path, or absolute, try default open()
-		return open(filename, 'r')
+		try:
+			return open(filename, 'r')
+		except IOError, arg:
+			raise IOError, (arg, filename)
 
 	def getline(self):
 		if not self.scanfile: