Add NPP_UAC_CREATEEMPTYFILE

+ minor fixes for FileManager::deleteFile

Follow notepad-plus-plus@4b0fc8d

Fix notepad-plus-plus#16933 (comment)

Author: xomx

PowerEditor/src/MISC/Common/Common.h

@@ -336,4 +336,5 @@ class ControlInfoTip final
 #define NPP_UAC_SAVE_SIGN L"#UAC-SAVE#"
 #define NPP_UAC_SETFILEATTRIBUTES_SIGN L"#UAC-SETFILEATTRIBUTES#"
 #define NPP_UAC_MOVEFILE_SIGN L"#UAC-MOVEFILE#"
+#define NPP_UAC_CREATEEMPTYFILE_SIGN L"#UAC-CREATEEMPTYFILE#"
 DWORD invokeNppUacOp(std::wstring& strCmdLineParams);

PowerEditor/src/ScintillaComponent/Buffer.cpp

@@ -1079,21 +1079,23 @@ bool FileManager::reloadBufferDeferred(BufferID id)
 
 bool FileManager::deleteFile(BufferID id)
 {
+	if (id == BUFFER_INVALID)
+		return false;
+
 	const Buffer* buf = getBufferByID(id);
 	wstring fileNamePath = buf->getFullPathName();
+	if (!doesFileExist(fileNamePath.c_str()))
+		return false;
 
 	// Make sure to form a string with double '\0' terminator.
 	fileNamePath.append(1, '\0');
 
-	if (!doesFileExist(fileNamePath.c_str()))
-		return false;
-
 	SHFILEOPSTRUCT fileOpStruct = {};
 	fileOpStruct.hwnd = NULL;
 	fileOpStruct.pFrom = fileNamePath.c_str();
 	fileOpStruct.pTo = NULL;
 	fileOpStruct.wFunc = FO_DELETE;
-	fileOpStruct.fFlags = FOF_ALLOWUNDO;
+	fileOpStruct.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION; // FOF_NOCONFIRMATION - prevent possible redundant shell-dlg (Notepad++ uses its own delete-confirmation dlg)
 	fileOpStruct.fAnyOperationsAborted = false;
 	fileOpStruct.hNameMappings         = NULL;
 	fileOpStruct.lpszProgressTitle     = NULL;
@@ -2079,10 +2081,26 @@ BufferID FileManager::getBufferFromDocument(Document doc)
 }
 
 
-bool FileManager::createEmptyFile(const wchar_t * path)
+bool FileManager::createEmptyFile(const wchar_t* path)
 {
 	Win32_IO_File file(path);
-	return file.isOpened();
+	if (!file.isOpened())
+	{
+		if (file.getLastErrorCode() != ERROR_ACCESS_DENIED)
+			return false;
+
+		// ERROR_ACCESS_DENIED, try the same but elevated
+		// (notepad++.exe #UAC-CREATEEMPTYFILE# new_empty_file_path)
+		wstring strCmdLineParams = NPP_UAC_CREATEEMPTYFILE_SIGN;
+		strCmdLineParams += L" \"";
+		strCmdLineParams += path;
+		strCmdLineParams += L"\"";
+		DWORD dwNppUacOpError = invokeNppUacOp(strCmdLineParams);
+		if (dwNppUacOpError != NO_ERROR)
+			return false;
+	}
+
+	return true;
 }
 
 

PowerEditor/src/winmain.cpp

@@ -489,6 +489,20 @@ DWORD nppUacMoveFile(const wchar_t* wszOriginalFilePath, const wchar_t* wszNewFi
 		return ERROR_SUCCESS;
 }
 
+DWORD nppUacCreateEmptyFile(const wchar_t* wszNewEmptyFilePath)
+{
+	if (lstrlenW(wszNewEmptyFilePath) == 0) // safe check (lstrlen returns 0 for possible nullptr)
+		return ERROR_INVALID_PARAMETER;
+	if (doesFileExist(wszNewEmptyFilePath))
+		return ERROR_FILE_EXISTS;
+
+	Win32_IO_File file(wszNewEmptyFilePath);
+	if (!file.isOpened())
+		return file.getLastErrorCode();
+
+	return ERROR_SUCCESS;
+}
+
 } // namespace
 
 
@@ -529,6 +543,12 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE /*hPrevInstance
 				// __wargv[x]: 2 ... originalFilePath, 3  ...  newFilePath
 				return static_cast<int>(nppUacMoveFile(__wargv[2], __wargv[3]));
 			}
+
+			if ((__argc == 3) && (wcscmp(wszNppUacOpSign, NPP_UAC_CREATEEMPTYFILE_SIGN) == 0))
+			{
+				// __wargv[x]: 2 ... newEmptyFilePath
+				return static_cast<int>(nppUacCreateEmptyFile(__wargv[2]));
+			}
 		}
 	} // Notepad++ UAC OPS////////////////////////////////////////////////////////////////////////////////////////////