[PATCH 0/4] MR567: vkd3d-utils: Use debugstr_hresult().

[PATCH 1/4] include: Introduce a debug helper for HRESULTs.

[Henri Verbeet]

From: Henri Verbeet

---
 include/private/vkd3d_debug.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h
index 6708cad34..663fc311a 100644
--- a/include/private/vkd3d_debug.h
+++ b/include/private/vkd3d_debug.h
@@ -104,6 +104,29 @@ static inline const char *debugstr_guid(const GUID *guid)
             guid->Data4[5], guid->Data4[6], guid->Data4[7]);
 }

+static inline const char *debugstr_hresult(HRESULT hr)
+{
+    switch (hr)
+    {
+#define TO_STR(u) case u: return #u;
+        TO_STR(S_OK)
+        TO_STR(S_FALSE)
+        TO_STR(E_NOTIMPL)
+        TO_STR(E_NOINTERFACE)
+        TO_STR(E_POINTER)
+        TO_STR(E_ABORT)
+        TO_STR(E_FAIL)
+        TO_STR(E_OUTOFMEMORY)
+        TO_STR(E_INVALIDARG)
+        TO_STR(DXGI_ERROR_NOT_FOUND)
+        TO_STR(DXGI_ERROR_MORE_DATA)
+        TO_STR(DXGI_ERROR_UNSUPPORTED)
+#undef TO_STR
+        default:
+            return vkd3d_dbg_sprintf("%#x", (int)hr);
+    }
+}
+
 unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value);

struct vkd3d_debug_option

[PATCH 2/4] vkd3d-utils: Use debugstr_hresult() in D3DCreateBlob().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d-utils/vkd3d_utils_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index 214ae06c1..f1d6c1a51 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -619,7 +619,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob)

if (FAILED(hr = vkd3d_blob_create(data, data_size, blob)))
     {
-        WARN("Failed to create blob object, hr %#x.\n", hr);
+        WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr));
         vkd3d_free(data);
     }
     return hr;

[PATCH 3/4] vkd3d-utils: Use debugstr_hresult() in get_blob_part().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d-utils/vkd3d_utils_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index f1d6c1a51..09fa8faeb 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -780,7 +780,7 @@ static HRESULT get_blob_part(const void *data, SIZE_T data_size,
     }

if (FAILED(hr = D3DCreateBlob(dst_dxbc.size, blob)))
-        WARN("Failed to create blob, hr %#x.\n", hr);
+        WARN("Failed to create blob, hr %s.\n", debugstr_hresult(hr));
     else
         memcpy(ID3D10Blob_GetBufferPointer(*blob), dst_dxbc.code, dst_dxbc.size);
     if (dst_dxbc.code != sections[0].data.code)

[PATCH 4/4] vkd3d-utils: Use debugstr_hresult() in D3DStripShader().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d-utils/vkd3d_utils_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index 09fa8faeb..349523e0b 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -911,7 +911,7 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID
     }

if (FAILED(hr = D3DCreateBlob(dst_dxbc.size, blob)))
-        WARN("Failed to create blob, hr %#x.\n", hr);
+        WARN("Failed to create blob, hr %s.\n", debugstr_hresult(hr));
     else
         memcpy(ID3D10Blob_GetBufferPointer(*blob), dst_dxbc.code, dst_dxbc.size);
     vkd3d_shader_free_shader_code(&dst_dxbc);

[PATCH 0/4] MR567: vkd3d-utils: Use debugstr_hresult(). - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[Giovanni Mascellani (＠giomasce)]

Technically the first commit introduces dead code...

[PATCH 0/4] MR567: vkd3d-utils: Use debugstr_hresult(). - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.