wrapping works

Author: Laeeth Isharc

genericwithwrap.d

@@ -83,7 +83,7 @@ import core.stdc.wctype:towlower;
 import std.format;
 import xlld.wrap;
 
- num GWLP_WNDPROC=-4;
+enum GWLP_WNDPROC=-4;
 enum MAXWORD = 0xFFFF;
 debug=0;
 extern(Windows)
@@ -153,7 +153,7 @@ wchar[20] g_szBuffer = ""w;
    g_rgWorksheetFuncsRows define the number of rows in the table. The
    g_rgWorksheetFuncsCols represents the number of columns in the table.
 */
-enum g_rgWorksheetFuncsRows =3;
+enum g_rgWorksheetFuncsRows =4;
 enum g_rgWorksheetFuncsCols =10;
 
 __gshared wstring[g_rgWorksheetFuncsCols][g_rgWorksheetFuncsRows] g_rgWorksheetFuncs =
@@ -181,10 +181,10 @@ __gshared wstring[g_rgWorksheetFuncsCols][g_rgWorksheetFuncsRows] g_rgWorksheetF
 		"Adds the arguments"w,   
 		"Number1,number2,... are 1 to 29 arguments for which you want to sum."w                   
 	],
-	[ "WrapSquare"w,
-		"UUUUUUUUUUUUUUUUUUUUUUUUUUUUUU"w, // up to 255 args in Excel 2007 and later,
+	[ "WrapSquare3"w,
+		"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ"w, // up to 255 args in Excel 2007 and later,
 										   // upto 29 args in Excel 2003 and earlier versions
-		"WrapSquare"w,
+		"WrapSquare3"w,
 		"number1,number2,..."w,
 		"1"w,
 		"Generic Add-In"w,
@@ -461,7 +461,8 @@ extern(Windows) BOOL /*APIENTRY*/ DllMain( HANDLE hDLL, DWORD dwReason, LPVOID l
 extern(Windows) int /*WINAPI*/ xlAutoOpen()
 {
 	import std.conv;
-
+	import core.runtime:rt_init;
+	rt_init();
 	static XLOPER12 xDLL,	   // name of this DLL //
 	xMenu,	 // xltypeMulti containing the menu //
 	xTool,	 // xltypeMulti containing the toolbar //
@@ -687,6 +688,9 @@ extern(Windows) int /*WINAPI*/ xlAutoClose()
 		Excel12f(xlFree, cast(XLOPER12*)0, [cast(LPXLOPER12) &xRes]);
 	}
 
+	import core.runtime:rt_term;
+	rt_term();
+
 	return 1;
 }
 
@@ -1297,7 +1301,7 @@ extern(Windows) LPXLOPER12 /*WINAPI*/ Func1 (LPXLOPER12 x)
    History:  Date       Author        Reason
 */
 
-extern(Windows) LPXLOPER12 FuncSquare(
+extern(Windows) LPXLOPER12 WrapSquare3(
                         LPXLOPER12 px1,LPXLOPER12 px2,LPXLOPER12 px3,LPXLOPER12 px4,
                         LPXLOPER12 px5,LPXLOPER12 px6,LPXLOPER12 px7,LPXLOPER12 px8,
                         LPXLOPER12 px9,LPXLOPER12 px10,LPXLOPER12 px11,LPXLOPER12 px12,
@@ -1307,8 +1311,21 @@ extern(Windows) LPXLOPER12 FuncSquare(
                         LPXLOPER12 px25,LPXLOPER12 px26,LPXLOPER12 px27,LPXLOPER12 px28,
                         LPXLOPER12 px29)
 {
+	import std.algorithm:map,sum;
+	import std.experimental.allocator;
+	import std.conv:to;
 	auto args=px1.fromXLOPER12!(double[]);
-	return args.map(arg=>arg*arg).sum.makeXLOPer12;
+	double[][] retD;
+	retD.length=args.length;
+	foreach(i;0..args.length)
+	{
+		retD[i].length=args.length;
+		foreach(j;0..args.length)
+		{
+			retD[i][j]=args[0..j+1].map!(arg=>arg*arg).sum;
+		}
+	}
+	return makeXLOPER12(retD);
 }
 
 extern(Windows) LPXLOPER12 /*WINAPI*/ FuncSum(

make64wrap.bat

@@ -1,3 +1,3 @@
-rm generic64.xll
+rm generic64e.xll
 dmd -c -gc -m64 -map -ofgeneric64.obj genericwithwrap.d  memorymanager.d memorypool.d xlcall.d xlcallcpp.d framework.d  wrap.d
-dmd -m64 -g -L/OUT:generic64.xll  -L/NOLOGO -L generic64.obj generic64.def xlcall64d.lib
+dmd -m64 -g -L/OUT:generic64e.xll  -L/NOLOGO -L generic64.obj generic64.def xlcall64d.lib