Ros-diffs

ros-diffs@reactos.org

81390 discussions

Start a nNew thread

[weiden] 13054: delete empty and unused directory
by weiden＠svn.reactos.com 15 Jan '05

15 Jan '05

delete empty and unused directory Deleted: trunk/reactos/lib/psapi/enum/

1 0

[gvg] 13053: Speed up 16bpp fills by a factor 2
by gvg＠svn.reactos.com 15 Jan '05

15 Jan '05

Speed up 16bpp fills by a factor 2 Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-01-15 02:44:25 UTC (rev 13052) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-01-15 09:46:55 UTC (rev 13053) @@ -40,15 +40,52 @@ VOID DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PWORD addr = (PWORD)byteaddr + x1; + PDWORD addr = (PDWORD)((PWORD)(SurfObj->pvScan0 + y * SurfObj->lDelta) + x1); + +#ifdef _M_IX86 + /* This is about 10% faster than the generic C code below */ + LONG Count = x2 - x1; + + __asm__( +" cld\n" +" andl $0xffff, %0\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ +" mov %0, %%eax\n" +" shl $16, %%eax\n" +" or %0, %%eax\n" +" test $0x01, %%edi\n" /* Align to fullword boundary */ +" jz .L1\n" +" stosw\n" +" dec %1\n" +" jz .L2\n" +".L1:\n" +" mov %1,%%ecx\n" /* Setup count of fullwords to fill */ +" shr $1,%%ecx\n" +" rep stosl\n" /* The actual fill */ +" test $0x01, %1\n" /* One left to do at the right side? */ +" jz .L2\n" +" stosw\n" +".L2:\n" + : /* no output */ + : "r"(c), "r"(Count), "D"(addr) + : "%eax", "%ecx"); +#else /* _M_IX86 */ LONG cx = x1; + DWORD cc; - while(cx < x2) { - *addr = (WORD)c; - ++addr; - ++cx; + if (0 != (cx & 0x01)) { + *((PWORD) addr) = c; + cx++; + addr = (PDWORD)((PWORD)(addr) + 1); } + cc = ((c & 0xffff) << 16) | (c & 0xffff); + while(cx + 1 < x2) { + *addr++ = cc; + cx += 2; + } + if (cx < x2) { + *((PWORD) addr) = c; + } +#endif /* _M_IX86 */ } VOID

1 0

[weiden] 13052: implemented QueryWorkingSet()
by weiden＠svn.reactos.com 15 Jan '05

15 Jan '05

implemented QueryWorkingSet() Modified: trunk/reactos/lib/psapi/makefile Deleted: trunk/reactos/lib/psapi/misc/stubs.c Modified: trunk/reactos/lib/psapi/misc/win32.c _____ Modified: trunk/reactos/lib/psapi/makefile --- trunk/reactos/lib/psapi/makefile 2005-01-15 02:33:06 UTC (rev 13051) +++ trunk/reactos/lib/psapi/makefile 2005-01-15 02:44:25 UTC (rev 13052) @@ -22,7 +22,6 @@ TARGET_OBJECTS = \ misc/dllmain.o \ misc/malloc.o \ - misc/stubs.o \ misc/win32.o DEP_OBJECTS = $(TARGET_OBJECTS) _____ Deleted: trunk/reactos/lib/psapi/misc/stubs.c --- trunk/reactos/lib/psapi/misc/stubs.c 2005-01-15 02:33:06 UTC (rev 13051) +++ trunk/reactos/lib/psapi/misc/stubs.c 2005-01-15 02:44:25 UTC (rev 13052) @@ -1,22 +0,0 @@ -/* $Id$ */ -#include "precomp.h" - -#define NDEBUG -#include <debug.h> - - -/* - * @unimplemented - */ -BOOL -STDCALL -QueryWorkingSet(HANDLE hProcess, - PVOID pv, - DWORD cb) -{ - DPRINT1("PSAPI: QueryWorkingSet is UNIMPLEMENTED!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* EOF */ _____ Modified: trunk/reactos/lib/psapi/misc/win32.c --- trunk/reactos/lib/psapi/misc/win32.c 2005-01-15 02:33:06 UTC (rev 13051) +++ trunk/reactos/lib/psapi/misc/win32.c 2005-01-15 02:44:25 UTC (rev 13052) @@ -1365,4 +1365,31 @@ return Ret; } + +/* + * @implemented + */ +BOOL +STDCALL +QueryWorkingSet(HANDLE hProcess, + PVOID pv, + DWORD cb) +{ + NTSTATUS Status; + + Status = NtQueryVirtualMemory(hProcess, + NULL, + MemoryWorkingSetList, + pv, + cb, + NULL); + if(!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + /* EOF */

1 0

[weiden] 13051: implemented GetProcessMemoryInfo()
by weiden＠svn.reactos.com 15 Jan '05

15 Jan '05

implemented GetProcessMemoryInfo() Modified: trunk/reactos/lib/psapi/makefile Modified: trunk/reactos/lib/psapi/misc/stubs.c Modified: trunk/reactos/lib/psapi/misc/win32.c Modified: trunk/reactos/lib/psapi/precomp.h _____ Modified: trunk/reactos/lib/psapi/makefile --- trunk/reactos/lib/psapi/makefile 2005-01-14 23:22:39 UTC (rev 13050) +++ trunk/reactos/lib/psapi/makefile 2005-01-15 02:33:06 UTC (rev 13051) @@ -6,14 +6,14 @@ TARGET_NAME = psapi -TARGET_SDKLIBS = epsapi.a ntdll.a kernel32.a +TARGET_SDKLIBS = pseh.a epsapi.a ntdll.a kernel32.a TARGET_CFLAGS = -I./include -Wall -Werror # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS -TARGET_LFLAGS = -nostartfiles -nostdlib +TARGET_LFLAGS = -nostartfiles TARGET_BASE = $(TARGET_BASE_LIB_PSAPI) _____ Modified: trunk/reactos/lib/psapi/misc/stubs.c --- trunk/reactos/lib/psapi/misc/stubs.c 2005-01-14 23:22:39 UTC (rev 13050) +++ trunk/reactos/lib/psapi/misc/stubs.c 2005-01-15 02:33:06 UTC (rev 13051) @@ -10,21 +10,6 @@ */ BOOL STDCALL -GetProcessMemoryInfo(HANDLE Process, - PPROCESS_MEMORY_COUNTERS ppsmemCounters, - DWORD cb) -{ - DPRINT1("PSAPI: GetProcessMemoryInfo is UNIMPLEMENTED!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL QueryWorkingSet(HANDLE hProcess, PVOID pv, DWORD cb) _____ Modified: trunk/reactos/lib/psapi/misc/win32.c --- trunk/reactos/lib/psapi/misc/win32.c 2005-01-14 23:22:39 UTC (rev 13050) +++ trunk/reactos/lib/psapi/misc/win32.c 2005-01-15 02:33:06 UTC (rev 13051) @@ -1302,4 +1302,67 @@ return TRUE; } + +/* + * @implemented + */ +BOOL +STDCALL +GetProcessMemoryInfo(HANDLE Process, + PPROCESS_MEMORY_COUNTERS ppsmemCounters, + DWORD cb) +{ + NTSTATUS Status; + VM_COUNTERS vmc; + BOOL Ret = FALSE; + + /* XP's implementation secures access to ppsmemCounters in SEH, we should behave + similar so we can return the proper error codes when bad pointers are passed + to this function! */ + + _SEH_TRY + { + if(cb < sizeof(PROCESS_MEMORY_COUNTERS)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + _SEH_LEAVE; + } + + /* ppsmemCounters->cb isn't checked at all! */ + + Status = NtQueryInformationProcess(Process, + ProcessVmCounters, + &vmc, + sizeof(vmc), + NULL); + if(!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + _SEH_LEAVE; + } + + /* fill the structure with the collected information, in case of bad pointers + SEH will catch the exception and set the appropriate error code */ + ppsmemCounters->cb = sizeof(PROCESS_MEMORY_COUNTERS); + ppsmemCounters->PageFaultCount = vmc.PageFaultCount; + ppsmemCounters->PeakWorkingSetSize = vmc.PeakWorkingSetSize; + ppsmemCounters->WorkingSetSize = vmc.WorkingSetSize; + ppsmemCounters->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage; + ppsmemCounters->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage; + ppsmemCounters->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage; + ppsmemCounters->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage; + ppsmemCounters->PagefileUsage = vmc.PagefileUsage; + ppsmemCounters->PeakPagefileUsage = vmc.PeakPagefileUsage; + + Ret = TRUE; + } + _SEH_HANDLE + { + SetLastErrorByStatus(_SEH_GetExceptionCode()); + } + _SEH_END; + + return Ret; +} + /* EOF */ _____ Modified: trunk/reactos/lib/psapi/precomp.h --- trunk/reactos/lib/psapi/precomp.h 2005-01-14 23:22:39 UTC (rev 13050) +++ trunk/reactos/lib/psapi/precomp.h 2005-01-15 02:33:06 UTC (rev 13051) @@ -11,4 +11,4 @@ #include <napi/teb.h> #include <ntos/heap.h> #include <ntdll/ldr.h> - +#include <pseh.h>

1 0

[mtempel] 13050: oops... make sure that I use / not \ in path specifiers so that linux builds don't get confused.
by mtempel＠svn.reactos.com 14 Jan '05

14 Jan '05

oops... make sure that I use / not \ in path specifiers so that linux builds don't get confused. Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c _____ Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c --- trunk/reactos/drivers/usb/usbhub/usbhub.c 2005-01-14 21:40:55 UTC (rev 13049) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c 2005-01-14 23:22:39 UTC (rev 13050) @@ -23,7 +23,7 @@ #include <stddef.h> #include <windef.h> #include <ddk/ntddk.h> -#include "..\usbport\usbport.h" +#include "../usbport/usbport.h" /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/

1 0

[royce] 13049: *nix compatibility
by royce＠svn.reactos.com 14 Jan '05

14 Jan '05

*nix compatibility Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-01-14 21:14:48 UTC (rev 13048) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-01-14 21:40:55 UTC (rev 13049) @@ -15,5 +15,5 @@ ARE_EQUAL(1, invoke1.output.size()); InvokeFile& file1 = *invoke1.output[0]; - ARE_EQUAL(".\\dir1\\file1.c", file1.name); + ARE_EQUAL(FixSeparator("./dir1/file1.c"), file1.name); }

1 0

[sedwards] 13048: get the new buildsystem to mostly work for cross-compiling. Thanks Casper, Royce, etc.
by sedwards＠svn.reactos.com 14 Jan '05

14 Jan '05

get the new buildsystem to mostly work for cross-compiling. Thanks Casper, Royce, etc. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-14 21:08:01 UTC (rev 13047) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-14 21:14:48 UTC (rev 13048) @@ -2,8 +2,13 @@ #include "pch.h" +#ifdef WIN32 #include <direct.h> #include <io.h> +#else +#include <sys/stat.h> +#define _MAX_PATH 255 +#endif #include <assert.h> #include "XML.h" @@ -63,7 +68,7 @@ { #ifdef WIN32 return _filelengthi64 ( _fileno(f) ); -#elif defined(UNIX) +#else struct stat64 file_stat; if ( fstat64(fileno(f), &file_stat) != 0 ) return 0; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-14 21:08:01 UTC (rev 13047) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-14 21:14:48 UTC (rev 13048) @@ -1,7 +1,7 @@ #include "../pch.h" -#include "../Rbuild.h" +#include "../rbuild.h" #include "backend.h" using std::string; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-14 21:08:01 UTC (rev 13047) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-14 21:14:48 UTC (rev 13048) @@ -13,4 +13,20 @@ #include <stdarg.h> +#ifndef WIN32 +#include <wctype.h> +#include <math.h> + +inline char* strlwr ( char* str ) +{ + char* p = str; + while ( *p ) + *p++ = tolower(*p); + return str; +} + +#define _finite __finite +#define _isnan __isnan +#endif + #endif//PCH_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-14 21:08:01 UTC (rev 13047) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-14 21:14:48 UTC (rev 13048) @@ -4,7 +4,9 @@ #include <typeinfo> #include <stdio.h> +#ifdef WIN32 #include <io.h> +#endif #include <assert.h> #include "rbuild.h" _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-14 21:08:01 UTC (rev 13047) +++ branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-14 21:14:48 UTC (rev 13048) @@ -1,5 +1,7 @@ // ssprintf.cpp +#include "pch.h" + #include <malloc.h> #include <math.h> #include <float.h> @@ -10,8 +12,13 @@ #define alloca _alloca #endif//_MSC_VER +#ifdef _MSC_VER typedef __int64 LONGLONG; typedef unsigned __int64 ULONGLONG; +#else +typedef long long LONGLONG; +typedef unsigned long long ULONGLONG; +#endif typedef struct { unsigned int mantissa:23;

1 0

[gvg] 13047: Speed up 8bpp fills by a factor 4
by gvg＠svn.reactos.com 14 Jan '05

14 Jan '05

Speed up 8bpp fills by a factor 4 Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-01-14 20:41:45 UTC (rev 13046) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-01-14 21:08:01 UTC (rev 13047) @@ -38,15 +38,7 @@ VOID DIB_8BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; - PBYTE addr = byteaddr + x1; - LONG cx = x1; - - while(cx < x2) { - *addr = c; - ++addr; - ++cx; - } + memset(SurfObj->pvScan0 + y * SurfObj->lDelta + x1, (BYTE) c, x2 - x1); } VOID

1 0

[sedwards] 13046: started working on cross-compile support
by sedwards＠svn.reactos.com 14 Jan '05

14 Jan '05

started working on cross-compile support Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-14 19:42:47 UTC (rev 13045) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-14 20:41:45 UTC (rev 13046) @@ -14,7 +14,7 @@ #define SSEP "\\" #define SBAD_SEP "/" #else -#define EXEPOSTFIX +#define EXEPOSTFIX "" #define CSEP '/' #define CBAD_SEP '\\' #define SSEP "/"

1 0

[blight] 13045: Replace EXCEPTION_FLT_XXX by STATUS_FLOAT_XXX. Set ExceptionFlags to 0 for exceptions dispatched from ntoskrnl.
by blight＠svn.reactos.com 14 Jan '05

14 Jan '05

Replace EXCEPTION_FLT_XXX by STATUS_FLOAT_XXX. Set ExceptionFlags to 0 for exceptions dispatched from ntoskrnl. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/usertrap.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-14 16:12:34 UTC (rev 13044) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-14 19:42:47 UTC (rev 13045) @@ -99,7 +99,7 @@ "SIMD Fault" }; -static NTSTATUS ExceptionToNtStatus[] = +NTSTATUS ExceptionToNtStatus[] = { STATUS_INTEGER_DIVIDE_BY_ZERO, STATUS_SINGLE_STEP, @@ -108,7 +108,7 @@ STATUS_INTEGER_OVERFLOW, STATUS_ARRAY_BOUNDS_EXCEEDED, STATUS_ILLEGAL_INSTRUCTION, - STATUS_ACCESS_VIOLATION, /* STATUS_FLT_INVALID_OPERATION */ + STATUS_FLOAT_INVALID_OPERATION, STATUS_ACCESS_VIOLATION, STATUS_ACCESS_VIOLATION, STATUS_ACCESS_VIOLATION, @@ -117,10 +117,10 @@ STATUS_ACCESS_VIOLATION, STATUS_ACCESS_VIOLATION, STATUS_ACCESS_VIOLATION, /* RESERVED */ - STATUS_ACCESS_VIOLATION, /* STATUS_FLT_INVALID_OPERATION */ + STATUS_FLOAT_INVALID_OPERATION, /* Should not be used, the FPU can give more specific info */ STATUS_DATATYPE_MISALIGNMENT, STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION /* STATUS_FLT_MULTIPLE_TRAPS? */ + STATUS_FLOAT_MULTIPLE_TRAPS, }; /* FUNCTIONS ****************************************************************/ @@ -190,9 +190,8 @@ Er.NumberParameters = 0; } - Er.ExceptionFlags = (STATUS_SINGLE_STEP == Er.ExceptionCode || - STATUS_BREAKPOINT == Er.ExceptionCode) ? - 0 : EXCEPTION_NONCONTINUABLE; + /* FIXME: Which exceptions are noncontinuable? */ + Er.ExceptionFlags = 0; KiDispatchException(&Er, 0, Tf, KernelMode, TRUE); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-01-14 16:12:34 UTC (rev 13044) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-01-14 19:42:47 UTC (rev 13045) @@ -35,16 +35,6 @@ /* DEFINES *******************************************************************/ -#define EXCEPTION_FLT_DENORMAL_OPERAND (0xc000008dL) -#define EXCEPTION_FLT_DIVIDE_BY_ZERO (0xc000008eL) -#define EXCEPTION_FLT_INEXACT_RESULT (0xc000008fL) -#define EXCEPTION_FLT_INVALID_OPERATION (0xc0000090L) -#define EXCEPTION_FLT_OVERFLOW (0xc0000091L) -#define EXCEPTION_FLT_STACK_CHECK (0xc0000092L) -#define EXCEPTION_FLT_UNDERFLOW (0xc0000093L) -#define EXCEPTION_FLT_MULTIPLE_FAULTS (0xC00002B4L) -#define EXCEPTION_FLT_MULTIPLE_TRAPS (0xC00002B5L) - /* x87 Status Word exception flags */ #define X87_SW_IE (1<<0) /* Invalid Operation */ #define X87_SW_DE (1<<1) /* Denormalized Operand */ @@ -566,19 +556,19 @@ DPRINT("FpuStatusWord = 0x%04x\n", FpuStatusWord); if (FpuStatusWord & X87_SW_IE) - Er.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + Er.ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; else if (FpuStatusWord & X87_SW_DE) - Er.ExceptionCode = EXCEPTION_FLT_DENORMAL_OPERAND; + Er.ExceptionCode = STATUS_FLOAT_DENORMAL_OPERAND; else if (FpuStatusWord & X87_SW_ZE) - Er.ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; + Er.ExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; else if (FpuStatusWord & X87_SW_OE) - Er.ExceptionCode = EXCEPTION_FLT_OVERFLOW; + Er.ExceptionCode = STATUS_FLOAT_OVERFLOW; else if (FpuStatusWord & X87_SW_UE) - Er.ExceptionCode = EXCEPTION_FLT_UNDERFLOW; + Er.ExceptionCode = STATUS_FLOAT_UNDERFLOW; else if (FpuStatusWord & X87_SW_PE) - Er.ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; + Er.ExceptionCode = STATUS_FLOAT_INEXACT_RESULT; else if (FpuStatusWord & X87_SW_SE) - Er.ExceptionCode = EXCEPTION_FLT_STACK_CHECK; + Er.ExceptionCode = STATUS_FLOAT_STACK_CHECK; else ASSERT(0); /* not reached */ /* FIXME: is this the right way to get the correct EIP of the faulting instruction? */ @@ -586,8 +576,8 @@ } else /* ExceptionNr == 19 */ { - /* FIXME: When should we use EXCEPTION_FLT_MULTIPLE_FAULTS? */ - Er.ExceptionCode = EXCEPTION_FLT_MULTIPLE_TRAPS; + /* FIXME: When should we use STATUS_FLOAT_MULTIPLE_FAULTS? */ + Er.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; Er.ExceptionAddress = (PVOID)Tf->Eip; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usertrap.c --- trunk/reactos/ntoskrnl/ke/i386/usertrap.c 2005-01-14 16:12:34 UTC (rev 13044) +++ trunk/reactos/ntoskrnl/ke/i386/usertrap.c 2005-01-14 19:42:47 UTC (rev 13045) @@ -131,11 +131,9 @@ Er.NumberParameters = 0; } + /* FIXME: Which exceptions are noncontinuable? */ + Er.ExceptionFlags = 0; - Er.ExceptionFlags = (STATUS_SINGLE_STEP == Er.ExceptionCode || - STATUS_BREAKPOINT == Er.ExceptionCode) ? - 0 : EXCEPTION_NONCONTINUABLE; - KiDispatchException(&Er, 0, Tf, UserMode, TRUE); return(0); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs