+ changed file and dir naming (grepWin -> grepWinNP3)

Versions/build.txt

@@ -1 +1 @@
-3
+4

np3portableapp/build_np3portableapp.cmd

@@ -61,7 +61,7 @@ call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\themes
 call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v142
 call :RESOLVEPATH NP3_X64_DIR %SCRIPT_DIR%..\Bin\Release_x64_v142
 
-call :RESOLVEPATH NP3_GREPWIN_DIR %SCRIPT_DIR%..\Build\grepWin
+call :RESOLVEPATH NP3_GREPWIN_DIR %SCRIPT_DIR%..\grepWinNP3
 
 call :RESOLVEPATH NP3_PORTAPP_DIR %SCRIPT_DIR%Notepad3Portable
 call :RESOLVEPATH NP3_PORTAPP_INFO %NP3_PORTAPP_DIR%\App\AppInfo\appinfo
@@ -163,10 +163,10 @@ copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y
 copy "%NP3_GREPWIN_DIR%\GPL_v3.0_LICENSE.txt" "%NP3_PORTAPP_DIR%\Other\Help\grepWin_GPL_v3.0_LICENSE.txt" /Y /V
 mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng"
 copy /B "%NP3_GREPWIN_DIR%\grepWinNP3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWinNP3.exe" /Y /V
-copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\lang\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
 mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng"
 copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_x64.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWinNP3.exe" /Y /V
-copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\lang\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
 
 :: --------------------------------------------------------------------------------------------------------------------
 

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.326.3"
+    version="5.20.326.4"
     type="win32"
   />
   <description>Notepad3 NF</description>

src/Dialogs.c

@@ -3505,7 +3505,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
     }
   }
 
-  // working (grepwin.ini) directory
+  // working (grepWinNP3.ini) directory
   WCHAR tchGrepWinDir[MAX_PATH] = { L'\0' };
   WCHAR tchIniFilePath[MAX_PATH] = { L'\0' };
 
@@ -3519,7 +3519,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
     }
 
     // grepWin INI-File
-    const WCHAR* const gwIniFileName = L"grepwin.ini";
+    const WCHAR* const gwIniFileName = L"grepWinNP3.ini";
     StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), StrIsNotEmpty(Globals.IniFile) ? Globals.IniFile : Globals.IniFileDefault);
     PathRemoveFileSpec(tchIniFilePath);
     PathAppend(tchIniFilePath, gwIniFileName);
@@ -3599,7 +3599,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
   // grepWin arguments
   const WCHAR* const tchParamFmt = L"/portable /content %s /inipath:\"%s\"";
   WCHAR tchParams[MAX_PATH + 80] = { L'\0' };
-  // relative grepwin.ini path (for shorter cmdline)
+  // relative grepWinNP3.ini path (for shorter cmdline)
   if (PathRelativePathTo(tchTemp, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchIniFilePath, FILE_ATTRIBUTE_NORMAL)) {
     StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchTemp);
   }

src/VersionEx.h

@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 326
-#define VERSION_BUILD 3
+#define VERSION_BUILD 4
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.4
 #define UCHARDET_VER 2018.09.27