From ee37178bcf9849b52754974a6f3d5799e6cc3f9e Mon Sep 17 00:00:00 2001
From: hakril <project@hakril.net>
Date: Wed, 8 Jan 2025 19:33:29 +0100
Subject: [PATCH] improve RpcClient error reporting in call()

---
 windows/rpc/client.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/windows/rpc/client.py b/windows/rpc/client.py
index 5e6f3e9..263b924 100644
--- a/windows/rpc/client.py
+++ b/windows/rpc/client.py
@@ -205,8 +205,11 @@ class RPCClient(object):
         "raise if request_type == RESPONSE_TYPE_FAIL"
         request_type = struct.unpack("<I", response.data[:4])[0]
         if request_type == gdef.RPC_RESPONSE_TYPE_FAIL:
-            error_code = struct.unpack("<5I", response.data)[2]
-            raise ValueError("RPC Response error {0} ({1!r})".format(error_code, KNOWN_RPC_ERROR_CODE.get(error_code, error_code)))
+            effective_error_code = error_code = struct.unpack("<5I", response.data)[2]
+            # https://learn.microsoft.com/en-us/windows/win32/com/structure-of-com-error-codes
+            if gdef.HRESULT_FACILITY(error_code) == gdef.FACILITY_WIN32:
+                effective_error_code = effective_error_code & 0xffff
+            raise ValueError("RPC Response error {0:#x} ({1!r})".format(error_code, KNOWN_RPC_ERROR_CODE[effective_error_code]))
         return request_type
 
     def _get_response_effective_data(self, response):