Final commit before merge, fixing the issue with loading plugins also.

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@472 3f818213-9676-44b0-a9b4-5e4c4e03d09d

branches/script-component/Projects/SAMufasaGUI/project1.lpi

@@ -10,7 +10,7 @@
       <TargetFileExt Value=""/>
       <Title Value="Simba"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="10"/>
+      <ActiveEditorIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -139,10 +139,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="TestUnit"/>
-        <ComponentState Value="1"/>
-        <CursorPos X="10" Y="1718"/>
-        <TopLine Value="1702"/>
-        <EditorIndex Value="9"/>
+        <CursorPos X="1" Y="557"/>
+        <TopLine Value="540"/>
+        <EditorIndex Value="10"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit13>
@@ -267,8 +266,8 @@
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="mmlpsthread"/>
-        <CursorPos X="47" Y="337"/>
-        <TopLine Value="321"/>
+        <CursorPos X="1" Y="465"/>
+        <TopLine Value="492"/>
         <EditorIndex Value="6"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
@@ -351,7 +350,7 @@
         <UnitName Value="bitmaps"/>
         <CursorPos X="12" Y="93"/>
         <TopLine Value="83"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="13"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit42>
@@ -498,7 +497,7 @@
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
         <CursorPos X="23" Y="107"/>
         <TopLine Value="7"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="11"/>
         <UsageCount Value="45"/>
         <Loaded Value="True"/>
       </Unit64>
@@ -539,8 +538,10 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="plugins"/>
         <CursorPos X="34" Y="70"/>
-        <TopLine Value="49"/>
+        <TopLine Value="71"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="200"/>
+        <Loaded Value="True"/>
       </Unit70>
       <Unit71>
         <Filename Value="../../Units/MMLAddon/PSInc/psdefines.inc"/>
@@ -627,7 +628,7 @@
         <UnitName Value="windowselector"/>
         <CursorPos X="37" Y="34"/>
         <TopLine Value="176"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="9"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
       </Unit82>
@@ -893,7 +894,7 @@
         <UnitName Value="framescript"/>
         <CursorPos X="23" Y="72"/>
         <TopLine Value="223"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="8"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit120>
@@ -1594,7 +1595,7 @@
         <UnitName Value="framefunctionlist"/>
         <CursorPos X="26" Y="295"/>
         <TopLine Value="7"/>
-        <UsageCount Value="188"/>
+        <UsageCount Value="189"/>
       </Unit223>
       <Unit224>
         <Filename Value="../../../usr/local/share/lazarus/lcl/comctrls.pp"/>
@@ -1649,7 +1650,7 @@
         <UnitName Value="simpleanalyzer"/>
         <CursorPos X="52" Y="104"/>
         <TopLine Value="193"/>
-        <UsageCount Value="175"/>
+        <UsageCount Value="176"/>
       </Unit231>
       <Unit232>
         <Filename Value="../../Units/Misc/mPasLex.pas"/>
@@ -1726,7 +1727,7 @@
         <UnitName Value="updater"/>
         <CursorPos X="38" Y="211"/>
         <TopLine Value="65"/>
-        <UsageCount Value="148"/>
+        <UsageCount Value="149"/>
       </Unit242>
       <Unit243>
         <Filename Value="updateform.pas"/>
@@ -1737,7 +1738,7 @@
         <ComponentState Value="1"/>
         <CursorPos X="111" Y="102"/>
         <TopLine Value="207"/>
-        <UsageCount Value="143"/>
+        <UsageCount Value="144"/>
       </Unit243>
       <Unit244>
         <Filename Value="../../../Documents/lazarus/lcl/fileutil.pas"/>
@@ -1858,7 +1859,7 @@
         <UnitName Value="simbasettings"/>
         <CursorPos X="26" Y="9"/>
         <TopLine Value="11"/>
-        <UsageCount Value="106"/>
+        <UsageCount Value="107"/>
       </Unit261>
       <Unit262>
         <Filename Value="../../Units/MMLAddon/settings.pas"/>
@@ -1896,7 +1897,7 @@
         <UnitName Value="reportbug"/>
         <CursorPos X="53" Y="23"/>
         <TopLine Value="21"/>
-        <UsageCount Value="89"/>
+        <UsageCount Value="90"/>
       </Unit266>
       <Unit267>
         <Filename Value="../../Units/Synapse/synsock.pas"/>
@@ -1953,7 +1954,7 @@
         <UnitName Value="newinternets"/>
         <CursorPos X="37" Y="171"/>
         <TopLine Value="153"/>
-        <UsageCount Value="85"/>
+        <UsageCount Value="86"/>
       </Unit274>
       <Unit275>
         <Filename Value="reportbug.lrs"/>
@@ -1999,8 +2000,8 @@
       <Unit281>
         <Filename Value="../../Units/MMLCore/iomanager.pas"/>
         <UnitName Value="IOManager"/>
-        <CursorPos X="15" Y="600"/>
-        <TopLine Value="379"/>
+        <CursorPos X="24" Y="617"/>
+        <TopLine Value="605"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="34"/>
         <Loaded Value="True"/>
@@ -2026,7 +2027,7 @@
         <UnitName Value="os_windows"/>
         <CursorPos X="9" Y="75"/>
         <TopLine Value="67"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="14"/>
         <UsageCount Value="29"/>
         <Loaded Value="True"/>
       </Unit284>
@@ -2048,9 +2049,11 @@
         <Filename Value="../../Units/MMLCore/libloader.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="libloader"/>
-        <CursorPos X="1" Y="149"/>
-        <TopLine Value="128"/>
-        <UsageCount Value="43"/>
+        <CursorPos X="11" Y="141"/>
+        <TopLine Value="116"/>
+        <EditorIndex Value="12"/>
+        <UsageCount Value="44"/>
+        <Loaded Value="True"/>
       </Unit287>
       <Unit288>
         <Filename Value="../../Units/MMLAddon/tpa.pas"/>
@@ -2061,8 +2064,8 @@
       </Unit288>
       <Unit289>
         <Filename Value="../../Units/PascalScript/x86.inc"/>
-        <CursorPos X="8" Y="157"/>
-        <TopLine Value="140"/>
+        <CursorPos X="1" Y="162"/>
+        <TopLine Value="145"/>
         <EditorIndex Value="4"/>
         <UsageCount Value="19"/>
         <Loaded Value="True"/>
@@ -2090,124 +2093,124 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="118" Column="15" TopLine="101"/>
+        <Filename Value="framescript.pas"/>
+        <Caret Line="73" Column="41" TopLine="54"/>
       </Position1>
       <Position2>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="129" Column="63" TopLine="101"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="1550" Column="3" TopLine="1548"/>
       </Position2>
       <Position3>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="369" Column="14" TopLine="352"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="541" Column="21" TopLine="518"/>
       </Position3>
       <Position4>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="99" Column="70" TopLine="67"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="536" Column="30" TopLine="519"/>
       </Position4>
       <Position5>
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="261" Column="8" TopLine="246"/>
+        <Caret Line="97" Column="54" TopLine="73"/>
       </Position5>
       <Position6>
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="308" Column="4" TopLine="292"/>
+        <Caret Line="240" Column="69" TopLine="223"/>
       </Position6>
       <Position7>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="310" Column="16" TopLine="297"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="550" Column="46" TopLine="532"/>
       </Position7>
       <Position8>
-        <Filename Value="../../Units/MMLAddon/PSInc/psexportedmethods.inc"/>
-        <Caret Line="59" Column="40" TopLine="36"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="636" Column="33" TopLine="613"/>
       </Position8>
       <Position9>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="127" Column="19" TopLine="101"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="1439" Column="24" TopLine="1422"/>
       </Position9>
       <Position10>
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="59" Column="22" TopLine="42"/>
+        <Caret Line="46" Column="30" TopLine="32"/>
       </Position10>
       <Position11>
-        <Filename Value="../../Units/MMLAddon/PSInc/psexportedmethods.inc"/>
-        <Caret Line="24" Column="28" TopLine="7"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="1718" Column="79" TopLine="1699"/>
       </Position11>
       <Position12>
-        <Filename Value="../../Units/MMLAddon/PSInc/psexportedmethods.inc"/>
-        <Caret Line="30" Column="24" TopLine="13"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="1711" Column="38" TopLine="1696"/>
       </Position12>
       <Position13>
-        <Filename Value="../../Units/MMLAddon/PSInc/psexportedmethods.inc"/>
-        <Caret Line="24" Column="3" TopLine="7"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="38" Column="31" TopLine="17"/>
       </Position13>
       <Position14>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="387" Column="6" TopLine="374"/>
+        <Filename Value="../../Units/MMLCore/iomanager.pas"/>
+        <Caret Line="600" Column="15" TopLine="564"/>
       </Position14>
       <Position15>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="644" Column="12" TopLine="622"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="1718" Column="10" TopLine="1702"/>
       </Position15>
       <Position16>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="133" Column="36" TopLine="113"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="45" Column="1" TopLine="28"/>
       </Position16>
       <Position17>
-        <Filename Value="framescript.pas"/>
-        <Caret Line="101" Column="1" TopLine="98"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="46" Column="1" TopLine="29"/>
       </Position17>
       <Position18>
-        <Filename Value="framescript.pas"/>
-        <Caret Line="73" Column="41" TopLine="54"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="48" Column="1" TopLine="31"/>
       </Position18>
       <Position19>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="1550" Column="3" TopLine="1548"/>
+        <Filename Value="../../Units/MMLCore/iomanager.pas"/>
+        <Caret Line="254" Column="1" TopLine="237"/>
       </Position19>
       <Position20>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="541" Column="21" TopLine="518"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="45" Column="1" TopLine="28"/>
       </Position20>
       <Position21>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="536" Column="30" TopLine="519"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="46" Column="1" TopLine="29"/>
       </Position21>
       <Position22>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="97" Column="54" TopLine="73"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="48" Column="1" TopLine="31"/>
       </Position22>
       <Position23>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="240" Column="69" TopLine="223"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="557" Column="1" TopLine="540"/>
       </Position23>
       <Position24>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="550" Column="46" TopLine="532"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
+        <Caret Line="462" Column="32" TopLine="445"/>
       </Position24>
       <Position25>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="636" Column="33" TopLine="613"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="45" Column="1" TopLine="28"/>
       </Position25>
       <Position26>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="1439" Column="24" TopLine="1422"/>
+        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
+        <Caret Line="461" Column="69" TopLine="455"/>
       </Position26>
       <Position27>
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="46" Column="30" TopLine="32"/>
+        <Caret Line="464" Column="1" TopLine="447"/>
       </Position27>
       <Position28>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="1704" Column="37" TopLine="1791"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="134" Column="45" TopLine="116"/>
       </Position28>
       <Position29>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="1718" Column="79" TopLine="1699"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="133" Column="83" TopLine="116"/>
       </Position29>
       <Position30>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="1711" Column="38" TopLine="1696"/>
+        <Filename Value="../../Units/MMLCore/libloader.pas"/>
+        <Caret Line="141" Column="11" TopLine="116"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
@@ -2236,12 +2239,6 @@
     </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Source Value="../../Units/MMLCore/libloader.pas"/>
-        <Line Value="60"/>
-      </Item1>
-    </BreakPoints>
     <Exceptions Count="3">
       <Item1>
         <Name Value="EAbort"/>

branches/script-component/Projects/SAMufasaGUI/testunit.pas

@@ -553,7 +553,7 @@ begin
       ScriptPath := ExtractFileDir(ScriptFile);
 
     if DirectoryExists(PluginsPath) then
-       PluginsGlob.AddAndLoadPath(PluginsPath);
+       PluginsGlob.AddPath(PluginsPath);
     if not DirectoryExists(IncludePath) then
       if FirstRun then
         Writeln('Warning: The include directory specified in the Settings isn''t valid.');

branches/script-component/Units/MMLCore/iomanager.pas

@@ -250,7 +250,7 @@ implementation
 constructor TIOManager_Abstract.Create(plugin_dir: string);
 begin
   inherited Create;
-  eios_controller.AddAndLoadPath(plugin_dir);
+  eios_controller.AddPath(plugin_dir);
   keymouse:= nil;
   image:= nil;
   frozen:= nil;
@@ -614,12 +614,7 @@ function TEIOS_Controller.FindClient(name: string): integer;
 var
   i: integer;
 begin
-  for i:= 0 to length(plugs) - 1 do
-    if plugs[i].name = name then
-    begin
-      result:= i;
-      exit;
-    end;
+  i:= LoadPlugin(name);
   result:= -1;
 end;
 

branches/script-component/Units/MMLCore/libloader.pas

@@ -26,7 +26,7 @@ interface
         constructor Create;
         destructor Destroy; override;
         procedure ValidateDirs;
-        procedure AddAndLoadPath(path: string);
+        procedure AddPath(path: string);
         function LoadPlugin(PluginName : string) : integer;
     end;
 
@@ -35,16 +35,15 @@ implementation
   uses
     MufasaTypes,FileUtil;
 
-  procedure TGenericLoader.AddAndLoadPath(path: string);
+  procedure TGenericLoader.AddPath(path: string);
   var
     idx: integer;
   begin
     if PluginDirs.Find(path,idx) then
        LoadPluginsDir(idx)
     else begin
-         writeln('Loading Path: ' + path);
+      writeln('Adding Plugin Path: ' + path);
       PluginDirs.Add(path);
-      LoadPluginsDir(PluginDirs.Count-1);
     end;
   end;
 
@@ -139,7 +138,7 @@ implementation
       inc(PluginLen)
     else
       FreeLibrary(Loaded[PluginLen].handle);
-    Result := PluginLen;
+    Result:= PluginLen - 1;
   end;