mirror of https://github.com/python/cpython.git
Jack Jansen: A few new types needed by new API calls.
This commit is contained in:
parent
1d8fcdacea
commit
e56b4cf804
|
@ -15,7 +15,7 @@
|
||||||
ScriptCode = Type("ScriptCode", "h")
|
ScriptCode = Type("ScriptCode", "h")
|
||||||
Size = Type("Size", "l")
|
Size = Type("Size", "l")
|
||||||
Style = Type("Style", "b")
|
Style = Type("Style", "b")
|
||||||
StyleParameter = Type("Style", "h")
|
StyleParameter = Type("StyleParameter", "h")
|
||||||
CharParameter = Type("CharParameter", "h")
|
CharParameter = Type("CharParameter", "h")
|
||||||
TextEncoding = Type("TextEncoding", "l")
|
TextEncoding = Type("TextEncoding", "l")
|
||||||
|
|
||||||
|
@ -31,7 +31,8 @@
|
||||||
Str255 = OpaqueArrayType("Str255", "PyMac_BuildStr255", "PyMac_GetStr255")
|
Str255 = OpaqueArrayType("Str255", "PyMac_BuildStr255", "PyMac_GetStr255")
|
||||||
|
|
||||||
# File System Specifications
|
# File System Specifications
|
||||||
FSSpec = FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec")
|
FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec")
|
||||||
|
FSSpec = OpaqueByValueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec")
|
||||||
|
|
||||||
# OSType and ResType: 4-byte character strings
|
# OSType and ResType: 4-byte character strings
|
||||||
def OSTypeType(typename):
|
def OSTypeType(typename):
|
||||||
|
@ -85,6 +86,7 @@ def errorCheck(self, name):
|
||||||
# Various buffer types
|
# Various buffer types
|
||||||
|
|
||||||
InBuffer = VarInputBufferType('char', 'long', 'l') # (buf, len)
|
InBuffer = VarInputBufferType('char', 'long', 'l') # (buf, len)
|
||||||
|
OptionalInBuffer = OptionalVarInputBufferType('char', 'long', 'l') # (buf, len)
|
||||||
|
|
||||||
InOutBuffer = HeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, len)
|
InOutBuffer = HeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, len)
|
||||||
VarInOutBuffer = VarHeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, &len)
|
VarInOutBuffer = VarHeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, &len)
|
||||||
|
@ -151,9 +153,9 @@ def errorCheck(self, name):
|
||||||
# This requires that the OSErr type (defined above) has a non-trivial
|
# This requires that the OSErr type (defined above) has a non-trivial
|
||||||
# errorCheck method.
|
# errorCheck method.
|
||||||
class OSErrMixIn:
|
class OSErrMixIn:
|
||||||
"Mix-in class to treat OSErr return values special"
|
"Mix-in class to treat OSErr/OSStatus return values special"
|
||||||
def makereturnvar(self):
|
def makereturnvar(self):
|
||||||
if self.returntype is OSErr:
|
if self.returntype.__class__ == OSErrType:
|
||||||
return Variable(self.returntype, "_err", ErrorMode)
|
return Variable(self.returntype, "_err", ErrorMode)
|
||||||
else:
|
else:
|
||||||
return Variable(self.returntype, "_rv", OutMode)
|
return Variable(self.returntype, "_rv", OutMode)
|
||||||
|
|
Loading…
Reference in New Issue