Thanks Subbu,
Changes committed. Thats 3 bug reports this week for the vb6 task.

Ian

Subbu Balakrishnan wrote:

I noticed two issues here:
[1] ActiveX Control references are not catered for i.e "Object={some guid
..." lines in the VB6 project file.
[2] "referenceRegEx" returns incorrect values for "majorver", "minorver" and
"lcid"

I have made the following modifications and they fix the problems mentioned
above:

--->Replace (line 329)
     Regex referenceRegEx = new
Regex(@"Reference\s*=\s*\*\\G{(?<tlbguid>[0-9\-A-Fa-f]*($^\.)*)}\#(?<majorve
r>[0-9\.0-9($^\.)*]*)\#(?<minorver>[0-9]($^\.)*)\#(?<tlbname>.*)\#");
--->With
     Regex referenceRegEx = new
Regex(@"(Object|Reference)\s*=\s*({|\*\\G{)(?<tlbguid>[0-9\-A-Fa-f]*($^\.)*)
}\#(?<majorver>[0-9($^\.)*]*)\.(?<minorver>[0-9]($^\.)*)\#(?<lcid>[0-9]($^\.
)*)(;|\#)(?<tlbname>.*)");

--->Replace (line 355)
     else if (key == "Reference") {
--->With
     else if (key == "Object" || key == "Reference") {

--->Add the line
     tlbName = tlbName.Trim('\0');
--->After the line (386)
     QueryPathOfRegTypeLib(ref guid, majorVer, minorVer, lcid, out
tlbName);
To remove trailing null chars else the File.Exists call that follows returns
false even the file exists.

Regards
Subbu Balakrishnan



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
NAntContrib-Developer mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nantcontrib-developer




--
Ian MacLean, Developer, ActiveState, a division of Sophos
http://www.ActiveState.com




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
NAntContrib-Developer mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nantcontrib-developer

Reply via email to