Author: dquintana Date: Sat Aug 22 00:17:15 2015 New Revision: 68791
URL: http://svn.reactos.org/svn/reactos?rev=68791&view=rev Log: [BROWSEUI] [OLEAUT32] [DDK] [PSDK] [STLPORT] [CPPRT] Port the vs2015 fixes to also work on x64
[HHCOMP] Fix compilation with VS in x64 mode
Modified: trunk/reactos/dll/win32/browseui/utility.cpp trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/psdk/kcom.h trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s trunk/reactos/tools/hhpcomp/chmc/chm.h
Modified: trunk/reactos/dll/win32/browseui/utility.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/utility.... ============================================================================== --- trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -10,7 +10,7 @@ LocalFree(p); }
-void operator delete(void *p, unsigned int) +void operator delete(void *p, UINT_PTR) { LocalFree(p); }
Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarshal... ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -1785,7 +1785,11 @@ /* nrofargs including This */ int nrofargs = 1; ITypeInfo *tinfo2; + +#ifdef __i386__ TMAsmProxy *xasm = proxy->asmstubs + num; +#endif + HRESULT hres; const FUNCDESC *fdesc;
Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=68... ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -206,7 +206,7 @@
inline void __cdecl operator delete( - PVOID ptr, UINT) + PVOID ptr, UINT_PTR) { ExFreePool(ptr); }
Modified: trunk/reactos/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=687... ============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -235,7 +235,7 @@ }
inline void __cdecl operator delete( - PVOID pVoid, UINT) + PVOID pVoid, UINT_PTR) { if (pVoid) ExFreePool(pVoid); }
Modified: trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/test/e... ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -265,9 +265,9 @@ }
#if defined (EH_DELETE_HAS_THROW_SPEC) -void _STLP_CALL operator delete(void* s, unsigned int) throw() -#else -void _STLP_CALL operator delete(void* s, unsigned int) +void _STLP_CALL operator delete(void* s, uintptr_t) throw() +#else +void _STLP_CALL operator delete(void* s, uintptr_t) #endif { ::operator delete(s);
Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s... ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -9,6 +9,12 @@
; void __cdecl `eh vector constructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64),void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,unsigned __int64,void (__cdecl*)(void *),void (__cdecl*)(void *))" +DEFINE_ALIAS ??_L@YAXPEAX_K1P6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,unsigned __int64,void (__cdecl*)(void *)) +DEFINE_ALIAS ??_M@YAXPEAX_K1P6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z
; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z @@ -22,4 +28,7 @@ ; void __cdecl operator delete[](void * __ptr64,struct std::nothrow_t const & __ptr64) DEFINE_ALIAS ??_V@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z
+; void __cdecl operator delete(void *,unsigned __int64) +DEFINE_ALIAS ??3@YAXPEAX_K@Z, ??3@YAXPEAX@Z + END
Modified: trunk/reactos/tools/hhpcomp/chmc/chm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chm.h?re... ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chm.h [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chm.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -35,8 +35,8 @@ * many bits as they specify. */
-/* i386, 32-bit, Windows */ -#ifdef WIN32 +/* i386, 32-bit/64-bit, Windows */ +#ifdef _MSC_VER typedef unsigned char UChar; typedef __int16 Int16; typedef unsigned __int16 UInt16;