[ros-diffs] [hyperion] 37055: modified base/system/smss/smss.h Fix compilation with Visual C++ modified lib/rtl/debug.c Call va_end in debug printing macros modified lib/rtl/res.c Don't mix int and ULONG modified lib/rtl/rtl.h <intrin.h> moved from PSDK to MinGW runtime, now always safe to include

Author: hyperion
Date: Wed Oct 29 08:30:26 2008
New Revision: 37055

URL: http://svn.reactos.org/svn/reactos?rev=37055&view=rev
Log:
modified   base/system/smss/smss.h
   Fix compilation with Visual C++

modified   lib/rtl/debug.c
   Call va_end in debug printing macros

modified   lib/rtl/res.c
   Don't mix int and ULONG

modified   lib/rtl/rtl.h
   <intrin.h> moved from PSDK to MinGW runtime, now always safe to include

Modified:
    branches/the-real-msvc/base/system/smss/smss.h
    branches/the-real-msvc/lib/rtl/debug.c
    branches/the-real-msvc/lib/rtl/res.c
    branches/the-real-msvc/lib/rtl/rtl.h

Modified: branches/the-real-msvc/base/system/smss/smss.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/system/smss/…
==============================================================================
--- branches/the-real-msvc/base/system/smss/smss.h [iso-8859-1] (original)
+++ branches/the-real-msvc/base/system/smss/smss.h [iso-8859-1] Wed Oct 29 08:30:26 2008
@@ -2,6 +2,7 @@
 #define _SMSS_H_INCLUDED_
 
 #include <stdio.h>
+#include <stdlib.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER

Modified: branches/the-real-msvc/lib/rtl/debug.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/debug.c?r…
==============================================================================
--- branches/the-real-msvc/lib/rtl/debug.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/rtl/debug.c [iso-8859-1] Wed Oct 29 08:30:26 2008
@@ -79,7 +79,7 @@
 
         /* Copy it */
         strncpy(Buffer, Prefix, PrefixLength);
-        
+
         /* Do the printf */
         Length = _vsnprintf(Buffer + PrefixLength,
                             sizeof(Buffer) - PrefixLength,
@@ -109,7 +109,7 @@
         /* Add the prefix */
         Length += PrefixLength;
     }
-    
+
     /* Build the string */
     DebugString.Length = Length;
     DebugString.Buffer = Buffer;
@@ -202,17 +202,19 @@
 DbgPrint(PCCH Format,
          ...)
 {
+	ULONG n;
     va_list ap;
 
     /* Call the internal routine that also handles ControlC */
     va_start(ap, Format);
-    return vDbgPrintExWithPrefixInternal("",
+    n = vDbgPrintExWithPrefixInternal("",
                                          -1,
                                          DPFLTR_ERROR_LEVEL,
                                          Format,
                                          ap,
                                          TRUE);
     va_end(ap);
+	return n;
 }
 
 /*
@@ -225,17 +227,19 @@
            IN PCCH Format,
            ...)
 {
+	ULONG n;
     va_list ap;
 
     /* Call the internal routine that also handles ControlC */
     va_start(ap, Format);
-    return vDbgPrintExWithPrefixInternal("",
+    n = vDbgPrintExWithPrefixInternal("",
                                          ComponentId,
                                          Level,
                                          Format,
                                          ap,
                                          TRUE);
     va_end(ap);
+	return n;
 }
 
 /*
@@ -246,16 +250,19 @@
 DbgPrintReturnControlC(PCH Format,
                        ...)
 {
+	ULONG n;
     va_list ap;
 
     /* Call the internal routine that also handles ControlC */
     va_start(ap, Format);
-    return vDbgPrintExWithPrefixInternal("",
+    n = vDbgPrintExWithPrefixInternal("",
                                          -1,
                                          DPFLTR_ERROR_LEVEL,
                                          Format,
                                          ap,
                                          FALSE);
+    va_end(ap);
+	return n;
 }
 
 /*

Modified: branches/the-real-msvc/lib/rtl/res.c
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/res.c?rev…
==============================================================================
--- branches/the-real-msvc/lib/rtl/res.c [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/rtl/res.c [iso-8859-1] Wed Oct 29 08:30:26 2008
@@ -60,7 +60,7 @@
  */
 int push_language( USHORT *list, ULONG pos, WORD lang )
 {
-    int i;
+    ULONG i;
     for (i = 0; i < pos; i++) if (list[i] == lang) return pos;
     list[pos++] = lang;
     return pos;

Modified: branches/the-real-msvc/lib/rtl/rtl.h
URL:
http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/rtl.h?rev…
==============================================================================
--- branches/the-real-msvc/lib/rtl/rtl.h [iso-8859-1] (original)
+++ branches/the-real-msvc/lib/rtl/rtl.h [iso-8859-1] Wed Oct 29 08:30:26 2008
@@ -31,9 +31,7 @@
 #include <reactos/helper.h>
 #include <pseh/pseh.h>
 
-#ifndef _MSC_VER
 #include <intrin.h>
-#endif
 
 #endif /* RTL_H */