Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[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

[amunger] 32673: Simplify and rename the functions that touch UserPageListHead. They were confusingly coded to accept any flavor of PFN_TYPE, which resulted in at least one bug. Constrained the calls to the MmRequest/ReleasePageMemoryConsumer and MmTrimUserMemory.
by amunger＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: amunger Date: Thu Mar 13 10:26:17 2008 New Revision: 32673 URL: http://svn.reactos.org/svn/reactos?rev=3D32673&view=3Drev Log: Simplify and rename the functions that touch UserPageListHead. They were confusingly coded to accept any flavor of PFN_TYPE, which resulte= d in at least one bug. Constrained the calls to the MmRequest/ReleasePageMemoryConsumer and MmTrim= UserMemory. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/wset.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/mm.h?rev=3D32673&r1=3D32672&r2=3D32673&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/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Mar 13 10:26:17 2008 @@ -1025,7 +1025,11 @@ = VOID NTAPI -MmSetLRULastPage(PFN_TYPE Page); +MmInsertLRULastUserPage(PFN_TYPE Page); + +VOID +NTAPI +MmRemoveLRUUserPage(PFN_TYPE Page); = VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c= ?rev=3D32673&r1=3D32672&r2=3D32673&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/mm/balance.c (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Thu Mar 13 10:26:17 2008 @@ -114,6 +114,7 @@ Entry =3D RemoveHeadList(&AllocationListHead); Request =3D CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListE= ntry); KeReleaseSpinLock(&AllocationListLock, oldIrql); + if(Consumer =3D=3D MC_USER) MmRemoveLRUUserPage(Page); Request->Page =3D Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); } @@ -121,6 +122,7 @@ else { KeReleaseSpinLock(&AllocationListLock, oldIrql); + if(Consumer =3D=3D MC_USER) MmRemoveLRUUserPage(Page); MmDereferencePage(Page); } = @@ -262,7 +264,9 @@ { KEBUGCHECK(NO_PAGES_AVAILABLE); } - MmSetLRULastPage(Page); + /* Update the Consumer */ + MiGetPfnEntry(Page)->Flags.Consumer =3D Consumer; + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage =3D Page; (void)InterlockedDecrementUL(&MiPagesRequired); return(STATUS_SUCCESS); @@ -276,6 +280,7 @@ { KEBUGCHECK(NO_PAGES_AVAILABLE); } + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage =3D Page; = return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.= c?rev=3D32673&r1=3D32672&r2=3D32673&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/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Mar 13 10:26:17 2008 @@ -31,8 +31,12 @@ ULONG MmPageArraySize; = static KSPIN_LOCK PageListLock; +/* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; +/* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */ static LIST_ENTRY FreeZeroedPageListHead; +/* List of free pages, filled by MmGetReferenceCountPage and + * and MmInitializePageList */ static LIST_ENTRY FreeUnzeroedPageListHead; = static KEVENT ZeroPageThreadEvent; @@ -65,19 +69,16 @@ = VOID NTAPI -MmSetLRULastPage(PFN_TYPE Pfn) +MmInsertLRULastUserPage(PFN_TYPE Pfn) { KIRQL oldIrql; PPHYSICAL_PAGE Page; = KeAcquireSpinLock(&PageListLock, &oldIrql); Page =3D MiGetPfnEntry(Pfn); - if (Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED && - Page->Flags.Consumer =3D=3D MC_USER) - { - RemoveEntryList(&Page->ListEntry); - InsertTailList(&UserPageListHead, &Page->ListEntry); - } + ASSERT(Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED); + ASSERT(Page->Flags.Consumer =3D=3D MC_USER); + InsertTailList(&UserPageListHead, &Page->ListEntry); KeReleaseSpinLock(&PageListLock, oldIrql); } = @@ -92,15 +93,9 @@ = KeAcquireSpinLock(&PageListLock, &oldIrql); Page =3D MiGetPfnEntry(PreviousPfn); - if (Page->Flags.Type !=3D MM_PHYSICAL_PAGE_USED || - Page->Flags.Consumer !=3D MC_USER) - { - NextListEntry =3D UserPageListHead.Flink; - } - else - { - NextListEntry =3D Page->ListEntry.Flink; - } + ASSERT(Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED); + ASSERT(Page->Flags.Consumer =3D=3D MC_USER); + NextListEntry =3D Page->ListEntry.Flink; if (NextListEntry =3D=3D &UserPageListHead) { KeReleaseSpinLock(&PageListLock, oldIrql); @@ -109,6 +104,13 @@ PageDescriptor =3D CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, List= Entry); KeReleaseSpinLock(&PageListLock, oldIrql); return PageDescriptor - MmPageArray; +} + +VOID +NTAPI +MmRemoveLRUUserPage(PFN_TYPE Page) +{ + RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); } = PFN_TYPE @@ -782,7 +784,6 @@ KeReleaseSpinLock(&PageListLock, oldIrql); = PfnOffset =3D PageDescriptor - MmPageArray; - MmSetLRULastPage(PfnOffset); if (NeedClear) { MiZeroPage(PfnOffset); @@ -882,7 +883,7 @@ /* Remember the page */ pfn =3D PageDescriptor - MmPageArray; Pages[NumberOfPagesFound++] =3D pfn; - MmSetLRULastPage(pfn); + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(pfn); } } else @@ -917,7 +918,6 @@ = /* Remember the page */ Pages[NumberOfPagesFound++] =3D pfn; - MmSetLRULastPage(pfn); if (NumberOfPagesFound =3D=3D NumberOfPages) break; } Modified: trunk/reactos/ntoskrnl/mm/wset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?re= v=3D32673&r1=3D32672&r2=3D32673&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/mm/wset.c (original) +++ trunk/reactos/ntoskrnl/mm/wset.c Thu Mar 13 10:26:17 2008 @@ -38,7 +38,8 @@ } else if (Status =3D=3D STATUS_PAGEFILE_QUOTA) { - MmSetLRULastPage(CurrentPage); + MmRemoveLRUUserPage(CurrentPage); + MmInsertLRULastUserPage(CurrentPage); } = CurrentPage =3D NextPage;

1 0

[fireball] 32672: - Factor out physical pages allocation and creating a virtual mapping into a standalone function called MmMapMemoryArea (idea proposed by Art Yerkes). - As a result, removed one case of a potentially dangerous _alloca usage in the kernel, increased code readability.
by fireball＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: fireball Date: Thu Mar 13 08:17:57 2008 New Revision: 32672 URL: http://svn.reactos.org/svn/reactos?rev=3D32672&view=3Drev Log: - Factor out physical pages allocation and creating a virtual mapping into = a standalone function called MmMapMemoryArea (idea proposed by Art Yerkes). - As a result, removed one case of a potentially dangerous _alloca usage in= the kernel, increased code readability. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/ncache.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32672&r1=3D32671&r2=3D32672&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 08:17:57 2008 @@ -561,16 +561,13 @@ ULONG FileOffset, PCACHE_SEGMENT* CacheSeg) { - ULONG i; PCACHE_SEGMENT current; PCACHE_SEGMENT previous; PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; - PPFN_TYPE Pfn; #ifdef CACHE_BITMAP ULONG StartingOffset; -#else #endif PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -706,24 +703,10 @@ KEBUGCHECKCC; } #endif - Pfn =3D alloca(sizeof(PFN_TYPE) * ((Bcb->CacheSegmentSize / PAGE_SIZE))); - for (i =3D 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++) - { - Status =3D MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Pfn[i]); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKCC; - } - } - Status =3D MmCreateVirtualMapping(NULL, - current->BaseAddress, - PAGE_READWRITE, - Pfn, - Bcb->CacheSegmentSize / PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKCC; - } + + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(current->BaseAddress, Bcb->CacheSegmentSize, + MC_CACHE, PAGE_READWRITE); = return(STATUS_SUCCESS); } Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/mm.h?rev=3D32672&r1=3D32671&r2=3D32672&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/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Mar 13 08:17:57 2008 @@ -503,6 +503,13 @@ PVOID BaseAddress ); = +VOID +NTAPI +MmMapMemoryArea(PVOID BaseAddress, + ULONG Length, + ULONG Consumer, + ULONG Protection); + /* npool.c ***************************************************************= ****/ = VOID Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?r= ev=3D32672&r1=3D32671&r2=3D32672&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/mm/marea.c (original) +++ trunk/reactos/ntoskrnl/mm/marea.c Thu Mar 13 08:17:57 2008 @@ -1022,6 +1022,38 @@ return STATUS_SUCCESS; } = +VOID NTAPI +MmMapMemoryArea(PVOID BaseAddress, + ULONG Length, + ULONG Consumer, + ULONG Protection) +{ + ULONG i; + NTSTATUS Status; + + for (i =3D 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) + { + PFN_TYPE Page; + + Status =3D MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to allocate page\n"); + KEBUGCHECK(0); + } + Status =3D MmCreateVirtualMapping (NULL, + (PVOID)((ULONG_PTR)BaseAddress + (i= * PAGE_SIZE)), + Protection, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KEBUGCHECK(0); + } + } +} + = VOID STDCALL MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, Modified: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?= rev=3D32672&r1=3D32671&r2=3D32672&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/mm/ncache.c (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c Thu Mar 13 08:17:57 2008 @@ -46,7 +46,6 @@ PVOID Result; MEMORY_AREA* marea; NTSTATUS Status; - ULONG i; ULONG Protect =3D PAGE_READWRITE|PAGE_SYSTEM|PAGE_NOCACHE|PAGE_WRITETHR= OUGH; PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -66,20 +65,14 @@ = if (!NT_SUCCESS(Status)) { + DPRINT1("Allocating marea for noncached mem failed with Status " + "0x%08X\n", Status); return (NULL); } = - for (i =3D 0; i < (PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE); i++) - { - PFN_TYPE NPage; + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(Result, NumberOfBytes, MC_NPPOOL, Protect); = - Status =3D MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &NPage); - MmCreateVirtualMapping (NULL, - (char*)Result + (i * PAGE_SIZE), - Protect, - &NPage, - 1); - } return ((PVOID)Result); } = Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c= ?rev=3D32672&r1=3D32671&r2=3D32672&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/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Mar 13 08:17:57 2008 @@ -4391,7 +4391,6 @@ PVOID Result; MEMORY_AREA* marea; NTSTATUS Status; - ULONG i; PMADDRESS_SPACE AddressSpace; PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -4418,27 +4417,10 @@ return (NULL); } DPRINT("Result %p\n",Result); - for (i =3D 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - PFN_TYPE Page; - - Status =3D MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to allocate page\n"); - KEBUGCHECK(0); - } - Status =3D MmCreateVirtualMapping (NULL, - (PVOID)((ULONG_PTR)Result + (i * PA= GE_SIZE)), - PAGE_READWRITE, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } - } + + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(Result, Length, MC_NPPOOL, PAGE_READWRITE); + return ((PVOID)Result); } =

1 0

[ros-arm-bringup] 32671: - Finish implementing very basic system call dispatcher. Our very first system call to NtClose works properly. - The rest of Phase 0 initialization continues smoothly, we now reach the while(TRUE) loop at the end of KiSystemStartup! - Phase 0 bring-up is complete: The phase 1 thread should now start (once thread scheduling works). - Next steps: IRQLs, HAL Initialization (Timers and IRQs) to get the interval clock timer running for quantum end/scheduling/time accounting.
by ros-arm-bringup＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: ros-arm-bringup Date: Wed Mar 12 17:06:42 2008 New Revision: 32671 URL: http://svn.reactos.org/svn/reactos?rev=3D32671&view=3Drev Log: - Finish implementing very basic system call dispatcher. Our very first sys= tem call to NtClose works properly. - The rest of Phase 0 initialization continues smoothly, we now reach the w= hile(TRUE) loop at the end of KiSystemStartup! - Phase 0 bring-up is complete: The phase 1 thread should now start (once t= hread scheduling works). - Next steps: IRQLs, HAL Initialization (Timers and IRQs) to get the interv= al clock timer running for quantum end/scheduling/time accounting. - After that: context switching code to be able to switch to the Phase 1 th= read. - Then: Phase 1 bring-up! Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.= s?rev=3D32671&r1=3D32670&r2=3D32671&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/arm/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s Wed Mar 12 17:06:42 2008 @@ -72,7 +72,30 @@ // mov r0, sp bl KiSoftwareInterruptHandler - + = + // + // Get the SPSR and restore it + // + ldr r0, [sp], #4 + msr spsr_all, r0 + = + // + // Restore the registers + // + ldmia sp, {r0-r14}^ + mov r0, r0 + = + // + // Advance in the trap frame + // + add sp, sp, #(4*17) + = + // + // Restore program execution state + // + ldr lr, [sp], #4 + movs pc, lr + b . ENTRY_END KiSoftwareInterruptException = NESTED_ENTRY KiPrefetchAbortException @@ -222,3 +245,43 @@ = ENTRY_END KiReservedException = + + NESTED_ENTRY KiSystemCall + PROLOG_END KiSystemCall + = + // + // a1 has the function pointer, a2 has an array of arguments, a3 has t= he count + // Save these to better locations + // + mov r4, a1 + mov r5, a2 + mov r6, a3 + = + // + // Load up A1-A4 from the argument array + // It doesn't matter if we had less than 4 arguments, we'll be loading= some + // of the registers with garbage, but nobody will know/care. + // + ldmia r5, {a1-a4} + add r5, r5, #(4* 4) + //sub r6, r6, #4 + = + // + // Now copy the other arguments into our stack + // +CopyLoop: + cmp r6, #4 + //strne sp, [r5], #4 + //subne r6, r6, #1 + beq . + + // + // Now do the system call + // + mov pc, r4 + = + // + // Should not get here + // + b . + ENTRY_END KiSystemCall Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc= .c?rev=3D32671&r1=3D32670&r2=3D32671&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/arm/trapc.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c Wed Mar 12 17:06:42 2008 @@ -18,6 +18,14 @@ #define KiGetPreviousMode(tf) \ ((tf->Spsr & CPSR_MODES) =3D=3D CPSR_USER_MODE) ? UserMode: KernelMode = +NTSTATUS +KiSystemCall( + IN PVOID Handler, + IN PULONG Arguments, + IN ULONG ArgumentCount +); + = + /* FUNCTIONS *************************************************************= *****/ = NTSTATUS @@ -45,13 +53,18 @@ return STATUS_SUCCESS; } = -NTSTATUS +VOID KiSystemService(IN PKTHREAD Thread, IN PKTRAP_FRAME TrapFrame, IN ULONG Instruction) { - ULONG Id; + ULONG Id, Number, ArgumentCount, i; PKPCR Pcr; + ULONG_PTR ServiceTable, Offset; + PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; + PVOID SystemCall; + PULONG Argument; + ULONG Arguments[16]; // Maximum 20 arguments = // // Increase count of system calls @@ -63,12 +76,104 @@ // Get the system call ID // Id =3D Instruction & 0xFFFFF; - DPRINT1("System call (%X) from thread: %p \n", Id, Thread); = - while (TRUE); - return STATUS_SUCCESS; + DPRINT1("System call (%X) from thread: %p (%d) \n", Id, Thread, Thread= ->PreviousMode); + = + // + // Get the descriptor table + // + ServiceTable =3D (ULONG_PTR)Thread->ServiceTable; + Offset =3D ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); + ServiceTable +=3D Offset; + DescriptorTable =3D (PVOID)ServiceTable; + DPRINT1("Descriptor Table: %p (Count %d)\n", DescriptorTable, Descript= orTable->Limit); + = + // + // Get the service call number and validate it + // + Number =3D Id & SERVICE_NUMBER_MASK; + if (Number > DescriptorTable->Limit) + { + // + // Check if this is a GUI call + // + UNIMPLEMENTED; + while (TRUE); + } + = + // + // Save the function responsible for handling this system call + // + SystemCall =3D (PVOID)DescriptorTable->Base[Number]; + DPRINT1("Handler: %p\n", SystemCall); + DPRINT1("NtClose: %p\n", NtClose); + = + // + // Check if this is a GUI call + // + if (Offset & SERVICE_TABLE_TEST) + { + // + // TODO + // + UNIMPLEMENTED; + while (TRUE); + } + = + // + // Check how many arguments this system call takes + // + DPRINT1("Number: %d\n", Number); + ArgumentCount =3D DescriptorTable->Number[Number] / 4; + ASSERT(ArgumentCount <=3D 20); + DPRINT1("Argument Count: %d\n", ArgumentCount); + = + // + // Copy the register-arguments first + // First four arguments are in a1, a2, a3, a4 + // + Argument =3D &TrapFrame->R0; + for (i =3D 0; (i < ArgumentCount) && (i < 4); i++) + { + // + // Copy them into the kernel stack + // + Arguments[i] =3D *Argument; + Argument++; + DPRINT1("Argument %d: %x\n", i, Arguments[i]); + } + = + // + // If more than four, we'll have some on the user stack + // + if (ArgumentCount > 4) + { + // + // FIXME: Validate the user stack + // + DPRINT1("User stack: %p\n", TrapFrame->UserSp); + = + // + // Copy the rest + // + Argument =3D (PULONG)TrapFrame->UserSp; + for (i =3D 4; i < ArgumentCount; i++) + { + // + // Copy into kernel stack + // + Arguments[i] =3D *Argument; + Argument++; + DPRINT1("Argument %d: %x\n", i, Arguments[i]); + } + } + = + // + // Do the system call and save result in EAX + // + TrapFrame->R0 =3D KiSystemCall(SystemCall, Arguments, ArgumentCount); } = -NTSTATUS +VOID KiSoftwareInterruptHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -87,6 +192,11 @@ PreviousMode =3D KiGetPreviousMode(TrapFrame); = // + // Save old previous mode + // + //TrapFrame->PreviousMode =3D PreviousMode; + = + // // Save previous mode and trap frame // Thread->TrapFrame =3D TrapFrame; @@ -98,7 +208,11 @@ Instruction =3D *(PULONG)(TrapFrame->Pc - sizeof(ULONG)); = // + // FIXME: Enable interrupts? + // + = + // // Call the service call dispatcher // - return KiSystemService(Thread, TrapFrame, Instruction); + KiSystemService(Thread, TrapFrame, Instruction); } Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?r= ev=3D32671&r1=3D32670&r2=3D32671&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/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Wed Mar 12 17:06:42 2008 @@ -100,8 +100,9 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" = -#define KernelModeStub_arm " swi #0x%x\n" \ - " bx lr\n\n" +#define KernelModeStub_arm " mov ip, lr\n" \ + " swi #0x%x\n" \ + " bx ip\n\n" = #elif defined(_MSC_VER) #define KernelModeStub_x86 " asm { \n" \

1 0

[dreimer] 32670: Polish Translation Update by Olaf Siejka.
by dreimer＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: dreimer Date: Wed Mar 12 16:32:45 2008 New Revision: 32670 URL: http://svn.reactos.org/svn/reactos?rev=3D32670&view=3Drev Log: Polish Translation Update by Olaf Siejka. Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/dll/cpl/input/lang/pl-PL.rc Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32670&r1=3D32669&r2=3D32670&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/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Mar 12 16:32:45 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by=C2=88 w stanie odnale=C2=AB=C2=86 sekji '%S'\nw pli= ku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik=C2=A2w= : %S"}, + " \xB3 Kopiowanie plik=C2=A2w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl= -PL.rc?rev=3D32670&r1=3D32669&r2=3D32670&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/dll/cpl/input/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc Wed Mar 12 16:32:45 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Jan, 2008) + * translated by Caemyr - Olaf Siejka (Jan,March 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -9,17 +9,17 @@ = IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select the services that you want for each input language shown= in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9,= 6, 238, 17 +CAPTION "Ustawienia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wybierz us=C2=B3ugi dla ka=C2=BFdego u=C2=BFywanego j=C3=AAzyka= z listy.\nList=C3=AA mo=C2=BFna modyfikowa=C3=A6 przyciskami Dodaj i Usu= =C3=B1.", -1, 9, 6, 238, 17 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VS= CROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 23= 7, 109 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "&Ustaw domy=C2=9Clne", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Dodaj...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "U&su=C3=B1...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&W=C2=B3a=C2=9Cciwo=C2=9Cci...", IDC_PROP_BUTTON, 175, 142= , 70, 14 + GROUPBOX "Preferencje", -1, 7, 185, 240, 36 + PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END = IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -54,18 +54,18 @@ = IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Zmiana sekwencji klawiszy" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", 1240, 4, 5, 186, 10 GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 + AUTOCHECKBOX "&Prze=C2=B3=C2=B9cz uk=C2=B3ad klawiatury", IDC_USE_SK, = 12, 17, 135, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Lewy A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 136, 70, 50, 14 END = IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -90,8 +90,8 @@ IDS_UNKNOWN "(Nieznany)" IDS_RESTART "Czy chcesz zrestartowa=C3=A6 sw=C3=B3j komputer= w tej chwili?" IDS_WHATS_THIS "Co to jest?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" + IDS_LANGUAGE "J=C3=AAzyk" + IDS_LAYOUT "Uk=C2=B3ad klawiatury" END = STRINGTABLE

1 0

[gbrunmar] 32669: Removed false unimplemented output :)
by gbrunmar＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: gbrunmar Date: Wed Mar 12 14:40:31 2008 New Revision: 32669 URL: http://svn.reactos.org/svn/reactos?rev=3D32669&view=3Drev Log: Removed false unimplemented output :) Modified: trunk/reactos/dll/directx/d3d9/d3d9.c Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= .c?rev=3D32669&r1=3D32668&r2=3D32669&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/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Wed Mar 12 14:40:31 2008 @@ -65,8 +65,6 @@ CHAR DebugMessageBuffer[DEBUG_MESSAGE_BUFFER_SIZE]; UINT NoDebugSDKVersion =3D SDKVersion & ~DX_D3D9_DEBUG; = - UNIMPLEMENTED - LoadDebugDllSize =3D sizeof(LoadDebugDll); if (ReadRegistryValue(REG_DWORD, "LoadDebugRuntime", (LPBYTE)&LoadDebu= gDll, &LoadDebugDllSize)) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

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 March 2008