forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more types

This commit is contained in:
Adam D. Ruppe 2023-10-04 09:28:42 -04:00
parent adfd54ac35
commit 660b6f6386
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
com.d
View File

@ -216,7 +216,7 @@ struct ComResult {
static if(is(T : const string)) static if(is(T : const string))
return makeUtf8StringFromWindowsString(result.bstrVal); // FIXME free? return makeUtf8StringFromWindowsString(result.bstrVal); // FIXME free?
throw new Exception("cannot convert variant of type string to requested " ~ T.stringof); throw new Exception("cannot convert variant of type string to requested " ~ T.stringof);
default: default:
return getFromVariant!T(result); return getFromVariant!T(result);
//throw new Exception("can't handle this type " ~ to!string(result.vt)); //throw new Exception("can't handle this type " ~ to!string(result.vt));
@ -556,6 +556,7 @@ struct ComClient(DVersion, ComVersion = IDispatch) {
VARIANT toComVariant(T)(T arg) { VARIANT toComVariant(T)(T arg) {
VARIANT ret; VARIANT ret;
static if(is(T : VARIANT)) { static if(is(T : VARIANT)) {
ret = arg;
} else static if(is(T : ComClient!(Dynamic, IDispatch))) { } else static if(is(T : ComClient!(Dynamic, IDispatch))) {
ret.vt = 9; ret.vt = 9;
ret.pdispVal = arg.innerComObject_; ret.pdispVal = arg.innerComObject_;
@ -564,7 +565,13 @@ VARIANT toComVariant(T)(T arg) {
} else static if(is(T : int)) { } else static if(is(T : int)) {
ret.vt = 3; ret.vt = 3;
ret.intVal = arg; ret.intVal = arg;
} else static if(is(T == string)) { } else static if(is(T : long)) {
ret.vt = 20;
ret.hVal = arg;
} else static if(is(T : double)) {
ret.vt = 5;
ret.dblVal = arg;
} else static if(is(T : const(char)[])) {
ret.vt = 8; ret.vt = 8;
import std.utf; import std.utf;
ret.bstrVal = SysAllocString(toUTFz!(wchar*)(arg)); ret.bstrVal = SysAllocString(toUTFz!(wchar*)(arg));
@ -630,7 +637,8 @@ auto createComObject(T = Dynamic)(GUID classId) {
T obj; T obj;
} }
ComCheck(CoCreateInstance(&classId, null, CLSCTX_ALL, &iid, cast(void**) &obj), "Failed to create object"); ComCheck(CoCreateInstance(&classId, null, CLSCTX_INPROC_SERVER/*|CLSCTX_INPROC_HANDLER*/|CLSCTX_LOCAL_SERVER, &iid, cast(void**) &obj), "Failed to create object");
// FIXME: if this fails we might retry with inproc_handler.
return ComClient!(Dify!T, typeof(obj))(obj); return ComClient!(Dify!T, typeof(obj))(obj);
} }