Changeset 1057


Ignore:
Timestamp:
Jun 23, 2018, 1:37:46 AM (3 years ago)
Author:
Alex Taylor
Message:

Fix error deleting Startup folder object

Location:
trunk/guitools/evfsgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/guitools/evfsgui

    • Property svn:ignore set to
      *.bak
      *.BAK
      *.exe
      *.EXE
      *.hlp
      *.HLP
      *.msg
      *.MSG
      *.RES
      __out
  • trunk/guitools/evfsgui/evfsgui.vrp

    r1048 r1057  
    66ClassFile: VRSPLITB.DLL
    77MacroPath: VRM:U:\Develop\Samba\trunk\guitools\evfsgui
    8 EXEPath:
     8EXEPath: G:\an_svn\arcamapper\trunk\arcamap.exe
    99RunParameters:
    1010RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
  • trunk/guitools/evfsgui/evfsgui.vrx

    r1048 r1057  
    310310    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Title","NTLMv1 support")
    311311    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH ,  "Title","Encryption support")
    312    
     312
    313313    /* SMBTree columns */
    314314    WorkgroupFH= VRMethod( "CN_smbtree", "AddField", "String", "Workgroup"  )
     
    14241424
    14251425    app_name_msg = NLVGetMessage( 0 )
    1426     IF app_name_msg == '' | WORD( app_name_msg, 1 ) == '[Missing' THEN 
     1426    IF app_name_msg == '' | WORD( app_name_msg, 1 ) == '[Missing' THEN
    14271427        app_name_msg = 'EVFSGUI EVFSGUI'
    14281428
     
    15781578/*:VRX         CB_client_lanman_auth_Click
    15791579*/
    1580 CB_client_lanman_auth_Click: 
     1580CB_client_lanman_auth_Click:
    15811581    advanced.!smbconfchanged = 1
    15821582return
     
    29472947
    29482948    hlpmin = VRGet("PB_SMBTREE_REFRESH", "Left") + VRGet("PB_SMBTREE_REFRESH","Width") + marginx2
    2949     hlppos = rcnr_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24   
     2949    hlppos = rcnr_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24
    29502950    IF hlppos < hlpmin THEN hlppos = hlpmin
    29512951
     
    32883288*/
    32893289Menu_File_Autostart_Deactivate_Click:
    3290     ok = SysDestroyObject("<'options.!appname_short'_AUTOSTART>")
     3290    ok = SysDestroyObject("<"options.!appname_short"_AUTOSTART>")
    32913291    IF ok == 1 THEN do
    32923292        Text = NLVGetMessage( 79 )
     
    38333833            cd.lastrh = VRMethod("CN_CONDET","AddRecord")
    38343834            PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
    3835    
     3835
    38363836            p_mpoint = strip(p_mpoint,'T','\')||'\'
    38373837            p_rw     = word(resource, words(resource))
    3838    
     3838
    38393839            /* Workaround for truncated resource string */
    38403840            if length(p_rw) > 1 then do
     
    38473847            /* this should be done unconditionally if the resource string is never truncated */
    38483848            else resource  = left(resource,length(resource)-length(p_rw))
    3849    
     3849
    38503850            call ParseResParmString
    3851    
     3851
    38523852            if p_master   = "" then p_master   = "WORKGROUP"
    38533853            if p_mtype    = "" then p_mtype    = "1"
    38543854            if p_loglevel = "" then p_loglevel = "0"
    38553855            if p_memlen   = "" then p_memlen   = "2"
    3856    
     3856
    38573857            /* Also works around for a truncated resource string! */
    38583858            if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
    3859    
     3859
    38603860            if p_password <> "" & p_spassword = "" then do
    38613861                p_spassword = c2x(p_password)
    38623862                p_password = ""
    38633863            end
    3864    
     3864
    38653865            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgrpFH  , p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
    38663866            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
     
    38693869            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
    38703870            ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
    3871    
     3871
    38723872            hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
    3873    
     3873
    38743874            md5 = rexx_md5(hashstr)
    3875    
     3875
    38763876            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
    3877    
     3877
    38783878            SELECT
    38793879                WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
     
    39023902            userData = "UNKNOWN"
    39033903        end
    3904     end 
     3904    end
    39053905    if left(word(resource,1),5) <> "SMBFS" then do
    39063906    end
     
    39323932    PARSE VAR resource . ';NTLMV1SUPPORT=' p_ntlmv1support ';' .
    39333933    PARSE VAR resource . ';ENCRYPTIONSUPPORT=' p_encryptionsupport ' '
    3934    
     3934
    39353935return
    39363936/*:VRX         PB_ABOUT_CLOSE_Click
     
    48434843    CALL VRSet 'CB_TRAC', 'Set', options.!tracmark
    48444844
    4845     ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
     4845    ok = VRSet("DT_About","Caption", Program' (c) 2007-2018 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
    48464846
    48474847    About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
     
    54795479*/
    54805480SW_SMBCONF_Init:
    5481    
     5481
    54825482    /* Buttons */
    54835483    call NLVSetText "PB_SMBCONF_APPLY",  "Caption", 122
Note: See TracChangeset for help on using the changeset viewer.