arsenetar/send2trash
1
0
Fork 0
mirror of https://github.com/arsenetar/send2trash.git synced 2025-03-11 22:24:36 +00:00
Code Releases Activity

Improved the trash_win module.

Browse Source
This commit is contained in:
Virgil Dupras 2010-04-06 10:41:07 +01:00
parent b8434f7cc0
commit be87b55146
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/trash_win.c
View File

@ -5,7 +5,7 @@
#include "windows.h" #include "windows.h"
#include "shlobj.h" #include "shlobj.h"
/* WARNING: If the filepath is not fully qualify, Windows deletes the file /* WARNING: If the filepath is not fully qualified, Windows deletes the file
rather than sending it to trash. rather than sending it to trash.
*/ */
@ -13,7 +13,7 @@ static PyObject* trash_win_send(PyObject *self, PyObject *args)
{ {
SHFILEOPSTRUCTW op; SHFILEOPSTRUCTW op;
PyObject *filepath; PyObject *filepath;
Py_ssize_t len, cpysize; Py_ssize_t len;
WCHAR filechars[MAX_PATH+1]; WCHAR filechars[MAX_PATH+1];
int r; int r;
@ -27,9 +27,7 @@ static PyObject* trash_win_send(PyObject *self, PyObject *args)
} }
len = PyUnicode_GET_SIZE(filepath); len = PyUnicode_GET_SIZE(filepath);
/* +2 because we are going to add two null chars at the end */ memcpy(filechars, PyUnicode_AsUnicode(filepath), sizeof(WCHAR)*len);
cpysize = sizeof(WCHAR) * (len + 2);
memcpy(filechars, PyUnicode_AsUnicode(filepath), cpysize);
filechars[len] = '\0'; filechars[len] = '\0';
filechars[len+1] = '\0'; filechars[len+1] = '\0';
@ -39,6 +37,12 @@ static PyObject* trash_win_send(PyObject *self, PyObject *args)
op.pTo = NULL; op.pTo = NULL;
op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
r = SHFileOperationW(&op); r = SHFileOperationW(&op);
if (r != 0) {
PyErr_Format(PyExc_OSError, "Couldn't perform operation. Error code: %d", r);
return NULL;
}
return Py_None; return Py_None;
} }