Index: install.c
===================================================================
--- install.c	(revision 69004)
+++ install.c	(working copy)
@@ -293,13 +293,90 @@
     typedef result (*__PROC__##name) args;\
     result (*name)args = (__PROC__##name)GetProcAddress(dll, #name)
 
+// A version that allows the function pointer variable to be named differently
+// than the function itself.
+#define DECLPROCEX(dll, result, var_name, export_name, args)\
+    typedef result (*__PROC__##var_name) args;\
+    result (*var_name)args = (__PROC__##var_name)GetProcAddress(dll, #export_name)
 
 #define DECLVAR(dll, type, name)\
     type *name = (type*)GetProcAddress(dll, #name)
 
 typedef void PyObject;
 
+// Convert a "char *" string to "whcar_t *", or NULL on error.
+// Result string must be free'd
+wchar_t *widen_string(char *src)
+{
+	wchar_t *result;
+	DWORD dest_cch;
+	int src_len = strlen(src) + 1; // include NULL term in all ops
+	/* use MultiByteToWideChar() to see how much we need. */
+	/* NOTE: this will include the null-term in the length */
+	dest_cch = MultiByteToWideChar(CP_ACP, 0, src, src_len, NULL, 0);
+	// alloc the buffer
+	result = (wchar_t *)malloc(dest_cch * sizeof(wchar_t));
+	if (result==NULL)
+		return NULL;
+	/* do the conversion */
+	if (0==MultiByteToWideChar(CP_ACP, 0, src, src_len, result, dest_cch)) {
+		free(result);
+		return NULL;
+	}
+	return result;
+}
 
+// Call PySys_SetArgv appropriately for either py2k or py3k
+static int setargv(HINSTANCE hPython, int argc, char **argv)
+{
+	if (py_major < 3) {
+		DECLPROCEX(hPython, int, Py2Sys_SetArgv, PySys_SetArgv, (int, char **));
+		if (!Py2Sys_SetArgv)
+			return 1;
+		Py2Sys_SetArgv(argc, argv);
+	} else {
+		// py3k version - widen the strings.
+		int i;
+		DECLPROCEX(hPython, int, Py3Sys_SetArgv, PySys_SetArgv, (int, wchar_t **));
+		static wchar_t *wargv[256];
+		if (!Py3Sys_SetArgv)
+			return 1;
+		memset(wargv, 0, sizeof(wargv));
+		for (i=0;i<argc;i++) {
+			wargv[i] = argv[i] ? widen_string(argv[i]) : NULL;
+		}
+		Py3Sys_SetArgv(argc, wargv);
+		for (i=0;i<argc;i++) {
+			if (wargv[i])
+				free(wargv[i]);
+		}
+	}
+	return 0;
+}
+
+// Call Py_SetProgramName appropriately for either py2k or py3k
+static int setprogramname(HINSTANCE hPython, char *val)
+{
+	if (py_major < 3) {
+		DECLPROCEX(hPython, void, Py2_SetProgramName, Py_SetProgramName, (char *));
+		if (!Py2_SetProgramName)
+			return 1;
+		Py2_SetProgramName(val);
+	} else {
+		// py3k version - widen the string.
+		DECLPROCEX(hPython, void, Py3_SetProgramName, Py_SetProgramName, (wchar_t *));
+		wchar_t *new_val;
+		if (!Py3_SetProgramName)
+			return 1;
+		new_val = widen_string(val);
+		if (!new_val)
+			return 1;
+		Py3_SetProgramName(new_val);
+		free(new_val);
+	}
+	return 0;
+}
+
 /*
  * Returns number of files which failed to compile,
  * -1 if python could not be loaded at all
@@ -307,7 +384,6 @@
 static int compile_filelist(HINSTANCE hPython, BOOL optimize_flag)
 {
 	DECLPROC(hPython, void, Py_Initialize, (void));
-	DECLPROC(hPython, void, Py_SetProgramName, (char *));
 	DECLPROC(hPython, void, Py_Finalize, (void));
 	DECLPROC(hPython, int, PyRun_SimpleString, (char *));
 	DECLPROC(hPython, PyObject *, PySys_GetObject, (char *));
@@ -319,14 +395,14 @@
 	if (!p)
 		return 0;
 
-	if (!Py_Initialize || !Py_SetProgramName || !Py_Finalize)
+	if (!Py_Initialize || !Py_Finalize)
 		return -1;
 
 	if (!PyRun_SimpleString || !PySys_GetObject || !Py_OptimizeFlag)
 		return -1;
 
 	*Py_OptimizeFlag = optimize_flag ? 1 : 0;
-	Py_SetProgramName(modulename);
+	setprogramname(hPython, modulename);
 	Py_Initialize();
 
 	errors += do_compile_files(PyRun_SimpleString, optimize_flag);
@@ -697,7 +773,6 @@
 run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv)
 {
 	DECLPROC(hPython, void, Py_Initialize, (void));
-	DECLPROC(hPython, int, PySys_SetArgv, (int, char **));
 	DECLPROC(hPython, int, PyRun_SimpleString, (char *));
 	DECLPROC(hPython, void, Py_Finalize, (void));
 	DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...));
@@ -709,8 +784,7 @@
 	int result = 0;
 	int fh;
 
-	if (!Py_Initialize || !PySys_SetArgv
-	    || !PyRun_SimpleString || !Py_Finalize)
+	if (!Py_Initialize || !PyRun_SimpleString || !Py_Finalize)
 		return 1;
 	
 	if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format)
@@ -734,7 +808,7 @@
 	Py_Initialize();
 
 	prepare_script_environment(hPython);
-	PySys_SetArgv(argc, argv);
+	setargv(hPython, argc, argv);
 	result = 3;
 	{
 		struct _stat statbuf;
@@ -759,16 +833,15 @@
 {
 	int rc;
 	DECLPROC(hPython, void, Py_Initialize, (void));
-	DECLPROC(hPython, void, Py_SetProgramName, (char *));
 	DECLPROC(hPython, void, Py_Finalize, (void));
 	DECLPROC(hPython, int, PyRun_SimpleString, (char *));
 	DECLPROC(hPython, void, PyErr_Print, (void));
 
-	if (!Py_Initialize || !Py_SetProgramName || !Py_Finalize || 
+	if (!Py_Initialize || !Py_Finalize || 
 	    !PyRun_SimpleString || !PyErr_Print)
 		return -1;
 
-	Py_SetProgramName(modulename);
+	setprogramname(hPython, modulename);
 	Py_Initialize();
 	prepare_script_environment(hPython);
 	rc = PyRun_SimpleString(script);