Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Fix win32k release build

svn path=/trunk/; revision=56078
This commit is contained in:
Pierre Schweitzer 2012-03-07 21:18:30 +00:00
parent 388562e5ec
commit 56f5b39130
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/subsystems/win32/win32k/include/win32kdebug.h
View file

@ -151,11 +151,11 @@
#else #else
#define DBG_GET_PPI #define DBG_GET_PPI
#define DBG_DEFAULT_CHANNEL(x) () #define DBG_DEFAULT_CHANNEL(x)
#define DBG_ENABLE_CHANNEL(ppi,ch,level) () #define DBG_ENABLE_CHANNEL(ppi,ch,level)
#define DBG_DISABLE_CHANNEL(ppi,ch,level) () #define DBG_DISABLE_CHANNEL(ppi,ch,level)
#define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) () #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level)
#define DBG_PRINT(ppi,ch,level) #define DBG_PRINT(ppi,ch,level)
@ -174,7 +174,8 @@
#define WARN_PPI(ppi,ch,fmt, ...) #define WARN_PPI(ppi,ch,fmt, ...)
#define TRACE_PPI(ppi,ch,fmt, ...) #define TRACE_PPI(ppi,ch,fmt, ...)
#define UNIMPLEMENTED #define STUB
#endif #endif
#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) #define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)

4
reactos/subsystems/win32/win32k/main/dllmain.c
View file

@ -30,6 +30,7 @@ extern ULONG_PTR Win32kSSDT[];
extern UCHAR Win32kSSPT[]; extern UCHAR Win32kSSPT[];
extern ULONG Win32kNumberOfSysCalls; extern ULONG Win32kNumberOfSysCalls;
#ifdef DBG
void void
NTAPI NTAPI
DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments)
@ -46,6 +47,7 @@ DbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult)
ulResult = UserDbgPostServiceHook(ulSyscallId, ulResult); ulResult = UserDbgPostServiceHook(ulSyscallId, ulResult);
return ulResult; return ulResult;
} }
#endif
NTSTATUS NTSTATUS
APIENTRY APIENTRY
@ -564,8 +566,10 @@ DriverEntry(
PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData);
/* Register service hook callbacks */ /* Register service hook callbacks */
#ifdef DBG
KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0);
KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0);
#endif
/* Create the global USER heap */ /* Create the global USER heap */
GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection, GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection,

3
reactos/subsystems/win32/win32k/objects/gdidbg.c
View file

@ -8,6 +8,7 @@
/** INCLUDES ******************************************************************/ /** INCLUDES ******************************************************************/
#ifdef DBG
#include <win32k.h> #include <win32k.h>
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -728,4 +729,6 @@ BOOL DbgInitDebugChannels()
return ret; return ret;
} }
#endif
/* EOF */ /* EOF */

2
reactos/subsystems/win32/win32k/objects/gdiobj.c
View file

@ -1309,9 +1309,11 @@ GDI_CleanupForProcess(struct _EPROCESS *Process)
} }
} }
#ifdef DBG
//#ifdef GDI_DEBUG //#ifdef GDI_DEBUG
DbgGdiHTIntegrityCheck(); DbgGdiHTIntegrityCheck();
//#endif //#endif
#endif
ppi = PsGetCurrentProcessWin32Process(); ppi = PsGetCurrentProcessWin32Process();
DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId);