--- mstools/rpc_dos/disk1/rpcsdk.mst	2018/08/09 18:20:36	1.1.1.1
+++ mstools/rpc_dos/disk1/rpcsdk.mst	2018/08/09 18:21:16	1.1.1.2
@@ -69,7 +69,6 @@ Type LAN_DETECT
     fEnhance As Integer
 End Type
 
-
 GLOBAL BasePath$        ''Default destination directory.
 GLOBAL RegPath$		''Default destination directory.
 GLOBAL DosPath$		''Default destination directory.
@@ -86,8 +85,6 @@ Global HelpFiles
 GLOBAL CUIDLL$
 GLOBAL HELPPROC$
 
-DECLARE FUNCTION GetNetConfiguration LIB "mscuistf.dll" (Detect as LAN_DETECT) AS INTEGER
-
 DECLARE Function GetPath(Dialog%, Path$) AS INTEGER
 DECLARE FUNCTION GetTransport() As INTEGER
 DECLARE Sub CopyList(ListIn$, ListOut$, Truncate%)
@@ -106,17 +103,17 @@ DECLARE FUNCTION FormatSize ()AS String
 
 INIT:
     CUIDLL$ = "mscuistf.dll"            ''Custom user interface dll
-    HELPPROC$ = "FHelpDlgProc"          ''Help dialog procedure
+    HELPPROC$ = "FHelpDlgProc"		''Help dialog procedure
 
     SetBitmap CUIDLL$, LOGO
-    SetTitle "Microsft RPC SDK Install"
+    SetTitle "RPC - Software Development Kit Install"
 
     szInf$ = GetSymbolValue("STF_SRCINFPATH")
     if szInf$ = "" THEN
         szInf$ = GetSymbolValue("STF_CWDDIR") + "RPCSDK.INF"
     end if
     ReadInfFile szInf$
-    SetAbout "RPC SDK Install", "By stevez - Version 0.08"
+    SetAbout "RPC SDK Install", "By stevez - Version 0.09"
 
     CustomInstall = FALSE
     AllTransports = TRUE
@@ -136,33 +133,6 @@ INIT:
     HelpFiles = TRUE
 
     Dim Detect As LAN_DETECT
-
-    if GetNetConfiguration(Detect) then
-
-'$ifdef DEBUG
-	mess$ = "Type "+str$(Detect.iType)+" Version: "+str$(Detect.iMajor)+"."+str$(Detect.iMinor)+"."+str$(Detect.iRev)
-	if Detect.fEnhance then
-	    mess$ = mess$ + " Enhanced"
-	end if
-
-	i% = DoMsgBox(mess$, "NetWork Type Detected", MB_OK+MB_TASKMODAL+MB_ICONHAND)
-'$endif
-	if Detect.iType = LanType_LANMAN then
-	    if Detect.iMajor < 2 or Detect.iMinor < 10 then
-		i% = DoMsgBox("You need at least Lanman 2.10 to use RPC", "Lanman Version", MB_OK+MB_TASKMODAL+MB_ICONHAND)
-	    else
-		fLanmanPresent = TRUE
-	    end if
-	end if
-    else
-	i% = DoMsgBox("Setup didn't detect a supported network on this machine.  RPC may not function correctly.", "Network Installation", MB_OK+MB_TASKMODAL+MB_ICONHAND)
-    end if
-
-
-    AddListItem "NetBiosMap", "nb=0"
-    AddListItem "NetBiosMap", "tcpip=0"
-    AddListItem "NetBiosMap", "xns=0"
-
     BasePath$ = "C:\c700"
     RegPath$="C:\"
     DosPath$="C:\DOS"
@@ -193,7 +163,7 @@ INIT:
 
 '$ifdef DEBUG
 
-    SrcDir$ = "U:\install\sdk.new\nsetup"
+    SrcDir$ = "\install\sdk.new\nsetup"
 '    DosPath$="C:\c700\DOS"
     WinPath$="C:\c700\WIN"
 
@@ -241,6 +211,12 @@ RESTART_OPTION:
 '$endif
 
 	if i% then
+	    goto NETBIOS
+
+	    ' If you want to default to netbios always, remove
+	    ' the preceeding goto.  This removes an additional dialog.
+
+	    AddListItem "NetBiosMap", "nb=0"
 	    goto FullInstall
 	else
 	    goto OPTION
@@ -437,15 +413,30 @@ RESTART_NETBIOS_OPTION:
 	GOTO RESTART_NETBIOS_OPTION
 
     elseif sz$ = "BACK" THEN
-	GOTO RUNTIME_OPTION
+
+        UIPop(1)
+	if CustomInstall then
+	   GOTO RUNTIME_OPTION
+	else
+	   goto RESTART_OPTION
+	end if
 
     else
         GOSUB ASKQUIT
 	GOTO NETBIOS
     end if
 
+
     if Index$ = "1" then
+
+	AddListItem "NetBiosMap", "nb=0"
+	goto FullInstall
+
+    elseif Index$ = "2" then
+
+	AddListItem "NetBiosMap", "tcpip=0"
 	goto FullInstall
+
     end if
 
 
@@ -606,21 +597,33 @@ FullInstall:
     if WindowsRuntime then
 	AddSectionFilesToCopyList "wruntime", SrcDir$, MakePath(WinPath$, "system")
 
-	if fLanmanPresent and Detect.fEnhance then
+	WinSysPath$ = MakePath(WinPath$, "system")
 
-	    NetapiPath$ = FindTargetOnEnvVar("netapi.dll", "PATH")
+	verdllPath$ = FindFileInTree("ver.dll", WinSysPath$)
 
-	    if NetapiPath$ <> "" then
-		AddSectionFilesToCopyList "wnetapi", SrcDir$, mid$(NetapiPath$, 1, len(NetapiPath$) - len("\netapi.dll"))
-	    end if
+	if verdllPath$ = "" then
+	    AddSectionFilesToCopyList "wruntime", SrcDir$, WinSysPath$
+	endif
+
+	NetapiPath$ = FindTargetOnEnvVar("netapi.dll", "PATH")
+
+	if NetapiPath$ <> "" then
+	    i% = DoMsgBox("If your netapi.dll is an older version, it will be renamed to netapi.old and a newer version installed.", "Note on Netapi.dll", MB_OK)
+	    AddSectionFilesToCopyList "wnetapi", SrcDir$, mid$(NetapiPath$, 1, len(NetapiPath$) - len("\netapi.dll"))
+	    BackupFile NetapiPath$, "netapi.old"
 	else
-	    AddSectionFilesToCopyList "dummynetapi", SrcDir$, MakePath(WinPath$, "system")
+	    WinballNetapiPath$ = FindTargetOnEnvVar("netapi.dll", WinSysPath$)
+	    if WinballNetapiPath$ <> "" then
+		AddSectionFilesToCopyList "dummynetapi", SrcDir$, WinSysPath$
+	    else
+		i% = DoMsgBox("Setup assumes you are running Windows For WorkGroups, so netapi.dll won't be updated.", "Note on Netapi.dll", MB_OK)
+	    endif
 	end if
 
-
 	if AllTransports then
 	    MakeListFromSectionKeys "SelectedTransports", "wtrans"
 	end if
+
     end if
 
     if MSDOSRuntime then
@@ -718,7 +721,6 @@ NextMapping:
 
     Close #1
 
-
     ' Update the users autoexec file if needed.
 
     AutoExec$ = "C:\"
@@ -817,6 +819,10 @@ NoAutoExec:
     ' DumpCopyList "c:\tmp\t"
     CopyFilesInCopyList
 
+    if verdllPath$ = "" then
+	verdllPath$ = FindFileInTree("ver.dll", WinSysPath$)
+	RemoveFile verdllPath$, cmoVital
+    endif
 
 '$ifdef SystemNetApi