From 3dfb07854b3143d59681fd65f7dd7c3ba65e1d2f Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmitch@gmail.com>
Date: Mon, 15 Feb 2016 17:52:56 -0800
Subject: dxva2: use mp_HESULT_to_str on FAILED(hr)

---
 osdep/windows_utils.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'osdep/windows_utils.c')

diff --git a/osdep/windows_utils.c b/osdep/windows_utils.c
index ee80a18ef4..21ff40a89d 100644
--- a/osdep/windows_utils.c
+++ b/osdep/windows_utils.c
@@ -21,6 +21,7 @@
 #include <windows.h>
 #include <errors.h>
 #include <audioclient.h>
+#include <d3d9.h>
 
 #include "windows_utils.h"
 
@@ -83,6 +84,40 @@ static char *hresult_to_str(const HRESULT hr)
     E(AUDCLNT_S_BUFFER_EMPTY)
     E(AUDCLNT_S_THREAD_ALREADY_REGISTERED)
     E(AUDCLNT_S_POSITION_STALLED)
+    E(D3DERR_WRONGTEXTUREFORMAT)
+    E(D3DERR_UNSUPPORTEDCOLOROPERATION)
+    E(D3DERR_UNSUPPORTEDCOLORARG)
+    E(D3DERR_UNSUPPORTEDALPHAOPERATION)
+    E(D3DERR_UNSUPPORTEDALPHAARG)
+    E(D3DERR_TOOMANYOPERATIONS)
+    E(D3DERR_CONFLICTINGTEXTUREFILTER)
+    E(D3DERR_UNSUPPORTEDFACTORVALUE)
+    E(D3DERR_CONFLICTINGRENDERSTATE)
+    E(D3DERR_UNSUPPORTEDTEXTUREFILTER)
+    E(D3DERR_CONFLICTINGTEXTUREPALETTE)
+    E(D3DERR_DRIVERINTERNALERROR)
+    E(D3DERR_NOTFOUND)
+    E(D3DERR_MOREDATA)
+    E(D3DERR_DEVICELOST)
+    E(D3DERR_DEVICENOTRESET)
+    E(D3DERR_NOTAVAILABLE)
+    E(D3DERR_OUTOFVIDEOMEMORY)
+    E(D3DERR_INVALIDDEVICE)
+    E(D3DERR_INVALIDCALL)
+    E(D3DERR_DRIVERINVALIDCALL)
+    E(D3DERR_WASSTILLDRAWING)
+    E(D3DOK_NOAUTOGEN)
+    E(D3DERR_DEVICEREMOVED)
+    E(D3DERR_DEVICEHUNG)
+    E(S_NOT_RESIDENT)
+    E(S_RESIDENT_IN_SHARED_MEMORY)
+    E(S_PRESENT_MODE_CHANGED)
+    E(S_PRESENT_OCCLUDED)
+    E(D3DERR_UNSUPPORTEDOVERLAY)
+    E(D3DERR_UNSUPPORTEDOVERLAYFORMAT)
+    E(D3DERR_CANNOTPROTECTCONTENT)
+    E(D3DERR_UNSUPPORTEDCRYPTO)
+    E(D3DERR_PRESENT_STATISTICS_DISJOINT)
     default:
         return "<Unknown>";
     }
-- 
cgit v1.2.3


From 50d9a2609ae283910d78c05d028ef378dc3d6617 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmitch@gmail.com>
Date: Wed, 17 Feb 2016 02:40:43 -0800
Subject: windows_utils: try and use FormatMessage for errors.

This is useful in particular for GetLastError, unfortunately, it's stil pretty
dumb with regards to WASAPI or D3D specific errors, so keep the
hresult_to_string switch.
---
 osdep/windows_utils.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'osdep/windows_utils.c')

diff --git a/osdep/windows_utils.c b/osdep/windows_utils.c
index 21ff40a89d..a1ea32191a 100644
--- a/osdep/windows_utils.c
+++ b/osdep/windows_utils.c
@@ -124,9 +124,29 @@ static char *hresult_to_str(const HRESULT hr)
 #undef E
 }
 
+static char *fmtmsg_buf(char *buf, size_t buf_size, DWORD errorID)
+{
+    DWORD n = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+                             FORMAT_MESSAGE_IGNORE_INSERTS,
+                             NULL, errorID, 0, buf, buf_size, NULL);
+    if (!n && GetLastError() == ERROR_MORE_DATA) {
+        snprintf(buf, buf_size,
+                 "<Insufficient buffer size (%zd) for error message>",
+                 buf_size);
+    } else {
+        if (n > 0 && buf[n-1] == '\n')
+            buf[n-1] = '\0';
+        if (n > 1 && buf[n-2] == '\r')
+            buf[n-2] = '\0';
+    }
+    return buf;
+}
+#define fmtmsg(hr) fmtmsg_buf((char[243]){0}, 243, (hr))
+
 char *mp_HRESULT_to_str_buf(char *buf, size_t buf_size, HRESULT hr)
 {
-    snprintf(buf, buf_size, "%s (0x%"PRIx32")",
-             hresult_to_str(hr), (uint32_t) hr);
+    char* msg = fmtmsg(hr);
+    msg = msg[0] ? msg : hresult_to_str(hr);
+    snprintf(buf, buf_size, "%s (0x%"PRIx32")", msg, (uint32_t)hr);
     return buf;
 }
-- 
cgit v1.2.3