Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 32683: Include <cstdlib> and <cstring> for "getenv" and "strlen"
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:04:43 2008 New Revision: 32683 URL: http://svn.reactos.org/svn/reactos?rev=3D32683&view=3Drev Log: Include <cstdlib> and <cstring> for "getenv" and "strlen" Modified: trunk/reactos/tools/sysreg/env_var.cpp Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.= cpp?rev=3D32683&r1=3D32682&r2=3D32683&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/env_var.cpp (original) +++ trunk/reactos/tools/sysreg/env_var.cpp Fri Mar 14 19:04:43 2008 @@ -10,6 +10,8 @@ = #include "env_var.h" #include <iostream> +#include <cstdlib> +#include <cstring> = namespace System_ {

1 0

[cfinck] 32682: Include <cstdlib> for "strtod" and "strtol"
by cfinck＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: cfinck Date: Fri Mar 14 18:59:55 2008 New Revision: 32682 URL: http://svn.reactos.org/svn/reactos?rev=3D32682&view=3Drev Log: Include <cstdlib> for "strtod" and "strtol" Modified: trunk/reactos/tools/sysreg/conf_parser.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_par= ser.cpp?rev=3D32682&r1=3D32681&r2=3D32682&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Fri Mar 14 18:59:55 2008 @@ -12,6 +12,7 @@ #include <sstream> #include <fstream> #include <cstdio> +#include <cstdlib> = namespace Sysreg_ {

1 0

[cfinck] 32681: Change, simplify and document the conditions for the include files. Fix two build problems in Fedora 8 and probably other hosts with a newer C library (reported by Dosadi on #reactos)
by cfinck＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: cfinck Date: Fri Mar 14 18:55:32 2008 New Revision: 32681 URL: http://svn.reactos.org/svn/reactos?rev=3D32681&view=3Drev Log: Change, simplify and document the conditions for the include files. Fix two build problems in Fedora 8 and probably other hosts with a newer C = library (reported by Dosadi on #reactos) Modified: trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/ssprintf.cpp trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?= rev=3D32681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Fri Mar 14 18:55:32 2008 @@ -1373,9 +1373,9 @@ return; } i =3D 0; - while (((CurrentChar + i < LineLength) && + while ((CurrentChar + i < LineLength) && (((ch =3D Line[CurrentChar + i]) >=3D 'a') && (ch <=3D 'z'= )) || - ((ch >=3D 'A') && (ch <=3D 'Z')) || (ch =3D=3D '_'))) + ((ch >=3D 'A') && (ch <=3D 'Z')) || (ch =3D=3D '_')) { CurrentString[i] =3D ch; i++; Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?re= v=3D32681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Fri Mar 14 18:55:32 2008 @@ -14,20 +14,25 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ = -#if defined(__FreeBSD__) || defined(__APPLE__) -# include <stdlib.h> -#else -# include <malloc.h> -#endif // __FreeBSD__ +// For character conversion functions like "wctomb" and "alloca" under Unix +#include <stdlib.h> + +#if defined(WIN32) + // Under Win32 hosts, "alloca" is not defined by stdlib.h, but by mall= oc.h + // On the other hand, malloc.h is deprecated under some Unix hosts, so= only include it for Win32 hosts. + #include <malloc.h> +#endif + +#include <ctype.h> #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" = #ifndef WIN32 -#include <ctype.h> #define _finite __finite #define _isnan __isnan +#endif = #ifndef __APPLE__ inline int iswdigit ( wchar_t c ) @@ -35,7 +40,6 @@ return ( c >=3D L'0' && c <=3D L'9' ); } #endif -#endif//WIN32 = #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__CYGWIN__) # define __isnan isnan Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=3D3= 2681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/xml.cpp (original) +++ trunk/reactos/tools/xml.cpp Fri Mar 14 18:55:32 2008 @@ -21,15 +21,23 @@ #endif//_MSC_VER = #ifdef WIN32 -# include <direct.h> -# include <io.h> + #include <direct.h> + #include <io.h> #else -# include <sys/stat.h> -# include <unistd.h> -# include <ctype.h> -# define MAX_PATH PATH_MAX + #include <sys/stat.h> + #include <unistd.h> + + // Some hosts don't define PATH_MAX in unistd.h + #if !defined(PATH_MAX) + #include <limits.h> + #endif + + #define MAX_PATH PATH_MAX #endif + #include <assert.h> +#include <ctype.h> +#include <string.h> = #include "xml.h" #include "ssprintf.h"

1 0

[tkreuzer] 32680: - modify the way the way the Frames parameter in KeRosDumpStackFrames() is handled, wasn't used so far - remove some code duplication
by tkreuzer＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: tkreuzer Date: Fri Mar 14 18:51:27 2008 New Revision: 32680 URL: http://svn.reactos.org/svn/reactos?rev=3D32680&view=3Drev Log: - modify the way the way the Frames parameter in KeRosDumpStackFrames() is = handled, wasn't used so far - remove some code duplication Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev= =3D32680&r1=3D32679&r2=3D32680&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Fri Mar 14 18:51:27 2008 @@ -227,41 +227,39 @@ return (USHORT)i; } = + VOID -NTAPI -KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, - IN ULONG FrameCount OPTIONAL) -{ - ULONG Frames[32]; +FASTCALL +KeRosDumpStackFrameArray(IN PULONG Frames, + IN ULONG FrameCount) +{ ULONG i, Addr; BOOLEAN InSystem; + PVOID p; PLDR_DATA_TABLE_ENTRY LdrEntry; = - /* If the caller didn't ask, assume 32 frames */ - if (!FrameCount || FrameCount > 32) FrameCount =3D 32; - - /* Get the current frames */ - FrameCount =3D RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames,= NULL); - - /* Now loop them (skip the two. One for the dumper, one for the caller= ) */ + /* Loop them */ for (i =3D 0; i < FrameCount; i++) { /* Get the EIP */ Addr =3D Frames[i]; - - /* If we had a custom frame, make sure we've reached it first */ - if ((Frame) && (Frame[1] =3D=3D Addr)) - { - Frame =3D NULL; - } - else if (Frame) - { - /* Skip this entry */ - continue; + if (!Addr) + { + break; } = /* Get the base for this file */ - if (KiPcToFileHeader((PVOID)Addr, &LdrEntry, FALSE, &InSystem)) + if (Addr > (ULONG_PTR)MmHighestUserAddress) + { + /* We are in kernel */ + p =3D KiPcToFileHeader((PVOID)Addr, &LdrEntry, FALSE, &InSyste= m); + } + else + { + /* We are in user land */ + p =3D KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry); + } + if (p) { #ifdef KDBG if (!KdbSymPrintAddress((PVOID)Addr)) @@ -269,53 +267,54 @@ { /* Print out the module name */ Addr -=3D (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); - } - } - else if (Addr) + DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr); + } + } + else { /* Print only the address */ - DbgPrint("<%x>", Addr); + DbgPrint("<%x>\n", Addr); } = /* Go to the next frame */ DbgPrint("\n"); } - - /* Get the current frames */ - FrameCount =3D KeRosCaptureUserStackBackTrace(-1, 32, (PVOID*)Frames, = NULL); - - /* Now loop them */ - for (i =3D 0; i < FrameCount; i++) - { - /* Get the EIP */ - Addr =3D Frames[i]; - - /* Get the base for this file */ - if (KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry)) - { - /* Print out the module name */ -#ifdef KDBG - if (!KdbSymPrintAddress((PVOID)Addr)) -#endif - { - /* Fall back to usual printing */ - Addr -=3D (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); - } - } - else if (Addr) - { - /* Print only the address */ - DbgPrint("<%x>", Addr); - } - - /* Go to the next frame */ - DbgPrint("\n"); - } - - /* Finish the output */ - DbgPrint("\n"); +} + +VOID +NTAPI +KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, + IN ULONG FrameCount OPTIONAL) +{ + ULONG Frames[32]; + ULONG RealFrameCount; + + /* If the caller didn't ask, assume 32 frames */ + if (!FrameCount || FrameCount > 32) FrameCount =3D 32; + + if (Frame) + { + /* Dump them */ + KeRosDumpStackFrameArray(Frame, FrameCount); + } + else + { + /* Get the current frames (skip the two. One for the dumper, one f= or the caller) */ + RealFrameCount =3D RtlCaptureStackBackTrace(2, FrameCount, (PVOID*= )Frames, NULL); + + /* Dump them */ + KeRosDumpStackFrameArray(Frames, RealFrameCount); + + /* Count left for user mode? */ + if (FrameCount - RealFrameCount > 0) + { + /* Get the current frames */ + RealFrameCount =3D KeRosCaptureUserStackBackTrace(-1, FrameCou= nt - RealFrameCount, (PVOID*)Frames, NULL); + + /* Dump them */ + KeRosDumpStackFrameArray(Frames, RealFrameCount); + } + } } = VOID

1 0

[fireball] 32679: - Merge 32177 (We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM)).
by fireball＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: fireball Date: Fri Mar 14 07:56:58 2008 New Revision: 32679 URL: http://svn.reactos.org/svn/reactos?rev=3D32679&view=3Drev Log: - Merge 32177 (We now only compile the ELF loader if _ELF_ is defined (both= because this isn't a standard Windows feature, and because the current cod= e is completely not portable with ARM)). Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/s= ection.c?rev=3D32679&r1=3D32678&r2=3D32679&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Mar 14 07:56:58 2008 @@ -3647,7 +3647,9 @@ static PEXEFMT_LOADER ExeFmtpLoaders[] =3D { PeFmtCreateSection, +#ifdef __ELF ElfFmtCreateSection +#endif }; = static

1 0

[mflyer] 32678: Per request of Fireball, here's our website link button (88x31).
by mflyer＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: mflyer Date: Fri Mar 14 07:31:52 2008 New Revision: 32678 URL: http://svn.reactos.org/svn/reactos?rev=3D32678&view=3Drev Log: Per request of Fireball, here's our website link button (88x31). Added: trunk/press-media/art/roswebsitebutton.png (with props) Added: trunk/press-media/art/roswebsitebutton.png URL: http://svn.reactos.org/svn/reactos/trunk/press-media/art/roswebsitebut= ton.png?rev=3D32678&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Binary file - no diff available. Propchange: trunk/press-media/art/roswebsitebutton.png ---------------------------------------------------------------------------= --- svn:mime-type =3D application/octet-stream

1 0

[tkreuzer] 32677: hide mouse cursor in mazescr
by tkreuzer＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: tkreuzer Date: Thu Mar 13 19:08:00 2008 New Revision: 32677 URL: http://svn.reactos.org/svn/reactos?rev=3D32677&view=3Drev Log: hide mouse cursor in mazescr Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensa= vers/mazescr/maze.c?rev=3D32677&r1=3D32676&r2=3D32677&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/applications/screensavers/mazescr/maze.c (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c Thu Mar 13 19:08= :00 2008 @@ -774,6 +774,7 @@ = // Make the window visible; update its client area; and return "success" ShowWindow(hWnd, SW_SHOW); // Show the window + SetCursor(NULL); UpdateWindow(hWnd); // Sends WM_PAINT message = hPenWall =3D CreatePen(PS_SOLID, 3, RGB(150,150,150));

1 0

[tkreuzer] 32676: - Simplify IntSetCursor - Make NtUserSetCursor hide Cursor on hCursor = NULL - Don't set the cursor pos if the cursor is hidden in IntMouseInput - remove 2 useless ASSERTs - Dereference old cursor- Make the screensaver lib hide the cursor directly after creating it (the window never recieves a WM_SETCURSOR) partly fixes bug 2965 See issue #2965 for more details.
by tkreuzer＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: tkreuzer Date: Thu Mar 13 19:05:58 2008 New Revision: 32676 URL: http://svn.reactos.org/svn/reactos?rev=3D32676&view=3Drev Log: - Simplify IntSetCursor - Make NtUserSetCursor hide Cursor on hCursor =3D NULL - Don't set the cursor pos if the cursor is hidden in IntMouseInput - remove 2 useless ASSERTs - Dereference old cursor- Make the screensaver lib hide the cursor directly= after creating it (the window never recieves a WM_SETCURSOR) partly fixes bug 2965 See issue #2965 for more details. Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrn= save.c?rev=3D32676&r1=3D32675&r2=3D32676&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c Thu Mar 13 19:05:58 2008 @@ -189,6 +189,7 @@ if (hMainWindow) { ShowWindow(hMainWindow, SW_SHOW); + SetCursor(NULL); = while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/cursoricon.c?rev=3D32676&r1=3D32675&r2=3D32676&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Thu Mar 13 19= :05:58 2008 @@ -125,59 +125,54 @@ { return Ret; } - else - { - if(!(Screen =3D IntGetScreenDC())) - { - return (HCURSOR)0; - } - /* FIXME use the desktop's HDC instead of using ScreenDeviceContext = */ - dc =3D DC_LockDc(Screen); - - if (!dc) - { - return Ret; - } - dcbmp =3D dc->w.hBitmap; - DevInfo =3D (PDEVINFO)&((GDIDEVICE *)dc->pPDev)->DevInfo; - DC_UnlockDc(dc); - - BitmapObj =3D BITMAPOBJ_LockBitmap(dcbmp); - if ( !BitmapObj ) - return (HCURSOR)0; - SurfObj =3D &BitmapObj->SurfObj; - ASSERT(SurfObj); - } - - if (!NewCursor && (CurInfo->CurrentCursorObject || ForceChange)) - { - if (NULL !=3D CurInfo->CurrentCursorObject) - { - UserDereferenceObject(CurInfo->CurrentCursorObject); - if (CurInfo->ShowingCursor) + + if(!(Screen =3D IntGetScreenDC())) + { + return (HCURSOR)0; + } + /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ + dc =3D DC_LockDc(Screen); + + if (!dc) + { + return Ret; + } + dcbmp =3D dc->w.hBitmap; + DevInfo =3D (PDEVINFO)&((GDIDEVICE *)dc->pPDev)->DevInfo; + DC_UnlockDc(dc); + + BitmapObj =3D BITMAPOBJ_LockBitmap(dcbmp); + if (!BitmapObj) + return (HCURSOR)0; + SurfObj =3D &BitmapObj->SurfObj; + + if (!NewCursor) + { + if (CurInfo->CurrentCursorObject || ForceChange) + { + if (CurInfo->CurrentCursorObject) { - /* Remove the cursor if it was displayed */ - IntEngMovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.E= xclude); + UserDereferenceObject(CurInfo->CurrentCursorObject); + if (CurInfo->ShowingCursor) + { + DPRINT1("Removing pointer!\n"); + /* Remove the cursor if it was displayed */ + IntEngMovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointe= r.Exclude); + } } - } - - GDIDEV(SurfObj)->Pointer.Status =3D SPS_ACCEPT_NOEXCLUDE; - - CurInfo->CurrentCursorObject =3D NewCursor; /* i.e. CurrentCursorObj= ect =3D NULL */ - CurInfo->ShowingCursor =3D 0; + + GDIDEV(SurfObj)->Pointer.Status =3D SPS_ACCEPT_NOEXCLUDE; + + CurInfo->CurrentCursorObject =3D NewCursor; /* i.e. CurrentCursor= Object =3D NULL */ + CurInfo->ShowingCursor =3D 0; + } + BITMAPOBJ_UnlockBitmap(BitmapObj); return Ret; } = - if (!NewCursor) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return Ret; - } - /* TODO: Fixme. Logic is screwed above */ = - ASSERT(NewCursor); MaskBmpObj =3D BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask); if (MaskBmpObj) { @@ -249,6 +244,12 @@ { CurInfo->ShowingCursor =3D 0; CurInfo->CurrentCursorObject =3D NULL; + } + + /* OldCursor is not in use anymore */ + if (OldCursor) + { + UserDereferenceObject(OldCursor); } = if (GDIDEVFUNCS(SurfObj).SetPointerShape) @@ -1107,15 +1108,25 @@ RETURN(NULL); } = - if(!(CurIcon =3D UserGetCurIconObject(hCursor))) - { - ObDereferenceObject(WinSta); - RETURN(NULL); + if(hCursor) + { + if(!(CurIcon =3D UserGetCurIconObject(hCursor))) + { + ObDereferenceObject(WinSta); + RETURN(NULL); + } + } + else + { + CurIcon =3D NULL; } = OldCursor =3D IntSetCursor(WinSta, CurIcon, FALSE); = - UserDereferenceObject(CurIcon); + if(CurIcon) + { + UserDereferenceObject(CurIcon); + } ObDereferenceObject(WinSta); = RETURN(OldCursor); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/input.c?rev=3D32676&r1=3D32675&r2=3D32676&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Mar 13 19:05:5= 8 2008 @@ -1096,7 +1096,10 @@ { SurfObj =3D &BitmapObj->SurfObj; = - IntEngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(Su= rfObj)->Pointer.Exclude)); + if (CurInfo->ShowingCursor) + { + IntEngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV= (SurfObj)->Pointer.Exclude)); + } /* Only now, update the info in the GDIDEVICE, so EngMovePoint= er can * use the old values to move the pointer image */ GDIDEV(SurfObj)->Pointer.Pos.x =3D MousePos.x;

1 0

[fireball] 32675: - Switch to using the cache bitmap (the cache manager uses one large memory region within the kernel address space and allocate/deallocate space from this block over a bitmap). - This removes (hides?) the so-called "ResourceNeverExclusive" problem at the end of the 1st stage setup or during file copy operation. Also it makes file copying process (not only in the 1st stage) more stable. - Cacheseg mapping region size enlarged to 256Mb. See issue #2872 for more details.
by fireball＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: fireball Date: Thu Mar 13 15:14:30 2008 New Revision: 32675 URL: http://svn.reactos.org/svn/reactos?rev=3D32675&view=3Drev Log: - Switch to using the cache bitmap (the cache manager uses one large memory= region within the kernel address space and allocate/deallocate space from = this block over a bitmap). - This removes (hides?) the so-called "ResourceNeverExclusive" problem at t= he end of the 1st stage setup or during file copy operation. Also it makes = file copying process (not only in the 1st stage) more stable. - Cacheseg mapping region size enlarged to 256Mb. See issue #2872 for more details. Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32675&r1=3D32674&r2=3D32675&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Thu Mar 13 15:14:30 2008 @@ -47,7 +47,7 @@ * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping reg= ion * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE). */ -//#define CACHE_BITMAP +#define CACHE_BITMAP = static LIST_ENTRY DirtySegmentListHead; static LIST_ENTRY CacheSegmentListHead; @@ -58,7 +58,7 @@ KGUARDED_MUTEX ViewLock; = #ifdef CACHE_BITMAP -#define CI_CACHESEG_MAPPING_REGION_SIZE (128*1024*1024) +#define CI_CACHESEG_MAPPING_REGION_SIZE (256*1024*1024) = static PVOID CiCacheSegMappingRegionBase =3D NULL; static RTL_BITMAP CiCacheSegMappingRegionAllocMap; @@ -564,10 +564,12 @@ PCACHE_SEGMENT current; PCACHE_SEGMENT previous; PLIST_ENTRY current_entry; - NTSTATUS Status; KIRQL oldIrql; #ifdef CACHE_BITMAP ULONG StartingOffset; +#else + ULONG_PTR GuardArea; + NTSTATUS Status; #endif PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -677,7 +679,8 @@ KEBUGCHECKCC; } = - current->BaseAddress =3D CiCacheSegMappingRegionBase + StartingOffset * = PAGE_SIZE; + current->BaseAddress =3D (PVOID)((ULONG_PTR)CiCacheSegMappingRegionBase + + StartingOffset * PAGE_SIZE); = if (CiCacheSegMappingRegionHint =3D=3D StartingOffset) { @@ -886,7 +889,7 @@ for (i =3D 0; i < RegionSize; i++) { MmDeleteVirtualMapping(NULL, - CacheSeg->BaseAddress + (i * PAGE_SIZE), + (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i * PAGE_SIZE)), FALSE, NULL, &Page); @@ -895,7 +898,8 @@ = KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); /* Deallocate all the pages used. */ - Base =3D (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / = PAGE_SIZE; + Base =3D ((ULONG_PTR)CacheSeg->BaseAddress - + (ULONG_PTR)CiCacheSegMappingRegionBase) / PAGE_SIZE; = RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize); =

1 0

[ros-arm-bringup] 32674: - Implement IRQL functions for the PL190 VIC. - Start coding HalInitSystem. - Implement HalRequestSoftwareInterrupt for the PL190 VIC. The interrupt fires! (This interrupt is responsible for forcing DPC delivery, which should also force thread scheduling, which should force the switch to the phase 1 thread)
by ros-arm-bringup＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: ros-arm-bringup Date: Thu Mar 13 11:29:45 2008 New Revision: 32674 URL: http://svn.reactos.org/svn/reactos?rev=3D32674&view=3Drev Log: - Implement IRQL functions for the PL190 VIC. - Start coding HalInitSystem. - Implement HalRequestSoftwareInterrupt for the PL190 VIC. The interrupt fi= res! (This interrupt is responsible for forcing DPC delivery, which should = also force thread scheduling, which should force the switch to the phase 1 = thread) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/reactos/armddk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/= arch/arm/loader.c?rev=3D32674&r1=3D32673&r2=3D32674&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Thu Mar 13 11:29:4= 5 2008 @@ -742,7 +742,7 @@ ArmTable->Pte[0] =3D Pte; = // - // Map the page in MMIO space that contains the serial port into virtu= al memory + // Map the page in MMIO space that contains the serial port and timers // Pte.L1.Section.BaseAddress =3D ArmBoardBlock->UartRegisterBase >> PDE_= SHIFT; ArmTable->Pte[UART_VIRTUAL >> PDE_SHIFT] =3D Pte; Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/ha= l.c?rev=3D32674&r1=3D32673&r2=3D32674&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/hal/halarm/generic/hal.c (original) +++ trunk/reactos/hal/halarm/generic/hal.c Thu Mar 13 11:29:45 2008 @@ -17,8 +17,10 @@ #include <ndk/halfuncs.h> #include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> #include <internal/arm/ke.h> #include <internal/arm/intrin_i.h> +#include <bugcodes.h> = #define NDEBUG #include <debug.h> @@ -31,6 +33,9 @@ #undef KeLowerIrql #undef KeRaiseIrql #undef KeReleaseSpinLock + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) =3D (v)) = /* DATA ******************************************************************= ****/ = @@ -371,16 +376,210 @@ UNIMPLEMENTED; } = - +VOID +NTAPI +HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine; + = + /* Make sure we have a loader block and command line */ + if ((LoaderBlock) && (LoaderBlock->LoadOptions)) + { + /* Read the command line */ + CommandLine =3D LoaderBlock->LoadOptions; + = + /* Check for initial breakpoint */ + if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); + } +} + + +// +// INTs on the Versatile: +// +// 0 WATCHDOG -> We use it for profiling +// 1 SOFTWARE INTERRUPT -> We use it for APC delivery +// 2 COMM RX -> We use it for DPC delivery +// 3 COMM TX -> We use it for IPI delivery +// 4 TIMER0/1 -> Use for Clock Interrupt. +// 5+ XXX -> Mapped to to actual device +// +// So we have the following IRQL masks: +// PASSIVE_LEVEL - 0xFFFFFFFF (enable all interrupts) +// APC_LEVEL - 0xFFFFFFFD (disable interrupt 1) +// DISPATCH_LEVEL - 0xFFFFFFF9 (disable interrupts 1, 2) +// DEVICE_LEVEL_0 - 0xFFFFFFD9 (disable interrupts 1, 2, 5) +// DEVICE_LEVEL_N - 0x19 (everything disabled except 0, 3, 4) +// PROFILE_LEVEL - 0x18 (everything disabled except, 3, 4) +// CLOCK_LEVEL - 0x10 (everything disabled except 4) +// POWER_LEVEL, IPI_LEVEL, HIGH_LEVEL - 0x00 (everything disabled) + +ULONG HalpIrqlTable[] =3D +{ + 0xFFFFFFFF, // IRQL 0 PASSIVE_LEVEL + 0xFFFFFFFD, // IRQL 1 APC_LEVEL + 0xFFFFFFF9, // IRQL 2 DISPATCH_LEVEL + 0xFFFFFFD9, // IRQL 3 + 0xFFFFFF99, // IRQL 4 + 0xFFFFFF19, // IRQL 5 + 0xFFFFFE19, // IRQL 6 + 0xFFFFFC19, // IRQL 7 + 0xFFFFF819, // IRQL 8 + 0xFFFFF019, // IRQL 9 + 0xFFFFE019, // IRQL 10 + 0xFFFFC019, // IRQL 11 + 0xFFFF8019, // IRQL 12 + 0xFFFF0019, // IRQL 13 + 0xFFFE0019, // IRQL 14 + 0xFFFC0019, // IRQL 15 + 0xFFF80019, // IRQL 16 + 0xFFF00019, // IRQL 17 + 0xFFE00019, // IRQL 18 + 0xFFC00019, // IRQL 19 + 0xFF800019, // IRQL 20 + 0xFF000019, // IRQL 21 + 0xFE000019, // IRQL 22 + 0xFC000019, // IRQL 23 + 0xF0000019, // IRQL 24 + 0x80000019, // IRQL 25 + 0x19, // IRQL 26 + 0x18, // IRQL 27 PROFILE_LEVEL + 0x10, // IRQL 28 CLOCK2_LEVEL + 0x00, // IRQL 29 IPI_LEVEL + 0x00, // IRQL 30 POWER_LEVEL + 0x00, // IRQL 31 HIGH_LEVEL +}; + + +VOID +HalpStallInterrupt(VOID) +{ + DPRINT1("STALL INTERRUPT!!!\n"); + while (TRUE); +} + +VOID +HalpInitializeInterrupts(VOID) +{ + ULONG i; + PKPCR Pcr =3D (PKPCR)KeGetPcr(); + = + // + // Fill out the IRQL mappings + // + for (i =3D 0; i < (HIGH_LEVEL + 1); i++) + { + // + // Save the valeue in the PCR + // + Pcr->IrqlTable[i] =3D HalpIrqlTable[i]; + } + = + // + // Setup the clock and profile interrupt + // + Pcr->InterruptRoutine[CLOCK2_LEVEL] =3D HalpStallInterrupt; + // Pcr->InterruptRoutine[PROFILE_LEVEL] =3D HalpCountInterrupt; +} + +ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCou= nt; + +#define VICINTENABLE (PVOID)0xE0040010 +#define VICINTENCLEAR (PVOID)0xE0040014 +#define VICSOFTINT (PVOID)0xE0040018 +#define VICSOFTINTCLEAR (PVOID)0xE004001C + +/* + * @implemented + */ BOOLEAN NTAPI -HalInitSystem( - ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - UNIMPLEMENTED; - - return TRUE; +HalInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PKPRCB Prcb =3D KeGetCurrentPrcb(); + = + // + // Check the boot phase + // + if (!BootPhase) + { + // + // Get command-line parameters + // + HalpGetParameters(LoaderBlock); + = +#if DBG + // + // Checked HAL requires checked kernel + // + if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); + } +#else + // + // Release build requires release HAL + // + if (Prcb->BuildType & PRCB_BUILD_DEBUG) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + = +#ifdef CONFIG_SMP + // + // SMP HAL requires SMP kernel + // + if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + = + // + // Validate the PRCB + // + if (Prcb->MajorVersion !=3D PRCB_MAJOR_VERSION) + { + // + // Validation failed, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); + } + = + // + // Setup time increments to 10ms and 1ms + // + HalpCurrentTimeIncrement =3D 100000; + HalpNextTimeIncrement =3D 100000; + HalpNextIntervalCount =3D 0; + KeSetTimeIncrement(100000, 10000); + = + // + // Initialize interrupts + // + HalpInitializeInterrupts(); + } + else if (BootPhase =3D=3D 1) + { + UNIMPLEMENTED; + while (TRUE); + } + = + // + // All done, return + // + return TRUE; } = = @@ -484,10 +683,35 @@ = VOID FASTCALL -HalRequestSoftwareInterrupt( - KIRQL Request) -{ - UNIMPLEMENTED; +HalRequestSoftwareInterrupt(IN KIRQL Request) +{ + ULONG Interrupt =3D 0; + + // + // Get the interrupt that maches this IRQL level + // + switch (Request) + { + case APC_LEVEL: + = + Interrupt =3D 1 << 1; + break; + = + case DISPATCH_LEVEL: + = + Interrupt =3D 1 << 2; + break; + = + default: + = + ASSERT(FALSE); + } + = + // + // Force a software interrupt + // + DPRINT1("About to force interrupt mask: %d\n", Interrupt); + WRITE_REGISTER_ULONG(VICSOFTINT, Interrupt); } = VOID FASTCALL @@ -766,23 +990,79 @@ = VOID FASTCALL -KfLowerIrql( - KIRQL NewIrql) -{ - KeGetPcr()->CurrentIrql =3D NewIrql; - UNIMPLEMENTED; -} - +KfLowerIrql(IN KIRQL NewIrql) +{ + ULONG InterruptMask; + PKPCR Pcr =3D (PKPCR)KeGetPcr(); + = + // + // Validate the new IRQL + // + ASSERT(NewIrql <=3D Pcr->CurrentIrql); + = + // + // IRQLs are internally 8 bits + // + NewIrql &=3D 0xFF; + = + // + // Setup the interrupt mask for this IRQL + // + InterruptMask =3D KeGetPcr()->IrqlTable[NewIrql]; + DPRINT1("New IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + = + // + // Clear interrupts associated to the old IRQL + // + WRITE_REGISTER_ULONG(VICINTENCLEAR, 0xFFFFFFFF); + = + // + // Set the new interrupt mask + // PL190 VIC support only for now + // + WRITE_REGISTER_ULONG(VICINTENABLE, InterruptMask); + = + // + // Save the new IRQL + // + Pcr->CurrentIrql =3D NewIrql; +} = KIRQL FASTCALL -KfRaiseIrql( - KIRQL NewIrql) -{ - KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; - KeGetPcr()->CurrentIrql =3D NewIrql; - UNIMPLEMENTED; - +KfRaiseIrql(IN KIRQL NewIrql) +{ + KIRQL OldIrql; + ULONG InterruptMask; + PKPCR Pcr =3D (PKPCR)KeGetPcr(); + = + // + // Save the current IRQL + // + OldIrql =3D Pcr->CurrentIrql; + = + // + // IRQLs are internally 8 bits + // + NewIrql &=3D 0xFF; + = + // + // Setup the interrupt mask for this IRQL + // + InterruptMask =3D KeGetPcr()->IrqlTable[NewIrql]; + DPRINT1("New IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + //ASSERT(NewIrql >=3D OldIrql); + = + // + // Set the new interrupt mask + // PL190 VIC support only for now + // + WRITE_REGISTER_ULONG(VICINTENABLE, InterruptMask); + = + // + // Save the new IRQL + // + Pcr->CurrentIrql =3D NewIrql; return OldIrql; } = @@ -915,28 +1195,28 @@ KIRQL KeSwapIrql(IN KIRQL Irql) { - KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; - KeGetPcr()->CurrentIrql =3D Irql; - UNIMPLEMENTED; - return OldIrql; + // + // Call the generic routine + // + return KfRaiseIrql(Irql); } = KIRQL KeRaiseIrqlToDpcLevel(VOID) { - KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; - KeGetPcr()->CurrentIrql =3D SYNCH_LEVEL; - UNIMPLEMENTED; - return OldIrql; + // + // Call the generic routine + // + return KfRaiseIrql(DISPATCH_LEVEL); } = KIRQL KeRaiseIrqlToSynchLevel(VOID) { - KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; - KeGetPcr()->CurrentIrql =3D SYNCH_LEVEL; - UNIMPLEMENTED; - return OldIrql; + // + // Call the generic routine + // + return KfRaiseIrql(DISPATCH_LEVEL); } = BOOLEAN HalpProcessorIdentified; @@ -1136,7 +1416,7 @@ IN PKLOCK_QUEUE_HANDLE LockHand= le) { /* Simply raise to synch */ - LockHandle->OldIrql =3D KfRaiseIrql(SYNCH_LEVEL); + LockHandle->OldIrql =3D KfRaiseIrql(DISPATCH_LEVEL); } = /* Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armdd= k.h?rev=3D32674&r1=3D32673&r2=3D32674&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Thu Mar 13 11:29:45 2008 @@ -4,15 +4,17 @@ // // IRQLs // -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define IPI_LEVEL 7 -#define POWER_LEVEL 7 -#define PROFILE_LEVEL 8 -#define HIGH_LEVEL 8 -#define SYNCH_LEVEL (IPI_LEVEL - 1) +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define SYNCH_LEVEL DISPATCH_LEVEL +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 = // // FIXME: mmtypes.h? @@ -83,8 +85,8 @@ PVOID InstructionBusError; ULONG CachePolicy; ULONG AlignedCachePolicy; - UCHAR IrqlMask[64]; - UCHAR IrqlTable[64]; +// UCHAR IrqlMask[64]; + ULONG IrqlTable[HIGH_LEVEL + 1]; UCHAR CurrentIrql; KAFFINITY SetMember; struct _KTHREAD *CurrentThread;

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