Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[sserapion] 35826: - minor WIN64 fixes - Remove unneeded dependencies
by sserapion＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: sserapion Date: Sat Aug 30 22:10:30 2008 New Revision: 35826 URL: http://svn.reactos.org/svn/reactos?rev=35826&view=rev Log: - minor WIN64 fixes - Remove unneeded dependencies Modified: branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c Modified: branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -396,7 +396,11 @@ DebugPrint(_T("Rouge packet: header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); return -1; } +#ifndef _WIN64 _tprintf(_T("%3lld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#else + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#endif return 0; case ECHO_REPLY : @@ -407,7 +411,11 @@ DebugPrint(_T("Rouge packet: header id %d, process id %d"), IcmpHdr->icmpheader.id, GetCurrentProcessId()); return -1; } +#ifndef _WIN64 _tprintf(_T("%3lld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#else + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); +#endif return 1; case DEST_UNREACHABLE : Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="regedit" type="win32gui" installname="regedit.exe"> +<module name="regedit" type="win32gui" installname="regedit.exe" allowwarnings="true"> <include base="regedit">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> @@ -12,7 +12,6 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> - <library>comdlg32</library> <library>ole32</library> <library>shell32</library> <library>comctl32</library> Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -1,10 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes"> +<module name="taskmgr" type="win32gui" installbase="system32" installname="taskmgr.exe" unicode="yes" allowwarnings="true"> <include base="taskmgr">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <library>msvcrt</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -10,7 +10,6 @@ <library>shell32</library> <library>user32</library> <library>gdi32</library> - <library>msvcrt</library> <library>advapi32</library> <library>kernel32</library> <library>comctl32</library> Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -699,7 +699,7 @@ INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -906,7 +906,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH]; Modified: branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -503,7 +503,7 @@ } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = (HANDLE)(ULONG_PTR)InterlockedExchange((LONG*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread); Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Aug 30 22:10:30 2008 @@ -307,10 +307,10 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned %d\n", ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (PtrToUlong(ret) > 32); }

1 0

[sserapion] 35825: -Actually disable TLS. -Fix boot.
by sserapion＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: sserapion Date: Sat Aug 30 21:53:32 2008 New Revision: 35825 URL: http://svn.reactos.org/svn/reactos?rev=35825&view=rev Log: -Actually disable TLS. -Fix boot. Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sat Aug 30 21:53:32 2008 @@ -287,9 +287,10 @@ PIMAGE_OPTIONAL_HEADER64 pNTHeader64; /* Force to be linked. */ - mingw_initltsdrot_force=1; - mingw_initltsdyn_force=1; - mingw_initltssuo_force=1; + //TLS sections + //mingw_initltsdrot_force=1; + //mingw_initltsdyn_force=1; + //mingw_initltssuo_force=1; mingw_initcharmax=1; pDOSHeader = (PIMAGE_DOS_HEADER) &__ImageBase; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sat Aug 30 21:53:32 2008 @@ -15,7 +15,6 @@ <file>natstart.c</file> <file>_newmode.c</file> <file>pesect.c</file> - <file>tlssup.c</file> <file>wildcard.c</file> <file>xtxtmode.c</file> <file>xncommod.c</file>

1 0

[tkreuzer] 35824: Move KeGetPcr from NDK to winddk.h
by tkreuzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: tkreuzer Date: Sat Aug 30 19:07:08 2008 New Revision: 35824 URL: http://svn.reactos.org/svn/reactos?rev=35824&view=rev Log: Move KeGetPcr from NDK to winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/ndk/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sat Aug 30 19:07:08 2008 @@ -5438,6 +5438,8 @@ ULONG HalReserved[16]; // For use by Hal } KPCR, *PKPCR; /* 54 */ +#define KeGetPcr() PCR + typedef struct _KFLOATING_SAVE { ULONG ControlWord; ULONG StatusWord; @@ -5655,6 +5657,8 @@ UCHAR Number; /* 51 */ } KPCR, *PKPCR; /* 54 */ +#define KeGetPcr() PCR + static __inline ULONG DDKAPI @@ -5688,6 +5692,8 @@ ULONG IRR; /* 28 */ ULONG IDR; /* 30 */ } KPCR, *PKPCR; + +#define KeGetPcr() PCR typedef struct _KFLOATING_SAVE { } KFLOATING_SAVE, *PKFLOATING_SAVE; Modified: branches/ros-amd64-bringup/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Aug 30 19:07:08 2008 @@ -106,11 +106,6 @@ #else #define KINTERRUPT_DISPATCH_CODES 106 #endif - -// -// Get KPCR -// -#define KeGetPcr() PCR #ifdef NTOS_MODE_USER

1 0

[tkreuzer] 35823: fix PCR
by tkreuzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: tkreuzer Date: Sat Aug 30 19:04:06 2008 New Revision: 35823 URL: http://svn.reactos.org/svn/reactos?rev=35823&view=rev Log: fix PCR Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sat Aug 30 19:04:06 2008 @@ -30,7 +30,7 @@ // //#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) //#define PCR ((volatile KPCR * const)K0IPCR) -#define PCR 0 // HACK +#define PCR ((volatile KPCR * const)__readgsqword(KPCR_SELF)) //#if defined(CONFIG_SMP) || defined(NT_BUILD) //#undef KeGetPcr //#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C))

1 0

[sginsberg] 35806: - Remove the (now deprecated) ntoskrnl/internal/debug.h header and fix all its includers to use the global debug.h
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 11:31:06 2008 New Revision: 35806 URL: http://svn.reactos.org/svn/reactos?rev=35806&view=rev Log: - Remove the (now deprecated) ntoskrnl/internal/debug.h header and fix all its includers to use the global debug.h Removed: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/cc/cacheman.c trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/dbgctrl.c trunk/reactos/ntoskrnl/ex/efi.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/rundown.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/ex/uuid.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/fstub/fstubex.c trunk/reactos/ntoskrnl/fstub/halstub.c trunk/reactos/ntoskrnl/io/iomgr/adapter.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/ioevent.c trunk/reactos/ntoskrnl/io/iomgr/iomdl.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/iotimer.c trunk/reactos/ntoskrnl/io/iomgr/iowork.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/iomgr/irq.c trunk/reactos/ntoskrnl/io/iomgr/remlock.c trunk/reactos/ntoskrnl/io/iomgr/symlink.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_expr.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/apc.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/config.c trunk/reactos/ntoskrnl/ke/devqueue.c trunk/reactos/ntoskrnl/ke/eventobj.c trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/gate.c trunk/reactos/ntoskrnl/ke/gmutex.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/mutex.c trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/semphobj.c trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/cont.c trunk/reactos/ntoskrnl/mm/drvlck.c trunk/reactos/ntoskrnl/mm/elf.inc.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/iospace.c trunk/reactos/ntoskrnl/mm/kmap.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/mpw.c trunk/reactos/ntoskrnl/mm/ncache.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/pe.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/verifier.c trunk/reactos/ntoskrnl/mm/wset.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obwait.c trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/quota.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/state.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/rtl/misc.c trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> PFSN_PREFETCHER_GLOBALS CcPfGlobals; Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=35806… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #ifndef VACB_MAPPING_GRANULARITY #define VACB_MAPPING_GRANULARITY (256 * 1024) Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -33,7 +33,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, CcInitView) Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> POBJECT_TYPE DbgkDebugObjectType; FAST_MUTEX DbgkpProcessDebugPortMutex; Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define TAG_ATOM TAG('A', 't', 'o', 'm') Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/efi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/efi.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ex/efi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/efi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeEventImplementation) Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeEventPairImplementation) Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define TAG_ERR TAG('E', 'r', 'r', ' ') Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeMutantImplementation) Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeProfileImplementation) Modified: trunk/reactos/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/rundown.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation) Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> VOID MmPrintMemoryStatistic(VOID); Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define TICKSPERMINUTE 600000000 Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define SEED_BUFFER_SIZE 6 Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -8,7 +8,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpWin32kInit) Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeWorkerThreads) Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <internal/hal.h> /* DEPRECATED FUNCTIONS ******************************************************/ Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/fstub/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Removed: trunk/reactos/ntoskrnl/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/debug.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/debug.h (removed) @@ -1,25 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h - * PURPOSE: Useful debugging macros - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * 28/05/98: Created - */ - -/* - * NOTES: Define DBG in configuration file for "checked" version - * Define NDEBUG before including this header to disable debugging - * macros - * Define NASSERT before including this header to disable assertions - */ - - -#ifndef __NTOSKRNL_DEBUG -#define __NTOSKRNL_DEBUG - -#include <reactos/debug.h> - - -#endif /* __NTOSKRNL_DEBUG */ Modified: trunk/reactos/ntoskrnl/io/iomgr/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/adapter.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* DATA **********************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitBootLog) Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -14,7 +14,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> typedef struct _SERVICE_GROUP { Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> POBJECT_TYPE IoCompletionType; Modified: trunk/reactos/ntoskrnl/io/iomgr/ioevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ioevent.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ioevent.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomdl.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> ULONG IopTraceLevel = 0; BOOLEAN PnpSystemInit = FALSE; Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iotimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iotimer.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iotimer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iotimer.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iowork.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* Undefine some macros we implement here */ #undef IoCallDriver Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/symlink.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> VOID NTAPI Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitFileSystemImplementation) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitPlugPlayEvents) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <wdmguid.h> /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> //#define ENABLE_ACPI Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define HIGH_PHYS_MASK 0x80000000 #define PAGE_TABLE_MASK 0x3ff Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, KdInitSystem) Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* VARIABLES ***************************************************************/ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* bochs debug output */ #define BOCHS_LOGGER_PORT ((PVOID)0xe9) Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -85,7 +85,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /************************************************************************/ /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -85,7 +85,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /************************************************************************/ /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ Modified: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/kdbg.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> VOID NTAPI KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -31,7 +31,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* DEFINES *******************************************************************/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_expr.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -35,7 +35,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *********************************************************************/ typedef enum _RPN_OP_TYPE Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, KiInitializeBugCheck) Modified: trunk/reactos/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/devqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/devqueue.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/eventobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/eventobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/eventobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gate.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/mutex.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -21,7 +21,7 @@ #include <ppcmmu/mmu.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> KDPC KiExpireTimerDpc; extern ULONG KiMaximumDpcQueueDepth; Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ke/semphobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/semphobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/semphobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define LQ_WAIT 1 #define LQ_OWN 2 Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; extern LIST_ENTRY PspReaperListHead; Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -41,7 +41,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeBalancer) Modified: trunk/reactos/ntoskrnl/mm/cont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/cont.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/elf.inc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -1,5 +1,5 @@ #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <reactos/exeformat.h> Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageList) Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) Modified: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/kmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -43,7 +43,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitMemoryAreas) Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeMdlImplementation) Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35806… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -13,7 +13,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MiInitializeNonPagedPool) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -29,7 +29,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitPagingFile) Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageOp) Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=35806… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> //#define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <reactos/exeformat.h> Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern ULONG MiNonPagedPoolLength; extern ULONG MmTotalPagedPoolQuota; Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -13,7 +13,7 @@ #include <ntoskrnl.h> #include <ppcmmu/mmu.h> //#define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/pfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/pfault.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <ppcmmu/mmu.h> /* EXTERNS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePagedPool) Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeRmapList) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -46,7 +46,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #include <reactos/exeformat.h> #if defined (ALLOC_PRAGMA) Modified: trunk/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/wset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -15,7 +15,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern ULONG NtGlobalFlag; Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=3580… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern ULONG ExpInitializationPhase; extern BOOLEAN SysThreadCreated; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* Include Information Class Tables */ #include "internal/ps_i.h" Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> PTOKEN PspBootAccessToken; Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #include <winerror.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> extern ULONG NtGlobalFlag; Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=358… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Sat Aug 30 11:31:06 2008 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/

2 1

[sginsberg] 35821: - Add SecureZeroMemory/RtlSecureZeroMemory - Add x86 versions of PreFetchCacheLine and MemoryBarrier (TODO for other architectures)
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 17:54:27 2008 New Revision: 35821 URL: http://svn.reactos.org/svn/reactos?rev=35821&view=rev Log: - Add SecureZeroMemory/RtlSecureZeroMemory - Add x86 versions of PreFetchCacheLine and MemoryBarrier (TODO for other architectures) Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Aug 30 17:54:27 2008 @@ -1208,6 +1208,7 @@ #define CopyMemory RtlCopyMemory #define FillMemory RtlFillMemory #define ZeroMemory RtlZeroMemory +#define SecureZeroMemory RtlSecureZeroMemory BOOL WINAPI CopySid(DWORD,PSID,PSID); #if (_WIN32_WINNT >= 0x0501) HANDLE WINAPI CreateActCtxA(PCACTCTXA); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 17:54:27 2008 @@ -4453,6 +4453,23 @@ #define RtlFillMemory(d,l,f) memset((d), (f), (l)) #define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0) +FORCEINLINE +PVOID +RtlSecureZeroMemory(IN PVOID ptr, + IN SIZE_T cnt) +{ + volatile char *vptr = (volatile char *)ptr; + + while (cnt) + { + *vptr = 0; + vptr++; + cnt--; + } + + return ptr; +} + typedef struct _OBJECT_TYPE_LIST { WORD Level; WORD Sbz; @@ -4656,6 +4673,43 @@ #endif +/* TODO: Other architectures than X86 */ +#if defined(_M_IX86) +#define PF_TEMPORAL_LEVEL_1 +#define PF_NON_TEMPORAL_LEVEL_ALL +#define PreFetchCacheLine(l, a) +#elif defined (_M_AMD64) +#define PreFetchCacheLine(l, a) +#elif defined(_M_PPC) +#define PreFetchCacheLine(l, a) +#elif defined(_M_ARM) +#define PreFetchCacheLine(l, a) +#else +#error Unknown architecture +#endif + +/* TODO: Other architectures than X86 */ +#if defined(_M_IX86) +FORCEINLINE +VOID +MemoryBarrier(VOID) +{ + LONG Barrier; + __asm__ __volatile__ + { + xchg Barrier, eax + } +} +#elif defined (_M_AMD64) +#define MemoryBarrier() +#elif defined(_M_PPC) +#define MemoryBarrier() +#elif defined(_M_ARM) +#define MemoryBarrier() +#else +#error Unknown architecture +#endif + #if defined(_M_IX86) #define YieldProcessor() __asm__ __volatile__("pause"); #elif defined (_M_AMD64)

1 0

[spetreolle] 35820: fix typo
by spetreolle＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: spetreolle Date: Sat Aug 30 16:58:12 2008 New Revision: 35820 URL: http://svn.reactos.org/svn/reactos?rev=35820&view=rev Log: fix typo Modified: trunk/reactos/drivers/usb/directory.rbuild Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sat Aug 30 16:58:12 2008 @@ -10,7 +10,7 @@ <directory name="usbhub"> <xi:include href="usbhub/usbhub.rbuild" /> </directory> - directory name="usbstor"> + <directory name="usbstor"> <xi:include href="usbstor/usbstor.rbuild" /> </directory--> </group>

1 0

[sginsberg] 35819: - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build)
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 16:34:56 2008 New Revision: 35819 URL: http://svn.reactos.org/svn/reactos?rev=35819&view=rev Log: - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build) Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Aug 30 16:34:56 2008 @@ -542,17 +542,6 @@ } KAPC_ENVIRONMENT; // -// CPU Cache Types -// -typedef enum _PROCESSOR_CACHE_TYPE -{ - CacheUnified, - CacheInstruction, - CacheData, - CacheTrace, -} PROCESSOR_CACHE_TYPE; - -// // PRCB DPC Data // typedef struct _KDPC_DATA @@ -571,18 +560,6 @@ struct _GENERAL_LOOKASIDE *P; struct _GENERAL_LOOKASIDE *L; } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - -// -// CPU Cache Descriptor -// -typedef struct _CACHE_DESCRIPTOR -{ - UCHAR Level; - UCHAR Associativity; - USHORT LineSize; - ULONG Size; - PROCESSOR_CACHE_TYPE Type; -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; // // Architectural Types

1 0

[pschweitzer] 35818: Removed useless defines
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 15:41:26 2008 New Revision: 35818 URL: http://svn.reactos.org/svn/reactos?rev=35818&view=rev Log: Removed useless defines Modified: trunk/reactos/dll/win32/sfc/sfc.spec trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 15:41:26 2008 @@ -14,5 +14,4 @@ @ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected @ stub SfcWLEventLogoff @ stub SfcWLEventLogon -@ stdcall SfpVerifyFile (str str long) -@ stdcall start (long long ptr) DllMain +@ stdcall SfpVerifyFile (str str long) Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sat Aug 30 15:41:26 2008 @@ -8,5 +8,4 @@ @ stub SfcGetNextProtectedFile @ stub SfcIsFileProtected @ stub SfcWLEventLogoff -@ stub SfcWLEventLogon -@ stdcall start (long long ptr) DllMain +@ stub SfcWLEventLogon

1 0

[sginsberg] 35817: - Add APIs new to Windows 2003/SP1 (including XP SP1) - Add missing NtGetCurrentProcessorNumber to ntdll - Update headers with missing structures
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 15:29:57 2008 New Revision: 35817 URL: http://svn.reactos.org/svn/reactos?rev=35817&view=rev Log: - Add APIs new to Windows 2003/SP1 (including XP SP1) - Add missing NtGetCurrentProcessorNumber to ntdll - Update headers with missing structures Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/token/token.c trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/dll/win32/psapi/psapi.def trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_arm.de… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -291,6 +291,7 @@ NtWriteRequestData NtWriteVirtualMemory NtYieldExecution +NtGetCurrentProcessorNumber ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -291,6 +291,7 @@ NtWriteRequestData@24 NtWriteVirtualMemory@20 NtYieldExecution@0 +NtGetCurrentProcessorNumber@0 ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -107,6 +107,7 @@ ;CreateProcessAsUserSecure CreateProcessAsUserW@44 ;CreateProcessWithLogonW +CreateProcessWithTokenW@36 CreateRestrictedToken@36 CreateServiceA@52 CreateServiceW@52 Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -670,4 +670,18 @@ return PSiteSid; } - +BOOL +WINAPI +CreateProcessWithTokenW(IN HANDLE hToken, + IN DWORD dwLogonFlags, + IN LPCWSTR lpApplicationName OPTIONAL, + IN OUT LPWSTR lpCommandLine OPTIONAL, + IN DWORD dwCreationFlags, + IN LPVOID lpEnvironment OPTIONAL, + IN LPCWSTR lpCurrentDirectory OPTIONAL, + IN LPSTARTUPINFOW lpStartupInfo, + OUT LPPROCESS_INFORMATION lpProcessInfo) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -97,6 +97,7 @@ ConvertDefaultLocale@4 ConvertFiberToThread@0 ConvertThreadToFiber@4 +ConvertThreadToFiberEx@8 CopyFileA@12 CopyFileExA@24 CopyFileExW@24 @@ -210,6 +211,7 @@ EnumResourceTypesW@12 EnumSystemCodePagesA@8 EnumSystemCodePagesW@8 +EnumSystemFirmwareTables@12 EnumSystemGeoID@12 EnumSystemLanguageGroupsA@12 EnumSystemLanguageGroupsW@12 @@ -272,10 +274,10 @@ FindResourceW@12 FindVolumeClose@4 FindVolumeMountPointClose@4 -;FlsAlloc@4 ;new for 2003 -;FlsFree@4 ;new for 2003 -;FlsGetValue@4 ;new for 2003 -;FlsSetValue@8 ;new for 2003 +FlsAlloc@4 +FlsFree@4 +FlsGetValue@4 +FlsSetValue@8 FlushConsoleInputBuffer@4 FlushFileBuffers@4 FlushInstructionCache@12 @@ -366,6 +368,7 @@ GetCurrentDirectoryW@8 GetCurrentProcess@0 GetCurrentProcessId@0 +GetCurrentProcessorNumber@0 GetCurrentThread@0 GetCurrentThreadId@0 GetDateFormatA@24 @@ -423,6 +426,7 @@ GetLogicalDriveStringsA@8 GetLogicalDriveStringsW@8 GetLogicalDrives@0 +GetLogicalProcessorInformation@8 GetLongPathNameA@12 GetLongPathNameW@12 GetMailslotInfo@20 @@ -438,6 +442,7 @@ GetNativeSystemInfo@4 GetNextVDMCommand@4 GetNlsSectionName@24 +GetNumaAvailableMemoryNode@8 GetNumaHighestNodeNumber@4 GetNumaNodeProcessorMask@8 ;GetNumaProcessorMap @@ -473,6 +478,7 @@ GetProcessTimes@20 GetProcessVersion@4 GetProcessWorkingSetSize@12 +GetProcessWorkingSetSizeEx@16 GetProfileIntA@12 GetProfileIntW@12 GetProfileSectionA@12 @@ -494,6 +500,8 @@ GetSystemDefaultUILanguage@0 GetSystemDirectoryA@8 GetSystemDirectoryW@8 +GetSystemFileCacheSize@12 +GetSystemFirmwareTable@16 GetSystemInfo@4 GetSystemPowerStatus@4 GetSystemRegistryQuota@8 @@ -763,6 +771,7 @@ ;RemoveLocalAlternateComputerNameA ;RemoveLocalAlternateComputerNameW RemoveVectoredExceptionHandler(a)4=NTDLL.RtlRemoveVectoredExceptionHandler +ReOpenFile@16 ReplaceFile=ReplaceFileW@24 ReplaceFileA@24 ReplaceFileW@24 @@ -874,7 +883,9 @@ SetProcessPriorityBoost@8 SetProcessShutdownParameters@8 SetProcessWorkingSetSize@12 +SetProcessWorkingSetSizeEx@16 SetStdHandle@8 +SetSystemFileCacheSize@12 SetSystemPowerState@8 SetSystemTime@4 SetSystemTimeAdjustment@8 @@ -888,6 +899,7 @@ SetThreadLocale@4 SetThreadPriority@8 SetThreadPriorityBoost@8 +SetThreadStackGuarantee@4 SetThreadUILanguage@4 SetTimerQueueTimer@24 SetTimeZoneInformation@4 Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -1402,3 +1402,104 @@ STUB; return FALSE; } + +UINT +WINAPI +EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + STUB; + return 0; +} + +BOOL +WINAPI +GetSystemFileCacheSize(OUT PSIZE_T lpMinimumFileCacheSize, + OUT PSIZE_T lpMaximumFileCacheSize, + OUT PDWORD lpFlags) +{ + STUB; + return FALSE; +} + +UINT +WINAPI +GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, + IN DWORD FirmwareTableID, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + STUB; + return 0; +} + +BOOL +WINAPI +SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize, + IN SIZE_T MaximumFileCacheSize, + IN DWORD Flags) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) +{ + STUB; + return FALSE; +} + +HANDLE +WINAPI +ReOpenFile(IN HANDLE hOriginalFile, + IN DWORD dwDesiredAccess, + IN DWORD dwShareMode, + IN DWORD dwFlags) +{ + STUB; + return INVALID_HANDLE_VALUE; +} + +BOOL +WINAPI +SetProcessWorkingSetSizeEx(IN HANDLE hProcess, + IN SIZE_T dwMinimumWorkingSetSize, + IN SIZE_T dwMaximumWorkingSetSize, + IN DWORD Flags) +{ + STUB; + return FALSE; +} + + +BOOL +WINAPI +GetProcessWorkingSetSizeEx(IN HANDLE hProcess, + OUT PSIZE_T lpMinimumWorkingSetSize, + OUT PSIZE_T lpMaximumWorkingSetSize, + OUT PDWORD Flags) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, + IN OUT PDWORD ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaAvailableMemoryNode(IN UCHAR Node, + OUT PULONGLONG AvailableBytes) +{ + STUB; + return FALSE; +} Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -233,4 +233,12 @@ GetSystemInfo(lpSystemInfo); } +DWORD +WINAPI +GetCurrentProcessorNumber(VOID) +{ + /* Forward to kernel */ + return NtGetCurrentProcessorNumber(); +} + /* EOF */ Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -1398,4 +1398,17 @@ return TRUE; } +/* + * @unimplemented + */ +BOOL +WINAPI +QueryWorkingSetEx(IN HANDLE hProcess, + IN OUT PVOID pv, + IN DWORD cb) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.def?… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -32,3 +32,4 @@ GetWsChanges@12 @22 InitializeProcessForWsWatch@4 @23 QueryWorkingSet@12 @24 +QueryWorkingSetEx@12 @25 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -4400,6 +4400,45 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif +typedef enum _PROCESSOR_CACHE_TYPE { + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace +} PROCESSOR_CACHE_TYPE; + +typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { + RelationProcessorCore, + RelationNumaNode, + RelationCache, + RelationProcessorPackage +} LOGICAL_PROCESSOR_RELATIONSHIP; + +#define CACHE_FULLY_ASSOCIATIVE 0xFF + +typedef struct _CACHE_DESCRIPTOR { + BYTE Level; + BYTE Associativity; + WORD LineSize; + DWORD Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + +typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION { + ULONG_PTR ProcessorMask; + LOGICAL_PROCESSOR_RELATIONSHIP Relationship; + union { + struct { + BYTE Flags; + } ProcessorCore; + struct { + DWORD NodeNumber; + } NumaNode; + CACHE_DESCRIPTOR Cache; + ULONGLONG Reserved[2]; + }; +} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; + NTSYSAPI SIZE_T STDCALL

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008