From: Amine Khaldi Date: Thu, 18 Aug 2016 10:29:24 +0000 (+0000) Subject: [OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866 X-Git-Tag: backups/sndblst@72664~320 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=7651447df413c659a759c8bda946794ccee9c317 [OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866 svn path=/trunk/; revision=72298 --- diff --git a/reactos/dll/win32/oleaut32/variant.c b/reactos/dll/win32/oleaut32/variant.c index 8fe49f9c683..f49684a8495 100644 --- a/reactos/dll/win32/oleaut32/variant.c +++ b/reactos/dll/win32/oleaut32/variant.c @@ -453,7 +453,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_DISPATCH: if (V_DISPATCH(ps) == NULL) + { V_UNKNOWN(pd) = NULL; + res = S_OK; + } else res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd)); break; @@ -465,7 +468,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_UNKNOWN: if (V_UNKNOWN(ps) == NULL) + { V_DISPATCH(pd) = NULL; + res = S_OK; + } else res = IUnknown_QueryInterface(V_UNKNOWN(ps), &IID_IDispatch, (LPVOID*)&V_DISPATCH(pd)); break; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f4ce33855b2..101dd9fa622 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -144,7 +144,7 @@ reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.11. Depends on reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 reactos/dll/win32/ole32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 -reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.16 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oledlg # Synced to WineStaging-1.9.11 reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11