Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 45073: [NTOS] Add KeGetContextSwitches macro for amd64
by tkreuzer＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: tkreuzer Date: Thu Jan 14 09:40:16 2010 New Revision: 45073 URL: http://svn.reactos.org/svn/reactos?rev=45073&view=rev Log: [NTOS] Add KeGetContextSwitches macro for amd64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Thu Jan 14 09:40:16 2010 @@ -108,6 +108,13 @@ #define KeGetTrapFrame(Thread) \ (PKTRAP_FRAME)((ULONG_PTR)((Thread)->InitialStack) - \ sizeof(KTRAP_FRAME)) + +// +// Macro to get context switches from the PRCB +// All architectures but x86 have it in the PRCB's KeContextSwitches +// +#define KeGetContextSwitches(Prcb) \ + (Prcb->KeContextSwitches) #define KeGetExceptionFrame(Thread) \ (PKEXCEPTION_FRAME)((ULONG_PTR)KeGetTrapFrame(Thread) - \

1 0

[tkreuzer] 45072: [HAL] add HalInitializeBios to amd64 exports
by tkreuzer＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: tkreuzer Date: Thu Jan 14 08:56:34 2010 New Revision: 45072 URL: http://svn.reactos.org/svn/reactos?rev=45072&view=rev Log: [HAL] add HalInitializeBios to amd64 exports Modified: branches/ros-amd64-bringup/reactos/hal/hal.pspec Modified: branches/ros-amd64-bringup/reactos/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] Thu Jan 14 08:56:34 2010 @@ -101,3 +101,4 @@ @ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) +@ stdcall -arch=x86_64 HalInitializeBios(long ptr)

1 0

[tkreuzer] 45071: reduce differences to trunk
by tkreuzer＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: tkreuzer Date: Thu Jan 14 08:53:23 2010 New Revision: 45071 URL: http://svn.reactos.org/svn/reactos?rev=45071&view=rev Log: reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/probe.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/probe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/probe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/probe.h [iso-8859-1] Thu Jan 14 08:53:23 2010 @@ -63,7 +63,7 @@ PVOID Buffer, ULONG BufferLength, PULONG ReturnLength, - PULONG_PTR ReturnLengthLong, + PULONG_PTR ReturnLengthPtr, KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; @@ -100,9 +100,9 @@ { ProbeForWriteUlong(ReturnLength); } - if (ReturnLengthLong != NULL) + if (ReturnLengthPtr != NULL) { - ProbeForWrite(ReturnLengthLong, sizeof(ULONG_PTR), sizeof(ULONG_PTR)); + ProbeForWrite(ReturnLengthPtr, sizeof(ULONG_PTR), sizeof(ULONG_PTR)); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

1 0

[jimtabor] 45070: [Win32k] - Updated headers and related files.
by jimtabor＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: jimtabor Date: Thu Jan 14 03:52:12 2010 New Revision: 45070 URL: http://svn.reactos.org/svn/reactos?rev=45070&view=rev Log: [Win32k] - Updated headers and related files. Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -8,6 +8,8 @@ { PDESKTOPINFO pDeskInfo; LIST_ENTRY ListEntry; + /* Pointer to the associated window station. */ + struct _WINSTATION_OBJECT *rpwinstaParent; PWND spwndForeground; PWND spwndTray; PWND spwndMessage; @@ -23,12 +25,8 @@ DWORD dwMouseHoverTime; /* ReactOS */ - CSHORT Type; - CSHORT Size; /* Rectangle of the work area */ RECTL WorkArea; - /* Pointer to the associated window station. */ - struct _WINSTATION_OBJECT *WindowStation; /* Pointer to the active queue. */ PVOID ActiveMessageQueue; /* Handle of the desktop window. */ @@ -130,7 +128,7 @@ HDC FASTCALL UserGetDesktopDC(ULONG,BOOL,BOOL); #define IntIsActiveDesktop(Desktop) \ - ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) + ((Desktop)->rpwinstaParent->ActiveDesktop == (Desktop)) #define GET_DESKTOP_NAME(d) \ OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(d)) ? \ @@ -210,10 +208,10 @@ ULONG_PTR Delta = 0; pti = PsGetCurrentThreadWin32Thread(); - if (!pti->Desktop) + if (!pti->rpdesk) return 0; - pheapDesktop = pti->Desktop->pheapDesktop; + pheapDesktop = pti->rpdesk->pheapDesktop; W32Process = PsGetCurrentProcessWin32Process(); Mapping = W32Process->HeapMappings.Next; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -70,7 +70,7 @@ struct _USER_MESSAGE_QUEUE* MessageQueue; struct _KBL* KeyboardLayout; PCLIENTTHREADINFO pcti; - struct _DESKTOP* Desktop; + struct _DESKTOP* rpdesk; PDESKTOPINFO pDeskInfo; PCLIENTINFO pClientInfo; FLONG TIF_flags; @@ -78,7 +78,7 @@ LONG timeLast; ULONG_PTR idLast; INT exitCode; - HANDLE hDesktop; + HDESK hdesk; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ DWORD dwExpWinVer; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -246,7 +246,7 @@ if (hDesk != NULL) { PDESKTOP DesktopObject; - Win32Thread->Desktop = NULL; + Win32Thread->rpdesk = NULL; Status = ObReferenceObjectByHandle(hDesk, 0, ExDesktopObjectType, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -62,7 +62,7 @@ { /* Don't save the new value to the registry! */ PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PWINSTATION_OBJECT WinStaObject = pti->Desktop->WindowStation; + PWINSTATION_OBJECT WinStaObject = pti->rpdesk->rpwinstaParent; /* windows doesn't do this check */ if((uMSeconds < MIN_CARETBLINKRATE) || (uMSeconds > MAX_CARETBLINKRATE)) @@ -152,7 +152,7 @@ UINT Ret; pti = PsGetCurrentThreadWin32Thread(); - WinStaObject = pti->Desktop->WindowStation; + WinStaObject = pti->rpdesk->rpwinstaParent; Ret = WinStaObject->CaretBlinkRate; if(!Ret) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -1265,7 +1265,7 @@ MenuName, fnID, dwFlags, - pti->Desktop, + pti->rpdesk, pi); if (Class != NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -1133,7 +1133,7 @@ PWINSTATION_OBJECT WinStaObj; pti = PsGetCurrentThreadWin32Thread(); - WinStaObj = pti->Desktop->WindowStation; + WinStaObj = pti->rpdesk->rpwinstaParent; WinStaObj->Clipboard->ClipboardSequenceNumber++; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -144,10 +144,10 @@ /* Initialize shell hook window list and set the parent */ RtlZeroMemory(Desktop, sizeof(DESKTOP)); InitializeListHead(&Desktop->ShellHookWindows); - Desktop->WindowStation = (PWINSTATION_OBJECT)ParseObject; + Desktop->rpwinstaParent = (PWINSTATION_OBJECT)ParseObject; /* Put the desktop on the window station's list of associated desktops */ - InsertTailList(&Desktop->WindowStation->DesktopListHead, + InsertTailList(&Desktop->rpwinstaParent->DesktopListHead, &Desktop->ListEntry); /* Set the desktop object and return success */ @@ -572,7 +572,7 @@ HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID) { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdo = pti->Desktop; + PDESKTOP pdo = pti->rpdesk; if (NULL == pdo) { DPRINT1("Thread doesn't have a desktop\n"); @@ -796,7 +796,7 @@ BOOL IntRegisterShellHookWindow(HWND hWnd) { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP Desktop = pti->Desktop; + PDESKTOP Desktop = pti->rpdesk; PSHELL_HOOK_WINDOW Entry; DPRINT("IntRegisterShellHookWindow\n"); @@ -828,7 +828,7 @@ BOOL IntDeRegisterShellHookWindow(HWND hWnd) { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP Desktop = pti->Desktop; + PDESKTOP Desktop = pti->rpdesk; PSHELL_HOOK_WINDOW Current; LIST_FOR_EACH(Current, &Desktop->ShellHookWindows, SHELL_HOOK_WINDOW, ListEntry) @@ -1103,7 +1103,7 @@ W32Thread = PsGetCurrentThreadWin32Thread(); - if (!W32Thread->Desktop) IntSetThreadDesktop(DesktopObject,FALSE); + if (!W32Thread->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE); /* Based on wine/server/window.c in get_desktop_window. @@ -1447,7 +1447,7 @@ UINT align_old; int mode_old; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PWINSTATION_OBJECT WinSta = pti->Desktop->WindowStation; + PWINSTATION_OBJECT WinSta = pti->rpdesk->rpwinstaParent; DECLARE_RETURN(BOOL); UserEnterExclusive(); @@ -1676,7 +1676,7 @@ * Don't allow applications switch the desktop if it's locked, unless the caller * is the logon application itself */ - if((DesktopObject->WindowStation->Flags & WSS_LOCKED) && + if((DesktopObject->rpwinstaParent->Flags & WSS_LOCKED) && LogonProcess != NULL && LogonProcess != PsGetCurrentProcessWin32Process()) { ObDereferenceObject(DesktopObject); @@ -1684,7 +1684,7 @@ RETURN(FALSE); } - if(DesktopObject->WindowStation != InputWindowStation) + if(DesktopObject->rpwinstaParent != InputWindowStation) { ObDereferenceObject(DesktopObject); DPRINT1("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hDesktop); @@ -1763,14 +1763,14 @@ { /* just return the handle, we queried the desktop handle of a thread running in the same context */ - Ret = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hDesktop; + Ret = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk; ObDereferenceObject(Thread); RETURN(Ret); } /* get the desktop handle and the desktop of the thread */ - if(!(hThreadDesktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hDesktop) || - !(DesktopObject = ((PTHREADINFO)Thread->Tcb.Win32Thread)->Desktop)) + if(!(hThreadDesktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk) || + !(DesktopObject = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk)) { ObDereferenceObject(Thread); DPRINT1("Desktop information of thread 0x%x broken!?\n", dwThreadId); @@ -1954,9 +1954,9 @@ MapHeap = (PsGetCurrentProcess() != PsInitialSystemProcess); W32Thread = PsGetCurrentThreadWin32Thread(); - if (W32Thread->Desktop != DesktopObject) + if (W32Thread->rpdesk != DesktopObject) { - OldDesktop = W32Thread->Desktop; + OldDesktop = W32Thread->rpdesk; if (!IsListEmpty(&W32Thread->WindowListHead)) { @@ -1965,7 +1965,7 @@ return FALSE; } - W32Thread->Desktop = DesktopObject; + W32Thread->rpdesk = DesktopObject; if (MapHeap && DesktopObject != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -121,7 +121,7 @@ W32Thread->pDeskInfo->fsHooks= W32Thread->fsHooks; Hook->head.pti = W32Thread; - Hook->head.rpdesk = W32Thread->Desktop; + Hook->head.rpdesk = W32Thread->rpdesk; } RtlInitUnicodeString(&Hook->ModuleName, NULL); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -990,7 +990,7 @@ PTHREADINFO OldBlock; ASSERT(W32Thread); - if(!W32Thread->Desktop || ((W32Thread->TIF_flags & TIF_INCLEANUP) && BlockIt)) + if(!W32Thread->rpdesk || ((W32Thread->TIF_flags & TIF_INCLEANUP) && BlockIt)) { /* * fail blocking if exiting the thread @@ -1004,14 +1004,14 @@ * e.g. services running in the service window station cannot block input */ if(!ThreadHasInputAccess(W32Thread) || - !IntIsActiveDesktop(W32Thread->Desktop)) + !IntIsActiveDesktop(W32Thread->rpdesk)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; } - ASSERT(W32Thread->Desktop); - OldBlock = W32Thread->Desktop->BlockInputThread; + ASSERT(W32Thread->rpdesk); + OldBlock = W32Thread->rpdesk->BlockInputThread; if(OldBlock) { if(OldBlock != W32Thread) @@ -1019,11 +1019,11 @@ SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; } - W32Thread->Desktop->BlockInputThread = (BlockIt ? W32Thread : NULL); + W32Thread->rpdesk->BlockInputThread = (BlockIt ? W32Thread : NULL); return OldBlock == NULL; } - W32Thread->Desktop->BlockInputThread = (BlockIt ? W32Thread : NULL); + W32Thread->rpdesk->BlockInputThread = (BlockIt ? W32Thread : NULL); return OldBlock == NULL; } @@ -1394,7 +1394,7 @@ /* Do not attach to system threads or between different desktops. */ if ( pti->TIF_flags & TIF_DONTATTACHQUEUE || ptiTo->TIF_flags & TIF_DONTATTACHQUEUE || - pti->Desktop != ptiTo->Desktop ) + pti->rpdesk != ptiTo->rpdesk ) return FALSE; /* If Attach set, allocate and link. */ @@ -1451,7 +1451,7 @@ W32Thread = PsGetCurrentThreadWin32Thread(); ASSERT(W32Thread); - if(!W32Thread->Desktop) + if(!W32Thread->rpdesk) { RETURN( 0); } @@ -1467,7 +1467,7 @@ * e.g. services running in the service window station cannot block input */ if(!ThreadHasInputAccess(W32Thread) || - !IntIsActiveDesktop(W32Thread->Desktop)) + !IntIsActiveDesktop(W32Thread->rpdesk)) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN( 0); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -191,13 +191,13 @@ SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN( FALSE); } - Desktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->Desktop; + Desktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk; } else { /* get the foreground thread */ PTHREADINFO W32Thread = (PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread; - Desktop = W32Thread->Desktop; + Desktop = W32Thread->rpdesk; if(Desktop) { MsgQueue = Desktop->ActiveMessageQueue; @@ -474,9 +474,9 @@ pti->pcti = &pti->cti; // FIXME Need to set it in desktop.c! - if (pti->Desktop != NULL) + if (pti->rpdesk != NULL) { - pti->pDeskInfo = pti->Desktop->pDeskInfo; + pti->pDeskInfo = pti->rpdesk->pDeskInfo; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -240,7 +240,7 @@ BOOL Res = FALSE; pti = PsGetCurrentThreadWin32Thread(); - if (pti->Desktop == NULL) + if (pti->rpdesk == NULL) { return FALSE; } @@ -281,7 +281,7 @@ BOOL Res; pti = PsGetCurrentThreadWin32Thread(); - if (pti->Desktop == NULL) + if (pti->rpdesk == NULL) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -702,7 +702,7 @@ ASSERT_REFS_CO(Window); - Desktop = ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->Desktop; + Desktop = ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->rpdesk; CaretInfo = ((PUSER_MESSAGE_QUEUE)Desktop->ActiveMessageQueue)->CaretInfo; hWndCaret = CaretInfo->hWnd; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -309,7 +309,7 @@ BOOL Ret = TRUE; PPOINTL pptl; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - if (pti->hDesktop != InputDesktopHandle) RETURN(FALSE); + if (pti->hdesk != InputDesktopHandle) RETURN(FALSE); _SEH2_TRY { pptl = (PPOINTL)Param; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -898,7 +898,7 @@ case SPI_GETWORKAREA: // FIXME: the workarea should be part of the MONITOR { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesktop = pti->Desktop; + PDESKTOP pdesktop = pti->rpdesk; RECTL rclWorkarea; if(!pdesktop) @@ -911,7 +911,7 @@ case SPI_SETWORKAREA: // FIXME: the workarea should be part of the MONITOR { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesktop = pti->Desktop; + PDESKTOP pdesktop = pti->rpdesk; RECT rcWorkArea; if(!pdesktop) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -37,7 +37,7 @@ RTL_ATOM Atom; pti = PsGetCurrentThreadWin32Thread(); - if (pti->Desktop == NULL) + if (pti->rpdesk == NULL) { SetLastNtError(Status); return (RTL_ATOM)0; @@ -61,7 +61,7 @@ ULONG Size = nSize; pti = PsGetCurrentThreadWin32Thread(); - if (pti->Desktop == NULL) + if (pti->rpdesk == NULL) { SetLastNtError(Status); return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -438,13 +438,13 @@ /* don't remove the WINDOWSTATUS_DESTROYING bit */ /* reset shell window handles */ - if(ThreadData->Desktop) - { - if (Window->hSelf == ThreadData->Desktop->WindowStation->ShellWindow) - ThreadData->Desktop->WindowStation->ShellWindow = NULL; - - if (Window->hSelf == ThreadData->Desktop->WindowStation->ShellListView) - ThreadData->Desktop->WindowStation->ShellListView = NULL; + if(ThreadData->rpdesk) + { + if (Window->hSelf == ThreadData->rpdesk->rpwinstaParent->ShellWindow) + ThreadData->rpdesk->rpwinstaParent->ShellWindow = NULL; + + if (Window->hSelf == ThreadData->rpdesk->rpwinstaParent->ShellListView) + ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } /* Unregister hot keys */ @@ -861,7 +861,7 @@ { W32Thread = PsGetCurrentThreadWin32Thread(); - if(!W32Thread->Desktop) + if(!W32Thread->rpdesk) return NULL; if(Window->SystemMenu) @@ -874,10 +874,10 @@ } } - if(W32Thread->Desktop->WindowStation->SystemMenuTemplate) + if(W32Thread->rpdesk->rpwinstaParent->SystemMenuTemplate) { /* clone system menu */ - Menu = UserGetMenuObject(W32Thread->Desktop->WindowStation->SystemMenuTemplate); + Menu = UserGetMenuObject(W32Thread->rpdesk->rpwinstaParent->SystemMenuTemplate); if(!Menu) return NULL; @@ -1703,9 +1703,9 @@ pti = PsGetCurrentThreadWin32Thread(); - if (pti->Desktop) - { - ParentWindowHandle = pti->Desktop->DesktopWindow; + if (pti->rpdesk) + { + ParentWindowHandle = pti->rpdesk->DesktopWindow; } @@ -1759,7 +1759,7 @@ /* Check the window station. */ ti = GetW32ThreadInfo(); - if (ti == NULL || pti->Desktop == NULL) + if (ti == NULL || pti->rpdesk == NULL) { DPRINT1("Thread is not attached to a desktop! Cannot create window!\n"); RETURN( (PWND)0); @@ -1792,14 +1792,14 @@ DPRINT("ClassAtom %x\n", ClassAtom); Class = IntReferenceClass(Class, ClassLink, - pti->Desktop); + pti->rpdesk); if (Class == NULL) { DPRINT1("Failed to reference window class!\n"); RETURN(NULL); } - WinSta = pti->Desktop->WindowStation; + WinSta = pti->rpdesk->rpwinstaParent; //FIXME: Reference thread/desktop instead ObReferenceObjectByPointer(WinSta, KernelMode, ExWindowStationObjectType, 0); @@ -1811,7 +1811,7 @@ sizeof(WINDOW_OBJECT)); if (Window) { - Window->Wnd = DesktopHeapAlloc(pti->Desktop, + Window->Wnd = DesktopHeapAlloc(pti->rpdesk, sizeof(WND) + Class->cbwndExtra); if (!Window->Wnd) goto AllocErr; @@ -1822,7 +1822,7 @@ Wnd->fnid = 0; Wnd->head.pti = ti; - Wnd->head.rpdesk = pti->Desktop; + Wnd->head.rpdesk = pti->rpdesk; Wnd->hWndLastActive = hWnd; Wnd->state2 |= WNDS2_WIN40COMPAT; } @@ -1840,11 +1840,11 @@ ObDereferenceObject(WinSta); - if (NULL == pti->Desktop->DesktopWindow) + if (NULL == pti->rpdesk->DesktopWindow) { /* If there is no desktop window yet, we must be creating it */ - pti->Desktop->DesktopWindow = hWnd; - pti->Desktop->pDeskInfo->spwnd = Wnd; + pti->rpdesk->DesktopWindow = hWnd; + pti->rpdesk->pDeskInfo->spwnd = Wnd; } /* @@ -2109,7 +2109,7 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; BOOL CalculatedDefPosSize = FALSE; - IntGetDesktopWorkArea(((PTHREADINFO)Window->pti->pEThread->Tcb.Win32Thread)->Desktop, &WorkArea); + IntGetDesktopWorkArea(Window->pti->rpdesk, &WorkArea); rc = WorkArea; ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; @@ -3888,7 +3888,7 @@ /* * Remove extended window style bit WS_EX_TOPMOST for shell windows. */ - WindowStation = Window->pti->Desktop->WindowStation; + WindowStation = Window->pti->rpdesk->rpwinstaParent; if(WindowStation) { if (hWnd == WindowStation->ShellWindow || hWnd == WindowStation->ShellListView) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -257,7 +257,7 @@ { RECTL WorkArea; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */ + PDESKTOP Desktop = pti->rpdesk; /* Or rather get it from the window? */ Parent = Window->spwndParent; if(Parent) @@ -405,7 +405,7 @@ UINT XInc, YInc; RECTL WorkArea; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */ + PDESKTOP Desktop = pti->rpdesk; /* Or rather get it from the window? */ IntGetDesktopWorkArea(Desktop, &WorkArea); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu Jan 14 03:52:12 2010 @@ -900,7 +900,7 @@ { DPRINT1("Should use ObFindHandleForObject\n"); pti = PsGetCurrentThreadWin32Thread(); - Status = ObOpenObjectByPointer(pti->Desktop->WindowStation, + Status = ObOpenObjectByPointer(pti->rpdesk->rpwinstaParent, 0, NULL, WINSTA_ALL_ACCESS, @@ -951,9 +951,9 @@ */ Win32Thread = PsGetCurrentThreadWin32Thread(); - if(Win32Thread != NULL && Win32Thread->Desktop != NULL) - { - WinStaObj = Win32Thread->Desktop->WindowStation; + if(Win32Thread != NULL && Win32Thread->rpdesk != NULL) + { + WinStaObj = Win32Thread->rpdesk->rpwinstaParent; ObReferenceObjectByPointer(WinStaObj, KernelMode, ExWindowStationObjectType, 0); } else if((CurrentProcess = PsGetCurrentProcess()) != CsrProcess)

1 0

[tkreuzer] 45069: Fix wrong positioned #else
by tkreuzer＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: tkreuzer Date: Thu Jan 14 01:45:11 2010 New Revision: 45069 URL: http://svn.reactos.org/svn/reactos?rev=45069&view=rev Log: Fix wrong positioned #else Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Thu Jan 14 01:45:11 2010 @@ -191,14 +191,13 @@ /* Bump EIP to the instruction following the int 2C and return */ Context->Eip += 2; #elif _AMD64_ -#else /* Warn about it */ DbgPrint("\n!!! Assertion Failure at Address 0x%p !!!\n\n", (PVOID)Context->Rip); /* Bump RIP to the instruction following the int 2C and return */ Context->Rip += 2; - +#else #error Unknown Architecture #endif return TRUE;

1 0

[jimtabor] 45068: [Win32k|User32] - Updated headers for the next round of changes.
by jimtabor＠svn.reactos.org 14 Jan '10

14 Jan '10

Author: jimtabor Date: Thu Jan 14 01:43:54 2010 New Revision: 45068 URL: http://svn.reactos.org/svn/reactos?rev=45068&view=rev Log: [Win32k|User32] - Updated headers for the next round of changes. Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -524,7 +524,7 @@ FASTCALL GetThreadDesktopWnd(VOID) { - PWND Wnd = GetThreadDesktopInfo()->Wnd; + PWND Wnd = GetThreadDesktopInfo()->spwnd; if (Wnd != NULL) Wnd = DesktopPtrToUser(Wnd); return Wnd; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -40,13 +40,13 @@ { PVOID pvDesktopBase; PVOID pvDesktopLimit; - - HANDLE hKernelHeap; - ULONG_PTR HeapLimit; + struct _WND *spwnd; + DWORD fsHooks; + struct tagHOOK * aphkStart[16]; + HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; - struct _WND *Wnd; union { Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -6,29 +6,36 @@ typedef struct _DESKTOP { + PDESKTOPINFO pDeskInfo; + LIST_ENTRY ListEntry; + PWND spwndForeground; + PWND spwndTray; + PWND spwndMessage; + PWND spwndTooltip; + PSECTION_OBJECT hsectionDesktop; + PWIN32HEAP pheapDesktop; + ULONG_PTR ulHeapSize; + LIST_ENTRY PtiList; + /* use for tracking mouse moves. */ + PWND spwndTrack; + DWORD htEx; + RECT rcMouseHover; + DWORD dwMouseHoverTime; + + /* ReactOS */ CSHORT Type; CSHORT Size; - LIST_ENTRY ListEntry; - - LIST_ENTRY PtiList; - + /* Rectangle of the work area */ + RECTL WorkArea; /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; /* Pointer to the active queue. */ PVOID ActiveMessageQueue; - /* Rectangle of the work area */ - RECTL WorkArea; /* Handle of the desktop window. */ HANDLE DesktopWindow; /* Thread blocking input */ PVOID BlockInputThread; - LIST_ENTRY ShellHookWindows; - - PWIN32HEAP pheapDesktop; - PSECTION_OBJECT DesktopHeapSection; - PDESKTOPINFO pDeskInfo; - PWND spwndMessage; } DESKTOP, *PDESKTOP; extern PDESKTOP InputDesktop; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -847,10 +847,10 @@ static VOID IntFreeDesktopHeap(IN OUT PDESKTOP Desktop) { - if (Desktop->DesktopHeapSection != NULL) + if (Desktop->hsectionDesktop != NULL) { - ObDereferenceObject(Desktop->DesktopHeapSection); - Desktop->DesktopHeapSection = NULL; + ObDereferenceObject(Desktop->hsectionDesktop); + Desktop->hsectionDesktop = NULL; } } /* SYSCALLS *******************************************************************/ @@ -1018,8 +1018,8 @@ NULL); if (!NT_SUCCESS(Status)) RETURN(NULL); - DesktopObject->DesktopHeapSection = NULL; - DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->DesktopHeapSection, + DesktopObject->hsectionDesktop = NULL; + DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, &DesktopHeapSystemBase, HeapSize); if (DesktopObject->pheapDesktop == NULL) @@ -1890,7 +1890,7 @@ /* we're the first, map the heap */ DPRINT("Noone mapped the desktop heap %p yet, so - map it!\n", DesktopObject->pheapDesktop); Offset.QuadPart = 0; - Status = MmMapViewOfSection(DesktopObject->DesktopHeapSection, + Status = MmMapViewOfSection(DesktopObject->hsectionDesktop, PsGetCurrentProcess(), &UserBase, 0, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -117,6 +117,9 @@ if (W32Thread->pClientInfo) W32Thread->pClientInfo->fsHooks = W32Thread->fsHooks; + if (W32Thread->pDeskInfo) // Do this for now. + W32Thread->pDeskInfo->fsHooks= W32Thread->fsHooks; + Hook->head.pti = W32Thread; Hook->head.rpdesk = W32Thread->Desktop; } @@ -237,6 +240,9 @@ W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; + + if (W32Thread->pDeskInfo) // Do this for now. + W32Thread->pDeskInfo->fsHooks= W32Thread->fsHooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Jan 14 01:43:54 2010 @@ -1844,7 +1844,7 @@ { /* If there is no desktop window yet, we must be creating it */ pti->Desktop->DesktopWindow = hWnd; - pti->Desktop->pDeskInfo->Wnd = Wnd; + pti->Desktop->pDeskInfo->spwnd = Wnd; } /*

1 0

[tkreuzer] 45067: remove diff to trunk
by tkreuzer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: tkreuzer Date: Thu Jan 14 00:05:26 2010 New Revision: 45067 URL: http://svn.reactos.org/svn/reactos?rev=45067&view=rev Log: remove diff to trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Jan 14 00:05:26 2010 @@ -350,14 +350,14 @@ BOOLEAN NTAPI SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, - IN BOOLEAN SubjectContextLocked, - IN ACCESS_MASK DesiredAccess, - IN ACCESS_MASK PreviouslyGrantedAccess, - OUT PPRIVILEGE_SET* Privileges, - IN PGENERIC_MAPPING GenericMapping, - IN KPROCESSOR_MODE AccessMode, - OUT PACCESS_MASK GrantedAccess, + IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, + IN BOOLEAN SubjectContextLocked, + IN ACCESS_MASK DesiredAccess, + IN ACCESS_MASK PreviouslyGrantedAccess, + OUT PPRIVILEGE_SET* Privileges, + IN PGENERIC_MAPPING GenericMapping, + IN KPROCESSOR_MODE AccessMode, + OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus, SECURITY_IMPERSONATION_LEVEL LowestImpersonationLevel) { @@ -721,14 +721,14 @@ /* Now perform the access check */ SepAccessCheck(SecurityDescriptor, - &SubjectSecurityContext, - TRUE, - DesiredAccess, - 0, - &PrivilegeSet, //FIXME - GenericMapping, - PreviousMode, - GrantedAccess, + &SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &PrivilegeSet, //FIXME + GenericMapping, + PreviousMode, + GrantedAccess, AccessStatus, SecurityIdentification);

1 0

[tkreuzer] 45066: Merge from amd64-branch: 34969 Some ULONG / SIZE_T fixes, handle amd64 in PspCreateThread 34986 Fix several 64 bit issues 35968 Fix Size parameter of CmpAllpcate (ULONG->SIZE_T). 35970 Fix pointer <-> ULONG cast 35971 Fix pointer <-> ULONG cast fixes 36332 fix 64 bit warnings 37435 Fix several ULONG/ULONG_PTR issues. Add a parameter to DefaultQueryInfoBufferCheck for ULONG_PTR/SIZE_T ResultLength 39522 ExInitializeSystemlookasideList: Use InitializeSListHead instead of directly
by tkreuzer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: tkreuzer Date: Wed Jan 13 23:35:43 2010 New Revision: 45066 URL: http://svn.reactos.org/svn/reactos?rev=45066&view=rev Log: Merge from amd64-branch: 34969 Some ULONG / SIZE_T fixes, handle amd64 in PspCreateThread 34986 Fix several 64 bit issues 35968 Fix Size parameter of CmpAllpcate (ULONG->SIZE_T). 35970 Fix pointer <-> ULONG cast 35971 Fix pointer <-> ULONG cast fixes 36332 fix 64 bit warnings 37435 Fix several ULONG/ULONG_PTR issues. Add a parameter to DefaultQueryInfoBufferCheck for ULONG_PTR/SIZE_T ResultLength 39522 ExInitializeSystemlookasideList: Use InitializeSListHead instead of directly accessing the members. ExpAllocateLocallyUniqueId: use InterlockedCompareExchange64 instead of non-portable ExfInterlockedCompareExchange64 37433 fix InterlockedExchangePointer usage 38105 Use KeGetCurrentPrcb() instead of KeGetPcr()->Prcb / KeGetPcr()->CurrentPrcb 39160 Use wbinvd instruction for amd64, too. Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmwraprs.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/pushlock.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/probe.h trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/lsa.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=450… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -615,7 +615,7 @@ { CurrentLength = Length; } - MmInitializeMdl(Mdl, (PVOID)WriteOffset.u.LowPart, CurrentLength); + MmInitializeMdl(Mdl, (PVOID)(ULONG_PTR)WriteOffset.QuadPart, CurrentLength); Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++) { Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1054,7 +1054,7 @@ for (i = 0; i < 4; i++) { /* Add it into the list */ - if (!InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + if (!InterlockedCompareExchangePointer((PVOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], KeyBody, NULL)) @@ -1110,7 +1110,7 @@ for (i = 0; i < 4; i++) { /* Add it into the list */ - if (InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + if (InterlockedCompareExchangePointer((VOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], NULL, KeyBody) == KeyBody) Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1079,7 +1079,7 @@ PAGED_CODE(); /* Get the hive index, make sure it makes sense */ - i = (ULONG)StartContext; + i = PtrToUlong(StartContext); ASSERT(CmpMachineHiveList[i].Name != NULL); /* We were started */ @@ -1274,7 +1274,7 @@ 0, NULL, CmpLoadHiveThread, - (PVOID)i); + UlongToPtr(i)); if (NT_SUCCESS(Status)) { /* We don't care about the handle -- the thread self-terminates */ Modified: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmwraprs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmwraprs.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -51,7 +51,7 @@ PVOID NTAPI -CmpAllocate(IN ULONG Size, +CmpAllocate(IN SIZE_T Size, IN BOOLEAN Paged, IN ULONG Tag) { Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -331,6 +331,7 @@ EventInformation, EventInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -515,7 +515,7 @@ /* Write the new level and attempt to change the table code */ TableBase = ((ULONG_PTR)Mid) | 1; - Value = InterlockedExchangePointer(&HandleTable->TableCode, TableBase); + Value = InterlockedExchangePointer((PVOID*)&HandleTable->TableCode, (PVOID)TableBase); } else if (TableLevel == 1) { @@ -532,7 +532,7 @@ if (!Low) return FALSE; /* Update the table */ - Value = InterlockedExchangePointer(&SecondLevel[i], Low); + Value = InterlockedExchangePointer((PVOID*)&SecondLevel[i], Low); ASSERT(Value == NULL); } else @@ -559,7 +559,7 @@ /* Write the new table and change the table code */ TableBase = ((ULONG_PTR)High) | 2; - Value = InterlockedExchangePointer(&HandleTable->TableCode, + Value = InterlockedExchangePointer((PVOID*)&HandleTable->TableCode, (PVOID)TableBase); } } @@ -580,7 +580,7 @@ if (!Mid) return FALSE; /* Update the table pointer */ - Value = InterlockedExchangePointer(&ThirdLevel[i], Mid); + Value = InterlockedExchangePointer((PVOID*)&ThirdLevel[i], Mid); ASSERT(Value == NULL); } else @@ -595,7 +595,7 @@ if (!Low) return FALSE; /* Update the table pointer */ - Value = InterlockedExchangePointer(&ThirdLevel[i][j], Low); + Value = InterlockedExchangePointer((PVOID*)&ThirdLevel[i][j], Low); ASSERT(Value == NULL); } } @@ -885,8 +885,8 @@ /* It's not locked, remove the lock bit to lock it */ NewValue = OldValue & ~EXHANDLE_TABLE_ENTRY_LOCK_BIT; if (InterlockedCompareExchangePointer(&HandleTableEntry->Object, - NewValue, - OldValue) == (PVOID)OldValue) + (PVOID)NewValue, + (PVOID)OldValue) == (PVOID)OldValue) { /* We locked it, get out */ return TRUE; @@ -1009,7 +1009,7 @@ } /* Clear the handle */ - Object = InterlockedExchangePointer(&HandleTableEntry->Object, NULL); + Object = InterlockedExchangePointer((PVOID*)&HandleTableEntry->Object, NULL); /* Sanity checks */ ASSERT(Object != NULL); Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -387,7 +387,7 @@ IN ULONG ValidResponseOptions, OUT PULONG Response) { - ULONG Size; + SIZE_T Size; UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; ULONG i; PULONG_PTR UserData = NULL, ParameterBase; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=450… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -68,7 +68,7 @@ ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; ULONG ExpUnicodeCaseTableDataOffset; NLSTABLEINFO ExpNlsTableInfo; -ULONG ExpNlsTableSize; +SIZE_T ExpNlsTableSize; PVOID ExpNlsSectionPointer; /* CMOS Timer Sanity */ @@ -196,7 +196,7 @@ NTSTATUS Status; HANDLE NlsSection; PVOID SectionBase = NULL; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; LARGE_INTEGER SectionOffset = {{0, 0}}; PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; @@ -369,7 +369,7 @@ OUT PCHAR *ProcessEnvironment) { NTSTATUS Status; - ULONG Size; + SIZE_T Size; PWSTR p; UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); UNICODE_STRING SmssName, Environment, SystemDriveString, DebugString; @@ -829,7 +829,7 @@ PLDR_DATA_TABLE_ENTRY NtosEntry; PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; ANSI_STRING CsdString; - ULONG Remaining = 0; + SIZE_T Remaining = 0; PCHAR RcEnd = NULL; CHAR VersionBuffer [65]; @@ -1245,7 +1245,8 @@ PCHAR StringBuffer, EndBuffer, BeginBuffer, MpString = ""; PINIT_BUFFER InitBuffer; ANSI_STRING TempString; - ULONG LastTzBias, Size, Length, YearHack = 0, Disposition, MessageCode = 0; + ULONG LastTzBias, Length, YearHack = 0, Disposition, MessageCode = 0; + SIZE_T Size; PRTL_USER_PROCESS_INFORMATION ProcessInfo; KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; UNICODE_STRING KeyName, DebugString; @@ -1325,14 +1326,14 @@ StringBuffer = InitBuffer->VersionBuffer; BeginBuffer = StringBuffer; EndBuffer = StringBuffer; - Length = 256; + Size = 256; if (CmCSDVersionString.Length) { /* Print the version string */ Status = RtlStringCbPrintfExA(StringBuffer, 255, &EndBuffer, - &Length, + &Size, 0, ": %wZ", &CmCSDVersionString); @@ -1345,7 +1346,7 @@ else { /* No version */ - Length = 255; + Size = 255; } /* Null-terminate the string */ @@ -1369,7 +1370,7 @@ { /* Create the banner message */ Status = RtlStringCbPrintfA(EndBuffer, - Length, + Size, MsgEntry->Text, StringBuffer, NtBuildNumber & 0xFFFF, @@ -1383,7 +1384,7 @@ else { /* Use hard-coded banner message */ - Status = RtlStringCbCopyA(EndBuffer, Length, "REACTOS (R)\n"); + Status = RtlStringCbCopyA(EndBuffer, Size, "REACTOS (R)\n"); if (!NT_SUCCESS(Status)) { /* Bugcheck */ Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -47,9 +47,7 @@ List->Depth = 2; List->Allocate = ExAllocatePoolWithTag; List->Free = ExFreePool; - List->ListHead.Next.Next = NULL; - List->ListHead.Depth = 0; - List->ListHead.Sequence = 0; + InitializeSListHead(&List->ListHead); List->TotalAllocates = 0; List->AllocateHits = 0; List->TotalFrees = 0; Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -242,6 +242,7 @@ MutantInformation, MutantInformationLength, ResultLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -20,6 +20,12 @@ #undef PEX_PUSH_LOCK /* PRIVATE FUNCTIONS *********************************************************/ + +#ifdef _WIN64 +#define InterlockedAndPointer(ptr,val) InterlockedAnd64((PLONGLONG)ptr,(LONGLONG)val) +#else +#define InterlockedAndPointer(ptr,val) InterlockedAnd((PLONG)ptr,(LONG)val) +#endif /*++ * @name ExpInitializePushLocks @@ -91,7 +97,7 @@ ASSERT(NewValue.Waiting); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -101,7 +107,7 @@ } /* Save the First Block */ - FirstWaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + FirstWaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); WaitBlock = FirstWaitBlock; @@ -139,7 +145,7 @@ ASSERT(!NewValue.Waking); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) break; @@ -158,7 +164,7 @@ ASSERT(PushLock->Waiting); /* Remove waking bit from pushlock */ - InterlockedAnd((PLONG)PushLock, ~EX_PUSH_LOCK_WAKING); + InterlockedAndPointer(&PushLock->Value, ~EX_PUSH_LOCK_WAKING); /* Leave the loop */ break; @@ -240,7 +246,7 @@ } /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop the blocks */ @@ -274,7 +280,7 @@ ASSERT(!NewValue.Waking); /* Update the value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -478,7 +484,7 @@ ASSERT(NewValue.Locked); /* Set the new value */ - if (InterlockedCompareExchangePointer(PushLock, + if (InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr) != OldValue.Ptr) { @@ -508,8 +514,8 @@ WaitBlock->ShareCount = 0; /* Set the current Wait Block pointer */ - WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)( + OldValue.Value &~ EX_PUSH_LOCK_PTR_BITS); /* Point to ours */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_MULTIPLE_SHARED) | @@ -564,7 +570,7 @@ /* Write the new value */ TempValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) @@ -663,7 +669,7 @@ ASSERT(NewValue.Locked); /* Set the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) @@ -688,8 +694,8 @@ if (OldValue.Waiting) { /* Set the current Wait Block pointer */ - WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)( + OldValue.Value &~ EX_PUSH_LOCK_PTR_BITS); /* Nobody is the last waiter yet */ WaitBlock->Last = NULL; @@ -727,7 +733,7 @@ #endif /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Ptr != OldValue.Ptr) @@ -826,7 +832,7 @@ } /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -840,7 +846,7 @@ if (OldValue.MultipleShared) { /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop until we find the last wait block */ @@ -893,7 +899,7 @@ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -913,7 +919,7 @@ /* Write the new value */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; @@ -966,7 +972,7 @@ } /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -979,7 +985,7 @@ if (OldValue.MultipleShared) { /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)(OldValue.Value & ~EX_PUSH_LOCK_PTR_BITS); /* Loop until we find the last wait block */ @@ -1029,7 +1035,7 @@ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value == OldValue.Value) return; @@ -1049,7 +1055,7 @@ /* Write the new value */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; @@ -1103,7 +1109,7 @@ /* Write the New Value. Save our original value for waking */ WakeValue = NewValue; - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -1124,7 +1130,7 @@ ASSERT(NewValue.Waking && !NewValue.Waiting); /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr); @@ -1168,7 +1174,7 @@ NewValue.Waking = TRUE; /* Write the New Value */ - if (InterlockedCompareExchangePointer(PushLock, + if (InterlockedCompareExchangePointer(&PushLock->Ptr, NewValue.Ptr, OldValue.Ptr) == OldValue.Ptr) { Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -214,7 +214,7 @@ KeInitializeEvent(Event, SynchronizationEvent, FALSE); /* Set it */ - if (InterlockedCompareExchangePointer(&Resource->ExclusiveWaiters, + if (InterlockedCompareExchangePointer((PVOID*)&Resource->ExclusiveWaiters, Event, NULL)) { @@ -274,7 +274,7 @@ KeInitializeSemaphore(Semaphore, 0, MAXLONG); /* Set it */ - if (InterlockedCompareExchangePointer(&Resource->SharedWaiters, + if (InterlockedCompareExchangePointer((PVOID*)&Resource->SharedWaiters, Semaphore, NULL)) { Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=4506… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -235,6 +235,7 @@ SemaphoreInformation, SemaphoreInformationLength, ReturnLength, + NULL, PreviousMode); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1113,7 +1113,7 @@ for (Count = 0; HandleCount > 0 ; HandleCount--) { - Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; + Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG_PTR)pr->UniqueProcessId; Count++; i++; } @@ -2023,7 +2023,7 @@ { PAGED_CODE(); -#if defined(_M_IX86) +#if defined(_M_IX86) || defined(_M_AMD64) __wbinvd(); #elif defined(_M_PPC) __asm__ __volatile__("tlbsync"); Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -528,6 +528,7 @@ TimerInformation, TimerInformationLength, ReturnLength, + NULL, PreviousMode); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=450… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -147,7 +147,7 @@ TimeoutPointer); /* Check if we timed out and quit this loop in that case */ - if ((NTSTATUS)QueueEntry == STATUS_TIMEOUT) break; + if ((NTSTATUS)(ULONG_PTR)QueueEntry == STATUS_TIMEOUT) break; /* Increment Processed Work Items */ InterlockedIncrement((PLONG)&WorkQueue->WorkItemsProcessed); @@ -271,7 +271,7 @@ NULL, NULL, ExpWorkerThreadEntryPoint, - (PVOID)Context); + UlongToPtr(Context)); /* If the thread is dynamic */ if (Dynamic) Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1301,7 +1301,7 @@ PVOID NTAPI CmpAllocate( - IN ULONG Size, + IN SIZE_T Size, IN BOOLEAN Paged, IN ULONG Tag ); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -257,7 +257,7 @@ ); /* Finds a new thread to run */ -NTSTATUS +LONG_PTR FASTCALL KiSwapThread( IN PKTHREAD Thread, @@ -641,7 +641,7 @@ FASTCALL KiUnwaitThread( IN PKTHREAD Thread, - IN NTSTATUS WaitStatus, + IN LONG_PTR WaitStatus, IN KPRIORITY Increment ); Modified: trunk/reactos/ntoskrnl/include/internal/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/probe.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/probe.h [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -63,6 +63,7 @@ PVOID Buffer, ULONG BufferLength, PULONG ReturnLength, + PULONG_PTR ReturnLengthPtr, KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; @@ -99,6 +100,10 @@ { ProbeForWriteUlong(ReturnLength); } + if (ReturnLengthPtr != NULL) + { + ProbeForWrite(ReturnLengthPtr, sizeof(ULONG_PTR), sizeof(ULONG_PTR)); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -398,6 +398,7 @@ IoCompletionInformation, IoCompletionInformationLength, ResultLength, + NULL, PreviousMode); if (!NT_SUCCESS(Status)) return Status; @@ -497,11 +498,11 @@ ListEntry = KeRemoveQueue(Queue, PreviousMode, Timeout); /* If we got a timeout or user_apc back, return the status */ - if (((NTSTATUS)ListEntry == STATUS_TIMEOUT) || - ((NTSTATUS)ListEntry == STATUS_USER_APC)) + if (((NTSTATUS)(ULONG_PTR)ListEntry == STATUS_TIMEOUT) || + ((NTSTATUS)(ULONG_PTR)ListEntry == STATUS_USER_APC)) { /* Set this as the status */ - Status = (NTSTATUS)ListEntry; + Status = (NTSTATUS)(ULONG_PTR)ListEntry; } else { Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -2451,7 +2451,7 @@ /* Set the Data */ Context->Key = CompletionInfo->Key; Context->Port = Queue; - if (InterlockedCompareExchangePointer(&FileObject-> + if (InterlockedCompareExchangePointer((PVOID*)&FileObject-> CompletionContext, Context, NULL)) Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1214,7 +1214,7 @@ if (LastStackPtr->Control & SL_ERROR_RETURNED) { /* Get the error code */ - ErrorCode = (NTSTATUS)LastStackPtr->Parameters.Others.Argument4; + ErrorCode = PtrToUlong(LastStackPtr->Parameters.Others.Argument4); } /* Get the Current Stack and skip it */ @@ -1236,7 +1236,7 @@ /* Update the error for the current stack */ ErrorCode = Irp->IoStatus.Status; StackPtr->Control |= SL_ERROR_RETURNED; - LastStackPtr->Parameters.Others.Argument4 = (PVOID)ErrorCode; + LastStackPtr->Parameters.Others.Argument4 = UlongToPtr(ErrorCode); LastStackPtr->Control |= SL_ERROR_RETURNED; } } @@ -1610,7 +1610,7 @@ IoGetRequestorProcessId(IN PIRP Irp) { /* Return the requestor process' id */ - return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); + return PtrToUlong(IoGetRequestorProcess(Irp)->UniqueProcessId); } /* @@ -1782,5 +1782,5 @@ IoSetTopLevelIrp(IN PIRP Irp) { /* Set the IRP */ - PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; -} + PsGetCurrentThread()->TopLevelIrp = (ULONG_PTR)Irp; +} Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -54,7 +54,7 @@ #if DBG case ' soR': /* ROS-INTERNAL */ { - switch ((ULONG)Buffer1) + switch ((ULONG_PTR)Buffer1) { case ManualBugCheck: KeBugCheck(MANUALLY_INITIATED_CRASH); Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -45,7 +45,7 @@ if (BootPhase == 0) { Value = READ_PORT_UCHAR(BOCHS_LOGGER_PORT); - if (Value != (ULONG)BOCHS_LOGGER_PORT) + if (Value != (ULONG_PTR)BOCHS_LOGGER_PORT) { KdpDebugMode.Bochs = FALSE; return; Propchange: trunk/reactos/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 13 23:35:43 2010 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36013,36172,36332,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38099,38148-38151,38264-38265,38268,38355,39151,39160,39333,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -209,6 +209,7 @@ RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME)); StackPtr = (ULONG_PTR *) KernelStack; +#if _M_X86_ KdbTrapFrame->Tf.Ebp = StackPtr[3]; KdbTrapFrame->Tf.Edi = StackPtr[4]; KdbTrapFrame->Tf.Esi = StackPtr[5]; @@ -220,6 +221,7 @@ KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA; KdbTrapFrame->Tf.SegGs = KGDT_R0_DATA; +#endif /* FIXME: what about the other registers??? */ } @@ -421,7 +423,7 @@ } /* Get the interrupt descriptor */ - if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(ULONG_PTR)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) { /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/ return FALSE; @@ -1126,7 +1128,7 @@ /* Get a pointer to the thread */ if (!NT_SUCCESS(PsLookupThreadByThreadId(ThreadId, &Thread))) { - KdbpPrint("Invalid thread id: 0x%08x\n", (ULONG)ThreadId); + KdbpPrint("Invalid thread id: 0x%08x\n", (ULONG_PTR)ThreadId); return FALSE; } Process = Thread->ThreadsProcess; @@ -1208,7 +1210,7 @@ /* Get a pointer to the process */ if (!NT_SUCCESS(PsLookupProcessByProcessId(ProcessId, &Process))) { - KdbpPrint("Invalid process id: 0x%08x\n", (ULONG)ProcessId); + KdbpPrint("Invalid process id: 0x%08x\n", (ULONG_PTR)ProcessId); return FALSE; } @@ -1216,7 +1218,7 @@ ObDereferenceObject(Process); if (Entry == &KdbCurrentProcess->ThreadListHead) { - KdbpPrint("No threads in process 0x%08x, cannot attach to process!\n", (ULONG)ProcessId); + KdbpPrint("No threads in process 0x%p, cannot attach to process!\n", ProcessId); return FALSE; } @@ -1257,7 +1259,7 @@ SavedStackLimit = Thread->Tcb.StackLimit; SavedKernelStack = Thread->Tcb.KernelStack; Thread->Tcb.InitialStack = Thread->Tcb.StackBase = (char*)KdbStack + KDB_STACK_SIZE; - Thread->Tcb.StackLimit = (ULONG)KdbStack; + Thread->Tcb.StackLimit = (ULONG_PTR)KdbStack; Thread->Tcb.KernelStack = (char*)KdbStack + KDB_STACK_SIZE; /*KdbpPrint("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp);*/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -418,10 +418,10 @@ KdbpSymAddCachedFile(&LdrEntry->FullDllName, LdrEntry->PatchInformation); } - DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", + DPRINT("Installed symbols: %wZ@%p-%p %p\n", &LdrEntry->BaseDllName, LdrEntry->DllBase, - LdrEntry->SizeOfImage + (ULONG)LdrEntry->DllBase, + (PVOID)(LdrEntry->SizeOfImage + (ULONG_PTR)LdrEntry->DllBase), LdrEntry->PatchInformation); } Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -57,7 +57,7 @@ KWAIT_BLOCK, WaitListEntry); Thread = WaitBlock->Thread; - KiUnwaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); + KiUnwaitThread(Thread, (LONG_PTR)QueueEntry, IO_NO_INCREMENT); } } } @@ -102,7 +102,7 @@ Thread = WaitBlock->Thread; /* Remove the queue from the thread's wait list */ - Thread->WaitStatus = (NTSTATUS)Entry; + Thread->WaitStatus = (LONG_PTR)Entry; if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry); /* Increase the active threads and remove any wait reason */ @@ -239,7 +239,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL) { PLIST_ENTRY QueueEntry; - NTSTATUS Status; + LONG_PTR Status; PKTHREAD Thread = KeGetCurrentThread(); PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock = &Thread->WaitBlock[0]; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -1356,7 +1356,9 @@ SavedEntry = Entry; /* Now try to do the exchange */ - Entry = InterlockedCompareExchangePointer(ListHead, ThreadAddr, Entry); + Entry = InterlockedCompareExchangePointer((PVOID*)ListHead, + ThreadAddr, + Entry); /* Break out if the change was succesful */ } while (Entry != SavedEntry); Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -334,7 +334,7 @@ return Thread; } -NTSTATUS +LONG_PTR FASTCALL KiSwapThread(IN PKTHREAD CurrentThread, IN PKPRCB Prcb) Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=450… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -87,7 +87,7 @@ VOID FASTCALL KiUnwaitThread(IN PKTHREAD Thread, - IN NTSTATUS WaitStatus, + IN LONG_PTR WaitStatus, IN KPRIORITY Increment) { /* Unlink the thread */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -4311,6 +4311,7 @@ sizeof(ExSectionInfoClass) / sizeof(ExSectionInfoClass[0]), SectionInformation, SectionInformationLength, + NULL, ResultLength, PreviousMode); Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -631,7 +631,7 @@ if (!Impersonation) return STATUS_INSUFFICIENT_RESOURCES; /* Update the pointer */ - OldData = InterlockedCompareExchangePointer(&Thread-> + OldData = InterlockedCompareExchangePointer((PVOID*)&Thread-> ImpersonationInfo, Impersonation, NULL); Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -138,7 +138,7 @@ if (NT_SUCCESS(Status)) { /* Set it */ - if (InterlockedCompareExchangePointer(&Process-> + if (InterlockedCompareExchangePointer((PVOID*)&Process-> SeAuditProcessCreationInfo.ImageFileName, AuditName, NULL)) Modified: trunk/reactos/ntoskrnl/se/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/lsa.c?rev=4506… ============================================================================== --- trunk/reactos/ntoskrnl/se/lsa.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/lsa.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -49,7 +49,7 @@ NTAPI LsaFreeReturnBuffer(PVOID Buffer) { - ULONG Size = 0; + SIZE_T Size = 0; return ZwFreeVirtualMemory(NtCurrentProcess(), &Buffer, &Size, Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Jan 13 23:35:43 2010 @@ -870,6 +870,7 @@ TokenInformation, TokenInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status))

1 0

[sir_richard] 45065: [NTOS]: Fix bug in illegal instruction trap handling. Patch by Timo Kreuzer <physicus@reactos.org>.
by sir_richard＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: sir_richard Date: Wed Jan 13 23:06:48 2010 New Revision: 45065 URL: http://svn.reactos.org/svn/reactos?rev=45065&view=rev Log: [NTOS]: Fix bug in illegal instruction trap handling. Patch by Timo Kreuzer <physicus(a)reactos.org>. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Jan 13 23:06:48 2010 @@ -1084,19 +1084,23 @@ /* Skip prefix instructions */ for (j = 0; j < sizeof(KiTrapPrefixTable); j++) { - /* Is this NOT a prefix instruction? */ - if (Instructions[i] != KiTrapPrefixTable[j]) + /* Is this a prefix instruction? */ + if (Instructions[i] == KiTrapPrefixTable[j]) { - /* We can go ahead and handle the fault now */ - Instruction = Instructions[i]; + /* Stop looking */ break; } } - /* Do we need to keep looking? */ - if (Instruction) break; + /* Is this NOT any prefix instruction? */ + if (Instructions[i] != KiTrapPrefixTable[j]) + { + /* We can go ahead and handle the fault now */ + Instruction = Instructions[i]; + break; + } } - + /* If all we found was prefixes, then this instruction is too long */ if (!Instruction) {

1 0

[sir_richard] 45064: Perf improvements: [NTOS]: Optimize trap entry/exit by manually copying registers to the trap frame the correct way from the first time. Avoids conversion between PUSHA and KTRAP_FRAMEs and makes trap frames compatible the whole time (other than being slightly faster). [NTOS]: Provide compiler with hints on likely code paths during trap entry and exit, which makes the code more linear and improves performance. The following assumptions (known to be true) are made: (1) Interr
by sir_richard＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: sir_richard Date: Wed Jan 13 23:01:20 2010 New Revision: 45064 URL: http://svn.reactos.org/svn/reactos?rev=45064&view=rev Log: Perf improvements: [NTOS]: Optimize trap entry/exit by manually copying registers to the trap frame the correct way from the first time. Avoids conversion between PUSHA and KTRAP_FRAMEs and makes trap frames compatible the whole time (other than being slightly faster). [NTOS]: Provide compiler with hints on likely code paths during trap entry and exit, which makes the code more linear and improves performance. The following assumptions (known to be true) are made: (1) Interrupts happen more often than system calls (per unit of time), so prioritize paths we take during interrupts. (2) The CPU spends most of its time in Ring 3, so prioritize traps from user-mode. (3) V8086 mode, debugging, 16-bit stacks, are uncommon, so de-prioritize them. [NTOS]: Use KTRAP_FRAME offset names recommended by Timo instead of substraction which was confusing some people (still seems clearer to me). Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Jan 13 23:01:20 2010 @@ -237,9 +237,17 @@ push 0 .endif - /* Save all register state before we touch it */ - pushad - + /* Make space for trap frame and save registers before we enter C code */ + sub esp, KTRAP_FRAME_ERROR_CODE + mov [esp+KTRAP_FRAME_EAX], eax + mov [esp+KTRAP_FRAME_EBX], ebx + mov [esp+KTRAP_FRAME_ECX], ecx + mov [esp+KTRAP_FRAME_EDX], edx + mov [esp+KTRAP_FRAME_ESI], esi + mov [esp+KTRAP_FRAME_EDI], edi + mov [esp+KTRAP_FRAME_EBP], ebp + mov ecx, esp + /* * The GPF and Invalid Opcode handlers are performance critical when talking * about V8086 traps, because they control the main flow of execution during @@ -270,14 +278,9 @@ * up DS/ES and lets us go on our merry way... */ .if \FastV86 - /* ESP+12 is EFLAGS on interrupt frame, add 8*4 for the PUSHAD frame */ - mov edx, [esp+12+8*4] + mov edx, [esp+KTRAP_FRAME_EFLAGS] .endif - - /* Now make space for the trap frame and store the pointer as first arg */ - sub esp, KTRAP_FRAME_LENGTH - KTRAP_FRAME_PREVIOUS_MODE - mov ecx, esp - + /* Normally we just have one parameter, but fast V86 handlers need two */ .if \FastV86 jmp @&Name&Handler@8 Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Wed Jan 13 23:01:20 2010 @@ -139,44 +139,6 @@ VOID FORCEINLINE -KiTrapFrameFromPushaStack(IN PKTRAP_FRAME TrapFrame) -{ - /* - * This sequence is Bavarian Alchemist Black Magic - * - * *** DO NOT MODIFY *** - */ - TrapFrame->Edx = TrapFrame->Esi; - TrapFrame->Esi = TrapFrame->PreviousPreviousMode; - TrapFrame->Ecx = TrapFrame->Ebx; - TrapFrame->Ebx = TrapFrame->Edi; - TrapFrame->Edi = TrapFrame->Eax; - TrapFrame->Eax = TrapFrame->Ebp; - TrapFrame->Ebp = (ULONG)TrapFrame->ExceptionList; - TrapFrame->TempEsp = TrapFrame->SegFs; -} - -VOID -FORCEINLINE -KiPushaStackFromTrapFrame(IN PKTRAP_FRAME TrapFrame) -{ - /* - * This sequence is Bavarian Alchemist Black Magic - * - * *** DO NOT MODIFY *** - */ - TrapFrame->SegFs = TrapFrame->TempEsp; - TrapFrame->ExceptionList = (PVOID)TrapFrame->Ebp; - TrapFrame->Ebp = TrapFrame->Eax; - TrapFrame->Eax = TrapFrame->Edi; - TrapFrame->Edi = TrapFrame->Ebx; - TrapFrame->Ebx = TrapFrame->Ecx; - TrapFrame->PreviousPreviousMode = TrapFrame->Esi; - TrapFrame->Esi = TrapFrame->Edx; -} - -VOID -FORCEINLINE KiCheckForApcDelivery(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -247,19 +209,29 @@ VOID KiTrapReturn(IN PKTRAP_FRAME TrapFrame) { - /* Restore registers */ - KiPushaStackFromTrapFrame(TrapFrame); - /* Regular interrupt exit */ __asm__ __volatile__ ( "movl %0, %%esp\n" - "addl %1, %%esp\n" - "popa\n" - "addl $4, %%esp\n" + "movl %c[a](%%esp), %%eax\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[c](%%esp), %%ecx\n" + "movl %c[d](%%esp), %%edx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "addl $%c[e],%%esp\n" "iret\n" : - : "r"(TrapFrame), "i"(KTRAP_FRAME_LENGTH - KTRAP_FRAME_PREVIOUS_MODE) + : "r"(TrapFrame), + [a] "i"(KTRAP_FRAME_EAX), + [b] "i"(KTRAP_FRAME_EBX), + [c] "i"(KTRAP_FRAME_ECX), + [d] "i"(KTRAP_FRAME_EDX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); } Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Jan 13 23:01:20 2010 @@ -56,14 +56,11 @@ KTRAP_EXIT_SKIP_BITS SkipBits = { .Bits = Skip }; KiExitTrapDebugChecks(TrapFrame, SkipBits); - /* If you skip volatile reload, you must skip segment reload */ - ASSERT((SkipBits.SkipVolatiles == FALSE) || (SkipBits.SkipSegments == TRUE)); - /* Restore the SEH handler chain */ KeGetPcr()->Tib.ExceptionList = TrapFrame->ExceptionList; /* Check if the previous mode must be restored */ - if (!SkipBits.SkipPreviousMode) + if (__builtin_expect(!SkipBits.SkipPreviousMode, 0)) /* More INTS than SYSCALLs */ { /* Not handled yet */ UNIMPLEMENTED; @@ -71,7 +68,7 @@ } /* Check if there are active debug registers */ - if (TrapFrame->Dr7 & ~DR7_RESERVED_MASK) + if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) { /* Not handled yet */ UNIMPLEMENTED; @@ -79,10 +76,10 @@ } /* Check if this was a V8086 trap */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturn(TrapFrame); + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) KiTrapReturn(TrapFrame); /* Check if the trap frame was edited */ - if (!(TrapFrame->SegCs & FRAME_EDITED)) + if (__builtin_expect(!(TrapFrame->SegCs & FRAME_EDITED), 0)) { /* Not handled yet */ UNIMPLEMENTED; @@ -90,7 +87,7 @@ } /* Check if this is a user trap */ - if (KiUserTrap(TrapFrame)) + if (__builtin_expect(KiUserTrap(TrapFrame), 1)) /* Ring 3 is where we spend time */ { /* Check if segments should be restored */ if (!SkipBits.SkipSegments) @@ -105,37 +102,30 @@ /* Always restore FS since it goes from KPCR to TEB */ Ke386SetFs(TrapFrame->SegFs); } - - /* Check if the caller wants to skip volatiles */ - if (SkipBits.SkipVolatiles) - { + + /* Check for ABIOS code segment */ + if (__builtin_expect(TrapFrame->SegCs == 0x80, 0)) + { + /* Not handled yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check for system call -- a system call skips volatiles! */ + if (__builtin_expect(SkipBits.SkipVolatiles, 0)) /* More INTs than SYSCALLs */ + { + /* Not handled yet */ /* * When we do the system call handler through this path, we need * to have some sort to restore the kernel EAX instead of pushing * back the user EAX. We'll figure it out... */ - DPRINT1("Warning: caller doesn't want volatiles restored\n"); - } - - /* Check for ABIOS code segment */ - if (TrapFrame->SegCs == 0x80) - { - /* Not handled yet */ - UNIMPLEMENTED; - while (TRUE); - } - - /* Check for system call -- a system call skips volatiles! */ - if (SkipBits.SkipVolatiles) - { - /* Not handled yet */ - UNIMPLEMENTED; - while (TRUE); + DPRINT1("Warning: caller doesn't want volatiles restored\n"); } else { /* Return from interrupt */ - KiTrapReturn(TrapFrame); + KiTrapReturn(TrapFrame); } } @@ -154,7 +144,7 @@ Thread->Alerted[KernelMode] = FALSE; /* Are there pending user APCs? */ - if (!Thread->ApcState.UserApcPending) break; + if (__builtin_expect(!Thread->ApcState.UserApcPending, 1)) break; /* Raise to APC level and enable interrupts */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -168,11 +158,11 @@ _disable(); /* Return if this isn't V86 mode anymore */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) return; + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) return; } /* If we got here, we're still in a valid V8086 context, so quit it */ - if (TrapFrame->Dr7 & ~DR7_RESERVED_MASK) + if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) { /* Not handled yet */ UNIMPLEMENTED; @@ -207,10 +197,7 @@ Ke386SetFs(KGDT_R0_PCR); Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - - /* Save registers */ - KiTrapFrameFromPushaStack(TrapFrame); - + /* Save exception list and bogus previous mode */ TrapFrame->PreviousPreviousMode = -1; TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; @@ -220,7 +207,7 @@ /* Save DR7 and check for debugging */ TrapFrame->Dr7 = __readdr(7); - if (TrapFrame->Dr7 & ~DR7_RESERVED_MASK) + if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) { UNIMPLEMENTED; while (TRUE); @@ -231,21 +218,18 @@ FASTCALL KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - /* Save registers */ - KiTrapFrameFromPushaStack(TrapFrame); - /* Set bogus previous mode */ TrapFrame->PreviousPreviousMode = -1; /* Check for V86 mode */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) { UNIMPLEMENTED; while (TRUE); } /* Check if this wasn't kernel code */ - if (TrapFrame->SegCs != KGDT_R0_CODE) + if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ { /* Save segments and then switch to correct ones */ TrapFrame->SegFs = Ke386GetFs(); @@ -269,7 +253,7 @@ /* Flush DR7 and check for debugging */ TrapFrame->Dr7 = 0; - if (KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF) + if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) { UNIMPLEMENTED; while (TRUE); @@ -307,22 +291,19 @@ TrapFrame->SegGs = Ke386GetGs(); Ke386SetFs(KGDT_R0_PCR); - /* Save registers */ - KiTrapFrameFromPushaStack(TrapFrame); - /* Save exception list and bogus previous mode */ TrapFrame->PreviousPreviousMode = -1; TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; /* Check for 16-bit stack */ - if ((ULONG_PTR)TrapFrame < 0x10000) + if (__builtin_expect((ULONG_PTR)TrapFrame < 0x10000, 0)) { UNIMPLEMENTED; while (TRUE); } /* Check for V86 mode */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) { /* Restore V8086 segments into Protected Mode segments */ TrapFrame->SegFs = TrapFrame->V86Fs; @@ -336,7 +317,7 @@ /* Flush DR7 and check for debugging */ TrapFrame->Dr7 = 0; - if (KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF) + if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) { UNIMPLEMENTED; while (TRUE); @@ -1041,13 +1022,13 @@ KIRQL OldIrql; /* Check for V86 GPF */ - if (EFlags & EFLAGS_V86_MASK) + if (__builtin_expect(EFlags & EFLAGS_V86_MASK, 1)) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); /* Must be a VDM process */ - if (!PsGetCurrentProcess()->VdmObjects) + if (__builtin_expect(!PsGetCurrentProcess()->VdmObjects, 0)) { /* Enable interrupts */ _enable(); @@ -1063,7 +1044,7 @@ _enable(); /* Handle the V86 opcode */ - if (Ki386HandleOpcodeV86(TrapFrame) == 0xFF) + if (__builtin_expect(Ki386HandleOpcodeV86(TrapFrame) == 0xFF, 0)) { /* Should only happen in VDM mode */ UNIMPLEMENTED; @@ -1075,7 +1056,7 @@ _disable(); /* Do a quick V86 exit if possible */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiExitV86Trap(TrapFrame); + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 1)) KiExitV86Trap(TrapFrame); /* Exit trap the slow way */ KiEoiHelper(TrapFrame);

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