From a6a823f8edf4db49aaff0a772359867baeb32d47 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 2 Jul 2016 13:09:58 +0000 Subject: [PATCH] [VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368 svn path=/trunk/; revision=71736 --- reactos/dll/win32/vbscript/global.c | 2 -- reactos/dll/win32/vbscript/vbdisp.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/vbscript/global.c b/reactos/dll/win32/vbscript/global.c index cebe6ebe354..77b3943813e 100644 --- a/reactos/dll/win32/vbscript/global.c +++ b/reactos/dll/win32/vbscript/global.c @@ -22,8 +22,6 @@ #include #include -#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 diff --git a/reactos/dll/win32/vbscript/vbdisp.c b/reactos/dll/win32/vbscript/vbdisp.c index 5a4b1f88063..7e1f2472d4f 100644 --- a/reactos/dll/win32/vbscript/vbdisp.c +++ b/reactos/dll/win32/vbscript/vbdisp.c @@ -549,7 +549,7 @@ static IDispatchExVtbl DispatchExVtbl = { 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; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index b8c2e792f25..7860ebd3c5b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -195,7 +195,7 @@ reactos/dll/win32/url # Synced to WineStaging-1.9.4 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