Skip to content

bpo-41142: Add support of non-ASCII paths for CAB files. #21195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Jun 30, 2020
Merged

bpo-41142: Add support of non-ASCII paths for CAB files. #21195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Lib/test/test_msilib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,16 @@ def test_getproperty_uninitialized_var(self):
with self.assertRaises(msilib.MSIError):
si.GetProperty(-1)

def test_FCICreate(self):
filepath = TESTFN + '.txt'
cabpath = TESTFN + '.cab'
self.addCleanup(unlink, filepath)
with open(filepath, 'wb'):
pass
self.addCleanup(unlink, cabpath)
msilib.FCICreate(cabpath, [(filepath, 'test.txt')])
self.assertTrue(os.path.isfile(cabpath))


class Test_make_id(unittest.TestCase):
#http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2020-06-28-12-40-41.bpo-41142.jpZzzh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`msilib` now supports creating CAB files with non-ASCII file path and
adding files with non-ASCII file path to them.
63 changes: 53 additions & 10 deletions PC/_msi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,50 @@ uuidcreate(PyObject* obj, PyObject*args)

}

/* Helper for converting file names from UTF-8 to wchat_t*. */
static wchar_t *
utf8_to_wchar(const char *s, int *err)
{
PyObject *obj = PyUnicode_FromString(s);
if (obj == NULL) {
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
*err = ENOMEM;
}
else {
*err = EINVAL;
}
PyErr_Clear();
return NULL;
}
wchar_t *ws = PyUnicode_AsWideCharString(obj, NULL);
if (ws == NULL) {
*err = ENOMEM;
PyErr_Clear();
}
Py_DECREF(obj);
return ws;
}

/* FCI callback functions */

static FNFCIALLOC(cb_alloc)
{
return malloc(cb);
return PyMem_RawMalloc(cb);
}

static FNFCIFREE(cb_free)
{
free(memory);
PyMem_RawFree(memory);
}

static FNFCIOPEN(cb_open)
{
int result = _open(pszFile, oflag | O_NOINHERIT, pmode);
wchar_t *ws = utf8_to_wchar(pszFile, err);
if (ws == NULL) {
return -1;
}
int result = _wopen(ws, oflag | O_NOINHERIT, pmode);
PyMem_Free(ws);
if (result == -1)
*err = errno;
return result;
Expand Down Expand Up @@ -95,7 +124,12 @@ static FNFCISEEK(cb_seek)

static FNFCIDELETE(cb_delete)
{
int result = remove(pszFile);
wchar_t *ws = utf8_to_wchar(pszFile, err);
if (ws == NULL) {
return -1;
}
int result = _wremove(ws);
PyMem_Free(ws);
if (result != 0)
*err = errno;
return result;
Expand Down Expand Up @@ -159,15 +193,22 @@ static FNFCIGETOPENINFO(cb_getopeninfo)
FILETIME filetime;
HANDLE handle;

wchar_t *ws = utf8_to_wchar(pszName, err);
if (ws == NULL) {
return -1;
}

/* Need Win32 handle to get time stamps */
handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL,
handle = CreateFileW(ws, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (handle == INVALID_HANDLE_VALUE)
if (handle == INVALID_HANDLE_VALUE) {
PyMem_Free(ws);
return -1;
}

if (GetFileInformationByHandle(handle, &bhfi) == FALSE)
{
if (GetFileInformationByHandle(handle, &bhfi) == FALSE) {
CloseHandle(handle);
PyMem_Free(ws);
return -1;
}

Expand All @@ -179,7 +220,9 @@ static FNFCIGETOPENINFO(cb_getopeninfo)

CloseHandle(handle);

return _open(pszName, _O_RDONLY | _O_BINARY | O_NOINHERIT);
int result = _wopen(ws, _O_RDONLY | _O_BINARY | O_NOINHERIT);
PyMem_Free(ws);
return result;
}

static PyObject* fcicreate(PyObject* obj, PyObject* args)
Expand Down Expand Up @@ -212,7 +255,7 @@ static PyObject* fcicreate(PyObject* obj, PyObject* args)
ccab.setID = 0;
ccab.szDisk[0] = '\0';

for (i = 0, p = cabname; *p; p = CharNext(p))
for (i = 0, p = cabname; *p; p++)
if (*p == '\\' || *p == '/')
i = p - cabname + 1;

Expand Down