diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h index a72cf5e5b1f..0d2218f47f8 100644 --- a/reactos/dll/win32/fmifs/precomp.h +++ b/reactos/dll/win32/fmifs/precomp.h @@ -13,10 +13,9 @@ /* INCLUDES ******************************************************************/ -#define WIN32_NO_STATUS - #include +#define WIN32_NO_STATUS /* PSDK/NDK Headers */ #include diff --git a/reactos/dll/win32/framedyn/chstring.cpp b/reactos/dll/win32/framedyn/chstring.cpp index 3b43c456cb7..d9bf714993e 100644 --- a/reactos/dll/win32/framedyn/chstring.cpp +++ b/reactos/dll/win32/framedyn/chstring.cpp @@ -54,19 +54,6 @@ void operator delete(void* ptr) } } -#if _MSC_VER >= 51900 -void __cdecl operator delete(void* ptr, unsigned int) -{ - // In Windows 2k3, they check for ptr being null. - // ISO, POSIX and even MSDN explains that it is allowed - // to call free with NULL pointer... - if (ptr) - { - free(ptr); - } -} -#endif - // Implement our own new operator so that we can throw our own exception in case // of allocation failure. // It could have been done using set_new_handler(), but well. MS guys didn't do it diff --git a/reactos/drivers/network/ndis/include/ndissys.h b/reactos/drivers/network/ndis/include/ndissys.h index 6c2fa358ef3..b80a6a0bbfa 100644 --- a/reactos/drivers/network/ndis/include/ndissys.h +++ b/reactos/drivers/network/ndis/include/ndissys.h @@ -10,13 +10,6 @@ #ifndef __NDISSYS_H #define __NDISSYS_H -/* portability fixes */ -#ifdef _M_AMD64 -#define KfReleaseSpinLock KeReleaseSpinLock -#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel -#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel -#endif - #include #include "debug.h" @@ -61,4 +54,11 @@ NTAPI ExGetCurrentProcessorCpuUsage( PULONG CpuUsage); +/* portability fixes */ +#ifdef _M_AMD64 +#define KfReleaseSpinLock KeReleaseSpinLock +#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel +#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel +#endif + #endif /* __NDISSYS_H */ diff --git a/reactos/include/ddk/stdunk.h b/reactos/include/ddk/stdunk.h index f9915cfc87a..6b15a4a0a68 100644 --- a/reactos/include/ddk/stdunk.h +++ b/reactos/include/ddk/stdunk.h @@ -206,7 +206,7 @@ operator delete( inline void __cdecl operator delete( - PVOID ptr, UINT unk) + PVOID ptr, UINT) { ExFreePool(ptr); } diff --git a/reactos/include/psdk/kcom.h b/reactos/include/psdk/kcom.h index 956e25f6978..f6f596f17c3 100644 --- a/reactos/include/psdk/kcom.h +++ b/reactos/include/psdk/kcom.h @@ -235,7 +235,7 @@ inline void __cdecl operator delete( } inline void __cdecl operator delete( - PVOID pVoid, UINT unk) + PVOID pVoid, UINT) { if (pVoid) ExFreePool(pVoid); } diff --git a/reactos/lib/sdk/cpprt/i386/cpprt.s b/reactos/lib/sdk/cpprt/i386/cpprt.s index 8935893ab15..f5fe642b095 100644 --- a/reactos/lib/sdk/cpprt/i386/cpprt.s +++ b/reactos/lib/sdk/cpprt/i386/cpprt.s @@ -27,7 +27,7 @@ _CallCxxFrameHandler: ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z -; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) +; void __stdcall `eh vector constructor iterator'(void *,unsigned int,unsigned int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIIP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) @@ -38,6 +38,5 @@ DEFINE_ALIAS ??_M@YGXPAXIIP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YG ; void __cdecl operator delete(void *,unsigned int) DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z -DEFINE_ALIAS ??3@YAXPAXII@Z, ??3@YAXPAX@Z END