Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[dgorbachev] 42926: Sprinkle win32k with some explicit voids,

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Aug 24 22:09:58 2009 New Revision: 42926 URL: http://svn.reactos.org/svn/reactos?rev=42926&view=rev Log: Sprinkle win32k with some explicit voids, Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/error.h trunk/reactos/subsystems/win32/win32k/include/focus.h trunk/reactos/subsystems/win32/win32k/include/guicheck.h trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/ntuser.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/misc/err.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -12,10 +12,10 @@ } ACCELERATOR_TABLE, *PACCELERATOR_TABLE; NTSTATUS FASTCALL -InitAcceleratorImpl(); +InitAcceleratorImpl(VOID); NTSTATUS FASTCALL -CleanupAcceleratorImpl(); +CleanupAcceleratorImpl(VOID); PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -233,7 +233,7 @@ } BOOL FASTCALL -IntPrepareDriverIfNeeded(); +IntPrepareDriverIfNeeded(VOID); extern PDEVOBJ PrimarySurface; #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/error.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/error.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -10,7 +10,7 @@ DWORD Status); NTSTATUS FASTCALL -GetLastNtError(); +GetLastNtError(VOID); #endif /* _WIN32K_ERROR_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/focus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/focus.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/focus.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -5,17 +5,17 @@ * These functions take the window handles from current message queue. */ HWND FASTCALL -IntGetCaptureWindow(); +IntGetCaptureWindow(VOID); HWND FASTCALL -IntGetFocusWindow(); +IntGetFocusWindow(VOID); /* * These functions take the window handles from current thread queue. */ HWND FASTCALL -IntGetThreadFocusWindow(); -HWND APIENTRY IntGetCapture(); -HWND FASTCALL UserGetActiveWindow(); +IntGetThreadFocusWindow(VOID); +HWND APIENTRY IntGetCapture(VOID); +HWND FASTCALL UserGetActiveWindow(VOID); BOOL FASTCALL co_IntMouseActivateWindow(PWINDOW_OBJECT Window); Modified: trunk/reactos/subsystems/win32/win32k/include/guicheck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/guicheck.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/guicheck.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -2,8 +2,8 @@ #define _WIN32K_GUICHECK_H BOOL FASTCALL co_IntGraphicsCheck(BOOL Create); -BOOL FASTCALL IntCreatePrimarySurface(); -VOID FASTCALL IntDestroyPrimarySurface(); +BOOL FASTCALL IntCreatePrimarySurface(VOID); +VOID FASTCALL IntDestroyPrimarySurface(VOID); NTSTATUS FASTCALL InitGuiCheckImpl (VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -15,7 +15,7 @@ } HOT_KEY_ITEM, *PHOT_KEY_ITEM; NTSTATUS FASTCALL -InitHotkeyImpl(); +InitHotkeyImpl(VOID); //NTSTATUS FASTCALL //CleanupHotKeys(PWINSTATION_OBJECT WinStaObject); Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -24,7 +24,7 @@ extern HGDIOBJ StockObjects[]; extern SHORT gusLanguageID; -SHORT FASTCALL IntGdiGetLanguageID(); +SHORT FASTCALL IntGdiGetLanguageID(VOID); DWORD APIENTRY IntGetQueueStatus(BOOL ClearChanges); VOID FASTCALL IntUserManualGuiCheck(LONG Check); PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -17,8 +17,8 @@ VOID FASTCALL UserEnterShared(VOID); VOID FASTCALL UserEnterExclusive(VOID); VOID FASTCALL UserLeave(VOID); -BOOL FASTCALL UserIsEntered(); -BOOL FASTCALL UserIsEnteredExclusive(); +BOOL FASTCALL UserIsEntered(VOID); +BOOL FASTCALL UserIsEnteredExclusive(VOID); #endif /* _WIN32K_NTUSER_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -115,7 +115,7 @@ BOOL UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); -BOOL FASTCALL UserCreateHandleTable(); +BOOL FASTCALL UserCreateHandleTable(VOID); VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -53,7 +53,7 @@ /*************** FOCUS.C ***************/ -HWND FASTCALL UserGetActiveWindow(); +HWND FASTCALL UserGetActiveWindow(VOID); HWND FASTCALL UserGetForegroundWindow(VOID); @@ -125,7 +125,7 @@ VOID FASTCALL co_DestroyThreadWindows(struct _ETHREAD *Thread); -HWND FASTCALL UserGetShellWindow(); +HWND FASTCALL UserGetShellWindow(VOID); HWND FASTCALL UserGetWindow(HWND hWnd, UINT Relationship); Modified: trunk/reactos/subsystems/win32/win32k/misc/err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/err.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/err.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -50,7 +50,7 @@ } NTSTATUS FASTCALL -GetLastNtError() +GetLastNtError(VOID) { PTEB Teb = PsGetCurrentThread()->Tcb.Teb; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -54,7 +54,7 @@ return wce; } -VOID FASTCALL printChain() +VOID FASTCALL printChain(VOID) { /*test*/ PCLIPBOARDCHAINELEMENT wce2 = WindowsChain; @@ -148,7 +148,7 @@ /* counts how many distinct format were are in the clipboard */ DWORD FASTCALL -IntCountClipboardFormats() +IntCountClipboardFormats(VOID) { DWORD ret = 0; PCLIPBOARDELEMENT ce = ClipboardData; @@ -221,7 +221,7 @@ } VOID FASTCALL -IntEmptyClipboardData() +IntEmptyClipboardData(VOID) { PCLIPBOARDELEMENT ce = ClipboardData; PCLIPBOARDELEMENT tmp; @@ -322,7 +322,7 @@ } VOID FASTCALL -freeSynthesizedData() +freeSynthesizedData(VOID) { ExFreePool(synthesizedData); } @@ -330,7 +330,7 @@ /*==============================================================*/ BOOL FASTCALL -intIsClipboardOpenByMe() +intIsClipboardOpenByMe(VOID) { /* check if we open the clipboard */ if (ClipboardThread && ClipboardThread == PsGetCurrentThreadWin32Thread()) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -24,21 +24,21 @@ #include <debug.h> HWND FASTCALL -IntGetCaptureWindow() +IntGetCaptureWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); return ForegroundQueue != NULL ? ForegroundQueue->CaptureWindow : 0; } HWND FASTCALL -IntGetFocusWindow() +IntGetFocusWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); return ForegroundQueue != NULL ? ForegroundQueue->FocusWindow : 0; } HWND FASTCALL -IntGetThreadFocusWindow() +IntGetThreadFocusWindow(VOID) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; @@ -445,7 +445,7 @@ } -HWND FASTCALL UserGetActiveWindow() +HWND FASTCALL UserGetActiveWindow(VOID) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -53,7 +53,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS FASTCALL -InitHotkeyImpl() +InitHotkeyImpl(VOID) { InitializeListHead(&gHotkeyList); @@ -63,7 +63,7 @@ #if 0 //not used NTSTATUS FASTCALL -CleanupHotKeys() +CleanupHotKeys(VOID) { return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -16,7 +16,7 @@ SHORT FASTCALL -IntGdiGetLanguageID() +IntGdiGetLanguageID(VOID) { HANDLE KeyHandle; ULONG Size = sizeof(WCHAR) * (MAX_PATH + 12); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -180,13 +180,13 @@ RETURN True if current thread owns the lock (possibly shared) */ -BOOL FASTCALL UserIsEntered() +BOOL FASTCALL UserIsEntered(VOID) { return ExIsResourceAcquiredExclusiveLite(&UserLock) || ExIsResourceAcquiredSharedLite(&UserLock); } -BOOL FASTCALL UserIsEnteredExclusive() +BOOL FASTCALL UserIsEnteredExclusive(VOID) { return ExIsResourceAcquiredExclusiveLite(&UserLock); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -402,7 +402,7 @@ -BOOL FASTCALL UserCreateHandleTable() +BOOL FASTCALL UserCreateHandleTable(VOID) { PVOID mem; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -713,7 +713,7 @@ } VOID FASTCALL -DceEmptyCache() +DceEmptyCache(VOID) { PDCE pDCE = FirstDce; KeEnterCriticalRegion(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -3272,7 +3272,7 @@ * Status * @implemented */ -HWND FASTCALL UserGetShellWindow() +HWND FASTCALL UserGetShellWindow(VOID) { PWINSTATION_OBJECT WinStaObject; HWND Ret; Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -202,7 +202,7 @@ } static BOOL FASTCALL -IntPrepareDriver() +IntPrepareDriver(VOID) { PFN_DrvEnableDriver GDEnableDriver; DRVENABLEDATA DED; @@ -437,13 +437,13 @@ } BOOL FASTCALL -IntPrepareDriverIfNeeded() +IntPrepareDriverIfNeeded(VOID) { return (PrimarySurface.PreparedDriver ? TRUE : IntPrepareDriver()); } static BOOL FASTCALL -PrepareVideoPrt() +PrepareVideoPrt(VOID) { PIRP Irp; NTSTATUS Status; @@ -499,7 +499,7 @@ BOOL FASTCALL -IntCreatePrimarySurface() +IntCreatePrimarySurface(VOID) { SIZEL SurfSize; RECTL SurfaceRect; @@ -573,7 +573,7 @@ } VOID FASTCALL -IntDestroyPrimarySurface() +IntDestroyPrimarySurface(VOID) { BOOL calledFromUser; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon Aug 24 22:09:58 2009 @@ -196,7 +196,7 @@ ULONG FASTCALL -InterlockedPopFreeEntry() +InterlockedPopFreeEntry(VOID) { ULONG idxFirst, idxNext, idxPrev; PGDI_TABLE_ENTRY pEntry;

15 years, 4 months

[sginsberg] 42925: - ...fix typo

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 22:08:45 2009 New Revision: 42925 URL: http://svn.reactos.org/svn/reactos?rev=42925&view=rev Log: - ...fix typo Modified: trunk/reactos/ntoskrnl/ke/except.c Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Mon Aug 24 22:08:45 2009 @@ -138,7 +138,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Don't fail silently */ - DPRINT1("KiRaiseException: Failed to Probe\n"), + DPRINT1("KiRaiseException: Failed to Probe\n"); DbgBreakPoint(); /* Return the exception code */

15 years, 4 months

[sginsberg] 42924: - Add a comment and debug print

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 22:07:12 2009 New Revision: 42924 URL: http://svn.reactos.org/svn/reactos?rev=42924&view=rev Log: - Add a comment and debug print Modified: trunk/reactos/ntoskrnl/ke/except.c Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Mon Aug 24 22:07:12 2009 @@ -137,6 +137,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* Don't fail silently */ + DPRINT1("KiRaiseException: Failed to Probe\n"), DbgBreakPoint(); /* Return the exception code */

15 years, 4 months

[sginsberg] 42923: - Use _SEH2_YIELD when returning from an exception instead of returning outside the SEH block. Avoids unnecessary status checks for the most common case (no exception). Move the cleanup code into the handler too in favor of the no-exception case. Futhermore, don't call ExSystemExceptionFilter when we know we are called from user mode. Finally, only enter SEH if we need to do any probing. - Re-enable user mode probes in KiRaiseException; they do not seem to be an issue anymore

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 21:58:15 2009 New Revision: 42923 URL: http://svn.reactos.org/svn/reactos?rev=42923&view=rev Log: - Use _SEH2_YIELD when returning from an exception instead of returning outside the SEH block. Avoids unnecessary status checks for the most common case (no exception). Move the cleanup code into the handler too in favor of the no-exception case. Futhermore, don't call ExSystemExceptionFilter when we know we are called from user mode. Finally, only enter SEH if we need to do any probing. - Re-enable user mode probes in KiRaiseException; they do not seem to be an issue anymore -- booting and running the ntdll exception Winetest didn't reveal any issue. Put a breakpoint there in case this code is ever hit (unlikely). Modified: trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/vdm/vdmmain.c Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=42923&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -54,7 +54,7 @@ IN va_list ap, IN BOOLEAN HandleBreakpoint) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ANSI_STRING DebugString; CHAR Buffer[512]; ULONG Length, PrefixLength; @@ -65,11 +65,11 @@ !(NtQueryDebugFilterState(ComponentId, Level))) { /* This message is masked */ - return Status; + return STATUS_SUCCESS; } /* For user mode, don't recursively DbgPrint */ - if (RtlpSetInDbgPrint(TRUE)) return Status; + if (RtlpSetInDbgPrint(TRUE)) return STATUS_SUCCESS; /* Guard against incorrect pointers */ _SEH2_TRY @@ -91,10 +91,9 @@ { /* Fail */ Length = PrefixLength = 0; - Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; /* Check if we went past the buffer */ if (Length == -1U) Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -27,7 +27,7 @@ IN ULONG CreateOptions, OUT PULONG Disposition OPTIONAL) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; @@ -63,11 +63,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the error code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if(!NT_SUCCESS(Status)) return Status; } else { @@ -113,7 +112,7 @@ { CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); DPRINT("NtOpenKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); @@ -135,11 +134,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the status */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if(!NT_SUCCESS(Status)) return Status; } /* Just let the object manager handle this */ @@ -268,16 +266,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { /* Dereference and return status */ ObDereferenceObject(KeyObject); - return Status; - } + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; } /* Setup the callback */ @@ -357,16 +350,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { /* Dereference and return status */ ObDereferenceObject(KeyObject); - return Status; - } + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; } /* Setup the callback */ @@ -476,16 +464,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { /* Dereference and return status */ ObDereferenceObject(KeyObject); - return Status; - } + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; } /* Setup the callback */ @@ -556,16 +539,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { /* Dereference and return status */ ObDereferenceObject(KeyObject); - return Status; - } + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; } /* Make sure the name is aligned properly */ @@ -1131,7 +1109,7 @@ IN ULONG Flags) { #if 0 - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING ObjectName; CM_PARSE_CONTEXT ParseContext = {0}; @@ -1175,11 +1153,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the error code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if(!NT_SUCCESS(Status)) return Status; } else { 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] Mon Aug 24 21:58:15 2009 @@ -1517,7 +1517,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PDEBUG_OBJECT DebugObject; HANDLE hDebug; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); /* Check if we were called from user mode*/ @@ -1531,10 +1531,9 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception error */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } /* Check for invalid flags */ @@ -1610,7 +1609,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PDEBUG_OBJECT DebugObject; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PDEBUG_EVENT DebugEvent = NULL, DebugEventToWake = NULL; PLIST_ENTRY ListHead, NextEntry; BOOLEAN NeedsWake = FALSE; @@ -1632,10 +1631,9 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception error */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } /* Make sure that the status is valid */ @@ -1869,7 +1867,7 @@ { PDEBUG_OBJECT DebugObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION DebugInfo = DebugInformation; PAGED_CODE(); @@ -1881,6 +1879,7 @@ DebugInformation, DebugInformationLength, PreviousMode); + if (!NT_SUCCESS(Status)) return Status; /* Check if the caller wanted the return length */ if (ReturnLength) @@ -1894,12 +1893,11 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - /* Get SEH Exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } - if (!NT_SUCCESS(Status)) return Status; /* Open the Object */ Status = ObReferenceObjectByHandle(DebugHandle, @@ -1955,7 +1953,7 @@ LARGE_INTEGER NewTime; PDEBUG_OBJECT DebugObject; DBGUI_WAIT_STATE_CHANGE WaitStateChange; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PDEBUG_EVENT DebugEvent = NULL, DebugEvent2; PLIST_ENTRY ListHead, NextEntry, NextEntry2; PAGED_CODE(); @@ -1987,11 +1985,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } else { Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -97,13 +97,12 @@ ULONG ParameterCount, Size; NTSTATUS Status = STATUS_SUCCESS; - /* Set up SEH */ - _SEH2_TRY + /* Check if we need to probe */ + if (PreviousMode != KernelMode) { - /* Check the previous mode */ - if (PreviousMode != KernelMode) + /* Set up SEH */ + _SEH2_TRY { -#if 0 /* Probe the context */ ProbeForRead(Context, sizeof(CONTEXT), sizeof(ULONG)); @@ -112,7 +111,7 @@ FIELD_OFFSET(EXCEPTION_RECORD, NumberParameters) + sizeof(ULONG), sizeof(ULONG)); -#endif + /* Validate the maximum parameters */ if ((ParameterCount = ExceptionRecord->NumberParameters) > EXCEPTION_MAXIMUM_PARAMETERS) @@ -136,14 +135,15 @@ /* Update the parameter count */ ExceptionRecord->NumberParameters = ParameterCount; } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DbgBreakPoint(); + + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; /* Convert the context record */ KeContextToTrapFrame(Context, Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -1072,7 +1072,6 @@ NTAPI KeRaiseUserException(IN NTSTATUS ExceptionCode) { - NTSTATUS Status = STATUS_SUCCESS; ULONG OldEip; PTEB Teb = KeGetCurrentThread()->Teb; PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame; @@ -1085,11 +1084,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Save exception code */ - Status = ExceptionCode; + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; /* Get the old EIP */ OldEip = TrapFrame->Eip; 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] Mon Aug 24 21:58:15 2009 @@ -135,7 +135,7 @@ { ULONG_PTR NewStack, OldStack; PULONG UserEsp; - NTSTATUS CallbackStatus = STATUS_SUCCESS; + NTSTATUS CallbackStatus; PEXCEPTION_REGISTRATION_RECORD ExceptionList; PTEB Teb; ULONG GdiBatchCount = 0; @@ -192,10 +192,9 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Get the SEH exception */ - CallbackStatus = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(CallbackStatus)) return CallbackStatus; /* Check if we have GDI Batch operations */ if (GdiBatchCount) Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -849,10 +849,10 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); LARGE_INTEGER SafeInterval; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; /* Check the previous mode */ - if(PreviousMode != KernelMode) + if (PreviousMode != KernelMode) { /* Enter SEH for probing */ _SEH2_TRY @@ -863,11 +863,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get SEH exception */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } /* Call the Kernel Function */ Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -160,7 +160,7 @@ { PLPCP_PORT_OBJECT Port, ReceivePort, ConnectionPort = NULL; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PLPCP_MESSAGE Message; PETHREAD Thread = PsGetCurrentThread(), WakeupThread; PLPCP_CONNECTION_MESSAGE ConnectMessage; @@ -200,14 +200,10 @@ _SEH2_EXCEPT(ExSystemExceptionFilter()) { DPRINT1("SEH crash [1]\n"); - DbgBreakPoint(); - Status = _SEH2_GetExceptionCode(); + DbgBreakPoint(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Bail out if pointer was invalid */ - if (!NT_SUCCESS(Status)) - return Status; } else { Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -544,6 +544,7 @@ /* No callback, just copy the message */ _SEH2_TRY { + /* Copy it */ LpcpMoveMessage(&Message->Request, LpcRequest, LpcRequest + 1, @@ -552,16 +553,12 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { + /* Fail */ LpcpFreeToPortZone(Message, 0); ObDereferenceObject(Port); - return Status; - } + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; /* Acquire the LPC lock */ KeAcquireGuardedMutex(&LpcpLock); Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -609,7 +609,7 @@ /* Check if the pointer is valid */ ProbeForWriteUlong(PreviousFlags); } - _SEH2_EXCEPT(ExSystemExceptionFilter()) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* It isn't -- fail */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Mon Aug 24 21:58:15 2009 @@ -120,25 +120,21 @@ return Status; } - /* Now, copy the first physical page into the first virtual page */ + /* Enter SEH */ _SEH2_TRY { + /* Copy the first physical page into the first virtual page */ RtlMoveMemory(NullAddress, BaseAddress, ViewSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the status */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { + /* Fail */ DPRINT1("Couldn't copy first page (%x)\n", Status); ZwClose(PhysMemHandle); ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - return Status; + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } + _SEH2_END; /* Close physical memory section handle */ ZwClose(PhysMemHandle);

15 years, 4 months

[sginsberg] 42922: - "BIG0" isn't a reserved tag, but "BIG " is.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 20:36:03 2009 New Revision: 42922 URL: http://svn.reactos.org/svn/reactos?rev=42922&view=rev Log: - "BIG0" isn't a reserved tag, but "BIG " is. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Mon Aug 24 20:36:03 2009 @@ -50,7 +50,7 @@ if (Tag == 0) KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller); - if (Tag == '0GIB') + if (Tag == ' GIB') KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller); #define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9'))

15 years, 4 months

[dgorbachev] 42921: Fix Czech file.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Aug 24 20:21:48 2009 New Revision: 42921 URL: http://svn.reactos.org/svn/reactos?rev=42921&view=rev Log: Fix Czech file. Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Mon Aug 24 20:21:48 2009 @@ -10,7 +10,6 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 @@ -43,7 +42,7 @@ LTEXT "Bytù:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Vlastnosti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 @@ -113,6 +112,7 @@ IDS_NET_REPAIR "Repair" IDS_NET_CREATELINK "Create Shortcut" IDS_NET_DELETE "Delete" + IDS_NET_RENAME "Rename" IDS_NET_PROPERTIES "Properties" IDS_FORMAT_BIT "%u Bit/s" @@ -124,4 +124,3 @@ IDS_ASSIGNED_DHCP "Pøiøazeno DHCP" IDS_ASSIGNED_MANUAL "Ruènì nastaveno" END -

15 years, 4 months

[sginsberg] 42920: - Get rid of TAG() from the kernel - mmtypes.h: Goodbye TAG(), you won't be missed

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 20:19:53 2009 New Revision: 42920 URL: http://svn.reactos.org/svn/reactos?rev=42920&view=rev Log: - Get rid of TAG() from the kernel - mmtypes.h: Goodbye TAG(), you won't be missed Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/lpc/create.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/dbgpool.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obsdcach.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -40,12 +40,6 @@ #define ROUND_TO_ALLOCATION_GRANULARITY(Size) \ (((ULONG_PTR)(Size) + MM_ALLOCATION_GRANULARITY - 1) \ & ~(MM_ALLOCATION_GRANULARITY - 1)) - -// -// Macro for generating pool tags -// -#define TAG(A, B, C, D) \ - (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) // // PFN Identity Uses Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -116,7 +116,7 @@ Callback = ExAllocatePoolWithTag(PagedPool, sizeof(REGISTRY_CALLBACK), - TAG('C', 'M', 'c', 'b')); + 'bcMC'); if (Callback != NULL) { /* initialize the callback */ Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -285,7 +285,7 @@ /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); - KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->Type = '20yk'; KeyBody->KeyControlBlock = NULL; /* Check if we had a class */ @@ -680,7 +680,7 @@ /* Get the key body and fill it out */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; - KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->Type = '20yk'; KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->NotifyBlock = NULL; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -63,7 +63,7 @@ CmpLockRegistry(); /* Make sure this is a valid key body */ - if (KeyBody->Type == TAG('k', 'y', '0', '2')) + if (KeyBody->Type == '20yk') { /* Get the KCB */ Kcb = KeyBody->KeyControlBlock; @@ -100,7 +100,7 @@ if (SystemHandleCount > 1) return; /* Make sure we're a valid key body */ - if (KeyBody->Type == TAG('k', 'y', '0', '2')) + if (KeyBody->Type == '20yk') { /* Don't do anything if we don't have a notify block */ if (!KeyBody->NotifyBlock) return; @@ -964,7 +964,7 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; - RootKey->Type = TAG('k', 'y', '0', '2'); + RootKey->Type = '20yk'; RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); 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] Mon Aug 24 20:19:53 2009 @@ -59,7 +59,7 @@ /* Allocate it */ DebugEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEBUG_EVENT), - TAG('D', 'b', 'g', 'E')); + 'EgbD'); if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; /* Set flags */ Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ATOM TAG('A', 't', 'o', 'm') +#define TAG_ATOM 'motA' /* GLOBALS ****************************************************************/ 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] Mon Aug 24 20:19:53 2009 @@ -402,7 +402,7 @@ if (NT_SUCCESS(Status)) { /* Set it up */ - Callback->Signature = TAG('C', 'a', 'l', 'l'); + Callback->Signature = 'llaC'; KeInitializeSpinLock(&Callback->Lock); InitializeListHead(&Callback->RegisteredCallbacks); Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -131,7 +131,7 @@ PVOID Buffer; /* Do the allocation */ - Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b')); + Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO'); if (Buffer) { /* Clear the memory */ @@ -156,7 +156,7 @@ PVOID Buffer; /* Do the allocation */ - Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b')); + Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO'); if (Buffer) { /* Check if we have a process to charge quota */ @@ -344,7 +344,7 @@ /* Allocate the table */ HandleTable = ExAllocatePoolWithTag(PagedPool, sizeof(HANDLE_TABLE), - TAG('O', 'b', 't', 'b')); + 'btbO'); if (!HandleTable) return NULL; /* Check if we have a process */ 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] Mon Aug 24 20:19:53 2009 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ERR TAG('E', 'r', 'r', ' ') +#define TAG_ERR ' rrE' /* GLOBALS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -235,7 +235,7 @@ /* Allocate the a new buffer since loader memory will be freed */ ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool, ExpNlsTableSize, - TAG('R', 't', 'l', 'i')); + 'iltR'); if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); /* Copy the codepage data in its new location. */ @@ -324,7 +324,7 @@ RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */ - ExFreePoolWithTag(ExpNlsTableBase, TAG('R', 't', 'l', 'i')); + ExFreePoolWithTag(ExpNlsTableBase, 'iltR'); ExpNlsTableBase = SectionBase; /* Initialize the NLS Tables */ @@ -1188,7 +1188,7 @@ KeServiceDescriptorTable[0].Count = ExAllocatePoolWithTag(NonPagedPool, KiServiceLimit * sizeof(ULONG), - TAG('C', 'a', 'l', 'l')); + 'llaC'); /* Use it for the shadow table too */ KeServiceDescriptorTableShadow[0].Count = KeServiceDescriptorTable[0].Count; @@ -1269,7 +1269,7 @@ /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(INIT_BUFFER), - TAG('I', 'n', 'i', 't')); + 'tinI'); if (!InitBuffer) { /* Bugcheck */ Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -108,7 +108,7 @@ ExInitializeSystemLookasideList(&ExpSmallNPagedPoolLookasideLists[i], NonPagedPool, (i + 1) * 8, - TAG('P', 'o', 'o', 'l'), + 'looP', 256, &ExPoolLookasideListHead); @@ -116,7 +116,7 @@ ExInitializeSystemLookasideList(&ExpSmallPagedPoolLookasideLists[i], PagedPool, (i + 1) * 8, - TAG('P', 'o', 'o', 'l'), + 'looP', 256, &ExPoolLookasideListHead); } 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] Mon Aug 24 20:19:53 2009 @@ -17,7 +17,7 @@ #pragma alloc_text(INIT, ExpInitializeProfileImplementation) #endif -#define TAG_PROFILE TAG('P', 'r', 'o', 'f') +#define TAG_PROFILE 'forP' /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -172,7 +172,7 @@ FsRtlPagingIoResources = FsRtlAllocatePoolWithTag(NonPagedPool, FSRTL_MAX_RESOURCES * sizeof(ERESOURCE), - TAG('F', 's', 'R', 'e')); + 'eRsF'); /* Initialize the Resources */ for (i = 0; i < FSRTL_MAX_RESOURCES; i++) Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -45,8 +45,8 @@ // // CM_KEY_CONTROL_BLOCK Signatures // -#define CM_KCB_SIGNATURE TAG('C', 'm', 'K', 'b') -#define CM_KCB_INVALID_SIGNATURE TAG('C', 'm', 'F', '4') +#define CM_KCB_SIGNATURE 'bKmC' +#define CM_KCB_INVALID_SIGNATURE '4FmC' // // CM_KEY_CONTROL_BLOCK Flags Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -70,7 +70,7 @@ PAGE_SIZE) /* Signature of free pool blocks */ -#define MM_FREE_POOL_TAG TAG('F', 'r', 'p', 'l') +#define MM_FREE_POOL_TAG 'lprF' #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -142,7 +142,7 @@ // // Private Temporary Buffer for Lookup Routines // -#define TAG_OB_TEMP_STORAGE TAG('O', 'b', 'S', 't') +#define TAG_OB_TEMP_STORAGE 'tSbO' typedef struct _OB_TEMP_BUFFER { ACCESS_STATE LocalAccessState; Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -2,166 +2,166 @@ #define _NTOSKRNL_TAG_H /* formerly located in cc/view.c */ -#define TAG_CSEG TAG('C', 'S', 'E', 'G') -#define TAG_BCB TAG('B', 'C', 'B', ' ') -#define TAG_IBCB TAG('i', 'B', 'C', 'B') +#define TAG_CSEG 'GESC' +#define TAG_BCB ' BCB' +#define TAG_IBCB 'BCBi' /* formely located in include/callback.h */ -#define CALLBACK_TAG TAG('C','L','B','K') +#define CALLBACK_TAG 'KBLC' /* formerly located in ex/resource.c */ -#define TAG_RESOURCE_TABLE TAG('R', 'e', 'T', 'a') -#define TAG_RESOURCE_EVENT TAG('R', 'e', 'T', 'a') -#define TAG_RESOURCE_SEMAPHORE TAG('R', 'e', 'T', 'a') +#define TAG_RESOURCE_TABLE 'aTeR' +#define TAG_RESOURCE_EVENT 'aTeR' +#define TAG_RESOURCE_SEMAPHORE 'aTeR' /* formerly located in fs/notify.c */ -#define FSRTL_NOTIFY_TAG TAG('N','O','T','I') +#define FSRTL_NOTIFY_TAG 'ITON' /* formerly located in io/device.c */ -#define TAG_DEVICE_EXTENSION TAG('D', 'E', 'X', 'T') -#define TAG_SHUTDOWN_ENTRY TAG('S', 'H', 'U', 'T') -#define TAG_IO_TIMER TAG('I', 'O', 'T', 'M') +#define TAG_DEVICE_EXTENSION 'TXED' +#define TAG_SHUTDOWN_ENTRY 'TUHS' +#define TAG_IO_TIMER 'MTOI' /* formerly located in io/driver.c */ -#define TAG_DRIVER TAG('D', 'R', 'V', 'R') -#define TAG_DRIVER_EXTENSION TAG('D', 'R', 'V', 'E') +#define TAG_DRIVER 'RVRD' +#define TAG_DRIVER_EXTENSION 'EVRD' /* formerly located in io/file.c */ -#define TAG_SYSB TAG('S', 'Y', 'S', 'B') -#define TAG_LOCK TAG('F','l','c','k') -#define TAG_FILE_NAME TAG('F', 'N', 'A', 'M') +#define TAG_SYSB 'BSYS' +#define TAG_LOCK 'kclF' +#define TAG_FILE_NAME 'MANF' /* formerly located in io/fs.c */ -#define TAG_FILE_SYSTEM TAG('F', 'S', 'Y', 'S') -#define TAG_FS_CHANGE_NOTIFY TAG('F', 'S', 'C', 'N') -#define IFS_POOL_TAG TAG('F', 'S', 'r', 't') +#define TAG_FILE_SYSTEM 'SYSF' +#define TAG_FS_CHANGE_NOTIFY 'NCSF' +#define IFS_POOL_TAG 'trSF' /* formerly located in io/iocomp.c */ -#define IOC_TAG TAG('I', 'O', 'C', 'T') +#define IOC_TAG 'TCOI' /* formerly located in io/iomgr.c */ -#define TAG_DEVICE_TYPE TAG('D', 'E', 'V', 'T') -#define TAG_FILE_TYPE TAG('F', 'I', 'L', 'E') -#define TAG_ADAPTER_TYPE TAG('A', 'D', 'P', 'T') -#define IO_LARGEIRP TAG('I', 'r', 'p', 'l') -#define IO_SMALLIRP TAG('I', 'r', 'p', 's') -#define IO_LARGEIRP_CPU TAG('I', 'r', 'p', 'L') -#define IO_SMALLIRP_CPU TAG('I', 'r', 'p', 'S') -#define IOC_TAG1 TAG('I', 'p', 'c', ' ') -#define IOC_CPU TAG('I', 'p', 'c', 'P') -#define TAG_APC TAG('K', 'A', 'P', 'C') -#define TAG_IO TAG('I', 'o', ' ', ' ') -#define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') -#define TAG_EA TAG('I', 'o', 'E', 'a') -#define TAG_IO_NAME TAG('I', 'o', 'N', 'm') -#define TAG_REINIT TAG('I', 'o', 'R', 'i') +#define TAG_DEVICE_TYPE 'TVED' +#define TAG_FILE_TYPE 'ELIF' +#define TAG_ADAPTER_TYPE 'TPDA' +#define IO_LARGEIRP 'lprI' +#define IO_SMALLIRP 'sprI' +#define IO_LARGEIRP_CPU 'LprI' +#define IO_SMALLIRP_CPU 'SprI' +#define IOC_TAG1 ' cpI' +#define IOC_CPU 'PcpI' +#define TAG_APC 'CPAK' +#define TAG_IO ' oI' +#define TAG_ERROR_LOG 'rEoI' +#define TAG_EA 'aEoI' +#define TAG_IO_NAME 'mNoI' +#define TAG_REINIT 'iRoI' /* formerly located in io/work.c */ -#define TAG_IOWI TAG('I', 'O', 'W', 'I') +#define TAG_IOWI 'IWOI' /* formerly located in io/irp.c */ -#define TAG_IRP TAG('I', 'R', 'P', ' ') -#define TAG_SYS_BUF TAG('S', 'Y', 'S' , 'B') +#define TAG_IRP ' PRI' +#define TAG_SYS_BUF 'BSYS' /* formerly located in io/irq.c */ -#define TAG_KINTERRUPT TAG('K', 'I', 'S', 'R') +#define TAG_KINTERRUPT 'RSIK' /* formerly located in io/mdl.c */ -#define TAG_MDL TAG('M', 'D', 'L', ' ') +#define TAG_MDL ' LDM' /* formerly located in io/pnpnotify.c */ -#define TAG_PNP_NOTIFY TAG('P', 'n', 'P', 'N') +#define TAG_PNP_NOTIFY 'NPnP' /* for io/pnproot.c */ -#define TAG_PNP_ROOT TAG('P', 'n', 'P', 'R') +#define TAG_PNP_ROOT 'RPnP' /* formerly located in io/resource.c */ -#define TAG_IO_RESOURCE TAG('R', 'S', 'R', 'C') +#define TAG_IO_RESOURCE 'CRSR' /* formerly located in io/timer.c */ -#define TAG_IO_TIMER TAG('I', 'O', 'T', 'M') +#define TAG_IO_TIMER 'MTOI' /* formerly located in io/vpb.c */ -#define TAG_VPB TAG('V', 'P', 'B', ' ') -#define TAG_SYSB TAG('S', 'Y', 'S', 'B') +#define TAG_VPB ' BPV' +#define TAG_SYSB 'BSYS' /* formerly located in kdbg/kdb_symbols.c */ -#define TAG_KDBS TAG('K', 'D', 'B', 'S') -#define TAG_KDBG TAG('K', 'D', 'B', 'G') +#define TAG_KDBS 'SBDK' +#define TAG_KDBG 'GBDK' /* formerly located in ldr/loader.c */ -#define TAG_DRIVER_MEM TAG('D', 'R', 'V', 'M') /* drvm */ -#define TAG_MODULE_OBJECT TAG('k', 'l', 'm', 'o') /* klmo - kernel ldr module object */ -#define TAG_LDR_WSTR TAG('k', 'l', 'w', 's') /* klws - kernel ldr wide string */ +#define TAG_DRIVER_MEM 'MVRD' /* drvm */ +#define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */ +#define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ /* formerly located in lpc/connect */ -#define TAG_LPC_CONNECT_MESSAGE TAG('L', 'P', 'C', 'C') +#define TAG_LPC_CONNECT_MESSAGE 'CCPL' /* formerly located in mm/aspace.c */ -#define TAG_PTRC TAG('P', 'T', 'R', 'C') +#define TAG_PTRC 'CRTP' /* formerly located in mm/marea.c */ -#define TAG_MAREA TAG('M', 'A', 'R', 'E') +#define TAG_MAREA 'ERAM' /* formerly located in mm/pageop.c */ -#define TAG_MM_PAGEOP TAG('M', 'P', 'O', 'P') +#define TAG_MM_PAGEOP 'POPM' /* formerly located in mm/pool.c */ -#define TAG_NONE TAG('N', 'o', 'n', 'e') +#define TAG_NONE 'enoN' /* formerly located in mm/region.c */ -#define TAG_MM_REGION TAG('M', 'R', 'G', 'N') +#define TAG_MM_REGION 'NGRM' /* formerly located in mm/rmap.c */ -#define TAG_RMAP TAG('R', 'M', 'A', 'P') +#define TAG_RMAP 'PAMR' /* formerly located in mm/section.c */ -#define TAG_MM_SECTION_SEGMENT TAG('M', 'M', 'S', 'S') -#define TAG_SECTION_PAGE_TABLE TAG('M', 'S', 'P', 'T') +#define TAG_MM_SECTION_SEGMENT 'SSMM' +#define TAG_SECTION_PAGE_TABLE 'TPSM' /* formerly located in ob/symlink.c */ -#define TAG_OBJECT_TYPE TAG('O', 'b', 'j', 'T') -#define TAG_SYMLINK_TTARGET TAG('S', 'Y', 'T', 'T') -#define TAG_SYMLINK_TARGET TAG('S', 'Y', 'M', 'T') +#define TAG_OBJECT_TYPE 'TjbO' +#define TAG_SYMLINK_TTARGET 'TTYS' +#define TAG_SYMLINK_TARGET 'TMYS' /* Object Manager Tags */ -#define OB_NAME_TAG TAG('O', 'b', 'N', 'm') -#define OB_DIR_TAG TAG('O', 'b', 'D', 'i') +#define OB_NAME_TAG 'mNbO' +#define OB_DIR_TAG 'iDbO' /* formerly located in ps/cid.c */ -#define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O') -#define TAG_PS_IMPERSONATION TAG('P', 's', 'I', 'm') +#define TAG_CIDOBJECT 'ODIC' +#define TAG_PS_IMPERSONATION 'mIsP' /* formerly located in ps/job.c */ -#define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */ +#define TAG_EJOB 'BOJE' /* EJOB */ /* formerly located in ps/kill.c */ -#define TAG_TERMINATE_APC TAG('T', 'A', 'P', 'C') +#define TAG_TERMINATE_APC 'CPAT' /* formerly located in ps/notify.c */ -#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */ -#define TAG_PS_APC TAG('P', 's', 'a', 'p') /* Psap - Ps APC */ +#define TAG_KAPC 'papk' /* kpap - kernel ps apc */ +#define TAG_PS_APC 'pasP' /* Psap - Ps APC */ /* formerly located in rtl/handle.c */ -#define TAG_HDTB TAG('H', 'D', 'T', 'B') +#define TAG_HDTB 'BTDH' /* formerly located in se/acl.c */ -#define TAG_ACL TAG('S', 'e', 'A', 'c') +#define TAG_ACL 'cAeS' /* formerly located in se/sid.c */ -#define TAG_SID TAG('S', 'e', 'S', 'i') +#define TAG_SID 'iSeS' /* formerly located in se/sd.c */ -#define TAG_SD TAG('S', 'e', 'S', 'd') +#define TAG_SD 'dSeS' /* LPC Tags */ -#define TAG_LPC_MESSAGE TAG('L', 'p', 'c', 'M') -#define TAG_LPC_ZONE TAG('L', 'p', 'c', 'Z') +#define TAG_LPC_MESSAGE 'McpL' +#define TAG_LPC_ZONE 'ZcpL' /* Se Process Audit */ -#define TAG_SEPA TAG('S', 'e', 'P', 'a') +#define TAG_SEPA 'aPeS' -#define TAG_WAIT TAG('W', 'a', 'i', 't') -#define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') +#define TAG_WAIT 'tiaW' +#define TAG_SEC_QUERY 'qSbO' #endif /* _NTOSKRNL_TAG_H */ 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] Mon Aug 24 20:19:53 2009 @@ -29,7 +29,7 @@ POBJECT_TYPE IoDriverObjectType = NULL; -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR' extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; 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] Mon Aug 24 20:19:53 2009 @@ -37,7 +37,7 @@ /* BOOLEAN ServiceRunning;*/ // needed ?? } SERVICE, *PSERVICE; -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR' /* GLOBALS ********************************************************************/ 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] Mon Aug 24 20:19:53 2009 @@ -230,7 +230,7 @@ /* Allocate the context */ UnloadContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(*UnloadContext), - TAG('I', 'o', 'U', 's')); + 'sUoI'); if (!UnloadContext) return STATUS_INSUFFICIENT_RESOURCES; /* Set up the context */ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -50,7 +50,7 @@ break; #if DBG - case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ + case ' soR': /* ROS-INTERNAL */ { switch ((ULONG)Buffer1) { @@ -81,7 +81,7 @@ } /* Special case for stack frame dumps */ - case TAG('R', 'o', 's', 'D'): + case 'DsoR': { KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); break; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -576,7 +576,7 @@ /* Allocate the IOPM save area. */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); + ' eK'); if (!Ki386IopmSaveArea) { /* Bugcheck. We need this for V86/VDM support. */ Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -74,7 +74,7 @@ /* Allocate VDM structure */ VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool, sizeof(VDM_PROCESS_OBJECTS), - TAG('K', 'e', ' ', ' ')); + ' eK'); if (!VdmProcessObjects) return STATUS_NO_MEMORY; /* Set it up */ 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] Mon Aug 24 20:19:53 2009 @@ -142,7 +142,7 @@ static ISR_TABLE IsrTable[NR_TRAPS][1]; #endif -#define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') +#define TAG_ISR_LOCK 'LRSI' /* FUNCTIONS ****************************************************************/ 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] Mon Aug 24 20:19:53 2009 @@ -61,7 +61,7 @@ /* Allocate a buffer first, before we raise IRQL */ SourceBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KPROFILE_SOURCE_OBJECT), - TAG('P', 'r', 'o', 'f')); + 'forP'); RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT)); /* Raise to PROFILE_LEVEL */ Modified: trunk/reactos/ntoskrnl/lpc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/create.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -24,7 +24,7 @@ /* Allocate the queue */ MessageQueue = ExAllocatePoolWithTag(NonPagedPool, sizeof(LPCP_NONPAGED_PORT_QUEUE), - TAG('P', 'o', 'r', 't')); + 'troP'); if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES; /* Set it up */ Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -65,7 +65,7 @@ NULL, 0, LpcpMaxMessageSize, - TAG('L', 'p', 'c', 'M'), + 'McpL', 32); /* We're done */ Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -25,19 +25,19 @@ ExpIsPoolTagDebuggable(ULONG Tag) { #if 0 - if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE; - if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE; - if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE; - if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE; + if (Tag == 'llaC') return FALSE; + if (Tag == 'virD') return FALSE; + if (Tag == 'iveD') return FALSE; + if (Tag == 'padA') return FALSE; - if (Tag == TAG('S', 'e', 'S', 'd')) return FALSE; - if (Tag == TAG('O', 'b', 'D', 'i')) return FALSE; - if (Tag == TAG('O', 'b', 'N', 'm')) return FALSE; - if (Tag == TAG('O', 'b', 'N', 'D')) return FALSE; - if (Tag == TAG('O', 'b', 't', 'b')) return FALSE; - if (Tag == TAG('O', 'b', 'S', 'c')) return FALSE; - //if (Tag == TAG('S', 'e', 'S', 'i')) return FALSE; - //if (Tag == TAG('S', 'e', 'A', 'c')) return FALSE; + if (Tag == 'dSeS') return FALSE; + if (Tag == 'iDbO') return FALSE; + if (Tag == 'mNbO') return FALSE; + if (Tag == 'DNbO') return FALSE; + if (Tag == 'btbO') return FALSE; + if (Tag == 'cSbO') return FALSE; + //if (Tag == 'iSeS') return FALSE; + //if (Tag == 'cAeS') return FALSE; #endif return TRUE; Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -50,7 +50,7 @@ if (Tag == 0) KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller); - if (Tag == TAG('B','I','G',0)) + if (Tag == '0GIB') KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller); #define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9')) 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] Mon Aug 24 20:19:53 2009 @@ -125,7 +125,7 @@ /* Allocate memory for our structure */ ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, 1024, - TAG('M', 'm', ' ', ' ')); + ' mM'); if (!ObjectNameInfo) return STATUS_NO_MEMORY; /* Query the name */ @@ -136,7 +136,7 @@ if (!NT_SUCCESS(Status)) { /* Failed, free memory */ - ExFreePoolWithTag(ObjectNameInfo, TAG('M', 'm', ' ', ' ')); + ExFreePoolWithTag(ObjectNameInfo, ' mM'); return Status; } @@ -191,7 +191,7 @@ ModuleNameInformation->Name.Buffer); /* Free temp taged buffer from MmGetFileNameForSection() */ - ExFreePoolWithTag(ModuleNameInformation, TAG('M', 'm', ' ', ' ')); + ExFreePoolWithTag(ModuleNameInformation, ' mM'); DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer,Address); } @@ -2755,7 +2755,7 @@ */ Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, - TAG('M', 'm', 'X', 'r')); + 'rXmM'); UsedSize = 0; @@ -2806,7 +2806,7 @@ } else { - ExFreePoolWithTag(Buffer, TAG('M', 'm', 'X', 'r')); + ExFreePoolWithTag(Buffer, 'rXmM'); } return Status; @@ -3215,7 +3215,7 @@ break; } - ExFreePoolWithTag(FileHeaderBuffer, TAG('M', 'm', 'X', 'r')); + ExFreePoolWithTag(FileHeaderBuffer, 'rXmM'); /* * No loader handled the format Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -16,7 +16,7 @@ #define MI_MAPPED_COPY_PAGES 16 #define MI_POOL_COPY_BYTES 512 #define MI_MAX_TRANSFER_SIZE 64 * 1024 -#define TAG_VM TAG('V', 'm', 'R', 'w') +#define TAG_VM 'wRmV' /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -20,7 +20,7 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; ULONG ObpAccessProtectCloseBit = MAXIMUM_ALLOWED; -#define TAG_OB_HANDLE TAG('O', 'b', 'H', 'd') +#define TAG_OB_HANDLE 'dHbO' /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -73,14 +73,14 @@ Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, sizeof(GENERAL_LOOKASIDE), - TAG('O', 'b', 'C', 'I')); + 'ICbO'); if (CurrentList) { /* Initialize it */ ExInitializeSystemLookasideList(CurrentList, NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), - TAG('O', 'b', 'C', 'I'), + 'ICbO', 32, &ExSystemLookasideListHead); } @@ -97,14 +97,14 @@ Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, sizeof(GENERAL_LOOKASIDE), - TAG('O', 'b', 'N', 'M')); + 'MNbO'); if (CurrentList) { /* Initialize it */ ExInitializeSystemLookasideList(CurrentList, PagedPool, 248, - TAG('O', 'b', 'N', 'M'), + 'MNbO', 16, &ExSystemLookasideListHead); } @@ -145,7 +145,7 @@ ExInitializeSystemLookasideList(&ObpCreateInfoLookasideList, NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), - TAG('O', 'b', 'C', 'I'), + 'ICbO', 32, &ExSystemLookasideListHead); @@ -153,7 +153,7 @@ ExInitializeSystemLookasideList(&ObpNameBufferLookasideList, PagedPool, 248, - TAG('O', 'b', 'N', 'M'), + 'MNbO', 16, &ExSystemLookasideListHead); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -599,7 +599,7 @@ { /* Use default tag and non-paged pool */ PoolType = NonPagedPool; - Tag = TAG('O', 'b', 'j', 'T'); + Tag = 'TjbO'; } else { @@ -1122,7 +1122,7 @@ /* Set the hard-coded key and object count */ LocalObjectType->TotalNumberOfObjects = 1; - LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); + LocalObjectType->Key = 'TjbO'; } else { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -100,7 +100,7 @@ /* FIXME: Hack Hack! */ ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), - TAG('O', 'b', 'D', 'm')); + 'mDbO'); RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); /* Return status */ Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -131,7 +131,7 @@ /* Calculate the memory we'll need to allocate and allocate it */ CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD)); - SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, TAG('O', 'b', 'S', 'c')); + SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, 'cSbO'); if (!SdHeader) return NULL; /* Setup the header */ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -1298,7 +1298,7 @@ /* Allocate the Port and make sure it suceeded */ TerminationPort = ExAllocatePoolWithTag(NonPagedPool, sizeof(TERMINATION_PORT), - TAG('P', 's', 'T', '=')); + '=TsP'); if(TerminationPort) { /* Associate the Port */ 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] Mon Aug 24 20:19:53 2009 @@ -659,7 +659,7 @@ Process->SeAuditProcessCreationInfo.ImageFileName = ExAllocatePoolWithTag(PagedPool, sizeof(OBJECT_NAME_INFORMATION), - TAG('S', 'e', 'P', 'a')); + 'aPeS'); if (!Process->SeAuditProcessCreationInfo.ImageFileName) { /* Fail */ 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] Mon Aug 24 20:19:53 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ATMT TAG('A', 't', 'o', 'T') /* Atom table */ +#define TAG_ATMT 'TotA' /* Atom table */ extern ULONG NtGlobalFlag; @@ -38,7 +38,7 @@ NULL, POOL_COLD_ALLOCATION, sizeof(RTL_RANGE_ENTRY), - TAG('R', 'R', 'l', 'e'), + 'elRR', 16); } @@ -76,9 +76,9 @@ } -#define TAG_USTR TAG('U', 'S', 'T', 'R') -#define TAG_ASTR TAG('A', 'S', 'T', 'R') -#define TAG_OSTR TAG('O', 'S', 'T', 'R') +#define TAG_USTR 'RTSU' +#define TAG_ASTR 'RTSA' +#define TAG_OSTR 'RTSO' VOID NTAPI RtlpFreeMemory(PVOID Mem, Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -287,7 +287,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -314,7 +314,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); for (i = 0; i < AccessToken->PrivilegeCount; i++) { @@ -329,7 +329,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, Token->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); memcpy(AccessToken->DefaultDacl, Token->DefaultDacl, Token->DefaultDacl->AclSize); @@ -589,7 +589,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; i = 0; @@ -621,7 +621,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); i = 0; AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED; @@ -700,7 +700,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION); if ( NT_SUCCESS(Status) ) { @@ -2079,7 +2079,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -2115,7 +2115,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); if (PreviousMode != KernelMode) { @@ -2144,7 +2144,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, TokenDefaultDacl->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); memcpy(AccessToken->DefaultDacl, TokenDefaultDacl->DefaultDacl, TokenDefaultDacl->DefaultDacl->AclSize);

15 years, 4 months

[fireball] 42919: - Fix a typo in the assert which made a lot of false positives, e.g. when running taskmgr.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 24 20:09:56 2009 New Revision: 42919 URL: http://svn.reactos.org/svn/reactos?rev=42919&view=rev Log: - Fix a typo in the assert which made a lot of false positives, e.g. when running taskmgr. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Mon Aug 24 20:09:56 2009 @@ -190,7 +190,7 @@ /* set the reply data pointer directly (will be freed by request code) */ void set_reply_data_ptr( void *req, void *data, data_size_t size ) { - ASSERT( size < get_reply_max_size(req)); + ASSERT( size <= get_reply_max_size(req)); /* Just save them */ ReplySize = size;

15 years, 4 months

[sginsberg] 42918: - Deprecate TAG() in rostests

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 19:41:36 2009 New Revision: 42918 URL: http://svn.reactos.org/svn/reactos?rev=42918&view=rev Log: - Deprecate TAG() in rostests Modified: trunk/rostests/drivers/kmtest/ntos_pools.c trunk/rostests/tests/pseh2/psehtest.c trunk/rostests/win32/win32k/tests/eng-mem-1.c Modified: trunk/rostests/drivers/kmtest/ntos_pools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_pools… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -30,7 +30,7 @@ //#define NDEBUG #include "debug.h" -#define TAG_POOLTEST TAG('P','t','s','t') +#define TAG_POOLTEST 'tstP' /* PRIVATE FUNCTIONS ***********************************************************/ Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -778,6 +778,12 @@ _SEH2_END; return ret == return_positive(); +} + +DEFINE_TEST(test_continue_execution_13) +{ + /* XXX */ + return 1; } //}}} @@ -2573,6 +2579,8 @@ USE_TEST(test_execute_handler_12), USE_TEST(test_continue_execution_12), + USE_TEST(test_continue_execution_13), + USE_TEST(test_leave_1), USE_TEST(test_leave_2), USE_TEST(test_leave_3), Modified: trunk/rostests/win32/win32k/tests/eng-mem-1.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/win32k/tests/eng-me… ============================================================================== --- trunk/rostests/win32/win32k/tests/eng-mem-1.c [iso-8859-1] (original) +++ trunk/rostests/win32/win32k/tests/eng-mem-1.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -14,14 +14,14 @@ /* Allocate memory with EngAllocMem */ pmem1 = 0; AllocSize1 = 1024; - AllocTag1 = TAG('D','x','y','z'); + AllocTag1 = 'zyxD'; pmem1 = EngAllocMem(FL_ZERO_MEMORY, AllocSize1, AllocTag1); _AssertNotEqualValue(pmem1, NULL); /* Allocate memory with EngAllocMem */ pmem2 = 0; AllocSize2 = 1024; - AllocTag2 = TAG('D','x','y','z'); + AllocTag2 = 'zyxD'; pmem2 = EngAllocUserMem(AllocSize2, AllocTag2); _AssertNotEqualValue(pmem1, NULL);

15 years, 4 months

[sginsberg] 42917: - Missed these in 42915

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 19:38:50 2009 New Revision: 42917 URL: http://svn.reactos.org/svn/reactos?rev=42917&view=rev Log: - Missed these in 42915 Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/usb/usbhub/usbhub.h trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -116,7 +116,7 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define FAT_NTC_VCB (USHORT) TAG('F', 'V', 0, 0) +#define FAT_NTC_VCB (USHORT) '00VF' /* Volume Control Block */ typedef struct _VCB Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -6,7 +6,7 @@ #include "../miniport/usb_wrapper.h" #include "../usbport/hub.h" -#define USB_HUB_TAG TAG('u','s','b','h') +#define USB_HUB_TAG 'hbsu' typedef struct _HUB_DEVICE_EXTENSION { Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -4,7 +4,7 @@ #include <initguid.h> #include <debug.h> -#define USB_STOR_TAG TAG('u','s','b','s') +#define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16) NTSTATUS NTAPI

15 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009