Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42931: tftpd: add parenthesis around AND statements embedded in OR statements, use const char* for string constants (gcc 4.4 warnings)
by gschneider＠svn.reactos.org 25 Aug '09

25 Aug '09

Author: gschneider Date: Tue Aug 25 02:13:15 2009 New Revision: 42931 URL: http://svn.reactos.org/svn/reactos?rev=42931&view=rev Log: tftpd: add parenthesis around AND statements embedded in OR statements, use const char* for string constants (gcc 4.4 warnings) Modified: trunk/reactos/base/services/tftpd/tftpd.cpp trunk/reactos/base/services/tftpd/tftpd.h Modified: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Tue Aug 25 02:13:15 2009 @@ -1568,7 +1568,7 @@ //printf("%s %s\n", name, value); } -bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName) +bool getSection(const char *sectionName, char *buffer, BYTE serial, char *fileName) { //printf("%s=%s\n",fileName,sectionName); char section[128]; @@ -1598,7 +1598,7 @@ if (strstr(buff, "[") == buff) break; - if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff)))) + if (((*buff) >= '0' && (*buff) <= '9') || ((*buff) >= 'A' && (*buff) <= 'Z') || ((*buff) >= 'a' && (*buff) <= 'z') || (((*buff) && strchr("/\\?*", (*buff))))) { buffer += sprintf(buffer, "%s", buff); buffer++; Modified: trunk/reactos/base/services/tftpd/tftpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] Tue Aug 25 02:13:15 2009 @@ -151,7 +151,7 @@ char* myGetToken(char*, BYTE); void init(); bool cleanReq(request*); -bool getSection(char*, char*, BYTE, char*); +bool getSection(const char*, char*, BYTE, char*); bool isIP(char*s); char* myLower(char*); char* myUpper(char*);

1 0

[gschneider] 42930: systeminfo: use strcmp to compare strings, gcc 4.4 warning
by gschneider＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: gschneider Date: Tue Aug 25 01:48:57 2009 New Revision: 42930 URL: http://svn.reactos.org/svn/reactos?rev=42930&view=rev Log: systeminfo: use strcmp to compare strings, gcc 4.4 warning Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Tue Aug 25 01:48:57 2009 @@ -356,9 +356,9 @@ /* Main program */ int -main(int argc,char *argv[]) -{ - if (argc > 1 && argv[1] == "/?") +main(int argc, char *argv[]) +{ + if (argc > 1 && !strcmp(argv[1], "/?")) { Usage(); return 0;

1 0

[sginsberg] 42929: - Make use of _SEH2_YIELD in Mm
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: sginsberg Date: Mon Aug 24 22:39:23 2009 New Revision: 42929 URL: http://svn.reactos.org/svn/reactos?rev=42929&view=rev Log: - Make use of _SEH2_YIELD in Mm Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c 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] Mon Aug 24 22:39:23 2009 @@ -659,9 +659,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -949,7 +948,7 @@ */ { MEMORY_AREA* MemoryArea; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PEPROCESS Process; PMMSUPPORT AddressSpace; PVOID BaseAddress; @@ -967,7 +966,7 @@ return STATUS_INVALID_PARAMETER_4; } - if(ExGetPreviousMode() != KernelMode) + if (ExGetPreviousMode() != KernelMode) { _SEH2_TRY { @@ -977,11 +976,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); 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] Mon Aug 24 22:39:23 2009 @@ -519,7 +519,7 @@ IN PLARGE_INTEGER MaximumSize, IN ULONG Reserved) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE FileHandle; IO_STATUS_BLOCK IoStatus; @@ -560,14 +560,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - 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/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 22:39:23 2009 @@ -3496,7 +3496,7 @@ LARGE_INTEGER SafeMaximumSize; PVOID SectionObject; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -3514,14 +3514,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = MmCreateSection(&SectionObject, @@ -3570,7 +3566,7 @@ { HANDLE hSection; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -3582,14 +3578,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = ObOpenObjectByName(ObjectAttributes, @@ -3729,7 +3721,7 @@ PEPROCESS Process; KPROCESSOR_MODE PreviousMode; PMMSUPPORT AddressSpace; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG tmpProtect; ACCESS_MASK DesiredAccess; @@ -3779,14 +3771,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } else { @@ -4263,7 +4251,7 @@ { PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); PreviousMode = ExGetPreviousMode(); @@ -4392,7 +4380,7 @@ LARGE_INTEGER SafeNewMaximumSize; PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -4406,14 +4394,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = ObReferenceObjectByHandle(SectionHandle, 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 22:39:23 2009 @@ -70,7 +70,6 @@ KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress; - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Calculate the maximum amount of data to move */ @@ -165,8 +164,7 @@ if ((FailedInProbe) || (FailedInMapping)) { /* Exit */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } /* Otherwise, we failed probably during the move */ @@ -182,12 +180,9 @@ } /* Return partial copy */ - Status = STATUS_PARTIAL_COPY; + _SEH2_YIELD(return STATUS_PARTIAL_COPY); } _SEH2_END; - - /* Check for SEH status */ - if (Status != STATUS_SUCCESS) return Status; /* Detach from target */ KeUnstackDetachProcess(&ApcState); @@ -225,7 +220,6 @@ KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress; - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Calculate the maximum amount of data to move */ @@ -313,8 +307,7 @@ if (FailedInProbe) { /* Exit */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } /* Otherwise, we failed probably during the move */ @@ -330,12 +323,9 @@ } /* Return partial copy */ - Status = STATUS_PARTIAL_COPY; + _SEH2_YIELD(return STATUS_PARTIAL_COPY); } _SEH2_END; - - /* Check for SEH status */ - if (Status != STATUS_SUCCESS) return Status; /* Detach from target */ KeUnstackDetachProcess(&ApcState); @@ -779,7 +769,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; SIZE_T BytesRead = 0; PAGED_CODE(); @@ -804,13 +794,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return if we failed */ - if (!NT_SUCCESS(Status)) return Status; } /* Reference the process */ @@ -866,7 +853,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG BytesWritten = 0; PAGED_CODE(); @@ -891,13 +878,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return if we failed */ - if (!NT_SUCCESS(Status)) return Status; } /* Reference the process */ @@ -957,7 +941,7 @@ PVOID BaseAddress = NULL; SIZE_T NumberOfBytesToProtect = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); /* Check for valid protection flags */ @@ -991,13 +975,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return on exception */ - if (!NT_SUCCESS(Status)) return Status; } else { @@ -1065,7 +1046,7 @@ IN SIZE_T Length, OUT PSIZE_T UnsafeResultLength) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; SIZE_T ResultLength = 0; KPROCESSOR_MODE PreviousMode; WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; @@ -1098,14 +1079,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } } if (Address >= MmSystemRangeStart)

1 0

[dgorbachev] 42928: ... and kernel32, too.
by dgorbachev＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: dgorbachev Date: Mon Aug 24 22:10:05 2009 New Revision: 42928 URL: http://svn.reactos.org/svn/reactos?rev=42928&view=rev Log: ... and kernel32, too. Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Mon Aug 24 22:10:05 2009 @@ -42,8 +42,8 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); -extern BOOL FASTCALL NlsInit(); -extern VOID FASTCALL NlsUninit(); +extern BOOL FASTCALL NlsInit(VOID); +extern VOID FASTCALL NlsUninit(VOID); BOOLEAN InWindows = FALSE; HANDLE Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Mon Aug 24 22:10:05 2009 @@ -61,7 +61,7 @@ BOOL FASTCALL -NlsInit() +NlsInit(VOID) { UNICODE_STRING DirName; OBJECT_ATTRIBUTES ObjectAttributes; @@ -117,7 +117,7 @@ VOID FASTCALL -NlsUninit() +NlsUninit(VOID) { PCODEPAGE_ENTRY Current; 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] Mon Aug 24 22:10:05 2009 @@ -1047,7 +1047,7 @@ NTSTATUS WINAPI -BaseCleanupAppcompatCache() +BaseCleanupAppcompatCache(VOID) { STUB; return STATUS_NOT_IMPLEMENTED;

1 0

[dgorbachev] 42927: ... and dxg,
by dgorbachev＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: dgorbachev Date: Mon Aug 24 22:10:03 2009 New Revision: 42927 URL: http://svn.reactos.org/svn/reactos?rev=42927&view=rev Log: ... and dxg, Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c trunk/reactos/drivers/directx/dxg/dxg_int.h trunk/reactos/drivers/directx/dxg/main.c Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/ddhmg.… ============================================================================== --- trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,5 +1,3 @@ - - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -46,7 +44,7 @@ *--*/ BOOL FASTCALL -DdHmgCreate() +DdHmgCreate(VOID) { gpentDdHmgr = EngAllocMem(FL_ZERO_MEMORY, gcSizeDdHmgr, TAG_THDD); ghFreeDdHmgr = 0; @@ -92,7 +90,7 @@ *--*/ BOOL FASTCALL -DdHmgDestroy() +DdHmgDestroy(VOID) { gcMaxDdHmgr = 0; gcSizeDdHmgr = 0; @@ -144,7 +142,7 @@ *--*/ PVOID FASTCALL -DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) +DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) { DWORD Index = (DWORD)DdHandle & 0x1FFFFF; Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,4 +1,3 @@ - /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntddmou.h> @@ -76,7 +75,7 @@ /* exported functions */ NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS NTAPI GsDriverEntry(IN PVOID Context1, IN PVOID Context2); -NTSTATUS APIENTRY DxDdCleanupDxGraphics(); +NTSTATUS APIENTRY DxDdCleanupDxGraphics(VOID); /* Global pointers */ extern ULONG gcSizeDdHmgr; @@ -99,9 +98,9 @@ /* Internal functions */ BOOL FASTCALL VerifyObjectOwner(PDD_ENTRY pEntry); -BOOL FASTCALL DdHmgCreate(); -BOOL FASTCALL DdHmgDestroy(); -PVOID FASTCALL DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); +BOOL FASTCALL DdHmgCreate(VOID); +BOOL FASTCALL DdHmgDestroy(VOID); +PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); /* define stuff */ #define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC] Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… ============================================================================== --- trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,4 +1,3 @@ - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -118,7 +117,7 @@ NTSTATUS APIENTRY -DxDdCleanupDxGraphics() +DxDdCleanupDxGraphics(VOID) { DdHmgDestroy(); @@ -137,10 +136,3 @@ return 0; } - - - - - - -

1 0

[dgorbachev] 42926: Sprinkle win32k with some explicit voids,
by dgorbachev＠svn.reactos.org 24 Aug '09

24 Aug '09

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;

1 0

[sginsberg] 42925: - ...fix typo
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

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 */

1 0

[sginsberg] 42924: - Add a comment and debug print
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

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 */

1 0

[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 24 Aug '09

24 Aug '09

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);

1 0

[sginsberg] 42922: - "BIG0" isn't a reserved tag, but "BIG " is.
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

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'))

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