Misha Koshelev : oleview: Report default values.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 26 12:19:29 CST 2007
Module: wine
Branch: master
Commit: a5d7c2fb1986b37ebc09041f63c74297c4e8b97a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d7c2fb1986b37ebc09041f63c74297c4e8b97a
Author: Misha Koshelev <mk144210 at bcm.tmc.edu>
Date: Sun Feb 25 01:35:10 2007 -0600
oleview: Report default values.
---
programs/oleview/typelib.c | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c
index c452343..98abc05 100644
--- a/programs/oleview/typelib.c
+++ b/programs/oleview/typelib.c
@@ -87,10 +87,10 @@ static const WCHAR wszPARAMFLAG_FOUT[] = { 'o','u','t','\0' };
static const WCHAR wszPARAMFLAG_FLCID[] = { 'c','i','d','\0' };
static const WCHAR wszPARAMFLAG_FRETVAL[] = { 'r','e','t','v','a','l','\0' };
static const WCHAR wszPARAMFLAG_FOPT[] = { 'o','p','t','\0' };
-static const WCHAR wszPARAMFLAG_FHASDEFAULT[]
- = { 'h','a','s','d','e','f','a','u','l','t','\0' };
static const WCHAR wszPARAMFLAG_FHASCUSTDATA[]
= { 'h','a','s','c','u','s','t','d','a','t','a','\0' };
+static const WCHAR wszDefaultValue[]
+ = { 'd','e','f','a','u','l','t','v','a','l','u','e','\0' };
static const WCHAR wszReadOnly[] = { 'r','e','a','d','o','n','l','y','\0' };
@@ -559,9 +559,32 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent)
ENUM_PARAM_FLAG(PARAMFLAG_FLCID);
ENUM_PARAM_FLAG(PARAMFLAG_FRETVAL);
ENUM_PARAM_FLAG(PARAMFLAG_FOPT);
- ENUM_PARAM_FLAG(PARAMFLAG_FHASDEFAULT);
ENUM_PARAM_FLAG(PARAMFLAG_FHASCUSTDATA);
+ if(U(pFuncDesc->lprgelemdescParam[j]).paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT)
+ {
+ VARIANT var, *param=&U(pFuncDesc->lprgelemdescParam[j]).paramdesc.pparamdescex->varDefaultValue;
+ VariantInit(&var);
+ if(bFirst) AddToTLDataStrW(tld,
+ wszOpenBrackets1);
+ else
+ {
+ AddToTLDataStrW(tld, wszComa);
+ AddToTLDataStrW(tld, wszSpace);
+ }
+ bFirst = FALSE;
+ AddToTLDataStrW(tld, wszDefaultValue);
+ AddToTLDataStrW(tld, wszOpenBrackets2);
+ if (V_VT(param) == VT_BSTR)
+ {
+ AddToTLDataStrW(tld, wszInvertedComa);
+ AddToTLDataStrW(tld, V_BSTR(&var));
+ AddToTLDataStrW(tld, wszInvertedComa);
+ } else if (VariantChangeType(&var, param, 0, VT_BSTR) == S_OK)
+ AddToTLDataStrW(tld, V_BSTR(&var));
+ AddToTLDataStrW(tld, wszCloseBrackets2);
+ }
+
if(!bFirst)
{
AddToTLDataStrW(tld, wszCloseBrackets1);
More information about the wine-cvs
mailing list