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

com.getD: Remove redundant variant logic

This commit is contained in:
Dennis Korpel 2024-07-04 13:03:15 +02:00
parent 292309541a
commit f8f5592132
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
com.d
View File

@ -250,20 +250,7 @@ struct ComResult {
}
T getD(T)() {
switch(result.vt) {
case VARENUM.VT_I4: // int
static if(is(T : const long))
return result.intVal;
throw new Exception("cannot convert variant of type int to requested " ~ T.stringof);
case VARENUM.VT_BSTR:
static if(is(T : const string))
return makeUtf8StringFromWindowsString(result.bstrVal); // FIXME free?
throw new Exception("cannot convert variant of type string to requested " ~ T.stringof);
default:
return getFromVariant!T(result);
//throw new Exception("can't handle this type " ~ to!string(result.vt));
}
return getFromVariant!T(result);
}
}
@ -658,6 +645,9 @@ VARIANT toComVariant(T)(T arg) {
ret = arg._fetchProperty();
} else static if (is(T : ComResult)) {
ret = arg.result;
} else static if(is(T : IDispatch)) {
ret.vt = VARENUM.VT_DISPATCH;
ret.pdispVal = arg;
} else static if(is(T : int)) {
ret.vt = 3;
ret.intVal = arg;