[Python-checkins] CVS: python/dist/src/Mac/Modules/res _Resmodule.c,1.6,1.7

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/res
In directory usw-pr-cvs1:/tmp/cvs-serv14686/python/Mac/Modules/res

Modified Files:
	_Resmodule.c 
Log Message:
Updated to Universal Headers 3.4

Index: _Resmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/res/_Resmodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** _Resmodule.c	2001/12/08 18:02:53	1.6
--- _Resmodule.c	2001/12/18 15:35:48	1.7
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
***************
*** 1358,1361 ****
--- 1362,1410 ----
  #endif
  
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+ 	short _rv;
+ 	FSRef ref;
+ 	SignedByte permission;
+ 	if (!PyArg_ParseTuple(_args, "O&b",
+ 	                      PyMac_GetFSRef, &ref,
+ 	                      &permission))
+ 		return NULL;
+ 	_rv = FSOpenResFile(&ref,
+ 	                    permission);
+ 	{
+ 		OSErr _err = ResError();
+ 		if (_err != noErr) return PyMac_Error(_err);
+ 	}
+ 	_res = Py_BuildValue("h",
+ 	                     _rv);
+ 	return _res;
+ }
+ 
+ static PyObject *Res_FSResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+ 	Boolean _rv;
+ 	FSRef resourceFileRef;
+ 	Boolean inChain;
+ 	SInt16 refNum;
+ 	if (!PyArg_ParseTuple(_args, "O&",
+ 	                      PyMac_GetFSRef, &resourceFileRef))
+ 		return NULL;
+ 	_rv = FSResourceFileAlreadyOpen(&resourceFileRef,
+ 	                                &inChain,
+ 	                                &refNum);
+ 	{
+ 		OSErr _err = ResError();
+ 		if (_err != noErr) return PyMac_Error(_err);
+ 	}
+ 	_res = Py_BuildValue("bbh",
+ 	                     _rv,
+ 	                     inChain,
+ 	                     refNum);
+ 	return _res;
+ }
+ 
  static PyObject *Res_Resource(PyObject *_self, PyObject *_args)
  {
***************
*** 1519,1522 ****
--- 1568,1575 ----
  	 "(SInt16 curRefNum) -> (OSErr _rv, SInt16 nextRefNum)"},
  #endif
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 "(FSRef ref, SignedByte permission) -> (short _rv)"},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 "(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)"},
  	{"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.\nSee also the Handle() docstring.\n"},