Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[hbirr] 14422: - Route the stream file objects also through the close path.

by hbirr＠svn.reactos.com

- Route the stream file objects also through the close path. - Calculate the size of the fcb hash table depend on the file system type. Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/close.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-04-01 18:22:17 UTC (rev 14421) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-04-01 18:35:34 UTC (rev 14422) @@ -49,6 +49,19 @@ if (pFcb->Flags & FCB_DELETE_PENDING && pFcb->OpenHandleCount == 1) { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFcb->FileObject; + if (tmpFileObject != NULL) + { + pFcb->FileObject = NULL; +#ifdef USE_ROS_CC_AND_FS + CcRosReleaseFileCache(tmpFileObject); +#else + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); +#endif + ObDereferenceObject(tmpFileObject); + } + #if 0 /* FIXME: * CcPurgeCacheSection is unimplemented. _____ Modified: trunk/reactos/drivers/fs/vfat/close.c --- trunk/reactos/drivers/fs/vfat/close.c 2005-04-01 18:22:17 UTC (rev 14421) +++ trunk/reactos/drivers/fs/vfat/close.c 2005-04-01 18:35:34 UTC (rev 14422) @@ -43,11 +43,8 @@ pFcb->RefCount--; FileObject->FsContext2 = NULL; } - else if (FileObject->FileName.Buffer) + else { - // This a FO, that was created outside from FSD. - // Some FO's are created with IoCreateStreamFileObject() insid from FSD. - // This FO's haven't a FileName. if (FileObject->DeletePending) { if (pFcb->Flags & FCB_DELETE_PENDING) _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-04-01 18:22:17 UTC (rev 14421) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-04-01 18:35:34 UTC (rev 14422) @@ -191,10 +191,10 @@ while (pFCB) { - Index = pFCB->Hash.Hash % FCB_HASH_TABLE_SIZE; - ShortIndex = pFCB->ShortHash.Hash % FCB_HASH_TABLE_SIZE; + Index = pFCB->Hash.Hash % pVCB->HashTableSize; + ShortIndex = pFCB->ShortHash.Hash % pVCB->HashTableSize; pFCB->RefCount--; - if (pFCB->RefCount <= 0 && (!vfatFCBIsDirectory (pFCB) || pFCB->Flags & FCB_DELETE_PENDING)) + if (pFCB->RefCount == 0) { tmpFcb = pFCB->parentFcb; RemoveEntryList (&pFCB->FcbListEntry); @@ -227,22 +227,6 @@ } entry->next = pFCB->Hash.next; } - if (vfatFCBIsDirectory(pFCB)) - { - /* Uninitialize file cache if initialized for this file object. */ - if (pFCB->FileObject->SectionObjectPointer->SharedCacheMap) - { -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(pFCB->FileObject); -#else - CcUninitializeCacheMap(pFCB->FileObject, NULL, NULL); -#endif - } - vfatDestroyCCB(pFCB->FileObject->FsContext2); - pFCB->FileObject->FsContext2 = NULL; - pFCB->FileObject->FsContext = NULL; - ObDereferenceObject(pFCB->FileObject); - } vfatDestroyFCB (pFCB); } else @@ -259,8 +243,8 @@ ULONG Index; ULONG ShortIndex; - Index = pFCB->Hash.Hash % FCB_HASH_TABLE_SIZE; - ShortIndex = pFCB->ShortHash.Hash % FCB_HASH_TABLE_SIZE; + Index = pFCB->Hash.Hash % pVCB->HashTableSize; + ShortIndex = pFCB->ShortHash.Hash % pVCB->HashTableSize; InsertTailList (&pVCB->FcbListHead, &pFCB->FcbListEntry); @@ -292,7 +276,7 @@ Hash = vfatNameHash(0, PathNameU); - entry = pVCB->FcbHashTable[Hash % FCB_HASH_TABLE_SIZE]; + entry = pVCB->FcbHashTable[Hash % pVCB->HashTableSize]; if (entry) { vfatSplitPathName(PathNameU, &DirNameU, &FileNameU); @@ -353,6 +337,7 @@ fileObject->FsContext = fcb; fileObject->FsContext2 = newCCB; fcb->FileObject = fileObject; + fcb->RefCount++; #ifdef USE_ROS_CC_AND_FS fileCacheQuantum = (vcb->FatInfo.BytesPerCluster >= PAGE_SIZE) ? @@ -375,12 +360,7 @@ #endif fcb->Flags |= FCB_CACHE_INITIALIZED; - -#ifdef USE_ROS_CC_AND_FS - return status; -#else return STATUS_SUCCESS; -#endif } PVFATFCB _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-01 18:22:17 UTC (rev 14421) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-01 18:35:34 UTC (rev 14422) @@ -372,6 +372,8 @@ PDEVICE_OBJECT DeviceToMount; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); + ULONG HashTableSize; + FATINFO FatInfo; DPRINT("VfatMount(IrpContext %x)\n", IrpContext); @@ -385,7 +387,7 @@ DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; - Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, NULL); + Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -398,9 +400,24 @@ goto ByeBye; } + /* Use prime numbers for the table size */ + if (FatInfo.FatType == FAT12) + { + HashTableSize = 4099; // 4096 = 4 * 1024 + } + else if (FatInfo.FatType == FAT16 || + FatInfo.FatType == FATX16) + { + HashTableSize = 16411; // 16384 = 16 * 1024 + } + else + { + HashTableSize = 65537; // 65536 = 64 * 1024; + } + HashTableSize = FCB_HASH_TABLE_SIZE; DPRINT("VFAT: Recognized volume\n"); Status = IoCreateDevice(VfatGlobalData->DriverObject, - sizeof (DEVICE_EXTENSION), + ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(DWORD)) + sizeof(HASHENTRY*) * HashTableSize, NULL, FILE_DEVICE_FILE_SYSTEM, 0, @@ -413,7 +430,9 @@ DeviceObject->Flags = DeviceObject->Flags | DO_DIRECT_IO; DeviceExt = (PVOID) DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, sizeof(DEVICE_EXTENSION)); + RtlZeroMemory(DeviceExt, ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(DWORD)) + sizeof(HASHENTRY*) * HashTableSize); + DeviceExt->FcbHashTable = (HASHENTRY**)((ULONG_PTR)DeviceExt + ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(DWORD))); + DeviceExt->HashTableSize = HashTableSize; /* use same vpb as device disk */ DeviceObject->Vpb = DeviceToMount->Vpb; @@ -557,7 +576,7 @@ /* read volume label */ ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); - + Status = STATUS_SUCCESS; ByeBye: _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-01 18:22:17 UTC (rev 14421) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-01 18:35:34 UTC (rev 14422) @@ -241,7 +241,8 @@ KSPIN_LOCK FcbListLock; LIST_ENTRY FcbListHead; - struct _HASHENTRY* FcbHashTable[FCB_HASH_TABLE_SIZE]; + ULONG HashTableSize; + struct _HASHENTRY** FcbHashTable; PDEVICE_OBJECT StorageDevice; PFILE_OBJECT FATFileObject;

19 years, 8 months

[hbirr] 14421: - Use IoBuildAsynchronousFsdRequest instead IoBuildSynchronousFsdRequest in NtRead/WriteFile.

by hbirr＠svn.reactos.com

- Use IoBuildAsynchronousFsdRequest instead IoBuildSynchronousFsdRequest in NtRead/WriteFile. - Guard the calls to IoBuildAsynchronousFsdRequest with an exception frame. Modified: trunk/reactos/ntoskrnl/io/rw.c _____ Modified: trunk/reactos/ntoskrnl/io/rw.c --- trunk/reactos/ntoskrnl/io/rw.c 2005-04-01 18:19:46 UTC (rev 14420) +++ trunk/reactos/ntoskrnl/io/rw.c 2005-04-01 18:22:17 UTC (rev 14421) @@ -44,7 +44,7 @@ { NTSTATUS Status; PFILE_OBJECT FileObject; - PIRP Irp; + PIRP Irp = NULL; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; PKEVENT EventObject = NULL; @@ -92,25 +92,53 @@ PreviousMode, (PVOID*)&EventObject, NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(FileObject); - return Status; - } + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } KeClearEvent(EventObject); } + _SEH_TRY + { + Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_READ, + FileObject->DeviceObject, + Buffer, + Length, + ByteOffset, + IoStatusBlock); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status) || Irp == NULL) + { + if (Event) + { + ObDereferenceObject(&EventObject); + } + ObDereferenceObject(FileObject); + if (Irp) + { + IoFreeIrp(Irp); + } + return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + } + + Irp->UserEvent = Event; + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* synchronous irp's are queued to requestor thread's irp cancel/cleanup list */ + IoQueueThreadIrp(Irp); + } + KeClearEvent(&FileObject->Event); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - EventObject, - IoStatusBlock); - /* Trigger FileObject/Event dereferencing */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -172,7 +200,7 @@ OBJECT_HANDLE_INFORMATION HandleInformation; NTSTATUS Status; PFILE_OBJECT FileObject; - PIRP Irp; + PIRP Irp = NULL; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; PKEVENT EventObject = NULL; @@ -253,16 +281,44 @@ KeClearEvent(EventObject); } + _SEH_TRY + { + Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_WRITE, + FileObject->DeviceObject, + Buffer, + Length, + ByteOffset, + IoStatusBlock); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status) || Irp == NULL) + { + if (Event) + { + ObDereferenceObject(&EventObject); + } + ObDereferenceObject(FileObject); + if (Irp) + { + IoFreeIrp(Irp); + } + return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + } + + Irp->UserEvent = Event; + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* synchronous irp's are queued to requestor thread's irp cancel/cleanup list */ + IoQueueThreadIrp(Irp); + } + KeClearEvent(&FileObject->Event); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - EventObject, - IoStatusBlock); - /* Trigger FileObject/Event dereferencing */ Irp->Tail.Overlay.OriginalFileObject = FileObject;

19 years, 8 months

[hbirr] 14420: Raise the exception in MmProbeAndLockPages always with STATUS_ACCESS_VIOLATION.

by hbirr＠svn.reactos.com

Raise the exception in MmProbeAndLockPages always with STATUS_ACCESS_VIOLATION. Modified: trunk/reactos/ntoskrnl/mm/mdl.c _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-04-01 18:18:18 UTC (rev 14419) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-04-01 18:19:46 UTC (rev 14420) @@ -437,7 +437,7 @@ } } MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(Status); + ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } else @@ -461,7 +461,7 @@ } } MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(Status); + ExRaiseStatus(STATUS_ACCESS_VIOLATION); } } Page = MmGetPfnForProcess(NULL, Address);

19 years, 8 months

[chorns] 14419: Build stubs generated by winebuild

by chorns＠svn.reactos.com

Build stubs generated by winebuild Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 18:17:47 UTC (rev 14418) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 18:18:18 UTC (rev 14419) @@ -104,8 +104,13 @@ MingwModuleHandler::PassThruCacheDirectory ( const string &file, bool out ) { - string dir ( GetDirectory ( file ) ); - return backend->AddDirectoryTarget ( dir, out ) + SSEP + file; + string directory ( GetDirectory ( file ) ); + string generatedFilesDirectory = backend->AddDirectoryTarget ( directory, out ); + if ( directory.find ( generatedFilesDirectory ) != string::npos ) + /* This path already includes the generated files directory variable */ + return file; + else + return generatedFilesDirectory + SSEP + file; } /*static*/ string @@ -222,10 +227,11 @@ const string& filename ) const { string extension = GetExtension ( filename ); - if ( extension == ".spec" || extension == "SPEC" ) + if ( extension == ".spec" || extension == ".SPEC" ) { string basename = GetBasename ( filename ); - return basename + ".stubs.c"; + return PassThruCacheDirectory ( FixupTargetFilename ( basename + ".stubs.c" ), + false ); } else return filename; @@ -235,7 +241,7 @@ MingwModuleHandler::GetModuleArchiveFilename () const { if ( module.type == StaticLibrary ) - return GetTargetFilename(module,NULL); + return GetTargetFilename ( module, NULL ); return PassThruCacheDirectory ( ReplaceExtension ( FixupTargetFilename ( module.GetPath () ), ".temp.a" ), false ); @@ -245,7 +251,7 @@ MingwModuleHandler::IsGeneratedFile ( const File& file ) const { string extension = GetExtension ( file.name ); - return ( extension == ".spec" || extension == "SPEC" ); + return ( extension == ".spec" || extension == ".SPEC" ); } string @@ -343,7 +349,7 @@ string obj_file = PassThruCacheDirectory ( FixupTargetFilename ( ReplaceExtension ( - sourceFilename, //PrefixFilename(sourceFilename,module.prefix), + sourceFilename, newExtension ) ), false ); if ( pclean_files )

19 years, 8 months

[hbirr] 14418: Guard the calls to MmProbeAndLockPages and IoPrepareIrpBuffer with an exception frame and do free allocated resources if an exception occurs.

by hbirr＠svn.reactos.com

Guard the calls to MmProbeAndLockPages and IoPrepareIrpBuffer with an exception frame and do free allocated resources if an exception occurs. Modified: trunk/reactos/ntoskrnl/io/buildirp.c _____ Modified: trunk/reactos/ntoskrnl/io/buildirp.c --- trunk/reactos/ntoskrnl/io/buildirp.c 2005-04-01 18:06:50 UTC (rev 14417) +++ trunk/reactos/ntoskrnl/io/buildirp.c 2005-04-01 18:17:47 UTC (rev 14418) @@ -37,7 +37,6 @@ (PVOID)ExAllocatePoolWithTag(NonPagedPool,Length, TAG_SYS_BUF); if (Irp->AssociatedIrp.SystemBuffer==NULL) { - IoFreeIrp(Irp); return(STATUS_NOT_IMPLEMENTED); } /* FIXME: should copy buffer in on other ops */ @@ -121,13 +120,34 @@ StackPtr->FileObject = NULL; StackPtr->CompletionRoutine = NULL; - if (Buffer != NULL) + if (Length > 0) { - IoPrepareIrpBuffer(Irp, - DeviceObject, - Buffer, - Length, - MajorFunction); + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_FILTER(FreeAndGoOn) + { + IoFreeIrp(Irp); + return EXCEPTION_CONTINUE_SEARCH; + } + _SEH_TRY_FILTER(FreeAndGoOn) + { + Status = IoPrepareIrpBuffer(Irp, + DeviceObject, + Buffer, + Length, + MajorFunction); + } + _SEH_HANDLE + { + KEBUGCHECK(0); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + IoFreeIrp(Irp); + return NULL; + } } if (MajorFunction == IRP_MJ_READ) @@ -296,7 +316,27 @@ FALSE, FALSE, Irp); - MmProbeAndLockPages(Irp->MdlAddress,UserMode,IoReadAccess); + if (Irp->MdlAddress == NULL) + { + IoFreeIrp(Irp); + return NULL; + } + + _SEH_FILTER(FreeAndGoOn) + { + IoFreeIrp(Irp); + return EXCEPTION_CONTINUE_SEARCH; + } + _SEH_TRY_FILTER(FreeAndGoOn) + { + MmProbeAndLockPages(Irp->MdlAddress,UserMode,IoReadAccess); + } + _SEH_HANDLE + { + KEBUGCHECK(0); + } + _SEH_END; + } break; @@ -329,7 +369,26 @@ FALSE, FALSE, Irp); - MmProbeAndLockPages(Irp->MdlAddress,UserMode,IoWriteAccess); + if (Irp->MdlAddress == NULL) + { + IoFreeIrp(Irp); + return NULL; + } + + _SEH_FILTER(FreeAndGoOn) + { + IoFreeIrp(Irp); + return EXCEPTION_CONTINUE_SEARCH; + } + _SEH_TRY_FILTER(FreeAndGoOn) + { + MmProbeAndLockPages(Irp->MdlAddress,UserMode,IoWriteAccess); + } + _SEH_HANDLE + { + KEBUGCHECK(0); + } + _SEH_END; } break; @@ -352,12 +411,12 @@ */ PIRP STDCALL IoBuildSynchronousFsdRequest(ULONG MajorFunction, - PDEVICE_OBJECT DeviceObject, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER StartingOffset, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock) + PDEVICE_OBJECT DeviceObject, + PVOID Buffer, + ULONG Length, + PLARGE_INTEGER StartingOffset, + PKEVENT Event, + PIO_STATUS_BLOCK IoStatusBlock) /* * FUNCTION: Allocates and builds an IRP to be sent synchronously to lower * level driver(s)

19 years, 8 months

[sedwards] 14417: move another SDK header to the SDK

by sedwards＠svn.reactos.com

move another SDK header to the SDK Deleted: trunk/reactos/include/aclui.h Added: trunk/reactos/w32api/include/aclui.h _____ Deleted: trunk/reactos/include/aclui.h --- trunk/reactos/include/aclui.h 2005-04-01 18:00:22 UTC (rev 14416) +++ trunk/reactos/include/aclui.h 2005-04-01 18:06:50 UTC (rev 14417) @@ -1,124 +0,0 @@ -/* - * aclui.h - * - * Access Control List Editor definitions - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __ACLUI_H -#define __ACLUI_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#include <unknwn.h> -#include <accctrl.h> -#include <commctrl.h> - -DEFINE_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x0091, 0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23); -DEFINE_GUID(IID_ISecurityInformation2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0x00a3, 0xce,0x00,0xc0,0x4f,0xb1,0x78,0x2a); -DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); -DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa); - -/* FIXME - defined in structs.h already!? avoid conflicts! */ -typedef struct _OBJECT_TYPE_LIST { - WORD Level; - WORD Sbz; - GUID *ObjectType; -} OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST; - -typedef interface ISecurityInformation *LPSECURITYINFO; -typedef interface ISecurityInformation2 *LPSECURITYINFO2; -typedef interface IEffectivePermission *LPEFFECTIVEPERMISSION; -typedef interface ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; - -#undef INTERFACE -EXTERN_C const IID IID_ISecurityInformation; -#define INTERFACE ISecurityInformation -DECLARE_INTERFACE_(ISecurityInformation,IUnknown) -{ - /* IUnknown */ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - /* ISecurityInformation */ - STDMETHOD(GetObjectInformation)(THIS_ PSI_OBJECT_INFO) PURE; - STDMETHOD(GetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*,BOOL) PURE; - STDMETHOD(SetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR) PURE; - STDMETHOD(GetAccessRights)(THIS_ GUID*,DWORD,PSI_ACCESS*,ULONG*,ULONG*) PURE; - STDMETHOD(MapGeneric)(THIS_ GUID*,UCHAR*,PSI_ACCESS*) PURE; - STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE; - STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE; -}; -#undef INTERFACE - -#undef INTERFACE -#define INTERFACE ISecurityInformation2 -DECLARE_INTERFACE_(ISecurityInformation2,IUnknown) -{ - /* IUnknown */ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - /* ISecurityInformation2 */ - STDMETHOD(IsDaclCanonical)(THIS_ PACL) PURE; - STDMETHOD(LookupSids)(THIS_ ULONG,PSID*,LPDATAOBJECT*) PURE; -}; -#undef INTERFACE - -#undef INTERFACE -#define INTERFACE IEffectivePermission -DECLARE_INTERFACE_(IEffectivePermission,IUnknown) -{ - /* IUnknown */ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - /* IEffectivePermission */ - STDMETHOD(GetEffectivePermission)(THIS_ GUID*,PSID,LPCWSTR,PSECURITY_DESCRIPTOR,POBJECT_TYPE_LIST*,ULONG*,PACCES S_MASK*,ULONG*) PURE; -}; -#undef INTERFACE - -#undef INTERFACE -#define INTERFACE ISecurityObjectTypeInfo -DECLARE_INTERFACE_(ISecurityObjectTypeInfo,IUnknown) -{ - /* IUnknown */ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - /* ISecurityObjectTypeInfo */ - STDMETHOD(GetInheritSource)(THIS_ SECURITY_INFORMATION,PACL,PINHERITED_FROM*) PURE; -}; -#undef INTERFACE - -HPROPSHEETPAGE WINAPI -CreateSecurityPage(LPSECURITYINFO psi); - -BOOL WINAPI -EditSecurity(HWND hwndOwner, LPSECURITYINFO psi); - -#ifdef __cplusplus -} -#endif -#endif /* __ACLUI_H */ - -/* EOF */ _____ Copied: trunk/reactos/w32api/include/aclui.h (from rev 14404, trunk/reactos/include/aclui.h)

19 years, 8 months

[sedwards] 14416: use -D__USE_W32API for tgetopt

by sedwards＠svn.reactos.com

use -D__USE_W32API for tgetopt Modified: trunk/reactos/lib/tgetopt/Makefile _____ Modified: trunk/reactos/lib/tgetopt/Makefile --- trunk/reactos/lib/tgetopt/Makefile 2005-04-01 11:42:40 UTC (rev 14415) +++ trunk/reactos/lib/tgetopt/Makefile 2005-04-01 18:00:22 UTC (rev 14416) @@ -7,7 +7,7 @@ TARGET_NAME = tgetopt # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS +TARGET_CFLAGS += -D__USE_W32API -D_DISABLE_TIDENTS TARGET_OBJECTS = getopt.o _wgetopt.o

19 years, 8 months

[greatlrd] 14415: Swedish translation

by greatlrd＠svn.reactos.com

Swedish translation David Nordenberg dnordenberg(a)users.sourceforge.net proofread by Andreas Bjerkeholt harteex(a)gmail.com, Modified: trunk/reactos/lib/user32/Sv.rc _____ Modified: trunk/reactos/lib/user32/Sv.rc --- trunk/reactos/lib/user32/Sv.rc 2005-04-01 11:29:14 UTC (rev 14414) +++ trunk/reactos/lib/user32/Sv.rc 2005-04-01 11:42:40 UTC (rev 14415) @@ -18,11 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) -#ifdef _WIN32 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(850) -#endif //_WIN32 //////////////////////////////////////////////////////////////////////// ///// //

19 years, 8 months

[greatlrd] 14414: minor update

by greatlrd＠svn.reactos.com

minor update Swedish translation Andreas Bjerkeholt harteex(a)gmail.com, proofread by David Nordenberg dnordenberg(a)users.sourceforge.net Modified: trunk/reactos/lib/aclui/aclui_Sv.rc _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-04-01 10:19:45 UTC (rev 14413) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-04-01 11:29:14 UTC (rev 14414) @@ -20,10 +20,7 @@ #include <defines.h> #include "resource.h" -#ifdef _WIN32 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(850) -#endif //_WIN32 IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION

19 years, 8 months

[greatlrd] 14413: David Nordenberg: New copy from english resource translated to Swedish,

by greatlrd＠svn.reactos.com

David Nordenberg: New copy from english resource translated to Swedish, old one was missing 95% of its content. proofread by Andreas Bjerkeholt Modified: trunk/reactos/lib/shell32/shell32_Sv.rc _____ Modified: trunk/reactos/lib/shell32/shell32_Sv.rc --- trunk/reactos/lib/shell32/shell32_Sv.rc 2005-04-01 09:54:56 UTC (rev 14412) +++ trunk/reactos/lib/shell32/shell32_Sv.rc 2005-04-01 10:19:45 UTC (rev 14413) @@ -1,5 +1,5 @@ /* - * Copyright 1998 Juergen Schmied + * Copyright 2005 David Nordenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,92 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Stora ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Visa" + BEGIN + MENUITEM "&Stora ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÕ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Ordna &ikoner efter" + BEGIN + MENUITEM "&Namn", 0x30 /* column 0 */ + MENUITEM "&Typ", 0x32 /* column 2 */ + MENUITEM "&Storlek", 0x31 /* ... */ + MENUITEM "&Datum", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Rada upp ikoner", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "&Uppdatera", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "K&listra in", FCIDM_SHVIEW_INSERT + MENUITEM "Klistra in som genvõg", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "&Ny" + BEGIN + MENUITEM "Ny &mapp", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Ny &genvõg", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "&Egenskaper", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Utforska", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Íppna", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&Klipp ut", FCIDM_SHVIEW_CUT + MENUITEM "K&opiera", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Skapa &genvõg", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Ta bort", FCIDM_SHVIEW_DELETE + MENUITEM "&Byt namn", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Egenskaper", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Blõddra efter mapp" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" @@ -37,10 +123,99 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet pÕ ett program, en mapp eller ett dokument och ReactOS kommer att ÷ppna det f÷r dig.", 12289, 36, 11, 182, 18 +LTEXT "Skriv namnet pÕ ett program, en mapp eller ett dokument f÷r att ÷ppna det.", 12289, 36, 11, 182, 18 LTEXT "&Íppna:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Blõddra...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +/* + special folders +*/ +STRINGTABLE DISCARDABLE +{ + IDS_DESKTOP "Skrivbord" + IDS_MYCOMPUTER "Den hõr datorn" +} + +/* + context menus +*/ +STRINGTABLE DISCARDABLE +{ + IDS_VIEW_LARGE "&Stora ikoner" + IDS_VIEW_SMALL "S&mÕ ikoner" + IDS_VIEW_LIST "&Lista" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "Võlj" + IDS_OPEN "Íppna" +} + +STRINGTABLE DISCARDABLE +{ + IDS_CREATEFOLDER_DENIED "Kan inte skapa ny mapp: ?tkomst nekad." + IDS_CREATEFOLDER_CAPTION "Fel vid f÷rs÷k att skapa ny mapp" + IDS_DELETEITEM_CAPTION "Bekrõfta borttagning av fil" + IDS_DELETEFOLDER_CAPTION "Bekrõfta borttagning av mapp" + IDS_DELETEITEM_TEXT "?r du sõker pÕ att du vill ta bort '%1'?" + IDS_DELETEMULTIPLE_TEXT "?r du sõker pÕ att du vill ta bort de hõr %1 objekten?" + IDS_OVERWRITEFILE_TEXT "Skriv ÷ver fil %1?" + IDS_OVERWRITEFILE_CAPTION "Bekrõfta fil÷verskrivning" +} + +/* columns in the shellview */ +STRINGTABLE +BEGIN + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "Storlek" + IDS_SHV_COLUMN3 "Typ" + IDS_SHV_COLUMN4 "Modifierad" + IDS_SHV_COLUMN5 "Attribut" + IDS_SHV_COLUMN6 "Storlek" + IDS_SHV_COLUMN7 "Storlek tillgõnglig" + IDS_SHV_COLUMN8 "Namn" + IDS_SHV_COLUMN9 "Kommentarer" +END + +/* message box strings */ +STRINGTABLE DISCARDABLE +{ + IDS_RESTART_TITLE "Starta om" + IDS_RESTART_PROMPT "Vill du starta om datorn?" + IDS_SHUTDOWN_TITLE "Stõng av" + IDS_SHUTDOWN_PROMPT "Vill du stõnga av datorn?" +} + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Start-meny\\Program" + IDS_PERSONAL "Mina dokument" + IDS_FAVORITES "Favoriter" + IDS_STARTUP "Start-meny\\Program\\Autostart" + IDS_RECENT "Tidigare" + IDS_SENDTO "Skicka till" + IDS_STARTMENU "Start-meny" + IDS_MYMUSIC "Mina dokument\\Min musik" + IDS_MYVIDEO "Mina dokument\\Mina videoklipp" + IDS_DESKTOPDIRECTORY "Skrivbord" + IDS_NETHOOD "Nõtverk" + IDS_TEMPLATES "Mallar" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "Skrivare" + IDS_LOCAL_APPDATA "Lokala instõllningar\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Tidigare" + IDS_PROGRAM_FILES "Program" + IDS_MYPICTURES "Mina dokument\\Mina bilder" + IDS_PROGRAM_FILES_COMMON "Program\\Delade filer" + IDS_COMMON_DOCUMENTS "Delade dokument" + IDS_ADMINTOOLS "Start-meny\\Program\\Administrativa verktyg" + IDS_COMMON_MUSIC "Delade dokument\\Min musik" + IDS_COMMON_PICTURES "Delade dokument\\Mina bilder" + IDS_COMMON_VIDEO "Delade dokument\\Mina videoklipp" + IDS_CDBURN_AREA "Lokala instõllningar\\Application Data\\Microsoft\\CD Burning" +}

19 years, 8 months

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 April 2005