win32_trash() to work correctly on various version of windows.

Careful tests are still required.
This commit is contained in:
dolphin6k 2021-10-31 15:49:55 +09:00
parent b667aa7d79
commit f9efb48450

View file

@ -1,15 +1,37 @@
#include <windows.h>
#include <tchar.h>
int win32_trash(char *path);
int win32_trash(char *path)
int MoveFileToRecycleBin(const TCHAR *fullPathName);
int win32_trash(const char *path);
int MoveFileToRecycleBin(const TCHAR *fullPathName)
{
SHFILEOPSTRUCT op;
SHFILEOPSTRUCT fileOp;
const TCHAR *src = fullPathName;
TCHAR *dest;
fileOp.pFrom = dest = alloca(sizeof(*dest) * (_tcslen(fullPathName) + 2));
while((*dest++ = *src++) != _T('\0')) {}
*dest = _T('\0');
fileOp.hwnd = NULL;
fileOp.wFunc = FO_DELETE;
fileOp.pTo = NULL;
fileOp.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT | FOF_ALLOWUNDO;
return SHFileOperation(&fileOp);
}
int win32_trash(const char *path)
{
char *p, *src;
int ret;
op.wFunc = FO_DELETE;
op.pFrom = path;
op.fFlags = FOF_SILENT|FOF_ALLOWUNDO;
ret = SHFileOperationA(&op);
src = p = strdup(path);
while(*p != '\0'){
if (*p == '/') *p = '\\';
p++;
}
ret = MoveFileToRecycleBin(src);
free(p);
return ret;
}