2017-11: Retroactive Updates

* Network drivers disabled (for now until the sigs are manually verified)
* Replaced Notepad2-Mod with Notepad++

Scripts/menu.py

@@ -203,7 +203,7 @@ def menu_tools():
         {'Name': 'Fast Copy', 'Folder': 'FastCopy', 'File': 'FastCopy.exe', 'Args': ['/log', '/logfile=X:\WK\Info\FastCopy.log', '/cmd=noexist_only', '/utf8', '/skip_empty_dir', '/linkdest', '/open_window', '/balloon=FALSE', r'/exclude=$RECYCLE.BIN;$Recycle.Bin;.AppleDB;.AppleDesktop;.AppleDouble;.com.apple.timemachine.supported;.dbfseventsd;.DocumentRevisions-V100*;.DS_Store;.fseventsd;.PKInstallSandboxManager;.Spotlight*;.SymAV*;.symSchedScanLockxz;.TemporaryItems;.Trash*;.vol;.VolumeIcon.icns;desktop.ini;Desktop?DB;Desktop?DF;hiberfil.sys;lost+found;Network?Trash?Folder;pagefile.sys;Recycled;RECYCLER;System?Volume?Information;Temporary?Items;Thumbs.db']},
         {'Name': 'HWiNFO', 'Folder': 'HWiNFO', 'File': 'HWiNFO.exe'},
         {'Name': 'NT Password Editor', 'Folder': 'NT Password Editor', 'File': 'ntpwedit.exe'},
-        {'Name': 'Notepad2', 'Folder': 'Notepad2', 'File': 'Notepad2-Mod.exe'},
+        {'Name': 'Notepad++', 'Folder': 'NotepadPlusPlus', 'File': 'notepadplusplus.exe'},
         {'Name': 'PhotoRec', 'Folder': 'TestDisk', 'File': 'photorec_win.exe', 'Args': ['-new_console:n']},
         {'Name': 'Prime95', 'Folder': 'Prime95', 'File': 'prime95.exe'},
         {'Name': 'ProduKey', 'Folder': 'ProduKey', 'File': 'ProduKey.exe', 'Args': ['/external', '/ExtractEdition:1']},

WK/amd64/Notepad2/Notepad2.ini

@@ -1,106 +0,0 @@
-[Notepad2]
-[Settings]
-SaveSettings=1
-SaveRecentFiles=0
-SaveFindReplace=0
-CloseFind=0
-CloseReplace=0
-NoFindWrap=0
-OpenWithDir=%SystemDrive%\WK\Tools\.bin\Notepad2
-Favorites=%SystemDrive%\WK\Tools\.bin\Notepad2
-PathNameFormat=2
-WordWrap=1
-WordWrapMode=0
-WordWrapIndent=0
-WordWrapSymbols=22
-ShowWordWrapSymbols=0
-MatchBraces=1
-AutoCloseTags=0
-HighlightCurrentLine=1
-AutoIndent=1
-AutoCompleteWords=0
-ShowIndentGuides=0
-TabsAsSpaces=1
-TabIndents=1
-BackspaceUnindents=1
-TabWidth=4
-IndentWidth=0
-MarkLongLines=1
-LongLinesLimit=80
-LongLineMode=1
-ShowSelectionMargin=0
-ShowLineNumbers=1
-ShowCodeFolding=1
-MarkOccurrences=2
-MarkOccurrencesMatchCase=0
-MarkOccurrencesMatchWholeWords=0
-ViewWhiteSpace=0
-ViewEOLs=0
-DefaultEncoding=3
-SkipUnicodeDetection=0
-LoadASCIIasUTF8=0
-LoadNFOasOEM=1
-NoEncodingTags=0
-DefaultEOLMode=0
-FixLineEndings=0
-FixTrailingBlanks=0
-PrintHeader=1
-PrintFooter=0
-PrintColorMode=3
-PrintZoom=10
-PrintMarginLeft=1000
-PrintMarginTop=1000
-PrintMarginRight=1000
-PrintMarginBottom=1000
-SaveBeforeRunningTools=1
-FileWatchingMode=1
-ResetFileWatching=0
-EscFunction=2
-AlwaysOnTop=0
-MinimizeToTray=0
-TransparentMode=0
-ToolbarButtons=1 2 4 0 5 6 0 7 8 9 0 10 11 0 12 0 24 0 13 14 0 15 0 17
-ShowToolbar=1
-ShowStatusbar=1
-EncodingDlgSizeX=256
-EncodingDlgSizeY=262
-RecodeDlgSizeX=256
-RecodeDlgSizeY=262
-FileMRUDlgSizeX=412
-FileMRUDlgSizeY=376
-OpenWithDlgSizeX=384
-OpenWithDlgSizeY=386
-FavoritesDlgSizeX=334
-FavoritesDlgSizeY=316
-FindReplaceDlgPosX=0
-FindReplaceDlgPosY=0
-[Settings2]
-SingleFileInstance=1
-ShellAppUserModelID=Notepad2
-ShellUseSystemMRU=1
-[Recent Files]
-[Recent Find]
-[Recent Replace]
-[Custom Colors]
-01=#000000
-02=#0A246A
-03=#3A6EA5
-04=#003CE6
-05=#006633
-06=#608020
-07=#648000
-08=#A46000
-09=#FFFFFF
-10=#FFFFE2
-11=#FFF1A8
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
-16=#B28B40
-[Styles]
-Use2ndDefaultStyle=0
-DefaultScheme=0
-AutoSelect=1
-SelectDlgSizeX=304
-SelectDlgSizeY=324

WK/amd64/NotepadPlusPlus/config.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<NotepadPlus>
+    <FindHistory nbMaxFindHistoryPath="10" nbMaxFindHistoryFilter="10" nbMaxFindHistoryFind="10" nbMaxFindHistoryReplace="10" matchWord="no" matchCase="no" wrap="yes" directionDown="yes" fifRecuisive="yes" fifInHiddenFolder="no" dlgAlwaysVisible="no" fifFilterFollowsDoc="no" fifFolderFollowsDoc="no" searchMode="0" transparencyMode="1" transparency="150" dotMatchesNewline="no" />
+    <History nbMaxFile="10" inSubMenu="no" customLength="-1" />
+    <GUIConfigs>
+        <GUIConfig name="ToolBar" visible="no">standard</GUIConfig>
+        <GUIConfig name="StatusBar">hide</GUIConfig>
+        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="yes" quitOnEmpty="no" />
+        <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
+        <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
+        <GUIConfig name="TabSetting" replaceBySpace="no" size="4" />
+        <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">no</GUIConfig>
+        <GUIConfig name="Auto-detection">yes</GUIConfig>
+        <GUIConfig name="CheckHistoryFiles">no</GUIConfig>
+        <GUIConfig name="TrayIcon">no</GUIConfig>
+        <GUIConfig name="MaitainIndent">yes</GUIConfig>
+        <GUIConfig name="TagsMatchHighLight" TagAttrHighLight="yes" HighLightNonHtmlZone="no">yes</GUIConfig>
+        <GUIConfig name="RememberLastSession">no</GUIConfig>
+        <GUIConfig name="DetectEncoding">yes</GUIConfig>
+        <GUIConfig name="NewDocDefaultSettings" format="0" encoding="4" lang="0" codepage="-1" openAnsiAsUTF8="yes" />
+        <GUIConfig name="langsExcluded" gr0="0" gr1="0" gr2="0" gr3="0" gr4="0" gr5="0" gr6="0" gr7="0" langMenuCompact="yes" />
+        <GUIConfig name="Print" lineNumber="yes" printOption="3" headerLeft="" headerMiddle="" headerRight="" footerLeft="" footerMiddle="" footerRight="" headerFontName="" headerFontStyle="0" headerFontSize="0" footerFontName="" footerFontStyle="0" footerFontSize="0" margeLeft="0" margeRight="0" margeTop="0" margeBottom="0" />
+        <GUIConfig name="Backup" action="0" useCustumDir="no" dir="" isSnapshotMode="no" snapshotBackupTiming="7000" />
+        <GUIConfig name="TaskList">yes</GUIConfig>
+        <GUIConfig name="MRU">yes</GUIConfig>
+        <GUIConfig name="URL">2</GUIConfig>
+        <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
+        <GUIConfig name="auto-completion" autoCAction="3" triggerFromNbChar="1" autoCIgnoreNumbers="yes" funcParams="yes" />
+        <GUIConfig name="auto-insert" parentheses="no" brackets="no" curlyBrackets="no" quotes="no" doubleQuotes="no" htmlXmlTag="no" />
+        <GUIConfig name="sessionExt"></GUIConfig>
+        <GUIConfig name="workspaceExt"></GUIConfig>
+        <GUIConfig name="MenuBar">hide</GUIConfig>
+        <GUIConfig name="Caret" width="1" blinkRate="600" />
+        <GUIConfig name="ScintillaGlobalSettings" enableMultiSelection="no" />
+        <GUIConfig name="openSaveDir" value="0" defaultDirPath="" />
+        <GUIConfig name="titleBar" short="no" />
+        <GUIConfig name="wordCharList" useDefault="yes" charsAdded="" />
+        <GUIConfig name="delimiterSelection" leftmostDelimiter="40" rightmostDelimiter="41" delimiterSelectionOnEntireDocument="no" />
+        <GUIConfig name="multiInst" setting="0" />
+        <GUIConfig name="MISC" fileSwitcherWithoutExtColumn="no" backSlashIsEscapeCharacterForSql="yes" newStyleSaveDlg="no" isFolderDroppedOpenFiles="no" />
+        <GUIConfig name="searchEngine" searchEngineChoice="1" searchEngineCustom="" />
+        <GUIConfig name="SmartHighLight" matchCase="no" wholeWordOnly="no" useFindSettings="no" onAnotherView="no">yes</GUIConfig>
+        <GUIConfig name="ScintillaPrimaryView" lineNumberMargin="show" bookMarkMargin="show" indentGuideLine="show" folderMarkStyle="box" lineWrapMethod="aligned" currentLineHilitingShow="show" scrollBeyondLastLine="no" disableAdvancedScrolling="no" wrapSymbolShow="hide" Wrap="no" borderEdge="yes" edge="no" edgeNbColumn="80" zoom="0" zoom2="0" whiteSpaceShow="hide" eolShow="hide" borderWidth="2" smoothFont="no" />
+        <GUIConfig name="DockingManager" leftWidth="200" rightWidth="200" topHeight="200" bottomHeight="200">
+            <ActiveTabs cont="0" activeTab="-1" />
+            <ActiveTabs cont="1" activeTab="-1" />
+            <ActiveTabs cont="2" activeTab="-1" />
+            <ActiveTabs cont="3" activeTab="-1" />
+        </GUIConfig>
+    </GUIConfigs>
+    <ProjectPanels>
+        <ProjectPanel id="0" workSpaceFile="" />
+        <ProjectPanel id="1" workSpaceFile="" />
+        <ProjectPanel id="2" workSpaceFile="" />
+    </ProjectPanels>
+</NotepadPlus>

WK/x86/Notepad2/Notepad2.ini

@@ -1,106 +0,0 @@
-[Notepad2]
-[Settings]
-SaveSettings=1
-SaveRecentFiles=0
-SaveFindReplace=0
-CloseFind=0
-CloseReplace=0
-NoFindWrap=0
-OpenWithDir=%SystemDrive%\WK\Tools\.bin\Notepad2
-Favorites=%SystemDrive%\WK\Tools\.bin\Notepad2
-PathNameFormat=2
-WordWrap=1
-WordWrapMode=0
-WordWrapIndent=0
-WordWrapSymbols=22
-ShowWordWrapSymbols=0
-MatchBraces=1
-AutoCloseTags=0
-HighlightCurrentLine=1
-AutoIndent=1
-AutoCompleteWords=0
-ShowIndentGuides=0
-TabsAsSpaces=1
-TabIndents=1
-BackspaceUnindents=1
-TabWidth=4
-IndentWidth=0
-MarkLongLines=1
-LongLinesLimit=80
-LongLineMode=1
-ShowSelectionMargin=0
-ShowLineNumbers=1
-ShowCodeFolding=1
-MarkOccurrences=2
-MarkOccurrencesMatchCase=0
-MarkOccurrencesMatchWholeWords=0
-ViewWhiteSpace=0
-ViewEOLs=0
-DefaultEncoding=3
-SkipUnicodeDetection=0
-LoadASCIIasUTF8=0
-LoadNFOasOEM=1
-NoEncodingTags=0
-DefaultEOLMode=0
-FixLineEndings=0
-FixTrailingBlanks=0
-PrintHeader=1
-PrintFooter=0
-PrintColorMode=3
-PrintZoom=10
-PrintMarginLeft=1000
-PrintMarginTop=1000
-PrintMarginRight=1000
-PrintMarginBottom=1000
-SaveBeforeRunningTools=1
-FileWatchingMode=1
-ResetFileWatching=0
-EscFunction=2
-AlwaysOnTop=0
-MinimizeToTray=0
-TransparentMode=0
-ToolbarButtons=1 2 4 0 5 6 0 7 8 9 0 10 11 0 12 0 24 0 13 14 0 15 0 17
-ShowToolbar=1
-ShowStatusbar=1
-EncodingDlgSizeX=256
-EncodingDlgSizeY=262
-RecodeDlgSizeX=256
-RecodeDlgSizeY=262
-FileMRUDlgSizeX=412
-FileMRUDlgSizeY=376
-OpenWithDlgSizeX=384
-OpenWithDlgSizeY=386
-FavoritesDlgSizeX=334
-FavoritesDlgSizeY=316
-FindReplaceDlgPosX=0
-FindReplaceDlgPosY=0
-[Settings2]
-SingleFileInstance=1
-ShellAppUserModelID=Notepad2
-ShellUseSystemMRU=1
-[Recent Files]
-[Recent Find]
-[Recent Replace]
-[Custom Colors]
-01=#000000
-02=#0A246A
-03=#3A6EA5
-04=#003CE6
-05=#006633
-06=#608020
-07=#648000
-08=#A46000
-09=#FFFFFF
-10=#FFFFE2
-11=#FFF1A8
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
-16=#B28B40
-[Styles]
-Use2ndDefaultStyle=0
-DefaultScheme=0
-AutoSelect=1
-SelectDlgSizeX=304
-SelectDlgSizeY=324

WK/x86/NotepadPlusPlus/config.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<NotepadPlus>
+    <FindHistory nbMaxFindHistoryPath="10" nbMaxFindHistoryFilter="10" nbMaxFindHistoryFind="10" nbMaxFindHistoryReplace="10" matchWord="no" matchCase="no" wrap="yes" directionDown="yes" fifRecuisive="yes" fifInHiddenFolder="no" dlgAlwaysVisible="no" fifFilterFollowsDoc="no" fifFolderFollowsDoc="no" searchMode="0" transparencyMode="1" transparency="150" dotMatchesNewline="no" />
+    <History nbMaxFile="10" inSubMenu="no" customLength="-1" />
+    <GUIConfigs>
+        <GUIConfig name="ToolBar" visible="no">standard</GUIConfig>
+        <GUIConfig name="StatusBar">hide</GUIConfig>
+        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="yes" quitOnEmpty="no" />
+        <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
+        <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
+        <GUIConfig name="TabSetting" replaceBySpace="no" size="4" />
+        <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">no</GUIConfig>
+        <GUIConfig name="Auto-detection">yes</GUIConfig>
+        <GUIConfig name="CheckHistoryFiles">no</GUIConfig>
+        <GUIConfig name="TrayIcon">no</GUIConfig>
+        <GUIConfig name="MaitainIndent">yes</GUIConfig>
+        <GUIConfig name="TagsMatchHighLight" TagAttrHighLight="yes" HighLightNonHtmlZone="no">yes</GUIConfig>
+        <GUIConfig name="RememberLastSession">no</GUIConfig>
+        <GUIConfig name="DetectEncoding">yes</GUIConfig>
+        <GUIConfig name="NewDocDefaultSettings" format="0" encoding="4" lang="0" codepage="-1" openAnsiAsUTF8="yes" />
+        <GUIConfig name="langsExcluded" gr0="0" gr1="0" gr2="0" gr3="0" gr4="0" gr5="0" gr6="0" gr7="0" langMenuCompact="yes" />
+        <GUIConfig name="Print" lineNumber="yes" printOption="3" headerLeft="" headerMiddle="" headerRight="" footerLeft="" footerMiddle="" footerRight="" headerFontName="" headerFontStyle="0" headerFontSize="0" footerFontName="" footerFontStyle="0" footerFontSize="0" margeLeft="0" margeRight="0" margeTop="0" margeBottom="0" />
+        <GUIConfig name="Backup" action="0" useCustumDir="no" dir="" isSnapshotMode="no" snapshotBackupTiming="7000" />
+        <GUIConfig name="TaskList">yes</GUIConfig>
+        <GUIConfig name="MRU">yes</GUIConfig>
+        <GUIConfig name="URL">2</GUIConfig>
+        <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
+        <GUIConfig name="auto-completion" autoCAction="3" triggerFromNbChar="1" autoCIgnoreNumbers="yes" funcParams="yes" />
+        <GUIConfig name="auto-insert" parentheses="no" brackets="no" curlyBrackets="no" quotes="no" doubleQuotes="no" htmlXmlTag="no" />
+        <GUIConfig name="sessionExt"></GUIConfig>
+        <GUIConfig name="workspaceExt"></GUIConfig>
+        <GUIConfig name="MenuBar">hide</GUIConfig>
+        <GUIConfig name="Caret" width="1" blinkRate="600" />
+        <GUIConfig name="ScintillaGlobalSettings" enableMultiSelection="no" />
+        <GUIConfig name="openSaveDir" value="0" defaultDirPath="" />
+        <GUIConfig name="titleBar" short="no" />
+        <GUIConfig name="wordCharList" useDefault="yes" charsAdded="" />
+        <GUIConfig name="delimiterSelection" leftmostDelimiter="40" rightmostDelimiter="41" delimiterSelectionOnEntireDocument="no" />
+        <GUIConfig name="multiInst" setting="0" />
+        <GUIConfig name="MISC" fileSwitcherWithoutExtColumn="no" backSlashIsEscapeCharacterForSql="yes" newStyleSaveDlg="no" isFolderDroppedOpenFiles="no" />
+        <GUIConfig name="searchEngine" searchEngineChoice="1" searchEngineCustom="" />
+        <GUIConfig name="SmartHighLight" matchCase="no" wholeWordOnly="no" useFindSettings="no" onAnotherView="no">yes</GUIConfig>
+        <GUIConfig name="ScintillaPrimaryView" lineNumberMargin="show" bookMarkMargin="show" indentGuideLine="show" folderMarkStyle="box" lineWrapMethod="aligned" currentLineHilitingShow="show" scrollBeyondLastLine="no" disableAdvancedScrolling="no" wrapSymbolShow="hide" Wrap="no" borderEdge="yes" edge="no" edgeNbColumn="80" zoom="0" zoom2="0" whiteSpaceShow="hide" eolShow="hide" borderWidth="2" smoothFont="no" />
+        <GUIConfig name="DockingManager" leftWidth="200" rightWidth="200" topHeight="200" bottomHeight="200">
+            <ActiveTabs cont="0" activeTab="-1" />
+            <ActiveTabs cont="1" activeTab="-1" />
+            <ActiveTabs cont="2" activeTab="-1" />
+            <ActiveTabs cont="3" activeTab="-1" />
+        </GUIConfig>
+    </GUIConfigs>
+    <ProjectPanels>
+        <ProjectPanel id="0" workSpaceFile="" />
+        <ProjectPanel id="1" workSpaceFile="" />
+        <ProjectPanel id="2" workSpaceFile="" />
+    </ProjectPanels>
+</NotepadPlus>

make.cmd

@@ -112,7 +112,7 @@ for %%a in (amd64 x86) do (
     rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-StorageWMI_en-us.cab" /logpath:"dism.log"
     
     rem Add Drivers
-    dism /add-driver /image:"!mount!" /driver:"!drivers!" /recurse /logpath:"dism.log"
+    REM dism /add-driver /image:"!mount!" /driver:"!drivers!" /recurse /logpath:"dism.log"
     
     rem Force RamDisk size to try and avoid capture-image errors
     dism /image:"!mount!" /set-scratchspace:512
@@ -142,7 +142,7 @@ for %%a in (amd64 x86) do (
     reg add "HKLM\WinPE-SYS\ControlSet001\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d "%%SystemRoot%%\system32;%%SystemRoot%%;%%SystemRoot%%\System32\Wbem;%%SYSTEMROOT%%\System32\WindowsPowerShell\v1.0\;%%SystemDrive%%\WK\7-Zip;%%SystemDrive%%\WK\python;%%SystemDrive%%\WK\wimlib" /f
 
     rem Replace Notepad
-    reg add "HKLM\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /v Debugger /t REG_SZ /d "X:\WK\Notepad2\Notepad2-Mod.exe /z" /f
+    reg add "HKLM\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /v Debugger /t REG_SZ /d "X:\WK\NotepadPlusPlus\notepadplusplus.exe /z" /f
 
     rem Unload registry hives
     reg unload HKLM\WinPE-SW