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

Note to self: review diffs and remove temporary changes BEFORE commiting (not after).

Browse source 
svn path=/trunk/; revision=67484
This commit is contained in:
David Quintana 2015-04-30 22:09:11 +00:00
parent 3933ca6bce
commit fd81042a22
6 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/fmifs/precomp.h
View file

@ -13,10 +13,9 @@
/* INCLUDES ******************************************************************/
#define WIN32_NO_STATUS
#include <stdio.h>
#define WIN32_NO_STATUS
/* PSDK/NDK Headers */
#include <windef.h>

13
reactos/dll/win32/framedyn/chstring.cpp
View file

@ -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

14
reactos/drivers/network/ndis/include/ndissys.h
View file

@ -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 <ndis.h>
#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 */

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

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

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

@ -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);
}

3
reactos/lib/sdk/cpprt/i386/cpprt.s
View file

@ -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