ExcelPython .xla add-in

ericremoreynolds · ericremoreynolds · commit af2e0bcbb9ec · 2014-07-18T17:44:43.000+02:00
diff --git a/addin/xlpython.xlam b/addin/xlpython.xlam
diff --git a/addin/xlpython/__init__.py b/addin/xlpython/__init__.py
@@ -0,0 +1,20 @@
+def xlfunc(f = None, **kwargs):
+	def inner(f):
+		if f is None:
+			f = self
+			self = None
+		xlfunc = f.__xlfunc__ = {}
+		xlfunc["name"] = f.__name__
+		xlfunc["doc"] = f.__doc__ if f.__doc__ is not None else "Python function '" + f.__name__ + "' defined in module '" + f.__module__ + "'."
+		xlargs = xlfunc["args"] = []
+		for vname in f.__code__.co_varnames:
+			xlargs.append({
+				"name": vname,
+				"marshal": "value"
+			})
+		return f
+	import inspect
+	if f is not None and len(kwargs) == 0:
+		return inner(f)
+	else:
+		return inner
diff --git a/addin/xlpython/xlpyserver.py b/addin/xlpython/xlpyserver.py
@@ -23,6 +23,23 @@ class XLPythonObject(object):
 	_public_methods_ = []
 	def __init__(self, obj):
 		self.obj = obj
+		
+class XLPythonIterator(object):
+	_public_methods_ = [ "MoveNext", "Current" ]
+	
+	def __init__(self, obj):
+		self.iter = obj.__iter__()
+		self.current = None
+	
+	def MoveNext(self):
+		try:
+			self.current = self.iter.next()
+			return True
+		except StopIteration:
+			return False
+	
+	def Current(self):
+		return ToVariant(self.current)
 
 def FromVariant(var):
 	try:
@@ -34,7 +51,7 @@ def ToVariant(obj):
 	return win32com.server.util.wrap(XLPythonObject(obj))
 
 class XLPython(object):
-	_public_methods_ = [ 'Module', 'Tuple', 'Dict', 'List', 'Obj', 'Str', 'Var', 'Call', 'GetItem', 'SetItem', 'GetAttr', 'SetAttr', 'Eval', 'Exec', 'ShowConsole', 'Reload', 'AddPath' ]
+	_public_methods_ = [ 'Module', 'Tuple', 'Dict', 'List', 'Obj', 'Str', 'Var', 'Call', 'GetItem', 'SetItem', 'GetAttr', 'SetAttr', 'HasAttr', 'Eval', 'Exec', 'ShowConsole', 'Reload', 'AddPath', 'Builtins', 'Len', 'GetIter' ]
 	
 	def ShowConsole(self):
 		import ctypes
@@ -117,6 +134,14 @@ def Call(self, obj, *args):
 		else:
 			return ToVariant(getattr(obj, method)(*pargs, **kwargs))
 			
+	def Len(self, obj):
+		obj = FromVariant(obj)
+		return len(obj)
+		
+	def Builtins(self):
+		import __builtin__
+		return ToVariant(__builtin__)
+			
 	def GetItem(self, obj, key):
 		obj = FromVariant(obj)
 		key = FromVariant(key)
@@ -139,6 +164,15 @@ def SetAttr(self, obj, attr, value):
 		value = FromVariant(value)
 		setattr(obj, attr, value)
 		
+	def HasAttr(self, obj, attr):
+		obj = FromVariant(obj)
+		attr = FromVariant(attr)
+		return hasattr(obj, attr)
+		
+	def GetIter(self, obj):
+		obj = FromVariant(obj)
+		return win32com.server.util.wrap(XLPythonIterator(obj))
+		
 	def Eval(self, expr, *args):
 		globals = None
 		locals = None
diff --git a/addin/xlpython/xlpython.bas b/addin/xlpython/xlpython.bas
@@ -3,18 +3,18 @@ Option Private Module
 Option Explicit
 
 #If win64 Then
-    Const XLPyDLLName As String = "xlpython64-2.0.0.dll"
-    Declare Function XLPyDLLActivate Lib "xlpython64-2.0.0.dll" (ByRef result As Variant, Optional ByVal config As String = "") As Long
-    Declare Function XLPyDLLNDims Lib "xlpython64-2.0.0.dll" (ByRef src As Variant, ByRef dims As Long, ByRef transpose As Boolean, ByRef dest As Variant) As Long
+    Const XLPyDLLName As String = "xlpython64-2.0.1.dll"
+    Declare Function XLPyDLLActivate Lib "xlpython64-2.0.1.dll" (ByRef result As Variant, Optional ByVal config As String = "") As Long
+    Declare Function XLPyDLLNDims Lib "xlpython64-2.0.1.dll" (ByRef src As Variant, ByRef dims As Long, ByRef transpose As Boolean, ByRef dest As Variant) As Long
 #Else
-    Private Const XLPyDLLName As String = "xlpython32-2.0.0.dll"
-    Private Declare Function XLPyDLLActivate Lib "xlpython32-2.0.0.dll" (ByRef result As Variant, Optional ByVal config As String = "") As Long
-    Private Declare Function XLPyDLLNDims Lib "xlpython32-2.0.0.dll" (ByRef src As Variant, ByRef dims As Long, ByRef transpose As Boolean, ByRef dest As Variant) As Long
+    Private Const XLPyDLLName As String = "xlpython32-2.0.1.dll"
+    Private Declare Function XLPyDLLActivate Lib "xlpython32-2.0.1.dll" (ByRef result As Variant, Optional ByVal config As String = "") As Long
+    Private Declare Function XLPyDLLNDims Lib "xlpython32-2.0.1.dll" (ByRef src As Variant, ByRef dims As Long, ByRef transpose As Boolean, ByRef dest As Variant) As Long
 #End If
 Private Declare Function LoadLibrary Lib "kernel32" Alias "LoadLibraryA" (ByVal lpLibFileName As String) As Long
 
 Private Function XLPyFolder() As String
-    XLPyFolder = ThisWorkbook.Path + "\.xlpy"
+    XLPyFolder = ThisWorkbook.Path + "\xlpython"
 End Function
 
 Function XLPyConfig() As String
diff --git a/addin/xlpython/xlpython.cfg b/addin/xlpython/xlpython.cfg
@@ -27,10 +27,10 @@
 #		The value of variable xxx if it has been set, otherwise an empty string - does not raise an error
 
 # The CLSID of the object which will get created
-CLSID = {C2922F29-0F9F-4A12-8E11-294A961423A1}
+CLSID = $(RandomGUID)
 
 # The command line used to launch the COM server
-Command = pythonw.exe -u "$(ConfigDir)\xlpython.py" $(CLSID)
+Command = pythonw.exe -u "$(ConfigDir)\xlpyserver.py" $(CLSID)
 
 # Optionally redirect stdout and stderr
 RedirectOutput = $(ConfigDir)\$(ConfigName).log
diff --git a/xlpython/config.cpp b/xlpython/config.cpp
@@ -324,9 +324,8 @@ void Config::ActivateRPCServer()
 		if(!CreateProcessA(NULL, cmdLine, NULL, NULL, TRUE, 0, envStr.p, workingDir.c_str(), &si, &pi))
 		{
 			formatted_exception e;
-			e << "Could not create Python process.\n\n";
-			if(this->HasValue("RedirectOutput"))
-				e << "Try consulting '" << this->GetValue("RedirectOutput") << "'.\n\n";
+			e << "Could not create Python process.\n";
+			e << "Error message: " << GetLastErrorMessage() << "\n";
 			e << "Command: " << cmdLine << "\nWorking Dir: " << workingDir;
 			throw e;
 		}
@@ -348,9 +347,10 @@ void Config::ActivateRPCServer()
 			if(dwExitCode != STILL_ACTIVE)
 			{
 				formatted_exception e;
-				e << "Python process exited before it was possible to create the interface object.\n\n";
+				e << "Python process exited before it was possible to create the interface object.";
 				if(this->HasValue("RedirectOutput"))
-					e << "Try consulting " << this->GetValue("RedirectOutput") << ".\n\n";
+					e << " Try consulting '" << this->GetValue("RedirectOutput") << "'.";
+				e << "\n";
 				e << "Command: " << cmdLine << "\nWorking Dir: " << workingDir;
 				throw e;
 			}
diff --git a/xlpython/dispatch.cpp b/xlpython/dispatch.cpp
@@ -65,5 +65,15 @@ HRESULT __stdcall CDispatchWrapper::Invoke(DISPID dispIdMember, REFIID riid, LCI
 	VariantInit(&result);
 	HRESULT hRet = pDispatch->Invoke(dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult == NULL ? &result : pVarResult, pExcepInfo, puArgErr);
 	VariantClear(&result);
+
+	//if(FAILED(hr))
+	//{
+	//	BSTR bstrOld = pExcepInfo->bstrDescription;
+	//	std::string 
+
+
+	//	SysFreeString(bstrOld);
+	//}
+
 	return hRet;
 }
diff --git a/xlpython/utils.cpp b/xlpython/utils.cpp
@@ -28,6 +28,49 @@ void ToStdString(const wchar_t* ws, std::string& str)
 	delete narrow;
 }
 
+void ToStdString(BSTR bs, std::string& str)
+{
+	BOOL bUsedDefaultChar;
+	int len = (int) SysStringLen(bs);
+	AutoArrayDeleter<char> narrow(new char[len+1]);
+	WideCharToMultiByte(CP_ACP, 0, bs, len, narrow.p, len+1, "?", &bUsedDefaultChar);
+	narrow.p[len] = 0;
+	str = narrow.p;
+}
+
+void ToBStr(const std::string& str, BSTR& bs)
+{
+	int sz = (int) str.length() + 1;
+	OLECHAR* wide = new OLECHAR[sz];
+	MultiByteToWideChar(CP_ACP, 0, str.c_str(), sz * sizeof(OLECHAR), wide, sz);
+	bs = SysAllocString(wide);
+	delete[] wide;
+}
+
+std::string GetLastErrorMessage()
+{
+	DWORD dwError = GetLastError();
+	char* lpMsgBuf;
+	
+	if(0 == FormatMessageA(
+		FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+		FORMAT_MESSAGE_FROM_SYSTEM |
+		FORMAT_MESSAGE_IGNORE_INSERTS,
+		NULL,
+		dwError,
+		0,
+		(LPSTR) &lpMsgBuf,
+		0,
+		NULL))
+	{
+		return "Could not get error message: FormatMessage failed.";
+	}
+
+	std::string ret = lpMsgBuf;
+	LocalFree(lpMsgBuf);
+	return ret;
+}
+
 const char* GetDLLPath()
 {
 	static bool initialized = false;
diff --git a/xlpython/utils.h b/xlpython/utils.h
@@ -1,6 +1,8 @@
 void ToVariant(const char* str, VARIANT* var);
 void ToVariant(const std::string& str, VARIANT* var);
 void ToStdString(const wchar_t* ws, std::string& str);
+void ToStdString(BSTR bs, std::string& str);
+void ToBstr(const std::string& str, BSTR& bs);
 
 class formatted_exception : public std::exception
 {
@@ -41,6 +43,8 @@ void NewGUID(GUID& guid);
 
 void GetLastWriteTime(const char* path, FILETIME* pFileTime);
 
+std::string GetLastErrorMessage();
+
 static inline std::string strlower(std::string& s)
 {
 	std::transform(s.begin(), s.end(), s.begin(), std::tolower);
diff --git a/xlpython/xlpython.vcxproj b/xlpython/xlpython.vcxproj
@@ -66,25 +66,25 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.0</TargetName>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.1</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.0</TargetName>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.1</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.0</TargetName>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.1</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.0</TargetName>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)-2.0.1</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -100,7 +100,7 @@
       <ModuleDefinitionFile>xlpython.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir).xlpy"</Command>
+      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)addin\xlpython"</Command>
       <Message>Copying dll to bin folder</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -118,7 +118,7 @@
       <ModuleDefinitionFile>xlpython.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir).xlpy"</Command>
+      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)addin\xlpython"</Command>
       <Message>Copying dll to bin folder</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -140,7 +140,7 @@
       <ModuleDefinitionFile>xlpython.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir).xlpy"</Command>
+      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)addin\xlpython"</Command>
       <Message>Copying dll to bin folder</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -162,7 +162,7 @@
       <ModuleDefinitionFile>xlpython.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir).xlpy"</Command>
+      <Command>xcopy /y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)addin\xlpython"</Command>
       <Message>Copying dll to bin folder</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>

Original file line number	Diff line number	Diff line change
`@@ -324,9 +324,8 @@ void Config::ActivateRPCServer()`
`324`	`324`	`if(!CreateProcessA(NULL, cmdLine, NULL, NULL, TRUE, 0, envStr.p, workingDir.c_str(), &si, &pi))`
`325`	`325`	`{`
`326`	`326`	`formatted_exception e;`
`327`		`- e << "Could not create Python process.\n\n";`
`328`		`- if(this->HasValue("RedirectOutput"))`
`329`		`- e << "Try consulting '" << this->GetValue("RedirectOutput") << "'.\n\n";`
	`327`	`+ e << "Could not create Python process.\n";`
	`328`	`+ e << "Error message: " << GetLastErrorMessage() << "\n";`
`330`	`329`	`e << "Command: " << cmdLine << "\nWorking Dir: " << workingDir;`
`331`	`330`	`throw e;`
`332`	`331`	`}`
`@@ -348,9 +347,10 @@ void Config::ActivateRPCServer()`
`348`	`347`	`if(dwExitCode != STILL_ACTIVE)`
`349`	`348`	`{`
`350`	`349`	`formatted_exception e;`
`351`		`- e << "Python process exited before it was possible to create the interface object.\n\n";`
	`350`	`+ e << "Python process exited before it was possible to create the interface object.";`
`352`	`351`	`if(this->HasValue("RedirectOutput"))`
`353`		`- e << "Try consulting " << this->GetValue("RedirectOutput") << ".\n\n";`
	`352`	`+ e << " Try consulting '" << this->GetValue("RedirectOutput") << "'.";`
	`353`	`+ e << "\n";`
`354`	`354`	`e << "Command: " << cmdLine << "\nWorking Dir: " << workingDir;`
`355`	`355`	`throw e;`
`356`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`void ToVariant(const char* str, VARIANT* var);`
`2`	`2`	`void ToVariant(const std::string& str, VARIANT* var);`
`3`	`3`	`void ToStdString(const wchar_t* ws, std::string& str);`
	`4`	`+void ToStdString(BSTR bs, std::string& str);`
	`5`	`+void ToBstr(const std::string& str, BSTR& bs);`
`4`	`6`
`5`	`7`	`class formatted_exception : public std::exception`
`6`	`8`	`{`
`@@ -41,6 +43,8 @@ void NewGUID(GUID& guid);`
`41`	`43`
`42`	`44`	`void GetLastWriteTime(const char* path, FILETIME* pFileTime);`
`43`	`45`
	`46`	`+std::string GetLastErrorMessage();`
	`47`	`+`
`44`	`48`	`static inline std::string strlower(std::string& s)`
`45`	`49`	`{`
`46`	`50`	`std::transform(s.begin(), s.end(), s.begin(), std::tolower);`