Improve error handling. Mostly for the python side but also a few minor fixes for the maxscript side.

git-svn-id: svn://svn.blur.com/blurdev/trunk/code/cpp/plugins/max/src/blurPython@11595 896c8824-d3f5-0310-9c61-ac502b9a79dc

Author: newellm

blurPython_msvc2010.vcxproj

@@ -160,7 +160,7 @@
       <Command>subwcrev $(SolutionDir) $(SolutionDir)version_h_template.txt $(SolutionDir)version.h</Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(PYTHON26_64)\include;$(MAX2012SDK)\include\maxscript;$(MAX2012SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>c:\python26_64\include;c:\program files (x86)\Autodesk\3ds Max 2012 SDK\maxsdk\include\maxscript;c:\program files (x86)\Autodesk\3ds Max 2012 SDK\\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MAXSCRIPT_2012__;WIN32;NDEBUG;_WINDOWS;_CRD_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -170,7 +170,7 @@
       <AdditionalDependencies>maxscrpt.lib;core.lib;maxutil.lib;geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <OutputFile>x64\blurPython26.dlx</OutputFile>
-      <AdditionalLibraryDirectories>$(MAX2012SDK)\x64\lib;$(PYTHON26_64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>c:\program files (x86)\Autodesk\3ds Max 2012 SDK\maxsdk\x64\lib;c:\python26_64\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>python26_d.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>blurPython.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>

macros.h

@@ -65,11 +65,20 @@ class PyExcRuntimeError : public RuntimeError
 
 // Call this macro to clean up any python errors that may have occurred
 // TODO: Test for quiet mode
-#define		PY_CLEARERRORS()			if ( PyErr_Occurred() ) { \
-											/* PyErr_Print(); */ \
-											throw PyExcRuntimeError( pythonExceptionTraceback() ); \
-											/* throw RuntimeError( "Python Exception: Traceback printed in listener." ); */ \
-										}
+#define PY_ERROR_PRINT_THROW() \
+	char * exc_str = pythonExceptionTraceback( /*clearException=*/ false ); \
+	PyErr_Print(); \
+	throw PyExcRuntimeError( exc_str );
+
+#define		PY_ERROR_PROPAGATE()			if ( PyErr_Occurred() ) { \
+												PY_ERROR_PRINT_THROW(); \
+											}
+
+#define PY_ERROR_PROPAGATE_MXS_CLEANUP() \
+	if ( PyErr_Occurred() ) { \
+		MXS_CLEANUP(); \
+		PY_ERROR_PRINT_THROW(); \
+	}
 
 #define		PY_PROCESSERROR( PYEXC, MEXC )  MXS_CLEARERRORS(); \
 											StringStream* buffer = new StringStream("MAXScript Error Has Occurred: \n"); \

python_struct.cpp

@@ -63,7 +63,7 @@ import_cf( Value** arg_list, int count ) {
 	// Step 5: import the module
 	if ( module_name ) {
 		PyObject* module = PyImport_ImportModule( module_name );
-		PY_CLEARERRORS();
+		PY_ERROR_PROPAGATE_MXS_CLEANUP();
 
 		vl.mxs_return = ( module ) ? ObjectWrapper::intern( module ) : &undefined;
 	}
@@ -81,16 +81,17 @@ reload_cf( Value** arg_list, int count ) {
 	check_arg_count( python.reload, 1, count );
 
 	// Step 2: evaluate the input item
-	Value* mxs_check = NULL;
-	MXS_EVAL( arg_list[0], mxs_check );
+	MXS_PROTECT(one_value_local(mxs_check));
+	MXS_EVAL( arg_list[0], vl.mxs_check );
 
 	// Step 3: make sure the item is a proper type
-	if ( is_objectwrapper(mxs_check) ) {
-		PyImport_ReloadModule( ((ObjectWrapper*) mxs_check)->object() );
-		PY_CLEARERRORS();
+	if ( is_objectwrapper(vl.mxs_check) ) {
+		PyImport_ReloadModule( ((ObjectWrapper*) vl.mxs_check)->object() );
+		PY_ERROR_PROPAGATE_MXS_CLEANUP();
 	}
 	else { mprintf( "python.reload() error: you need to supply a valid python module to reload\n" ); }
 
+	MXS_CLEANUP();
 	return &ok;	
 }
 
@@ -116,7 +117,7 @@ run_cf( Value** arg_list, int count ) {
 
 	// Step 4: run the file
 	PyRun_SimpleFile( PyFile_AsFile(py_file), filename );
-	PY_CLEARERRORS();
+	PY_ERROR_PROPAGATE_MXS_CLEANUP();
 
 	// Step 5: cleanup the memory
 	Py_XDECREF( py_file );
@@ -148,7 +149,7 @@ exec_cf( Value** arg_list, int count ) {
 
 	// Step 4: run the command
 	PyRun_SimpleString( command );
-	PY_CLEARERRORS();
+	PY_ERROR_PROPAGATE_MXS_CLEANUP();
 
 	// Step 5: cleanup the memory
 	MXS_CLEANUP();
@@ -164,6 +165,8 @@ PyExcRuntimeError::PyExcRuntimeError( char * _error )
 PyExcRuntimeError::~PyExcRuntimeError()
 {
 	delete error;
+	// Hopefully this is safe and keeps RuntimeError from double deleting our copy of the string
+	desc1 = 0;
 }
 
 // Returns a new string

studiomax_module.cpp

@@ -42,11 +42,14 @@ static PyObject*
 mxs_getattro( PyObject* self, PyObject* key ) {
 	// Step 1: convert the key to a name
 	char* keystr	= PyString_AsString( key );
-	Value* name		= Name::intern( keystr );
+	
+	MXS_PROTECT(one_value_local(name));
+	vl.name = Name::intern( keystr );
 
 	// Step 2: collect the PyObject* instance
-	PyObject* output = ObjectWrapper::py_intern( globals->get( name ) );
-
+	PyObject* output = ObjectWrapper::py_intern( globals->get( vl.name ) );
+	MXS_CLEANUP();
+	
 	return output;
 }
 
@@ -186,11 +189,13 @@ studiomax_runScript( PyObject* self, PyObject* args ) {
 
 	// Step 3: run the file
 	PyRun_SimpleFile( PyFile_AsFile(py_file), filename );
-	PY_CLEARERRORS();
 
 	// Step 4: clear the memory
 	Py_XDECREF( py_file );
 
+	if( PyErr_Occurred() )
+		return 0;
+
 	// return true
 	Py_INCREF( Py_True );
 	return Py_True;
@@ -317,18 +322,27 @@ studiomax_runMaxscript( PyObject* self, PyObject* args ) {
 // Py3dsMax.getVisController() - get the visibility controller of a node
 static PyObject*
 studiomax_getVisController( PyObject* self, PyObject* args ) {
+	PyObject * ret = 0;
 	if ( PyTuple_Size(args) == 1 ) {
 		// convert the input item to a maxscript value
 		PyObject* item	= PyTuple_GetItem(args,0);
-		Value* obj		= ObjectWrapper::intern(item);
+		MXS_PROTECT(one_value_local(obj));
+		vl.obj		= ObjectWrapper::intern(item);
 
-		if ( is_node(obj) ) {
-			return ObjectWrapper::py_intern( MAXControl::intern( ((MAXNode*)obj)->node->GetVisController() ) );
+		if ( is_node(vl.obj) ) {
+			ret = ObjectWrapper::py_intern( MAXControl::intern( ((MAXNode*)vl.obj)->node->GetVisController() ) );
 		}
+		MXS_CLEANUP();
+	} else {
+		PyErr_SetString( PyExc_AttributeError, "getVisController takes one argument, a max object." );
+		return 0;
 	}
 
-	Py_INCREF( Py_None );
-	return Py_None;
+	if( !ret ) {
+		Py_INCREF( Py_None );
+		ret = Py_None;
+	}
+	return ret;
 }
 
 // Py3dsMax.setVisController() - set the visibility controller of a node
@@ -350,6 +364,9 @@ studiomax_setVisController( PyObject* self, PyObject* args ) {
 			}
 			catch ( ... ) {};
 		}
+	} else {
+		PyErr_SetString( PyExc_AttributeError, "setVisController takes two arguments, a max object and a visibility controller." );
+		return 0;
 	}
 	if ( success ) {
 		Py_INCREF( Py_True );

wrapper.cpp

@@ -896,7 +896,13 @@ ObjectWrapper::apply( Value** arg_list, int count, CallContext* cc ) {
 
 		// Step 7: execture the python call
 		py_result = PyObject_Call( this->mObject, args, kwds );
-		PY_CLEARERRORS();
+		if ( PyErr_Occurred() ) {
+			MXS_CLEARERRORS();
+			Py_XDECREF( args );
+			Py_XDECREF( kwds );
+			Py_XDECREF( py_result );
+			PY_ERROR_PRINT_THROW();
+		}
 
 		// Step 8: convert the result to a value
 
@@ -1068,7 +1074,7 @@ ObjectWrapper::to_string() {
 		// Step 2: pull the python object string for this object
 		PyObject* py_string = PyObject_Str( this->mObject );
 		char* out = ( py_string ) ? PyString_AsString( py_string ) : "<<python: error converting value to string>>";
-		PY_CLEARERRORS();
+		PyErr_Clear();
 
 		// Step 3: release the python memory
 		Py_XDECREF( py_string );