Fix imports.

4 files changed, 11 insertions, 14 deletions

diff --git a/source4/lib/wmi/tools/wmis.c b/source4/lib/wmi/tools/wmis.c
index 8c2ba72a0c..72ca4ebdfe 100644
--- a/source4/lib/wmi/tools/wmis.c
+++ b/source4/lib/wmi/tools/wmis.c
@@ -35,11 +35,7 @@
 #include "librpc/gen_ndr/com_wmi.h"
 #include "librpc/ndr/ndr_table.h"
 
-struct WBEMCLASS;
-struct WBEMOBJECT;
-enum CIMTYPE_ENUMERATION;
-
-#include "wmi/proto.h"
+#include "lib/wmi/wmi.h"
 
 struct program_args {
     char *hostname;
@@ -212,7 +208,8 @@ int main(int argc, char **argv)
 	printf("2: ReturnCode: %d\n", cnt);
 
 	printf("3: Monitoring directory C:\\wmi_test_dir_tmp. Please create/delete files in that directory to see notifications, after 4 events program quits.\n");
-        result = IWbemServices_ExecNotificationQuery(pWS, ctx, "WQL", "SELECT * FROM __InstanceOperationEvent WITHIN 1 WHERE Targetinstance ISA 'CIM_DirectoryContainsFile' and TargetInstance.GroupComponent= 'Win32_Directory.Name=\"C:\\\\\\\\wmi_test_dir_tmp\"'", WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, NULL, &pEnum);
+        result = IWbemServices_ExecNotificationQuery(pWS, ctx, "WQL", 
+		"SELECT * FROM __InstanceOperationEvent WITHIN 1 WHERE Targetinstance ISA 'CIM_DirectoryContainsFile' and TargetInstance.GroupComponent= 'Win32_Directory.Name=\"C:\\\\\\\\wmi_test_dir_tmp\"'", WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, NULL, &pEnum);
         WERR_CHECK("WMI query execute.");
 	for (cnt = 0; cnt < 4; ++cnt) {
 		struct WbemClassObject *co;
diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/source4/pidl/lib/Parse/Pidl/ODL.pm
index 951f7c8725..95c4ee1672 100644
--- a/source4/pidl/lib/Parse/Pidl/ODL.pm
+++ b/source4/pidl/lib/Parse/Pidl/ODL.pm
@@ -62,7 +62,7 @@ sub ODL2IDL
 					require Parse::Pidl::Typelist;
 
 					Parse::Pidl::Typelist::LoadIdl($podl);
-					my $pidl = ODL2IDL($podl);
+					my $pidl = ODL2IDL($podl, $basedir, $opt_incdirs);
 
 					foreach my $y (@$pidl) {
 						if ($y->{TYPE} eq "INTERFACE") {
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 2e77ff01b8..611f0adb92 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -334,10 +334,10 @@ sub HeaderFunction($)
 sub HeaderImport
 {
 	my @imports = @_;
-	foreach (@imports) {
-		s/\.idl\"$//;
-		s/^\"//;
-		pidl choose_header("librpc/gen_ndr/$_\.h", "gen_ndr/$_.h") . "\n";
+	foreach my $import (@imports) {
+		$import = unmake_str($import);
+		$import =~ s/\.idl$//;
+		pidl choose_header("librpc/gen_ndr/$import\.h", "gen_ndr/$import.h") . "\n";
 	}
 }
 
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 745777d012..7b4234e7d7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -13,7 +13,7 @@ require Exporter;
 
 use strict;
 use Parse::Pidl::Typelist qw(hasType getType mapTypeName typeHasBody);
-use Parse::Pidl::Util qw(has_property ParseExpr ParseExprExt print_uuid);
+use Parse::Pidl::Util qw(has_property ParseExpr ParseExprExt print_uuid unmake_str);
 use Parse::Pidl::CUtil qw(get_pointer_to get_value_of get_array_element);
 use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred is_charset_array);
 use Parse::Pidl::Samba4 qw(is_intree choose_header);
@@ -2298,8 +2298,8 @@ sub HeaderImport
 	my $self = shift;
 	my @imports = @_;
 	foreach (@imports) {
-		s/\.idl\"$//;
-		s/^\"//;
+		$_ = unmake_str($_);
+		s/\.idl$//;
 		$self->pidl(choose_header("librpc/gen_ndr/ndr_$_\.h", "gen_ndr/ndr_$_.h"));
 	}
 }