Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[janderwald] 23128: * unlink menu object from window object on destroy
by janderwald＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: janderwald Date: Mon Jul 17 23:16:30 2006 New Revision: 23128 URL: http://svn.reactos.org/svn/reactos?rev=23128&view=rev Log: * unlink menu object from window object on destroy Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Mon Jul 17 23:16:30 2006 @@ -277,6 +277,7 @@ { if(Menu) { + PWINDOW_OBJECT Window; PWINSTATION_OBJECT WindowStation; NTSTATUS Status; @@ -296,6 +297,15 @@ NULL); if(NT_SUCCESS(Status)) { + if (Menu->MenuInfo.Wnd) + { + Window = UserGetWindowObject(Menu->MenuInfo.Wnd); + if (Window) + { + Window->IDMenu = 0;; + } + + } ObmDeleteObject(Menu->MenuInfo.Self, otMenu); ObDereferenceObject(WindowStation); return TRUE;

1 0

[ion] 23127: [FORMATTING] - Cleanup win32.c [AUDIT] - Only function of interest is PsConverToGuiThread, heavily documented at: http://www.windowsitlibrary.com/Content/356/07/1.html http://www.osronline.com/lists_archive/ntdev/thread4614.html http://www.i.u-tokyo.ac.jp/edu/training/ss/lecture/new-documents/Lectures/17-Win32K/Win32K.ppt
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 21:32:58 2006 New Revision: 23127 URL: http://svn.reactos.org/svn/reactos?rev=23127&view=rev Log: [FORMATTING] - Cleanup win32.c [AUDIT] - Only function of interest is PsConverToGuiThread, heavily documented at: http://www.windowsitlibrary.com/Content/356/07/1.html http://www.osronline.com/lists_archive/ntdev/thread4614.html http://www.i.u-tokyo.ac.jp/edu/training/ss/lecture/new-documents/Lectures/1… Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ps/win32.c (contents, props changed) 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 (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Jul 17 21:32:58 2006 @@ -310,6 +310,13 @@ IN OUT PKTHREAD Thread ); +PVOID +NTAPI +KeSwitchKernelStack( + IN PVOID StackBase, + IN PVOID StackLimit +); + VOID STDCALL KeRundownThread(VOID); Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Mon Jul 17 21:32:58 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ps/win32.c - * PURPOSE: win32k support - * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) + * PURPOSE: Process Manager: Win32K Initialization and Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ****************************************************************/ @@ -22,43 +20,7 @@ extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; -#ifndef ALEX_CB_REWRITE -typedef struct _NTW32CALL_SAVED_STATE -{ - ULONG_PTR SavedStackLimit; - PVOID SavedStackBase; - PVOID SavedInitialStack; - PVOID CallerResult; - PULONG CallerResultLength; - PNTSTATUS CallbackStatus; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; -} NTW32CALL_SAVED_STATE, *PNTW32CALL_SAVED_STATE; -#endif - -PVOID -STDCALL -KeSwitchKernelStack( - IN PVOID StackBase, - IN PVOID StackLimit -); - -/* FUNCTIONS ***************************************************************/ - -/* - * @implemented - */ -VOID -STDCALL -PsEstablishWin32Callouts(PWIN32_CALLOUTS_FPNS CalloutData) -{ - PspW32ProcessCallout = CalloutData->ProcessCallout; - PspW32ThreadCallout = CalloutData->ThreadCallout; - ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; - ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; - ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; -} +/* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS NTAPI @@ -134,6 +96,23 @@ return Status; } +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +PsEstablishWin32Callouts(IN PWIN32_CALLOUTS_FPNS CalloutData) +{ + /* Setup the callback pointers */ + PspW32ProcessCallout = CalloutData->ProcessCallout; + PspW32ThreadCallout = CalloutData->ThreadCallout; + ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; + ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; + ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; +} + NTSTATUS STDCALL NtW32Call(IN ULONG RoutineIndex, @@ -145,24 +124,23 @@ PVOID RetResult; ULONG RetResultLength; NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("NtW32Call(RoutineIndex %d, Argument %p, ArgumentLength %d)\n", - RoutineIndex, Argument, ArgumentLength); - - /* must not be called as KernelMode! */ ASSERT(KeGetPreviousMode() != KernelMode); + /* Enter SEH for probing */ _SEH_TRY { + /* Probe arguments */ ProbeForWritePointer(Result); ProbeForWriteUlong(ResultLength); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Make sure we got success */ if (NT_SUCCESS(Status)) { /* Call kernel function */ @@ -171,16 +149,18 @@ ArgumentLength, &RetResult, &RetResultLength); - if (NT_SUCCESS(Status)) { + /* Enter SEH for write back */ _SEH_TRY { + /* Return results to user mode */ *Result = RetResult; *ResultLength = RetResultLength; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; Propchange: trunk/reactos/ntoskrnl/ps/win32.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23126: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time.
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 20:27:13 2006 New Revision: 23126 URL: http://svn.reactos.org/svn/reactos?rev=23126&view=rev Log: more code, from alex patch I got over one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Jul 17 20:27:13 2006 @@ -776,9 +776,72 @@ } +/* + * @implemented + * + * GDIEntry 5 + */ +BOOL +WINAPI +DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + BOOL Return = FALSE; + + /* Make sure there is one */ + if (pSurfaceLocal->hDDSurface) + { + /* Delete it */ + Return = NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); + pSurfaceLocal->hDDSurface = 0; + } + + return Return; +} + +/* + * @implemented + * + * GDIEntry 6 + */ +BOOL +WINAPI +DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd) +{ + /* Call win32k directly */ + return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); +} + +/* + * @implemented + * + * GDIEntry 7 + */ +HDC +WINAPI +DdGetDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + LPPALETTEENTRY pColorTable) +{ + /* Call win32k directly */ + return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); +} + +/* + * @implemented + * + * GDIEntry 8 + */ +BOOL +WINAPI +DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + /* Call win32k directly */ + return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); +} /* * @unimplemented + * GDIEntry 9 */ HBITMAP STDCALL @@ -796,63 +859,6 @@ /* * @implemented * - * GDIEntry 5 - */ -BOOL -STDCALL -DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) -{ - if (!pSurfaceLocal->hDDSurface) - { - return FALSE; - } - - return NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); -} - -/* - * @implemented - * - * GDIEntry 6 - */ -BOOL -STDCALL -DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, - HWND hWnd) -{ - return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); -} - -/* - * @implemented - * - * GDIEntry 7 - */ -HDC STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -) -{ - return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); -} - -/* - * @implemented - * - * GDIEntry 8 - */ -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -) -{ - return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); -} - - - -/* - * @implemented - * * GDIEntry 10 */ BOOL @@ -865,6 +871,7 @@ pbNewMode); } + /* * @implemented * @@ -903,12 +910,14 @@ * * GDIEntry 12 */ -VOID -STDCALL +VOID +STDCALL DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached) { - NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE) pSurfaceAttached->hDDSurface); + /* Call win32k */ + NtGdiDdUnattachSurface((HANDLE)pSurface->hDDSurface, + (HANDLE)pSurfaceAttached->hDDSurface); } /* @@ -965,20 +974,21 @@ hdc, lpGammaRamp); } - /* * @implemented * * GDIEntry 16 */ -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -) -{ - return TRUE; -} - - - +DWORD +WINAPI +DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2) +{ + /* Always returns success */ + return TRUE; +} + + + +

1 0

[ion] 23125: - Export Ps(S)GetContextThread
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 18:31:15 2006 New Revision: 23125 URL: http://svn.reactos.org/svn/reactos?rev=23125&view=rev Log: - Export Ps(S)GetContextThread Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Jul 17 18:31:15 2006 @@ -894,6 +894,7 @@ PsDereferencePrimaryToken@4 PsDisableImpersonation@8 PsEstablishWin32Callouts@4 +PsGetContextThread@12 PsGetCurrentProcess@0=KeGetCurrentProcess@0 PsGetCurrentProcessId@0 PsGetCurrentProcessSessionId@0 @@ -953,6 +954,7 @@ PsReturnProcessPagedPoolQuota@8 PsRevertToSelf@0 PsRevertThreadToSelf@4 +PsSetContextThread@12 PsSetCreateProcessNotifyRoutine@8 PsSetCreateThreadNotifyRoutine@4 PsSetJobUIRestrictionsClass@8

1 0

[ion] 23124: - Factor out NtSet/GetContextThread implementation into PsGet/SetContexThread, new exported kernel APIs available to drivers, and export them. - If the caller didn't request extended registers, don't probe the full CONTEXT structure. - Use the proper trap frame in the kernel APC responsible for the context read/write. - Always go through the APC instead of directly calling the Ke routine. - Cleanup the code. [AUDIT] - Mark file as clean. The NT APIs are stubs around the Ps APIs whic
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 18:30:53 2006 New Revision: 23124 URL: http://svn.reactos.org/svn/reactos?rev=23124&view=rev Log: - Factor out NtSet/GetContextThread implementation into PsGet/SetContexThread, new exported kernel APIs available to drivers, and export them. - If the caller didn't request extended registers, don't probe the full CONTEXT structure. - Use the proper trap frame in the kernel APC responsible for the context read/write. - Always go through the APC instead of directly calling the Ke routine. - Cleanup the code. [AUDIT] - Mark file as clean. The NT APIs are stubs around the Ps APIs which simply setup an APC and stack context to an APC function that is again, merely a wrapper around the Ke function (which is not in this file). Modified: trunk/reactos/ntoskrnl/ps/debug.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Mon Jul 17 18:30:53 2006 @@ -1,13 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ps/debug.c - * PURPOSE: Thread managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Phillip Susi + * PURPOSE: Process Manager: Debugging Support (Set/Get Context) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ - /* INCLUDES ****************************************************************/ @@ -18,291 +16,15 @@ /* GLOBALS *****************************************************************/ /* Thread "Set/Get Context" Context Structure */ -typedef struct _GET_SET_CTX_CONTEXT { +typedef struct _GET_SET_CTX_CONTEXT +{ KAPC Apc; KEVENT Event; + KPROCESSOR_MODE Mode; CONTEXT Context; - KPROCESSOR_MODE Mode; - NTSTATUS Status; } GET_SET_CTX_CONTEXT, *PGET_SET_CTX_CONTEXT; - -/* FUNCTIONS ***************************************************************/ - -/* - * FUNCTION: This routine is called by an APC sent by NtGetContextThread to - * copy the context of a thread into a buffer. - */ -VOID -STDCALL -PspGetOrSetContextKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) -{ - PGET_SET_CTX_CONTEXT GetSetContext; - PKEVENT Event; - PCONTEXT Context; - KPROCESSOR_MODE Mode; - PKTRAP_FRAME TrapFrame; - - TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - - sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); - - /* Get the Context Structure */ - GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); - Context = &GetSetContext->Context; - Event = &GetSetContext->Event; - Mode = GetSetContext->Mode; - - if (TrapFrame->SegCs == KGDT_R0_CODE && Mode != KernelMode) - { - GetSetContext->Status = STATUS_ACCESS_DENIED; - } - else - { - /* Check if it's a set or get */ - if (*SystemArgument1) { - /* Get the Context */ - KeTrapFrameToContext(TrapFrame, NULL, Context); - } else { - /* Set the Context */ - KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); - } - GetSetContext->Status = STATUS_SUCCESS; - } - - /* Notify the Native API that we are done */ - KeSetEvent(Event, IO_NO_INCREMENT, FALSE); -} - -NTSTATUS -STDCALL -NtGetContextThread(IN HANDLE ThreadHandle, - IN OUT PCONTEXT ThreadContext) -{ - PETHREAD Thread; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - GET_SET_CTX_CONTEXT GetSetContext; - NTSTATUS Status = STATUS_SUCCESS; - PCONTEXT SafeThreadContext = NULL; - - PAGED_CODE(); - - /* Check the buffer to be OK */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWrite(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - GetSetContext.Context = *ThreadContext; - SafeThreadContext = &GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } else { - SafeThreadContext = ThreadContext; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_GET_CONTEXT, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check success */ - if(NT_SUCCESS(Status)) { - - /* Check if we're running in the same thread */ - if(Thread == PsGetCurrentThread()) { - /* - * I don't know if trying to get your own context makes much - * sense but we can handle it more efficently. - */ - KeTrapFrameToContext(Thread->Tcb.TrapFrame, NULL, SafeThreadContext); - - } else { - - /* Copy context into GetSetContext if not already done */ - if(PreviousMode == KernelMode) { - GetSetContext.Context = *ThreadContext; - SafeThreadContext = &GetSetContext.Context; - } - - /* Use an APC... Initialize the Event */ - KeInitializeEvent(&GetSetContext.Event, - NotificationEvent, - FALSE); - - /* Set the previous mode */ - GetSetContext.Mode = PreviousMode; - - /* Initialize the APC */ - KeInitializeApc(&GetSetContext.Apc, - &Thread->Tcb, - OriginalApcEnvironment, - PspGetOrSetContextKernelRoutine, - NULL, - NULL, - KernelMode, - NULL); - - /* Queue it as a Get APC */ - if (!KeInsertQueueApc(&GetSetContext.Apc, - (PVOID)1, - NULL, - IO_NO_INCREMENT)) { - - Status = STATUS_THREAD_IS_TERMINATING; - - } else { - - /* Wait for the APC to complete */ - Status = KeWaitForSingleObject(&GetSetContext.Event, - 0, - KernelMode, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - Status = GetSetContext.Status; - } - } - - /* Dereference the thread */ - ObDereferenceObject(Thread); - - /* Check for success and return the Context */ - if(NT_SUCCESS(Status) && SafeThreadContext != ThreadContext) { - _SEH_TRY { - - *ThreadContext = GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - } - - /* Return status */ - return Status; -} - -NTSTATUS -STDCALL -NtSetContextThread(IN HANDLE ThreadHandle, - IN PCONTEXT ThreadContext) -{ - PETHREAD Thread; - GET_SET_CTX_CONTEXT GetSetContext; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - /* Check the buffer to be OK */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForRead(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - - GetSetContext.Context = *ThreadContext; - ThreadContext = &GetSetContext.Context; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Get the Thread Object */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_CONTEXT, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - - /* Check success */ - if(NT_SUCCESS(Status)) { - - /* Check if we're running in the same thread */ - if(Thread == PsGetCurrentThread()) { - - /* - * I don't know if trying to set your own context makes much - * sense but we can handle it more efficently. - */ - KeContextToTrapFrame(ThreadContext, NULL, Thread->Tcb.TrapFrame, ThreadContext->ContextFlags, PreviousMode); - - } else { - - /* Copy context into GetSetContext if not already done */ - if(PreviousMode == KernelMode) - GetSetContext.Context = *ThreadContext; - - /* Use an APC... Initialize the Event */ - KeInitializeEvent(&GetSetContext.Event, - NotificationEvent, - FALSE); - - /* Set the previous mode */ - GetSetContext.Mode = PreviousMode; - - /* Initialize the APC */ - KeInitializeApc(&GetSetContext.Apc, - &Thread->Tcb, - OriginalApcEnvironment, - PspGetOrSetContextKernelRoutine, - NULL, - NULL, - KernelMode, - NULL); - - /* Queue it as a Get APC */ - if (!KeInsertQueueApc(&GetSetContext.Apc, - (PVOID)0, - NULL, - IO_NO_INCREMENT)) { - - Status = STATUS_THREAD_IS_TERMINATING; - - } else { - - /* Wait for the APC to complete */ - Status = KeWaitForSingleObject(&GetSetContext.Event, - 0, - KernelMode, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - Status = GetSetContext.Status; - } - } - - /* Dereference the thread */ - ObDereferenceObject(Thread); - } - - /* Return status */ - return Status; -} +/* PRIVATE FUNCTIONS *********************************************************/ #ifdef DBG VOID @@ -379,4 +101,349 @@ } #endif +VOID +NTAPI +PspGetOrSetContextKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArgument2) +{ + PGET_SET_CTX_CONTEXT GetSetContext; + PKEVENT Event; + PCONTEXT Context; + PKTHREAD Thread; + KPROCESSOR_MODE Mode; + PKTRAP_FRAME TrapFrame; + PAGED_CODE(); + + /* Get the Context Structure */ + GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); + Context = &GetSetContext->Context; + Event = &GetSetContext->Event; + Mode = GetSetContext->Mode; + Thread = Apc->SystemArgument2; + + /* Get the trap frame */ + TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - + sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); + + /* Sanity check */ + ASSERT(((TrapFrame->SegCs & MODE_MASK) != KernelMode) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)); + + /* Check if it's a set or get */ + if (SystemArgument1) + { + /* Get the Context */ + KeTrapFrameToContext(TrapFrame, NULL, Context); + } + else + { + /* Set the Context */ + KeContextToTrapFrame(Context, + NULL, + TrapFrame, + Context->ContextFlags, + Mode); + } + + /* Notify the Native API that we are done */ + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsGetContextThread(IN PETHREAD Thread, + IN OUT PCONTEXT ThreadContext, + IN KPROCESSOR_MODE PreviousMode) +{ + GET_SET_CTX_CONTEXT GetSetContext; + ULONG Size = 0, Flags = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Enter SEH */ + _SEH_TRY + { + /* Set default ength */ + Size = sizeof(CONTEXT); + + /* Read the flags */ + ProbeForReadUlong(&ThreadContext->ContextFlags); + Flags = ThreadContext->ContextFlags; + + /* Check if the caller wanted extended registers */ + if ((Flags & CONTEXT_EXTENDED_REGISTERS) != + CONTEXT_EXTENDED_REGISTERS) + { + /* Cut them out of the size */ + Size = FIELD_OFFSET(CONTEXT, ExtendedRegisters); + } + + /* Check if we came from user mode */ + if (PreviousMode != KernelMode) + { + /* Probe the context */ + ProbeForWrite(ThreadContext, Size, sizeof(ULONG)); + } + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Check if we got success */ + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the wait event */ + KeInitializeEvent(&GetSetContext.Event, NotificationEvent, FALSE); + + /* Set the flags and previous mode */ + GetSetContext.Context.ContextFlags = Flags; + GetSetContext.Mode = PreviousMode; + + /* Check if we're running in the same thread */ + if (Thread == PsGetCurrentThread()) + { + /* Setup APC parameters manually */ + GetSetContext.Apc.SystemArgument1 = NULL; + GetSetContext.Apc.SystemArgument2 = Thread; + + /* Enter a guarded region to simulate APC_LEVEL */ + KeEnterGuardedRegion(); + + /* Manually call the APC */ + PspGetOrSetContextKernelRoutine(&GetSetContext.Apc, + NULL, + NULL, + &GetSetContext.Apc.SystemArgument1, + &GetSetContext.Apc.SystemArgument2); + + /* Leave the guarded region */ + KeLeaveGuardedRegion(); + } + else + { + /* Initialize the APC */ + KeInitializeApc(&GetSetContext.Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PspGetOrSetContextKernelRoutine, + NULL, + NULL, + KernelMode, + NULL); + + /* Queue it as a Get APC */ + if (!KeInsertQueueApc(&GetSetContext.Apc, NULL, Thread, 2)) + { + /* It was already queued, so fail */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Wait for the APC to complete */ + Status = KeWaitForSingleObject(&GetSetContext.Event, + 0, + KernelMode, + FALSE, + NULL); + } + + /* Copy the context */ + RtlMoveMemory(ThreadContext, &GetSetContext.Context, Size); + } + + /* Return status */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsSetContextThread(IN PETHREAD Thread, + IN OUT PCONTEXT ThreadContext, + IN KPROCESSOR_MODE PreviousMode) +{ + GET_SET_CTX_CONTEXT GetSetContext; + ULONG Size = 0, Flags = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Enter SEH */ + _SEH_TRY + { + /* Set default length */ + Size = sizeof(CONTEXT); + + /* Read the flags */ + ProbeForReadUlong(&ThreadContext->ContextFlags); + Flags = ThreadContext->ContextFlags; + + /* Check if the caller wanted extended registers */ + if ((Flags & CONTEXT_EXTENDED_REGISTERS) != + CONTEXT_EXTENDED_REGISTERS) + { + /* Cut them out of the size */ + Size = FIELD_OFFSET(CONTEXT, ExtendedRegisters); + } + + /* Check if we came from user mode */ + if (PreviousMode != KernelMode) + { + /* Probe the context */ + ProbeForRead(ThreadContext, Size, sizeof(ULONG)); + } + + /* Copy the context */ + RtlMoveMemory(&GetSetContext.Context, ThreadContext, Size); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Check if we got success */ + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the wait event */ + KeInitializeEvent(&GetSetContext.Event, NotificationEvent, FALSE); + + /* Set the flags and previous mode */ + GetSetContext.Context.ContextFlags = Flags; + GetSetContext.Mode = PreviousMode; + + /* Check if we're running in the same thread */ + if (Thread == PsGetCurrentThread()) + { + /* Setup APC parameters manually */ + GetSetContext.Apc.SystemArgument1 = UlongToPtr(1); + GetSetContext.Apc.SystemArgument2 = Thread; + + /* Enter a guarded region to simulate APC_LEVEL */ + KeEnterGuardedRegion(); + + /* Manually call the APC */ + PspGetOrSetContextKernelRoutine(&GetSetContext.Apc, + NULL, + NULL, + &GetSetContext.Apc.SystemArgument1, + &GetSetContext.Apc.SystemArgument2); + + /* Leave the guarded region */ + KeLeaveGuardedRegion(); + } + else + { + /* Initialize the APC */ + KeInitializeApc(&GetSetContext.Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PspGetOrSetContextKernelRoutine, + NULL, + NULL, + KernelMode, + NULL); + + /* Queue it as a Get APC */ + if (!KeInsertQueueApc(&GetSetContext.Apc, UlongToPtr(1), Thread, 2)) + { + /* It was already queued, so fail */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Wait for the APC to complete */ + Status = KeWaitForSingleObject(&GetSetContext.Event, + 0, + KernelMode, + FALSE, + NULL); + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtGetContextThread(IN HANDLE ThreadHandle, + IN OUT PCONTEXT ThreadContext) +{ + PETHREAD Thread; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Get the Thread Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_GET_CONTEXT, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + + /* Make sure it's not a system thread */ + if (Thread->SystemThread) + { + /* Fail */ + Status = STATUS_INVALID_HANDLE; + } + else + { + /* Call the kernel API */ + Status = PsGetContextThread(Thread, ThreadContext, PreviousMode); + } + + /* Dereference it and return */ + ObDereferenceObject(Thread); + return Status; +} + +NTSTATUS +NTAPI +NtSetContextThread(IN HANDLE ThreadHandle, + IN PCONTEXT ThreadContext) +{ + PETHREAD Thread; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Get the Thread Object */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_CONTEXT, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + + /* Make sure it's not a system thread */ + if (Thread->SystemThread) + { + /* Fail */ + Status = STATUS_INVALID_HANDLE; + } + else + { + /* Call the kernel API */ + Status = PsSetContextThread(Thread, ThreadContext, PreviousMode); + } + + /* Dereference it and return */ + ObDereferenceObject(Thread); + return Status; +} + /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/debug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 23123: Merge 22156 to branch.
by hpoussin＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: hpoussin Date: Mon Jul 17 12:58:16 2006 New Revision: 23123 URL: http://svn.reactos.org/svn/reactos?rev=23123&view=rev Log: Merge 22156 to branch. Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Mon Jul 17 12:58:16 2006 @@ -606,11 +606,7 @@ } /* Calculate loss percent */ - if (LostCount > 0) { - Count = (SentCount * 100) / LostCount; - } else { - Count = 0; - } + Count = (LostCount * 100) / SentCount; if (!MinRTTSet) MinRTT = MaxRTT;

1 0

[greatlrd] 23122: patch from LMH1 : Bug#: 1674 : Norwegian translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 12:20:16 2006 New Revision: 23122 URL: http://svn.reactos.org/svn/reactos?rev=23122&view=rev Log: patch from LMH1 : Bug#: 1674 : Norwegian translation Added: trunk/reactos/base/system/expand/No.rc (with props) Modified: trunk/reactos/base/system/expand/expand.rc Added: trunk/reactos/base/system/expand/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/No.rc?r… ============================================================================== --- trunk/reactos/base/system/expand/No.rc (added) +++ trunk/reactos/base/system/expand/No.rc Mon Jul 17 12:20:16 2006 @@ -1,0 +1,16 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS Fil ekstrakterings Verktøy Versjon 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Bruk: %s innfil [utfil]\n" + +IDS_FAILS "LZCopy mislykket: retur ble %ld\n" +} Propchange: trunk/reactos/base/system/expand/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/expand/expand.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… ============================================================================== --- trunk/reactos/base/system/expand/expand.rc (original) +++ trunk/reactos/base/system/expand/expand.rc Mon Jul 17 12:20:16 2006 @@ -12,3 +12,5 @@ #include "Sv.rc" #include "Hu.rc" #include "Gr.rc" +#include "No.rc" +

1 0

[greatlrd] 23121: patch from LMH1 : Bug#: 1644 : Norwegian translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 12:14:27 2006 New Revision: 23121 URL: http://svn.reactos.org/svn/reactos?rev=23121&view=rev Log: patch from LMH1 : Bug#: 1644 : Norwegian translation Added: trunk/reactos/base/applications/regedit/clb/clb_No.rc (with props) Modified: trunk/reactos/base/applications/regedit/clb/clb.rc Modified: trunk/reactos/base/applications/regedit/clb/clb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/clb.rc (original) +++ trunk/reactos/base/applications/regedit/clb/clb.rc Mon Jul 17 12:14:27 2006 @@ -10,3 +10,5 @@ #include "clb_En.rc" #include "clb_Ja.rc" +#include "clb_No.rc" + Added: trunk/reactos/base/applications/regedit/clb/clb_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/clb_No.rc (added) +++ trunk/reactos/base/applications/regedit/clb/clb_No.rc Mon Jul 17 12:14:27 2006 @@ -1,0 +1,28 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Column List Box Styles" +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "kolonne liste Boks Stiler", -1, 6, 7, 158, 71 + CHECKBOX "S&tandard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Kantlinje", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "S&orter", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Varsle", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "G&rønt. Scroll Bar", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Sammensatt valg", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Utvidet valg", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Fremspring overskrift", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Spenstig kolonner", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Grunnleggende stiler", -1, 6, 80, 158, 34 + CHECKBOX "&Synlig", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Koble ut", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Gruppe ", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Kategori stopp", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Koble ut Ingen skrolling", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Propchange: trunk/reactos/base/applications/regedit/clb/clb_No.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 23120: patch from Apal : bug 1429 : greek translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 11:53:10 2006 New Revision: 23120 URL: http://svn.reactos.org/svn/reactos?rev=23120&view=rev Log: patch from Apal : bug 1429 : greek translation Added: trunk/rosapps/sysutils/ctm/Gr.rc (with props) Modified: trunk/rosapps/sysutils/ctm/ctm.rc Added: trunk/rosapps/sysutils/ctm/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Gr.rc?rev=231… ============================================================================== --- trunk/rosapps/sysutils/ctm/Gr.rc (added) +++ trunk/rosapps/sysutils/ctm/Gr.rc Mon Jul 17 11:53:10 2006 @@ -1,0 +1,32 @@ +// Greek resources by Dj Apal + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Console TaskManager v0.1 by Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "Image name " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "CPU" + IDS_COLUMN_MEM "×ñÞóç ìíÞìçò" + IDS_COLUMN_MEM_UNIT "KB" + IDS_COLUMN_PF "Page Faults" + + IDS_IDLE_PROCESS "ÁäñáíÞò äéáäéêáóßá" + IDS_YES "Y" + IDS_NO "N" + + IDS_MENU "ÐáôÞóôå: q - Ýîïäïò, k - ôÝëïò äéåñãáóßáò" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "K" + + IDS_KILL_PROCESS "ÈÝëåôå íá óôáìáôÞóåôå áõôÞ ôç äéåñãáóßá? (y/n)" + IDS_KILL_PROCESS_ERR1 "Áäýíáôïí íá ôåñìáôéóôåß ç äéåñãáóßá..." + IDS_KILL_PROCESS_ERR2 "Áäýíáôïí íá ôåñìáôéóôåß ç äéåñãáóßá %d (unable to OpenProcess)" + + IDS_CTM_GENERAL_ERR1 "ctm: can't use console." + IDS_CTM_GENERAL_ERR2 "ctm: can't GetConsoleMode() for input console." + IDS_CTM_GENERAL_ERR3 "ctm: can't GetConsoleMode() for output console." +END Propchange: trunk/rosapps/sysutils/ctm/Gr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.rc?rev=23… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.rc (original) +++ trunk/rosapps/sysutils/ctm/ctm.rc Mon Jul 17 11:53:10 2006 @@ -12,3 +12,4 @@ #include "En.rc" #include "Fr.rc" #include "De.rc" +#include "Gr.rc"

1 0

[greatlrd] 23119: patch from Apal : bug 1429 : greek translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 11:49:42 2006 New Revision: 23119 URL: http://svn.reactos.org/svn/reactos?rev=23119&view=rev Log: patch from Apal : bug 1429 : greek translation Added: trunk/reactos/dll/cpl/hdwwiz/Gr.rc (with props) Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Added: trunk/reactos/dll/cpl/hdwwiz/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/Gr.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/Gr.rc (added) +++ trunk/reactos/dll/cpl/hdwwiz/Gr.rc Mon Jul 17 11:49:42 2006 @@ -1,0 +1,7 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLNAME "Ðñüóèåóç óõóêåõþí" + IDS_CPLDESCRIPTION "Ðñüóèåóç óõóêåõþí óôïí õðïëïãéóôÞ óáò." +END Propchange: trunk/reactos/dll/cpl/hdwwiz/Gr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Mon Jul 17 11:49:42 2006 @@ -26,3 +26,5 @@ #include "Nl.rc" #include "Ru.rc" #include "Uk.rc" +#include "Gr.rc" +

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
67
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 July 2006