Author: sginsberg
Date: Fri Sep 11 20:18:12 2015
New Revision: 69187

URL: http://svn.reactos.org/svn/reactos?rev=69187&view=rev
Log:
Fix over a hundred thousand warnings by:
- Disabling C4214 (nonstandard extension used : bit field types other than 
int), a somewhat overzealous warning for a "nonstandard" extension we rely on 
all over.
- Defining inactive DPRINT and friends for MSVC using __noop (no not __nop, 
__noop. See  https://msdn.microsoft.com/en-us/library/s6btaxcs.aspx) to get at 
a whole bunch of C4127 (conditional expression is constant).
- Remove the last of the exported DriverEntry from dxg and dxgthk. There is no 
need in anyw way to export them -- dxg exports DxDdStartupDxGraphics to Win32k 
for initialization purposes and dxgthk is just a forwarder. Linking to a 
DriverEntry is to begin with is a pretty bad idea. Say goodbye to the last of 
LNK4216.

Modified:
    trunk/reactos/cmake/msvc.cmake
    trunk/reactos/include/reactos/debug.h
    trunk/reactos/win32ss/reactx/dxg/dxg.spec
    trunk/reactos/win32ss/reactx/dxgthk/dxgthk.spec

Modified: trunk/reactos/cmake/msvc.cmake
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=69187&r1=69186&r2=69187&view=diff
==============================================================================
--- trunk/reactos/cmake/msvc.cmake      [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake      [iso-8859-1] Fri Sep 11 20:18:12 2015
@@ -49,7 +49,8 @@
 # - C4290: C++ exception specification ignored
 # - C4800: forcing value to bool 'true' or 'false' (performance warning)
 # - C4200: nonstandard extension used : zero-sized array in struct/union
-add_compile_flags("/wd4244 /wd4290 /wd4800 /wd4200")
+# - C4214: nonstandard extension used : bit field types other than int
+add_compile_flags("/wd4244 /wd4290 /wd4800 /wd4200 /wd4214")
 
 # FIXME: Temporarily disable C4018 until we fix more of the others. CORE-10113
 add_compile_flags("/wd4018")

Modified: trunk/reactos/include/reactos/debug.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?rev=69187&r1=69186&r2=69187&view=diff
==============================================================================
--- trunk/reactos/include/reactos/debug.h       [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/debug.h       [iso-8859-1] Fri Sep 11 
20:18:12 2015
@@ -113,7 +113,11 @@
 
     #else
 
+#if defined(_MSC_VER)
+        #define DPRINT   __noop
+#else
         #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+#endif
 
     #endif
 
@@ -132,6 +136,22 @@
 #else /* not DBG */
 
     /* On non-debug builds, we never show these */
+#if defined(_MSC_VER)
+    #define DPRINT1   __noop
+    #define DPRINT    __noop
+
+    #define UNIMPLEMENTED
+
+    #define ERR_      __noop
+    #define WARN_     __noop
+    #define TRACE_    __noop
+    #define INFO_     __noop
+
+    #define ERR__     __noop
+    #define WARN__    __noop
+    #define TRACE__   __noop
+    #define INFO__    __noop
+#else
     #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
     #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
 
@@ -146,6 +166,7 @@
     #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
     #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
     #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+#endif /* _MSC_VER */
 
 #endif /* not DBG */
 

Modified: trunk/reactos/win32ss/reactx/dxg/dxg.spec
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg.spec?rev=69187&r1=69186&r2=69187&view=diff
==============================================================================
--- trunk/reactos/win32ss/reactx/dxg/dxg.spec   [iso-8859-1] (original)
+++ trunk/reactos/win32ss/reactx/dxg/dxg.spec   [iso-8859-1] Fri Sep 11 
20:18:12 2015
@@ -1,3 +1,2 @@
-@ stdcall DriverEntry(ptr ptr)
 @ stdcall DxDdCleanupDxGraphics()
 @ stdcall DxDdStartupDxGraphics(long ptr long ptr ptr ptr)

Modified: trunk/reactos/win32ss/reactx/dxgthk/dxgthk.spec
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxgthk/dxgthk.spec?rev=69187&r1=69186&r2=69187&view=diff
==============================================================================
--- trunk/reactos/win32ss/reactx/dxgthk/dxgthk.spec     [iso-8859-1] (original)
+++ trunk/reactos/win32ss/reactx/dxgthk/dxgthk.spec     [iso-8859-1] Fri Sep 11 
20:18:12 2015
@@ -1,4 +1,3 @@
-@ stdcall DriverEntry(ptr ptr)
 @ stdcall EngAcquireSemaphore(ptr) win32k.EngAcquireSemaphore
 @ stdcall EngAllocMem(long long long) win32k.EngAllocMem
 @ stdcall EngAllocUserMem(long long) win32k.EngAllocUserMem


Reply via email to