Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[fireball] 38700: - Rewrite DriverEntry. - Start cleaning up structures.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 11 09:58:57 2009 New Revision: 38700 URL: http://svn.reactos.org/svn/reactos?rev=38700&view=rev Log: - Rewrite DriverEntry. - Start cleaning up structures. Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastio.c trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/flush.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -24,7 +24,7 @@ } NTSTATUS -VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, +VfatReadDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, IN PLARGE_INTEGER ReadOffset, IN ULONG ReadLength, ULONG BufferOffset, @@ -35,7 +35,7 @@ NTSTATUS -VfatWriteDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, +VfatWriteDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, IN PLARGE_INTEGER WriteOffset, IN ULONG WriteLength, IN ULONG BufferOffset, Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,7 +14,7 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatCleanup(PVFAT_IRP_CONTEXT IrpContext) +VfatCleanup(PFAT_IRP_CONTEXT IrpContext) { DPRINT("VfatCleanup(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,7 +14,7 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatClose(PVFAT_IRP_CONTEXT IrpContext) +VfatClose(PFAT_IRP_CONTEXT IrpContext) { DPRINT("VfatClose(DeviceObject %p, Irp %p)\n", IrpContext->DeviceObject, IrpContext->Irp); Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,7 +14,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatCreate(PVFAT_IRP_CONTEXT IrpContext) +VfatCreate(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,7 +14,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatDirectoryControl(PVFAT_IRP_CONTEXT IrpContext) +VfatDirectoryControl(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -1,26 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/iface.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * PROJECT: ReactOS FAT file system driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filesystems/fastfat/fastfat.c + * PURPOSE: Initialization routines + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -28,103 +11,104 @@ #define NDEBUG #include "fastfat.h" -/* GLOBALS *****************************************************************/ +/* GLOBALS ******************************************************************/ -PVFAT_GLOBAL_DATA VfatGlobalData; +FAT_GLOBAL_DATA FatGlobalData; /* FUNCTIONS ****************************************************************/ -NTSTATUS NTAPI +NTSTATUS +NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -/* - * FUNCTION: Called by the system to initialize the driver - * ARGUMENTS: - * DriverObject = object describing this driver - * RegistryPath = path to our configuration entries - * RETURNS: Success or failure - */ + PUNICODE_STRING RegistryPath) { - PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); - NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); + NTSTATUS Status; - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); + /* Create a device object */ + Status = IoCreateDevice(DriverObject, + 0, + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); - if (Status == STATUS_OBJECT_NAME_EXISTS || - Status == STATUS_OBJECT_NAME_COLLISION) - { - /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ - RtlInitUnicodeString(&DeviceName, L"\\RosFat"); - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - } + if (!NT_SUCCESS(Status)) return Status; + /* Zero global storage */ + RtlZeroMemory(&FatGlobalData, sizeof(FAT_GLOBAL_DATA)); + FatGlobalData.DriverObject = DriverObject; + FatGlobalData.DiskDeviceObject = DeviceObject; + // TODO: Fill major function handlers +#if 0 + DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_READ] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_WRITE] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = + VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = + VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = VfatShutdown; + DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VfatBuildRequest; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest; +#endif - if (!NT_SUCCESS(Status)) - { - return (Status); - } + DriverObject->DriverUnload = NULL; - VfatGlobalData = DeviceObject->DeviceExtension; - RtlZeroMemory (VfatGlobalData, sizeof(VFAT_GLOBAL_DATA)); - VfatGlobalData->DriverObject = DriverObject; - VfatGlobalData->DeviceObject = DeviceObject; + /* Initialize cache manager callbacks */ + FatGlobalData.CacheMgrCallbacks.AcquireForLazyWrite = FatAcquireForLazyWrite; + FatGlobalData.CacheMgrCallbacks.ReleaseFromLazyWrite = FatReleaseFromLazyWrite; + FatGlobalData.CacheMgrCallbacks.AcquireForReadAhead = FatAcquireForReadAhead; + FatGlobalData.CacheMgrCallbacks.ReleaseFromReadAhead = FatReleaseFromReadAhead; - DeviceObject->Flags |= DO_DIRECT_IO; - /*DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_READ] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_WRITE] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = - VfatBuildRequest;*/ - DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = VfatShutdown; - /*DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VfatBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest;*/ + FatGlobalData.CacheMgrCallbacks.AcquireForLazyWrite = FatNoopAcquire; + FatGlobalData.CacheMgrCallbacks.ReleaseFromLazyWrite = FatNoopRelease; + FatGlobalData.CacheMgrCallbacks.AcquireForReadAhead = FatNoopAcquire; + FatGlobalData.CacheMgrCallbacks.ReleaseFromReadAhead = FatNoopRelease; - DriverObject->DriverUnload = NULL; + /* Initialize Fast I/O dispatchers */ + FatInitFastIoRoutines(&FatGlobalData.FastIoDispatch); + DriverObject->FastIoDispatch = &FatGlobalData.FastIoDispatch; - /* Cache manager */ - VfatGlobalData->CacheMgrCallbacks.AcquireForLazyWrite = VfatAcquireForLazyWrite; - VfatGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite = VfatReleaseFromLazyWrite; - VfatGlobalData->CacheMgrCallbacks.AcquireForReadAhead = VfatAcquireForReadAhead; - VfatGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = VfatReleaseFromReadAhead; + /* Initialize lookaside lists */ + ExInitializeNPagedLookasideList(&FatGlobalData.NonPagedFcbList, + NULL, + NULL, + 0, + sizeof(VFATFCB), + TAG_FCB, + 0); - /* Fast I/O */ - VfatInitFastIoRoutines(&VfatGlobalData->FastIoDispatch); - DriverObject->FastIoDispatch = &VfatGlobalData->FastIoDispatch; + ExInitializeNPagedLookasideList(&FatGlobalData.ResourceList, + NULL, + NULL, + 0, + sizeof(ERESOURCE), + TAG_CCB, + 0); - /* Private lists */ - ExInitializeNPagedLookasideList(&VfatGlobalData->FcbLookasideList, - NULL, NULL, 0, sizeof(VFATFCB), TAG_FCB, 0); - ExInitializeNPagedLookasideList(&VfatGlobalData->CcbLookasideList, - NULL, NULL, 0, sizeof(VFATCCB), TAG_CCB, 0); - ExInitializeNPagedLookasideList(&VfatGlobalData->IrpContextLookasideList, - NULL, NULL, 0, sizeof(VFAT_IRP_CONTEXT), TAG_IRP, 0); + ExInitializeNPagedLookasideList(&FatGlobalData.IrpContextList, + NULL, + NULL, + 0, + sizeof(FAT_IRP_CONTEXT), + TAG_IRP, + 0); - ExInitializeResourceLite(&VfatGlobalData->VolumeListLock); - InitializeListHead(&VfatGlobalData->VolumeListHead); - IoRegisterFileSystem(DeviceObject); - return(STATUS_SUCCESS); + /* Register and reference our filesystem */ + IoRegisterFileSystem(DeviceObject); + ObReferenceObject(DeviceObject); + + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -296,19 +296,17 @@ typedef struct { - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - ULONG Flags; - ERESOURCE VolumeListLock; - LIST_ENTRY VolumeListHead; - NPAGED_LOOKASIDE_LIST FcbLookasideList; - NPAGED_LOOKASIDE_LIST CcbLookasideList; - NPAGED_LOOKASIDE_LIST IrpContextLookasideList; - FAST_IO_DISPATCH FastIoDispatch; - CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; -} VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; - -extern PVFAT_GLOBAL_DATA VfatGlobalData; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DiskDeviceObject; + NPAGED_LOOKASIDE_LIST NonPagedFcbList; + NPAGED_LOOKASIDE_LIST ResourceList; + NPAGED_LOOKASIDE_LIST IrpContextList; + FAST_IO_DISPATCH FastIoDispatch; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; + CACHE_MANAGER_CALLBACKS CacheMgrNoopCallbacks; +} FAT_GLOBAL_DATA, *VFAT_GLOBAL_DATA; + +extern VFAT_GLOBAL_DATA VfatGlobalData; #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_DELETE_PENDING 0x0002 @@ -449,7 +447,7 @@ PFILE_OBJECT FileObject; ULONG RefCount; KEVENT Event; -} VFAT_IRP_CONTEXT, *PVFAT_IRP_CONTEXT; +} FAT_IRP_CONTEXT, *PFAT_IRP_CONTEXT; typedef struct _VFAT_DIRENTRY_CONTEXT { @@ -469,9 +467,9 @@ /* -------------------------------------------------------- volume.c */ -NTSTATUS VfatQueryVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatQueryVolumeInformation (PFAT_IRP_CONTEXT IrpContext); + +NTSTATUS VfatSetVolumeInformation (PFAT_IRP_CONTEXT IrpContext); /* ------------------------------------------------------ blockdev.c */ @@ -481,13 +479,13 @@ IN PUCHAR Buffer, IN BOOLEAN Override); -NTSTATUS VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, +NTSTATUS VfatReadDiskPartial (IN PFAT_IRP_CONTEXT IrpContext, IN PLARGE_INTEGER ReadOffset, IN ULONG ReadLength, IN ULONG BufferOffset, IN BOOLEAN Wait); -NTSTATUS VfatWriteDiskPartial(IN PVFAT_IRP_CONTEXT IrpContext, +NTSTATUS VfatWriteDiskPartial(IN PFAT_IRP_CONTEXT IrpContext, IN PLARGE_INTEGER WriteOffset, IN ULONG WriteLength, IN ULONG BufferOffset, @@ -503,7 +501,7 @@ /* ----------------------------------------------------------- dir.c */ -NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT); +NTSTATUS VfatDirectoryControl (PFAT_IRP_CONTEXT); BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, USHORT DosDate, @@ -517,7 +515,7 @@ /* -------------------------------------------------------- create.c */ -NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatCreate (PFAT_IRP_CONTEXT IrpContext); NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Parent, @@ -533,43 +531,51 @@ /* --------------------------------------------------------- close.c */ -NTSTATUS VfatClose (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatClose (PFAT_IRP_CONTEXT IrpContext); NTSTATUS VfatCloseFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject); /* ------------------------------------------------------- cleanup.c */ -NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatCleanup (PFAT_IRP_CONTEXT IrpContext); /* --------------------------------------------------------- fastio.c */ VOID -VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch); +FatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch); BOOLEAN NTAPI -VfatAcquireForLazyWrite(IN PVOID Context, +FatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait); VOID NTAPI -VfatReleaseFromLazyWrite(IN PVOID Context); +FatReleaseFromLazyWrite(IN PVOID Context); BOOLEAN NTAPI -VfatAcquireForReadAhead(IN PVOID Context, +FatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait); VOID NTAPI -VfatReleaseFromReadAhead(IN PVOID Context); +FatReleaseFromReadAhead(IN PVOID Context); + +BOOLEAN NTAPI +FatNoopAcquire(IN PVOID Context, + IN BOOLEAN Wait); + +VOID NTAPI +FatNoopRelease(IN PVOID Context); + /* --------------------------------------------------------- fsctl.c */ -NTSTATUS VfatFileSystemControl (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatFileSystemControl (PFAT_IRP_CONTEXT IrpContext); /* --------------------------------------------------------- finfo.c */ -NTSTATUS VfatQueryInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetInformation (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatQueryInformation (PFAT_IRP_CONTEXT IrpContext); + +NTSTATUS VfatSetInformation (PFAT_IRP_CONTEXT IrpContext); NTSTATUS VfatSetAllocationSizeInformation(PFILE_OBJECT FileObject, @@ -745,9 +751,9 @@ /* ------------------------------------------------------------ rw.c */ -NTSTATUS VfatRead (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatRead (PFAT_IRP_CONTEXT IrpContext); + +NTSTATUS VfatWrite (PFAT_IRP_CONTEXT IrpContext); NTSTATUS NextCluster(PDEVICE_EXTENSION DeviceExt, ULONG FirstCluster, @@ -756,12 +762,12 @@ /* ----------------------------------------------------------- misc.c */ -NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT IrpContext); - -PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, +NTSTATUS VfatQueueRequest(PFAT_IRP_CONTEXT IrpContext); + +PFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, PIRP Irp); -VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); +VOID VfatFreeIrpContext(PFAT_IRP_CONTEXT IrpContext); DRIVER_DISPATCH VfatBuildRequest; NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, @@ -778,7 +784,7 @@ ULONG EaLength); /* ------------------------------------------------------------- flush.c */ -NTSTATUS VfatFlush(PVFAT_IRP_CONTEXT IrpContext); +NTSTATUS VfatFlush(PFAT_IRP_CONTEXT IrpContext); NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -326,8 +326,9 @@ return STATUS_SUCCESS; } -BOOLEAN NTAPI -VfatAcquireForLazyWrite(IN PVOID Context, +BOOLEAN +NTAPI +FatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait) { PVFATFCB Fcb = (PVFATFCB)Context; @@ -342,8 +343,9 @@ return TRUE; } -VOID NTAPI -VfatReleaseFromLazyWrite(IN PVOID Context) +VOID +NTAPI +FatReleaseFromLazyWrite(IN PVOID Context) { PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); @@ -352,8 +354,9 @@ ExReleaseResourceLite(&(Fcb->MainResource)); } -BOOLEAN NTAPI -VfatAcquireForReadAhead(IN PVOID Context, +BOOLEAN +NTAPI +FatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait) { PVFATFCB Fcb = (PVFATFCB)Context; @@ -368,8 +371,9 @@ return TRUE; } -VOID NTAPI -VfatReleaseFromReadAhead(IN PVOID Context) +VOID +NTAPI +FatReleaseFromReadAhead(IN PVOID Context) { PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); @@ -378,8 +382,23 @@ ExReleaseResourceLite(&(Fcb->MainResource)); } +BOOLEAN +NTAPI +FatNoopAcquire(IN PVOID Context, + IN BOOLEAN Wait) +{ + return TRUE; +} + VOID -VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch) +NTAPI +FatNoopRelease(IN PVOID Context) +{ +} + + +VOID +FatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch) { FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); FastIoDispatch->FastIoCheckIfPossible = VfatFastIoCheckIfPossible; Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -13,12 +13,12 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS VfatQueryInformation(PVFAT_IRP_CONTEXT IrpContext) +NTSTATUS VfatQueryInformation(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } -NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext) +NTSTATUS VfatSetInformation(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -21,7 +21,7 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS VfatFlush(PVFAT_IRP_CONTEXT IrpContext) +NTSTATUS VfatFlush(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,7 +14,7 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) +VfatFileSystemControl(PFAT_IRP_CONTEXT IrpContext) { DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,13 +14,13 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -VfatRead(PVFAT_IRP_CONTEXT IrpContext) +VfatRead(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } NTSTATUS -VfatWrite(PVFAT_IRP_CONTEXT IrpContext) +VfatWrite(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Sun Jan 11 09:58:57 2009 @@ -14,13 +14,13 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -VfatQueryVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) +VfatQueryVolumeInformation(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; } NTSTATUS -VfatSetVolumeInformation(PVFAT_IRP_CONTEXT IrpContext) +VfatSetVolumeInformation(PFAT_IRP_CONTEXT IrpContext) { return STATUS_NOT_IMPLEMENTED; }

15 years, 8 months

[mjmartin] 38699: - Last implementation was failing to charge the QuotaAvailable for the message length proceeding the message in the buffer, causing overwriting of the pool. See bug 4018 for more info.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Jan 11 08:28:45 2009 New Revision: 38699 URL: http://svn.reactos.org/svn/reactos?rev=38699&view=rev Log: - Last implementation was failing to charge the QuotaAvailable for the message length proceeding the message in the buffer, causing overwriting of the pool. See bug 4018 for more info. Modified: trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sun Jan 11 08:28:45 2009 @@ -438,6 +438,7 @@ break; } ExReleaseFastMutex(&Ccb->DataListLock); + if (IoIsOperationSynchronous(Irp)) { /* Wait for ReadEvent to become signaled */ @@ -448,8 +449,7 @@ Irp->RequestorMode, FALSE, NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); - ExAcquireFastMutex(&Ccb->DataListLock); + DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { @@ -460,6 +460,7 @@ { ASSERT(FALSE); } + ExAcquireFastMutex(&Ccb->DataListLock); } else { @@ -526,26 +527,25 @@ DPRINT("Message mode\n"); /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ - if (Ccb->ReadDataAvailable) { ULONG NextMessageLength=0; //HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); - /*First get the size of the message */ memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); - - if (NextMessageLength == 0) + if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) { DPRINT1("This should never happen! Possible memory corruption.\n"); #ifndef NDEBUG HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); #endif - break; + ASSERT(FALSE); } /* Use the smaller value */ + CopyLength = min(NextMessageLength, Length); + /* retrieve the message from the buffer */ memcpy(Buffer, (PVOID)((ULONG)Ccb->Data + sizeof(NextMessageLength)), CopyLength); @@ -558,6 +558,7 @@ /* Calculate the remaining message new size */ ULONG NewMessageSize = NextMessageLength-CopyLength; + /* Write a new Message size to buffer for the part of the message still there */ memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); @@ -568,10 +569,15 @@ /* Update the write pointer */ Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - CopyLength); + + /* Add CopyLength only to WriteQuotaAvailable as the + Message Size was replaced in the buffer */ + Ccb->WriteQuotaAvailable += CopyLength; } else { /* Client wanted the entire message */ + /* Move the memory starting from the next Message just retrieved */ memmove(Ccb->Data, (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), @@ -579,14 +585,24 @@ /* Update the write pointer */ Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - NextMessageLength); + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (CopyLength + sizeof(NextMessageLength)); } } else { /* This was the last Message, so just zero this messages for safety sake */ memset(Ccb->Data,0,NextMessageLength + sizeof(NextMessageLength)); - /* reset the write pointer */ + + /* reset the write pointer to beginning of buffer */ Ccb->WritePtr = Ccb->Data; + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (CopyLength + sizeof(ULONG)); + KeResetEvent(&Ccb->ReadEvent); if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) { @@ -599,8 +615,10 @@ #endif Information += CopyLength; - Ccb->WriteQuotaAvailable +=CopyLength; + Ccb->ReadDataAvailable -= CopyLength; + + if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); } if (Information > 0) @@ -700,7 +718,7 @@ if (Irp->MdlAddress == NULL) { - DPRINT("Irp->MdlAddress == NULL\n"); + DPRINT1("Irp->MdlAddress == NULL\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; @@ -708,7 +726,7 @@ if (ReaderCcb == NULL) { - DPRINT("Pipe is NOT connected!\n"); + DPRINT1("Pipe is NOT connected!\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -721,7 +739,7 @@ if (ReaderCcb->Data == NULL) { - DPRINT("Pipe is NOT writable!\n"); + DPRINT1("Pipe is NOT writable!\n"); Status = STATUS_UNSUCCESSFUL; Length = 0; goto done; @@ -738,7 +756,7 @@ while(1) { - if (ReaderCcb->WriteQuotaAvailable == 0) + if ((ReaderCcb->WriteQuotaAvailable == 0)) { KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) @@ -749,14 +767,14 @@ } ExReleaseFastMutex(&ReaderCcb->DataListLock); - DPRINT("Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); + DPRINT("Write Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); Status = KeWaitForSingleObject(&Ccb->WriteEvent, UserRequest, Irp->RequestorMode, FALSE, NULL); - DPRINT("Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - + DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); + ExAcquireFastMutex(&ReaderCcb->DataListLock); if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; @@ -777,8 +795,6 @@ // ExReleaseFastMutex(&ReaderCcb->DataListLock); goto done; } - - ExAcquireFastMutex(&ReaderCcb->DataListLock); } if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) @@ -825,21 +841,41 @@ { /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ /* FIXME: Check and verify ReadMode ByteStream */ - DPRINT("Message mode\n"); + if (Length > 0) { - CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable); + /* Verify the WritePtr is still inside the buffer */ + if (((ULONG)ReaderCcb->WritePtr > ((ULONG)ReaderCcb->Data + (ULONG)ReaderCcb->MaxDataLength)) || + ((ULONG)ReaderCcb->WritePtr < (ULONG)ReaderCcb->Data)) + { + DPRINT1("NPFS is writing out of its buffer. Report to developer!\n"); + DPRINT1("ReaderCcb->WritePtr %x, ReaderCcb->Data %x, ReaderCcb->MaxDataLength%d\n", + ReaderCcb->WritePtr,ReaderCcb->Data,ReaderCcb->MaxDataLength); + ASSERT(FALSE); + } + + CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable - sizeof(ULONG)); + /* First Copy the Length of the message into the pipes buffer */ memcpy(ReaderCcb->WritePtr, &CopyLength, sizeof(CopyLength)); + /* Now the user buffer itself */ memcpy((PVOID)((ULONG)ReaderCcb->WritePtr+ sizeof(CopyLength)), Buffer, CopyLength); + /* Update the write pointer */ ReaderCcb->WritePtr = (PVOID)((ULONG)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); Information += CopyLength; ReaderCcb->ReadDataAvailable += CopyLength; - ReaderCcb->WriteQuotaAvailable -= CopyLength; + + ReaderCcb->WriteQuotaAvailable -= (CopyLength + sizeof(ULONG)); + + if ((ULONG)ReaderCcb->WriteQuotaAvailable > (ULONG)ReaderCcb->MaxDataLength) + { + DPRINT1("QuotaAvailable is greater than buffer size!\n"); + ASSERT(FALSE); + } } if (Information > 0)

15 years, 8 months

[fireball] 38698: - Delete old source code (only fastio.c and DriverEntry remain for now). - Create a base for a future skeleton.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 11 08:10:54 2009 New Revision: 38698 URL: http://svn.reactos.org/svn/reactos?rev=38698&view=rev Log: - Delete old source code (only fastio.c and DriverEntry remain for now). - Create a base for a future skeleton. Added: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c - copied, changed from r38694, trunk/reactos/drivers/filesystems/fastfat_new/iface.c Removed: trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c trunk/reactos/drivers/filesystems/fastfat_new/iface.c trunk/reactos/drivers/filesystems/fastfat_new/misc.c trunk/reactos/drivers/filesystems/fastfat_new/string.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/direntry.c trunk/reactos/drivers/filesystems/fastfat_new/ea.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/flush.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Removed: trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/ea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Copied: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c (from r38694, trunk/reactos/drivers/filesystems/fastfat_new/iface.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Removed: trunk/reactos/drivers/filesystems/fastfat_new/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Removed: trunk/reactos/drivers/filesystems/fastfat_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Removed: trunk/reactos/drivers/filesystems/fastfat_new/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…

15 years, 8 months

[fireball] 38697: Olaf Siejka <olaf_siejka@o2.pl> - Add VBE 24bpp modes into 1st stage setup.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 11 08:05:07 2009 New Revision: 38697 URL: http://svn.reactos.org/svn/reactos?rev=38697&view=rev Log: Olaf Siejka <olaf_siejka(a)o2.pl> - Add VBE 24bpp modes into 1st stage setup. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Jan 11 08:05:07 2009 @@ -84,12 +84,15 @@ vga = "VGA Display (640x480x4)",,Vga,640,480,4 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 +vbe_640x480x24 = "VESA Display (640x480x24)",,VBE,640,480,24 vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32 vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 vbe = "VESA Display (800x600x16)",,VBE,800,600,16 +vbe_800x600x24 = "VESA Display (800x600x24)",,VBE,800,600,24 vbe_800x600x32 = "VESA Display (800x600x32)",,VBE,800,600,32 vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8 vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 +vbe_1024x768x24 = "VESA Display (1024x768x24)",,VBE,1024,768,24 vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32 [Map.Display]

15 years, 8 months

[dgoette] 38696: * remove checks for users security level or membership checks and replace them with area protection which can be assigned per group. * Also implement a admin interface for this * update converter * minor bugfixes

by dgoette＠svn.reactos.org

Author: dgoette Date: Sun Jan 11 06:41:52 2009 New Revision: 38696 URL: http://svn.reactos.org/svn/reactos?rev=38696&view=rev Log: * remove checks for users security level or membership checks and replace them with area protection which can be assigned per group. * Also implement a admin interface for this * update converter * minor bugfixes Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_System.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/index.php branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Maintain.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Welcome.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Tag.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/ThisUser.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -42,4 +42,32 @@ $config->setPathGenerated('/reactos/'); // path to generated files $config->setPathRoscms('/reactos/roscms/'); // path to roscms files + + +// RosCMS Table Names +define('ROSCMST_ACCESS' , 'roscms_access'); +define('ROSCMST_AREA' , 'roscms_area'); +define('ROSCMST_USERS' , 'roscms_accounts'); +define('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); +define('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); +define('ROSCMST_COUNTRIES' , 'roscms_countries'); +define('ROSCMST_ENTRIES' , 'roscms_entries'); +define('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); +define('ROSCMST_STEXT' , 'roscms_entries_stext'); +define('ROSCMST_TAGS' , 'roscms_entries_tags'); +define('ROSCMST_TEXT' , 'roscms_entries_text'); +define('ROSCMST_FILTER' , 'roscms_filter'); +define('ROSCMST_GROUPS' , 'roscms_groups'); +define('ROSCMST_JOBS' , 'roscms_jobs'); +define('ROSCMST_LANGUAGES' , 'roscms_languages'); +define('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); +define('ROSCMST_MEMBERSHIPS', 'roscms_rel_groups_accounts'); +define('ROSCMST_ENTRY_AREA' , 'roscms_rel_groups_acl'); +define('ROSCMST_AREA_ACCESS', 'roscms_rel_groups_area'); +define('ROSCMST_DEPENCIES' , 'roscms_rel_revisions_depencies'); +define('ROSCMST_ACL' , 'roscms_rel_rights_access'); +define('ROSCMST_RIGHTS' , 'roscms_rights'); +define('ROSCMST_TIMEZONES' , 'roscms_timezones'); + + ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -124,7 +124,7 @@ -- -------------------------------------------------------- -- create and convert access lists (allowed groups are stored in rel_groups_access) -- -------------------------------------------------------- -CREATE TABLE roscms_access ( +CREATE TABLE roscms_entries_access ( id bigint(20) unsigned NOT NULL auto_increment, name varchar(100) collate utf8_unicode_ci NOT NULL, name_short varchar(50) collate utf8_unicode_ci NOT NULL, @@ -134,7 +134,7 @@ UNIQUE KEY name_short (name_short) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -INSERT INTO roscms_access +INSERT INTO roscms_entries_access SELECT NULL, sec_fullname, @@ -146,7 +146,7 @@ -- -------------------------------------------------------- --- create access lists (need to run seperate script) +-- create access lists -- -------------------------------------------------------- CREATE TABLE roscms_rel_groups_access ( acl_id bigint(20) unsigned NOT NULL COMMENT '->access(id)', @@ -170,7 +170,7 @@ s.sec_lev1_add, s.sec_lev1_pub, s.sec_lev1_trans -FROM roscms_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 1 +FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 1 UNION SELECT a.id, @@ -181,7 +181,7 @@ s.sec_lev2_add, s.sec_lev2_pub, s.sec_lev2_trans -FROM roscms_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 2 +FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 2 UNION SELECT a.id, @@ -192,14 +192,97 @@ s.sec_lev3_add, s.sec_lev3_pub, s.sec_lev3_trans -FROM roscms_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 3; - -UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name +FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 3; + +UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_entries_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name SET ga.can_read=TRUE, ga.can_write=TRUE, ga.can_add=TRUE, ga.can_delete=TRUE, ga.can_publish=TRUE, ga.can_translate=TRUE WHERE s.sec_allow LIKE CONCAT('%',g.name_short,'%'); -UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name +UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_entries_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name SET ga.can_read=FALSE, ga.can_write=FALSE, ga.can_add=FALSE, ga.can_delete=FALSE, ga.can_publish=FALSE, ga.can_translate=FALSE WHERE s.sec_deny LIKE CONCAT('%',g.name_short,'%'); + + +-- -------------------------------------------------------- +-- create areas +-- -------------------------------------------------------- +CREATE TABLE roscms_area ( + id bigint(20) NOT NULL auto_increment, + `name` varchar(30) NOT NULL, + name_short varchar(15) NOT NULL, + description varchar(255) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY `name` (`name`), + UNIQUE KEY name_short (name_short) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO roscms_area VALUES +(1, 'System Tags', 'system_tags', 'Can the user modify/see system tags'), +(2, 'Content Management System', 'CMS', 'RosCMS Interface itself'), +(3, 'Entry Details', 'entry_details', 'Shows Entry Details such as Rev-ID'), +(4, 'New Entries', 'new_entry', 'Be able to create new entries'), +(5, 'Admin Branch', 'admin', 'Can Access Admin Branch'), +(6, 'Delete Files', 'delete_file', 'Able to delete files from generated content'), +(7, 'User Branch', 'user', 'Access user branch'), +(8, 'Add Translator', 'addtransl', 'add someone to translator group'), +(9, 'Add new membership', 'addmembership', 'add someone to new group'), +(10, 'Delete Membership', 'delmembership', 'removes someones membership to a group'), +(11, 'Disable Account', 'disableaccount', 'disable/enable user accounts'), +(12, 'User Details', 'user_details', 'Access to user details, such as user groups, user-id and contact data'), +(13, 'Foreign Drafts', 'other_drafts', 'beein able to view drafts of other people'), +(14, 'Maintain Branch', 'maintain', 'Access to Maintain branch'), +(15, 'Statistics Branch', 'stats', 'Access to Statistics branch'), +(16, 'Website Branch', 'website', 'Access to Website branch'), +(17, 'Pages', 'pages', 'View Pages'), +(18, 'Dynamic Pages', 'dynamic_pages', 'View Dynamic Pages'), +(19, 'Templates', 'templates', 'View Page Templates'), +(20, 'Scripts', 'scripts', 'View Scripts'), +(21, 'Delete Tags', 'deltag', 'Delete System Tags from entries'), +(22, 'Update Tags', 'updatetag', 'Update Tag value'), +(23, 'More Languages', 'more_lang', 'Can change things in more languages than the user has set in his profile'), +(24, 'Logs', 'logs', 'Can view Logs'), +(25, 'Delete Entries', 'del_entry', 'Delete Entries'), +(26, 'Delete without archiv', 'del_wo_archiv', 'delete entries without moving them to archiv'), +(27, 'add level 0 group', 'addlvl0group', 'Add memberships with group security level 0'), +(28, 'add level 1 groups', 'addlvl1group', 'Add memberships with group security level 1'), +(29, 'add level 2 groups', 'addlvl2group', 'Add memberships with group security level 2'), +(30, 'add level 3 groups', 'addlvl3group', 'Add memberships with group security level 3'), +(31, 'Mix private & public entries', 'mix_priv_pub', 'show private and public type entries together'), +(32, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); + + + +-- -------------------------------------------------------- +-- create area protection list +-- -------------------------------------------------------- +CREATE TABLE roscms_rel_groups_area ( + group_id bigint(20) NOT NULL, + area_id bigint(20) NOT NULL, + PRIMARY KEY (group_id,area_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO roscms_rel_groups_area +SELECT g.id, a.id +FROM roscms_area a JOIN roscms_groups g +WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group') +AND g.security_level > 1) + +OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain') +AND g.security_level = 3) + +OR ((a.name_short = 'admin' OR a.name_short = 'logs' OR a.name_short = 'addlvl3group') +AND g.name_short = 'ros_sadmin') + +OR ((a.name_short='pages' OR a.name_short = 'templates' OR a.name_short = 'scripts') +AND g.security_level > 1 AND g.name_short != 'transmaint') + +OR ((a.name_short = 'CMS' OR a.name_short = 'website' OR a.name_short = 'addlvl0group') +AND g.security_level > 0) + +OR ((a.name_short = 'maintain' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'addtransl' OR a.name_short = 'addlvl0group') +AND g.name_short = 'transmaint') + +OR ((a.name_short = 'more_lang') +AND g.name_short != 'translator' AND g.name_short != 'transmaint' AND g.security_level > 0); -- -------------------------------------------------------- @@ -227,7 +310,7 @@ s.id, d.data_id, 1 -FROM data_a d JOIN roscms_access s ON d.data_acl=s.name_short +FROM data_a d JOIN roscms_entries_access s ON d.data_acl=s.name_short UNION SELECT NULL, @@ -236,7 +319,7 @@ s.id, d.data_id, 0 -FROM data_ d JOIN roscms_access s ON d.data_acl=s.name_short; +FROM data_ d JOIN roscms_entries_access s ON d.data_acl=s.name_short; @@ -577,7 +660,6 @@ PRIMARY KEY (id), KEY name (name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - @@ -641,4 +723,4 @@ DROP TABLE users; DROP TABLE user_unsafenames; DROP TABLE user_unsafepwds; -DROP TABLE user_sessions; +DROP TABLE user_sessions; Modified: branches/danny-web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -32,7 +32,6 @@ require_once('config.php'); require_once('lib/RosCMS_Autoloader.class.php'); -require_once('lib/DBConnection.class.php'); // strips whitespace from sourcecode function echo_strip( $text ) { @@ -173,6 +172,9 @@ case 'lang': new Admin_Languages(); break; + case 'system': + new Admin_System(); + break; default: die(''); break; Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -82,6 +82,27 @@ if (uf==true) { makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=delete&submit=true', 'POST'); } + return false; +} + + + +/** + * @FILLME + */ +function showAreaProtection( ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=system&action=apl', 'GET'); +} + + + +/** + * @FILLME + */ +function submitAreaProtection( ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=system&action=apl&submit=true', 'POST'); return false; } Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -8,14 +8,18 @@ { var soptckd = ''; - // get request type - if (document.getElementById('searchopt1').checked) soptckd = 'accountname'; - if (document.getElementById('searchopt2').checked) soptckd = 'fullname'; - if (document.getElementById('searchopt3').checked) soptckd = 'email'; - if (document.getElementById('searchopt4').checked) soptckd = 'website'; - if (document.getElementById('searchopt5').checked) soptckd = 'language'; + // only start with more than two chars + if (document.getElementById('textfield').value.length > 2) { - makeRequest('?page=data_out&d_f=user&d_u=usrtbl&d_fl=list&d_val='+encodeURIComponent(document.getElementById('textfield').value)+'&d_val2='+encodeURIComponent(soptckd)); + // get request type + if (document.getElementById('searchopt1').checked) soptckd = 'accountname'; + if (document.getElementById('searchopt2').checked) soptckd = 'fullname'; + if (document.getElementById('searchopt3').checked) soptckd = 'email'; + if (document.getElementById('searchopt4').checked) soptckd = 'website'; + if (document.getElementById('searchopt5').checked) soptckd = 'language'; + + makeRequest('?page=data_out&d_f=user&d_u=usrtbl&d_fl=list&d_val='+encodeURIComponent(document.getElementById('textfield').value)+'&d_val2='+encodeURIComponent(soptckd)); + } } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -33,7 +33,7 @@ // check if user has enough rights Login::required(); - if (ThisUser::getInstance()->securityLevel() < 3) { + if (!ThisUser::getInstance()->hasAccess('admin')) { die('Not enough rights to access this Area.'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -116,7 +116,7 @@ if ($access_id !== false) { // prepare for usage in loop - $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ACL." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRY_AREA." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); $stmt_ins->bindParam('acl_id',$access_id,PDO::PARAM_INT); // insert access rights for each group @@ -249,7 +249,7 @@ <th title="translate">T</th> </tr>'); - $stmt=&DBConnection::getInstance()->prepare("SELECT g.id, g.name, g.security_level, g.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ACL." a JOIN ".ROSCMST_GROUPS." g ON g.id=a.group_id WHERE a.acl_id=:acl_id ORDER BY g.security_level ASC, g.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT g.id, g.name, g.security_level, g.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ENTRY_AREA." a JOIN ".ROSCMST_GROUPS." g ON g.id=a.group_id WHERE a.acl_id=:acl_id ORDER BY g.security_level ASC, g.name ASC"); $stmt->bindParam('acl_id',$access['id'],PDO::PARAM_INT); $stmt->execute(); while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -294,7 +294,7 @@ $success = $success && $stmt->execute(); // prepare for usage in loop - $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ACL." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); + $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRY_AREA." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); $stmt_ins->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); // insert access rights for each group @@ -385,7 +385,7 @@ // delete rights list if ($success) { - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ACL." WHERE acl_id=:acl_id"); + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ENTRY_AREA." WHERE acl_id=:acl_id"); $stmt->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); $success = $success && $stmt->execute(); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -124,7 +124,7 @@ if ($group_id !== false) { // prepare for usage in loop - $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ACL." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRY_AREA." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); $stmt_ins->bindParam('group_id',$group_id,PDO::PARAM_INT); // insert access rights for each group @@ -265,7 +265,7 @@ <th title="translate">T</th> </tr>'); - $stmt=&DBConnection::getInstance()->prepare("SELECT s.id, s.name, s.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ACCESS." s JOIN ".ROSCMST_ACL." a ON a.acl_id=s.id WHERE a.group_id=:group_id ORDER BY name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT s.id, s.name, s.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ACCESS." s JOIN ".ROSCMST_ENTRY_AREA." a ON a.acl_id=s.id WHERE a.group_id=:group_id ORDER BY name ASC"); $stmt->bindParam('group_id',$group['id'],PDO::PARAM_INT); $stmt->execute(); while ($acl = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -310,7 +310,7 @@ $success = $success && $stmt->execute(); // prepare for usage in loop - $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ACL." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); + $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRY_AREA." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); $stmt_ins->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); // insert access rights for each group @@ -380,7 +380,7 @@ // delete rights list if ($success) { - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ACL." WHERE group_id=:group_id"); + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ENTRY_AREA." WHERE group_id=:group_id"); $stmt->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); $success = $success && $stmt->execute(); } Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_System.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_System.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_System.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -1,0 +1,166 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Admin_System + * + */ +class Admin_System +{ + + + + /** + * + * + * @access protected + */ + public function __construct() + { + // check if user has enough rights + Login::required(); + if (!ThisUser::getInstance()->hasAccess('admin')) { + die('Not enough rights to access this Area.'); + } + + // is an action given ? + if (empty($_GET['action'])) { + die('missing param'); + } + + // show requested form + if (empty($_GET['submit'])) { + switch ($_GET['action']) { + case 'apl': + $this->showAPL(); + break; + } + } + + // submit form data + else { + switch ($_GET['action']) { + case 'apl': + $this->submitAPL(); + break; + } + } + } + + + + /** + * + * + * @access protected + */ + protected function showAPL( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name_short, description FROM ".ROSCMST_AREA." ORDER BY name_short ASC"); + $stmt->execute(); + $areas=$stmt->fetchAll(PDO::FETCH_ASSOC); + + echo_strip(' + <h2>Create new Area Protection List (APL)</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Groups Access Rights</legend> + <table> + <tr> + <th style="vertical-align:bottom;" title="Security Level">SecLvl</th> + <th style="vertical-align:bottom;">Group Name</th>'); + foreach ($areas as $area) { + echo '<th style="width: 1em;font-family:monospace;vertical-align:bottom;line-height: 0.8em;" title="'.$area['name_short'].': '.$area['description'].'">'; + for ($i=0; $i<strlen($area['name_short']);$i++) { + echo substr($area['name_short'], $i, 1).'<br />'; + } + echo '</th>'; + } + echo '</tr>'; + + $stmt_is=&DBConnection::getInstance()->prepare("SELECT TRUE FROM ".ROSCMST_AREA." a JOIN ".ROSCMST_AREA_ACCESS." b ON a.id=b.area_id WHERE b.group_id=:group_id AND a.id=:area_id ORDER BY a.name_short LIMIT 1"); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, security_level, description FROM ".ROSCMST_GROUPS." ORDER BY security_level ASC, name ASC"); + $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + $stmt_is->bindParam('group_id',$group['id'],PDO::PARAM_INT); + echo_strip(' + <tr title="'.htmlspecialchars($group['description']).'"> + <td style="text-align:center;">'.$group['security_level'].'</td> + <td>'.htmlspecialchars($group['name']).'</td>'); + foreach ($areas as $area) { + $stmt_is->bindParam('area_id',$area['id'],PDO::PARAM_INT); + $stmt_is->execute(); + $is = $stmt_is->fetchColumn(); + + echo '<td title="'.$group['name'].'--'.$area['name_short'].': '.$area['description'].'"><input type="checkbox" value="1" name="valid'.$group['id'].'_'.$area['id'].'" '.($is ? 'checked="checked"' : '').' /></td>'; + } + echo '</tr>'; + } + + echo_strip(' + </table> + </fieldset> + <button onclick="'."submitAreaProtection()".'">update APL</button> + </form> + '); + } // end of member function showNew + + + + /** + * + * + * @access protected + */ + protected function submitAPL( ) + { + $success = true; + + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_AREA_ACCESS); + $success = $success && $stmt->execute(); + + if ($success) { + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_AREA_ACCESS." (area_id, group_id) VALUES (:area_id,:group_id)"); + foreach ($_POST as $item=>$val) { + if (strpos($item,'valid')===0) { + $item = substr($item, 5); + $id = explode('_',$item); + if($id[0] > 0 && $id[1] > 0 && $val=='true') { + $stmt->bindParam('area_id',$id[1],PDO::PARAM_INT); + $stmt->bindParam('group_id',$id[0],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + } + } + } + } + + // give the user success message + if ($success) { + echo 'Success, Area Protection List was updated successfully'; + } + else { + echo 'Error, while updating Area Protection list'; + } + } // end of member function submitNew + +} // end of Admin_System +?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -17,28 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -// RosCMS Table Names -define('ROSCMST_ACCESS' , 'roscms_access'); -define('ROSCMST_USERS' , 'roscms_accounts'); -define('ROSCMST_FORBIDDEN' , 'roscms_accounts_forbidden'); -define('ROSCMST_SESSIONS' , 'roscms_accounts_sessions'); -define('ROSCMST_COUNTRIES' , 'roscms_countries'); -define('ROSCMST_ENTRIES' , 'roscms_entries'); -define('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); -define('ROSCMST_STEXT' , 'roscms_entries_stext'); -define('ROSCMST_TAGS' , 'roscms_entries_tags'); -define('ROSCMST_TEXT' , 'roscms_entries_text'); -define('ROSCMST_FILTER' , 'roscms_filter'); -define('ROSCMST_GROUPS' , 'roscms_groups'); -define('ROSCMST_JOBS' , 'roscms_jobs'); -define('ROSCMST_LANGUAGES' , 'roscms_languages'); -define('ROSCMST_SUBSYS' , 'roscms_rel_accounts_subsys'); -define('ROSCMST_MEMBERSHIPS', 'roscms_rel_groups_accounts'); -define('ROSCMST_ACL' , 'roscms_rel_groups_access'); -define('ROSCMST_DEPENCIES' , 'roscms_rel_revisions_depencies'); -define('ROSCMST_TIMEZONES' , 'roscms_timezones'); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -40,7 +40,6 @@ $stmt->bindParam('type',$data_type,PDO::PARAM_STR); $stmt->bindParam('lang',$lang_id,PDO::PARAM_INT); $stmt->bindValue('archive',($mode == 'archive'),PDO::PARAM_BOOL); - echo ($mode == 'archive'); $stmt->execute(); $rev_id = $stmt->fetchColumn(); @@ -187,7 +186,7 @@ public static function deleteFile( $rev_id ) { // only for admins - if (ThisUser::getInstance()->securityLevel() < 3) { + if (!ThisUser::getInstance()->hasAccess('delete_file')) { return; } @@ -634,7 +633,7 @@ // mark as stable case 'ms': - if ($thisuser->securityLevel() > 1 && $thisuser->isMemberOfGroup('transmaint')) { + if (!$thisuser->hasAccess('more_lang')) { // check for user language if ($user_lang == '') { @@ -706,7 +705,7 @@ // mark as new case 'mn': - if ($thisuser->securityLevel() > 1 && $thisuser->isMemberOfGroup('transmaint')) { + if (!$thisuser->hasAccess('more_lang')) { // check for user language if ($user_lang == 0) { @@ -745,10 +744,10 @@ // delete entry case 'xe': - if ($thisuser->securityLevel() > 1 || $revision['user_id'] == $thisuser->id()) { + if ($thisuser->hasAccess('del_entry') || $revision['user_id'] == $thisuser->id()) { // copy to Archive if no admin - if ($thisuser->securityLevel() < 3) { + if (!$thisuser->hasAccess('del_wo_archiv')) { Data::copy($revision['id'], 0, $lang_id); } //Data::deleteFile($revision['id']); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -78,7 +78,7 @@ case 'newentry': // add a new entry only with higher security level - if ($thisuser->securityLevel() > 1) { + if ($thisuser->hasAccess('new_entry')) { switch ($_GET['d_val']) { case 'dynamic': $this->showAddEntry(self::DYNAMIC); @@ -466,7 +466,7 @@ <option value="page">Page</option> <option value="content">Content</option> <option value="template">Template</option> - <option value="script">Script</option>'.(ThisUser::getInstance()->isMemberOfGroup('ros_sadmin') ? ' + <option value="script">Script</option>'.(ThisUser::getInstance()->hasAccess('dynamic_pages') ? ' <option value="dynamic">Dynamic Page Type</option>' : '').' </select> <br /> @@ -615,7 +615,7 @@ } // allowed only for someone with "add" rights - if (Security::hasRight($this->data_id, 'add')) { + if ($thisuser->hasAccess('entry_fields')) { echo ' | '; // Fields @@ -625,6 +625,9 @@ else { echo '<span class="detailmenu" onclick="'."showEditorTabFields(".$this->rev_id.")".'">Fields</span>'; } + } + + if ($thisuser->hasAccess('entry_revs')) { echo ' | '; if ($mode == self::REVISION) { @@ -636,7 +639,7 @@ } // allowed only for related super administrators - if ($thisuser->isMemberOfGroup('ros_sadmin') || (Security::hasRight($this->data_id, 'add') && $thisuser->isMemberOfGroup('ros_admin'))) { + if ($thisuser->hasAccess('entry_security')) { echo ' | '; // Security @@ -689,7 +692,7 @@ // helper vars $last_user = null; // used in first while, to recognize the last type - if ($thisuser->securityLevel() > 1) { + if ($thisuser->hasAccess('system_tags')) { $stmt=&DBConnection::getInstance()->prepare("SELECT id, user_id, name, value FROM ".ROSCMST_TAGS." WHERE rev_id = :rev_id AND user_id IN(-1, 0,:user_id) ORDER BY user_id ASC, name ASC"); } else { @@ -726,7 +729,7 @@ // allow to delete label if SecLev > 1 // allow to delete sys metadata if user has the rights // allow someone to delete his metadata he set and the user-id > 0 - if (($thisuser->securityLevel() > 1 && $tag['user_id'] == 0) || (Security::hasRight($this->data_id, 'add') && $tag['user_id'] == -1) || ($tag['user_id'] == $thisuser->id() && $tag['user_id'] > 0)) { + if (($thisuser->hasAccess('system_tags') && $tag['user_id'] == -1) || $tag['user_id'] == $thisuser->id()) { echo_strip('   <span class="frmeditbutton" onclick="'."delLabelOrTag('".$tag['id']."')".'"> <img src="images/remove.gif" alt="" style="width:11px; height:11px; border:0px;" /> @@ -746,10 +749,10 @@ <button type="button" onclick="'."addLabelOrTag(".$this->rev_id.",'tag','addtagn', '".$thisuser->id()."')".'">Add</button> <br />'); - if ($thisuser->securityLevel() > 1) { + if ($thisuser->hasAccess('system_tags')) { echo_strip(' <br /> - <h3>Add Label'.(Security::hasRight($this->data_id, 'add') ? ' or System Metadata' : '').'</h3> + <h3>Add Label'.(Security::hasAccess($this->data_id, 'add') ? ' or System Metadata' : '').'</h3> <label for="addtags1" class="normal">Name:</label>  <input type="text" id="addtags1" size="15" maxlength="100" value="" />  <label for="addtags2" class="normal">Value:</label>  @@ -1163,7 +1166,7 @@ <li>Type: '.$revision1['type'].'</li> <li>Language: '.$revision1['language'].'</li> <li>User: '.$revision1['user_name'].'</li>'); - if (ThisUser::getInstance()->securityLevel() > 1) { + if (ThisUser::getInstance()->hasAccess('entry_details')) { echo '<li>Rev-ID: '.$revision1['id'].'</li>'; } echo_strip(' @@ -1175,7 +1178,7 @@ <li>Type: '.$revision2['type'].'</li> <li>Language: '.$revision2['language'].'</li> <li>User: '.$revision2['user_name'].'</li>'); - if (ThisUser::getInstance()->securityLevel() > 1) { + if (ThisUser::getInstance()->hasAccess('entry_details')) { echo '<li>ID: '.$revision2['id'].'</li>'; } echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Maintain.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Maintain.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Maintain.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -53,7 +53,7 @@ { switch ($_GET['d_u']) { case 'optimize': - $stmt=&DBConnection::getInstance()->prepare("OPTIMIZE TABLE ".ROSCMST_ACCESS.",".ROSCMST_USERS.",".ROSCMST_FORBIDDEN.",".ROSCMST_SESSIONS.",".ROSCMST_COUNTRIES.",".ROSCMST_ENTRIES.",".ROSCMST_REVISIONS.",".ROSCMST_STEXT.",".ROSCMST_TAGS.",".ROSCMST_TEXT.",".ROSCMST_FILTER.",".ROSCMST_GROUPS.",".ROSCMST_JOBS.",".ROSCMST_LANGUAGES.",".ROSCMST_SUBSYS.",".ROSCMST_MEMBERSHIPS.",".ROSCMST_ACL.",".ROSCMST_DEPENCIES.",".ROSCMST_TIMEZONES); + $stmt=&DBConnection::getInstance()->prepare("OPTIMIZE TABLE ".ROSCMST_ACCESS.",".ROSCMST_USERS.",".ROSCMST_FORBIDDEN.",".ROSCMST_SESSIONS.",".ROSCMST_COUNTRIES.",".ROSCMST_ENTRIES.",".ROSCMST_REVISIONS.",".ROSCMST_STEXT.",".ROSCMST_TAGS.",".ROSCMST_TEXT.",".ROSCMST_FILTER.",".ROSCMST_GROUPS.",".ROSCMST_JOBS.",".ROSCMST_LANGUAGES.",".ROSCMST_SUBSYS.",".ROSCMST_MEMBERSHIPS.",".ROSCMST_ENTRY_AREA.",".ROSCMST_DEPENCIES.",".ROSCMST_TIMEZONES); $stmt->execute(); Log::writeHigh('optimize database tables: done by '.ThisUser::getInstance()->id().' {data_maintain_out}'); break; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -78,7 +78,7 @@ } // show additional data for security level > 1 - if (ThisUser::getInstance()->securityLevel() > 1) { + if (ThisUser::getInstance()->hasAccess('entry_details')) { echo $t_s.'Rev-ID'.$t_e.$revision['id'].$t_lb; echo $t_s.'Data-ID'.$t_e.$revision['data_id'].$t_lb; echo $t_s.'ACL'.$t_e.$revision['acl'].$t_lb; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -56,16 +56,16 @@ $display = ''; // list / user details $user_id = $_GET['d_val']; $search_string = $_GET['d_val']; - $group_id = $_GET['d_val2']; - $new_lang = $_GET['d_val2']; - $search_type = $_GET['d_Val2']; - - if (!$thisuser->isMemberOfGroup('transmaint') && $thisuser->securityLevel() > 3) { + $group_id = @$_GET['d_val2']; + $new_lang = @$_GET['d_val2']; + $search_type = @$_GET['d_Val2']; + + if (!$thisuser->hasAccess('user')) { return; } - if ($thisuser->isMemberOfGroup('transmaint')) { - $stmt=&DBConnection::getInstance()->prepare("SELECT lang_id FROM ".ROSCMST_LANGUAGES." WHERE id = :user_id LIMIT 1"); + if (!$thisuser->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT lang_id FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); $stmt->bindParam('user_id',$thisuser->id()); $stmt->execute(); $user_lang = $stmt->fetchColumn(); @@ -85,10 +85,9 @@ case 'addmembership': // check if user is already member, so we don't add him twice // also check that you don't give accounts a higher seclevel - $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_MEMBERSHIPS." m JOIN ".ROSCMST_GROUPS." g ON m.group_id = g.id WHERE m.user_id = :user_id AND m.group_id = :group_id AND g.security_level <= :security_level LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_MEMBERSHIPS." m JOIN ".ROSCMST_GROUPS." g ON m.group_id = g.id WHERE m.user_id = :user_id AND m.group_id = :group_id LIMIT 1"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); $stmt->bindParam('group_id',$group_id,PDO::PARAM_STR); - $stmt->bindParam('security_level',$thisuser->securityLevel(),PDO::PARAM_INT); $stmt->execute(); if ($stmt->fetchColumn() === false) { @@ -121,7 +120,7 @@ case 'accountdisable': // only with admin rights - if ($thisuser->securityLevel() == 3) { + if ($thisuser->hasAccess('disableaccount')) { $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_USERS." SET disabled = TRUE WHERE id = :user_id"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); $stmt->execute(); @@ -132,7 +131,7 @@ case 'accountenable': // enable account only with admin rights - if ($thisuser->securityLevel() == 3) { + if ($thisuser->hasAccess('disableaccount')) { // enable account only, if he has already activated his account $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_USERS." SET disabled = FALSE WHERE activation = '' AND id = :user_id"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); @@ -188,7 +187,13 @@ break; } - $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language FROM ".ROSCMST_USERS." u JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE ". $sql_search ." LIKE :value ORDER BY u.name ASC LIMIT 25"); + if ($user_lang === false) { + $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language FROM ".ROSCMST_USERS." u JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE ". $sql_search ." LIKE :value ORDER BY u.name ASC LIMIT 25"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language FROM ".ROSCMST_USERS." u JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE ". $sql_search ." LIKE :value AND u.lang_id=:user_lang ORDER BY u.name ASC LIMIT 25"); + $stmt->bindValue('user_lang',$user_lang,PDO::PARAM_INT); + } $stmt->bindValue('value','%'.$search_string.'%',PDO::PARAM_INT); $stmt->execute(); $users = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -223,7 +228,7 @@ <legend>Details for \''.$user['name'].'\'</legend> <p><strong>Name:</strong> '.$user['name'].' ('.$user['fullname'].') ['.$user['id'].']</p> <p><strong>Lang:</strong> '.$user['language'].'</p>'); - if ($thisuser->securityLevel() == 3) { + if ($thisuser->hasAccess('user_details')) { echo_strip(' <p><strong>E-Mail:</strong> '.$user['email'].'</p> <p><strong>Latest Login:</strong> '.$user['modified'].'; '.$user['logins'].' logins</p> @@ -245,7 +250,7 @@ while ($membership = $stmt->fetch(PDO::FETCH_ASSOC)) { echo '<li>'.$membership['name'].' '; - if ($thisuser->securityLevel() == 3) { + if ($thisuser->hasAccess('delmembership')) { echo_strip('   <span class="frmeditbutton" onclick="'."delMembership(".$user_id.", '".$membership['group_id']."')".'"> @@ -257,16 +262,15 @@ } // end while echo '</ul>'; - if ($thisuser->securityLevel() == 3) { + if ($thisuser->hasAccess('addmembership')) { echo '<select id="cbmmemb" name="cbmmemb">'; - $stmt=&DBConnection::getInstance()->prepare("SELECT g.id, g.name FROM ".ROSCMST_MEMBERSHIPS." m JOIN ".ROSCMST_GROUPS." g ON g.id!=m.group_id WHERE g.security_level <= :sec_level AND m.user_id != :user-id ORDER BY g.name ASC"); - $stmt->bindParam('sec_level',$thisuser->securityLevel(),PDO::PARAM_INT); + $stmt=&DBConnection::getInstance()->prepare("SELECT g.id, g.name FROM ".ROSCMST_MEMBERSHIPS." m JOIN ".ROSCMST_GROUPS." g ON g.id!=m.group_id WHERE m.user_id != :user-id ORDER BY g.name ASC"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); $stmt->execute(); while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { // only super admin can give super admin rights - if ($group['usrgroup_name'] != 'sadmin' || $thisuser->isMemberOfGroup('ros_sadmin')) { + if ($group['usrgroup_name'] != 'sadmin' || $thisuser->hasAccess('addLvl')) { echo '<option value="'.$group['id'].'">'.$group['name'].'</option>'; } } @@ -283,7 +287,7 @@ echo_strip('</select> <input type="button" name="addusrlang" id="addusrlang" value="Update User language" onclick="'."updateUserLang(".$user_id.", document.getElementById('cbmusrlang').value)".'" /><br />'); } - elseif ($thisuser->isMemberOfGroup('transmaint')) { + elseif ($thisuser->hasAccess('addtransl')) { echo_strip('<input type="button" name="addmemb" id="addmemb" value="Make this User a Translator" onclick="'."getUserDetails(".$user_id.", 'translator')".'" /> <br /> <br />'); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -290,7 +290,7 @@ } break; case 'Rights': - $column_list_row .= Security::rightsOverview($row['id']); + $column_list_row .= 'Depracted'; break; case 'Version': $column_list_row .= $row['version'] ; @@ -664,18 +664,8 @@ // if no filter is set, construct a new one if ($entries_private <= 0 && $entries_system <= 0 && $entries_public <= 0) { - // everything except draft - if ($thisuser->securityLevel() == 3) { - $this->sql_where .= " AND (t.name = 'status' AND t.value != 'draft') "; - } - - // new, stable and unknown (if more than translator) - if ($thisuser->securityLevel() == 2) { - $this->sql_where .= " AND (t.name = 'status' AND (t.value = 'new' OR t.value = 'stable' OR t.value = 'unknown')) "; - } - else { - $this->sql_where .= " AND (t.name = 'status' AND (t.value = 'new' OR t.value = 'stable')) "; - } + // new, stable + $this->sql_where .= " AND (t.name = 'status' AND (t.value = 'new' OR t.value = 'stable')) "; // set additional needed sql $this->sql_select .= ", t.name AS tag_name, t.value AS tag_value "; @@ -685,7 +675,7 @@ // construct additioanl sql for tag-usage from filter if ($tag_counter > 0) { - $this->sql_select .= ", ".$tag_counter." AS tag_count"; + $this->sql_select .= ", ".$tag_counter." AS tag_count"; for ($i = 1; $i <= $tag_counter; $i++) { $this->sql_select .= ", t".$i.".name AS tag_name".$i.", t".$i.".value AS tag_value".$i." "; $this->sql_from .= " JOIN ".ROSCMST_TAGS." t".$i." ON t".$i.".rev_id = r.id "; @@ -694,12 +684,12 @@ } // make sure only private drafts are visible - if ($thisuser->securityLevel() < 3 && $entries_private > 0) { + if (!$thisuser->hasAccess('other_drafts') && $entries_private > 0) { $this->sql_where .= " AND r.user_id = '".$thisuser->id()."' "; } // either show draft (private) OR stable & new (public) entries, private AND public entries together are NOT allowed => block - if ($thisuser->securityLevel() < 2 && (($entries_private > 0 && $entries_public > 0) || $entries_system > 0)) { + if (($entries_private > 0 && $entries_public > 0 && $thisuser->hasAccess('mix_priv_pub')) || ($thisuser->hasAccess('show_sys_entry') && $entries_system > 0)) { $this->sql_select = ""; $this->sql_from = ""; $this->sql_where = " FALSE "; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -38,7 +38,7 @@ { // need to have a logged in user with minimum security level 1 Login::required(); - if (ThisUser::getInstance()->securityLevel() == 0) { + if (!ThisUser::getInstance()->hasAccess('CMS')) { header('location:?page=nopermission'); } @@ -76,14 +76,10 @@ $group_list .= ($group_list!=''?',':'').$group['name']; } - // get security level - $security_level = $thisuser->securityLevel(); - // get selected navigation entry echo_strip(' <div id="myReactOS"> - <strong>'.$thisuser->name().'</strong> - '.(($security_level > 1) ? '| SecLev: '.$security_level.' ('. $group_list .')' : '').' + <strong>'.$thisuser->name().'</strong> ('. $group_list .') | <span onclick="refreshPage()" style="color:#006090; cursor:pointer;"> <img src="images/reload.gif" alt="reload page" width="16" height="16" /> @@ -103,8 +99,10 @@ </div> </div> </th> - <td>  </td> - + <td>  </td>'); + + if ($thisuser->hasAccess('website')) { + echo_strip(' <th class="int'.(($this->branch == 'website') ? '2' : '1').'" onclick="'."loadBranch('website')".'"> <div class="tcL"> <div class="tcR"> @@ -113,8 +111,9 @@ </div> </th> <td>  </td>'); - - if ($thisuser->isMemberOfGroup('transmaint','ros_admin','ros_sadmin')) { + } + + if ($thisuser->hasAccess('user')) { echo_strip(' <th class="int'.(($this->branch == 'user') ? '2' : '1').'" onclick="'."loadBranch('user')".'"> <div class="tcL"> @@ -122,12 +121,11 @@ <div class="text">User</div> </div> </div> - - </th> - <td>  </td>'); - } - - if ($thisuser->isMemberOfGroup('transmaint') || $thisuser->securityLevel() == 3) { + </th> + <td>  </td>'); + } + + if ($thisuser->hasAccess('maintain')) { echo_strip(' <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."loadBranch('maintain')".'"> <div class="tcL"> @@ -137,27 +135,30 @@ </div> </th> <td>  </td>'); - - if ($thisuser->securityLevel() == 3) { - echo_strip(' - <th class="int'.(($this->branch == 'admin') ? '2' : '1').'" onclick="'."loadBranch('admin')".'"> - <div class="tcL"> - <div class="tcR"> - <div class="text">Administration</div> - </div> - </div> - </th> - <td>  </td> - - <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."loadBranch('stats')".'"> - <div class="tcL"> - <div class="tcR"> - <div class="text">Statistics</div> - </div> - </div> - </th> - <td>  </td>'); - } + } + + if ($thisuser->hasAccess('admin')) { + echo_strip(' + <th class="int'.(($this->branch == 'admin') ? '2' : '1').'" onclick="'."loadBranch('admin')".'"> + <div class="tcL"> + <div class="tcR"> + <div class="text">Administration</div> + </div> + </div> + </th> + <td>  </td>'); + } + + if ($thisuser->hasAccess('stats')) { + echo_strip(' + <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."loadBranch('stats')".'"> + <div class="tcL"> + <div class="tcR"> + <div class="text">Statistics</div> + </div> + </div> + </th> + <td>  </td>'); } echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -39,7 +39,7 @@ $this->register_css('cms_admin.css'); parent::__construct( $page_title, $page_css); - if (ThisUser::getInstance()->securityLevel() < 3) { + if (!ThisUser::getInstance()->hasAccess('admin')) { die('Not enough rights to get into this area'); } } @@ -54,7 +54,7 @@ { echo_strip(' <ul> - <li>Access Control Lists + <li>Entry Access Control Lists <ul> <li><a href="#" onclick="'."showNew('acl')".'">new</a></li> <li><a href="#" onclick="'."showSearch('acl','edit')".'">edit</a></li> @@ -74,6 +74,11 @@ <li><a href="#" onclick="'."showSearch('lang','edit')".'">edit</a></li> </ul> </li> + <li>System Settings + <ul> + <li><a href="#" onclick="'."showAreaProtection()".'">Area Protection</a></li> + </ul> + </li> </ul> <div id="adminarea" style="border: 1px dashed red;"> </div>'); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -52,7 +52,7 @@ protected function body( ) { // check if user has rights for this area - if (ThisUser::getInstance()->securityLevel() < 3) { + if (!ThisUser::getInstance()->hasAccess('maintain')) { return; } @@ -96,7 +96,7 @@ <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /> <br />'); - if (ThisUser::getInstance()->isMemberOfGroup('ros_sadmin')) { + if (ThisUser::getInstance()->hasAccess('logs')) { // display logs echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -53,7 +53,7 @@ { $thisuser = &ThisUser::getInstance(); - if (!$thisuser->isMemberOfGroup('transmaint','ros_admin','ros_sadmin')) { + if (!$thisuser->hasAccess('user')) { return; } @@ -63,18 +63,12 @@ <p style="font-weight: bold;">User Account Management Interface</p> <br />'); - if ($thisuser->isMemberOfGroup('ros_admin','ros_sadmin')) { - echo '<h3>Administrator</h3>'; + if ($thisuser->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language, COUNT(r.id) as editcounter FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE r.version > 0 GROUP BY u.name ORDER BY editcounter DESC, u.name"); } - elseif ($thisuser->isMemberOfGroup('transmaint')) { - echo '<h3>Language Maintainer</h3>'; + else { $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language, COUNT(r.id) as editcounter FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE r.version > 0 AND r.lang_id = :lang GROUP BY u.name ORDER BY editcounter DESC, u.name"); $stmt->bindParam('lang',Language::getStandardId(),PDO::PARAM_INT); - } - - // for non language maintainers - if (!isset($stmt)) { - $stmt=&DBConnection::getInstance()->prepare("SELECT u.id, u.name, u.fullname, l.name AS language, COUNT(r.id) as editcounter FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON u.lang_id=l.id WHERE r.version > 0 GROUP BY u.name ORDER BY editcounter DESC, u.name"); } echo_strip(' @@ -83,8 +77,8 @@ <input name="searchopt" type="radio" id="searchopt1" value="accountname" checked="checked" onclick="getUser()" /><label>account name</label> <input name="searchopt" type="radio" id="searchopt2" value="fullname" onclick="getUser()" /><label>full name </label> <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getUser()" /><label>email address</label> - <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getUser()" /><label>website</label> - <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getUser()" /><label>language</label> + <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getUser()" /><label>website</label>'.($thisuser->hasAccess('more_lang') ? ' + <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getUser()" /><label>language</label>' : '').' <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> <br /> </div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -97,8 +97,8 @@ var roscms_intern_webserver_roscms = '".RosCMS::getInstance()->pathRosCMS()."'; var roscms_intern_page_link = '".RosCMS::getInstance()->pathRosCMS()."?page='; var roscms_get_edit = '".(isset($_GET['edit']) ? $_GET['edit'] : '')."'; - var roscms_access_level = ".$thisuser->securityLevel()."; - var roscms_cbm_hide = '".(($thisuser->securityLevel() > 1) ? '' : ' disabled="disabled" style="color:#CCCCCC;"')."'; // disable combobox entries for novice user + var roscms_access_level = 3"./*$thisuser->securityLevel().*/"; + var roscms_cbm_hide = '"./*(($thisuser->securityLevel() > 1) ? '' : ' disabled="disabled" style="color:#CCCCCC;"').*/"'; // disable combobox entries for novice user // favorite user language "; @@ -137,7 +137,7 @@ <div id="roscms_container"> <div class="leftMenu" style="position: absolute; top: 0px; width: 150px; left: 0px; border: 0px; z-index:1;"> - <div id="smenutab1" class="submb" style="margin-bottom: 1.5em;" onclick="loadMenu(this.id)"'.(($thisuser->securityLevel() == 1 || $thisuser->isMemberOfGroup('transmaint')) ? ' style="display:none;"' : '').'> + <div id="smenutab1" class="submb" style="margin-bottom: 1.5em;" onclick="loadMenu(this.id)"'.(!$thisuser->hasAccess('new_entry') ? ' style="display:none;"' : '').'> <div class="subm1"> <div id="smenutabc1" class="subm2" style="font-weight: bold;">New Entry</div> </div> @@ -149,12 +149,12 @@ </div> </div> - <div id="smenutab3" class="submb" onclick="loadMenu(this.id)"'.(($thisuser->securityLevel() == 1 || $thisuser->isMemberOfGroup('transmaint')) ? ' style="display:none;"' : '').'> + <div id="smenutab3" class="submb" onclick="loadMenu(this.id)"'.(!$thisuser->hasAccess('pages') ? ' style="display:none;"' : '').'> <div class="subm1"> <div id="smenutabc3" class="subm2">Page</div> </div> </div> - <div id="smenutab13" class="submb" onclick="loadMenu(this.id)"'.((!$thisuser->isMemberOfGroup('ros_sadmin')) ? ' style="display:none;"' : '').'> + <div id="smenutab13" class="submb" onclick="loadMenu(this.id)"'.(!$thisuser->hasAccess('dynamic_pages') ? ' style="display:none;"' : '').'> <div class="subm1"> <div id="smenutabc13" class="subm2">Dynamic Page</div> </div> @@ -164,12 +164,12 @@ <div id="smenutabc4" class="subm2">Content</div> </div> </div> - <div id="smenutab5" class="submb" onclick="loadMenu(this.id)"'.(($thisuser->securityLevel() == 1 || $thisuser->isMemberOfGroup('transmaint')) ? ' style="display:none;"' : '').'> + <div id="smenutab5" class="submb" onclick="loadMenu(this.id)"'.(!$thisuser->hasAccess('templates') ? ' style="display:none;"' : '').'> <div class="subm1"> <div id="smenutabc5" class="subm2">Template</div> </div> </div> - <div id="smenutab6" class="submb" onclick="loadMenu(this.id)"'.(($thisuser->securityLevel() == 1 || $thisuser->isMemberOfGroup('transmaint')) ? ' style="display:none;"' : '').'> + <div id="smenutab6" class="submb" onclick="loadMenu(this.id)"'.(!$thisuser->hasAccess('scripts') ? ' style="display:none;"' : '').'> <div class="subm1"> <div id="smenutabc6" class="subm2">Script</div> </div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Welcome.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Welcome.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Welcome.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -62,30 +62,27 @@ <p style="font-weight: bold;">');echo Data::getContent('web_news', 'system', Language::getStandardId(), 'heading', 'stext').'</p>'. Data::getContent('web_news', 'system', Language::getStandardId(), 'content', 'text').'<br />'; - if (ThisUser::getInstance()->isMemberOfGroup('translator', 'transmaint')) { - - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); - $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); - $stmt->execute(); - $user_lang = $stmt->fetchColumn(); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); + $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); + $stmt->execute(); + $user_lang = $stmt->fetchColumn(); - if ($user_lang !== false) { - echo_strip(' - <a name="web_news_langgroup"></a> - <h3>Translator Information</h3>'); + if ($user_lang !== false) { + echo_strip(' + <a name="web_news_langgroup"></a> + <h3>Translator Information</h3>'); - // try to get content in local language, otherwise use standard language - $content = Data::getContent('web_news_langgroup', 'system', $user_lang, 'content', 'text'); - if ($content == '') { - $content = Data::getContent('web_news_langgroup', 'system', Language::getStandardId(), 'content', 'text'); - } - echo $content; + // try to get content in local language, otherwise use standard language + $content = Data::getContent('web_news_langgroup', 'system', $user_lang, 'content', 'text'); + if ($content == '') { + $content = Data::getContent('web_news_langgroup', 'system', Language::getStandardId(), 'content', 'text'); } - else { - echo_strip(' - <h2>Please set your favorite language in the '.RosCMS::siteName().' profile settings.</h2> - <p>This language will also be the default language to that you can translate content.</p>'); - } + echo $content; + } + else { + echo_strip(' + <h2>Please set your favorite language in the '.RosCMS::siteName().' profile settings.</h2> + <p>This language will also be the default language to that you can translate content.</p>'); } echo '<br />'; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -79,7 +79,7 @@ <li><a href="'.$config->pathRosCMS().'?page=my">My Profile</a></li> <li><a href="'.$config->pathRosCMS().'?page=search">User Search</a></li> <li><a href="'.$config->pathGenerated().'peoplemap/">User Map</a></li>'); - if ($thisuser->securityLevel() > 0) { + if ($thisuser->hasAccess('CMS')) { echo '<li><a href="'.$config->pathRosCMS().'?page=data&branch=welcome">RosCMS Interface</a></li>'; } echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -187,7 +187,7 @@ } // email only for the user itself or admins - if ($profile['id'] == $thisuser->id() || $thisuser->securityLevel() == 3) { + if ($profile['id'] == $thisuser->id() || $thisuser->hasAccess('user_details')) { echo_strip(' <div class="field"> <div class="key">E-Mail Address </div> @@ -231,7 +231,7 @@ } // Groups (only for user itself) and admins - if ($profile['id'] == $thisuser->id() || $thisuser->securityLevel() == 3) { + if ($profile['id'] == $thisuser->id() || $thisuser->hasAccess('user_details')) { echo_strip(' <div class="field"> <div class="key">User Groups</div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -44,7 +44,7 @@ */ public static function prepareInfo( $data_id = 'unknown', $rev_id = 'unknown' ) { - return ' [dataid: '.$data_id.'; revid: '.$rev_id.'; userid: '.ThisUser::getInstance()->id().'; security: '.Security::rightsOverview($rev_id).'] '; + return ' [dataid: '.$data_id.'; revid: '.$rev_id.'; userid: '.ThisUser::getInstance()->id(); } // end of member function prepare_info @@ -285,7 +285,7 @@ * @access private */ public static function read($level = 'medium', $log = '' ) { - return Data::getContent('log_website_'.($log!=''?$log.'_':'').date('Y-W'), 'system', Language::getStandardId(), $level.'_security_log', 'text', 'archive'); + return Data::getContent('log_website_'.($log!=''?$log.'_':'').date('Y-W'), 'system', Language::getStandardId(), $level.'_security_log', 'text'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -162,6 +162,7 @@ */ public static function required( ) { + $thisuser=&ThisUser::getInstance(); // check if user wants to logout if (isset($_POST['logout'])) { @@ -195,15 +196,14 @@ } // collect memberships for current user - $stmt=&DBConnection::getInstance()->prepare("SELECT g.name_short, g.security_level FROM ".ROSCMST_MEMBERSHIPS." m JOIN ".ROSCMST_GROUPS." g ON m.group_id = g.id WHERE user_id = :user_id"); + $stmt=&DBConnection::getInstance()->prepare(" SELECT a.name_short FROM ".ROSCMST_AREA." a JOIN ".ROSCMST_AREA_ACCESS." r ON r.area_id = a.id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = r.group_id WHERE m.user_id =:user_id"); $stmt->bindparam('user_id',$user['id'],PDO::PARAM_INT); $stmt->execute(); - $memberships = $stmt->fetchAll(PDO::FETCH_ASSOC); - foreach($memberships as $membership) { - ThisUser::getInstance()->addGroup($membership); - } - - ThisUser::getInstance()->setData($user); + while ($area = $stmt->fetch(PDO::FETCH_ASSOC)) { + $thisuser->addAccess($area['name_short']); + } + + $thisuser->setData($user); } // end of member function require } // end of Login Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -48,25 +48,21 @@ $acl = ''; $sec_access = false; // security access already granted ? - // only if user has rights to access the interface - if ($thisuser->securityLevel() > 0) { + // go through acl's + $stmt=&DBConnection::getInstance()->prepare("SELECT a.id, b.can_read, b.can_add, b.can_write, b.can_delete, b.can_publish, b.can_translate FROM ".ROSCMST_ACCESS." a JOIN ".ROSCMST_ENTRY_AREA." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = b.group_id WHERE m.user_id = :user_id"); + $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); + $stmt->execute(); + while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { - // go through acl's - $stmt=&DBConnection::getInstance()->prepare("SELECT a.id, b.can_read, b.can_add, b.can_write, b.can_delete, b.can_publish, b.can_translate FROM ".ROSCMST_ACCESS." a JOIN ".ROSCMST_ACL." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = b.group_id WHERE m.user_id = :user_id"); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); - $stmt->execute(); - while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { - - // add entries, remove them if they're on the deny list - if ($access['can_'.$kind] == true) { - if ($sec_access) { - $acl .= " , "; - } - $acl .= DBConnection::getInstance()->quote($access['id'],PDO::PARAM_INT); - $sec_access = true; + // add entries, remove them if they're on the deny list + if ($access['can_'.$kind] == true) { + if ($sec_access) { + $acl .= " , "; } - } // while - } + $acl .= DBConnection::getInstance()->quote($access['id'],PDO::PARAM_INT); + $sec_access = true; + } + } // while // group our acl list, or fail because no rights to access if ($sec_access > 0) { @@ -82,49 +78,20 @@ /** - * - * - * @access public - */ - public static function getAccessId( $name_short ) - { - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS." WHERE name_short=:name_short LIMIT 1"); - $stmt->bindParam('name_short',$name_short,PDO::PARAM_STR); - $stmt->execute(); - return $stmt->fetchColumn(); - } - - - /** * Constructs a list of things the user can do * * @param int data_id * @return rights list * @access private */ - private function getRightsList( $rev_id, $is_rev = true ) + private function getRightsList( $data_id ) { $thisuser = &ThisUser::getInstance(); - // roscms interface access ? - if ($thisuser->securityLevel() < 1) { - return; - } - - // contains list with granted rights - $rights = array('read'=>false,'write'=>false,'add'=>false,'delete'=>false,'publish'=>false,'translate'=>false,); - // get rights - if ($is_rev) { - $stmt=&DBConnection::getInstance()->prepare("SELECT b.can_read, b.can_add, b.can_delete, b.can_translate, b.can_publish, b.can_write FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id=d.id JOIN ".ROSCMST_ACCESS." a ON d.acl_id=a.id JOIN ".ROSCMST_ACL." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=b.group_id WHERE r.id = :rev_id AND m.user_id=:user_id"); - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); - } - else { - $stmt=&DBConnection::getInstance()->prepare("SELECT b.can_read, b.can_add, b.can_delete, b.can_translate, b.can_publish, b.can_write FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACCESS." a ON d.acl_id=a.id JOIN ".ROSCMST_ACL." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=b.group_id WHERE d.id = :data_id AND m.user_id=:user_id"); - $stmt->bindParam('data_id',$rev_id,PDO::PARAM_INT); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); - } + $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACCESS." a ON d.acl_id=a.id JOIN ".ROSCMST_ENTRY_AREA." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=b.group_id WHERE d.id = :data_id AND m.user_id=:user_id"); + $stmt->bindParam('data_id',$rev_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); $stmt->execute() or die('Rev-Entry "'.$rev_id.'" not found [usergroups].'); // create a list with rights @@ -151,49 +118,16 @@ * @return * @access public */ - public function hasRight( $data_id, $kind ) + public function hasRight( $data_id, $area ) { - // only if roscms interface access is granted - if (ThisUser::getInstance()->securityLevel() < 1) { - return false; - } - - // return if the requested kind of right is in the rights list for the user - $rights = self::getRightsList($data_id, false); - return $rights[$kind]; +return true; + $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACL." a ON a.acl_id=d.acl_id JOIN ".ROSCMST_ENTRY_AREA." e ON e.acl_id=a.id JOIN ".ROSCMST_RIGHTS." r ON r.id=e.right_id JOIN ".ROSCMST_GROUPS." g ON g.id=e.group_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=g.id WHERE r.name_short=:area AND m.user_id=:user_id AND d.id=:data_id LIMIT 1"); + $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->bindParam('area',$area,PDO::PARAM_STR); + $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); + return $stmt->execute(); } // end of member function hasRight - - /** - * gives a short overview about user rights - * - * @param int data_id - * @return explanation - * @access public - */ - public function rightsOverview( $data_id ) - { - // only if roscms interface access is granted - if (ThisUser::getInstance()->securityLevel() < 1) { - return; - } - - $rights = self::getRightsList($data_id, false); // so we don't need to call the same function several times - $explanation = ''; // contains abbreviations for each right or a - (if missing) symbol instead - - // start to construct list - $explanation .= $rights['read'] ? '-' : 'r'; - $explanation .= $rights['write'] ? '-' : 'w'; - $explanation .= $rights['add'] ? '-' : 'a'; - $explanation .= $rights['delete'] ? '-' : 'd'; - $explanation .= $rights['publish'] ? '-' : 'p'; - $explanation .= $rights['translate'] ? '-' : 't'; - - // add also security level - $explanation .= ' '.ThisUser::getInstance()->securityLevel(); - - return $explanation; - } // end of member function rightsOverview } // end of Security Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Tag.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Tag.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Tag.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -102,7 +102,7 @@ $tag = $stmt->fetchOnce(PDO::FETCH_ASSOC); // @unimplemented: account group membership check - if ($tag['user_id'] == ThisUser::getInstance()->id() || ThisUser::getInstance()->securityLevel() > 1) { + if ($tag['user_id'] == ThisUser::getInstance()->id() || ThisUser::getInstance()->hasAccess('deltag')) { // finally delete tag $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_TAGS." WHERE id = :tag_id LIMIT 1"); @@ -166,7 +166,7 @@ $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_TAGS." WHERE tag_id = :tag_id AND user_id IN(-1, 0, :user_id) LIMIT 1"); $stmt->bindParam('tag_id',$tag_id,PDO::PARAM_INT); $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); - if ($stmt->fetchColumn() || ThisUser::getInstance()->securityLevel() == 3) { + if ($stmt->fetchColumn() || ThisUser::getInstance()->hasAccess('updatetag')) { // update value $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_TAGS." SET value = :new_value WHERE id=:tag_id"); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/ThisUser.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/ThisUser.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/ThisUser.class.php [iso-8859-1] Sun Jan 11 06:41:52 2009 @@ -27,60 +27,36 @@ private $security_level = 0; private $user = array('id'=>0,'name'=>''); private $groups = array(); + private $access = array(); /** - * adds a new membership for this user and registers maximum security level + * adds a access area to the allowed list of this user * * @access public */ - public function addGroup( $group ) + public function addAccess( $access_area ) { - $this->groups[$group['name_short']] = $group['security_level']; - if ($group['security_level'] > $this->security_level) $this->security_level = $group['security_level']; + $this->access[$access_area] = true; } // end of member function setId - /** - * adds a new membership for this user - * - * @return array - * @access public - */ - public function getGroups( ) - { - return $this->groups; - } // end of member function setId - /** - * checks if the user is member of at least in one of the groups + * checks if the user has access to a requested area * - * @param string group_name - * @param string group_name2 - * @param string group_name3 + * @param string access_area name of the area * @return bool * @access public */ - public function isMemberOfGroup( $group_name, $group_name2 = null, $group_name3 = null ) + public function hasAccess( $access_area ) { - if (@$this->groups[$group_name] > -1 || @$this->groups[$group_name2] > -1 || @$this->groups[$group_name3] > -1) { - return true; + if (isset($this->access[$access_area])) { + return $this->access[$access_area]; } return false; } // end of member isGroupMember - - /** - * returns highest security level of users group memberships - * - * @return int - * @access public - */ - public function securityLevel( ) - { - return $this->security_level; - } // end of member function securityLevel /**

15 years, 8 months

[tkreuzer] 38695: Go back to non-win32k functions inside user32, using the inline wrappers to call the NtUser functions.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 06:37:54 2009 New Revision: 38695 URL: http://svn.reactos.org/svn/reactos?rev=38695&view=rev Log: Go back to non-win32k functions inside user32, using the inline wrappers to call the NtUser functions. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/ntwrapper.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeserver.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/object.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/windows/accel.c trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -210,7 +210,7 @@ { if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { - HDC hdc = NtUserGetDC( hwnd ); + HDC hdc = GetDC( hwnd ); btnPaintFunc[style]( hwnd, hdc, action ); ReleaseDC( hwnd, hdc ); } @@ -317,11 +317,11 @@ if (btnPaintFunc[btn_type]) { PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint( hWnd, &ps ); + HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); int nOldMode = SetBkMode( hdc, OPAQUE ); (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ - if( !wParam ) NtUserEndPaint( hWnd, &ps ); + if( !wParam ) EndPaint( hWnd, &ps ); } break; @@ -344,8 +344,8 @@ } /* fall through */ case WM_LBUTTONDOWN: - NtUserSetCapture( hWnd ); - NtUserSetFocus( hWnd ); + SetCapture( hWnd ); + SetFocus( hWnd ); set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED ); SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 ); break; @@ -409,7 +409,7 @@ case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = NtUserGetDC(hWnd); + HDC hdc = GetDC(hWnd); HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -198,7 +198,7 @@ TRACE("[%p]: freeing storage\n", lphc->self); if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - NtUserDestroyWindow( lphc->hWndLBox ); + DestroyWindow( lphc->hWndLBox ); SetWindowLongPtrW( lphc->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, lphc ); @@ -231,7 +231,7 @@ else { TEXTMETRICW tm; - HDC hDC = NtUserGetDC(hwnd); + HDC hDC = GetDC(hwnd); HFONT hPrevFont = 0; INT baseUnitY; @@ -331,7 +331,7 @@ * this will cancel-out in the processing of the WM_WINDOWPOSCHANGING * message. */ - NtUserSetWindowPos( lphc->self, + SetWindowPos( lphc->self, NULL, 0, 0, windowRect.right - windowRect.left, @@ -662,7 +662,7 @@ if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { /* Now do the trick with parent */ - NtUserSetParent(lphc->hWndLBox, HWND_DESKTOP); + SetParent(lphc->hWndLBox, HWND_DESKTOP); /* * If the combo is a dropdown, we must resize the control * to fit only the text area and button. To do this, @@ -929,7 +929,7 @@ HDC hDC; hDC = (hParamDC) ? hParamDC - : NtUserBeginPaint( lphc->self, &ps); + : BeginPaint( lphc->self, &ps); TRACE("hdc=%p\n", hDC); @@ -975,7 +975,7 @@ } if( !hParamDC ) - NtUserEndPaint(lphc->self, &ps); + EndPaint(lphc->self, &ps); return 0; } @@ -1141,19 +1141,19 @@ if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) rect.bottom = rect.top - nDroppedHeight; - NtUserSetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, + SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, lphc->droppedRect.right - lphc->droppedRect.left, nDroppedHeight, SWP_NOACTIVATE | SWP_SHOWWINDOW); if( !(lphc->wState & CBF_NOREDRAW) ) - NtUserRedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | + RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self) - NtUserSetCapture(lphc->hWndLBox); + SetCapture(lphc->hWndLBox); } /*********************************************************************** @@ -1178,7 +1178,7 @@ RECT rect; lphc->wState &= ~CBF_DROPPED; - NtUserShowWindow( lphc->hWndLBox, SW_HIDE ); + ShowWindow( lphc->hWndLBox, SW_HIDE ); if(GetCapture() == lphc->hWndLBox) { @@ -1204,8 +1204,8 @@ } if( bButton && !(lphc->wState & CBF_NOREDRAW) ) - NtUserRedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | + RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); CB_NOTIFY( lphc, CBN_CLOSEUP ); } } @@ -1567,13 +1567,13 @@ * sizing messages */ if( lphc->wState & CBF_EDIT ) - NtUserSetWindowPos( lphc->hWndEdit, 0, + SetWindowPos( lphc->hWndEdit, 0, rectEdit->left, rectEdit->top, rectEdit->right - rectEdit->left, rectEdit->bottom - rectEdit->top, SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) ); - NtUserSetWindowPos( lphc->hWndLBox, 0, + SetWindowPos( lphc->hWndLBox, 0, rectLB->left, rectLB->top, rectLB->right - rectLB->left, rectLB->bottom - rectLB->top, @@ -1584,12 +1584,12 @@ if( lphc->wState & CBF_DROPPED ) { lphc->wState &= ~CBF_DROPPED; - NtUserShowWindow( lphc->hWndLBox, SW_HIDE ); + ShowWindow( lphc->hWndLBox, SW_HIDE ); } if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) - NtUserRedrawWindow( lphc->self, NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); + RedrawWindow( lphc->self, NULL, 0, + RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); } } @@ -1741,7 +1741,7 @@ /* drop down the listbox and start tracking */ lphc->wState |= CBF_CAPTURE; - NtUserSetCapture( hWnd ); + SetCapture( hWnd ); CBDropDown( lphc ); } if( bButton ) CBRepaintButton( lphc ); @@ -1770,7 +1770,7 @@ } } ReleaseCapture(); - NtUserSetCapture(lphc->hWndLBox); + SetCapture(lphc->hWndLBox); } if( lphc->wState & CBF_BUTTONDOWN ) @@ -1943,7 +1943,7 @@ return (LRESULT)lphc->hFont; case WM_SETFOCUS: if( lphc->wState & CBF_EDIT ) - NtUserSetFocus( lphc->hWndEdit ); + SetFocus( lphc->hWndEdit ); else COMBO_SetFocus( lphc ); return TRUE; @@ -2054,7 +2054,7 @@ SendMessageA(hwndTarget, message, wParam, lParam); } case WM_LBUTTONDOWN: - if( !(lphc->wState & CBF_FOCUSED) ) NtUserSetFocus( lphc->self ); + if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); return TRUE; case WM_LBUTTONUP: Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -1173,7 +1173,7 @@ if (istart == iend && delta == 0) return; - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); @@ -1443,7 +1443,7 @@ text = EDIT_GetPasswordPointer_SL(es); - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); @@ -1577,7 +1577,7 @@ *after_wrap = FALSE; return line_index; } - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); low = line_index; @@ -1621,7 +1621,7 @@ } text = EDIT_GetPasswordPointer_SL(es); - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); if (x < 0) @@ -3187,7 +3187,7 @@ LINEDEF *line_def; index = min(index, len); - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); if (es->style & ES_MULTILINE) { @@ -3803,7 +3803,7 @@ /* Set the default margins depending on the font */ if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) { - HDC dc = NtUserGetDC(es->hwndSelf); + HDC dc = GetDC(es->hwndSelf); HFONT old_font = SelectObject(dc, es->font); GetTextMetricsW(dc, &tm); /* The default margins are only non zero for TrueType or Vector fonts */ @@ -4257,7 +4257,7 @@ /* copy */ EnableMenuItem(popup, 3, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED)); /* paste */ - EnableMenuItem(popup, 4, MF_BYPOSITION | (NtUserIsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(popup, 4, MF_BYPOSITION | (IsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* delete */ EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* select all */ @@ -4274,7 +4274,7 @@ } TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); - NtUserDestroyMenu(menu); + DestroyMenu(menu); } @@ -4301,9 +4301,9 @@ TRACE("%s\n", debugstr_w(dst)); GlobalUnlock(hdst); OpenClipboard(es->hwndSelf); - NtUserEmptyClipboard(); + EmptyClipboard(); SetClipboardData(CF_UNICODETEXT, hdst); - NtUserCloseClipboard(); + CloseClipboard(); } @@ -4801,7 +4801,7 @@ INT ll; es->bCaptureState = TRUE; - NtUserSetCapture(es->hwndSelf); + SetCapture(es->hwndSelf); l = EDIT_EM_LineFromChar(es, e); li = EDIT_EM_LineIndex(es, l); @@ -4811,7 +4811,7 @@ EDIT_EM_SetSel(es, s, e, FALSE); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; - NtUserSetTimer(es->hwndSelf, 0, 100, NULL); + SetTimer(es->hwndSelf, 0, 100, NULL); return 0; } @@ -4827,17 +4827,17 @@ BOOL after_wrap; es->bCaptureState = TRUE; - NtUserSetCapture(es->hwndSelf); + SetCapture(es->hwndSelf); EDIT_ConfinePoint(es, &x, &y); e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; if (!(es->style & ES_MULTILINE)) - NtUserSetTimer(es->hwndSelf, 0, 100, NULL); + SetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) - NtUserSetFocus(es->hwndSelf); + SetFocus(es->hwndSelf); return 0; } @@ -4851,7 +4851,7 @@ static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - NtUserKillTimer(es->hwndSelf, 0); + KillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; @@ -5026,7 +5026,7 @@ BOOL rev = es->bEnableState && ((es->flags & EF_FOCUSED) || (es->style & ES_NOHIDESEL)); - dc = hdc ? hdc : NtUserBeginPaint(es->hwndSelf, &ps); + dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); GetClientRect(es->hwndSelf, &rcClient); @@ -5091,7 +5091,7 @@ SelectObject(dc, old_font); if (!hdc) - NtUserEndPaint(es->hwndSelf, &ps); + EndPaint(es->hwndSelf, &ps); } @@ -5120,7 +5120,7 @@ const WCHAR empty_strW[] = { 0 }; EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); } - NtUserCloseClipboard(); + CloseClipboard(); } @@ -5139,12 +5139,12 @@ /* single line edit updates itself */ if (!(es->style & ES_MULTILINE)) { - HDC hdc = NtUserGetDC(es->hwndSelf); + HDC hdc = GetDC(es->hwndSelf); EDIT_WM_Paint(es, hdc); ReleaseDC(es->hwndSelf, hdc); } - NtUserCreateCaret(es->hwndSelf, 0, 2, es->line_height); + CreateCaret(es->hwndSelf, 0, 2, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); @@ -5169,7 +5169,7 @@ RECT clientRect; es->font = font; - dc = NtUserGetDC(es->hwndSelf); + dc = GetDC(es->hwndSelf); if (font) old_font = SelectObject(dc, font); GetTextMetricsW(dc, &tm); @@ -5194,7 +5194,7 @@ EDIT_UpdateText(es, NULL, TRUE); if (es->flags & EF_FOCUSED) { DestroyCaret(); - NtUserCreateCaret(es->hwndSelf, 0, 2, es->line_height); + CreateCaret(es->hwndSelf, 0, 2, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); @@ -5506,7 +5506,7 @@ es->flags &= ~EF_UPDATE; EDIT_NOTIFY_PARENT(es, EN_UPDATE); } - NtUserInvalidateRgn(es->hwndSelf, hrgn, bErase); + InvalidateRgn(es->hwndSelf, hrgn, bErase); } Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -108,7 +108,7 @@ length = strlenW( str ); } - if (!(hDC = NtUserGetDC( hwnd ))) return FALSE; + if (!(hDC = GetDC( hwnd ))) return FALSE; hPrevFont = SelectObject( hDC, hIconTitleFont ); @@ -131,7 +131,7 @@ /* point is relative to owner, make it relative to parent */ MapWindowPoints( owner, GetParent(hwnd), &pt, 1 ); - NtUserSetWindowPos( hwnd, owner, pt.x, pt.y, cx, cy, SWP_NOACTIVATE ); + SetWindowPos( hwnd, owner, pt.x, pt.y, cx, cy, SWP_NOACTIVATE ); return TRUE; } @@ -224,7 +224,7 @@ case WM_NCLBUTTONDBLCLK: return SendMessageW( owner, msg, wParam, lParam ); case WM_ACTIVATE: - if( wParam ) NtUserSetActiveWindow( owner ); + if( wParam ) SetActiveWindow( owner ); return 0; case WM_CLOSE: return 0; Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -52,6 +52,7 @@ #define WS_EX_DRAGDETECT 0x00000002L #define WM_BEGINDRAG 0x022C +UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ @@ -459,9 +460,9 @@ #endif TRACE("[%p]: changing height %d -> %d\n", descr->self, descr->height, descr->height - remaining ); - NtUserSetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, - rect.bottom - rect.top - remaining, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); + SetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, + rect.bottom - rect.top - remaining, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); return; } } @@ -735,7 +736,7 @@ return; } if (LISTBOX_GetItemRect( descr, index, &rect ) != 1) return; - if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; if (descr->font) oldFont = SelectObject( hdc, descr->font ); hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, (WPARAM)hdc, (LPARAM)descr->self ); @@ -766,7 +767,7 @@ if (!descr->caret_on || !descr->in_focus) return; if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) != 1) return; - if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; if (descr->font) oldFont = SelectObject( hdc, descr->font ); if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); @@ -1387,7 +1388,7 @@ descr->font = font; - if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) + if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) { ERR("unable to get DC.\n" ); return 16; @@ -2130,8 +2131,8 @@ if (!descr->in_focus) { - if( !descr->lphc ) NtUserSetFocus( descr->self ); - else NtUserSetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit : descr->lphc->self ); + if( !descr->lphc ) SetFocus( descr->self ); + else SetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit : descr->lphc->self ); } if (index == -1) return 0; @@ -2144,7 +2145,7 @@ } descr->captured = TRUE; - NtUserSetCapture( descr->self ); + SetCapture( descr->self ); if (descr->style & (LBS_EXTENDEDSEL | LBS_MULTIPLESEL)) { @@ -2293,7 +2294,7 @@ /* Resume the Capture after scrolling is complete */ if(hWndOldCapture != 0) - NtUserSetCapture(hWndOldCapture); + SetCapture(hWndOldCapture); } } return 0; @@ -2412,7 +2413,7 @@ /* Start/stop the system timer */ if (dir != LB_TIMER_NONE) - NtUserSetSystemTimer( descr->self, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL); + SetSystemTimer( descr->self, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL); else if (LISTBOX_Timer != LB_TIMER_NONE) KillSystemTimer( descr->self, LB_TIMER_ID ); LISTBOX_Timer = dir; @@ -3269,9 +3270,9 @@ case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = ( wParam ) ? ((HDC)wParam) : NtUserBeginPaint( descr->self, &ps ); + HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); - if( !wParam ) NtUserEndPaint( hwnd, &ps ); + if( !wParam ) EndPaint( hwnd, &ps ); } return ret; case WM_SIZE: Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -72,6 +72,7 @@ static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /********************************************************************* @@ -815,7 +816,7 @@ { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(Wnd); /* hide caret while holding down LBUTTON */ - NtUserSetCapture(Wnd); + SetCapture(Wnd); PrevPt = Pt; ScrollTrackHitTest = HitTest = SCROLL_THUMB; break; @@ -838,7 +839,7 @@ return; } - Dc = NtUserGetDCEx(Wnd, 0, DCX_CACHE | ((SB_CTL == SBType) ? 0 : DCX_WINDOW)); + Dc = GetDCEx(Wnd, 0, DCX_CACHE | ((SB_CTL == SBType) ? 0 : DCX_WINDOW)); if (SB_VERT == SBType) { Vertical = TRUE; @@ -867,9 +868,9 @@ PrevPt = Pt; if (SB_CTL == SBType && 0 != (GetWindowLongW(Wnd, GWL_STYLE) & WS_TABSTOP)) { - NtUserSetFocus(Wnd); - } - NtUserSetCapture(Wnd); + SetFocus(Wnd); + } + SetCapture(Wnd); ScrollBarInfo.rgstate[ScrollTrackHitTest] |= STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); @@ -915,9 +916,9 @@ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_LINEUP, (LPARAM) WndCtl); } - NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -933,9 +934,9 @@ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_PAGEUP, (LPARAM) WndCtl); } - NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -999,9 +1000,9 @@ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_PAGEDOWN, (LPARAM) WndCtl); } - NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -1017,9 +1018,9 @@ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_LINEDOWN, (LPARAM) WndCtl); } - NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -1093,45 +1094,45 @@ { if (0 != (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN)) { - NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL) + 1, - GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + MoveWindow(Wnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL) + 1, + GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } else if (0 != (lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN)) { - NtUserMoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, - lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, - GetSystemMetrics(SM_CXVSCROLL) + 1, - GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + MoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, + lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, + GetSystemMetrics(SM_CXVSCROLL) + 1, + GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } } else if (0 != (lpCreate->style & SBS_VERT)) { if (0 != (lpCreate->style & SBS_LEFTALIGN)) { - NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); + MoveWindow(Wnd, lpCreate->x, lpCreate->y, + GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); } else if (0 != (lpCreate->style & SBS_RIGHTALIGN)) { - NtUserMoveWindow(Wnd, - lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, - lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); + MoveWindow(Wnd, + lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, + lpCreate->y, + GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); } } else /* SBS_HORZ */ { if (0 != (lpCreate->style & SBS_TOPALIGN)) { - NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + MoveWindow(Wnd, lpCreate->x, lpCreate->y, + lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } else if (0 != (lpCreate->style & SBS_BOTTOMALIGN)) { - NtUserMoveWindow(Wnd, - lpCreate->x, - lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + MoveWindow(Wnd, + lpCreate->x, + lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, + lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } } } @@ -1278,7 +1279,7 @@ DbgPrint("ScrollBarWndProc WM_ENABLE\n"); NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ - hdc = NtUserGetDCEx( Wnd, 0, DCX_CACHE ); + hdc = GetDCEx( Wnd, 0, DCX_CACHE ); if (!hdc) return 1; IntDrawScrollBar( Wnd, hdc, SB_CTL); ReleaseDC( Wnd, hdc ); @@ -1327,12 +1328,12 @@ &ArrowSize, &ThumbSize, &ThumbPos); if (! Vertical) { - NtUserCreateCaret(Wnd, (HBITMAP) 1, ThumbSize - 2, Rect.bottom - Rect.top - 2); + CreateCaret(Wnd, (HBITMAP) 1, ThumbSize - 2, Rect.bottom - Rect.top - 2); SetCaretPos(ThumbPos + 1, Rect.top + 1); } else { - NtUserCreateCaret(Wnd, (HBITMAP) 1, Rect.right - Rect.left - 2, ThumbSize - 2); + CreateCaret(Wnd, (HBITMAP) 1, Rect.right - Rect.left - 2, ThumbSize - 2); SetCaretPos(Rect.top + 1, ThumbPos + 1); } ShowCaret(Wnd); @@ -1373,7 +1374,7 @@ PAINTSTRUCT Ps; HDC Dc; - Dc = (0 != wParam ? (HDC) wParam : NtUserBeginPaint(Wnd, &Ps)); + Dc = (0 != wParam ? (HDC) wParam : BeginPaint(Wnd, &Ps)); if (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEGRIP) { @@ -1392,7 +1393,7 @@ if (0 == wParam) { - NtUserEndPaint(Wnd, &Ps); + EndPaint(Wnd, &Ps); } } break; @@ -1418,7 +1419,7 @@ return IntScrollGetScrollRange(Wnd, SB_CTL, (LPINT) wParam, (LPINT) lParam); case SBM_ENABLE_ARROWS: - return NtUserEnableScrollBar(Wnd, SB_CTL, wParam); + return EnableScrollBar(Wnd, SB_CTL, wParam); case SBM_SETRANGEREDRAW: { Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -211,8 +211,8 @@ } else */ { - NtUserSetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } return prevIcon; @@ -248,8 +248,8 @@ } else */ { - NtUserSetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } return hOldBitmap; @@ -384,7 +384,7 @@ HDC hdc; HRGN hOrigClipping; - hdc = NtUserGetDC( hwnd ); + hdc = GetDC( hwnd ); setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); restore_clipping(hdc, hOrigClipping); @@ -483,7 +483,7 @@ case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint(hwnd, &ps); + HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); if (staticPaintFunc[style]) { HRGN hOrigClipping; @@ -491,7 +491,7 @@ (staticPaintFunc[style])( hwnd, hdc, full_style ); restore_clipping(hdc, hOrigClipping); } - if (!wParam) NtUserEndPaint(hwnd, &ps); + if (!wParam) EndPaint(hwnd, &ps); } break; @@ -581,7 +581,7 @@ { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - NtUserRedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; @@ -654,7 +654,7 @@ if (STATIC_update_uistate(hwnd, unicode) && hasTextStyle( full_style )) { - NtUserRedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -437,3 +437,64 @@ { return NtUserSetActiveWindow(hWnd); } + +EXTINLINE DWORD WINAPI +GetListBoxInfo(HWND hwnd) +{ + return NtUserGetListBoxInfo(hwnd); // Do it right! Have the message org from kmode! +} + +EXTINLINE BOOL WINAPI +DeleteMenu(HMENU hMenu, UINT uPosition, UINT uFlags) +{ + return NtUserDeleteMenu(hMenu, uPosition, uFlags); +} + +EXTINLINE BOOL WINAPI +DestroyMenu(HMENU hMenu) +{ + return NtUserDestroyMenu(hMenu); +} + +EXTINLINE BOOL WINAPI +GetMenuBarInfo(HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO pmbi) +{ + return NtUserGetMenuBarInfo(hwnd, idObject, idItem, pmbi); +} + +EXTINLINE BOOL WINAPI +GetMenuItemRect(HWND hWnd, HMENU hMenu, UINT uItem, LPRECT lprcItem) +{ + return NtUserGetMenuItemRect(hWnd, hMenu, uItem, lprcItem); +} + +EXTINLINE BOOL WINAPI +HiliteMenuItem(HWND hwnd, HMENU hmenu, UINT uItemHilite, UINT uHilite) +{ + return NtUserHiliteMenuItem(hwnd, hmenu, uItemHilite, uHilite); +} + +EXTINLINE BOOL WINAPI +RemoveMenu(HMENU hMenu, UINT uPosition, UINT uFlags) +{ + return NtUserRemoveMenu(hMenu, uPosition, uFlags); +} + +EXTINLINE BOOL WINAPI +SetMenuDefaultItem(HMENU hMenu, UINT uItem, UINT fByPos) +{ + return NtUserSetMenuDefaultItem(hMenu, uItem, fByPos); +} + +EXTINLINE BOOL WINAPI +SetMenuContextHelpId(HMENU hmenu, DWORD dwContextHelpId) +{ + return NtUserSetMenuContextHelpId(hmenu, dwContextHelpId); +} + +EXTINLINE HWND WINAPI +SetCapture(HWND hWnd) +{ + return(NtUserSetCapture(hWnd)); +} + Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -25,6 +25,7 @@ #include "window.h" #include "winpos.h" #include "winsta.h" +#include "ntwrapper.h" /* One/Two Param Functions */ #define NtUserMsqSetWakeMask(dwWaitMask) \ Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -651,7 +651,7 @@ */ WDML_FreeAllHSZ(pInstance); - NtUserDestroyWindow(pInstance->hwndEvent); + DestroyWindow(pInstance->hwndEvent); /* OK now delete the instance handle itself */ @@ -1652,7 +1652,7 @@ pPrev->next = pServer->next; } - NtUserDestroyWindow(pServer->hwndServer); + DestroyWindow(pServer->hwndServer); WDML_DecHSZ(pInstance, pServer->hszServiceSpec); WDML_DecHSZ(pInstance, pServer->hszService); @@ -1793,7 +1793,7 @@ hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer; SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0); - NtUserDestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); + DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); WDML_DecHSZ(pRef->instance, pRef->hszService); WDML_DecHSZ(pRef->instance, pRef->hszTopic); Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddes… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeserver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/ddeserver.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -370,7 +370,7 @@ } else { - NtUserDestroyWindow(hwndServerConv); + DestroyWindow(hwndServerConv); } return pConv; } Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -327,7 +327,7 @@ } } - NtUserRedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); + RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; } @@ -434,7 +434,7 @@ } } - NtUserRedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); + RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; } @@ -618,7 +618,7 @@ BOOL WINAPI SetShellWindow(HWND hwndShell) { - return NtUserSetShellWindowEx(hwndShell, hwndShell); + return SetShellWindowEx(hwndShell, hwndShell); } 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] Sun Jan 11 06:37:54 2009 @@ -249,7 +249,7 @@ if (IsWindow(hWnd)) { if (fForce) - return NtUserDestroyWindow(hWnd); + return DestroyWindow(hWnd); else return FALSE; } Modified: trunk/reactos/dll/win32/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/obje… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/object.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -54,7 +54,7 @@ pvInfo, nLength, lpnLengthNeeded); if (nIndex != UOI_NAME && nIndex != UOI_TYPE) - return NtUserGetObjectInformation(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); + return GetUserObjectInformationW(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); /* allocate unicode buffer */ buffer = HeapAlloc(GetProcessHeap(), 0, nLength*2); @@ -65,7 +65,7 @@ } /* get unicode string */ - if (!NtUserGetObjectInformation(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) + if (!GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) ret = FALSE; *lpnLengthNeeded /= 2; Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -113,7 +113,7 @@ { WINDOWPLACEMENT wndpl; - if (NtUserGetWindowPlacement(hwnd, &wndpl)) + if (GetWindowPlacement(hwnd, &wndpl)) { if (rectWnd) *rectWnd = wndpl.rcNormalPosition; if (ptIcon) *ptIcon = wndpl.ptMinPosition; Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -280,7 +280,7 @@ { int i; - cAccelEntries = NtUserCopyAcceleratorTable(hAccelSrc, lpAccelDst, cAccelEntries); + cAccelEntries = CopyAcceleratorTableW(hAccelSrc, lpAccelDst, cAccelEntries); if (lpAccelDst == NULL) return cAccelEntries; @@ -326,7 +326,7 @@ if(!NT_SUCCESS(nErrCode)) lpaccl[i].key = -1; } - return NtUserCreateAcceleratorTable(lpaccl, cEntries); + return CreateAcceleratorTableW(lpaccl, cEntries); } Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -699,7 +699,7 @@ } else { - HDC screenDC = NtUserGetDC(NULL); + HDC screenDC = GetDC(NULL); res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); ReleaseDC(NULL, screenDC); } @@ -717,7 +717,7 @@ } else { - HDC screenDC = NtUserGetDC(NULL); + HDC screenDC = GetDC(NULL); int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); ReleaseDC(NULL, screenDC); Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -39,7 +39,7 @@ { HDC hDC, hComp; - hDC = NtUserGetDC(hWnd); + hDC = GetDC(hWnd); if(hDC) { if(CaretInfo->Bitmap && GetBitmapDimensionEx(CaretInfo->Bitmap, &CaretInfo->Size)) Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -53,13 +53,13 @@ if(*DefaultCursor) { /* set default cursor */ - NtUserSetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } else { /* FIXME load system cursor scheme */ - NtUserSetCursor(0); - NtUserSetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + SetCursor(0); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -191,7 +191,7 @@ { if (Style & WS_VISIBLE) /* Visible */ { - NtUserRedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); + RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); Style &= ~WS_VISIBLE; SetWindowLong(hWnd, GWL_STYLE, Style); /* clear bits */ } @@ -227,7 +227,7 @@ HICON hCursor = (HICON)GetClassLongW(hWnd, GCL_HCURSOR); if (hCursor) { - NtUserSetCursor(hCursor); + SetCursor(hCursor); return(TRUE); } return(FALSE); @@ -240,7 +240,7 @@ { break; } - return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZEWE))); + return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZEWE))); } case HTTOP: @@ -250,7 +250,7 @@ { break; } - return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENS))); + return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENS))); } case HTTOPLEFT: @@ -260,7 +260,7 @@ { break; } - return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENWSE))); + return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENWSE))); } case HTBOTTOMLEFT: @@ -270,10 +270,10 @@ { break; } - return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENESW))); + return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW))); } } - return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_ARROW))); + return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW))); } static LONG @@ -469,7 +469,7 @@ } else { - NtUserSetCapture(hwnd); + SetCapture(hwnd); hittest = DefWndStartSizeMove(hwnd, Wnd, wParam, &capturePoint); if (!hittest) { @@ -506,7 +506,7 @@ } unmodRect = sizingRect; } - NtUserClipCursor(&clipRect); + ClipCursor(&clipRect); origRect = sizingRect; if (ON_LEFT_BORDER(hittest)) @@ -536,17 +536,17 @@ SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); - if (GetCapture() != hwnd) NtUserSetCapture( hwnd ); + if (GetCapture() != hwnd) SetCapture( hwnd ); if (Style & WS_CHILD) { /* Retrieve a default cache DC (without using the window style) */ - hdc = NtUserGetDCEx(hWndParent, 0, DCX_CACHE); + hdc = GetDCEx(hWndParent, 0, DCX_CACHE); DesktopRgn = NULL; } else { - hdc = NtUserGetDC( 0 ); + hdc = GetDC( 0 ); DesktopRgn = CreateRectRgnIndirect(&clipRect); } @@ -615,7 +615,7 @@ if( iconic ) /* ok, no system popup tracking */ { - hOldCursor = NtUserSetCursor(hDragCursor); + hOldCursor = SetCursor(hDragCursor); ShowCursor( TRUE ); } } @@ -647,7 +647,7 @@ else { /* To avoid any deadlocks, all the locks on the windows structures must be suspended before the SetWindowPos */ - NtUserSetWindowPos( hwnd, 0, newRect.left, newRect.top, + SetWindowPos( hwnd, 0, newRect.left, newRect.top, newRect.right - newRect.left, newRect.bottom - newRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); @@ -659,13 +659,13 @@ } ReleaseCapture(); - NtUserClipCursor(NULL); + ClipCursor(NULL); if( iconic ) { if( moved ) /* restore cursors, show icon title later on */ { ShowCursor( FALSE ); - NtUserSetCursor( hOldCursor ); + SetCursor( hOldCursor ); } DestroyCursor( hDragCursor ); } @@ -703,14 +703,14 @@ { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ if(!DragFullWindows) - NtUserSetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, + SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); } else { /* restore previous size/position */ if(DragFullWindows) - NtUserSetWindowPos( hwnd, 0, origRect.left, origRect.top, + SetWindowPos( hwnd, 0, origRect.left, origRect.top, origRect.right - origRect.left, origRect.bottom - origRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); @@ -783,26 +783,26 @@ break; case SC_MINIMIZE: wp.length = sizeof(WINDOWPLACEMENT); - if(NtUserGetWindowPlacement(hWnd, &wp)) + if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MINIMIZE; - NtUserSetWindowPlacement(hWnd, &wp); + SetWindowPlacement(hWnd, &wp); } break; case SC_MAXIMIZE: wp.length = sizeof(WINDOWPLACEMENT); - if(NtUserGetWindowPlacement(hWnd, &wp)) + if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MAXIMIZE; - NtUserSetWindowPlacement(hWnd, &wp); + SetWindowPlacement(hWnd, &wp); } break; case SC_RESTORE: wp.length = sizeof(WINDOWPLACEMENT); - if(NtUserGetWindowPlacement(hWnd, &wp)) + if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_RESTORE; - NtUserSetWindowPlacement(hWnd, &wp); + SetWindowPlacement(hWnd, &wp); } break; case SC_CLOSE: @@ -1003,9 +1003,9 @@ HDC hdc2; OpenClipboard(hWnd); - NtUserEmptyClipboard(); - - hdc = NtUserGetWindowDC(hWnd); + EmptyClipboard(); + + hdc = GetWindowDC(hWnd); GetWindowRect(hWnd, &rect); w = rect.right - rect.left; h = rect.bottom - rect.top; @@ -1023,7 +1023,7 @@ ReleaseDC(hWnd, hdc); ReleaseDC(hWnd, hdc2); - NtUserCloseClipboard(); + CloseClipboard(); } @@ -1107,7 +1107,7 @@ /* in Windows, capture is taken when right-clicking on the caption bar */ if (wParam == HTCAPTION) { - NtUserSetCapture(hWnd); + SetCapture(hWnd); } break; } @@ -1206,7 +1206,7 @@ case WM_PAINT: { PAINTSTRUCT Ps; - HDC hDC = NtUserBeginPaint(hWnd, &Ps); + HDC hDC = BeginPaint(hWnd, &Ps); if (hDC) { HICON hIcon; @@ -1223,7 +1223,7 @@ GetSystemMetrics(SM_CYICON)) / 2; DrawIcon(hDC, x, y, hIcon); } - NtUserEndPaint(hWnd, &Ps); + EndPaint(hWnd, &Ps); } return (0); } @@ -1234,7 +1234,7 @@ hRgn = CreateRectRgn(0, 0, 0, 0); if (GetUpdateRgn(hWnd, hRgn, FALSE) != NULLREGION) { - NtUserRedrawWindow(hWnd, NULL, hRgn, + RedrawWindow(hWnd, NULL, hRgn, RDW_ERASENOW | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); } @@ -1250,7 +1250,7 @@ case WM_CLOSE: { - NtUserDestroyWindow(hWnd); + DestroyWindow(hWnd); return (0); } @@ -1283,7 +1283,7 @@ if (LOWORD(wParam) != WA_INACTIVE && !(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) { - NtUserSetFocus(hWnd); + SetFocus(hWnd); } break; } @@ -1520,7 +1520,7 @@ INT Index = (wParam != 0) ? GCL_HICON : GCL_HICONSM; HICON hOldIcon = (HICON)GetClassLongW(hWnd, Index); SetClassLongW(hWnd, Index, lParam); - NtUserSetWindowPos(hWnd, 0, 0, 0, 0, 0, + SetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); return ((LRESULT)hOldIcon); Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -536,7 +536,7 @@ if (bFirstEmpty) { /* ShowWindow the first time the queue goes empty */ - NtUserShowWindow( hwnd, SW_SHOWNORMAL ); + ShowWindow( hwnd, SW_SHOWNORMAL ); bFirstEmpty = FALSE; } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) @@ -558,7 +558,7 @@ } if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); retval = dlgInfo->idResult; - NtUserDestroyWindow( hwnd ); + DestroyWindow( hwnd ); return retval; } @@ -703,7 +703,7 @@ * for both +ve and -ve template.pointSize */ HDC dc; int pixels; - dc = NtUserGetDC(0); + dc = GetDC(0); pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, @@ -824,7 +824,7 @@ if (!hwnd) { if (hUserFont) DeleteObject( hUserFont ); - if (hMenu) NtUserDestroyMenu( hMenu ); + if (hMenu) DestroyMenu( hMenu ); if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } @@ -837,7 +837,7 @@ if (dlgInfo == NULL) { if (hUserFont) DeleteObject( hUserFont ); - if (hMenu) NtUserDestroyMenu( hMenu ); + if (hMenu) DestroyMenu( hMenu ); if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } @@ -872,7 +872,7 @@ /* By returning TRUE, app has requested a default focus assignment */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); if( dlgInfo->hwndFocus ) - NtUserSetFocus( dlgInfo->hwndFocus ); + SetFocus( dlgInfo->hwndFocus ); } } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) @@ -880,12 +880,12 @@ if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { - NtUserShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ + ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ } return hwnd; } if (modal && ownerEnabled) DIALOG_EnableOwner(owner); - if( IsWindow(hwnd) ) NtUserDestroyWindow( hwnd ); + if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } @@ -906,7 +906,7 @@ } if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); - NtUserSetFocus( hwndCtrl ); + SetFocus( hwndCtrl ); } /*********************************************************************** @@ -940,7 +940,7 @@ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - NtUserSetFocus( infoPtr->hwndFocus ); + SetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -1078,7 +1078,7 @@ GlobalFree16(dlgInfo->hDialogHeap); }*/ if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); - if (dlgInfo->hMenu) NtUserDestroyMenu( dlgInfo->hMenu ); + if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); } /* Window clean-up */ @@ -1912,13 +1912,13 @@ /* Windows sets the focus to the dialog itself in EndDialog */ if (IsChild(hDlg, GetFocus())) - NtUserSetFocus( hDlg ); + SetFocus( hDlg ); /* Don't have to send a ShowWindow(SW_HIDE), just do SetWindowPos with SWP_HIDEWINDOW as done in Windows */ - NtUserSetWindowPos(hDlg, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE - | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW); + SetWindowPos(hDlg, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE + | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW); if (hDlg == GetActiveWindow()) WinPosActivateOtherWindow( hDlg ); @@ -1942,7 +1942,7 @@ HDC hdc; SIZE size; - if ((hdc = NtUserGetDC(0))) + if ((hdc = GetDC(0))) { size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); if (size.cx) units = MAKELONG( size.cx, size.cy ); @@ -2338,7 +2338,7 @@ SendMessageW (hwndNext, EM_SETSEL, 0, length); } } - NtUserSetFocus (hwndNext); + SetFocus (hwndNext); DIALOG_FixChildrenOnChangeFocus (hDlg, hwndNext); } else Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -63,7 +63,7 @@ rect.top = pt.y - dy; rect.bottom = pt.y + dy; - NtUserSetCapture(hWnd); + SetCapture(hWnd); for (;;) { @@ -96,7 +96,7 @@ } } } - NtUserWaitMessage(); + WaitMessage(); } return 0; #endif @@ -125,7 +125,7 @@ /* Remove keyboard focus from that window if it had focus */ if (hWnd == GetFocus()) { - NtUserSetFocus(NULL); + SetFocus(NULL); } } NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); @@ -680,7 +680,7 @@ /* stop the timer if the tracking list is empty */ if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - NtUserKillTimer(0, ptracking_info->timer); + KillTimer(0, ptracking_info->timer); RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); } } @@ -770,7 +770,7 @@ /* if we aren't tracking on hover or leave remove this entry */ if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - NtUserKillTimer(0, ptracking_info->timer); + KillTimer(0, ptracking_info->timer); RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); } } @@ -786,7 +786,7 @@ if (!ptracking_info->timer) { - ptracking_info->timer = NtUserSetTimer(0, 0, hover_time, TrackMouseEventProc); + ptracking_info->timer = SetTimer(0, 0, hover_time, TrackMouseEventProc); } } } Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -447,7 +447,7 @@ if (mii.wID == ci->idFirstChild) { TRACE("removing %u items including separator\n", count - i); - while (NtUserRemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION)) + while (RemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION)) /* nothing */; break; @@ -545,16 +545,16 @@ { /* restore old MDI child */ SendMessageW( hwndPrev, WM_SETREDRAW, FALSE, 0 ); - NtUserShowWindow( hwndPrev, SW_RESTORE ); + ShowWindow( hwndPrev, SW_RESTORE ); SendMessageW( hwndPrev, WM_SETREDRAW, TRUE, 0 ); /* activate new MDI child */ - NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); + SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); /* maximize new MDI child */ - NtUserShowWindow( hwndTo, SW_MAXIMIZE ); + ShowWindow( hwndTo, SW_MAXIMIZE ); } /* activate new MDI child */ - NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) ); + SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) ); } } @@ -576,7 +576,7 @@ MDI_SwitchActiveChild(ci, next, TRUE); else { - NtUserShowWindow(child, SW_HIDE); + ShowWindow(child, SW_HIDE); if (IsZoomed(child)) { MDI_RestoreFrameMenu(GetParent(client), child, ci->hBmpClose); @@ -618,7 +618,7 @@ if (flagDestroy) { MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1); - NtUserDestroyWindow(child); + DestroyWindow(child); } TRACE("child destroyed - %p\n", child); @@ -663,7 +663,7 @@ if( isActiveFrameWnd ) { SendMessageW( child, WM_NCACTIVATE, TRUE, 0L); - NtUserSetFocus( client ); + SetFocus( client ); } SendMessageW( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child ); @@ -750,8 +750,8 @@ TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); - NtUserSetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, + SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); } } HeapFree( GetProcessHeap(), 0, win_array ); @@ -831,8 +831,8 @@ y = 0; for (r = 1; r <= rows && *pWnd; r++, i++) { - NtUserSetWindowPos(*pWnd, 0, x, y, xsize, ysize, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(*pWnd, 0, x, y, xsize, ysize, + SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); y += ysize; pWnd++; } @@ -891,7 +891,7 @@ HDC hMemDC; HBITMAP hBitmap, hOldBitmap; HBRUSH hBrush; - HDC hdc = NtUserGetDC(hChild); + HDC hdc = GetDC(hChild); if (hdc) { @@ -916,14 +916,14 @@ (UINT_PTR)hSysPopup, (LPSTR)hSysMenuBitmap)) { TRACE("not inserted\n"); - NtUserDestroyMenu(hSysPopup); + DestroyMenu(hSysPopup); return 0; } EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED); - NtUserSetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); + SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); /* redraw menu */ DrawMenuBar(frame); @@ -962,7 +962,7 @@ TRUE, &menuInfo); - NtUserRemoveMenu(menu,0,MF_BYPOSITION); + RemoveMenu(menu,0,MF_BYPOSITION); if ( (menuInfo.fType & MFT_BITMAP) && (menuInfo.dwTypeData != 0) && @@ -975,11 +975,11 @@ DeleteObject(menuInfo.hbmpItem); /* close */ - NtUserDeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); + DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); /* restore */ - NtUserDeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); + DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); /* minimize */ - NtUserDeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); + DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); DrawMenuBar(frame); @@ -1205,7 +1205,7 @@ return 0; case WM_MDIMAXIMIZE: - NtUserShowWindow( (HWND)wParam, SW_MAXIMIZE ); + ShowWindow( (HWND)wParam, SW_MAXIMIZE ); return 0; case WM_MDINEXT: /* lParam != 0 means previous window */ @@ -1231,7 +1231,7 @@ case WM_MDITILE: ci->mdiFlags |= MDIF_NEEDUPDATE; - NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); + ShowScrollBar( hwnd, SB_BOTH, FALSE ); MDITile( hwnd, ci, wParam ); ci->mdiFlags &= ~MDIF_NEEDUPDATE; return 0; @@ -1245,7 +1245,7 @@ case WM_SETFOCUS: if (ci->hwndActiveChild && !IsIconic( ci->hwndActiveChild )) - NtUserSetFocus( ci->hwndActiveChild ); + SetFocus( ci->hwndActiveChild ); return 0; case WM_NCACTIVATE: @@ -1284,7 +1284,7 @@ TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y); if( child && child != hwnd && child != ci->hwndActiveChild ) - NtUserSetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); + SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); break; } } @@ -1303,7 +1303,7 @@ AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); - NtUserMoveWindow(ci->hwndActiveChild, rect.left, rect.top, + MoveWindow(ci->hwndActiveChild, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1); } else @@ -1438,11 +1438,11 @@ return 1; /* success. FIXME: check text length */ case WM_SETFOCUS: - NtUserSetFocus(hwndMDIClient); + SetFocus(hwndMDIClient); break; case WM_SIZE: - NtUserMoveWindow(hwndMDIClient, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); + MoveWindow(hwndMDIClient, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); break; case WM_NEXTMENU: @@ -1771,7 +1771,7 @@ if (style & WS_MAXIMIZE) { HeapFree( GetProcessHeap(), 0, list ); - NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); + ShowScrollBar( hwnd, SB_BOTH, FALSE ); return; } if (style & WS_VISIBLE) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -957,9 +957,9 @@ case WM_PAINT: { PAINTSTRUCT ps; - NtUserBeginPaint(Wnd, &ps); + BeginPaint(Wnd, &ps); MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrW(Wnd, 0)); - NtUserEndPaint(Wnd, &ps); + EndPaint(Wnd, &ps); return 0; } @@ -1044,7 +1044,7 @@ return NULL; if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) { - NtUserDestroyMenu(mii.hSubMenu); + DestroyMenu(mii.hSubMenu); return NULL; } mii.fMask |= MIIM_SUBMENU; @@ -1388,7 +1388,7 @@ return; } - Dc = NtUserGetDC(NULL); + Dc = GetDC(NULL); SelectObject(Dc, hMenuFont); Start = 0; @@ -1766,8 +1766,8 @@ { /* app changed/recreated menu bar entries in WM_INITMENU Recalculate menu sizes else clicks will not work */ - NtUserSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); + SetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } /* This makes the menus of applications built with Delphi work. @@ -1878,8 +1878,8 @@ } /* Display the window */ - NtUserSetWindowPos(MenuInfo.Wnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + SetWindowPos(MenuInfo.Wnd, HWND_TOPMOST, 0, 0, 0, 0, + SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); UpdateWindow(MenuInfo.Wnd); return TRUE; @@ -1963,11 +1963,11 @@ if (0 != (MenuInfo->Flags & MF_POPUP)) { - Dc = NtUserGetDC(MenuInfo->Wnd); + Dc = GetDC(MenuInfo->Wnd); } else { - Dc = NtUserGetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); + Dc = GetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); } if (NULL == TopPopup) @@ -2160,7 +2160,7 @@ DefItem = SC_CLOSE; } #endif - NtUserSetMenuDefaultItem(Menu, DefItem, MF_BYCOMMAND); + SetMenuDefaultItem(Menu, DefItem, MF_BYCOMMAND); } /*********************************************************************** @@ -2220,11 +2220,11 @@ { if (0 != (MenuInfo->Flags & MF_POPUP)) { - Dc = NtUserGetDC(MenuInfo->Wnd); + Dc = GetDC(MenuInfo->Wnd); } else { - Dc = NtUserGetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); + Dc = GetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); } SelectObject(Dc, hMenuFont); @@ -2320,7 +2320,7 @@ { MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE); MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL); - NtUserDestroyWindow(SubMenuInfo.Wnd); + DestroyWindow(SubMenuInfo.Wnd); SubMenuInfo.Wnd = NULL; MenuSetRosMenuInfo(&SubMenuInfo); } @@ -2880,7 +2880,7 @@ if (NewWnd != Mt->OwnerWnd) { Mt->OwnerWnd = NewWnd; - NtUserSetCapture(Mt->OwnerWnd); + SetCapture(Mt->OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); } @@ -3243,7 +3243,7 @@ fEndMenu = ! fRemove; } - NtUserSetCapture(Mt.OwnerWnd); + SetCapture(Mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); while (! fEndMenu) @@ -3271,7 +3271,7 @@ EnterIdleSent = TRUE; SendMessageW(Mt.OwnerWnd, WM_ENTERIDLE, MSGF_MENU, (LPARAM) Win); } - NtUserWaitMessage(); + WaitMessage(); } } @@ -3529,7 +3529,7 @@ } (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); - NtUserSetCapture(NULL); /* release the capture */ + SetCapture(NULL); /* release the capture */ /* If dropdown is still painted and the close box is clicked on then the menu will be destroyed as part of the DispatchMessage above. @@ -3545,7 +3545,7 @@ if (0 != (MenuInfo.Flags & MF_POPUP)) { - NtUserDestroyWindow(MenuInfo.Wnd); + DestroyWindow(MenuInfo.Wnd); MenuInfo.Wnd = NULL; } MenuSelectItem(Mt.OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, FALSE, NULL); @@ -4056,7 +4056,7 @@ { GUITHREADINFO guii; guii.cbSize = sizeof(GUITHREADINFO); - if(NtUserGetGUIThreadInfo(GetCurrentThreadId(), &guii) && guii.hwndMenuOwner) + if(GetGUIThreadInfo(GetCurrentThreadId(), &guii) && guii.hwndMenuOwner) { PostMessageW(guii.hwndMenuOwner, WM_CANCELMODE, 0, 0); } @@ -4660,7 +4660,7 @@ if (!(hMenu = CreateMenu())) return 0; if (!MENU_ParseResource(p, hMenu, TRUE)) { - NtUserDestroyMenu(hMenu); + DestroyMenu(hMenu); return 0; } return hMenu; @@ -4670,7 +4670,7 @@ if (!(hMenu = CreateMenu())) return 0; if (!MENUEX_ParseResource(p, hMenu)) { - NtUserDestroyMenu( hMenu ); + DestroyMenu( hMenu ); return 0; } return hMenu; @@ -5142,14 +5142,14 @@ return AppendMenuW(hMenu, flags &~ MF_APPEND, cmdInsert, lpszNewItem); case MF_DELETE : - return NtUserDeleteMenu(hMenu, cmd, flags &~ MF_DELETE); + return DeleteMenu(hMenu, cmd, flags &~ MF_DELETE); case MF_CHANGE : return ModifyMenuW(hMenu, cmd, flags &~ MF_CHANGE, cmdInsert, lpszNewItem); case MF_REMOVE : - return NtUserRemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, - flags &~ MF_REMOVE); + return RemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, + flags &~ MF_REMOVE); default : /* MF_INSERT */ return InsertMenuW(hMenu, cmd, flags, cmdInsert, lpszNewItem); @@ -5180,14 +5180,14 @@ return AppendMenuA(hMenu, flags &~ MF_APPEND, cmdInsert, lpszNewItem); case MF_DELETE : - return NtUserDeleteMenu(hMenu, cmd, flags &~ MF_DELETE); + return DeleteMenu(hMenu, cmd, flags &~ MF_DELETE); case MF_CHANGE : return ModifyMenuA(hMenu, cmd, flags &~ MF_CHANGE, cmdInsert, lpszNewItem); case MF_REMOVE : - return NtUserRemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, - flags &~ MF_REMOVE); + return RemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, + flags &~ MF_REMOVE); default : /* MF_INSERT */ return InsertMenuA(hMenu, cmd, flags, cmdInsert, lpszNewItem); Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -104,12 +104,12 @@ { case MB_ABORTRETRYIGNORE: case MB_YESNO: - NtUserRemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); + RemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); break; } - NtUserSetFocus(GetDlgItem(hwnd, mbi->DefBtn)); + SetFocus(GetDlgItem(hwnd, mbi->DefBtn)); if(mbi->Timeout && (mbi->Timeout != (UINT)-1)) - NtUserSetTimer(hwnd, 0, mbi->Timeout, NULL); + SetTimer(hwnd, 0, mbi->Timeout, NULL); } return 0; Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -285,7 +285,7 @@ Style = GetWindowLongW(hWnd, GWL_STYLE); - hDC = NtUserGetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); + hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); if (hDC == 0) { return 0; @@ -297,13 +297,13 @@ { if (ExStyle & WS_EX_MDICHILD) { - Active = IsChild(NtUserGetForegroundWindow(), hWnd); + Active = IsChild(GetForegroundWindow(), hWnd); if (Active) Active = (hWnd == (HWND)SendMessageW(Parent, WM_MDIGETACTIVE, 0, 0)); } else { - Active = (NtUserGetForegroundWindow() == hWnd); + Active = (GetForegroundWindow() == hWnd); } } GetWindowRect(hWnd, &WindowRect); @@ -546,7 +546,7 @@ if (menu && !(Style & WS_CHILD)) { - HDC hDC = NtUserGetWindowDC(hWnd); + HDC hDC = GetWindowDC(hWnd); if(hDC) { RECT CliRect = *Rect; @@ -911,10 +911,10 @@ */ UpdateWindow(hWnd); - WindowDC = NtUserGetWindowDC(hWnd); + WindowDC = GetWindowDC(hWnd); UserDrawCaptionButtonWnd(hWnd, WindowDC, TRUE, ButtonType); - NtUserSetCapture(hWnd); + SetCapture(hWnd); for (;;) { @@ -950,7 +950,7 @@ case HTCAPTION: { HWND hTopWnd = GetAncestor(hWnd, GA_ROOT); - if (NtUserSetActiveWindow(hTopWnd) || GetActiveWindow() == hTopWnd) + if (SetActiveWindow(hTopWnd) || GetActiveWindow() == hTopWnd) { SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam); } Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -154,7 +154,7 @@ UpdateWindow( HWND hWnd) { - return NtUserRedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); + return RedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); } @@ -169,7 +169,7 @@ { /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, but Wine dont so i removed it... */ - return NtUserRedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); + return RedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); } @@ -184,7 +184,7 @@ { /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, but Wine dont so i removed it... */ - return NtUserRedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); + return RedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -99,7 +99,7 @@ VOID WINAPI SwitchToThisWindow(HWND hwnd, BOOL fUnknown) { - NtUserShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd, SW_SHOW); } @@ -327,7 +327,7 @@ { TRACE("Restoring current maximized child %p\n", top_child); SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - NtUserShowWindow(top_child, SW_RESTORE); + ShowWindow(top_child, SW_RESTORE); SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); } } @@ -433,7 +433,7 @@ { TRACE("Restoring current maximized child %p\n", top_child); SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - NtUserShowWindow(top_child, SW_RESTORE); + ShowWindow(top_child, SW_RESTORE); SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); } } @@ -488,7 +488,7 @@ #if 0 return NtUserDeferWindowPos(hWinPosInfo, hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); #else - NtUserSetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); + SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); return hWinPosInfo; #endif } @@ -1482,7 +1482,7 @@ return FALSE; } - NtUserShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); return TRUE; } @@ -1497,7 +1497,7 @@ if (!(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) return FALSE; - NtUserShowWindow(hWnd,SW_RESTORE); + ShowWindow(hWnd,SW_RESTORE); return TRUE; } Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Sun Jan 11 06:37:54 2009 @@ -60,13 +60,13 @@ } done: - fg = NtUserGetForegroundWindow(); + fg = GetForegroundWindow(); TRACE("win = %p fg = %p\n", hwndTo, fg); if (!fg || (hwnd == fg)) { if (SetForegroundWindow( hwndTo )) return; } - if (!NtUserSetActiveWindow( hwndTo )) NtUserSetActiveWindow(0); + if (!SetActiveWindow( hwndTo )) SetActiveWindow(0); }

15 years, 8 months

[fireball] 38694: - Renames, cleanup.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 11 05:26:20 2009 New Revision: 38694 URL: http://svn.reactos.org/svn/reactos?rev=38694&view=rev Log: - Renames, cleanup. Added: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h - copied unchanged from r38693, trunk/reactos/drivers/filesystems/fastfat_new/vfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild - copied, changed from r38693, trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rc - copied unchanged from r38693, trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rc Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfat.h trunk/reactos/drivers/filesystems/fastfat_new/vfat005.1st trunk/reactos/drivers/filesystems/fastfat_new/vfat_fr.txt trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rc Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/direntry.c trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c trunk/reactos/drivers/filesystems/fastfat_new/ea.c trunk/reactos/drivers/filesystems/fastfat_new/fastio.c trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/flush.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/iface.c trunk/reactos/drivers/filesystems/fastfat_new/misc.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c trunk/reactos/drivers/filesystems/fastfat_new/string.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ */ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" // function like DosDateTimeToFileTime Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -11,7 +11,7 @@ /* ------------------------------------------------------- INCLUDES */ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" ULONG vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, Modified: trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dirwr.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* * update an existing FAT entry Modified: trunk/reactos/drivers/filesystems/fastfat_new/ea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/ea.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/ea.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -27,7 +27,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS *****************************************************************/ Copied: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild (from r38693, trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> +<module name="fastfatn" type="kernelmodedriver" installbase="system32/drivers" installname="fastfatn.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <include base="fastfat">.</include> + <include base="fastfatn">.</include> <library>ntoskrnl</library> <library>hal</library> <file>blockdev.c</file> @@ -25,6 +25,6 @@ <file>shutdown.c</file> <file>string.c</file> <file>volume.c</file> - <file>vfatfs.rc</file> - <pch>vfat.h</pch> + <file>fastfat.rc</file> + <pch>fastfat.h</pch> </module> Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -7,7 +7,7 @@ */ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" static BOOLEAN NTAPI VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -15,7 +15,7 @@ #endif #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* -------------------------------------------------------- DEFINES */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/iface.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* GLOBALS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/misc.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* * Uncomment to enable strict verification of cluster/offset pair Modified: trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat_new/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/string.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/string.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/ Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/vfat.h (removed) @@ -1,786 +1,0 @@ -#include <ntifs.h> -#include <ntdddisk.h> -#include <reactos/helper.h> -#include <debug.h> - -#ifdef __GNUC__ -#include <ccros.h> - -#define USE_ROS_CC_AND_FS -#else -#define KEBUGCHECK KeBugCheck -#define KEBUGCHECKEX KeBugCheckEx -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) -#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) -#endif - -#include <pshpack1.h> -struct _BootSector -{ - unsigned char magic0, res0, magic1; - unsigned char OEMName[8]; - unsigned short BytesPerSector; - unsigned char SectorsPerCluster; - unsigned short ReservedSectors; - unsigned char FATCount; - unsigned short RootEntries, Sectors; - unsigned char Media; - unsigned short FATSectors, SectorsPerTrack, Heads; - unsigned long HiddenSectors, SectorsHuge; - unsigned char Drive, Res1, Sig; - unsigned long VolumeID; - unsigned char VolumeLabel[11], SysType[8]; - unsigned char Res2[448]; - unsigned short Signatur1; -}; - -struct _BootSector32 -{ - unsigned char magic0, res0, magic1; // 0 - unsigned char OEMName[8]; // 3 - unsigned short BytesPerSector; // 11 - unsigned char SectorsPerCluster; // 13 - unsigned short ReservedSectors; // 14 - unsigned char FATCount; // 16 - unsigned short RootEntries, Sectors; // 17 - unsigned char Media; // 21 - unsigned short FATSectors, SectorsPerTrack, Heads; // 22 - unsigned long HiddenSectors, SectorsHuge; // 28 - unsigned long FATSectors32; // 36 - unsigned short ExtFlag; // 40 - unsigned short FSVersion; // 42 - unsigned long RootCluster; // 44 - unsigned short FSInfoSector; // 48 - unsigned short BootBackup; // 50 - unsigned char Res3[12]; // 52 - unsigned char Drive; // 64 - unsigned char Res4; // 65 - unsigned char ExtBootSignature; // 66 - unsigned long VolumeID; // 67 - unsigned char VolumeLabel[11], SysType[8]; // 71 - unsigned char Res2[420]; // 90 - unsigned short Signature1; // 510 -}; - -struct _BootSectorFatX -{ - unsigned char SysType[4]; // 0 - unsigned long VolumeID; // 4 - unsigned long SectorsPerCluster; // 8 - unsigned short FATCount; // 12 - unsigned long Unknown; // 14 - unsigned char Unused[4078]; // 18 -}; - -struct _FsInfoSector -{ - unsigned long ExtBootSignature2; // 0 - unsigned char Res6[480]; // 4 - unsigned long FSINFOSignature; // 484 - unsigned long FreeCluster; // 488 - unsigned long NextCluster; // 492 - unsigned char Res7[12]; // 496 - unsigned long Signatur2; // 508 -}; - -typedef struct _BootSector BootSector; - -struct _FATDirEntry -{ - union - { - struct { unsigned char Filename[8], Ext[3]; }; - unsigned char ShortName[11]; - }; - unsigned char Attrib; - unsigned char lCase; - unsigned char CreationTimeMs; - unsigned short CreationTime,CreationDate,AccessDate; - union - { - unsigned short FirstClusterHigh; // FAT32 - unsigned short ExtendedAttributes; // FAT12/FAT16 - }; - unsigned short UpdateTime; //time create/update - unsigned short UpdateDate; //date create/update - unsigned short FirstCluster; - unsigned long FileSize; -}; - -#define FAT_EAFILE "EA DATA. SF" - -typedef struct _EAFileHeader FAT_EA_FILE_HEADER, *PFAT_EA_FILE_HEADER; - -struct _EAFileHeader -{ - unsigned short Signature; // ED - unsigned short Unknown[15]; - unsigned short EASetTable[240]; -}; - -typedef struct _EASetHeader FAT_EA_SET_HEADER, *PFAT_EA_SET_HEADER; - -struct _EASetHeader -{ - unsigned short Signature; // EA - unsigned short Offset; // relative offset, same value as in the EASetTable - unsigned short Unknown1[2]; - char TargetFileName[12]; - unsigned short Unknown2[3]; - unsigned int EALength; - // EA Header -}; - -typedef struct _EAHeader FAT_EA_HEADER, *PFAT_EA_HEADER; - -struct _EAHeader -{ - unsigned char Unknown; - unsigned char EANameLength; - unsigned short EAValueLength; - // Name Data - // Value Data -}; - -typedef struct _FATDirEntry FAT_DIR_ENTRY, *PFAT_DIR_ENTRY; - -struct _FATXDirEntry -{ - unsigned char FilenameLength; // 0 - unsigned char Attrib; // 1 - unsigned char Filename[42]; // 2 - unsigned long FirstCluster; // 44 - unsigned long FileSize; // 48 - unsigned short UpdateTime; // 52 - unsigned short UpdateDate; // 54 - unsigned short CreationTime; // 56 - unsigned short CreationDate; // 58 - unsigned short AccessTime; // 60 - unsigned short AccessDate; // 62 -}; - -struct _slot -{ - unsigned char id; // sequence number for slot - WCHAR name0_4[5]; // first 5 characters in name - unsigned char attr; // attribute byte - unsigned char reserved; // always 0 - unsigned char alias_checksum; // checksum for 8.3 alias - WCHAR name5_10[6]; // 6 more characters in name - unsigned char start[2]; // starting cluster number - WCHAR name11_12[2]; // last 2 characters in name -}; - -typedef struct _slot slot; - -#include <poppack.h> - -#define VFAT_CASE_LOWER_BASE 8 // base is lower case -#define VFAT_CASE_LOWER_EXT 16 // extension is lower case - -#define LONGNAME_MAX_LENGTH 256 // max length for a long filename - -#define ENTRY_DELETED(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) -#define ENTRY_VOLUME(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) -#define ENTRY_END(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) - -#define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) -#define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0) -#define FAT_ENTRY_LONG(DirEntry) (((DirEntry)->Attrib & 0x3f) == 0x0f) -#define FAT_ENTRY_VOLUME(DirEntry) (((DirEntry)->Attrib & 0x1f) == 0x08) - -#define FATX_ENTRY_DELETED(DirEntry) ((DirEntry)->FilenameLength == 0xe5) -#define FATX_ENTRY_END(DirEntry) ((DirEntry)->FilenameLength == 0xff) -#define FATX_ENTRY_LONG(DirEntry) (FALSE) -#define FATX_ENTRY_VOLUME(DirEntry) (((DirEntry)->Attrib & 0x1f) == 0x08) - -#define FAT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof (FAT_DIR_ENTRY)) -#define FATX_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof (FATX_DIR_ENTRY)) - -typedef struct _FATXDirEntry FATX_DIR_ENTRY, *PFATX_DIR_ENTRY; - -union _DIR_ENTRY -{ - FAT_DIR_ENTRY Fat; - FATX_DIR_ENTRY FatX; -}; - -typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; - -#define BLOCKSIZE 512 - -#define FAT16 (1) -#define FAT12 (2) -#define FAT32 (3) -#define FATX16 (4) -#define FATX32 (5) - -#define VCB_VOLUME_LOCKED 0x0001 -#define VCB_DISMOUNT_PENDING 0x0002 -#define VCB_IS_FATX 0x0004 -#define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ -#define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */ - -typedef struct -{ - ULONG VolumeID; - ULONG FATStart; - ULONG FATCount; - ULONG FATSectors; - ULONG rootDirectorySectors; - ULONG rootStart; - ULONG dataStart; - ULONG RootCluster; - ULONG SectorsPerCluster; - ULONG BytesPerSector; - ULONG BytesPerCluster; - ULONG NumberOfClusters; - ULONG FatType; - ULONG Sectors; - BOOLEAN FixedMedia; -} FATINFO, *PFATINFO; - -struct _VFATFCB; -struct _VFAT_DIRENTRY_CONTEXT; - -typedef struct _HASHENTRY -{ - ULONG Hash; - struct _VFATFCB* self; - struct _HASHENTRY* next; -} -HASHENTRY; - -#define FCB_HASH_TABLE_SIZE 65536 - -typedef struct DEVICE_EXTENSION *PDEVICE_EXTENSION; - -typedef NTSTATUS (*PGET_NEXT_CLUSTER)(PDEVICE_EXTENSION,ULONG,PULONG); -typedef NTSTATUS (*PFIND_AND_MARK_AVAILABLE_CLUSTER)(PDEVICE_EXTENSION,PULONG); -typedef NTSTATUS (*PWRITE_CLUSTER)(PDEVICE_EXTENSION,ULONG,ULONG,PULONG); - -typedef NTSTATUS (*PGET_NEXT_DIR_ENTRY)(PVOID*,PVOID*,struct _VFATFCB*,struct _VFAT_DIRENTRY_CONTEXT*,BOOLEAN); - -typedef struct DEVICE_EXTENSION -{ - ERESOURCE DirResource; - ERESOURCE FatResource; - - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - ULONG HashTableSize; - struct _HASHENTRY** FcbHashTable; - - PDEVICE_OBJECT StorageDevice; - PFILE_OBJECT FATFileObject; - FATINFO FatInfo; - ULONG LastAvailableCluster; - ULONG AvailableClusters; - BOOLEAN AvailableClustersValid; - ULONG Flags; - struct _VFATFCB * VolumeFcb; - - /* Pointers to functions for manipulating FAT. */ - PGET_NEXT_CLUSTER GetNextCluster; - PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; - PWRITE_CLUSTER WriteCluster; - ULONG CleanShutBitMask; - - /* Pointers to functions for manipulating directory entries. */ - PGET_NEXT_DIR_ENTRY GetNextDirEntry; - - ULONG BaseDateYear; - - LIST_ENTRY VolumeListEntry; -} DEVICE_EXTENSION, VCB, *PVCB; - -typedef struct -{ - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - ULONG Flags; - ERESOURCE VolumeListLock; - LIST_ENTRY VolumeListHead; - NPAGED_LOOKASIDE_LIST FcbLookasideList; - NPAGED_LOOKASIDE_LIST CcbLookasideList; - NPAGED_LOOKASIDE_LIST IrpContextLookasideList; - FAST_IO_DISPATCH FastIoDispatch; - CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; -} VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; - -extern PVFAT_GLOBAL_DATA VfatGlobalData; - -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_DELETE_PENDING 0x0002 -#define FCB_IS_FAT 0x0004 -#define FCB_IS_PAGE_FILE 0x0008 -#define FCB_IS_VOLUME 0x0010 -#define FCB_IS_DIRTY 0x0020 -#define FCB_IS_FATX_ENTRY 0x0040 - -typedef struct _VFATFCB -{ - /* FCB header required by ROS/NT */ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - /* end FCB header required by ROS/NT */ - - /* directory entry for this file or directory */ - DIR_ENTRY entry; - - /* Pointer to attributes in entry */ - PUCHAR Attributes; - - /* long file name, points into PathNameBuffer */ - UNICODE_STRING LongNameU; - - /* short file name */ - UNICODE_STRING ShortNameU; - - /* directory name, points into PathNameBuffer */ - UNICODE_STRING DirNameU; - - /* path + long file name 260 max*/ - UNICODE_STRING PathNameU; - - /* buffer for PathNameU */ - PWCHAR PathNameBuffer; - - /* buffer for ShortNameU */ - WCHAR ShortNameBuffer[13]; - - /* */ - LONG RefCount; - - /* List of FCB's for this volume */ - LIST_ENTRY FcbListEntry; - - /* pointer to the parent fcb */ - struct _VFATFCB* parentFcb; - - /* Flags for the fcb */ - ULONG Flags; - - /* pointer to the file object which has initialized the fcb */ - PFILE_OBJECT FileObject; - - /* Directory index for the short name entry */ - ULONG dirIndex; - - /* Directory index where the long name starts */ - ULONG startIndex; - - /* Share access for the file object */ - SHARE_ACCESS FCBShareAccess; - - /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ - ULONG OpenHandleCount; - - /* Entry into the hash table for the path + long name */ - HASHENTRY Hash; - - /* Entry into the hash table for the path + short name */ - HASHENTRY ShortHash; - - /* List of byte-range locks for this file */ - FILE_LOCK FileLock; - - /* - * Optimalization: caching of last read/write cluster+offset pair. Can't - * be in VFATCCB because it must be reset everytime the allocated clusters - * change. - */ - FAST_MUTEX LastMutex; - ULONG LastCluster; - ULONG LastOffset; -} VFATFCB, *PVFATFCB; - -typedef struct _VFATCCB -{ - LARGE_INTEGER CurrentByteOffset; - /* for DirectoryControl */ - ULONG Entry; - /* for DirectoryControl */ - UNICODE_STRING SearchPattern; -} VFATCCB, *PVFATCCB; - -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('V', 'C', 'C', 'B') -#define TAG_FCB TAG('V', 'F', 'C', 'B') -#define TAG_IRP TAG('V', 'I', 'R', 'P') -#define TAG_VFAT TAG('V', 'F', 'A', 'T') - -#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) - -typedef struct __DOSTIME -{ - USHORT Second:5; - USHORT Minute:6; - USHORT Hour:5; -} -DOSTIME, *PDOSTIME; - -typedef struct __DOSDATE -{ - USHORT Day:5; - USHORT Month:4; - USHORT Year:5; -} -DOSDATE, *PDOSDATE; - -#define IRPCONTEXT_CANWAIT 0x0001 -#define IRPCONTEXT_PENDINGRETURNED 0x0002 - -typedef struct -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExt; - ULONG Flags; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; - UCHAR MajorFunction; - UCHAR MinorFunction; - PFILE_OBJECT FileObject; - ULONG RefCount; - KEVENT Event; -} VFAT_IRP_CONTEXT, *PVFAT_IRP_CONTEXT; - -typedef struct _VFAT_DIRENTRY_CONTEXT -{ - ULONG StartIndex; - ULONG DirIndex; - DIR_ENTRY DirEntry; - UNICODE_STRING LongNameU; - UNICODE_STRING ShortNameU; -} VFAT_DIRENTRY_CONTEXT, *PVFAT_DIRENTRY_CONTEXT; - - -/* ------------------------------------------------------ shutdown.c */ - -DRIVER_DISPATCH VfatShutdown; -NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -/* -------------------------------------------------------- volume.c */ - -NTSTATUS VfatQueryVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); - -/* ------------------------------------------------------ blockdev.c */ - -NTSTATUS VfatReadDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN PUCHAR Buffer, - IN BOOLEAN Override); - -NTSTATUS VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatWriteDiskPartial(IN PVFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize, - IN BOOLEAN Override); - -/* ----------------------------------------------------------- dir.c */ - -NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT); - -BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, - USHORT DosDate, - USHORT DosTime, - PLARGE_INTEGER SystemTime); - -BOOLEAN FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER SystemTime, - USHORT *pDosDate, - USHORT *pDosTime); - -/* -------------------------------------------------------- create.c */ - -NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, - PVFATFCB Parent, - PUNICODE_STRING FileToFindU, - PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -VOID vfat8Dot3ToString (PFAT_DIR_ENTRY pEntry, - PUNICODE_STRING NameU); - -NTSTATUS ReadVolumeLabel(PDEVICE_EXTENSION DeviceExt, - PVPB Vpb); - -/* --------------------------------------------------------- close.c */ - -NTSTATUS VfatClose (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatCloseFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject); - -/* ------------------------------------------------------- cleanup.c */ - -NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext); - -/* --------------------------------------------------------- fastio.c */ - -VOID -VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch); - -BOOLEAN NTAPI -VfatAcquireForLazyWrite(IN PVOID Context, - IN BOOLEAN Wait); - -VOID NTAPI -VfatReleaseFromLazyWrite(IN PVOID Context); - -BOOLEAN NTAPI -VfatAcquireForReadAhead(IN PVOID Context, - IN BOOLEAN Wait); - -VOID NTAPI -VfatReleaseFromReadAhead(IN PVOID Context); - -/* --------------------------------------------------------- fsctl.c */ - -NTSTATUS VfatFileSystemControl (PVFAT_IRP_CONTEXT IrpContext); - -/* --------------------------------------------------------- finfo.c */ - -NTSTATUS VfatQueryInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS -VfatSetAllocationSizeInformation(PFILE_OBJECT FileObject, - PVFATFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER AllocationSize); - -/* --------------------------------------------------------- iface.c */ - -NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -/* --------------------------------------------------------- dirwr.c */ - -NTSTATUS VfatAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PVFATFCB* Fcb, - PVFATFCB ParentFcb, - ULONG RequestedOptions, - UCHAR ReqAttr); - -NTSTATUS VfatUpdateEntry (PVFATFCB pFcb); - -NTSTATUS VfatDelEntry(PDEVICE_EXTENSION, PVFATFCB); - -BOOLEAN -vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, - PVFATFCB pDirFcb, - ULONG nbSlots, - PULONG start); - -/* -------------------------------------------------------- string.c */ - -VOID -vfatSplitPathName(PUNICODE_STRING PathNameU, - PUNICODE_STRING DirNameU, - PUNICODE_STRING FileNameU); - -BOOLEAN vfatIsLongIllegal(WCHAR c); - -BOOLEAN wstrcmpjoki (PWSTR s1, - PWSTR s2); - -/* ----------------------------------------------------------- fat.c */ - -NTSTATUS FAT12GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT12FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT12WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT16GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT16FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT16WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT32GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT32FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT32WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS OffsetToCluster (PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - ULONG FileOffset, - PULONG Cluster, - BOOLEAN Extend); - -ULONGLONG ClusterToSector (PDEVICE_EXTENSION DeviceExt, - ULONG Cluster); - -NTSTATUS GetNextCluster (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS GetNextClusterExtend (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS CountAvailableClusters (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER Clusters); - -NTSTATUS -WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue); - -/* ------------------------------------------------------ direntry.c */ - -ULONG vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, - PDIR_ENTRY pDirEntry); - -BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb); - -NTSTATUS FATGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -NTSTATUS FATXGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -/* ----------------------------------------------------------- fcb.c */ - -PVFATFCB vfatNewFCB (PDEVICE_EXTENSION pVCB, - PUNICODE_STRING pFileNameU); - -VOID vfatDestroyFCB (PVFATFCB pFCB); - -VOID vfatDestroyCCB(PVFATCCB pCcb); - -VOID vfatGrabFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatReleaseFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatAddFCBToTable (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -PVFATFCB vfatGrabFCBFromTable (PDEVICE_EXTENSION pDeviceExt, - PUNICODE_STRING pFileNameU); - -PVFATFCB vfatMakeRootFCB (PDEVICE_EXTENSION pVCB); - -PVFATFCB vfatOpenRootFCB (PDEVICE_EXTENSION pVCB); - -BOOLEAN vfatFCBIsDirectory (PVFATFCB FCB); - -BOOLEAN vfatFCBIsRoot(PVFATFCB FCB); - -NTSTATUS vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb, - PVFATFCB fcb, - PFILE_OBJECT fileObject); - -NTSTATUS vfatDirFindFile (PDEVICE_EXTENSION pVCB, - PVFATFCB parentFCB, - PUNICODE_STRING FileToFindU, - PVFATFCB * fileFCB); - -NTSTATUS vfatGetFCBForFile (PDEVICE_EXTENSION pVCB, - PVFATFCB *pParentFCB, - PVFATFCB *pFCB, - PUNICODE_STRING pFileNameU); - -NTSTATUS vfatMakeFCBFromDirEntry (PVCB vcb, - PVFATFCB directoryFCB, - PVFAT_DIRENTRY_CONTEXT DirContext, - PVFATFCB * fileFCB); - -/* ------------------------------------------------------------ rw.c */ - -NTSTATUS VfatRead (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS NextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - PULONG CurrentCluster, - BOOLEAN Extend); - -/* ----------------------------------------------------------- misc.c */ - -NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT IrpContext); - -PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); - -DRIVER_DISPATCH VfatBuildRequest; -NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -PVOID VfatGetUserBuffer(IN PIRP); - -NTSTATUS VfatLockUserBuffer(IN PIRP, IN ULONG, - IN LOCK_OPERATION); - -NTSTATUS -VfatSetExtendedAttributes(PFILE_OBJECT FileObject, - PVOID Ea, - ULONG EaLength); -/* ------------------------------------------------------------- flush.c */ - -NTSTATUS VfatFlush(PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb); - - -/* EOF */ Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfat005.1st URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfat005.1st [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/vfat005.1st (removed) @@ -1,12 +1,0 @@ -This is VFAT driver release 0.0.5 - -To install : - extract files - delete all object files (*.o) in all subdirectories - (because include file include/ddk/iotypes.h is modified and is used by many files) - recompile reactos - -What's new : - - some bugfixes - - support for IRP_MJ_DIRECTORY_CONTROL - (see reactos/tst/sshell.c for use of ZwQueryDirectoryFile) Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfat_fr.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfat_fr.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/vfat_fr.txt (removed) @@ -1,97 +1,0 @@ -A Faire : - finir FsdDirectoryControl. - tester les écritures. - FsdCreate doit créer le fichier s'il n'existe pas et que le répertoire parent existe, - et que les options d'appel lee demandent. - - -fichiers sources : - -iface.c -dir.c -blockdev.c -vfat.h - - - -fonctions visibles de l'extérieur (appelées par IoCallDriver): - DriverEntry : iface.c - initialisation du driver - rend visibles les fonctions suivantes : - FsdFileSystemControl - répond aux demandes IRP_MJ_FILE_SYSTEM_CONTROL - monte les filesystems qu'il reconnait - appelle FsdHasFileSystem pour voir si le driver reconnait le filesystem. - puis appelle FsdMount. - NTSTATUS FsdCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) - répond aux demandes IRP_MJ_CREATE : - appelle FsdOpenFile, qui remplit IoGetCurrentIrpStackLocation(Irp)->FileObject->Fcb - remplit Irp->IoStatus - appelle IoCompleteRequest - FsdClose - répond aux demandes IRP_MJ_CLOSE - appelle FsdCloseFile, qui ne fait rien actuellement. - remplit Irp->IoStatus - appelle IoCompleteRequest - FsdRead - répond aux demandes IRP_MJ_READ - FsdWrite - répond aux demandes IRP_MJ_WRITE - FsdQueryInformation - répond aux demandes IRP_MJ_QUERY_INFORMATION - FsdDirectoryControl - répond aux demandes IRP_MJ_DIRECTORY_CONTROL - - -fonctions strictement internes dans iface.c : - ULONG Fat32GetNextCluster(PDEVICE_EXTENSION DeviceExt, ULONG CurrentCluster) - ULONG Fat16GetNextCluster(PDEVICE_EXTENSION DeviceExt, ULONG CurrentCluster) - ULONG Fat12GetNextCluster(PDEVICE_EXTENSION DeviceExt, ULONG CurrentCluster) - ULONG GetNextCluster(PDEVICE_EXTENSION DeviceExt, ULONG CurrentCluster) - ULONG FAT16FindAvailableCluster(PDEVICE_EXTENSION DeviceExt) - void FAT16WriteCluster(PDEVICE_EXTENSION DeviceExt, ULONG ClusterToWrite, - ULONG NewValue) - void WriteCluster(PDEVICE_EXTENSION DeviceExt, ULONG ClusterToWrite, - ULONG NewValue) - ULONG GetNextWriteCluster(PDEVICE_EXTENSION DeviceExt, ULONG CurrentCluster) - unsigned long ClusterToSector(PDEVICE_EXTENSION DeviceExt, - unsigned long Cluster) - void RtlAnsiToUnicode(PWSTR Dest, PCH Source, ULONG Length) - void vfat_initstr(wchar_t *wstr, ULONG wsize) - wchar_t * vfat_wcsncat(wchar_t * dest, const wchar_t * src,size_t wstart, size_t wcount) - wchar_t * vfat_wcsncpy(wchar_t * dest, const wchar_t *src,size_t wcount) - wchar_t * vfat_movstr(wchar_t * dest, const wchar_t *src, ULONG dpos, - ULONG spos, ULONG len) - BOOLEAN IsLastEntry(PVOID Block, ULONG Offset) - BOOLEAN IsDeletedEntry(PVOID Block, ULONG Offset) - BOOLEAN GetEntryName(PVOID Block, PULONG _Offset, PWSTR Name, PULONG _jloop, - PDEVICE_EXTENSION DeviceExt, PULONG _StartingSector) - BOOLEAN wstrcmpi(PWSTR s1, PWSTR s2) - BOOLEAN wstrcmpjoki(PWSTR s1, PWSTR s2) - NTSTATUS FindFile(PDEVICE_EXTENSION DeviceExt, PFCB Fcb, - PFCB Parent, PWSTR FileToFind) - parcourt le répertoire décrit par Parent pour trouver un fichier dans le filesystem - décrit par DeviceExt.Si Parent==NULL : part de la racine du filesystem. - remplit Fcb si trouve elle le fichier, et renvoie STATUS_SUCCESS. - renvoie STATUS_UNSUCCESSFUL sinon. - NTSTATUS FsdCloseFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject) - ne fait rien, renvoie STATUS_SUCCESS. - NTSTATUS FsdOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PWSTR FileName) - parcourt l'arborescence pour trouver le fichier(appelle FindFile à chaque niveau) - si trouvé : FileObject->FsContext = Fcb du fichier, renvoie STATUS_SUCCESS - sinon : renvoie STATUS_UNSUCCESSFULL - BOOLEAN FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount) - NTSTATUS FsdMountDevice(PDEVICE_EXTENSION DeviceExt, - PDEVICE_OBJECT DeviceToMount) - void VFATLoadCluster(PDEVICE_EXTENSION DeviceExt, PVOID Buffer, ULONG Cluster) - void VFATWriteCluster(PDEVICE_EXTENSION DeviceExt, PVOID Buffer, ULONG Cluster) - NTSTATUS FsdReadFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PVOID Buffer, ULONG Length, ULONG ReadOffset) - lit Length octets d'un fichier - NTSTATUS FsdWriteFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PVOID Buffer, ULONG Length, ULONG WriteOffset) - NTSTATUS FsdMount(PDEVICE_OBJECT DeviceToMount) - NTSTATUS FsdGetStandardInformation(PFCB FCB, PDEVICE_OBJECT DeviceObject, - PFILE_STANDARD_INFORMATION StandardInfo); - Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rbuild (removed) @@ -1,30 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> - <include base="fastfat">.</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>blockdev.c</file> - <file>cleanup.c</file> - <file>close.c</file> - <file>create.c</file> - <file>dir.c</file> - <file>direntry.c</file> - <file>dirwr.c</file> - <file>ea.c</file> - <file>fat.c</file> - <file>fastio.c</file> - <file>fcb.c</file> - <file>finfo.c</file> - <file>flush.c</file> - <file>fsctl.c</file> - <file>iface.c</file> - <file>misc.c</file> - <file>rw.c</file> - <file>shutdown.c</file> - <file>string.c</file> - <file>volume.c</file> - <file>vfatfs.rc</file> - <pch>vfat.h</pch> -</module> Removed: trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/vfatfs.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "VFAT IFS Driver\0" -#define REACTOS_STR_INTERNAL_NAME "vfatfs\0" -#define REACTOS_STR_ORIGINAL_FILENAME "vfatfs.sys\0" -#include <reactos/version.rc> Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Sun Jan 11 05:26:20 2009 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #define NDEBUG -#include "vfat.h" +#include "fastfat.h" /* FUNCTIONS ****************************************************************/

15 years, 8 months

[fireball] 38693: - Branch existing fastfat driver.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 11 05:12:55 2009 New Revision: 38693 URL: http://svn.reactos.org/svn/reactos?rev=38693&view=rev Log: - Branch existing fastfat driver. Added: trunk/reactos/drivers/filesystems/fastfat_new/ - copied from r38678, trunk/reactos/drivers/filesystems/fastfat/

15 years, 8 months

[mkupfer] 38692: Michael von Glasow <michael AT vonglasow DOT com> - Remove hardcoded Alt Gr behavior. - Tested with german layout and installation, patch doesn't break system, further tests are recommended. - See issue #3887 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jan 11 04:10:31 2009 New Revision: 38692 URL: http://svn.reactos.org/svn/reactos?rev=38692&view=rev Log: Michael von Glasow <michael AT vonglasow DOT com> - Remove hardcoded Alt Gr behavior. - Tested with german layout and installation, patch doesn't break system, further tests are recommended. - See issue #3887 for more details. Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] Sun Jan 11 04:10:31 2009 @@ -459,7 +459,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */ /* Ligatures -- Russian doesn't have any */ 0, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Jan 11 04:10:31 2009 @@ -213,9 +213,10 @@ ModBits |= GetShiftBit( pkKT, VK_MENU ); /* Handle Alt+Gr */ - if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) & - KS_DOWN_BIT ) - ModBits |= GetShiftBit( pkKT, VK_CONTROL ); + if (pkKT->fLocalFlags & 0x1) + if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) & + KS_DOWN_BIT) + ModBits |= GetShiftBit( pkKT, VK_CONTROL ); /* Deal with VK_CAPITAL */ if (KeysSet( pkKT, KeyState, VK_CAPITAL, 0 ) & KS_LOCK_BIT)

15 years, 8 months

[dreimer] 38691: German Translation of hdwwiz.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Jan 10 18:21:59 2009 New Revision: 38691 URL: http://svn.reactos.org/svn/reactos?rev=38691&view=rev Log: German Translation of hdwwiz. Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Sat Jan 10 18:21:59 2009 @@ -2,21 +2,21 @@ IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Wilkommen zum Hardware Assistenten", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Dieser Assistent unterstützt Sie bei:", -1, 114, 40, 182, 8 + LTEXT "1) Software installieren, um die an den Computer angeschlossene Hardware zu unterstützen.", -1, 121, 56, 184, 16 + LTEXT "2) Probleme lösen, die Sie mit Ihrer Hardware haben.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Falls die Hardware mit einer Installations CD geliefert wurde, ist es empfehlenswert den Assistenten zu beenden und die Installations CD des Anbieters zu verwenden.", 503, 150, 106, 155, 50 + LTEXT "Klicken Sie ""Weiter"", um fortzufahren.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,63 +25,63 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Ist die Hardware bereits am Computer angeschlossen?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Ja, die Hardware ist bereits angeschlossen", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&Nein, die Hardware ist noch nicht angeschlossen", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Wählen Sie aus der Liste ein installiertes Gerät aus und klicken Sie auf ""Weiter"", um die Einstellungen zu überprüfen und mögliche Probleme zu lösen.", -1, 21, 8, 275, 22 + LTEXT "Um Hardware zu installieren, die nicht in der Liste aufgelistet ist, klicken Sie ""Neue Hardware hinzufügen.""", -1, 21, 32, 275, 24 + LTEXT "I&nstallierte Hardware:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "Der Assistent kann automatisch Hardware suchen und diese installieren. Oder, falls Sie das zu installierende Gerät genau kennen, können Sie es aus der Liste auswählen.", -1, 21, 8, 280, 24 + LTEXT "Wie wollen Sie den Assistenten fortsetzen?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "Automatisch nach neuer Hardware &suchen und installieren (empfohlen)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Manuell aus der Liste ausgewählte Hardware installieren (erweitert)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Erkannte Hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Wenn Sie die Hardwarekategorie, die Sie benötigen nicht finden, wählen Sie ""Alle Geräte"".", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Bekannte &Hardware Typen:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "Der Hardware Suchvorgang kann mehere Minuten dauern.", -1, 21, 8, 275, 15 + LTEXT "Fortschitt:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,58 +89,58 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Hardware Assistent wird vervollständigt", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Der Hardware Assistent wurde erfolgreich abgeschlossen.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Klicken Sie ""Beenden"", um den Assistenten zu schliessen.", -1, 114, 166, 192, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Hardware Assistent wird vervollständigt", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Der Assistent fand folgende Hardware an ihrem Computer:", -1, 114, 32, 193, 19 + LTEXT "Klicken Sie ""Beenden"", um den Assistenten zu schliessen.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Hardware Assistent wird vervollständigt", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Derzeitiger Status der ausgewählten Hardware:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Klicken Sie ""Beenden"", um Hilfe zum Lösen von möglichen Problemen zu erhalten.", -1, 114, 136, 193, 16 + LTEXT "Klicken Sie ""Abbrechen"", um den Assistenden zu schliessen.", IDC_STATUSTEXT, 114, 166, 200, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Hardware Assistent" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Hardware Assistent kann nicht fortgesetzt werden", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Um fortsetzen zu können, verbinden Sie folgende Hardware mit dem Computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Nach Beenden den Computer neustarten, um die Hardware anschliessen zu können.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In den meisten Fällen wird ReactOS die Hardware automatisch installieren, wenn Sie sie mit dem Computer verbinden. Andernfalls können Sie den Assistenten erneut starten, um die zu unterstützende Hardware zu installieren.", -1, 114, 98, 193, 32 + LTEXT "Klicken Sie auf ""Beenden"", um den Assistenten zu schliessen.", IDC_STATUSTEXT, 114, 166, 200, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Hardware" IDS_CPLDESCRIPTION "Installiert neue Hardwarekomponenten." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_SEARCHTITLE "Bitte warten Sie, während der Assistent neue Hardware sucht..." + IDS_SEARCHTEXT "Dieser Assistent sucht nach Hardware, die vor kurzem an Ihren Computer angeschlossen, aber noch nicht installiert wurde." + IDS_ISCONNECTED "Ist die Hardware bereits verbunden?" + IDS_PROBELISTTITLE "Folgende Hardware ist bereits auf Ihrem Computer installiert" + IDS_ADDNEWDEVICE "Ein neues Gerät hinzufügen" + IDS_SELECTWAYTITLE "Der Assistent kann Sie bei der Installation anderer Hardware unterstützen" END

15 years, 8 months

← Newer
1
...
53
54
55
56
57
58
59
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009