asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix errors during removing files or folders and fix for latin symbols

Browse source 
This commit adds support for unicode strings in OS_Windows::move_to_trash.
Also reverts commit 6188388c5a as it did not add extra null character to the path string (SHFILEOPSTRUCTA and SHFILEOPSTRUCTW require path to be double null-terminated).
This commit is contained in:
neonsoup 2018-08-18 01:30:22 +03:00
parent c93888ae71
commit 42dc2ec080
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
platform/windows/os_windows.cpp
View file

@ -2790,9 +2790,13 @@ bool OS_Windows::is_disable_crash_handler() const {
Error OS_Windows::move_to_trash(const String &p_path) { Error OS_Windows::move_to_trash(const String &p_path) {
SHFILEOPSTRUCTW sf; SHFILEOPSTRUCTW sf;
WCHAR *from = new WCHAR[p_path.length() + 2];
wcscpy(from, p_path.c_str());
from[p_path.length() + 1] = 0;
sf.hwnd = hWnd; sf.hwnd = hWnd;
sf.wFunc = FO_DELETE; sf.wFunc = FO_DELETE;
sf.pFrom = p_path.c_str(); sf.pFrom = from;
sf.pTo = NULL; sf.pTo = NULL;
sf.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION; sf.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION;
sf.fAnyOperationsAborted = FALSE; sf.fAnyOperationsAborted = FALSE;
@ -2800,6 +2804,7 @@ Error OS_Windows::move_to_trash(const String &p_path) {
sf.lpszProgressTitle = NULL; sf.lpszProgressTitle = NULL;
int ret = SHFileOperationW(&sf); int ret = SHFileOperationW(&sf);
delete[] from;
if (ret) { if (ret) {
ERR_PRINTS("SHFileOperation error: " + itos(ret)); ERR_PRINTS("SHFileOperation error: " + itos(ret));