Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866

Browse source 
svn path=/trunk/; revision=72298
This commit is contained in:
Amine Khaldi 2016-08-18 10:29:24 +00:00
parent ddb3a842ea
commit 7651447df4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/oleaut32/variant.c
View file

@ -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;

2
reactos/media/doc/README.WINE
View file

@ -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