Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-25 10:36:21 +05:30
parent bb6d43d7cd
commit 452058a4aa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/mtp/windows/content_enumeration.cpp
View File

@ -436,7 +436,7 @@ find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevic
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
if (FAILED(hr)) { if (FAILED(hr)) {
pyobject_raii parent_name(PyUnicode_FromWideChar(parent_id, -1)); pyobject_raii parent_name(PyUnicode_FromWideChar(parent_id, -1));
set_error_from_hresult(wpd::WPDError, __FILE__, __LINE__, hr, "Failed to EnumObjects() of folder from device", parent_name.ptr()); hresult_set_exc("Failed to EnumObjects() of folder from device", hr, parent_name.ptr());
*enum_failed = true; *enum_failed = true;
return false; return false;
} }
@ -463,7 +463,7 @@ find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevic
} else { } else {
if (hr == S_FALSE && !fetched) break; if (hr == S_FALSE && !fetched) break;
pyobject_raii parent_name(PyUnicode_FromWideChar(parent_id, -1)); pyobject_raii parent_name(PyUnicode_FromWideChar(parent_id, -1));
set_error_from_hresult(wpd::WPDError, __FILE__, __LINE__, hr, "Failed to EnumObjects()->Next() of folder from device", parent_name.ptr()); hresult_set_exc("Failed to EnumObjects()->Next() of folder from device", hr, parent_name.ptr());
return false; return false;
} }
} }

2
src/calibre/devices/mtp/windows/global.h
View File

@ -39,7 +39,7 @@ typedef struct {
} Device; } Device;
extern PyTypeObject DeviceType; extern PyTypeObject DeviceType;
#define hresult_set_exc(msg, hr) set_error_from_hresult(wpd::WPDError, __FILE__, __LINE__, hr, msg) #define hresult_set_exc(msg, hr, ...) set_error_from_hresult(wpd::WPDError, __FILE__, __LINE__, hr, msg, __VA_ARGS__)
extern IPortableDeviceValues* get_client_information(); extern IPortableDeviceValues* get_client_information();
extern IPortableDevice* open_device(const wchar_t *pnp_id, CComPtr<IPortableDeviceValues> &client_information); extern IPortableDevice* open_device(const wchar_t *pnp_id, CComPtr<IPortableDeviceValues> &client_information);