Alistair Leslie-Hughes : xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize.

Alexandre Julliard julliard at winehq.org
Tue Aug 4 15:26:35 CDT 2020


Module: wine
Branch: master
Commit: 47a5de3438a30dbcc5a729e3442103015b99be34
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=47a5de3438a30dbcc5a729e3442103015b99be34

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Tue Aug  4 11:30:33 2020 +1000

xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize.

FAudio doesn't always return a valid HRESULT, ensure a valid code
is passed back to the application.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/xactengine3_7/xact_dll.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
index 3a14db7460..69570e8cef 100644
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -157,6 +157,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface,
 {
     XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
     FACTRuntimeParameters params;
+    UINT ret;
 
     TRACE("(%p)->(%p)\n", This, pParams);
 
@@ -195,7 +196,11 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface,
     params.fileIOCallbacks.readFileCallback = wrap_readfile;
     params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult;
 
-    return FACTAudioEngine_Initialize(This->fact_engine, &params);
+    ret = FACTAudioEngine_Initialize(This->fact_engine, &params);
+    if (ret != 0)
+        WARN("FACTAudioEngine_Initialize returned %d\n", ret);
+
+    return !ret ? S_OK : E_FAIL;
 }
 
 static HRESULT WINAPI IXACT3EngineImpl_ShutDown(IXACT3Engine *iface)




More information about the wine-cvs mailing list