Skip to content

Commit c005832

Browse files
committed
Bug fixes around the IDL generation / listeners and update the OleWoo including additional bug fixes
1 parent 98b91a7 commit c005832

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

Rubberduck.API/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// General Information about an assembly is controlled through the following
77
// set of attributes. Change these attribute values to modify the information
88
// associated with an assembly.
9-
[assembly: AssemblyTitle("RubberduckAPI")]
9+
[assembly: AssemblyTitle("Rubberduck.API")]
1010
[assembly: AssemblyDescription("Rubberduck Reflection API")]
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("Rubberduck-VBA")]
13-
[assembly: AssemblyProduct("RubberduckAPI")]
13+
[assembly: AssemblyProduct("Rubberduck.API")]
1414
[assembly: AssemblyCopyright("Copyright © 2018")]
1515
[assembly: AssemblyCulture("en")]
1616
[assembly: AssemblyTrademark("")]

Rubberduck.API/VBA/Parser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public interface IParser
4444
public interface IParserEvents
4545
{
4646
[DispId(1)]
47-
void OnStateChanged(ParserState ParserState);
47+
void OnStateChanged(ParserState CurrentState);
4848
}
4949

5050
[

Rubberduck.Deployment/IdlGeneration/IdlGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public string GenerateIdl(Assembly assembly)
3434
var converter = new TypeLibConverter();
3535
var sink = new TypeLibExporterNotifySink();
3636
var lib = (ITypeLib) converter.ConvertAssemblyToTypeLib(assembly, assembly.GetName().Name,
37-
TypeLibExporterFlags.ExportAs32Bit, sink);
37+
TypeLibExporterFlags.None, sink);
3838
var formatter = new PlainIDLFormatter();
3939
var owLib = new OWTypeLib(lib);
4040
owLib.Listeners.Add(new IdlListener());
@@ -55,7 +55,7 @@ public object ResolveRef(Assembly assembly)
5555
{
5656
var converter = new TypeLibConverter();
5757
var lib = converter.ConvertAssemblyToTypeLib(assembly, assembly.GetName().Name,
58-
TypeLibExporterFlags.ExportAs32Bit, this);
58+
TypeLibExporterFlags.None, this);
5959
return lib;
6060
}
6161
}

Rubberduck.Deployment/IdlGeneration/IdlListener.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ public override void EnterTypeLib(ITlibNode libNode)
1010
libNode.Data.Name = libNode.Data.Name.Replace("_", string.Empty);
1111
libNode.Data.ShortName = libNode.Data.ShortName.Replace("_", string.Empty);
1212
}
13-
13+
1414
public override void EnterCoClass(ITlibNode coClassNode)
1515
{
1616
if (coClassNode.ShortName.StartsWith("_"))
1717
{
1818
coClassNode.Data.Attributes.Add("hidden");
19+
coClassNode.Data.Attributes.Add("restricted");
1920
}
2021
}
2122

22-
public override void EnterInterface(ITlibNode interfaceNode)
23+
public override void EnterCoClassInterface(ITlibNode coClassInterfaceNode)
2324
{
24-
if (interfaceNode.Parent.Name.StartsWith("_"))
25+
if (coClassInterfaceNode.Parent.ShortName.StartsWith("_") && coClassInterfaceNode.ShortName != "_Object")
2526
{
26-
interfaceNode.Data.Attributes.Remove("default");
27-
interfaceNode.Data.Attributes.Add("restricted");
27+
coClassInterfaceNode.Data.Attributes.Remove("default");
28+
coClassInterfaceNode.Data.Attributes.Add("restricted");
2829
}
2930
}
3031

31-
public override void EnterDispInterface(ITlibNode dispInterfaceNode)
32+
public override void EnterInterface(ITlibNode interfaceNode)
3233
{
33-
if (dispInterfaceNode.Parent.Name.StartsWith("_"))
34+
if (interfaceNode.ShortName.StartsWith("_") || interfaceNode.ShortName == "IDockableWindowHost")
3435
{
35-
dispInterfaceNode.Data.Attributes.Remove("default");
36-
dispInterfaceNode.Data.Attributes.Add("restricted");
36+
interfaceNode.Data.Attributes.Add("restricted");
3737
}
3838
}
3939

1.5 KB
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)