From d6840d6d5558a5cd6b40c9763072e28c28aba7d7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 May 2021 09:59:02 +0530
Subject: [PATCH] Revert the change to ignore objects for which EnumObjects()
 fails

Causing crashes elsewhere. Instead retry with a sleep. Also report the
object id for the failing object in the error message.
---
 .../mtp/windows/content_enumeration.cpp       | 19 ++++++++++++++-----
 src/calibre/utils/windows/common.h            |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/calibre/devices/mtp/windows/content_enumeration.cpp b/src/calibre/devices/mtp/windows/content_enumeration.cpp
index f1c7233362..59640d92b2 100644
--- a/src/calibre/devices/mtp/windows/content_enumeration.cpp
+++ b/src/calibre/devices/mtp/windows/content_enumeration.cpp
@@ -325,7 +325,19 @@ find_objects_in(CComPtr<IPortableDeviceContent> &content, CComPtr<IPortableDevic
     hr = content->EnumObjects(0, parent_id, NULL, &children);
     Py_END_ALLOW_THREADS;
 
-    if (FAILED(hr)) {hresult_set_exc("Failed to get children from device", hr); *enum_failed = true; return false;}
+    if (FAILED(hr)) {
+        fwprintf(stderr, L"Failed to EnumObjects() for object id: %s retrying with a sleep.\n", parent_id); fflush(stderr);
+        Py_BEGIN_ALLOW_THREADS;
+        Sleep(500);
+        hr = content->EnumObjects(0, parent_id, NULL, &children);
+        Py_END_ALLOW_THREADS;
+        if (FAILED(hr)) {
+            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());
+            *enum_failed = true;
+            return false;
+        }
+    }
     *enum_failed = false;
 
     hr = S_OK;
@@ -452,10 +464,7 @@ get_files_and_folders(unsigned int level, IPortableDevice *device, CComPtr<IPort
 
     bool enum_failed = false;
     if (!find_objects_in(content, object_ids, parent_id, &enum_failed)) {
-        if (!enum_failed) return false;
-        fwprintf(stderr, L"Failed to EnumObjects() for object id: %s\n", parent_id);
-        if (PyErr_Occurred()) PyErr_Print();
-        return true;
+        return false;
     }
 
     if (bulk_properties != NULL) {
diff --git a/src/calibre/utils/windows/common.h b/src/calibre/utils/windows/common.h
index 9c776fc258..c732e1eb8c 100644
--- a/src/calibre/utils/windows/common.h
+++ b/src/calibre/utils/windows/common.h
@@ -17,8 +17,8 @@ static inline PyObject*
 set_error_from_hresult(PyObject *exc_type, const char *file, const int line, const HRESULT hr, const char *prefix="", PyObject *name=NULL) {
     _com_error err(hr);
     PyObject *pmsg = PyUnicode_FromWideChar(err.ErrorMessage(), -1);
-    if (name) PyErr_Format(exc_type, "%s:%d:%s:[%li] %V: %S", file, line, prefix, hr, pmsg, "Out of memory", name);
-    else PyErr_Format(exc_type, "%s:%d:%s:[%li] %V", file, line, prefix, hr, pmsg, "Out of memory");
+    if (name) PyErr_Format(exc_type, "%s:%d:%s:[hr=0x%x wCode=%d] %V: %S", file, line, prefix, hr, err.WCode(), pmsg, "Out of memory", name);
+    else PyErr_Format(exc_type, "%s:%d:%s:[hr=0x%x wCode=%d] %V", file, line, prefix, hr, err.WCode(), pmsg, "Out of memory");
     Py_CLEAR(pmsg);
     return NULL;
 }