Changeset 316

Timestamp:

Aug 18, 2009, 10:30:31 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: More work on EVFSGUI V.next

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/eBall_01.bmp (added)
• evfsgui/eBall_02.bmp (added)
• evfsgui/eBall_03.bmp (added)
• evfsgui/eBall_04.bmp (added)
• evfsgui/eBall_05.bmp (added)
• evfsgui/eBall_06.bmp (added)
• evfsgui/eBall_07.bmp (added)
• evfsgui/eBall_08.bmp (added)
• evfsgui/eBall_09.bmp (added)
• evfsgui/eBall_10.bmp (added)
• evfsgui/eBall_11.bmp (added)
• evfsgui/eBall_12.bmp (added)
• evfsgui/eBall_13.bmp (added)
• evfsgui/eBall_14.bmp (added)
• evfsgui/eBall_15.bmp (added)
• evfsgui/eBall_16.bmp (added)
• evfsgui/eBall_17.bmp (added)
• evfsgui/eBall_18.bmp (added)
• evfsgui/eBall_19.bmp (added)
• evfsgui/eBall_20.bmp (added)
• evfsgui/eBall_21.bmp (added)
• evfsgui/eBall_22.bmp (added)
• evfsgui/eBall_23.bmp (added)
• evfsgui/eBall_24.bmp (added)
• evfsgui/eBall_25.bmp (added)
• evfsgui/evfsgui.RC (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (2 diffs)
• evfsgui/evfsgui.VRX (modified) (17 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• evfsgui/evfsi_de.mkm (modified) (1 diff)
• evfsgui/evfsi_en.mkm (modified) (1 diff)
• evfsgui/evfsi_fr.mkm (modified) (1 diff)
• evfsgui/throb1.bmp (deleted)
• evfsgui/throb2.bmp (deleted)
• evfsgui/throb3.bmp (deleted)
• evfsgui/throb4.bmp (deleted)
• evfsgui/throb5.bmp (deleted)
• evfsgui/throb6.bmp (deleted)
• evfsgui/throb7.bmp (deleted)
• evfsgui/throb8.bmp (deleted)
• shared/cltinit.vrs (modified) (5 diffs)

branches/guitools-2.0/evfsgui/changes ¶

@@ -1 +1 @@
 Version 2 (Next) project:
 Already done:
-- Add browsing code from smbmon
-- Add d'n'd support for file shares
-- Add connection wizard dialogs
-- Add main menu bar
-- Add new advanced settings
-- Add possibility to have the "old" 1.x look and feel (default for now)
-- Add possibility to completely resize the main window (not yet complete)
+- Added: Browsing code from smbmon
+- Added: D'n'd support for file shares
+- Added: Connection wizard dialogs
+- Added: main menu bar
+- Added: New advanced settings
+- Added: "Old" 1.x look and feel (default for now)
+- Added: Main window is resizable
+- Added: Splitbar between panels
+- Added: Create rudimentary %ETC%\samba\smb.conf
+- Fixed: CltInit uses smbclient.exe instead of smbd.exe to find Samba binaries
+- Fixed: Message queue during resize isn't cleared (no flashing during resize)
+- Fixed: Missing NLV aware strings
 ToDo:
 - CltInit requires resync with SambaInit
-- Debug on/off option doesn't work correctly
-- Message queue during resize isn't cleared (flashing display during resize)
+- Connection details page (required for new profile code)
+- Debug on/off option is badly implemented (rework required)
+- Advanced dialog should be split into connection options and global options
 - smbtree error messages are ignored (requires more code from smbmon)
 - Connecting to IPC$ still possible
 - printer share detection is flaky
 - error checking
-- some string not NLV aware
 - rebuild required utilities with libc063 (instead of libc064x)
 

branches/guitools-2.0/evfsgui/evfsgui.RC ¶

@@ -1 +1 @@
 ICON 1  sambaclient.ico
 ICON 2  conf_setup.ico
-BITMAP 11  Throb1.bmp
-BITMAP 12  Throb2.bmp
-BITMAP 13  Throb3.bmp
-BITMAP 14  Throb4.bmp
-BITMAP 15  Throb5.bmp
-BITMAP 16  Throb6.bmp
-BITMAP 17  Throb7.bmp
-BITMAP 18  Throb8.bmp
+BITMAP 11  eBall_01.bmp
+BITMAP 12  eBall_02.bmp
+BITMAP 13  eBall_03.bmp
+BITMAP 14  eBall_04.bmp
+BITMAP 15  eBall_05.bmp
+BITMAP 16  eBall_06.bmp
+BITMAP 17  eBall_07.bmp
+BITMAP 18  eBall_08.bmp
+BITMAP 19  eBall_09.bmp
+BITMAP 20  eBall_10.bmp
+BITMAP 21  eBall_11.bmp
+BITMAP 22  eBall_12.bmp
+BITMAP 23  eBall_13.bmp
+BITMAP 24  eBall_14.bmp
+BITMAP 25  eBall_15.bmp
+BITMAP 26  eBall_16.bmp
+BITMAP 27  eBall_17.bmp
+BITMAP 28  eBall_18.bmp
+BITMAP 29  eBall_19.bmp
+BITMAP 30  eBall_20.bmp
+BITMAP 31  eBall_21.bmp
+BITMAP 32  eBall_22.bmp
+BITMAP 33  eBall_23.bmp
+BITMAP 34  eBall_24.bmp
+BITMAP 35  eBall_25.bmp

branches/guitools-2.0/evfsgui/evfsgui.VRP ¶

@@ -1 +1 @@
 VX-REXX OS/2 V2.14 Build B3
 VRX: evfsgui.VRX
+VXOFile: VRSPLIT
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
@@ -6 +7 @@
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
-VRXWindow: __VRESectionListWindow,1,337,11708,10323,3686
-VRXWindow: __VREToolsWindow,1,518,530,7496,1663
+VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
+VRXWindow: __VREToolsWindow,1,518,530,6993,1669
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_ADVANCED,1

branches/guitools-2.0/evfsgui/evfsgui.VRX ¶

@@ -104 +104 @@
 return
 
+/*:VRX         _CreateSmbConf
+*/
+_CreateSmbConf: 
+    IF options.!debug == 1 THEN SAY time()' '||"_CreateSmbConf started"
+    call lineout samba.!smbconf, '# Samba config file created using EVFSGUI ver. 'word(VRGet("Main","Hinttext"),2)
+    call lineout samba.!smbconf, '# from 'value("USER",,'OS2ENVIRONMENT')'@'value("HOSTNAME",,'OS2ENVIRONMENT')
+    call lineout samba.!smbconf, '# Date: 'date()' 'time()
+    call lineout samba.!smbconf, '[global]'
+    if settings.!network <> '' then do
+        call lineout samba.!smbconf, '09'x||'workgroup = 'settings.!network
+    end
+    else do
+        call lineout samba.!smbconf, '09'x||'workgroup = WORKGROUP'
+    end
+    call lineout samba.!smbconf, '09'x||'log level = 0'
+    ok = stream(samba.!smbconf,'c','close')
+    IF options.!debug == 1 THEN SAY time()' '||"_CreateSmbConf done"
+return
+
 /*:VRX         _GUIInit
 */
@@ -111 +130 @@
     /* Setup SmbTree View */
     ok = VRset("GB_SMBTREE","Painting", 0)
-    FWidth = 48
+    FWidth = 32
 
     call Main_Resize
-
-/*    ok = VRSet("GB_SMBTREE", "Top",     FWidth)
-    ok = VRSet("GB_SMBTREE", "Left",    VRGet("GB_CURRENT","Width") + FWidth + 24)
-    ok = VRset("GB_SMBTREE", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")- 2963-FWidth*2)
-
-    ok = VRset("GB_SMBTREE3","Top",     FWidth)
-    ok = VRset("GB_SMBTREE3","Left",    FWidth)
-    ok = VRset("GB_SMBTREE3","Height",  245  )
-    ok = VRset("GB_SMBTREE3","Width",   VRGet("GB_SMBTREE","Width") -(FWidth*2))
-
-    ok = VRset("DT_SMBTREE", "Top",     8)
-    ok = VRset("DT_SMBTREE", "Left",    8)
-    ok = VRset("DT_SMBTREE", "Width",   VRGet("GB_SMBTREE3","Width") - 24)
-
-    ok = VRset("GB_SMBTREE2","Left",    FWidth)
-    ok = VRset("GB_SMBTREE2","Top",     245 + FWidth*2)
-    ok = VRset("GB_SMBTREE2","Width",   VRGet("GB_SMBTREE","Width")-FWidth*2)
-    ok = VRset("GB_SMBTREE2","Height",  VRGet("GB_SMBTREE","Height")-FWidth*4-400-245)
-
-    ok = VRset("CN_SMBTREE",  "Top",    FWidth)
-    ok = VRset("CN_SMBTREE",  "Left",   FWidth)
-    ok = VRset("CN_SMBTREE",  "Width",  VRGet("GB_SMBTREE2","Width") -(FWidth*2))
-    ok = VRset("CN_SMBTREE",  "Height", VRGet("GB_SMBTREE2","Height")-(FWidth*2))
-
-    ok = VRset("PB_CONNECT", "Left",   FWidth)
-    ok = VRset("PB_CONNECT", "Top",    VRGet("GB_SMBTREE","Height")- 400-FWidth-12)
-    ok = VRset("PB_REFRESH", "Left",   FWidth*2 +1313 - 12)
-    ok = VRset("PB_REFRESH", "Top",    VRGet("GB_SMBTREE","Height")- 400-FWidth-12)
-
-    ok = VRset("PICT_THROBBER", "Top",   VRGet("CN_SMBTREE","Height")%2+200)
-    ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2)
-    ok = VRset("DT_SMBTREE","Width",  VRGet("GB_SMBTREE","Width")-144)
-    ok = VRset("GB_SMBTREE","Painting", 1) */
 return
 
@@ -716 +701 @@
 /*:VRX         LoadSettings
 */
-LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced.
+LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba.
     IF options.!debug == 1 THEN SAY time()' '||'LoadSettings started'
 
@@ -739 +724 @@
         IF settings.!y == '' THEN settings.!y = -1
 
+        settings.!h = VRGetIni('Settings', 'H', settings.!ini, 'NoClose')
+        settings.!w = VRGetIni('Settings', 'W', settings.!ini, 'NoClose')
+        IF settings.!h == '' THEN settings.!h = -1
+        IF settings.!w == '' THEN settings.!w = -1
+
+        settings.!s = VRGetIni('Settings', 'S', settings.!ini, 'NoClose')
+        IF settings.!s == '' THEN settings.!s = -1
+
         /* Herwig B. */
         settings.!curbcolor = VRGetIni('Settings', 'TitleBarBackground', settings.!ini, 'NoClose')
@@ -757 +750 @@
         settings.!network = VRGetIni('Settings', 'Network', settings.!ini, 'NoClose')
         IF settings.!network == '' THEN settings.!network = '' 
-        /* Herwig B. */
+say "Loadsettings" samba.!smbconf
+        if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf        
 
         /* Load font settings.
@@ -773 +767 @@
 
         advanced.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
-        IF advanced.!debug == '' THEN advanced.!debug = 0
+        IF advanced.!debug == '' THEN advanced.!debug = 1 /* change this later */
+
+        /* This is a hack and should be reworked! - using several variables for debug is bad! */
+        options.!debug = advanced.!debug
+        IF options.!debug <> 1 THEN ok = VRRedirectStdIO("OFF")
 
         /* Apply the settings
          */
-        /* Herwig B. */
         ok = VRSet("EF_NETWORK","Value", settings.!network)
         ok = VRSet("DT_CURRENT","BACKCOLOR", settings.!curbcolor )
@@ -788 +785 @@
         ok = VRSet("Menu_View_Buttons","Checked", settings.!buttonson)
         ok = VRset("GB_Buttons","Visible", settings.!buttonson)
-        options.!buttondelta = 500 * settings.!buttonson
+        options.!buttondelta = 440 * settings.!buttonson
 
         ok = VRSet("Menu_View_Dialog","Checked", settings.!dialogon)
@@ -802 +799 @@
         if advanced.!debug == 1 then ok = VRRedirectStdio("ON") 
 
-        /* Herwig B. */
-
-        IF ( settings.!x >= 0 ) & ( settings.!y >= 0 ) THEN DO
-            CALL VRSet VRWindow(), 'Left', settings.!x
-            CALL VRSet VRWindow(), 'Top',  settings.!y
+        IF ( settings.!x >= 0 ) & ( settings.!y >= 0 ) & ( settings.!l >= 0 ) & ( settings.!w >= 0 ) & ( settings.!s >= 0 ) THEN DO
+            CALL VRSet VRWindow(), 'Left',   settings.!x
+            CALL VRSet VRWindow(), 'Top',    settings.!y
+            CALL VRSet VRWindow(), 'Height', settings.!h
+            CALL VRSet VRWindow(), 'Width',  settings.!w
+            CALL VRSet "SPLIT_MAIN", 'Left',  settings.!s
         END
         ELSE 
@@ -885 +883 @@
     if datatype(options.!buttondelta) = 'CHAR' then return
 
+    IF options.!debug == 1 THEN SAY time()' '||"Main_Resize started"
     ok = VRset("Main","Painting", 0)
 
+    /* Button bar */
+    ok = VRSet("GB_BUTTONS",   "Top",    VRGet("GB_CURRENT","Height")+ FWidth * 2)
+    ok = VRSet("GB_BUTTONS",   "Left",   VRGet("Main","Width") -VRGet("GB_Buttons","Width") - FWidth)
+
+    /* Current Panel */
     ok = VRSet("GB_CURRENT","Top",    FWidth)
     ok = VRSet("GB_CURRENT","Left",   FWidth-24)
-    ok = VRSet("GB_CURRENT","Width",  2976-FWidth*2)
-    ok = VRSet("GB_CURRENT","Height", VRGet("Main","Height")-988 - options.!buttondelta)
+    ok = VRSet("GB_CURRENT","Width",  VRGet("SPLIT_Main","Left")-FWidth+24) /* 2976-FWidth*2) */
+    ok = VRSet("GB_CURRENT","Height", VRGet("Main","Height") -920 -FWidth -options.!buttondelta) /* 988 */
 
     ok = VRset("GB_CURRENT3","Top",     FWidth)
@@ -913 +917 @@
     ok = VRset("PB_DETACH",  "Left",   FWidth)
     ok = VRset("PB_DETACH",  "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
-    ok = VRset("PB_UNMOUNT", "Left",   VRGet("GB_CURRENT","WIdth") -1313-FWidth)
+    ok = VRset("PB_DETACH",  "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
+    ok = VRset("PB_UNMOUNT", "Left",   VRGet("GB_CURRENT","Width") -VRGet("PB_DETACH","Width")-FWidth)
     ok = VRset("PB_UNMOUNT", "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
+    ok = VRset("PB_UNMOUNT", "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
 
     /* SMBTree stuff */
     ok = VRSet("GB_SMBTREE", "Top",     FWidth)
-    ok = VRSet("GB_SMBTREE", "Left",    VRGet("GB_CURRENT","Width") + FWidth + 24)
+    ok = VRSet("GB_SMBTREE", "Left",    VRGet("SPLIT_Main","Left")+60)
     ok = VRset("GB_SMBTREE", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")- 2963-FWidth*2)
+    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
 
     ok = VRset("GB_SMBTREE3","Top",     FWidth)
@@ -946 +952 @@
     ok = VRset("PB_REFRESH", "Top",    VRGet("GB_SMBTREE","Height")- 400-FWidth-12)
 
-    ok = VRset("PICT_THROBBER", "Top",   VRGet("CN_SMBTREE","Height")%2+200)
-    ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2)
+    ok = VRset("PICT_THROBBER", "Top",   VRGet("CN_SMBTREE","Height")%2+100)
+    ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2-200)
 
     /* Dialog stuff */
     ok = VRSet("GB_DIALOG", "Top",    FWidth)
-    ok = VRSet("GB_DIALOG", "Left",   VRGet("GB_CURRENT","Width") + FWidth + 24)
+    ok = VRSet("GB_DIALOG", "Left",   VRGet("SPLIT_Main","Left")+60)
     ok = VRset("GB_DIALOG", "Height", VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_DIALOG", "Width",  VRGet("Main","Width")- 2963-FWidth*2)
+    ok = VRset("GB_DIALOG", "Width",  VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
 
     ok = VRset("GB_DIALOG3","Top",     FWidth)
@@ -981 +987 @@
     ok = VRset("GB_MPOINT","Width",  VRGet("GB_DIALOG","Width")-FWidth*2)
 
-    ok = VRSet("GB_BUTTONS",   "Top",    VRGet("Main","Height")-1350)
+    ok = VRset("SPLIT_Main","Top", FWidth)
+    ok = VRset("SPLIT_Main","Height", VRGet("GB_CURRENT","Height"))
+
     ok = VRset("Main","Painting", 1)
+
+    /* check and empty event queue, trash spurious resize events */
+    EventString = ''
+    TrashedResize = 0
+
+    do until EventString = 'nop'
+        EventString = VREvent('N')
+        if EventString <> 'nop' then do
+            if EventString = 'CALL Main_Resize' then TrashedResize = 1
+                                                else interpret eventString
+        end
+    end 
+    if TrashedResize then CALL Main_Resize
+    IF options.!debug == 1 THEN SAY time()' '||"Main_Resize done"
 return
 /*:VRX         Menu_Context_ChangeView_Click
@@ -1089 +1111 @@
         ok = VRSet("GB_Buttons","Visible", 1)
         ok = VRSet("Menu_View_Buttons","Checked",1)
-        options.!buttondelta = 500
+        options.!buttondelta = 440
         settings.!buttonson = 1
     end
-    ok = VRSet("Main","Height", VRGet("GB_CURRENT", "Height") + 1000 + options.!buttondelta)
+    ok = VRSet("Main","Height", VRGet("GB_CURRENT", "Height") +920 +FWidth +options.!buttondelta)
 return
 
@@ -2090 +2112 @@
 SaveSettings: PROCEDURE EXPOSE settings. options. fs. advanced.
     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings started"
-    /* Herwig B. */
+
     settings.!network = VRGet("EF_NETWORK","Value")
     CALL VRSetIni 'Settings', 'Network', settings.!network, settings.!ini, 'NoClose'
-    /* Herwig B. */
 
     font = VRGet('CN_CURRENT', 'Font')
@@ -2118 +2139 @@
     CALL VRSetIni 'Settings', 'BrowseAuth', advanced.!browseauth, settings.!ini, 'NoClose'
     CALL VRSetIni 'Settings', 'BrowseImme', advanced.!browseimme, settings.!ini, 'NoClose'
-    CALL VRSetIni 'Settings', 'Debug'     , advanced.!debuy     , settings.!ini, 'NoClose'
-
-    left = VRGet( VRWindow(), 'Left')
-    top  = VRGet( VRWindow(), 'Top')
-
-    CALL VRSetIni 'Settings', 'X', left, settings.!ini, 'NoClose'
-    CALL VRSetIni 'Settings', 'Y', top,  settings.!ini 
+    CALL VRSetIni 'Settings', 'Debug'     , advanced.!debug     , settings.!ini, 'NoClose'
+
+    /* Save position and size */
+    settings.!l = VRGet("Main",       'Left'  )
+    settings.!t = VRGet("Main",       'Top'   )
+    settings.!h = VRGet("Main",       'Height')
+    settings.!w = VRGet("Main",       'Width' )
+    settings.!s = VRGet("SPLIT_Main", 'Left'  )
+
+    CALL VRSetIni 'Settings', 'X', settings.!l, settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'Y', settings.!t, settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'H', settings.!h, settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'W', settings.!w, settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'S', settings.!s, settings.!ini
+
     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings done"
 RETURN
+
+/*:VRX         SPLIT_Main_Move
+*/
+SPLIT_Main_Move: 
+    ok = VRset("Main", "Painting", 0)
+    NewPos = VRInfo("Left")
+    OldPos = VRGet("SPLIT_Main","Left")
+    ok = VRSet("SPLIT_Main","Left", NewPos)
+    ok = VRset("GB_SMBTREE","Left",NewPos+60)
+    call Main_Resize
+    ok = VRset("Main", "Painting", 1)
+return
 
 /*:VRX         StemsInit
@@ -2193 +2234 @@
     CALL NLVSetText 'SW_ADVANCED',  'Caption', 40
     CALL NLVSetText 'GB_MEM',       'Caption', 41
-    CALL NLVSetText 'DT_SMBSIZE',   'Caption', 42
+    CALL NLVSetText 'CB_DEBUG',     'Caption', 42
     CALL NLVSetText 'GB_MISC',      'Caption', 43
     CALL NLVSetText 'CB_EAS',       'Caption', 44
@@ -2375 +2416 @@
     parse var pIdx '#' pidx
     pidx = pidx + 1
-    if pidx = 19 then pidx = 11
+    if pidx = 36 then pidx = 11
     ok = VRSet("Pict_Throbber","PicturePath","#"pidx)
 return

branches/guitools-2.0/evfsgui/evfsi_de.mkm ¶

@@ -46 +46 @@
 EVG0040I: Erweiterte Verbindungsoptionen
 EVG0041I: Gemeinsamer Speicher pro Verbindung
-EVG0042I: Anzahl von 64 kB Bl”cken:
+EVG0042I: Debug
 EVG0043I: Verbindungsoptionen
 EVG0044I: Erweiterte Attribute untersttzen

branches/guitools-2.0/evfsgui/evfsi_en.mkm ¶

@@ -46 +46 @@
 EVG0040I: Advanced Mount Options
 EVG0041I: Shared memory to allocate per connection
-EVG0042I: No. of 64 kB blocks:
+EVG0042I: Debug
 EVG0043I: Optional connection settings
 EVG0044I: Support extended attributes

branches/guitools-2.0/evfsgui/evfsi_fr.mkm ¶

@@ -49 +49 @@
 EVG0041I: M‚moire partag‚e 
  allouer par connexion
-EVG0042I: Nb de blocs de 64 ko :
+EVG0042I: Debug
 EVG0043I: Divers
 EVG0044I: Support des attributs ‚tendus

branches/guitools-2.0/shared/cltinit.vrs ¶

@@ -40 +40 @@
     say '  Changing into "'directory(samba.!tools)'"'
 
-    /* smbd.exe */
+    /* smbclient.exe */
     samba.!smbclientexe = ""
     if samba.!smbclientexe = "" then do /* in current directory? */
         call charout , "  Are binaries in current directory? "
-        ok = SysFileTree('.\smbd.exe', exist.,'FO')
+        ok = SysFileTree('.\smbclient.exe', exist.,'FO')
         say exist.0' (1 = Yes, 0 = No)'
         if exist.0 = 1 then samba.!smbclientexe = exist.1
@@ -50 +50 @@
     if samba.!smbclientexe = "" then do /* in parent directory? */
         call charout , "  Are binaries in parent directory? "
-        ok = SysFileTree('..\smbd.exe', exist.,'FO')
+        ok = SysFileTree('..\smbclient.exe', exist.,'FO')
         say exist.0' (1 = Yes, 0 = No)'
         if exist.0 = 1 then samba.!smbclientexe = exist.1
@@ -56 +56 @@
     if samba.!smbclientexe = "" then do /* in ..\BIN directory? */
         call charout , "  Are binaries in ..\BIN directory? "
-        ok = SysFileTree('..\bin\smbd.exe', exist.,'FO')
+        ok = SysFileTree('..\bin\smbclient.exe', exist.,'FO')
         say exist.0' (1 = Yes, 0 = No)'
         if exist.0 = 1 then samba.!smbclientexe = exist.1
@@ -62 +62 @@
     if samba.!smbclientexe = "" then do /* in SMB_EXE ? */
         call charout , "  Are binaries in SMB_EXE path? "
-        samba.!smbclientexe = SysSearchPath("SMB_EXE","SMBD.EXE")
+        samba.!smbclientexe = SysSearchPath("SMB_EXE","smbclient.EXE")
         if samba.!smbclientexe = "" then say "No."; else say "Yes."
     end
     if samba.!smbclientexe = "" then do /* in PATH ? */
         call charout , "  Are binaries in PATH? "
-        samba.!smbclientexe = SysSearchPath("PATH","SMBD.EXE")
+        samba.!smbclientexe = SysSearchPath("PATH","smbclient.EXE")
         if samba.!smbclientexe = "" then say "No."; else say "Yes."
     end
 
-    if samba.!smbclientexe = "" then call _ErrorBinaryNotFound " could not find smbd.exe!"
+    if samba.!smbclientexe = "" then call _ErrorBinaryNotFound " could not find smbclient.exe!"
 
     samba.!bin = VRParseFileName(samba.!smbclientexe,'DP')
@@ -99 +99 @@
     samba.!smbspoolexe = samba.!bin'\smbspool.exe'
     if \VRFileExists(samba.!smbspoolexe) then call _ErrorBinaryNotFound " could not find smbspool.exe!"
-    IF options.!debug == 1 THEN say '  smbspool.exe = "'samba.!smbspoolexe'"'
+    IF options.!debug == 1 THEN say '  smbspool.exe   = "'samba.!smbspoolexe'"'
 
     /* smb.conf */