[ros-diffs] [dquintana] 67484: Note to self: review diffs and remove temporary changes BEFORE commiting (not after).

Author: dquintana
Date: Thu Apr 30 22:09:11 2015
New Revision: 67484

URL: http://svn.reactos.org/svn/reactos?rev=67484&view=rev
Log:
Note to self: review diffs and remove temporary changes BEFORE commiting (not after).

Modified:
    trunk/reactos/dll/win32/fmifs/precomp.h
    trunk/reactos/dll/win32/framedyn/chstring.cpp
    trunk/reactos/drivers/network/ndis/include/ndissys.h
    trunk/reactos/include/ddk/stdunk.h
    trunk/reactos/include/psdk/kcom.h
    trunk/reactos/lib/sdk/cpprt/i386/cpprt.s

Modified: trunk/reactos/dll/win32/fmifs/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?r...
==============================================================================
--- trunk/reactos/dll/win32/fmifs/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fmifs/precomp.h	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -13,10 +13,9 @@

/* INCLUDES ******************************************************************/

-#define WIN32_NO_STATUS
-
 #include <stdio.h>

+#define WIN32_NO_STATUS

/* PSDK/NDK Headers */
 #include <windef.h>

Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstring...
==============================================================================
--- trunk/reactos/dll/win32/framedyn/chstring.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/framedyn/chstring.cpp	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -54,19 +54,6 @@
     }
 }

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

Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/includ...
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/ndissys.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/ndissys.h	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -9,13 +9,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>

@@ -61,4 +54,11 @@
 ExGetCurrentProcessorCpuUsage(
     PULONG CpuUsage);

+/* portability fixes */
+#ifdef _M_AMD64
+#define KfReleaseSpinLock KeReleaseSpinLock
+#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel
+#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel
+#endif
+
 #endif /* __NDISSYS_H */

Modified: trunk/reactos/include/ddk/stdunk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=67...
==============================================================================
--- trunk/reactos/include/ddk/stdunk.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/stdunk.h	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -206,7 +206,7 @@

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

Modified: trunk/reactos/include/psdk/kcom.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=674...
==============================================================================
--- trunk/reactos/include/psdk/kcom.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/kcom.h	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -235,7 +235,7 @@
 }

inline void __cdecl operator delete(
-  PVOID pVoid, UINT unk)
+  PVOID pVoid, UINT)
 {
   if (pVoid) ExFreePool(pVoid);
 }

Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s?...
==============================================================================
--- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s	[iso-8859-1] Thu Apr 30 22:09:11 2015
@@ -27,7 +27,7 @@
 ; 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 @@

; void __cdecl operator delete(void *,unsigned int)
 DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z
-DEFINE_ALIAS ??3@YAXPAXII@Z, ??3@YAXPAX@Z

END