Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VBSCRIPT] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71736
This commit is contained in:
Amine Khaldi 2016-07-02 13:09:58 +00:00
parent 031bcbf7cc
commit a6a823f8ed
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/vbscript/global.c
View file

@ -22,8 +22,6 @@
#include <wingdi.h> #include <wingdi.h>
#include <mshtmhst.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_CANNOT_CREATE_OBJ 0x800a01ad
#define VB_E_MK_PARSE_ERROR 0x800a01b0 #define VB_E_MK_PARSE_ERROR 0x800a01b0

2
reactos/dll/win32/vbscript/vbdisp.c
View file

@ -549,7 +549,7 @@ static IDispatchExVtbl DispatchExVtbl = {
static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface) static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface)
{ {
return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl
? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface) ? CONTAINING_RECORD((IDispatchEx *)iface, vbdisp_t, IDispatchEx_iface)
: NULL; : NULL;
} }

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

@ -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/urlmon # Synced to WineStaging-1.9.4
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11
reactos/dll/win32/uxtheme # Forked 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/version # Synced to WineStaging-1.9.11
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4
reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4