diff options
| -rw-r--r-- | source4/librpc/idl/wmi.idl | 13 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 1 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/ODL.pm | 1 | ||||
| -rwxr-xr-x | source4/pidl/pidl | 7 |
4 files changed, 14 insertions, 8 deletions
diff --git a/source4/librpc/idl/wmi.idl b/source4/librpc/idl/wmi.idl index 8b3fda3b40..8d2e31b6f0 100644 --- a/source4/librpc/idl/wmi.idl +++ b/source4/librpc/idl/wmi.idl @@ -16,8 +16,11 @@ import "misc.idl"; }; -[local, object, uuid("dc12a681-737f-11cf-884d-00aa004b2e24")] - +[ + local, + object, + uuid("dc12a681-737f-11cf-884d-00aa004b2e24") +] interface IWbemClassObject : IUnknown { @@ -584,7 +587,7 @@ coclass WbemClassObject ); WERROR NextAsync( - [in] uint32 uCount + [in] uint32 uCount, [in] IWbemObjectSink* pSink ); @@ -760,12 +763,12 @@ coclass WbemClassObject { WERROR GetResultObject( [in] long lTimeout, - [out] IUnknown** ppResultObject + [out] IUnknown** ppResultObject, [out] IWbemClassObject** ppResultObject ); WERROR GetResultString( - [in] long lTimeout + [in] long lTimeout, [out] BSTR* pstrResultString ); diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index 5eb5cbc195..9b61a370e2 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -856,6 +856,7 @@ my %property_list = ( "pointer_default" => ["INTERFACE"], "helper" => ["INTERFACE"], "authservice" => ["INTERFACE"], + "restricted" => ["INTERFACE"], # dcom "object" => ["INTERFACE"], diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/source4/pidl/lib/Parse/Pidl/ODL.pm index f6df34afa8..5c2cc8bfbf 100644 --- a/source4/pidl/lib/Parse/Pidl/ODL.pm +++ b/source4/pidl/lib/Parse/Pidl/ODL.pm @@ -110,6 +110,7 @@ sub ODL2IDL LINE => undef }) if ($addedorpc); + return $odl; } diff --git a/source4/pidl/pidl b/source4/pidl/pidl index 0a6b0a97ca..e58442ba1b 100755 --- a/source4/pidl/pidl +++ b/source4/pidl/pidl @@ -612,10 +612,11 @@ sub process_file($) $pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs); defined @$pidl || die "Failed to parse $idl_file"; - require Parse::Pidl::Typelist; - Parse::Pidl::Typelist::LoadIdl($pidl); } - + + require Parse::Pidl::Typelist; + Parse::Pidl::Typelist::LoadIdl($pidl); + if (defined($opt_dump_idl_tree)) { my($pidl_file) = ($opt_dump_idl_tree or "$outputdir/$basename.pidl"); SaveStructure($pidl_file, $pidl) or die "Failed to save $pidl_file\n"; |