[ros-diffs] [pschweitzer] 56078: [WIN32K] Fix win32k release build

[pschweitzer at svn.reactos.org]

Author: pschweitzer
Date: Wed Mar  7 21:18:30 2012
New Revision: 56078

URL: http://svn.reactos.org/svn/reactos?rev=56078&view=rev
Log:
[WIN32K]
Fix win32k release build

Modified:
    trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
    trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c

Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h?rev=56078&r1=56077&r2=56078&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Wed Mar  7 21:18:30 2012
@@ -151,11 +151,11 @@
 
 #else
     #define DBG_GET_PPI 
-    #define DBG_DEFAULT_CHANNEL(x) ()
+    #define DBG_DEFAULT_CHANNEL(x)
 
-    #define DBG_ENABLE_CHANNEL(ppi,ch,level) ()
-    #define DBG_DISABLE_CHANNEL(ppi,ch,level) ()
-    #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) ()
+    #define DBG_ENABLE_CHANNEL(ppi,ch,level)
+    #define DBG_DISABLE_CHANNEL(ppi,ch,level)
+    #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level)
 
     #define DBG_PRINT(ppi,ch,level) 
 
@@ -174,7 +174,8 @@
     #define WARN_PPI(ppi,ch,fmt, ...)  
     #define TRACE_PPI(ppi,ch,fmt, ...) 
 
-    #define UNIMPLEMENTED
+    #define STUB
+
 #endif
 
 #define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/main/dllmain.c?rev=56078&r1=56077&r2=56078&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Wed Mar  7 21:18:30 2012
@@ -30,6 +30,7 @@
 extern UCHAR Win32kSSPT[];
 extern ULONG Win32kNumberOfSysCalls;
 
+#ifdef DBG
 void
 NTAPI
 DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments)
@@ -46,6 +47,7 @@
     ulResult = UserDbgPostServiceHook(ulSyscallId, ulResult);
     return ulResult;
 }
+#endif
 
 NTSTATUS
 APIENTRY
@@ -564,8 +566,10 @@
     PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData);
 
     /* Register service hook callbacks */
+#ifdef DBG
     KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0);
     KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0);
+#endif
 
     /* Create the global USER heap */
     GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection,

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c?rev=56078&r1=56077&r2=56078&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Wed Mar  7 21:18:30 2012
@@ -8,6 +8,7 @@
 
 /** INCLUDES ******************************************************************/
 
+#ifdef DBG
 #include <win32k.h>
 #define NDEBUG
 #include <debug.h>
@@ -728,4 +729,6 @@
     return ret;
 }
 
+#endif
+
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c?rev=56078&r1=56077&r2=56078&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Mar  7 21:18:30 2012
@@ -1309,9 +1309,11 @@
         }
     }
 
+#ifdef DBG
 //#ifdef GDI_DEBUG
 	DbgGdiHTIntegrityCheck();
 //#endif
+#endif
 
     ppi = PsGetCurrentProcessWin32Process();
     DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId);