diff --git a/src/calibre/devices/usbobserver/usbobserver.c b/src/calibre/devices/usbobserver/usbobserver.c index 7268380e63..50adb8e53b 100644 --- a/src/calibre/devices/usbobserver/usbobserver.c +++ b/src/calibre/devices/usbobserver/usbobserver.c @@ -105,7 +105,7 @@ usbobserver_get_usb_devices(PyObject *self, PyObject *args) { } io_iterator_t iter; - kr = IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, &iter); + kr = IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); if (KERN_SUCCESS != kr) { printf("IOServiceGetMatchingServices returned 0x%08x\n", kr); PyErr_SetString(PyExc_RuntimeError, "Could not run IO Matching"); @@ -217,7 +217,7 @@ usbobserver_get_usb_drives(PyObject *self, PyObject *args) { ans = PyList_New(0); if (ans == NULL) return PyErr_NoMemory(); - kr = IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDict, &iter); + kr = IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict, &iter); if (KERN_SUCCESS != kr) { printf("IOServiceGetMatchingServices returned 0x%08x\n", kr); PyErr_SetString(PyExc_RuntimeError, "Could not run IO Matching"); @@ -411,7 +411,7 @@ usbobserver_is_mtp(PyObject *self, PyObject * args) { CFDictionarySetValue(matching_dict, CFSTR(kUSBDeviceReleaseNumber), num); CFRelease(num); num = NULL; - kr = IOServiceGetMatchingServices(kIOMasterPortDefault, matching_dict, &iter); + kr = IOServiceGetMatchingServices(kIOMainPortDefault, matching_dict, &iter); matching_dict = NULL; if (KERN_SUCCESS != kr) { PyErr_Format(PyExc_RuntimeError, "IOServiceGetMatchingServices returned 0x%x", kr); diff --git a/src/calibre/utils/fonts/winfonts.cpp b/src/calibre/utils/fonts/winfonts.cpp index 3eb0d122a8..36ecf2f5db 100644 --- a/src/calibre/utils/fonts/winfonts.cpp +++ b/src/calibre/utils/fonts/winfonts.cpp @@ -24,7 +24,7 @@ static wchar_t* unicode_to_wchar(PyObject *o) { Py_ssize_t len; if (o == NULL) return NULL; if (!PyUnicode_Check(o)) {PyErr_Format(PyExc_TypeError, "The python object must be a unicode object"); return NULL;} - len = PyUnicode_GET_SIZE(o); + len = PyUnicode_GET_LENGTH(o); buf = (wchar_t *)calloc(len+2, sizeof(wchar_t)); if (buf == NULL) { PyErr_NoMemory(); return NULL; } len = PyUnicode_AsWideChar(o, buf, len);