Author: akhaldi
Date: Thu Aug 18 10:29:24 2016
New Revision: 72298
URL: http://svn.reactos.org/svn/reactos?rev=72298&view=rev
Log:
[OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/oleaut32/variant.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/oleaut32/variant.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant.c?rev=72298&r1=72297&r2=72298&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Thu Aug 18
10:29:24 2016
@@ -453,7 +453,10 @@
{
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 @@
{
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;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72298&r1=72297&r2=72298&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:29:24 2016
@@ -144,7 +144,7 @@
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
