--- mstools/mstools.inf	2018/08/09 18:22:54	1.1.1.3
+++ mstools/mstools.inf	2018/08/09 18:25:17	1.1.1.4
@@ -3,7 +3,8 @@
 ; ------------------------
 ;***********************************************************************
 [Source Media Descriptions]
-    2 = "Diskette Labelled Win32 SDK"
+    2 = "CD-Rom Labelled Windows NT"
+    3 = "CD-Rom Labelled Win32 SDK"
 
 
 
@@ -71,6 +72,7 @@
     ProcessorID_I486  = I486
     ProcessorID_I586  = I586
     ProcessorID_R4000 = R4000
+    ProcessorID_Alpha = Alpha_AXP
 
 ;----------------------------------------------------
 ; PLATFORM CHOICES
@@ -78,6 +80,7 @@
 [PlatformID]
     PlatformID_I386 = I386
     PlatformID_Mips = Mips
+    PlatformID_Alpha = Alpha
 
 
 ;**************************************************************
@@ -158,14 +161,14 @@
 
 [VarsI386]
     ;
-    MinToolsSize     = 18
-    MaxToolsSize     = 92
-    ToolsSamplesSize = 16246528
-    ToolsHelpSize    = 13342739 
-    HelpIndexSize    = 11227712 
-    MfcSize          = 7611714
-    OLE20Size        = 22682112
-    MSTestSize       = 3228040
+    MinToolsSize     = 15
+    MaxToolsSize     = 56
+    ToolsSamplesSize = 13746528
+    ToolsHelpSize    = 23342739 
+    RPCSize          = 734922 
+    PosixSize        = 483354 
+    MSSetupSize      = 2158304
+    MSTestSize       = 1241563
 
     ;
     ; Installation options
@@ -173,9 +176,9 @@
 
     DoToolsSamples = $(Chosen)
     DoToolsHelp    = $(Chosen)
-    DoHelpIndex    = $(Chosen)
-    DoMfc          = $(Chosen)
-    DoOLE20        = $(Chosen)
+    DoRPC          = $(Chosen)
+    DoPosix        = $(Chosen)
+    DoMSSetup      = $(Chosen)
     DoMSTest       = $(Chosen)
 
     ;
@@ -188,14 +191,14 @@
 
 [VarsMips]
     ;
-    MinToolsSize     = 28
-    MaxToolsSize     = 98 
-    ToolsSamplesSize = 15946528
-    ToolsHelpSize    = 13342739 
-    HelpIndexSize    = 11227712 
-    MfcSize          = 10034544
-    OLE20Size        = 15987384
-    MSTestSize       = 3698224
+    MinToolsSize     = 25
+    MaxToolsSize     = 66 
+    ToolsSamplesSize = 13446528
+    ToolsHelpSize    = 23342739 
+    RPCSize          = 734922
+    PosixSize        = 961242
+    MSSetupSize      = 2276965
+    MSTestSize       = 1427384
 
     ;
     ; Installation options
@@ -203,9 +206,39 @@
 
     DoToolsSamples = $(Chosen)
     DoToolsHelp    = $(Chosen)
-    DoHelpIndex    = $(Chosen)
-    DoMfc          = $(Chosen)
-    DoOLE20        = $(Chosen)
+    DoRPC          = $(Chosen)
+    DoPosix        = $(Chosen)
+    DoMSSetup      = $(Chosen)
+    DoMSTest	   = $(Chosen)
+    DoMfc          = $(NotChosen)
+
+    ;
+    ; Options to disable
+    ;
+
+    DisableList = {}
+
+
+[VarsAlpha]
+    ;
+    MinToolsSize     = 32
+    MaxToolsSize     = 80 
+    ToolsSamplesSize = 13446528
+    ToolsHelpSize    = 23342739 
+    RPCSize          = 734922
+    PosixSize        = 961242
+    MSSetupSize      = 2287634
+    MSTestSize       = 1427384
+
+    ;
+    ; Installation options
+    ;
+
+    DoToolsSamples = $(Chosen)
+    DoToolsHelp    = $(Chosen)
+    DoRPC          = $(Chosen)
+    DoPosix        = $(Chosen)
+    DoMSSetup      = $(Chosen)
     DoMSTest	   = $(Chosen)
 
     ;
@@ -254,6 +287,15 @@
 	       "drive.  If you are certain that this drive is a valid drive, and "+
                "that it has sufficient space, please hit OK to continue.  Otherwise, "+
                "choose Cancel to select another drive."
+    String18 = "Setup was unable to locate the Windows NT CD in the specified"+
+	       " location.  Please choose OK to select a new drive, or CANCEL "+
+	       "to continue without copying the .DBG files."
+    String19 = "Setup will attempt to copy the .DBG files from the Windows NT v"+
+	       "3.1 CD or network image. These files are used by Windbg to provide "+
+	       "complete symbolic information for the Win32 API. Please enter the "+
+	       "full path to the root of the Windows NT image."
+    String21 = "Setup was unable to copy the .DBG files, please see the Win32 SDK"+
+               " Getting Started manual for further information."
 
 
 ;--------------------
@@ -384,10 +426,10 @@ Billboard1 = "Please wait while Setup cr
 
     Check1Text  = "Copy Win32 SDK samples."
     Check2Text  = "Copy Online Reference files."
-    Check3Text  = "Copy Full Text Search files."
-    Check4Text  = "Copy MFC development files."
-    Check5Text  = "Copy OLE 2.0 Beta2 files."
-    Check6Text  = "Copy MSTest/MSSetup files."
+    Check3Text  = "Copy RPC Development files."
+    Check4Text  = "Copy Posix development files."
+    Check5Text  = "Copy MSSetup files."
+    Check6Text  = "Copy MSTest files."
 
     Continue    = "&Continue"
     Help        = "&Help"
@@ -402,13 +444,11 @@ Billboard1 = "Please wait while Setup cr
     footer1        = "Bytes"
     SizeAvailable  = $(FreeForOptional)
 
-    CheckItemsIn      = { $(DoToolsSamples),   $(DoToolsHelp), $(DoHelpIndex), $(DoMfc), $(DoOLE20), $(DoMSTest) }
-    CheckItemsInSizes = { $(ToolsSamplesSize), $(ToolsHelpSize), $(HelpIndexSize), $(MfcSize), $(OLE20Size), $(MSTestSize) }
+    CheckItemsIn      = { $(DoToolsSamples),   $(DoToolsHelp), $(DoRPC), $(DoPosix), $(DoMSSetup), $(DoMSTest) }
+    CheckItemsInSizes = { $(ToolsSamplesSize), $(ToolsHelpSize), $(RPCSize), $(PosixSize), $(MSSetupSize), $(MSTestSize) }
     OptionsGreyed     = $(DisableList)
 
 
-
-
 ;--------------------------------------------------------------
 ; k) SETUP DONE - RESTART DIALOG
 ;--------------------------------------------------------------
@@ -648,6 +688,8 @@ end_addvaluelist = +
         set STF_PLATFORM = $(PlatformID_I386)
     else-ifstr(i) $(STF_PROCESSOR) == $(ProcessorID_R4000)
         set STF_PLATFORM = $(PlatformID_Mips)
+    else-ifstr(i) $(STF_PROCESSOR) == $(ProcessorID_Alpha)
+        set STF_PLATFORM = $(PlatformID_Alpha)
     else
         shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String1)
         goto setupnotdone
@@ -667,6 +709,14 @@ end_addvaluelist = +
     endif
 
     ;
+    ; x86 is always just a user for VC++
+    ;
+
+    ifstr(i) $(STF_PLATFORM) == $(PlatformID_I386)
+	set PRIVILEGES = USER
+    endif
+
+    ;
     ; read the UI Variables and detect their setting on the current machine
     ;
 
@@ -851,7 +901,7 @@ mstooldirs = +
     set MstoolsLib     = $(MstoolsDir)lib
     set MstoolsInclude = $(MstoolsDir)h
     set MstoolsInit    = $(MstoolsDir)init
-
+   
     set MfcLib	       = $(MstoolsDir)mfc\lib
     set MfcInclude     = $(MstoolsDir)mfc\include
 
@@ -874,9 +924,9 @@ mstools = +
     ifint $(DestVolumeFree) < $(MaxToolsSize)
         set DoToolsSamples   = $(NotChosen)
         set DoToolsHelp      = $(NotChosen)
-        set DoHelpIndex      = $(NotChosen)
-        set DoMfc            = $(NotChosen)
-        set DoOLE20          = $(NotChosen)
+        set DoRPC            = $(NotChosen)
+        set DoPosix          = $(NotChosen)
+        set DoMSSetup        = $(NotChosen)
         set DoMSTest         = $(NotChosen)
     endif
 
@@ -890,15 +940,10 @@ mstools = +
     ifstr(i) $(DLGEVENT) == "CONTINUE"
         set DoToolsSamples   = *($(CheckItemsOut), 1)
         set DoToolsHelp      = *($(CheckItemsOut), 2)
-        set DoHelpIndex      = *($(CheckItemsOut), 3)
-        set DoMfc            = *($(CheckItemsOut), 4)
-        set DoOLE20          = *($(CheckItemsOut), 5)
+        set DoRPC            = *($(CheckItemsOut), 3)
+        set DoPosix          = *($(CheckItemsOut), 4)
+        set DoMSSetup        = *($(CheckItemsOut), 5)
         set DoMSTest         = *($(CheckItemsOut), 6)
-
-	ifstr(i) $(DoToolsHelp) == $(NotChosen)
-	    set DoHelpIndex = $(NotChosen)
-	endif
-
         ui pop 1
         goto mstoolsinstall
     else-ifstr(i) $(DLGEVENT) == "EXIT"
@@ -924,14 +969,6 @@ mstoolsinstall	=+
     shell "subroutn.inf" PopBillboard
     EndWait
 
-    ;
-    ;  Complete the copying of files added by other options.
-    ;
-    ;  Alter the CFG/INI files as needed by the options.
-    ;
-    ;  print information screen to restart
-    ;
-
 finish = +
 
     ;
@@ -941,13 +978,56 @@ finish = +
     read-syms ProgressCopy$(STF_LANGUAGE)
     install Install-All-Files-Now
     ifstr(i) $(STF_INSTALL_OUTCOME) == "STF_SUCCESS"
-        goto mstoolsconfig
+        goto dodbg
     else
         shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String4)
         goto setupnotdone
     endif
 
-    StartWait
+dodbg = +
+
+    shell "subroutn.inf" DoAskSourceEx $(STF_SRCDIR) $(String19)
+    ifint $($ShellCode) != $(!SHELL_CODE_OK)
+        Debug-Output "shelling DoAskSource failed"
+	shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "NONFATAL" $(String21)
+        goto mstoolsconfig
+    endif
+    ifstr(i) $($R0) == STATUS_SUCCESSFUL
+        set STF_SRCDIR = $($R1)
+        ifstr(i) $($R2) != ""
+            set DrivesToFree = >($(DrivesToFree), $($R2))
+        endif
+    else
+	shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "NONFATAL" $(String21)
+        goto mstoolsconfig
+    endif
+
+    set FileToCheck = $(STF_SRCDIR)"support\debug\i386\symbols\dll\advapi32.dbg"
+    install Install-SeeIfFileIsPresent
+    ifstr(i) $(STATUS) != "YES"
+	shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "WARNING" $(String18)
+	ifstr(i) $($R0) != STATUS_SUCCESSFUL
+	    goto dbgfilecontinue
+        else
+	    ifstr(i) $($R1) == "OK"
+		goto dodbg
+	    else
+		shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "NONFATAL" $(String21)
+		goto mstoolsconfig
+	    endif
+        endif
+    endif
+
+dbgfilecontinue =+
+
+    install Install-DBGFiles
+
+    install Install-All-Files-Now
+    ifstr(i) $(STF_INSTALL_OUTCOME) == "STF_SUCCESS"
+        goto mstoolsconfig
+    else
+        shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "NONFATAL" $(String21)
+    endif
 
 mstoolsconfig=+
     read-syms EnvironmentVars
@@ -962,37 +1042,37 @@ mstoolsconfig=+
     EndForListDo
 
     ;
-    ; add the mfc variables if mfc chosen, posix is not set up automatically
+    ; For the Path,Lib and Include variables see if we can append them
+    ; onto the current variables
     ;
 
-    ifstr(i) $(DoMfc) == $(Chosen)
-        ForListDo {Include,Lib}
-            set Var = $($)
-            ifstr(i) $($(Var)EnvVar) == {}
-                set $(Var)EnvVar = {$(Var), 0, $(!REG_VT_EXPAND_SZ), {$(Mfc$(Var))}}
+    ForListDo {Path,Lib, Include}
+        set Var = $($)
+        ifstr(i) $($(Var)EnvVar) == {}
+            set $(Var)EnvVar = {$(Var), 0, $(!REG_VT_EXPAND_SZ), {$(Mstools$(Var))}}
+            set FSet$(Var)Var = TRUE
+        else
+            set VarTitle   = *($($(Var)EnvVar), 2)
+            set VarRegType = *($($(Var)EnvVar), 3)
+            set VarValue   = *($($(Var)EnvVar), 4)
+            shell "" AppendNewValueToEnvVar $(VarValue) $(Mstools$(Var))
+            ifstr(i) $($R0) == STATUS_FAILED
+                shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String6)
+                goto setupnotdone
+            endif
+            ifstr(i) $($R1) == "TRUE"
                 set FSet$(Var)Var = TRUE
-            else
-                set VarTitle   = *($($(Var)EnvVar), 2)
-                set VarRegType = *($($(Var)EnvVar), 3)
-                set VarValue   = *($($(Var)EnvVar), 4)
-                shell "" PrependNewValueToEnvVar $(VarValue) $(Mfc$(Var))
-                ifstr(i) $($R0) == STATUS_FAILED
-                    shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String6)
-                    goto setupnotdone
-                endif
-                ifstr(i) $($R1) == "TRUE"
-                    set FSet$(Var)Var = TRUE
-                    set $(Var)EnvVar = {$(Var), $(VarTitle), $(VarRegType), $($R2)}
-                endif
+                set $(Var)EnvVar = {$(Var), $(VarTitle), $(VarRegType), $($R2)}
             endif
-        EndForListDo
-    endif
+        endif
+    EndForListDo
 
+    
     ;
-    ; add the mstest and setup variables if mstest is chosen
+    ; add the mssetup variables if mssetup is chosen
     ;
 
-    ifstr(i) $(DoMSTest) == $(Chosen)
+    ifstr(i) $(DoMSSetup) == $(Chosen)
         ForListDo {Include,Lib}
             set Var = $($)
             ifstr(i) $($(Var)EnvVar) == {}
@@ -1002,15 +1082,7 @@ mstoolsconfig=+
                 set VarTitle   = *($($(Var)EnvVar), 2)
                 set VarRegType = *($($(Var)EnvVar), 3)
                 set VarValue   = *($($(Var)EnvVar), 4)
-                ifstr(i) $(Var) == "Path"
-                  ifstr(i) $(PRIVILEGES) == "SYSTEM"
-                    shell "" AppendNewValueToEnvVar $(VarValue) $(MSSetup$(Var))
-                  else
-                    shell "" PrependNewValueToEnvVar $(VarValue) $(MSSetup$(Var))
-                  endif
-                else
-                  shell "" PrependNewValueToEnvVar $(VarValue) $(MSSetup$(Var))
-                endif
+                shell "" AppendNewValueToEnvVar $(VarValue) $(MSSetup$(Var))
                 ifstr(i) $($R0) == STATUS_FAILED
                     shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String6)
                     goto setupnotdone
@@ -1021,6 +1093,13 @@ mstoolsconfig=+
                 endif
             endif
         EndForListDo
+    endif
+
+    ;
+    ; add the mstest variables if mstest is chosen
+    ;
+
+    ifstr(i) $(DoMSTest) == $(Chosen)
         ForListDo {Include,Path}
             set Var = $($)
             ifstr(i) $($(Var)EnvVar) == {}
@@ -1030,15 +1109,7 @@ mstoolsconfig=+
                 set VarTitle   = *($($(Var)EnvVar), 2)
                 set VarRegType = *($($(Var)EnvVar), 3)
                 set VarValue   = *($($(Var)EnvVar), 4)
-                ifstr(i) $(Var) == "Path"
-                  ifstr(i) $(PRIVILEGES) == "SYSTEM"
-                    shell "" AppendNewValueToEnvVar $(VarValue) $(MSTest$(Var))
-                  else
-                    shell "" PrependNewValueToEnvVar $(VarValue) $(MSTest$(Var))
-                  endif
-                else
-                  shell "" PrependNewValueToEnvVar $(VarValue) $(MSTest$(Var))
-                endif
+                shell "" AppendNewValueToEnvVar $(VarValue) $(MSTest$(Var))
                 ifstr(i) $($R0) == STATUS_FAILED
                     shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String6)
                     goto setupnotdone
@@ -1052,46 +1123,13 @@ mstoolsconfig=+
     endif
 
     ;
-    ; For the Path,Lib and Include variables see if we can prepend them
-    ; onto the current variables
-    ;
-
-    ForListDo {Path,Lib, Include}
-        set Var = $($)
-        ifstr(i) $($(Var)EnvVar) == {}
-            set $(Var)EnvVar = {$(Var), 0, $(!REG_VT_EXPAND_SZ), {$(Mstools$(Var))}}
-            set FSet$(Var)Var = TRUE
-        else
-            set VarTitle   = *($($(Var)EnvVar), 2)
-            set VarRegType = *($($(Var)EnvVar), 3)
-            set VarValue   = *($($(Var)EnvVar), 4)
-            ifstr(i) $(Var) == "Path"
-                ifstr(i) $(PRIVILEGES) == "SYSTEM"
-                   shell "" AppendNewValueToEnvVar $(VarValue) $(Mstools$(Var))
-                else
-                   shell "" PrependNewValueToEnvVar $(VarValue) $(Mstools$(Var))
-                endif
-            else
-                shell "" PrependNewValueToEnvVar $(VarValue) $(Mstools$(Var))
-            endif
-            ifstr(i) $($R0) == STATUS_FAILED
-                shell "subroutn.inf" SetupMessage $(!STF_LANGUAGE) "FATAL" $(String6)
-                goto setupnotdone
-            endif
-            ifstr(i) $($R1) == "TRUE"
-                set FSet$(Var)Var = TRUE
-                set $(Var)EnvVar = {$(Var), $(VarTitle), $(VarRegType), $($R2)}
-            endif
-        endif
-    EndForListDo
-
-    
-    ;
     ; make cpu variable - STF_PLATFORM
     ;
     set FSetCpuVar = TRUE
     ifstr(i) $(!STF_PLATFORM) == $(!PlatformID_I386)
         set CpuEnvVar = {Cpu, 0, $(!REG_VT_SZ), i386}
+    else-ifstr(i) $(!STF_PLATFORM) == $(!PlatformID_Alpha)
+	set CpuEnvVar = {Cpu, 0, $(!REG_VT_SZ), ALPHA}
     else
         set CpuEnvVar = {Cpu, 0, $(!REG_VT_SZ), MIPS}
     endif
@@ -1123,7 +1161,7 @@ mstoolsconfig=+
     install Install-MSTools-Groups
 
     ;
-    ; modify the registry to use windbg instead of ntsdk and clear auto 
+    ; modify the registry to use windbg instead of drwatson and clear auto 
     ;
 
     set KeyPath = { +
@@ -1404,6 +1442,10 @@ finish_setenvstr = +
     Create$(Common)ProgManGroup $(ToolsGroup) ""
     Show$(Common)ProgManGroup   $(ToolsGroup), 1
 
+    ifstr(i) $(STF_PLATFORM) == $(PlatformID_Alpha)
+        Create$(Common)ProgmanItem  $(ToolsGroup) , "AXP Notes"        "notepad "$(MstoolsPath)"\axpnotes.txt"       ""	    0
+    endif
+
     Create$(Common)ProgmanItem  $(ToolsGroup) , "M Editor"        $(MstoolsPath)"\mep"                               $(MstoolsPath)"\m.ico"	    0
     Create$(Common)ProgmanItem  $(ToolsGroup) , "Dialog Editor"   $(MstoolsPath)"\dlgedit"                           ""              0
     Create$(Common)ProgmanItem  $(ToolsGroup) , "Image Editor"    $(MstoolsPath)"\imagedit"                          ""              0
@@ -1441,11 +1483,10 @@ finish_setenvstr = +
 
         Create$(Common)ProgmanItem  $(HelpGroup) , "Win32 SDK Knowledge Base"         "winhlp32 "$(MstoolsPath)"\win32kb.hlp"    ""              0
         Create$(Common)ProgmanItem  $(HelpGroup) , "Storage Class Modifiers QuickRef" "winhlp32 "$(MstoolsPath)"\modif.hlp" ""              0
-        Create$(Common)ProgmanItem  $(HelpGroup) , "RPC Language QuickRef"	  "winhlp32 "$(MstoolsPath)"\midl10wh.hlp"   ""		    0
 
-        ifstr(i) $(DoMfc) == $(Chosen)
-            Create$(Common)ProgmanItem  $(HelpGroup) , "MFC Library QuickRef"         "winhlp32 "$(MstoolsPath)"\mfc10wh.hlp"    ""              0
-        endif
+	ifstr(i) $(DoRPC) == $(Chosen)
+            Create$(Common)ProgmanItem  $(HelpGroup) , "RPC Language QuickRef"	  "winhlp32 "$(MstoolsPath)"\midl10wh.hlp"   ""		    0
+	endif
 
         Show$(Common)ProgManGroup   $(HelpGroup), 6
     endif
@@ -1475,8 +1516,6 @@ finish_setenvstr = +
     CreateDir  $(MstoolsPath)
     CreateDir  $(MstoolsLib)
     CreateDir  $(MstoolsInit)
-    CreateDir  $(STF_WINDOWSPATH)\symbols
-    CreateDir  $(STF_WINDOWSPATH)\symbols\dll
 
     AddSectionFilesToCopyList Files-mstools                          $(STF_SRCDIR)mstools                          $(MstoolsDir)
     AddSectionFilesToCopyList Files-mstools-bin                      $(STF_SRCDIR)mstools\bin                      $(MstoolsPath)
@@ -1486,25 +1525,7 @@ finish_setenvstr = +
     AddSectionFilesToCopyList Files-mstools-h-sys                    $(STF_SRCDIR)mstools\h\sys                    $(MstoolsInclude)\sys
     AddSectionFilesToCopyList Files-mstools-init                     $(STF_SRCDIR)mstools\init                     $(MstoolsInit)
     AddSectionFilesToCopyList Files-mstools-lib-$(STF_PLATFORM)      $(STF_SRCDIR)mstools\lib\$(STF_PLATFORM)      $(MstoolsLib)
-    AddSectionFilesToCopyList Files-support-debug-$(STF_PLATFORM)-symbols-dll $(STF_SRCDIR)support\debug\$(STF_PLATFORM)\symbols\dll $(STF_WINDOWSPATH)\symbols\dll
 
-    ;
-    ; 1.5 POSIX - always done
-    ;
-
-    CreateDir $(MstoolsDir)posix
-    CreateDir $(MstoolsDir)posix\h
-    CreateDir $(MstoolsDir)posix\h\sys
-    CreateDir $(MstoolsDir)posix\lib
-    CreateDir $(MstoolsDir)posix\samples
-    CreateDir $(MstoolsDir)posix\samples\psxarc
-
-    AddSectionFilesToCopyList Files-mstools-posix		$(STF_SRCDIR)mstools\posix	$(MstoolsDir)posix
-    AddSectionFilesToCopyList Files-mstools-posix-h			$(STF_SRCDIR)mstools\posix\h			$(MstoolsDir)posix\h
-    AddSectionFilesToCopyList Files-mstools-posix-h-sys		$(STF_SRCDIR)mstools\posix\h\sys		$(MstoolsDir)posix\h\sys
-    AddSectionFilesToCopyList Files-mstools-posix-lib-$(STF_PLATFORM)	$(STF_SRCDIR)mstools\posix\lib\$(STF_PLATFORM)		$(MstoolsDir)posix\lib
-    AddSectionFilesToCopyList Files-mstools-posix-samples-psxarc	$(STF_SRCDIR)mstools\posix\samples\psxarc	$(MstoolsDir)posix\samples\psxarc
-	
 
     ;
     ; 2. Help files - conditional
@@ -1512,19 +1533,18 @@ finish_setenvstr = +
 
     ifstr(i) $(!DoToolsHelp)  == $(!Chosen)
        AddSectionFilesToCopyList Files-mstools-help $(STF_SRCDIR)mstools\help $(MstoolsPath)
+       AddSectionFilesToCopyList Files-mstools-help-$(STF_PLATFORM) $(STF_SRCDIR)mstools\help\$(STF_PLATFORM) $(MstoolsPath)
        AddSectionFilesToCopyList Files-mstools-help-qh $(STF_SRCDIR)mstools\help\qh $(MstoolsPath)
+       AddSectionFilesToCopyList Files-mstools-help-index $(STF_SRCDIR)mstools\help $(MstoolsPath)
+
 
        ifstr(i) $(!DoToolsSamples) == $(!Chosen)
            AddSectionFilesToCopyList Files-mstools-samples-help $(STF_SRCDIR)mstools\help $(MstoolsPath)
        endif 
-    
-       ifstr(i) $(!DoMfc) == $(!Chosen)
-           AddSectionFilesToCopyList Files-mstools-mfc-help $(STF_SRCDIR)mstools\mfc\help $(MstoolsPath)
-       endif 
 
-	ifstr(i) $(!DoHelpIndex) == $(!Chosen)
-	   AddSectionFilesToCopyList Files-mstools-help-index $(STF_SRCDIR)mstools\help $(MstoolsPath)
-	endif
+       ifstr(i) $(DoRPC) == $(Chosen) 
+	   AddSectionFilesToCopyList Files-mstools-rpc-help $(STF_SRCDIR)mstools\help $(MstoolsPath)
+       endif
 
     endif
 
@@ -1647,47 +1667,6 @@ finish_setenvstr = +
         AddSectionFilesToCopyList Files-mstools-samples-ddeml-ddeprog        $(STF_SRCDIR)mstools\samples\ddeml\ddeprog       $(MstoolsDir)samples\ddeml\ddeprog
         AddSectionFilesToCopyList Files-mstools-samples-ddeml-server         $(STF_SRCDIR)mstools\samples\ddeml\server        $(MstoolsDir)samples\ddeml\server
 
-        ; 3. rpc
-
-        CreateDir $(MstoolsDir)samples\rpc
-        CreateDir $(MstoolsDir)samples\rpc\callback
-        CreateDir $(MstoolsDir)samples\rpc\data
-        CreateDir $(MstoolsDir)samples\rpc\data\dunion
-        CreateDir $(MstoolsDir)samples\rpc\data\inout
-        CreateDir $(MstoolsDir)samples\rpc\data\xmit
-        CreateDir $(MstoolsDir)samples\rpc\dict
-        CreateDir $(MstoolsDir)samples\rpc\doctor
-        CreateDir $(MstoolsDir)samples\rpc\handles
-        CreateDir $(MstoolsDir)samples\rpc\handles\auto
-        CreateDir $(MstoolsDir)samples\rpc\handles\cxhndl
-        CreateDir $(MstoolsDir)samples\rpc\handles\usrdef
-        CreateDir $(MstoolsDir)samples\rpc\hello
-        CreateDir $(MstoolsDir)samples\rpc\mandel
-        CreateDir $(MstoolsDir)samples\rpc\ns
-        CreateDir $(MstoolsDir)samples\rpc\ns\cds
-        CreateDir $(MstoolsDir)samples\rpc\ns\nhello
-        CreateDir $(MstoolsDir)samples\rpc\whello
-        CreateDir $(MstoolsDir)samples\rpc\yield
-        CreateDir $(MstoolsDir)samples\rpc\cluuid
-
-        AddSectionFilesToCopyList Files-mstools-samples-rpc                  $(STF_SRCDIR)mstools\samples\rpc                 $(MstoolsDir)samples\rpc
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-callback         $(STF_SRCDIR)mstools\samples\rpc\callback        $(MstoolsDir)samples\rpc\callback
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-dunion      $(STF_SRCDIR)mstools\samples\rpc\data\dunion     $(MstoolsDir)samples\rpc\data\dunion
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-inout       $(STF_SRCDIR)mstools\samples\rpc\data\inout      $(MstoolsDir)samples\rpc\data\inout
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-xmit        $(STF_SRCDIR)mstools\samples\rpc\data\xmit       $(MstoolsDir)samples\rpc\data\xmit
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-dict           $(STF_SRCDIR)mstools\samples\rpc\dict          $(MstoolsDir)samples\rpc\dict
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-doctor           $(STF_SRCDIR)mstools\samples\rpc\doctor          $(MstoolsDir)samples\rpc\doctor
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-auto     $(STF_SRCDIR)mstools\samples\rpc\handles\auto    $(MstoolsDir)samples\rpc\handles\auto
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-cxhndl   $(STF_SRCDIR)mstools\samples\rpc\handles\cxhndl  $(MstoolsDir)samples\rpc\handles\cxhndl
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-usrdef   $(STF_SRCDIR)mstools\samples\rpc\handles\usrdef  $(MstoolsDir)samples\rpc\handles\usrdef
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-hello            $(STF_SRCDIR)mstools\samples\rpc\hello           $(MstoolsDir)samples\rpc\hello
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-mandel           $(STF_SRCDIR)mstools\samples\rpc\mandel          $(MstoolsDir)samples\rpc\mandel
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-ns-cds           $(STF_SRCDIR)mstools\samples\rpc\ns\cds          $(MstoolsDir)samples\rpc\ns\cds
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-ns-nhello        $(STF_SRCDIR)mstools\samples\rpc\ns\nhello       $(MstoolsDir)samples\rpc\ns\nhello
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-whello           $(STF_SRCDIR)mstools\samples\rpc\whello          $(MstoolsDir)samples\rpc\whello
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-yield            $(STF_SRCDIR)mstools\samples\rpc\yield           $(MstoolsDir)samples\rpc\yield
-        AddSectionFilesToCopyList Files-mstools-samples-rpc-cluuid            $(STF_SRCDIR)mstools\samples\rpc\cluuid           $(MstoolsDir)samples\rpc\cluuid
-
         ; 5. mazelords
 
         CreateDir $(MstoolsDir)samples\mazelord
@@ -1767,13 +1746,6 @@ finish_setenvstr = +
 	AddSectionFilesToCopyList Files-mstools-samples-snmp-testdll  $(STF_SRCDIR)mstools\samples\snmp\testdll  $(MstoolsDir)samples\snmp\testdll
 	AddSectionFilesToCopyList Files-mstools-samples-snmp-snmputil $(STF_SRCDIR)mstools\samples\snmp\snmputil $(MstoolsDir)samples\snmp\snmputil
 
-	ifstr(i) $(STF_PLATFORM) == $(PlatformID_I386)
-            ifstr(i) $(DoMfc) == $(Chosen)
-	        CreateDir $(MstoolsDir)samples\sdktools\capview
-	        AddSectionFilesToCopyList Files-mstools-samples-sdktools-capview $(STF_SRCDIR)mstools\samples\sdktools\capview $(MstoolsDir)samples\sdktools\capview
-	    endif
-	endif
-
         ; 7. Large Integer
 
         CreateDir $(MstoolsDir)samples\largeint
@@ -1806,149 +1778,78 @@ finish_setenvstr = +
     endif
 
     ;
-    ; 4. Microsoft C++ - optional
+    ; RPC Files - conditional
     ;
+    
+    ifstr(i) $(DoRPC) == $(Chosen)
 
-    ifstr(i) $(DoMfc) == $(Chosen)
-
-        CreateDir $(MstoolsDir)mfc
-        CreateDir $(MfcInclude)
-        CreateDir $(MfcLib)
-	CreateDir $(MstoolsDir)mfc\doc
-        CreateDir $(MstoolsDir)mfc\samples
-        CreateDir $(MstoolsDir)mfc\samples\about2
-        CreateDir $(MstoolsDir)mfc\samples\chart
-        CreateDir $(MstoolsDir)mfc\samples\ctrltest
-        CreateDir $(MstoolsDir)mfc\samples\dlltrace
-        CreateDir $(MstoolsDir)mfc\samples\fileview
-        CreateDir $(MstoolsDir)mfc\samples\hello
-        CreateDir $(MstoolsDir)mfc\samples\helloapp
-        CreateDir $(MstoolsDir)mfc\samples\mdi
-        CreateDir $(MstoolsDir)mfc\samples\minmdi
-        CreateDir $(MstoolsDir)mfc\samples\minsvr
-        CreateDir $(MstoolsDir)mfc\samples\minsvrmi
-        CreateDir $(MstoolsDir)mfc\samples\multipad
-        CreateDir $(MstoolsDir)mfc\samples\oclient
-        CreateDir $(MstoolsDir)mfc\samples\oserver
-        CreateDir $(MstoolsDir)mfc\samples\showfont
-        CreateDir $(MstoolsDir)mfc\samples\templdef
-        CreateDir $(MstoolsDir)mfc\samples\tracer
-        CreateDir $(MstoolsDir)mfc\samples\tutorial
-        CreateDir $(MstoolsDir)mfc\samples\tutorial\char
-        CreateDir $(MstoolsDir)mfc\samples\tutorial\win
-        CreateDir $(MstoolsDir)mfc\src
-
-
-        AddSectionFilesToCopyList Files-mstools-mfc       $(STF_SRCDIR)mstools\mfc                         $(MstoolsDir)mfc
-	AddSectionFilesToCopyList Files-mstools-mfc-doc	  $(STF_SRCDIR)mstools\mfc\doc			   $(MstoolsDir)mfc\doc
-        AddSectionFilesToCopyList Files-mstools-mfc-include             $(STF_SRCDIR)mstools\mfc\include                 $(MfcInclude)
-        AddSectionFilesToCopyList Files-mstools-mfc-lib                 $(STF_SRCDIR)mstools\mfc\lib                     $(MfcLib)
-        AddSectionFilesToCopyList Files-mstools-mfc-lib-$(STF_PLATFORM) $(STF_SRCDIR)mstools\mfc\lib\$(STF_PLATFORM)     $(MfcLib)
-        AddSectionFilesToCopyList Files-mstools-mfc-samples             $(STF_SRCDIR)mstools\mfc\samples                 $(MstoolsDir)mfc\samples
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-about2      $(STF_SRCDIR)mstools\mfc\samples\about2          $(MstoolsDir)mfc\samples\about2
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-chart       $(STF_SRCDIR)mstools\mfc\samples\chart           $(MstoolsDir)mfc\samples\chart
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-ctrltest    $(STF_SRCDIR)mstools\mfc\samples\ctrltest        $(MstoolsDir)mfc\samples\ctrltest
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-dlltrace    $(STF_SRCDIR)mstools\mfc\samples\dlltrace        $(MstoolsDir)mfc\samples\dlltrace
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-fileview    $(STF_SRCDIR)mstools\mfc\samples\fileview        $(MstoolsDir)mfc\samples\fileview
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-hello       $(STF_SRCDIR)mstools\mfc\samples\hello           $(MstoolsDir)mfc\samples\hello
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-helloapp    $(STF_SRCDIR)mstools\mfc\samples\helloapp        $(MstoolsDir)mfc\samples\helloapp
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-mdi         $(STF_SRCDIR)mstools\mfc\samples\mdi             $(MstoolsDir)mfc\samples\mdi
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-minmdi      $(STF_SRCDIR)mstools\mfc\samples\minmdi          $(MstoolsDir)mfc\samples\minmdi
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-minsvr      $(STF_SRCDIR)mstools\mfc\samples\minsvr          $(MstoolsDir)mfc\samples\minsvr
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-minsvrmi    $(STF_SRCDIR)mstools\mfc\samples\minsvrmi        $(MstoolsDir)mfc\samples\minsvrmi
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-multipad    $(STF_SRCDIR)mstools\mfc\samples\multipad        $(MstoolsDir)mfc\samples\multipad
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-oclient     $(STF_SRCDIR)mstools\mfc\samples\oclient         $(MstoolsDir)mfc\samples\oclient
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-oserver     $(STF_SRCDIR)mstools\mfc\samples\oserver         $(MstoolsDir)mfc\samples\oserver
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-showfont    $(STF_SRCDIR)mstools\mfc\samples\showfont        $(MstoolsDir)mfc\samples\showfont
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-templdef    $(STF_SRCDIR)mstools\mfc\samples\templdef        $(MstoolsDir)mfc\samples\templdef
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-tracer      $(STF_SRCDIR)mstools\mfc\samples\tracer          $(MstoolsDir)mfc\samples\tracer
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-tutorial    $(STF_SRCDIR)mstools\mfc\samples\tutorial        $(MstoolsDir)mfc\samples\tutorial
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-tutorial-char $(STF_SRCDIR)mstools\mfc\samples\tutorial\char   $(MstoolsDir)mfc\samples\tutorial\char
-        AddSectionFilesToCopyList Files-mstools-mfc-samples-tutorial-win  $(STF_SRCDIR)mstools\mfc\samples\tutorial\win    $(MstoolsDir)mfc\samples\tutorial\win
-        AddSectionFilesToCopyList Files-mstools-mfc-src                 $(STF_SRCDIR)mstools\mfc\src                     $(MstoolsDir)mfc\src
+	CreateDir $(MstoolsDir)samples
+        CreateDir $(MstoolsDir)samples\rpc
+        CreateDir $(MstoolsDir)samples\rpc\callback
+        CreateDir $(MstoolsDir)samples\rpc\data
+        CreateDir $(MstoolsDir)samples\rpc\data\dunion
+        CreateDir $(MstoolsDir)samples\rpc\data\inout
+        CreateDir $(MstoolsDir)samples\rpc\data\xmit
+        CreateDir $(MstoolsDir)samples\rpc\dict
+        CreateDir $(MstoolsDir)samples\rpc\doctor
+        CreateDir $(MstoolsDir)samples\rpc\handles
+        CreateDir $(MstoolsDir)samples\rpc\handles\auto
+        CreateDir $(MstoolsDir)samples\rpc\handles\cxhndl
+        CreateDir $(MstoolsDir)samples\rpc\handles\usrdef
+        CreateDir $(MstoolsDir)samples\rpc\hello
+        CreateDir $(MstoolsDir)samples\rpc\mandel
+        CreateDir $(MstoolsDir)samples\rpc\ns
+        CreateDir $(MstoolsDir)samples\rpc\ns\cds
+        CreateDir $(MstoolsDir)samples\rpc\ns\nhello
+        CreateDir $(MstoolsDir)samples\rpc\whello
+        CreateDir $(MstoolsDir)samples\rpc\yield
+        CreateDir $(MstoolsDir)samples\rpc\cluuid
 
+        AddSectionFilesToCopyList Files-mstools-samples-rpc                  $(STF_SRCDIR)mstools\samples\rpc                 $(MstoolsDir)samples\rpc
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-callback         $(STF_SRCDIR)mstools\samples\rpc\callback        $(MstoolsDir)samples\rpc\callback
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-dunion      $(STF_SRCDIR)mstools\samples\rpc\data\dunion     $(MstoolsDir)samples\rpc\data\dunion
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-inout       $(STF_SRCDIR)mstools\samples\rpc\data\inout      $(MstoolsDir)samples\rpc\data\inout
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-data-xmit        $(STF_SRCDIR)mstools\samples\rpc\data\xmit       $(MstoolsDir)samples\rpc\data\xmit
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-dict           $(STF_SRCDIR)mstools\samples\rpc\dict          $(MstoolsDir)samples\rpc\dict
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-doctor           $(STF_SRCDIR)mstools\samples\rpc\doctor          $(MstoolsDir)samples\rpc\doctor
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-auto     $(STF_SRCDIR)mstools\samples\rpc\handles\auto    $(MstoolsDir)samples\rpc\handles\auto
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-cxhndl   $(STF_SRCDIR)mstools\samples\rpc\handles\cxhndl  $(MstoolsDir)samples\rpc\handles\cxhndl
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-handles-usrdef   $(STF_SRCDIR)mstools\samples\rpc\handles\usrdef  $(MstoolsDir)samples\rpc\handles\usrdef
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-hello            $(STF_SRCDIR)mstools\samples\rpc\hello           $(MstoolsDir)samples\rpc\hello
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-mandel           $(STF_SRCDIR)mstools\samples\rpc\mandel          $(MstoolsDir)samples\rpc\mandel
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-ns-cds           $(STF_SRCDIR)mstools\samples\rpc\ns\cds          $(MstoolsDir)samples\rpc\ns\cds
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-ns-nhello        $(STF_SRCDIR)mstools\samples\rpc\ns\nhello       $(MstoolsDir)samples\rpc\ns\nhello
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-whello           $(STF_SRCDIR)mstools\samples\rpc\whello          $(MstoolsDir)samples\rpc\whello
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-yield            $(STF_SRCDIR)mstools\samples\rpc\yield           $(MstoolsDir)samples\rpc\yield
+        AddSectionFilesToCopyList Files-mstools-samples-rpc-cluuid            $(STF_SRCDIR)mstools\samples\rpc\cluuid           $(MstoolsDir)samples\rpc\cluuid
     endif
 
-
     ;
-    ; 5. Microsoft OLE2.0 - optional
+    ; 4 POSIX - optional
     ;
 
-    ifstr(i) $(DoOLE20) == $(Chosen)
-
-	CreateDir $(MstoolsDir)ole20
-	CreateDir $(MstoolsDir)ole20\h
-	CreateDir $(MstoolsDir)ole20\lib
-	CreateDir $(MstoolsDir)ole20\bin
-	CreateDir $(MstoolsDir)ole20\samples
-	CreateDir $(MstoolsDir)ole20\samples\h
-	CreateDir $(MstoolsDir)ole20\samples\lib
-	CreateDir $(MstoolsDir)ole20\samples\bin
-	CreateDir $(MstoolsDir)ole20\samples\bttncur
-	CreateDir $(MstoolsDir)ole20\samples\bttncur\res
-	CreateDir $(MstoolsDir)ole20\samples\gizmobar
-	CreateDir $(MstoolsDir)ole20\samples\outline
-	CreateDir $(MstoolsDir)ole20\samples\outline\cntroutl
-	CreateDir $(MstoolsDir)ole20\samples\outline\icntrotl
-	CreateDir $(MstoolsDir)ole20\samples\outline\isvrotl
-	CreateDir $(MstoolsDir)ole20\samples\outline\outline
-	CreateDir $(MstoolsDir)ole20\samples\outline\svroutl
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\build
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\build\ship
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\build\debug
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\debug
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\resource
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\resource\static
-	CreateDir $(MstoolsDir)ole20\samples\ole2ui\resource\usa
-
-	ifstr(i) $(STF_PLATFORM) == $(PlatformID_I386)
-	    CreateDir $(MstoolsDir)ole20\samples\spoly
-	    CreateDir $(MstoolsDir)ole20\samples\spoly2
-	    CreateDir $(MstoolsDir)ole20\samples\tibrowse
-	    CreateDir $(MstoolsDir)ole20\samples\dispcalc
-	    CreateDir $(MstoolsDir)ole20\samples\dspcalc2
-	    CreateDir $(MstoolsDir)ole20\samples\dispdemo
-	endif
-
-	AddSectionFilesToCopyList Files-mstools-ole20                  $(STF_SRCDIR)mstools\ole20                  $(MstoolsDir)ole20
-	AddSectionFilesToCopyList Files-mstools-ole20-$(STF_PLATFORM)           $(STF_SRCDIR)mstools\ole20\$(STF_PLATFORM)           $(MstoolsDir)ole20
-	AddSectionFilesToCopyList Files-mstools-ole20-h                $(STF_SRCDIR)mstools\ole20\h                                $(MstoolsDir)ole20\h
-	AddSectionFilesToCopyList Files-mstools-ole20-lib-$(STF_PLATFORM)              $(STF_SRCDIR)mstools\ole20\lib\$(STF_PLATFORM)              $(MstoolsDir)ole20\lib
-	AddSectionFilesToCopyList Files-mstools-ole20-bin              $(STF_SRCDIR)mstools\ole20\bin              $(MstoolsDir)ole20\bin
-	AddSectionFilesToCopyList Files-mstools-ole20-bin-$(STF_PLATFORM)              $(STF_SRCDIR)mstools\ole20\bin\$(STF_PLATFORM)              $(MstoolsDir)ole20\bin
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-$(STF_PLATFORM)  $(STF_SRCDIR)mstools\ole20\samples\$(STF_PLATFORM)  $(MstoolsDir)ole20\samples
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-h  $(STF_SRCDIR)mstools\ole20\samples\h  $(MstoolsDir)ole20\samples\h
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-bttncur  $(STF_SRCDIR)mstools\ole20\samples\bttncur  $(MstoolsDir)ole20\samples\bttncur
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-bttncur-$(STF_PLATFORM)  $(STF_SRCDIR)mstools\ole20\samples\bttncur\$(STF_PLATFORM)  $(MstoolsDir)ole20\samples\bttncur
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-bttncur-res  $(STF_SRCDIR)mstools\ole20\samples\bttncur\res  $(MstoolsDir)ole20\samples\bttncur\res
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-gizmobar  $(STF_SRCDIR)mstools\ole20\samples\gizmobar  $(MstoolsDir)ole20\samples\gizmobar
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-gizmobar-$(STF_PLATFORM)  $(STF_SRCDIR)mstools\ole20\samples\gizmobar\$(STF_PLATFORM)  $(MstoolsDir)ole20\samples\gizmobar
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-outline  $(STF_SRCDIR)mstools\ole20\samples\outline  $(MstoolsDir)ole20\samples\outline
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-outline-$(STF_PLATFORM)  $(STF_SRCDIR)mstools\ole20\samples\outline\$(STF_PLATFORM)  $(MstoolsDir)ole20\samples\outline
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-ole2ui   $(STF_SRCDIR)mstools\ole20\samples\ole2ui   $(MstoolsDir)ole20\samples\ole2ui
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-ole2ui-$(STF_PLATFORM)   $(STF_SRCDIR)mstools\ole20\samples\ole2ui\$(STF_PLATFORM)   $(MstoolsDir)ole20\samples\ole2ui
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-ole2ui-resource   $(STF_SRCDIR)mstools\ole20\samples\ole2ui\resource   $(MstoolsDir)ole20\samples\ole2ui\resource
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-ole2ui-resource-static   $(STF_SRCDIR)mstools\ole20\samples\ole2ui\resource\static   $(MstoolsDir)ole20\samples\ole2ui\resource\static
-	AddSectionFilesToCopyList Files-mstools-ole20-samples-ole2ui-resource-usa   $(STF_SRCDIR)mstools\ole20\samples\ole2ui\resource\usa   $(MstoolsDir)ole20\samples\ole2ui\resource\usa
-
-	ifstr(i) $(STF_PLATFORM) == $(PlatformID_I386)
- 	    AddSectionFilesToCopyList Files-mstools-ole20-h-i386        $(STF_SRCDIR)mstools\ole20\h\i386 $(MstoolsDir)ole20\h
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-spoly  $(STF_SRCDIR)mstools\ole20\samples\spoly  $(MstoolsDir)ole20\samples\spoly
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-spoly2  $(STF_SRCDIR)mstools\ole20\samples\spoly2  $(MstoolsDir)ole20\samples\spoly2
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-tibrowse  $(STF_SRCDIR)mstools\ole20\samples\tibrowse  $(MstoolsDir)ole20\samples\tibrowse
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-dispcalc  $(STF_SRCDIR)mstools\ole20\samples\dispcalc  $(MstoolsDir)ole20\samples\dispcalc
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-dspcalc2  $(STF_SRCDIR)mstools\ole20\samples\dspcalc2  $(MstoolsDir)ole20\samples\dspcalc2
-	    AddSectionFilesToCopyList Files-mstools-ole20-samples-dispdemo  $(STF_SRCDIR)mstools\ole20\samples\dispdemo  $(MstoolsDir)ole20\samples\dispdemo
-	endif 
+    ifstr(i) $(DoPosix) == $(Chosen)
 
+	CreateDir $(MstoolsDir)posix
+	CreateDir $(MstoolsDir)posix\h
+	CreateDir $(MstoolsDir)posix\h\sys
+	CreateDir $(MstoolsDir)posix\lib
+	CreateDir $(MstoolsDir)posix\samples
+	CreateDir $(MstoolsDir)posix\samples\psxarc
+
+	AddSectionFilesToCopyList Files-mstools-posix		$(STF_SRCDIR)mstools\posix	$(MstoolsDir)posix
+	AddSectionFilesToCopyList Files-mstools-posix-h			$(STF_SRCDIR)mstools\posix\h			$(MstoolsDir)posix\h
+	AddSectionFilesToCopyList Files-mstools-posix-h-sys		$(STF_SRCDIR)mstools\posix\h\sys		$(MstoolsDir)posix\h\sys
+	AddSectionFilesToCopyList Files-mstools-posix-lib-$(STF_PLATFORM)	$(STF_SRCDIR)mstools\posix\lib\$(STF_PLATFORM)		$(MstoolsDir)posix\lib
+	AddSectionFilesToCopyList Files-mstools-posix-samples-psxarc	$(STF_SRCDIR)mstools\posix\samples\psxarc	$(MstoolsDir)posix\samples\psxarc
+	
     endif
 
     ;
-    ; 6. Microsoft Setup Toolkit - optional
+    ; 5. Microsoft Setup Toolkit - optional
     ;
 
-    ifstr(i) $(DoMSTest) == $(Chosen)
+    ifstr(i) $(DoMSSetup) == $(Chosen)
 	CreateDir $(MstoolsDir)mssetup
 	CreateDir $(MstoolsDir)mssetup\bin
 	CreateDir $(MstoolsDir)mssetup\bldcui
@@ -1994,6 +1895,17 @@ finish_setenvstr = +
 
     exit
 
+[Install-DBGFiles]
+    set STF_VITAL = ""
+    CreateDir  $(STF_WINDOWSPATH)\symbols
+    CreateDir  $(STF_WINDOWSPATH)\symbols\dll
+
+    AddSectionFilesToCopyList Files-support-debug-$(STF_PLATFORM)-symbols-dll $(STF_SRCDIR)support\debug\$(STF_PLATFORM)\symbols\dll $(STF_WINDOWSPATH)\symbols\dll
+    exit
+
+[Install-SeeIfFileIsPresent]
+LibraryProcedure STATUS,$(!LIBHANDLE), CheckFileExistance $(FileToCheck)
+exit
 
 [Install-All-Files-Now]
     CopyFilesInCopyList
@@ -2004,25 +1916,128 @@ finish_setenvstr = +
 ; REGULAR MSTOOLS
 ;
 
+[Files-mstools-bin-Alpha]
+2,A2COFF.EXE
+2,ACC.EXE
+2,ACCNOTES.TXT
+2,ALPHAKD.EXE
+2,APF32CVT.EXE
+2,APF32DMP.EXE
+2,AS0.EXE
+2,AS1.EXE
+2,ASAXP.EXE
+2,ASAXP.TXT
+2,AXPNOTES.TXT
+2,C1.ERR
+2,C1N32.EXE
+2,C1XX32.EXE
+2,C2N32.EXE
+2,CFE.EXE
+2,CL.ERR
+2,CL.EXE
+2,CL32.MSG
+2,CLAXP.EXE
+2,CLAXP.TXT
+2,COMPRESS.EXE
+2,CVDUMP.EXE
+2,CVPACK.EXE
+2,CVTRES.EXE
+2,DDESPY.EXE
+2,DLGEDIT.EXE
+2,DM.DLL
+2,EECANALP.DLL
+2,EECANMIP.DLL
+2,EECANX86.DLL
+2,EECXXALP.DLL
+2,EECXXMIP.DLL
+2,EECXXX86.DLL
+2,EMALP.DLL
+2,EMMIP.DLL
+2,EMX86.DLL
+2,ENGLISH.ERR
+2,EXP.EXE
+2,FASTIMER.DLL
+2,FERNEL32.DLL
+2,FILTER.DLL
+2,FONTEDIT.EXE
+2,GUTILS.DLL
+2,HOOK.DLL
+2,I386KD.EXE
+2,IMAGEDIT.EXE
+2,JUSTIFY.DLL
+2,LIB32.EXE
+2,LINK32.EXE
+2,LMMIB2.MIB
+2,MC.EXE
+2,MEP.EXE
+2,MHELP.DLL
+2,MIB.BIN
+2,MIB_II.MIB
+2,MIBCC.EXE
+2,MIDL.EXE
+2,MIPSKD.EXE
+2,MSHELP.DLL
+2,NMAKE.EXE
+2,NTSD.EXE
+2,NTSDEXTS.DLL
+2,PEFILE.DLL
+2,PERFMTR.EXE
+2,PMATCH.DLL
+2,PORT.DLL
+2,PORT.INI
+2,PORTTOOL.EXE
+2,PROBE.DLL
+2,PSTAT.EXE
+2,PVIEW.EXE
+2,PWALK.EXE
+2,QGREP.EXE
+2,RC.EXE
+2,RCPP.EXE
+2,REBASE.EXE
+2,RM.EXE
+2,SHCV.DLL
+2,SMI.MIB
+2,SPY.EXE
+2,SYMCVT.DLL
+2,TGLCASE.DLL
+2,TLLOC.DLL
+2,TLPIPE.DLL
+2,TLSER.DLL
+2,TOP.EXE
+2,UCONVERT.EXE
+2,UGEN.EXE
+2,ULCASE.DLL
+2,UNDEL.EXE
+2,UNDNAME.EXE
+2,UNIPAD.EXE
+2,UOPT.EXE
+2,UUIDGEN.EXE
+2,VERFIX.EXE
+2,WDBGEXTS.DLL
+2,WHERE.EXE
+2,WINDBG.EXE
+2,WINDBGRM.EXE
+2,WINDIFF.EXE
+2,WINOBJ.EXE
+2,WPERF.EXE
+2,ZDI32.DLL
+2,ZDVAPI32.DLL
+2,ZERNEL32.DLL
+2,ZOOMIN.EXE
+2,ZRTDLL.DLL
+2,ZSER32.DLL
+
 [Files-mstools-bin-I386]
+2,ALPHAKD.EXE
 2,APF32CVT.EXE
 2,APF32DMP.EXE
 2,BIND.EXE
-2,C1.ERR
-2,C13232.EXE
-2,C1XX3232.EXE
-2,C23.ERR
-2,C23232.EXE
 2,CAP.DLL
 2,CAP.INI
 2,CAPDUMP.EXE
 2,CAPSETUP.EXE
 2,CAPVIEW.EXE
 2,CAPVIEW.HLP
-2,CL.ERR
-2,CL.EXE
-2,CL32.MSG
-2,CL386.EXE
 2,COMPRESS.EXE
 2,CVDUMP.EXE
 2,CVPACK.EXE
@@ -2031,10 +2046,13 @@ finish_setenvstr = +
 2,DLGEDIT.EXE
 2,DM.DLL
 2,DM32S.DLL
+2,EECANALP.DLL
 2,EECANMIP.DLL
 2,EECANX86.DLL
+2,EECXXALP.DLL
 2,EECXXMIP.DLL
 2,EECXXX86.DLL
+2,EMALP.DLL
 2,EMMIP.DLL
 2,EMX86.DLL
 2,EXP.EXE
@@ -2120,6 +2138,7 @@ finish_setenvstr = +
 2,ZSER32.DLL
 
 [Files-mstools-bin-Mips]
+2,ALPHAKD.EXE
 2,APF32CVT.EXE
 2,APF32DMP.EXE
 2,AS0.EXE
@@ -2141,10 +2160,13 @@ finish_setenvstr = +
 2,DDESPY.EXE
 2,DLGEDIT.EXE
 2,DM.DLL
+2,EECANALP.DLL
 2,EECANMIP.DLL
 2,EECANX86.DLL
+2,EECXXALP.DLL
 2,EECXXMIP.DLL
 2,EECXXX86.DLL
+2,EMALP.DLL
 2,EMMIP.DLL
 2,EMX86.DLL
 2,ERR.CC
@@ -2231,6 +2253,7 @@ finish_setenvstr = +
 2,ZSER32.DLL
 
 [Files-mstools-bin]
+2,DLLSWTCH.BAT
 2,HC.BAT
 2,HC30.EXE
 2,HC31.ERR
@@ -2244,6 +2267,11 @@ finish_setenvstr = +
 2,UNICODE.UTF
 2,WINSOCK.ICO
 
+[Files-mstools-h-alpha]
+2,ALPHAOPS.H
+2,KSALPHA.H
+2,KXALPHA.H
+
 [Files-mstools-h-i386]
 2,CALLCONV.INC
 
@@ -2293,7 +2321,6 @@ finish_setenvstr = +
 2,ISTREAM.H
 2,LARGEINT.H
 2,LIMITS.H
-2,LISTING.INC
 2,LM.H
 2,LMACCESS.H
 2,LMALERT.H
@@ -2391,17 +2418,27 @@ finish_setenvstr = +
 2,WSIPX.H
 2,WSNWLINK.H
 
+[Files-mstools-help-alpha]
+2,CL.HLP
+2,TOOLS.HLP
+
+[Files-mstools-help-i386]
+2,TOOLS.HLP
+
 [Files-mstools-help-index]
 2,API32WH.IND
 2,WIN32KB.IND
 
+[Files-mstools-help-mips]
+2,CL.HLP
+2,TOOLS.HLP
+
 [Files-mstools-help-qh]
 2,MEP.HLP
 
 [Files-mstools-help]
 2,API32WH.HLP
 2,BUILD.HLP
-2,CL.HLP
 2,DLGEDIT.HLP
 2,EDITHLP.HLP
 2,ERRORS.HLP
@@ -2416,7 +2453,6 @@ finish_setenvstr = +
 2,PT.HLP
 2,RC.HLP
 2,SHED.HLP
-2,TOOLS.HLP
 2,TOOLSBK.HLP
 2,UCONVERT.HLP
 2,UNIPAD.HLP
@@ -2431,6 +2467,48 @@ finish_setenvstr = +
 2,QUICK.INI
 2,TOOLS.INI
 
+[Files-mstools-lib-Alpha]
+2,ADVAPI32.LIB
+2,BINMODE.OBJ
+2,CHKSTK.OBJ
+2,COMCTL32.LIB
+2,COMDLG32.LIB
+2,COMMODE.OBJ
+2,CRTDLL.LIB
+2,DLCAPI.LIB
+2,GDI32.LIB
+2,INETMIB1.LIB
+2,KERNEL32.LIB
+2,LARGEINT.LIB
+2,LIBC.LIB
+2,LIBCMT.LIB
+2,LIBCX32.LIB
+2,LMMIB2.LIB
+2,LZ32.LIB
+2,MGMTAPI.LIB
+2,MPR.LIB
+2,NDDEAPI.LIB
+2,NETAPI32.LIB
+2,OLECLI32.LIB
+2,OLESVR32.LIB
+2,RASAPI32.LIB
+2,RPCNDR.LIB
+2,RPCNS4.LIB
+2,RPCRT4.LIB
+2,SCRNSAVE.LIB
+2,SETARGV.OBJ
+2,SHELL32.LIB
+2,SNMP.LIB
+2,USER32.LIB
+2,VDMDBG.LIB
+2,VERSION.LIB
+2,WIN32API.CSV
+2,WIN32SPL.LIB
+2,WINMM.LIB
+2,WINSPOOL.LIB
+2,WINSTRM.LIB
+2,WSOCK32.LIB
+
 [Files-mstools-lib-I386]
 2,ADVAPI32.LIB
 2,BINMODE.OBJ
@@ -2518,412 +2596,12 @@ finish_setenvstr = +
 2,WINSTRM.LIB
 2,WSOCK32.LIB
 
-[Files-mstools-mfc-doc]
-2,README.TXT
-2,TN001.TXT
-2,TN002.TXT
-2,TN003.TXT
-2,TN004.TXT
-2,TN005.TXT
-2,TN006.TXT
-2,TN007.TXT
-2,TN008.TXT
-2,TN009.TXT
-2,TN010.TXT
-2,TN011.TXT
-2,TN012.TXT
-2,TN013.TXT
-2,TN014.TXT
-2,TN015.TXT
-2,TN016.TXT
-
-[Files-mstools-mfc-help]
-2,MFC10WH.HLP
-
-[Files-mstools-mfc-include]
-2,AFX.H
-2,AFX.INL
-2,AFXCOLL.H
-2,AFXDLGS.H
-2,AFXMSG.H
-2,AFXNT.H
-2,AFXOLE.H
-2,AFXOLEUI.H
-2,AFXOLEUI.RC
-2,AFXPEN.H
-2,AFXRES.H
-2,AFXWIN.H
-2,AFXWIN.INL
-
-[Files-mstools-mfc-lib-i386]
-2,NAFXCR.LIB
-2,NAFXCRD.LIB
-2,NAFXCW.LIB
-2,NAFXCWD.LIB
-2,NAFXDW.LIB
-2,NAFXDWD.LIB
-
-[Files-mstools-mfc-lib-mips]
-2,NAFXCR.LIB
-2,NAFXCRD.LIB
-2,NAFXCW.LIB
-2,NAFXCWD.LIB
-2,NAFXDW.LIB
-2,NAFXDWD.LIB
-
-[Files-mstools-mfc-lib]
-2,README.TXT
-
-[Files-mstools-mfc-samples-about2]
-2,ABOUT2.CPP
-2,ABOUT2.DEF
-2,ABOUT2.DLG
-2,ABOUT2.H
-2,ABOUT2.ICO
-2,ABOUT2.RC
-2,MAKEFILE
-2,README.TXT
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-chart]
-2,ABOUT.DLG
-2,CHART.CPP
-2,CHART.DEF
-2,CHART.H
-2,CHART.ICO
-2,CHART.RC
-2,CHARTDLG.CPP
-2,CHARTDLG.H
-2,CHARTWND.CPP
-2,CHARTWND.H
-2,CHFILE.CPP
-2,DOBJECT.CPP
-2,DOBJECT.H
-2,ENTRY.DLG
-2,MAKEFILE
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-ctrltest]
-2,BBUTTON.CPP
-2,BMTEST1.DLG
-2,BMTEST2.DLG
-2,CANCELD.BMP
-2,CANCELF.BMP
-2,CANCELU.BMP
-2,CTRLTEST.CPP
-2,CTRLTEST.DEF
-2,CTRLTEST.H
-2,CTRLTEST.ICO
-2,CTRLTEST.RC
-2,CUSTLIST.CPP
-2,CUSTLIST.DLG
-2,CUSTMENU.CPP
-2,DERPEN.CPP
-2,DERTEST.CPP
-2,DERTEST.DLG
-2,DLGPEN.CPP
-2,DLGPEN.DLG
-2,FEATPEN.CPP
-2,FEATPEN.DLG
-2,IMAGE1D.BMP
-2,IMAGE1F.BMP
-2,IMAGE1U.BMP
-2,IMAGE2D.BMP
-2,IMAGE2F.BMP
-2,IMAGE2U.BMP
-2,MAKEFILE
-2,MUSCROLL.DLL
-2,MUSCROLL.H
-2,OKD.BMP
-2,OKF.BMP
-2,OKU.BMP
-2,PAREDIT.CPP
-2,PAREDIT.H
-2,PAREDIT2.CPP
-2,SPIN.CPP
-2,SPIN.H
-2,SPINTEST.CPP
-2,SPINTEST.DLG
-2,SUBTEST.CPP
-2,SUBTEST.DLG
-2,WCLSTEST.CPP
-2,WCLSTEST.DLG
-
-[Files-mstools-mfc-samples-dlltrace]
-2,HELLO1.CPP
-2,HELLO1.DEF
-2,HELLO1.ICO
-2,HELLO1.RC 
-2,MAKEFILE  
-2,RESOURCE.H
-2,TRACEAPI.H 
-2,TRACER.CPP 
-2,TRACER.DEF 
-2,TRACER.RC  
-2,TRACER1.DEF
-
-[Files-mstools-mfc-samples-fileview]
-2,FILEVIEW.CPP
-2,FILEVIEW.DEF
-2,FILEVIEW.DLG
-2,FILEVIEW.H
-2,FILEVIEW.ICO
-2,FILEVIEW.RC
-2,LINEFILE.CPP
-2,MAKEFILE
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-hello]
-2,HELLO.CPP
-2,HELLO.DEF
-2,HELLO.DLG
-2,HELLO.H
-2,HELLO.ICO
-2,HELLO.RC
-2,MAKEFILE
-2,README.TXT
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-helloapp]
-2,HELLOAPP.CPP
-2,HELLOAPP.DEF
-2,MAKEFILE
-
-[Files-mstools-mfc-samples-mdi]
-2,ABOUT.DLG
-2,BOUNCE.CPP
-2,BOUNCE.H
-2,COMMON.H
-2,HELLO.CPP
-2,HELLO.H
-2,HELLO.ICO
-2,MAKEFILE
-2,MDI.CPP
-2,MDI.DEF
-2,MDI.H
-2,MDI.ICO
-2,MDI.RC
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-minmdi]
-2,ABOUT.DLG
-2,CHILD.ICO
-2,FRAME.ICO
-2,MAKEFILE
-2,MINMDI.CPP
-2,MINMDI.DEF
-2,MINMDI.H
-2,MINMDI.RC
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-minsvr]
-2,ABOUT.DLG
-2,CHANGE.DLG
-2,MAINWND.CPP
-2,MAKEFILE
-2,MINDOC.CPP
-2,MINITEM.CPP
-2,MINSVR.CPP
-2,MINSVR.DEF
-2,MINSVR.H
-2,MINSVR.ICO
-2,MINSVR.RC
-2,MINSVR.REG
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-minsvrmi]
-2,ABOUT.DLG
-2,CHANGE.DLG
-2,MAINWND.CPP
-2,MAKEFILE
-2,MINSVRMI.CPP
-2,MINSVRMI.DEF
-2,MINSVRMI.H
-2,MINSVRMI.ICO
-2,MINSVRMI.RC
-2,MINSVRMI.REG
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-multipad]
-2,BAR.CPP
-2,BAR.H
-2,MAKEFILE
-2,MENU.H
-2,MPFILE.CPP
-2,MPFIND.CPP
-2,MPINIT.CPP
-2,MPMAIN.CPP
-2,MPPRINT.CPP
-2,MULTIPAD.DEF
-2,MULTIPAD.DLG
-2,MULTIPAD.H
-2,MULTIPAD.ICO
-2,MULTIPAD.RC
-2,NOTEPAD.ICO
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-oclient]
-2,FILEIO.CPP
-2,ITEMWND.CPP
-2,ITEMWND.H
-2,MAINWND.CPP
-2,MAINWND.H
-2,MAKEFILE
-2,OCLIENT.CPP
-2,OCLIENT.DEF
-2,OCLIENT.H
-2,OCLIENT.ICO
-2,OCLIENT.RC
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-oserver]
-2,ABOUT.DLG
-2,BIBDOC.CPP
-2,BIBDOC.H
-2,BIBITEM.CPP
-2,BIBITEM.H
-2,BIBREF.CPP
-2,BIBREF.DEF
-2,BIBREF.H
-2,BIBREF.ICO
-2,BIBREF.RC
-2,BIBREF.REG
-2,BIBSVR.CPP
-2,BIBSVR.H
-2,ITEM.DLG
-2,MAINWND.CPP
-2,MAINWND.H
-2,MAKEFILE
-2,RESOURCE.H
-
-[Files-mstools-mfc-samples-showfont]
-2,ABOUT.DLG
-2,CFONT.CPP
-2,CFONT.DLG
-2,DIALOGS.CPP
-2,DRAWING.CPP
-2,MAINWND.CPP
-2,MAINWND.H
-2,MAKEFILE
-2,RESOURCE.H
-2,SHOWFONT.CPP
-2,SHOWFONT.DEF
-2,SHOWFONT.H
-2,SHOWFONT.ICO
-2,SHOWFONT.RC
-
-[Files-mstools-mfc-samples-templdef]
-2,AFXCOLL.HTT
-2,ARRAY.CTT
-2,LIST.CTT
-2,MAKEFILE
-2,MAP.CTT
-2,MAP_S.CTT
-2,MKCOLL.BAT
-2,README.TXT
-2,TEMPLDEF.CPP
-
-[Files-mstools-mfc-samples-tracer]
-2,MAKEFILE
-2,TRACER.CPP
-2,TRACER.DEF
-2,TRACER.ICO
-2,TRACER.RC
-
-[Files-mstools-mfc-samples-tutorial-char]
-2,README.TXT
-
-[Files-mstools-mfc-samples-tutorial-win]
-2,README.TXT
-
-[Files-mstools-mfc-samples-tutorial]
-2,DATABASE.CPP
-2,DATABASE.H
-2,PERSON.CPP
-2,PERSON.H
-2,PHBOOK
-2,PHBOOK.DEF
-2,PHBOOK.DLG
-2,PHBOOK.ICO
-2,PHBOOK.RC
-2,README.TXT
-2,RESOURCE.H
-2,VIEW.CPP
-2,VIEW.H
-
-[Files-mstools-mfc-samples]
-2,BLDSAMP.BAT
-2,NTSAMPLE.MAK
-2,README.TXT
-
-[Files-mstools-mfc-src]
-2,ABORT.CPP
-2,AFX.INI
-2,ARCHIVE.CPP
-2,ARCHIVEX.CPP
-2,ARRAY_B.CPP
-2,ARRAY_D.CPP
-2,ARRAY_O.CPP
-2,ARRAY_P.CPP
-2,ARRAY_S.CPP
-2,ARRAY_W.CPP
-2,ASSERT.CPP
-2,DOSIO_.H
-2,DUMPCONT.CPP
-2,DUMPINIT.CPP
-2,ELEMENTS.H
-2,EXCEPT.CPP
-2,FILE.CPP
-2,FILEMEM.CPP
-2,FILETXT.CPP
-2,FILEX.CPP
-2,LIST_O.CPP
-2,LIST_P.CPP
-2,LIST_S.CPP
-2,MAKEFILE
-2,MAP_PP.CPP
-2,MAP_PW.CPP
-2,MAP_SO.CPP
-2,MAP_SP.CPP
-2,MAP_SS.CPP
-2,MAP_WO.CPP
-2,MAP_WP.CPP
-2,MEMORY.CPP
-2,OBJECT.CPP
-2,OLECLI.CPP
-2,OLEFILE.CPP
-2,OLEMISC.CPP
-2,OLEPTR_.H
-2,OLESVR.CPP
-2,OLEUI.CPP
-2,OLEUI2.CPP
-2,PENCTRL.CPP
-2,PLEX.CPP
-2,PLEX.H
-2,README.TXT
-2,STRING.CPP
-2,STRINGEX.CPP
-2,TIME.CPP
-2,TRACE.CPP
-2,TRACE_.H
-2,TRACEDAT.H
-2,VALIDADD.CPP
-2,VERSION.CPP
-2,WINAPP.CPP
-2,WINBTN.CPP
-2,WINCTRL.CPP
-2,WINDLGS.CPP
-2,WINDOW.CPP
-2,WINDOW_.H
-2,WINGDI.CPP
-2,WINHAND_.H
-2,WINMAIN.CPP
-2,WINMDI.CPP
-2,WINMENU.CPP
-2,WINSTR.CPP
-
-[Files-mstools-mfc]
-2,README.TXT
+[Files-mstools-mssetup-bin-Alpha]
+2,MSCOMSTF.DLL
+2,MSDETSTF.DLL
+2,MSINSSTF.DLL
+2,MSSHLSTF.DLL
+2,MSUILSTF.DLL
 
 [Files-mstools-mssetup-bin-i386]
 2,MSCOMSTF.DLL
@@ -2957,6 +2635,9 @@ finish_setenvstr = +
 2,MSCUISTF.DEF
 2,SETUP.ICO
 
+[Files-mstools-mssetup-disklay-Alpha]
+2,DSKLAYT2.EXE
+
 [Files-mstools-mssetup-disklay-i386]
 2,DSKLAYT2.EXE
 
@@ -2979,6 +2660,10 @@ finish_setenvstr = +
 2,SETUPAPI.H
 2,SETUPAPI.INC
 
+[Files-mstools-mssetup-intldll-setupexe-Alpha]
+2,SETUP.OBJ
+2,VIRWINN.OBJ
+
 [Files-mstools-mssetup-intldll-setupexe-i386]
 2,SETUP.OBJ
 2,VIRWINN.OBJ
@@ -3008,6 +2693,13 @@ finish_setenvstr = +
 2,MSUILSTF.RC
 2,SETUP.ICO
 
+[Files-mstools-mssetup-lib-Alpha]
+2,MSCOMSTF.LIB
+2,MSDETSTF.LIB
+2,MSINSSTF.LIB
+2,MSSHLSTF.LIB
+2,MSUILSTF.LIB
+
 [Files-mstools-mssetup-lib-i386]
 2,MSCOMSTF.LIB
 2,MSDETSTF.LIB
@@ -3022,6 +2714,14 @@ finish_setenvstr = +
 2,MSSHLSTF.LIB
 2,MSUILSTF.LIB
 
+[Files-mstools-mssetup-sample-Alpha]
+2,MSCOMSTF.DLL
+2,MSCUISTF.DLL
+2,MSDETSTF.DLL
+2,MSINSSTF.DLL
+2,MSSHLSTF.DLL
+2,MSUILSTF.DLL
+
 [Files-mstools-mssetup-sample-i386]
 2,MSCOMSTF.DLL
 2,MSCUISTF.DLL
@@ -3064,6 +2764,19 @@ finish_setenvstr = +
 2,README.WRI
 2,SETUP.WRI
 
+[Files-mstools-mstest-Alpha]
+2,LINEEDIT.DLL
+2,MSTEST.HLP
+2,TESTCTRL.DLL
+2,TESTDLGS.DLL
+2,TESTDLGS.EXE
+2,TESTDRVR.EXE
+2,TESTEVNT.DLL
+2,TESTSCRN.DLL
+2,TESTSCRN.EXE
+2,TESTVW32.DLL
+2,WS1.DLL
+
 [Files-mstools-mstest-i386]
 2,LINEEDIT.DLL
 2,MSTEST.HLP
@@ -3113,454 +2826,6 @@ finish_setenvstr = +
 [Files-mstools-mstest]
 2,MSTEST32.TXT
 
-[Files-mstools-ole20-bin-i386]
-2,CL32TEST.EXE
-2,CLIDEMO.EXE
-2,CLTEST.EXE
-2,COMPOB32.DLL
-2,DFVIEW.EXE
-2,DISPCALC.REG
-2,DOBJVIEW.EXE
-2,DSPCALC2.REG
-2,ELLIPSWT.DLL
-2,IPSDEMO1.EXE
-2,MKTYPLIB.EXE
-2,MONITOR.EXE
-2,OLE2AUTO.HLP
-2,OLE2AUTO.REG
-2,OLE2CO32.DLL
-2,OLE2DI32.DLL
-2,OLE2PR32.DLL
-2,OLE2SVR.EXE
-2,OLE2W32.DLL
-2,OLETEST.EXE
-2,OUTLUI.DLL
-2,REGADD.EXE
-2,SDEMO1.EXE
-2,SPOLY.REG
-2,SPOLY2.REG
-2,SR32TEST.EXE
-2,SRVRDEMO.EXE
-2,SRVRTEST.EXE
-2,STDOLE.REG
-2,STDOLE.TLB
-2,STORAG32.DLL
-2,TEST32.REG
-2,TYPLIB32.DLL
-
-[Files-mstools-ole20-bin-mips]
-2,CL32TEST.EXE
-2,CLIDEMO.EXE
-2,CLTEST.EXE
-2,COMPOB32.DLL
-2,DFVIEW.EXE
-2,DOBJVIEW.EXE
-2,ELLIPSWT.DLL
-2,IPSDEMO1.EXE
-2,MONITOR.EXE
-2,OLE2PR32.DLL
-2,OLE2SVR.EXE
-2,OLE2W32.DLL
-2,OLETEST.EXE
-2,OUTLUI.DLL
-2,REGADD.EXE
-2,SDEMO1.EXE
-2,SR32TEST.EXE
-2,SRVRDEMO.EXE
-2,SRVRTEST.EXE
-2,STORAG32.DLL
-2,TEST32.REG
-
-[Files-mstools-ole20-bin]
-2,OLE2.REG
-2,OLE2API.HLP
-2,OLE2UI.HLP
-2,OLETEST.REG
-2,OUTLINE.REG
-2,SDEMO1.REG
-
-[Files-mstools-ole20-h-i386]
-2,DISPATCH.H
-2,VARIANT.H
-
-[Files-mstools-ole20-h]
-2,BTTNCUR.H
-2,COBJPS.H
-2,COGUID.H
-2,COMPOBJ.H
-2,DEBUG.H
-2,DVOBJ.H
-2,ENUMFETC.H
-2,GETICON.H
-2,GIZMOBAR.H
-2,INITGUID.H
-2,LRPCMON.H
-2,MONIKER.H
-2,MSGFILTR.H
-2,OLE1CLS.H
-2,OLE2.H
-2,OLE2ANAC.H
-2,OLE2SP.H
-2,OLE2UI.H
-2,OLE2VER.H
-2,OLEGUID.H
-2,OLEREM.H
-2,OLESTD.H
-2,REGDB.H
-2,SCODE.H
-2,STORAGE.H
-2,UICLASS.H
-2,VALID.H
-
-[Files-mstools-ole20-i386]
-2,README.WRI
-
-[Files-mstools-ole20-lib-i386]
-2,COMPOB32.LIB
-2,OLE2DI32.LIB
-2,OLE2PR32.LIB
-2,OLE2W32.LIB
-2,STORAG32.LIB
-2,TYPLIB32.LIB
-
-[Files-mstools-ole20-lib-mips]
-2,COMPOB32.LIB
-2,OLE2PR32.LIB
-2,OLE2W32.LIB
-2,STORAG32.LIB
-
-[Files-mstools-ole20-mips]
-2,README.WRI
-
-[Files-mstools-ole20-samples-bttncur-i386]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-bttncur-mips]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-bttncur-res]
-2,HARROWS.CUR
-2,HELP.CUR
-2,LARROWS.CUR
-2,MAGNIFY.CUR
-2,NESWARRS.CUR
-2,NODROP.CUR
-2,NWSEARRS.CUR
-2,RARROW.CUR
-2,SARROWS.CUR
-2,SIZEBARH.CUR
-2,SIZEBARV.CUR
-2,SPLITH.CUR
-2,SPLITV.CUR
-2,STDIM120.BMP
-2,STDIM72.BMP
-2,STDIM96.BMP
-2,TABLETOP.CUR
-2,VARROWS.CUR
-
-[Files-mstools-ole20-samples-bttncur]
-2,BTTNCUR.C
-2,BTTNCUR.D32
-2,BTTNCUR.DEF
-2,BTTNCUR.H
-2,BTTNCUR.RC
-2,BTTNCUR.RCV
-2,BTTNCURI.H
-2,CHANGES.TXT
-2,CURSORS.C
-
-[Files-mstools-ole20-samples-dispcalc]
-2,CLSID.C
-2,CLSID.H
-2,DISPCALC.CPP
-2,DISPCALC.DEF
-2,DISPCALC.H
-2,DISPCALC.ICO
-2,DISPCALC.RC
-2,DISPCALC.REG
-2,IDATA.CPP
-2,MAIN.CPP
-2,MAKEFILE
-2,RESOURCE.H
-
-[Files-mstools-ole20-samples-dispdemo]
-2,CLSID.C
-2,CLSID.H
-2,CREMPOLY.CPP
-2,CREMPOLY.H
-2,DISPDEMO.CPP
-2,DISPDEMO.DEF
-2,DISPDEMO.H
-2,DISPDEMO.ICO
-2,DISPDEMO.RC
-2,DISPHELP.CPP
-2,DISPHELP.H
-2,HOSTENV.H
-2,MAKEFILE
-2,MISC.CPP
-2,RESOURCE.H
-2,WINMAIN.CPP
-
-[Files-mstools-ole20-samples-dspcalc2]
-2,CALCTYPE.ODL
-2,CLSID.C
-2,CLSID.H
-2,DSPCALC2.CPP
-2,DSPCALC2.DEF
-2,DSPCALC2.H
-2,DSPCALC2.ICO
-2,DSPCALC2.RC
-2,DSPCALC2.REG
-2,MAIN.CPP
-2,MAKEFILE
-2,RESOURCE.H
-
-[Files-mstools-ole20-samples-gizmobar-i386]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-gizmobar-mips]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-gizmobar]
-2,API.C
-2,GIZMO.C
-2,GIZMO.H
-2,GIZMOBAR.C
-2,GIZMOBAR.D32
-2,GIZMOBAR.DEF
-2,GIZMOBAR.H
-2,GIZMOBAR.RC
-2,GIZMOBAR.RCV
-2,GIZMOINT.H
-2,INIT.C
-2,PAINT.C
-2,WIN1632.H
-
-[Files-mstools-ole20-samples-h]
-2,BTTNCUR.H
-2,ENUMFETC.H
-2,GETICON.H
-2,GIZMOBAR.H
-2,MSGFILTR.H
-2,OLE2UI.H
-2,OLESTD.H
-2,REGDB.H
-
-[Files-mstools-ole20-samples-i386]
-2,MKITALL.BAT
-
-[Files-mstools-ole20-samples-mips]
-2,MKITALL.BAT
-
-[Files-mstools-ole20-samples-ole2ui-i386]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-ole2ui-mips]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-ole2ui-resource-static]
-2,BANG.ICO
-2,DEFAULT.ICO
-2,EGARES.BMP
-2,HIVGARES.BMP
-2,VGARES.BMP
-
-[Files-mstools-ole20-samples-ole2ui-resource-usa]
-2,BUSY.DLG
-2,CONVERT.DLG
-2,FILEOPEN.DLG
-2,ICON.DLG
-2,INSOBJ.DLG
-2,LINKS.DLG
-2,PASTESPL.DLG
-2,PROMPT.DLG
-2,STRINGS.RC
-2,VERLOCAL.H
-
-[Files-mstools-ole20-samples-ole2ui-resource]
-2,LOCALOLE.H
-2,OLE2UI.RCV
-
-[Files-mstools-ole20-samples-ole2ui]
-2,BUSY.C
-2,BUSY.H
-2,COMMON.C
-2,COMMON.H
-2,CONVERT.C
-2,CONVERT.H
-2,DBGUTIL.C
-2,DEBUG.H
-2,DEPEND
-2,DLLFUNCS.C
-2,DRAWICON.C
-2,EDLINKS.H
-2,ENUMFETC.C
-2,ENUMFETC.H
-2,GETICON.C
-2,GETICON.H
-2,HATCH.C
-2,ICON.C
-2,ICON.H
-2,ICONBOX.C
-2,ICONBOX.H
-2,INSOBJ.C
-2,INSOBJ.H
-2,LINKS.C
-2,MSGFILTR.C
-2,MSGFILTR.H
-2,OBJFDBK.C
-2,OLE2UI.C
-2,OLE2UI.DEF
-2,OLE2UI.H
-2,OLE2UI.RC
-2,OLESTD.C
-2,OLESTD.H
-2,OLEUTL.C
-2,OUTLUI.D32
-2,PASTESPL.C
-2,PASTESPL.H
-2,PRECOMP.C
-2,REGDB.C
-2,REGDB.H
-2,RESIMAGE.C
-2,RESIMAGE.H
-2,TARGTDEV.C
-2,TEMPLATE.C
-2,TEMPLATE.H
-2,UTILITY.C
-2,UTILITY.H
-
-[Files-mstools-ole20-samples-outline-i386]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-outline-mips]
-2,MAKEFILE
-
-[Files-mstools-ole20-samples-outline]
-2,CLASSFAC.C
-2,CLIPBRD.C
-2,CNTRBASE.C
-2,CNTRINPL.C
-2,CNTRLINE.C
-2,CNTROUTL.D32
-2,CNTROUTL.DEF
-2,CNTROUTL.H
-2,CNTROUTL.ICO
-2,CNTROUTL.RC
-2,CNTRRC.H
-2,DEBUG.C
-2,DEBUG.RC
-2,DEBUG2.C
-2,DIALOGS.C
-2,DIALOGS.DLG
-2,DRAGCOPY.CUR
-2,DRAGDROP.C
-2,DRAGLINK.CUR
-2,DRAGMOVE.CUR
-2,DRAGNONE.CUR
-2,FRAMETLS.C
-2,FRAMETLS.H
-2,HEADING.C
-2,HEADING.H
-2,ICNTROTL.DEF
-2,ICNTROTL.ICO
-2,ICNTROTL.RC
-2,IMAGE120.BMP
-2,IMAGE72.BMP
-2,IMAGE96.BMP
-2,ISVROTL.DEF
-2,ISVROTL.ICO
-2,ISVROTL.RC
-2,LINKING.C
-2,MAIN.C
-2,MEMMGR.C
-2,MESSAGE.H
-2,OLE2.BMP
-2,OLEAPP.C
-2,OLEDOC.C
-2,OLEOUTL.H
-2,OUTLAPP.C
-2,OUTLDOC.C
-2,OUTLINE.DEF
-2,OUTLINE.H
-2,OUTLINE.ICO
-2,OUTLINE.RC
-2,OUTLINE.REG
-2,OUTLLINE.C
-2,OUTLLIST.C
-2,OUTLNAME.C
-2,OUTLNTBL.C
-2,OUTLRC.H
-2,OUTLTXTL.C
-2,PRECOMP.C
-2,SELCROSS.CUR
-2,STATUS.C
-2,STATUS.H
-2,SVRBASE.C
-2,SVRINPL.C
-2,SVROUTL.DEF
-2,SVROUTL.H
-2,SVROUTL.ICO
-2,SVROUTL.RC
-2,SVRPSOBJ.C
-
-[Files-mstools-ole20-samples-spoly2]
-2,CENUMPT.CPP
-2,CENUMPT.H
-2,CFPOINT.CPP
-2,CFPOLY.CPP
-2,CLSID.C
-2,CLSID.H
-2,COMMON.H
-2,CPOINT.CPP
-2,CPOINT.H
-2,CPOLY.CPP
-2,CPOLY.H
-2,MAKEFILE
-2,SPOLY.H
-2,SPOLY2.DEF
-2,SPOLY2.ICO
-2,SPOLY2.RC
-2,SPOLY2.REG
-2,STATBAR.CPP
-2,STATBAR.H
-2,TDATA.CPP
-2,WINMAIN.CPP
-
-[Files-mstools-ole20-samples-spoly]
-2,CENUMPT.CPP
-2,CENUMPT.H
-2,CLSID.C
-2,CLSID.H
-2,CPOINT.CPP
-2,CPOINT.H
-2,CPOLY.CPP
-2,CPOLY.H
-2,HOSTENV.H
-2,MAKEFILE
-2,MISC.CPP
-2,RESOURCE.H
-2,SPOLY.DEF
-2,SPOLY.H
-2,SPOLY.ICO
-2,SPOLY.RC
-2,SPOLY.REG
-2,STATBAR.CPP
-2,STATBAR.H
-2,WINMAIN.CPP
-
-[Files-mstools-ole20-samples-tibrowse]
-2,MAKEFILE
-2,RESOURCE.H
-2,TIBROWSE.CPP
-2,TIBROWSE.DEF
-2,TIBROWSE.ICO
-2,TIBROWSE.RC
-
-[Files-mstools-ole20]
-2,REGINIT.BAT
-2,SETNVOLE.BAT
-
 [Files-mstools-posix-h-sys]
 2,ERRNO.H
 2,STAT.H
@@ -3583,6 +2848,11 @@ finish_setenvstr = +
 2,UNISTD.H
 2,UTIME.H
 
+[Files-mstools-posix-lib-Alpha]
+2,LIBCPSX.LIB
+2,PSXDLL.LIB
+2,PSXRTL.LIB
+
 [Files-mstools-posix-lib-i386]
 2,LIBCPSX.LIB
 2,PSXDLL.LIB
@@ -3612,6 +2882,9 @@ finish_setenvstr = +
 [Files-mstools-posix]
 2,SETNVPSX.BAT
 
+[Files-mstools-rpc-help]
+2,MIDL10WH.HLP
+
 [Files-mstools-samples-cdtest]
 2,ABOUT.DLG
 2,CDTEST.C
@@ -3934,7 +3207,6 @@ finish_setenvstr = +
 2,VIEW.HXX    
 
 [Files-mstools-samples-help]
-2,MIDL10WH.HLP
 2,SAMPLES.HLP
 
 [Files-mstools-samples-input]
@@ -3973,6 +3245,10 @@ finish_setenvstr = +
 2,MAKEFILE
 2,PAYROLL
 
+[Files-mstools-samples-largeint-Alpha]
+2,LARGEINT.S
+2,MAKEFILE
+
 [Files-mstools-samples-largeint-i386]
 2,DIVLARGE.C
 2,DIVLARGE.H
@@ -4588,37 +3864,6 @@ finish_setenvstr = +
 2,MAKEFILE
 2,NEWCOLR.CUR
 
-[Files-mstools-samples-sdktools-capview]
-2,ARRAY_X.CPP
-2,ARRAY_X.H
-2,B1.BMP
-2,CAPVIEW.CPP
-2,CAPVIEW.DEF
-2,CAPVIEW.DLG
-2,CAPVIEW.H  
-2,CAPVIEW.HPJ
-2,CAPVIEW.ICO
-2,CAPVIEW.RC 
-2,CAPVIEW.RTF
-2,DIALOGS.H  
-2,DISPOBJ.CPP
-2,DISPOBJ.H  
-2,LIST.CPP   
-2,LIST.H     
-2,LIST.ICO   
-2,LISTWIN.CPP
-2,LISTWIN.H  
-2,MAKEFILE
-2,RANGES.CPP
-2,RANGES.H  
-2,RESOURCE.H
-2,TIMER.CPP 
-2,TIMER.H   
-2,TREE.CPP  
-2,TREE.H    
-2,TREE.ICO  
-2,TYPES.H   
-
 [Files-mstools-samples-sdktools-ddespy]
 2,DDESPY.C
 2,DDESPY.DLG
@@ -4760,6 +4005,17 @@ finish_setenvstr = +
 2,TYPECVT.C
 2,TYPECVT.H
 
+[Files-mstools-samples-sdktools-image-drwatson-Alpha]
+2,CONTEXT.C
+2,DISASM.C
+2,DISASM.H
+2,OPTABLE.C
+2,OPTABLE.H
+2,REGS.C
+2,REGS.H
+2,STRINGS.H
+2,WALK.C
+
 [Files-mstools-samples-sdktools-image-drwatson-i386]
 2,CONTEXT.C
 2,DISASM.C
@@ -4803,6 +4059,9 @@ finish_setenvstr = +
 2,UI.C
 2,UTIL.C
 
+[Files-mstools-samples-sdktools-image-imagehlp-Alpha]
+2,UNDECSYM.OBJ
+
 [Files-mstools-samples-sdktools-image-imagehlp-i386]
 2,UNDECSYM.OBJ
 
@@ -5355,6 +4614,35 @@ finish_setenvstr = +
 [Files-mstools]
 2,SETENV.BAT
 
+[Files-support-debug-Alpha-symbols-dll]
+2,ADVAPI32.DBG
+2,COMDLG32.DBG
+2,CRTDLL.DBG
+2,DLCAPI.DBG
+2,GDI32.DBG
+2,INETMIB1.DBG
+2,KERNEL32.DBG
+2,LMMIB2.DBG
+2,LZ32.DBG
+2,MGMTAPI.DBG
+2,MPR.DBG
+2,NDDEAPI.DBG
+2,NETAPI32.DBG
+2,NTDLL.DBG
+2,OLECLI32.DBG
+2,OLESVR32.DBG
+2,RASAPI32.DBG
+2,RPCNS4.DBG
+2,RPCRT4.DBG
+2,SHELL32.DBG
+2,USER32.DBG
+2,VDMDBG.DBG
+2,VERSION.DBG
+2,WIN32SPL.DBG
+2,WINMM.DBG
+2,WINSTRM.DBG
+2,WSOCK32.DBG
+
 [Files-support-debug-i386-symbols-dll]
 2,ADVAPI32.DBG
 2,COMDLG32.DBG