[ros-diffs] [akhaldi] 71736: [VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:09:58 2016
New Revision: 71736

URL: http://svn.reactos.org/svn/reactos?rev=71736&view=rev
Log:
[VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/vbscript/global.c
    trunk/reactos/dll/win32/vbscript/vbdisp.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/vbscript/global.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.…
==============================================================================
--- trunk/reactos/dll/win32/vbscript/global.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/vbscript/global.c	[iso-8859-1] Sat Jul  2 13:09:58 2016
@@ -21,8 +21,6 @@
 #include <math.h>
 #include <wingdi.h>
 #include <mshtmhst.h>
-
-#define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5))
 
 #define VB_E_CANNOT_CREATE_OBJ 0x800a01ad
 #define VB_E_MK_PARSE_ERROR    0x800a01b0

Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.…
==============================================================================
--- trunk/reactos/dll/win32/vbscript/vbdisp.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/vbscript/vbdisp.c	[iso-8859-1] Sat Jul  2 13:09:58 2016
@@ -549,7 +549,7 @@
 static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface)
 {
     return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl
-        ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface)
+        ? CONTAINING_RECORD((IDispatchEx *)iface, vbdisp_t, IDispatchEx_iface)
         : NULL;
 }
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jul  2 13:09:58 2016
@@ -195,7 +195,7 @@
 reactos/dll/win32/urlmon              # Synced to WineStaging-1.9.4
 reactos/dll/win32/usp10               # Synced to WineStaging-1.9.11
 reactos/dll/win32/uxtheme             # Forked
-reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.4
+reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.11
 reactos/dll/win32/version             # Synced to WineStaging-1.9.11
 reactos/dll/win32/vssapi              # Synced to WineStaging-1.9.4
 reactos/dll/win32/wbemdisp            # Synced to WineStaging-1.9.4