From 2e80f11c5e9bf9da3163231e66d251d6780fd0d4 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Fri, 11 Apr 2008 22:58:26 +0200 Subject: [PATCH] oleview: Fixed incorrect brackets bug. --- programs/oleview/typelib.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 8143906922c..5dbffb092d0 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -545,20 +545,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszCloseBrackets2); memset(wszText, 0, sizeof(wszText)); } - if(SysStringLen(bstrHelpString)) { - if(bFirst) AddToTLDataStrW(tld, wszOpenBrackets1); - else { - AddToTLDataStrW(tld, wszComa); - AddToTLDataStrW(tld, wszSpace); - } - bFirst = FALSE; - AddToTLDataStrW(tld, wszHelpstring); - AddToTLDataStrW(tld, wszOpenBrackets2); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, bstrHelpString); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, wszCloseBrackets2); - } + CreateTypeInfo(wszText, wszAfter, pFuncDesc->elemdescFunc.tdesc, pTypeInfo); switch(pFuncDesc->invkind) { @@ -594,6 +581,22 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen break; default:; } + if(SysStringLen(bstrHelpString)) + { + if(bFirst) AddToTLDataStrW(tld, wszOpenBrackets1); + else + { + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(tld, wszHelpstring); + AddToTLDataStrW(tld, wszOpenBrackets2); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, bstrHelpString); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, wszCloseBrackets2); + } if(!bFirst) { AddToTLDataStrW(tld, wszCloseBrackets1); @@ -1104,11 +1107,11 @@ static void CreateCoclassHeader(ITypeInfo *pTypeInfo, AddToTLDataStrW(pTLData, wszNewLine); AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpstring); - AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszOpenBrackets2); AddToTLDataStrW(pTLData, wszInvertedComa); AddToTLDataStrW(pTLData, bstrHelpString); AddToTLDataStrW(pTLData, wszInvertedComa); - AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszCloseBrackets2); } SysFreeString(bstrHelpString); } -- 2.11.4.GIT