Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23091: 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 16 Jul '06

16 Jul '06

Author: greatlrd Date: Mon Jul 17 00:35:25 2006 New Revision: 23091 URL: http://svn.reactos.org/svn/reactos?rev=23091&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 00:35:25 2006 @@ -14,13 +14,14 @@ #include <ddrawi.h> #include <ddrawint.h> #include <ddrawgdi.h> +#include <ntgdi.h> /* DATA **********************************************************************/ HANDLE ghDirectDraw; ULONG gcDirectDraw; -#define GetDdHandle(Handle) (Handle ? Handle : ghDirectDraw) +#define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) /* CALLBACKS *****************************************************************/ @@ -104,7 +105,208 @@ (HANDLE)Lock->lpDDSurface->hDC); } - +DWORD +WINAPI +DdUnlock(LPDDHAL_UNLOCKDATA Unlock) +{ + /* Call win32k */ + return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, + (PDD_UNLOCKDATA)Unlock); +} + +DWORD +WINAPI +DdGetBltStatus(LPDDHAL_GETBLTSTATUSDATA GetBltStatus) +{ + /* Call win32k */ + return NtGdiDdGetBltStatus((HANDLE)GetBltStatus->lpDDSurface->hDDSurface, + (PDD_GETBLTSTATUSDATA)GetBltStatus); +} + +DWORD +WINAPI +DdGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA GetFlipStatus) +{ + /* Call win32k */ + return NtGdiDdGetFlipStatus((HANDLE)GetFlipStatus->lpDDSurface->hDDSurface, + (PDD_GETFLIPSTATUSDATA)GetFlipStatus); +} + +DWORD +APIENTRY +DdUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA UpdateOverlay) +{ + /* We have to handle this manually here */ + if (UpdateOverlay->dwFlags & DDOVER_KEYDEST) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYDEST; + UpdateOverlay->dwFlags |= DDOVER_KEYDESTOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckDestColorkey = + UpdateOverlay->lpDDDestSurface->ddckCKDestOverlay; + } + if (UpdateOverlay->dwFlags & DDOVER_KEYSRC) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYSRC; + UpdateOverlay->dwFlags |= DDOVER_KEYSRCOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckSrcColorkey = + UpdateOverlay->lpDDSrcSurface->ddckCKSrcOverlay; + } + + /* Call win32k */ + return NtGdiDdUpdateOverlay((HANDLE)UpdateOverlay->lpDDDestSurface->hDDSurface, + (HANDLE)UpdateOverlay->lpDDSrcSurface->hDDSurface, + (PDD_UPDATEOVERLAYDATA)UpdateOverlay); +} + +DWORD +APIENTRY +DdSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA SetOverlayPosition) +{ + /* Call win32k */ + return NtGdiDdSetOverlayPosition((HANDLE)SetOverlayPosition-> + lpDDSrcSurface->hDDSurface, + (HANDLE)SetOverlayPosition-> + lpDDDestSurface->hDDSurface, + (PDD_SETOVERLAYPOSITIONDATA) + SetOverlayPosition); +} + +/* + * Dd Callbacks + */ +DWORD +WINAPI +DdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA WaitForVerticalBlank) +{ + /* Call win32k */ + return NtGdiDdWaitForVerticalBlank(GetDdHandle( + WaitForVerticalBlank->lpDD->hDD), + (PDD_WAITFORVERTICALBLANKDATA) + WaitForVerticalBlank); +} + +DWORD +WINAPI +DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) +{ + /* Call win32k */ + return NtGdiDdCanCreateSurface(GetDdHandle(CanCreateSurface->lpDD->hDD), + (PDD_CANCREATESURFACEDATA)CanCreateSurface); +} + +DWORD +APIENTRY +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) +{ + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + ULONG SurfaceCount = pCreateSurface->dwSCnt; + DD_SURFACE_LOCAL DdSurfaceLocal; + DD_SURFACE_MORE DdSurfaceMore; + DD_SURFACE_GLOBAL DdSurfaceGlobal; + HANDLE hPrevSurface, hSurface; + DD_SURFACE_LOCAL* pDdSurfaceLocal; + DD_SURFACE_MORE* pDdSurfaceMore; + DD_SURFACE_GLOBAL* pDdSurfaceGlobal; + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; + //LPDDRAWI_DDRAWSURFACE_MORE pSurfaceMore; + LPDDRAWI_DDRAWSURFACE_GBL pSurfaceGlobal; + PHANDLE phSurface = NULL, puhSurface = NULL; + ULONG i; + LPDDSURFACEDESC pSurfaceDesc; + + /* Check how many surfaces there are */ + if (SurfaceCount != 1) + { + /* We'll have to allocate more data, our stack isn't big enough */ + + } + else + { + /* We'll use what we have on the stack */ + pDdSurfaceLocal = &DdSurfaceLocal; + pDdSurfaceMore = &DdSurfaceMore; + pDdSurfaceGlobal = &DdSurfaceGlobal; + phSurface = &hPrevSurface; + puhSurface = &hSurface; + + /* Clear the structures */ + RtlZeroMemory(&DdSurfaceLocal, sizeof(DdSurfaceLocal)); + RtlZeroMemory(&DdSurfaceGlobal, sizeof(DdSurfaceGlobal)); + RtlZeroMemory(&DdSurfaceMore, sizeof(DdSurfaceMore)); + } + + /* Loop for each surface */ + for (i = 0; i < pCreateSurface->dwSCnt; i++) + { + /* Get data */ + pSurfaceLocal = pCreateSurface->lplpSList[i]; + pSurfaceGlobal = pSurfaceLocal->lpGbl; + pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; + + /* Check if it has pixel data */ + if (pSurfaceDesc->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + /* Use its pixel data */ + DdSurfaceGlobal.ddpfSurface = pSurfaceDesc->ddpfPixelFormat; + DdSurfaceGlobal.ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + /* Use the one from the global surface */ + DdSurfaceGlobal.ddpfSurface = pSurfaceGlobal->lpDD->vmiData.ddpfDisplay; + } + + /* Convert data */ + DdSurfaceGlobal.wWidth = pSurfaceGlobal->wWidth; + DdSurfaceGlobal.wHeight = pSurfaceGlobal->wHeight; + DdSurfaceGlobal.lPitch = pSurfaceGlobal->lPitch; + DdSurfaceGlobal.fpVidMem = pSurfaceGlobal->fpVidMem; + DdSurfaceGlobal.dwBlockSizeX = pSurfaceGlobal->dwBlockSizeX; + DdSurfaceGlobal.dwBlockSizeY = pSurfaceGlobal->dwBlockSizeY; + // DdSurfaceGlobal.ddsCaps = pSurfaceLocal->ddsCaps | 0xBF0000; + + /* FIXME: Ddscapsex stuff missing */ + + /* Call win32k now */ + pCreateSurface->ddRVal = E_FAIL; + + Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), + (HANDLE *)phSurface, + pSurfaceDesc, + &DdSurfaceGlobal, + &DdSurfaceLocal, + &DdSurfaceMore, + (PDD_CREATESURFACEDATA)pCreateSurface, + puhSurface); + + + /* FIXME: Ddscapsex stuff missing */ + + /* Convert the data back */ + pSurfaceGlobal->lPitch = DdSurfaceGlobal.lPitch; + pSurfaceGlobal->fpVidMem = DdSurfaceGlobal.fpVidMem; + pSurfaceGlobal->dwBlockSizeX = DdSurfaceGlobal.dwBlockSizeX; + pSurfaceGlobal->dwBlockSizeY = DdSurfaceGlobal.dwBlockSizeY; + pCreateSurface->lplpSList[i]->hDDSurface = (DWORD) hSurface; + + /* FIXME: Ddscapsex stuff missing */ + } + + /* Check if we have to free all our local allocations */ + if (SurfaceCount > 1) + { + /* FIXME: */ + } + + /* Return */ + return Return; +} static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal;

1 0

[fireball] 23090: Alexey Minnekhanov: Improve monitor.bmp for desk.cpl
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Mon Jul 17 00:10:48 2006 New Revision: 23090 URL: http://svn.reactos.org/svn/reactos?rev=23090&view=rev Log: Alexey Minnekhanov: Improve monitor.bmp for desk.cpl Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/mon… ============================================================================== Binary files - no diff available.

1 0

[fireball] 23089: Slightly improve debug prints in IoInvalidateDeviceRelations()
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Mon Jul 17 00:05:18 2006 New Revision: 23089 URL: http://svn.reactos.org/svn/reactos?rev=23089&view=rev Log: Slightly improve debug prints in IoInvalidateDeviceRelations() Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Jul 17 00:05:18 2006 @@ -2314,7 +2314,7 @@ NTSTATUS Status; ULONG i; - DPRINT("DeviceNode 0x%p\n", DeviceNode); + DPRINT("DeviceNode 0x%p, Type %d\n", DeviceNode, Type); DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); @@ -2443,6 +2443,7 @@ return Status; } + DPRINT("IopInvalidateDeviceRelations() finished\n"); return STATUS_SUCCESS; }

1 0

[greatlrd] 23088: Start implement code that alex for 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 16 Jul '06

16 Jul '06

Author: greatlrd Date: Sun Jul 16 23:03:46 2006 New Revision: 23088 URL: http://svn.reactos.org/svn/reactos?rev=23088&view=rev Log: Start implement code that alex for 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 Sun Jul 16 23:03:46 2006 @@ -1,36 +1,112 @@ /* - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* - * $Id: * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GDI32 - * PURPOSE: Gdi DirectX inteface + * PURPOSE: GDI DirectX inteface * FILE: lib/gdi32/misc/gdientry.c - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - * REVISION HISTORY: - * NOTES: - */ - + * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) + * Magnus Olsen (magnus(a)greatlord.com) + */ + +/* INCLUDES ******************************************************************/ #include "precomp.h" #include <ddraw.h> #include <ddrawi.h> #include <ddrawint.h> #include <ddrawgdi.h> + +/* DATA **********************************************************************/ + +HANDLE ghDirectDraw; +ULONG gcDirectDraw; + +#define GetDdHandle(Handle) (Handle ? Handle : ghDirectDraw) + + +/* CALLBACKS *****************************************************************/ + +/* + * Dd Surface Callbacks + */ +DWORD +WINAPI +DdAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA Attach) +{ + /* Call win32k */ + return NtGdiDdAddAttachedSurface((HANDLE)Attach->lpDDSurface->hDDSurface, + (HANDLE)Attach->lpSurfAttached->hDDSurface, + (PDD_ADDATTACHEDSURFACEDATA)Attach); +} + +DWORD +WINAPI +DdBlt(LPDDHAL_BLTDATA Blt) +{ + HANDLE Surface = 0; + + /* Use the right surface */ + if (Blt->lpDDSrcSurface) Surface = (HANDLE)Blt->lpDDSrcSurface->hDDSurface; + + /* Call win32k */ + return NtGdiDdBlt((HANDLE)Blt->lpDDDestSurface->hDDSurface, Surface, (PDD_BLTDATA)Blt); +} + +DWORD +APIENTRY +DdDestroySurface(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) +{ + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + BOOL RealDestroy = TRUE; + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; + + /* Get the local surface */ + pSurfaceLocal = pDestroySurface->lpDDSurface; + + /* Make sure there's a surface */ + if (pSurfaceLocal->hDDSurface) + { + /* Check if we shoudl really destroy it */ + if ((pSurfaceLocal->dwFlags & DDRAWISURF_DRIVERMANAGED) && + (pSurfaceLocal->dwFlags & DDRAWISURF_INVALID)) + { + RealDestroy = FALSE; + } + + /* Call win32k */ + Return = NtGdiDdDestroySurface((HANDLE)pSurfaceLocal->hDDSurface, + RealDestroy); + } + + return Return; +} + +DWORD +WINAPI +DdFlip(LPDDHAL_FLIPDATA Flip) +{ + /* Call win32k */ + + return NtGdiDdFlip( (HANDLE)Flip->lpSurfCurr->hDDSurface, + (HANDLE)Flip->lpSurfTarg->hDDSurface, + /* FIXME the two last should be current left handler */ + (HANDLE)Flip->lpSurfCurr->hDDSurface, + (HANDLE)Flip->lpSurfTarg->hDDSurface, + (PDD_FLIPDATA)Flip); +} + +WORD +WINAPI +DdLock(LPDDHAL_LOCKDATA Lock) +{ + /* Call win32k */ + return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, + (PDD_LOCKDATA)Lock, + (HANDLE)Lock->lpDDSurface->hDC); +} + + + + static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0;

1 0

[greatlrd] 23087: start implement of gdientry2, for moment it return incorrect info. and does not fill some stuff right. we are return alot of kernel pointer and does not setup alot stuff right, see it as start ground. I do not want lose this start code again. it will be add in modifcate alot.
by greatlrd＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: greatlrd Date: Sun Jul 16 22:12:13 2006 New Revision: 23087 URL: http://svn.reactos.org/svn/reactos?rev=23087&view=rev Log: start implement of gdientry2, for moment it return incorrect info. and does not fill some stuff right. we are return alot of kernel pointer and does not setup alot stuff right, see it as start ground. I do not want lose this start code again. it will be add in modifcate alot. 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 Sun Jul 16 22:12:13 2006 @@ -115,8 +115,34 @@ LPDWORD pdwFourCC, LPVIDMEM pvmList) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + BOOL bStatus = FALSE; + DD_HALINFO DDHalInfo; + LPVOID pCallBackFlags[3]; + DWORD NumHeaps; + DWORD NumFourCC; + + DDHalInfo.dwSize = sizeof(DD_HALINFO); + + pCallBackFlags[0] = pDDCallbacks; + pCallBackFlags[1] = pDDSurfaceCallbacks; + pCallBackFlags[2] = pDDPaletteCallbacks; + + bStatus = NtGdiDdQueryDirectDrawObject( + (HANDLE)pDirectDrawGlobal->hDD, + (DD_HALINFO *)&DDHalInfo, + (DWORD *)pCallBackFlags, + (LPD3DNTHAL_CALLBACKS)pD3dCallbacks, + (LPD3DNTHAL_GLOBALDRIVERDATA)pD3dDriverData, + (PDD_D3DBUFCALLBACKS)pD3dBufferCallbacks, + (LPDDSURFACEDESC)pD3dTextureFormats, + (DWORD *)&NumHeaps, + (VIDEOMEMORY *)pvmList, + (DWORD *)&NumFourCC, + (DWORD *)pdwFourCC); + + + //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return bStatus; } /*

1 0

[fireball] 23086: [AUDIT] fmifs.dll It is completely clean, because it's only stubs without any code. The only pair of coded functions are trivial "pass-through"/wrappers.
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Sun Jul 16 21:38:03 2006 New Revision: 23086 URL: http://svn.reactos.org/svn/reactos?rev=23086&view=rev Log: [AUDIT] fmifs.dll It is completely clean, because it's only stubs without any code. The only pair of coded functions are trivial "pass-through"/wrappers. Modified: trunk/reactos/dll/win32/fmifs/chkdsk.c (props changed) trunk/reactos/dll/win32/fmifs/compress.c (props changed) trunk/reactos/dll/win32/fmifs/diskcopy.c (props changed) trunk/reactos/dll/win32/fmifs/extend.c (props changed) trunk/reactos/dll/win32/fmifs/fmifs.def (props changed) trunk/reactos/dll/win32/fmifs/fmifs.rc (props changed) trunk/reactos/dll/win32/fmifs/format.c (props changed) trunk/reactos/dll/win32/fmifs/init.c (props changed) trunk/reactos/dll/win32/fmifs/label.c (props changed) trunk/reactos/dll/win32/fmifs/media.c (props changed) trunk/reactos/dll/win32/fmifs/precomp.h (props changed) Propchange: trunk/reactos/dll/win32/fmifs/chkdsk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/compress.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/diskcopy.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/extend.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/fmifs.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/fmifs.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/format.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/label.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/media.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 23085: - Added constants for all the ETHREAD flags so when we use Interlocked operations to edit them, a nice symbolic name is there isntead of a magic hex value. - Fixed a bug in PspUserThreadStartup which was causing us to notify the debugger for system threads or hidden threads, instead of vice-versa. - Documented cookie generation for Thomas. - Threads were incorrectly created with KernelMode access instead of PreviousMode. - Initialize the thread's rundown protection and use the proce
by ion＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: ion Date: Sun Jul 16 21:19:21 2006 New Revision: 23085 URL: http://svn.reactos.org/svn/reactos?rev=23085&view=rev Log: - Added constants for all the ETHREAD flags so when we use Interlocked operations to edit them, a nice symbolic name is there isntead of a magic hex value. - Fixed a bug in PspUserThreadStartup which was causing us to notify the debugger for system threads or hidden threads, instead of vice-versa. - Documented cookie generation for Thomas. - Threads were incorrectly created with KernelMode access instead of PreviousMode. - Initialize the thread's rundown protection and use the process's. - Handle failure when TEB = NULL. - The LPC Semaphore has a limit of 1, not 0x7FFF. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Jul 16 21:19:21 2006 @@ -97,9 +97,9 @@ #define PS_INHERIT_HANDLES 4 #define PS_UNKNOWN_VALUE 8 #define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ - PS_NO_DEBUG_INHERIT | \ - PS_INHERIT_HANDLES | \ - PS_UNKNOWN_VALUE) + PS_NO_DEBUG_INHERIT | \ + PS_INHERIT_HANDLES | \ + PS_UNKNOWN_VALUE) // // Process base priorities @@ -139,7 +139,6 @@ 0xFFF) #endif - // // Job Access Types // @@ -151,6 +150,34 @@ #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ 31) + +// +// Cross Thread Flags +// +#define CT_TERMINATED_BIT 0x1 +#define CT_DEAD_THREAD_BIT 0x2 +#define CT_HIDE_FROM_DEBUGGER_BIT 0x4 +#define CT_ACTIVE_IMPERSTIONATION_INFO_BIT 0x8 +#define CT_SYSTEM_THREAD_BIT 0x10 +#define CT_HARD_ERRORS_ARE_DISABLED_BIT 0x20 +#define CT_BREAK_ON_TERMINATION_BIT 0x40 +#define CT_SKIP_CREATION_MSG_BIT 0x80 +#define CT_SKIP_TERMINATION_MSG_BIT 0x100 + +// +// Same Thread Passive Flags +// +#define STP_ACTIVE_EX_WORKER_BIT 0x1 +#define STP_EX_WORKER_CAN_WAIT_USER_BIT 0x2 +#define STP_MEMORY_MAKER_BIT 0x4 +#define STP_KEYED_EVENT_IN_USE_BIT 0x8 + +// +// Same Thread APC Flags +// +#define STA_LPC_RECEIVED_MSG_ID_VALID_BIT 0x1 +#define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 +#define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #endif #ifdef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sun Jul 16 21:19:21 2006 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/ps/thread.c * PURPOSE: Process Manager: Thread Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Thomas Weidenmueller (w3seek(a)reactos.org + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* @@ -66,9 +66,9 @@ } /* Check if this is a system thread, or if we're hiding */ - if ((Thread->SystemThread) || (Thread->HideFromDebugger)) -{ - /* Notify the debugger */ + if (!(Thread->SystemThread) && !(Thread->HideFromDebugger)) + { + /* We're not, so notify the debugger */ DbgkCreateThread(StartContext); } @@ -90,9 +90,9 @@ sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)), PspSystemDllEntryPoint, - NULL, + NULL, PspSystemDllBase, - NULL); + NULL); /* Lower it back to passive */ KeLowerIrql(PASSIVE_LEVEL); @@ -100,13 +100,21 @@ else { /* We're dead, kill us now */ - PspTerminateThreadByPointer(Thread, STATUS_THREAD_IS_TERMINATING, TRUE); + PspTerminateThreadByPointer(Thread, + STATUS_THREAD_IS_TERMINATING, + TRUE); } /* Do we have a cookie set yet? */ if (!SharedUserData->Cookie) { - /* FIXME: Generate cookie */ + /* + * FIXME: Generate cookie + * Formula (roughly): Per-CPU Page Fault ^ Per-CPU Interrupt Time ^ + * Global System Time ^ Stack Address of where + * the LARGE_INTEGER containing the Global System + * Time is. + */ } } @@ -202,7 +210,7 @@ Status = ObCreateObject(PreviousMode, PsThreadType, ObjectAttributes, - KernelMode, + PreviousMode, NULL, sizeof(ETHREAD), 0, @@ -218,6 +226,9 @@ /* Zero the Object entirely */ RtlZeroMemory(Thread, sizeof(ETHREAD)); + /* Initialize rundown protection */ + ExInitializeRundownProtection(&Thread->RundownProtect); + /* Set the Process CID */ Thread->ThreadsProcess = Process; Thread->Cid.UniqueProcess = Process->UniqueProcessId; @@ -228,8 +239,7 @@ Thread->Cid.UniqueThread = ExCreateHandle(PspCidTable, &CidEntry); if (!Thread->Cid.UniqueThread) { - /* We couldn't create the CID, dereference everything and fail */ - ObDereferenceObject(Process); + /* We couldn't create the CID, dereference the thread and fail */ ObDereferenceObject(Thread); return STATUS_INSUFFICIENT_RESOURCES; } @@ -238,7 +248,7 @@ Thread->ReadClusterSize = MmReadClusterSize; /* Initialize the LPC Reply Semaphore */ - KeInitializeSemaphore(&Thread->LpcReplySemaphore, 0, MAXLONG); + KeInitializeSemaphore(&Thread->LpcReplySemaphore, 0, 1); /* Initialize the list heads and locks */ InitializeListHead(&Thread->LpcReplyChain); @@ -247,6 +257,9 @@ InitializeListHead(&Thread->ActiveTimerListHead); KeInitializeSpinLock(&Thread->ActiveTimerListLock); + /* Acquire rundown protection */ + ExAcquireRundownProtection(&Process->RundownProtect); + /* Allocate Stack for non-GUI Thread */ KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; @@ -255,6 +268,13 @@ { /* User-mode Thread, create Teb */ TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); + if (!TebBase) + { + /* Failed to create the TEB. Release rundown and dereference */ + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Thread); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Set the Start Addresses */ Thread->StartAddress = (PVOID)ThreadContext->Eip; @@ -274,7 +294,7 @@ { /* System Thread */ Thread->StartAddress = StartRoutine; - InterlockedOr((PLONG)&Thread->CrossThreadFlags, 0x10); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_SYSTEM_THREAD_BIT); /* Let the kernel intialize the Thread */ KeInitializeThread(&Process->Pcb, @@ -294,6 +314,9 @@ */ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); Process->ActiveThreads++; + + /* Release rundown */ + ExReleaseRundownProtection(&Process->RundownProtect); /* Notify WMI */ //WmiTraceProcess(Process, TRUE);

1 0

[hpoussin] 23084: [FORMATTING] Replace tabs by spaces Replace some DPRINT1 by DPRINT
by hpoussin＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: hpoussin Date: Sun Jul 16 21:00:39 2006 New Revision: 23084 URL: http://svn.reactos.org/svn/reactos?rev=23084&view=rev Log: [FORMATTING] Replace tabs by spaces Replace some DPRINT1 by DPRINT Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sun Jul 16 21:00:39 2006 @@ -60,7 +60,7 @@ { HANDLE Thread; - DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); if (ProcessData->CtrlDispatcher) { @@ -191,7 +191,7 @@ CloseHandle(Console->ActiveEvent); return STATUS_INSUFFICIENT_RESOURCES; } - + if (! GuiMode) { Status = TuiInitConsole(Console); @@ -223,7 +223,7 @@ DeleteCriticalSection(&Console->Header.Lock); CloseHandle(Console->ActiveEvent); HeapFree(Win32CsrApiHeap, 0, NewBuffer); - DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); + DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); return Status; } @@ -310,8 +310,8 @@ if (NewConsole || !ProcessData->bInheritHandles) { /* Insert the Objects */ - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, &Console->Header); if (! NT_SUCCESS(Status)) { @@ -320,15 +320,15 @@ ProcessData->Console = 0; return Request->Status = Status; } - - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, + + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, &Console->ActiveBuffer->Header); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); ConioDeleteConsole((Object_t *) Console); - Win32CsrReleaseObject(ProcessData, + Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); ProcessData->Console = 0; return Request->Status = Status; @@ -336,12 +336,12 @@ } /* Duplicate the Event */ - if (!DuplicateHandle(GetCurrentProcess(), + if (!DuplicateHandle(GetCurrentProcess(), ProcessData->Console->ActiveEvent, - ProcessData->Process, - &ProcessData->ConsoleEvent, - EVENT_ALL_ACCESS, - FALSE, + ProcessData->Process, + &ProcessData->ConsoleEvent, + EVENT_ALL_ACCESS, + FALSE, 0)) { DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); @@ -623,13 +623,13 @@ } else { - /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ + /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); Request->Data.ReadConsoleRequest.NrCharactersRead++; Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; - return Request->Status; + return Request->Status; } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */ @@ -724,7 +724,7 @@ RECT *Rect2) { return ((Rect1->left == Rect2->left) && (Rect1->right == Rect2->right) && - (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom)); + (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom)); } inline BOOLEAN ConioGetIntersection( @@ -947,7 +947,7 @@ DPRINT("CsrWriteConsole\n"); if (Request->Header.u1.s1.TotalLength - < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + (Request->Data.WriteConsoleRequest.NrCharactersToWrite * CharSize)) { DPRINT1("Invalid request size\n"); @@ -956,10 +956,10 @@ return Request->Status = STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); - + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - + if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -967,16 +967,16 @@ if(Request->Data.WriteConsoleRequest.Unicode) { - Length = WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, NULL, 0, NULL, NULL); Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length); if (Buffer) { - WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, Buffer, Length, NULL, NULL); } else @@ -988,7 +988,7 @@ { Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer; } - + if (Buffer) { Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff); @@ -1096,11 +1096,11 @@ DPRINT1("Console_Api Ctrl-C\n"); current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); - current_entry = current_entry->Flink; - ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); - } + { + current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + current_entry = current_entry->Flink; + ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); + } HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); return; } @@ -1111,30 +1111,30 @@ || VK_DOWN == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode)) { if (KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown) - { - /* scroll up or down */ - if (NULL == Console) - { - DPRINT1("No Active Console!\n"); - HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); - return; - } - if (VK_UP == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode) - { - /* only scroll up if there is room to scroll up into */ - if (Console->ActiveBuffer->ShowY != ((Console->ActiveBuffer->CurrentY + 1) % - Console->ActiveBuffer->MaxY)) + { + /* scroll up or down */ + if (NULL == Console) + { + DPRINT1("No Active Console!\n"); + HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); + return; + } + if (VK_UP == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode) + { + /* only scroll up if there is room to scroll up into */ + if (Console->ActiveBuffer->ShowY != ((Console->ActiveBuffer->CurrentY + 1) % + Console->ActiveBuffer->MaxY)) { Console->ActiveBuffer->ShowY = (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY - 1) % Console->ActiveBuffer->MaxY; } } - else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) - /* only scroll down if there is room to scroll down into */ - { - if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != - Console->ActiveBuffer->CurrentY) + else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) + /* only scroll down if there is room to scroll down into */ + { + if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != + Console->ActiveBuffer->CurrentY) { if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY) % @@ -1208,30 +1208,30 @@ { /* walk the input queue looking for a char to backspace */ for (TempInput = (ConsoleInput *) Console->InputEvents.Blink; - TempInput != (ConsoleInput *) &Console->InputEvents + TempInput != (ConsoleInput *) &Console->InputEvents && (KEY_EVENT == TempInput->InputEvent.EventType || ! TempInput->InputEvent.Event.KeyEvent.bKeyDown || '\b' == TempInput->InputEvent.Event.KeyEvent.uChar.AsciiChar); - TempInput = (ConsoleInput *) TempInput->ListEntry.Blink) + TempInput = (ConsoleInput *) TempInput->ListEntry.Blink) { /* NOP */; } /* if we found one, delete it, otherwise, wake the client */ if (TempInput != (ConsoleInput *) &Console->InputEvents) - { - /* delete previous key in queue, maybe echo backspace to screen, and do not place backspace on queue */ - RemoveEntryList(&TempInput->ListEntry); - if (TempInput->Echoed) + { + /* delete previous key in queue, maybe echo backspace to screen, and do not place backspace on queue */ + RemoveEntryList(&TempInput->ListEntry); + if (TempInput->Echoed) { ConioWriteConsole(Console, Console->ActiveBuffer, &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar, 1, TRUE); } HeapFree(Win32CsrApiHeap, 0, TempInput); - RemoveEntryList(&KeyEventRecord->ListEntry); - HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); - Console->WaitingChars -= 2; - } + RemoveEntryList(&KeyEventRecord->ListEntry); + HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); + Console->WaitingChars -= 2; + } else { SetEvent(Console->ActiveEvent); @@ -1395,15 +1395,15 @@ LastVirtualKey = msg->wParam; DPRINT ("csrss: %s %s %s %s %02x %02x '%c' %04x\n", - Down ? "down" : "up ", - (msg->message == WM_CHAR || msg->message == WM_SYSCHAR) ? - "char" : "key ", - ConInRec->Fake ? "fake" : "real", - ConInRec->NotChar ? "notc" : "char", - VirtualScanCode, - VirtualKeyCode, - (AsciiChar >= ' ') ? AsciiChar : '.', - ShiftState); + Down ? "down" : "up ", + (msg->message == WM_CHAR || msg->message == WM_SYSCHAR) ? + "char" : "key ", + ConInRec->Fake ? "fake" : "real", + ConInRec->NotChar ? "notc" : "char", + VirtualScanCode, + VirtualKeyCode, + (AsciiChar >= ' ') ? AsciiChar : '.', + ShiftState); if (! ConInRec->Fake || ! ConInRec->NotChar) { @@ -1590,7 +1590,7 @@ CharSize = (Request->Data.WriteConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); if (Request->Header.u1.s1.TotalLength - < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + (Request->Data.WriteConsoleOutputCharRequest.Length * CharSize)) { DPRINT1("Invalid request size\n"); @@ -1606,16 +1606,16 @@ { if(Request->Data.WriteConsoleOutputCharRequest.Unicode) { - Length = WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, - Request->Data.WriteConsoleOutputCharRequest.Length, + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, NULL, 0, NULL, NULL); tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length); if (String) { - WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, - Request->Data.WriteConsoleOutputCharRequest.Length, + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, String, Length, NULL, NULL); } else @@ -1627,7 +1627,7 @@ { String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String; } - + if (String) { Status = ConioLockScreenBuffer(ProcessData, @@ -1781,9 +1781,9 @@ if (Done && !Input->Fake) { - Request->Data.ReadInputRequest.MoreEvents = TRUE; - break; - } + Request->Data.ReadInputRequest.MoreEvents = TRUE; + break; + } RemoveEntryList(&Input->ListEntry); @@ -1794,14 +1794,14 @@ { ConioInputEventToAnsi(Console, &Request->Data.ReadInputRequest.Input); } - Done = TRUE; - } + Done = TRUE; + } if (Input->InputEvent.EventType == KEY_EVENT) { if (0 != (Console->Mode & ENABLE_LINE_INPUT) - && Input->InputEvent.Event.KeyEvent.bKeyDown - && '\r' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) + && Input->InputEvent.Event.KeyEvent.bKeyDown + && '\r' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) { Console->WaitingLines--; } @@ -2215,7 +2215,7 @@ if (Console->ActiveBuffer) { Buff->MaxX = Console->ActiveBuffer->MaxX; - Buff->MaxY = Console->ActiveBuffer->MaxY; + Buff->MaxY = Console->ActiveBuffer->MaxY; } if (Buff->MaxX == 0) @@ -2694,15 +2694,15 @@ Xpos++; if (Xpos == Buff->MaxX) - { - Xpos = 0; - Ypos++; - - if (Ypos == Buff->MaxY) + { + Xpos = 0; + Ypos++; + + if (Ypos == Buff->MaxY) { Ypos = 0; } - } + } } *ReadBuffer = 0; @@ -2820,7 +2820,7 @@ if (!Input->Fake) { NumEvents++; - } + } } ConioUnlockConsole(Console); @@ -3045,8 +3045,8 @@ Record->Echoed = FALSE; Record->Fake = FALSE; - //Record->InputEvent = *InputRecord++; - memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); + //Record->InputEvent = *InputRecord++; + memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); if (KEY_EVENT == Record->InputEvent.EventType) { /* FIXME - convert from unicode to ascii!! */ @@ -3335,7 +3335,7 @@ { STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR szCmdline[MAX_PATH]; + WCHAR szCmdline[MAX_PATH]; HKEY hKey; WCHAR szBuffer[MAX_PATH]; @@ -3345,33 +3345,33 @@ /* FIXME : 1. Make it unicode and ansi compatible with TCHAR - + 2. Return state it is running if a tree try start it - one more screen saver when we already have one + one more screen saver when we already have one screen saver running - + 3. Use GetLongPath or GetPathName so we can use %SystemRoot% in the key that will make it posible for livecd have a preview screen saver install. - + 4. Move the code to winlogon SAS and screen saver must run in the secuar desktop. But current our Winlogon does not working - well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) - add the code here as w3seek recommended + well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) + add the code here as w3seek recomandete */ - result = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_QUERY_VALUE, &hKey); if (result == ERROR_SUCCESS) { result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) + if(result == ERROR_SUCCESS) { swprintf(szCmdline, L"%s /s",szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + DPRINT("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); ZeroMemory( &si, sizeof(si) ); si.cb = sizeof(si); ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); @@ -3379,27 +3379,27 @@ } else { - GetSystemDirectoryW(szCmdline,MAX_PATH); - wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + GetSystemDirectoryW(szCmdline,MAX_PATH); + wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); + DPRINT("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); ZeroMemory( &si, sizeof(si) ); si.cb = sizeof(si); ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); } - else - { - DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); - } + else + { + DPRINT("CsrStartScreenSaver : failed 0x%08X\n", result); + } } RegCloseKey(hKey); } else { - DPRINT1("CsrStartScreenSaver : failed to RegOpenKeyExW 0x%08X\n", result); + DPRINT1("CsrStartScreenSaver : failed to RegOpenKeyExW (error 0x%lx)\n", result); } return Request->Status = STATUS_SUCCESS; } 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Sun Jul 16 21:00:39 2006 @@ -167,7 +167,7 @@ UINT ScreenSaverTimeOut = 0; BOOL nPreviousState = FALSE; NTSTATUS Status; - BOOL FristTime = TRUE; + BOOL FirstTime = TRUE; KeSetPriorityThread(&PsGetCurrentThread()->Tcb, @@ -217,13 +217,13 @@ (nPreviousState == FALSE)) { BOOL nPreviousState = FALSE; - DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); - DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); - DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); - - if (FristTime == FALSE) - { + DPRINT("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); + DPRINT(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); + + if (FirstTime == FALSE) + { CSR_API_MESSAGE Request; CsrInit(); Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); @@ -231,11 +231,11 @@ co_CsrNotifyScreenSaver(&Request ); IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - } - else - { - FristTime = FALSE; - } + } + else + { + FirstTime = FALSE; + } } if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) &&

1 0

[gedmurphy] 23083: {AUDIT] rossym ROS specific lib
by gedmurphy＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: gedmurphy Date: Sun Jul 16 19:32:42 2006 New Revision: 23083 URL: http://svn.reactos.org/svn/reactos?rev=23083&view=rev Log: {AUDIT] rossym ROS specific lib Modified: trunk/reactos/lib/rossym/delete.c (props changed) trunk/reactos/lib/rossym/find.c (props changed) trunk/reactos/lib/rossym/fromfile.c (props changed) trunk/reactos/lib/rossym/frommem.c (props changed) trunk/reactos/lib/rossym/fromraw.c (props changed) trunk/reactos/lib/rossym/getraw.c (props changed) trunk/reactos/lib/rossym/init.c (props changed) trunk/reactos/lib/rossym/initkm.c (props changed) trunk/reactos/lib/rossym/initum.c (props changed) trunk/reactos/lib/rossym/rossympriv.h (props changed) trunk/reactos/lib/rossym/zwfile.c (props changed) Propchange: trunk/reactos/lib/rossym/delete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/find.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/fromfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/frommem.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/fromraw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/getraw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/initkm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/initum.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/rossympriv.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/zwfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 23082: * check return value of RtlDeleteAtomFromAtomTable * simply, optimize, bugfix UserRegisterClass * allow de-registration for system classes * set ERROR_CLASS_DOES_NOT_EXIST in case of errors * reduces user32_winetest.exe class errors to 31 failures
by janderwald＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: janderwald Date: Sun Jul 16 19:16:55 2006 New Revision: 23082 URL: http://svn.reactos.org/svn/reactos?rev=23082&view=rev Log: * check return value of RtlDeleteAtomFromAtomTable * simply, optimize, bugfix UserRegisterClass * allow de-registration for system classes * set ERROR_CLASS_DOES_NOT_EXIST in case of errors * reduces user32_winetest.exe class errors to 31 failures Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sun Jul 16 19:16:55 2006 @@ -171,11 +171,11 @@ return TRUE; } -static VOID +static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom) { - RtlDeleteAtomFromAtomTable(gAtomTable, - Atom); + return RtlDeleteAtomFromAtomTable(gAtomTable, + Atom); } static BOOL @@ -1147,38 +1147,28 @@ /* try to find a previously registered class */ ClassAtom = IntGetClassAtom(ClassName, - NULL, - NULL, - NULL, + lpwcx->hInstance, + pi, + &Class, NULL); if (ClassAtom != (RTL_ATOM)0) { - Class = IntFindClass(ClassAtom, - lpwcx->hInstance, - &pi->LocalClassList, - NULL); - if (Class != NULL) - { - goto ClassAlreadyExists; - } - - /* if CS_GLOBALCLASS is set, try to find a previously registered global class. - Re-registering system classes as global classes seems to be allowed, - so we don't fail */ if (lpwcx->style & CS_GLOBALCLASS) { - Class = IntFindClass(ClassAtom, - NULL, - ((dwFlags & REGISTERCLASS_SYSTEM) ? - &pi->SystemClassList : &pi->GlobalClassList), - NULL); - if (Class != NULL) - { -ClassAlreadyExists: + // global classes shall not have same names as system classes + if (Class->Global || Class->System) + { DPRINT("Class 0x%p does already exist!\n", ClassAtom); SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } + } + else if ( !Class->Global && !Class->System) + { + // local class already exists + DPRINT("Class 0x%p does already exist!\n", ClassAtom); + SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); + return (RTL_ATOM)0; } } @@ -1244,13 +1234,6 @@ ASSERT(Class != NULL); - if (Class->System) - { - DPRINT1("Attempted to unregister system class 0x%p!\n", ClassAtom); - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - if (Class->Windows != 0 || Class->Clone != NULL) { @@ -1264,11 +1247,13 @@ /* unlink the class */ *Link = Class->Next; - IntDeregisterClassAtom(Class->Atom); - - /* finally free the resources */ - IntDestroyClass(Class); - return TRUE; + if (NT_SUCCESS(IntDeregisterClassAtom(Class->Atom))) + { + /* finally free the resources */ + IntDestroyClass(Class); + return TRUE; + } + return FALSE; } INT @@ -2117,7 +2102,6 @@ { goto Cleanup; } - _SEH_TRY { /* probe the paramters */ @@ -2184,20 +2168,24 @@ if (!(Class->Global || Class->System) && hInstance == NULL) { + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); Ret = FALSE; } } - } + } + else + { + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); + } } _SEH_HANDLE { - SetLastNtError(_SEH_GetExceptionCode()); + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); } _SEH_END; Cleanup: UserLeave(); - return Ret; }

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