Changeset 546 for branches

Timestamp:

Feb 6, 2011, 10:54:31 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI: 2.1.x, attempt to fix Ticket #159, fix no plugin version in About box

Location:

branches/guitools-2.0

Files:

• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (2 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -10 +10 @@
 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4794
-VRXWindow: __VREToolsWindow,1,2517,7082,6489,1659
+VRXWindow: __VREToolsWindow,1,2517,7082,6480,1661
 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -3881 +3881 @@
     plugindll. =""
 
+    if NDFSDir = "" then NDFSDir = SysBootDrive()'\ecs\dll'
+
     ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
-    if plugindll.0 = 0 then do
-        ok = SysFileTree(SysBootDrive()'\ecs\dll\ndpsmb.dll', "plugindll.", 'FOS')
-    end
 
     if plugindll.0 > 0 then do
@@ -3903 +3902 @@
             I = I + 1
             line.I = linein(samba.!msg)
-            parse var line.I desc':'vers
-            DummyRH = VRMethod('CN_About', 'AddRecord')
-            ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
-            AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)
+            if pos('has no LAN component-style version string', line.I) > 0 then do
+                DummyRH = VRMethod('CN_About', 'AddRecord')
+                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Error", About.ValFH, "Plugin has no LAN component-style version string")
+                leave
+            end
+            else do
+                parse var line.I desc':'vers
+                DummyRH = VRMethod('CN_About', 'AddRecord')
+                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
+                AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)
+            end
         end
         line.0 = I

branches/guitools-2.0/shared/smbtree.vrs

@@ -311 +311 @@
             if workgroup <> "" then do
                 wgh = _GetMachinehandle(workgroup)
-                if wgh = "" then do /* This machine is in a new workgroup - add it as well */
+                if wgh = "" then do /* This machine appears to be in a new workgroup - add it as well */
                     wgh = VRMethod( "CN_smbtree", "AddRecord",,, workgroup,"#62:PMWP.DLL")
                     ok = VRMethod( "CN_smbtree", "SetFieldData", wgh, WorkGroupFH, workgroup)
@@ -318 +318 @@
                     ok = VRMethod( "CN_smbtree", 'SetRecordAttr', wgh, "UserData", "WORKGROUP|")
                 end
-                if wgh <> "" then ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
+                /* we only do this for machines with empty parent (=workgroup) handle */
+                /* this might not be good enough yet - verifictaion required          */
+                if wgh <> "" & VRMethod('CN_smbtree', 'GetRecordAttr', smbtree.!machine, 'Parent') = "" then do
+                    ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
+                end
             end