Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI]

Browse source 
[OLEAUT32]
[DDK]
[PSDK]
[STLPORT]
[CPPRT]
Port the vs2015 fixes to also work on x64

[HHCOMP]
Fix compilation with VS in x64 mode

svn path=/trunk/; revision=68791
This commit is contained in:
David Quintana 2015-08-22 00:17:15 +00:00
parent ca5361525f
commit 42df3d1b7e
7 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/browseui/utility.cpp
View file

@ -10,7 +10,7 @@ void operator delete(void *p)
LocalFree(p); LocalFree(p);
} }
void operator delete(void *p, unsigned int) void operator delete(void *p, UINT_PTR)
{ {
LocalFree(p); LocalFree(p);
} }

4
reactos/dll/win32/oleaut32/tmarshal.c
View file

@ -1785,7 +1785,11 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num)
/* nrofargs including This */ /* nrofargs including This */
int nrofargs = 1; int nrofargs = 1;
ITypeInfo *tinfo2; ITypeInfo *tinfo2;
#ifdef __i386__
TMAsmProxy *xasm = proxy->asmstubs + num; TMAsmProxy *xasm = proxy->asmstubs + num;
#endif
HRESULT hres; HRESULT hres;
const FUNCDESC *fdesc; const FUNCDESC *fdesc;

2
reactos/include/ddk/stdunk.h
View file

@ -206,7 +206,7 @@ operator delete(
inline void __cdecl inline void __cdecl
operator delete( operator delete(
PVOID ptr, UINT) PVOID ptr, UINT_PTR)
{ {
ExFreePool(ptr); ExFreePool(ptr);
} }

2
reactos/include/psdk/kcom.h
View file

@ -235,7 +235,7 @@ inline void __cdecl operator delete(
} }
inline void __cdecl operator delete( inline void __cdecl operator delete(
PVOID pVoid, UINT) PVOID pVoid, UINT_PTR)
{ {
if (pVoid) ExFreePool(pVoid); if (pVoid) ExFreePool(pVoid);
} }

4
reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp vendored
View file

@ -265,9 +265,9 @@ void _STLP_CALL operator delete(void* s)
} }
#if defined (EH_DELETE_HAS_THROW_SPEC) #if defined (EH_DELETE_HAS_THROW_SPEC)
void _STLP_CALL operator delete(void* s, unsigned int) throw() void _STLP_CALL operator delete(void* s, uintptr_t) throw()
#else #else
void _STLP_CALL operator delete(void* s, unsigned int) void _STLP_CALL operator delete(void* s, uintptr_t)
#endif #endif
{ {
::operator delete(s); ::operator delete(s);

9
reactos/lib/sdk/cpprt/amd64/cpprt.s
View file

@ -10,6 +10,12 @@ ENDM
; void __cdecl `eh vector constructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64),void (__cdecl*)(void * __ptr64)) ; 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 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)) ; 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 DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z
@ -22,4 +28,7 @@ DEFINE_ALIAS ??3@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z
; void __cdecl operator delete[](void * __ptr64,struct std::nothrow_t const & __ptr64) ; void __cdecl operator delete[](void * __ptr64,struct std::nothrow_t const & __ptr64)
DEFINE_ALIAS ??_V@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z 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 END

4
reactos/tools/hhpcomp/chmc/chm.h
View file

@ -35,8 +35,8 @@
* many bits as they specify. * many bits as they specify.
*/ */
/* i386, 32-bit, Windows */ /* i386, 32-bit/64-bit, Windows */
#ifdef WIN32 #ifdef _MSC_VER
typedef unsigned char UChar; typedef unsigned char UChar;
typedef __int16 Int16; typedef __int16 Int16;
typedef unsigned __int16 UInt16; typedef unsigned __int16 UInt16;