Manually added HRHTMLRenderingLibAvailable.

Blacklist HRDisposeReference and call it in the dispose routine.

3 files changed, 23 insertions, 3 deletions

diff --git a/Mac/Modules/htmlrender/HtmlRendermodule.c b/Mac/Modules/htmlrender/HtmlRendermodule.c
index e521c11..afd5805 100644
--- a/Mac/Modules/htmlrender/HtmlRendermodule.c
+++ b/Mac/Modules/htmlrender/HtmlRendermodule.c
@@ -755,6 +755,20 @@ static PyObject *Html_HRUtilGetURLFromFSSpec(_self, _args)
 	return _res;
 }
 
+static PyObject *Html_HRHTMLRenderingLibAvailable(_self, _args)
+	PyObject *_self;
+	PyObject *_args;
+{
+	PyObject *_res = NULL;
+	int _rv;
+	if (!PyArg_ParseTuple(_args, ""))
+		return NULL;
+	_rv = HRHTMLRenderingLibAvailable();
+	_res = Py_BuildValue("i",
+	                     _rv);
+	return _res;
+}
+
 static PyMethodDef Html_methods[] = {
 	{"HRGetHTMLRenderingLibVersion", (PyCFunction)Html_HRGetHTMLRenderingLibVersion, 1,
 	 "() -> (NumVersion returnVers)"},
@@ -772,6 +786,8 @@ static PyMethodDef Html_methods[] = {
 	 "(char * rootURL, char * linkURL) -> (FSSpec destSpec)"},
 	{"HRUtilGetURLFromFSSpec", (PyCFunction)Html_HRUtilGetURLFromFSSpec, 1,
 	 "(FSSpec fsspec, Handle urlHandle) -> None"},
+	{"HRHTMLRenderingLibAvailable", (PyCFunction)Html_HRHTMLRenderingLibAvailable, 1,
+	 "() -> (int _rv)"},
 	{NULL, NULL, 0}
 };
 
diff --git a/Mac/Modules/htmlrender/htmlscan.py b/Mac/Modules/htmlrender/htmlscan.py
index ae31c37..db62858 100644
--- a/Mac/Modules/htmlrender/htmlscan.py
+++ b/Mac/Modules/htmlrender/htmlscan.py
@@ -14,7 +14,7 @@ OBJECT = "HRReference"
 
 def main():
 ##	input = LONG + ".h"
-	input = "Macintosh HD:SWdev:Jack:Universal:Interfaces:CIncludes:HTMLRendering.h"
+	input = "Macintosh HD:ufs:jack:SWdev:Universal:Interfaces:CIncludes:HTMLRendering.h"
 	output = SHORT + "gen.py"
 	defsoutput = TOOLBOXDIR + LONG + ".py"
 	scanner = MyScanner(input, output, defsoutput)
@@ -38,6 +38,7 @@ class MyScanner(Scanner):
 
 	def makeblacklistnames(self):
 		return [
+			"HRDisposeReference",
 			]
 
 	def makeblacklisttypes(self):
diff --git a/Mac/Modules/htmlrender/htmlsupport.py b/Mac/Modules/htmlrender/htmlsupport.py
index d4547ca..b8c7eec 100644
--- a/Mac/Modules/htmlrender/htmlsupport.py
+++ b/Mac/Modules/htmlrender/htmlsupport.py
@@ -143,8 +143,8 @@ class MyObjectDefinition(GlobalObjectDefinition):
 ##		Output("if (v == Py_None) { *p_itself = NULL; return 1; }")
 ##		Output("if (PyInt_Check(v)) { *p_itself = (DialogPtr)PyInt_AsLong(v);")
 ##		Output("                      return 1; }")
-##	def outputFreeIt(self, itselfname):
-##		Output("DisposeDialog(%s);", itselfname)
+	def outputFreeIt(self, itselfname):
+		Output("HRDisposeReference(%s);", itselfname)
 
 # Create the generator groups and link them
 module = MacModule('HtmlRender', 'Html', includestuff, finalstuff, initstuff)
@@ -160,6 +160,9 @@ functions = []
 methods = []
 execfile("htmlgen.py")
 
+f = Function(int, 'HRHTMLRenderingLibAvailable')
+functions.append(f)
+
 # add the populated lists to the generator groups
 for f in functions: module.add(f)
 for f in methods: object.add(f)