Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [FASTFAT] Only initialize directory cache on use.
by Pierre Schweitzer 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c3ebe33207a05c0b5b11… commit 3c3ebe33207a05c0b5b11ffd2d753c69690dc2fb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 18 14:03:20 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 18 14:09:30 2018 +0200 [FASTFAT] Only initialize directory cache on use. This avoids initializing cache directly on directory open/create. The advantage is we reduce the load on cache manager and on memory manager by avoiding creating everytime a stream file object, and initializing cache for it. This will avoid initializing cache for started applications 'current directory' which is just opened for having a valid handle but no read/write is performed in it, by default. This is a step forward for autochk. CORE-14629 --- drivers/filesystems/fastfat/cleanup.c | 2 +- drivers/filesystems/fastfat/create.c | 2 +- drivers/filesystems/fastfat/dir.c | 1 + drivers/filesystems/fastfat/direntry.c | 31 ++++++++ drivers/filesystems/fastfat/dirwr.c | 138 +++++++++++++++++++++++++++++++-- drivers/filesystems/fastfat/fcb.c | 67 +--------------- drivers/filesystems/fastfat/finfo.c | 4 +- drivers/filesystems/fastfat/flush.c | 2 +- drivers/filesystems/fastfat/vfat.h | 14 +++- 9 files changed, 181 insertions(+), 80 deletions(-) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index 3ab4a101d1..f611a69def 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -88,7 +88,7 @@ VfatCleanupFile( if (BooleanFlagOn(pFcb->Flags, FCB_IS_DIRTY)) { - VfatUpdateEntry (pFcb, vfatVolumeIsFatX(DeviceExt)); + VfatUpdateEntry (DeviceExt, pFcb); } if (BooleanFlagOn(pFcb->Flags, FCB_DELETE_PENDING) && diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index d9efa96828..84751c2595 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -951,7 +951,7 @@ VfatCreateFile( &pFcb->entry.Fat.UpdateTime); } - VfatUpdateEntry(pFcb, vfatVolumeIsFatX(DeviceExt)); + VfatUpdateEntry(DeviceExt, pFcb); } ExAcquireResourceExclusiveLite(&(pFcb->MainResource), TRUE); diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index dd53080cda..18c6dcc2ca 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -599,6 +599,7 @@ DoQuery( DPRINT("Buffer=%p tofind=%wZ\n", Buffer, &pCcb->SearchPattern); + DirContext.DeviceExt = IrpContext->DeviceExt; DirContext.LongNameU.Buffer = LongNameBuffer; DirContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); DirContext.ShortNameU.Buffer = ShortNameBuffer; diff --git a/drivers/filesystems/fastfat/direntry.c b/drivers/filesystems/fastfat/direntry.c index f018282b6d..aa1e12f5a5 100644 --- a/drivers/filesystems/fastfat/direntry.c +++ b/drivers/filesystems/fastfat/direntry.c @@ -41,12 +41,14 @@ vfatDirEntryGetFirstCluster( BOOLEAN FATIsDirectoryEmpty( + PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb) { LARGE_INTEGER FileOffset; PVOID Context = NULL; PFAT_DIR_ENTRY FatDirEntry; ULONG Index, MaxIndex; + NTSTATUS Status; if (vfatFCBIsRoot(Fcb)) { @@ -60,6 +62,12 @@ FATIsDirectoryEmpty( FileOffset.QuadPart = 0; MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FAT_DIR_ENTRY); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, Fcb); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + while (Index < MaxIndex) { if (Context == NULL || (Index % FAT_ENTRIES_PER_PAGE) == 0) @@ -109,16 +117,24 @@ FATIsDirectoryEmpty( BOOLEAN FATXIsDirectoryEmpty( + PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb) { LARGE_INTEGER FileOffset; PVOID Context = NULL; PFATX_DIR_ENTRY FatXDirEntry; ULONG Index = 0, MaxIndex; + NTSTATUS Status; FileOffset.QuadPart = 0; MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FATX_DIR_ENTRY); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, Fcb); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + while (Index < MaxIndex) { if (Context == NULL || (Index % FATX_ENTRIES_PER_PAGE) == 0) @@ -186,12 +202,20 @@ FATGetNextDirEntry( BOOLEAN Valid = TRUE; BOOLEAN Back = FALSE; + NTSTATUS Status; + DirContext->LongNameU.Length = 0; DirContext->LongNameU.Buffer[0] = UNICODE_NULL; FileOffset.u.HighPart = 0; FileOffset.u.LowPart = ROUND_DOWN(DirContext->DirIndex * sizeof(FAT_DIR_ENTRY), PAGE_SIZE); + Status = vfatFCBInitializeCacheFromVolume(DirContext->DeviceExt, pDirFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + if (*pContext == NULL || (DirContext->DirIndex % FAT_ENTRIES_PER_PAGE) == 0) { if (*pContext != NULL) @@ -461,6 +485,7 @@ FATXGetNextDirEntry( PFATX_DIR_ENTRY fatxDirEntry; OEM_STRING StringO; ULONG DirIndex = DirContext->DirIndex; + NTSTATUS Status; FileOffset.u.HighPart = 0; @@ -498,6 +523,12 @@ FATXGetNextDirEntry( } } + Status = vfatFCBInitializeCacheFromVolume(DirContext->DeviceExt, pDirFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + if (*pContext == NULL || (DirIndex % FATX_ENTRIES_PER_PAGE) == 0) { if (*pContext != NULL) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index 68f1579102..e2026b8cd9 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -16,23 +16,105 @@ #define NDEBUG #include <debug.h> +#ifdef KDBG +extern UNICODE_STRING DebugFile; +#endif + +NTSTATUS +vfatFCBInitializeCacheFromVolume( + PVCB vcb, + PVFATFCB fcb) +{ + PFILE_OBJECT fileObject; + PVFATCCB newCCB; + NTSTATUS status; + BOOLEAN Acquired; + + /* Don't re-initialize if already done */ + if (BooleanFlagOn(fcb->Flags, FCB_CACHE_INITIALIZED)) + { + return STATUS_SUCCESS; + } + + ASSERT(vfatFCBIsDirectory(fcb)); + + Acquired = FALSE; + if (!ExIsResourceAcquiredExclusive(&vcb->DirResource)) + { + ExAcquireResourceExclusiveLite(&vcb->DirResource, TRUE); + Acquired = TRUE; + } + + fileObject = IoCreateStreamFileObject (NULL, vcb->StorageDevice); + +#ifdef KDBG + if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &fcb->LongNameU, FALSE, NULL)) + { + DPRINT1("Attaching %p to %p (%d)\n", fcb, fileObject, fcb->RefCount); + } +#endif + + newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); + if (newCCB == NULL) + { + ObDereferenceObject(fileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(newCCB, sizeof (VFATCCB)); + + fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; + fileObject->FsContext = fcb; + fileObject->FsContext2 = newCCB; + fileObject->Vpb = vcb->IoVPB; + fcb->FileObject = fileObject; + + _SEH2_TRY + { + CcInitializeCacheMap(fileObject, + (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), + TRUE, + &VfatGlobalData->CacheMgrCallbacks, + fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + status = _SEH2_GetExceptionCode(); + fcb->FileObject = NULL; + ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, newCCB); + ObDereferenceObject(fileObject); + return status; + } + _SEH2_END; + + vfatGrabFCB(vcb, fcb); + SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); + + if (Acquired) + { + ExReleaseResourceLite(&vcb->DirResource); + } + + return STATUS_SUCCESS; +} + /* * update an existing FAT entry */ NTSTATUS VfatUpdateEntry( - IN PVFATFCB pFcb, - IN BOOLEAN IsFatX) + IN PDEVICE_EXTENSION DeviceExt, + IN PVFATFCB pFcb) { PVOID Context; PDIR_ENTRY PinEntry; LARGE_INTEGER Offset; ULONG SizeDirEntry; ULONG dirIndex; + NTSTATUS Status; ASSERT(pFcb); - if (IsFatX) + if (vfatVolumeIsFatX(DeviceExt)) { SizeDirEntry = sizeof(FATX_DIR_ENTRY); dirIndex = pFcb->startIndex; @@ -52,6 +134,12 @@ VfatUpdateEntry( ASSERT(pFcb->parentFcb); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pFcb->parentFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + Offset.u.HighPart = 0; Offset.u.LowPart = dirIndex * SizeDirEntry; _SEH2_TRY @@ -91,6 +179,12 @@ vfatRenameEntry( DPRINT("vfatRenameEntry(%p, %p, %wZ, %d)\n", DeviceExt, pFcb, FileName, CaseChangeOnly); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pFcb->parentFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + if (vfatVolumeIsFatX(DeviceExt)) { VFAT_DIRENTRY_CONTEXT DirContext; @@ -120,6 +214,7 @@ vfatRenameEntry( pDirEntry->FilenameLength = (unsigned char)NameA.Length; /* Update FCB */ + DirContext.DeviceExt = DeviceExt; DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = 0; DirContext.ShortNameU.Buffer = NULL; @@ -169,6 +264,12 @@ vfatFindDirSpace( else SizeDirEntry = sizeof(FAT_DIR_ENTRY); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pDirFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + count = pDirFcb->RFCB.FileSize.u.LowPart / SizeDirEntry; size = DeviceExt->FatInfo.BytesPerCluster / SizeDirEntry; for (i = 0; i < count; i++, pFatEntry = (PDIR_ENTRY)((ULONG_PTR)pFatEntry + SizeDirEntry)) @@ -343,6 +444,7 @@ FATAddEntry( NameA.Length = 0; NameA.MaximumLength = sizeof(aName); + DirContext.DeviceExt = DeviceExt; DirContext.ShortNameU.Buffer = ShortNameBuffer; DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); @@ -359,6 +461,7 @@ FATAddEntry( needTilde = TRUE; needLong = TRUE; RtlZeroMemory(&NameContext, sizeof(GENERATE_NAME_CONTEXT)); + SearchContext.DeviceExt = DeviceExt; SearchContext.LongNameU.Buffer = LongNameBuffer; SearchContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); SearchContext.ShortNameU.Buffer = ShortSearchName; @@ -577,6 +680,8 @@ FATAddEntry( DirContext.DirEntry.Fat.FirstCluster = (unsigned short)CurrentCluster; } + /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + i = DeviceExt->FatInfo.BytesPerCluster / sizeof(FAT_DIR_ENTRY); FileOffset.u.HighPart = 0; FileOffset.u.LowPart = DirContext.StartIndex * sizeof(FAT_DIR_ENTRY); @@ -659,6 +764,12 @@ FATAddEntry( if (IsDirectory) { + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, (*Fcb)); + if (!NT_SUCCESS(Status)) + { + return Status; + } + FileOffset.QuadPart = 0; _SEH2_TRY { @@ -741,6 +852,7 @@ FATXAddEntry( DirContext.ShortNameU.Buffer = 0; DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = 0; + DirContext.DeviceExt = DeviceExt; RtlZeroMemory(&DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY)); memset(DirContext.DirEntry.FatX.Filename, 0xff, 42); /* Use cluster, if moving */ @@ -784,6 +896,8 @@ FATXAddEntry( DirContext.DirEntry.FatX.FileSize = MoveContext->FileSize; } + /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + /* add entry into parent directory */ FileOffset.u.HighPart = 0; FileOffset.u.LowPart = Index * sizeof(FATX_DIR_ENTRY); @@ -829,10 +943,17 @@ FATDelEntry( PVOID Context = NULL; LARGE_INTEGER Offset; PFAT_DIR_ENTRY pDirEntry = NULL; + NTSTATUS Status; ASSERT(pFcb); ASSERT(pFcb->parentFcb); + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pFcb->parentFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + DPRINT("delEntry PathName \'%wZ\'\n", &pFcb->PathNameU); DPRINT("delete entry: %u to %u\n", pFcb->startIndex, pFcb->dirIndex); Offset.u.HighPart = 0; @@ -910,6 +1031,7 @@ FATXDelEntry( LARGE_INTEGER Offset; PFATX_DIR_ENTRY pDirEntry; ULONG StartIndex; + NTSTATUS Status; ASSERT(pFcb); ASSERT(pFcb->parentFcb); @@ -917,6 +1039,12 @@ FATXDelEntry( StartIndex = pFcb->startIndex; + Status = vfatFCBInitializeCacheFromVolume(DeviceExt, pFcb->parentFcb); + if (!NT_SUCCESS(Status)) + { + return Status; + } + DPRINT("delEntry PathName \'%wZ\'\n", &pFcb->PathNameU); DPRINT("delete entry: %u\n", StartIndex); Offset.u.HighPart = 0; @@ -1004,8 +1132,8 @@ VfatMoveEntry( return Status; } -extern BOOLEAN FATXIsDirectoryEmpty(PVFATFCB Fcb); -extern BOOLEAN FATIsDirectoryEmpty(PVFATFCB Fcb); +extern BOOLEAN FATXIsDirectoryEmpty(PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb); +extern BOOLEAN FATIsDirectoryEmpty(PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb); extern NTSTATUS FATGetNextDirEntry(PVOID *pContext, PVOID *pPage, PVFATFCB pDirFcb, PVFAT_DIRENTRY_CONTEXT DirContext, BOOLEAN First); extern NTSTATUS FATXGetNextDirEntry(PVOID *pContext, PVOID *pPage, PVFATFCB pDirFcb, PVFAT_DIRENTRY_CONTEXT DirContext, BOOLEAN First); diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index 35bb675795..89c8dc2ad2 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -640,62 +640,6 @@ vfatGrabFCBFromTable( return NULL; } -static -NTSTATUS -vfatFCBInitializeCacheFromVolume( - PVCB vcb, - PVFATFCB fcb) -{ - PFILE_OBJECT fileObject; - PVFATCCB newCCB; - NTSTATUS status; - - fileObject = IoCreateStreamFileObject (NULL, vcb->StorageDevice); - -#ifdef KDBG - if (DebugFile.Buffer != NULL && FsRtlIsNameInExpression(&DebugFile, &fcb->LongNameU, FALSE, NULL)) - { - DPRINT1("Attaching %p to %p (%d)\n", fcb, fileObject, fcb->RefCount); - } -#endif - - newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); - if (newCCB == NULL) - { - ObDereferenceObject(fileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlZeroMemory(newCCB, sizeof (VFATCCB)); - - fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; - fileObject->FsContext = fcb; - fileObject->FsContext2 = newCCB; - fileObject->Vpb = vcb->IoVPB; - fcb->FileObject = fileObject; - - _SEH2_TRY - { - CcInitializeCacheMap(fileObject, - (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - TRUE, - &VfatGlobalData->CacheMgrCallbacks, - fcb); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - status = _SEH2_GetExceptionCode(); - fcb->FileObject = NULL; - ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, newCCB); - ObDereferenceObject(fileObject); - return status; - } - _SEH2_END; - - vfatGrabFCB(vcb, fcb); - SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); - return STATUS_SUCCESS; -} - PVFATFCB vfatMakeRootFCB( PDEVICE_EXTENSION pVCB) @@ -788,16 +732,6 @@ vfatMakeFCBFromDirEntry( vfatInitFCBFromDirEntry(vcb, rcFCB, DirContext); rcFCB->RefCount = 1; - if (vfatFCBIsDirectory(rcFCB)) - { - Status = vfatFCBInitializeCacheFromVolume(vcb, rcFCB); - if (!NT_SUCCESS(Status)) - { - vfatReleaseFCB(vcb, rcFCB); - ExFreePoolWithTag(NameU.Buffer, TAG_FCB); - return Status; - } - } rcFCB->parentFcb = directoryFCB; InsertTailList(&directoryFCB->ParentListHead, &rcFCB->ParentListEntry); vfatAddFCBToTable(vcb, rcFCB); @@ -880,6 +814,7 @@ vfatDirFindFile( DirContext.ShortNameU.Buffer = ShortNameBuffer; DirContext.ShortNameU.Length = 0; DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); + DirContext.DeviceExt = pDeviceExt; while (TRUE) { diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 97067b929f..d860cd641b 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -265,7 +265,7 @@ VfatSetBasicInformation( } } - VfatUpdateEntry(FCB, vfatVolumeIsFatX(DeviceExt)); + VfatUpdateEntry(DeviceExt, FCB); if (NotifyFilter != 0) { @@ -1407,7 +1407,7 @@ VfatSetAllocationSizeInformation( Fcb->Flags |= FCB_IS_DIRTY; if (AllocSizeChanged) { - VfatUpdateEntry(Fcb, vfatVolumeIsFatX(DeviceExt)); + VfatUpdateEntry(DeviceExt, Fcb); vfatReportChange(DeviceExt, Fcb, FILE_NOTIFY_CHANGE_SIZE, FILE_ACTION_MODIFIED); } diff --git a/drivers/filesystems/fastfat/flush.c b/drivers/filesystems/fastfat/flush.c index 0629491416..ebf1925172 100644 --- a/drivers/filesystems/fastfat/flush.c +++ b/drivers/filesystems/fastfat/flush.c @@ -35,7 +35,7 @@ VfatFlushFile( if (BooleanFlagOn(Fcb->Flags, FCB_IS_DIRTY)) { - Status = VfatUpdateEntry(Fcb, vfatVolumeIsFatX(DeviceExt)); + Status = VfatUpdateEntry(DeviceExt, Fcb); if (!NT_SUCCESS(Status)) { IoStatus.Status = Status; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index e58b61bb57..1f2939577c 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -281,7 +281,7 @@ 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 BOOLEAN (*PIS_DIRECTORY_EMPTY)(struct _VFATFCB*); +typedef BOOLEAN (*PIS_DIRECTORY_EMPTY)(PDEVICE_EXTENSION,struct _VFATFCB*); typedef NTSTATUS (*PADD_ENTRY)(PDEVICE_EXTENSION,PUNICODE_STRING,struct _VFATFCB**,struct _VFATFCB*,ULONG,UCHAR,struct _VFAT_MOVE_CONTEXT*); typedef NTSTATUS (*PDEL_ENTRY)(PDEVICE_EXTENSION,struct _VFATFCB*,struct _VFAT_MOVE_CONTEXT*); typedef NTSTATUS (*PGET_NEXT_DIR_ENTRY)(PVOID*,PVOID*,struct _VFATFCB*,struct _VFAT_DIRENTRY_CONTEXT*,BOOLEAN); @@ -352,7 +352,7 @@ BOOLEAN VfatIsDirectoryEmpty(PDEVICE_EXTENSION DeviceExt, struct _VFATFCB* Fcb) { - return DeviceExt->Dispatch.IsDirectoryEmpty(Fcb); + return DeviceExt->Dispatch.IsDirectoryEmpty(DeviceExt, Fcb); } FORCEINLINE @@ -570,6 +570,7 @@ typedef struct _VFAT_DIRENTRY_CONTEXT DIR_ENTRY DirEntry; UNICODE_STRING LongNameU; UNICODE_STRING ShortNameU; + PDEVICE_EXTENSION DeviceExt; } VFAT_DIRENTRY_CONTEXT, *PVFAT_DIRENTRY_CONTEXT; typedef struct _VFAT_MOVE_CONTEXT @@ -736,10 +737,15 @@ vfatDirEntryGetFirstCluster( /* dirwr.c */ +NTSTATUS +vfatFCBInitializeCacheFromVolume( + PVCB vcb, + PVFATFCB fcb); + NTSTATUS VfatUpdateEntry( - PVFATFCB pFcb, - IN BOOLEAN IsFatX); + IN PDEVICE_EXTENSION DeviceExt, + PVFATFCB pFcb); BOOLEAN vfatFindDirSpace(

1 0

01/01: [SHELL32] Add 'Create New Extension' IDD_NEWEXTENSION dialog (#544)
by Katayama Hirofumi MZ 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f20bdf19946947b37254c… commit f20bdf19946947b37254c05fb4c814af3324a17b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 18 19:47:52 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 18 12:47:52 2018 +0200 [SHELL32] Add 'Create New Extension' IDD_NEWEXTENSION dialog (#544) A 'Create New Extension' dialog is implemented, which enables the user to add a new file extension. CORE-12906 --- dll/win32/shell32/dialogs/folder_options.cpp | 345 ++++++++++++++++++++++++++- dll/win32/shell32/lang/bg-BG.rc | 21 ++ dll/win32/shell32/lang/ca-ES.rc | 21 ++ dll/win32/shell32/lang/cs-CZ.rc | 21 ++ dll/win32/shell32/lang/da-DK.rc | 21 ++ dll/win32/shell32/lang/de-DE.rc | 21 ++ dll/win32/shell32/lang/el-GR.rc | 21 ++ dll/win32/shell32/lang/en-GB.rc | 21 ++ dll/win32/shell32/lang/en-US.rc | 21 ++ dll/win32/shell32/lang/es-ES.rc | 21 ++ dll/win32/shell32/lang/et-EE.rc | 21 ++ dll/win32/shell32/lang/fi-FI.rc | 21 ++ dll/win32/shell32/lang/fr-FR.rc | 21 ++ dll/win32/shell32/lang/he-IL.rc | 21 ++ dll/win32/shell32/lang/hu-HU.rc | 21 ++ dll/win32/shell32/lang/it-IT.rc | 21 ++ dll/win32/shell32/lang/ja-JP.rc | 21 ++ dll/win32/shell32/lang/ko-KR.rc | 21 ++ dll/win32/shell32/lang/nl-NL.rc | 21 ++ dll/win32/shell32/lang/no-NO.rc | 21 ++ dll/win32/shell32/lang/pl-PL.rc | 21 ++ dll/win32/shell32/lang/pt-BR.rc | 21 ++ dll/win32/shell32/lang/pt-PT.rc | 21 ++ dll/win32/shell32/lang/ro-RO.rc | 21 ++ dll/win32/shell32/lang/ru-RU.rc | 21 ++ dll/win32/shell32/lang/sk-SK.rc | 21 ++ dll/win32/shell32/lang/sl-SI.rc | 21 ++ dll/win32/shell32/lang/sq-AL.rc | 21 ++ dll/win32/shell32/lang/sv-SE.rc | 21 ++ dll/win32/shell32/lang/tr-TR.rc | 21 ++ dll/win32/shell32/lang/uk-UA.rc | 21 ++ dll/win32/shell32/lang/zh-CN.rc | 21 ++ dll/win32/shell32/lang/zh-TW.rc | 21 ++ dll/win32/shell32/shresdef.h | 14 ++ 34 files changed, 1022 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index 197b301395..12af778245 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -2,7 +2,7 @@ * Open With Context Menu extension * * Copyright 2007 Johannes Anderwald <johannes.anderwald(a)reactos.org> - * Copyright 2016-2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2016-2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1556,6 +1556,324 @@ FindSelectedItem( return NULL; } +struct NEWEXT_DIALOG +{ + HWND hwndDlg; + HWND hwndLV; + RECT rcDlg; + BOOL bAdvanced; + INT dy; + WCHAR szExt[16]; + WCHAR szFileType[64]; +}; + +static VOID +NewExtDlg_OnAdvanced(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) +{ + // If "Advanced" button was clicked, then we shrink or expand the dialog. + WCHAR szText[64]; + RECT rc, rc1, rc2; + + GetWindowRect(hwndDlg, &rc); + rc.bottom = rc.top + (pNewExt->rcDlg.bottom - pNewExt->rcDlg.top); + + GetWindowRect(GetDlgItem(hwndDlg, IDOK), &rc1); + MapWindowPoints(NULL, hwndDlg, (POINT *)&rc1, 2); + + GetWindowRect(GetDlgItem(hwndDlg, IDCANCEL), &rc2); + MapWindowPoints(NULL, hwndDlg, (POINT *)&rc2, 2); + + if (pNewExt->bAdvanced) + { + rc1.top += pNewExt->dy; + rc1.bottom += pNewExt->dy; + + rc2.top += pNewExt->dy; + rc2.bottom += pNewExt->dy; + + ShowWindow(GetDlgItem(hwndDlg, IDC_NEWEXT_ASSOC), SW_SHOWNOACTIVATE); + ShowWindow(GetDlgItem(hwndDlg, IDC_NEWEXT_COMBOBOX), SW_SHOWNOACTIVATE); + + LoadStringW(shell32_hInstance, IDS_NEWEXT_ADVANCED_LEFT, szText, _countof(szText)); + SetDlgItemTextW(hwndDlg, IDC_NEWEXT_ADVANCED, szText); + + SetFocus(GetDlgItem(hwndDlg, IDC_NEWEXT_COMBOBOX)); + } + else + { + rc1.top -= pNewExt->dy; + rc1.bottom -= pNewExt->dy; + + rc2.top -= pNewExt->dy; + rc2.bottom -= pNewExt->dy; + + ShowWindow(GetDlgItem(hwndDlg, IDC_NEWEXT_ASSOC), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_NEWEXT_COMBOBOX), SW_HIDE); + + LoadStringW(shell32_hInstance, IDS_NEWEXT_ADVANCED_RIGHT, szText, _countof(szText)); + SetDlgItemTextW(hwndDlg, IDC_NEWEXT_ADVANCED, szText); + + rc.bottom -= pNewExt->dy; + + LoadStringW(shell32_hInstance, IDS_NEWEXT_NEW, szText, _countof(szText)); + SetDlgItemTextW(hwndDlg, IDC_NEWEXT_COMBOBOX, szText); + } + + HDWP hDWP = BeginDeferWindowPos(3); + + if (hDWP) + DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDOK), NULL, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + SWP_NOACTIVATE | SWP_NOZORDER); + if (hDWP) + DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDCANCEL), NULL, + rc2.left, rc2.top, rc2.right - rc2.left, rc2.bottom - rc2.top, + SWP_NOACTIVATE | SWP_NOZORDER); + if (hDWP) + DeferWindowPos(hDWP, hwndDlg, NULL, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + SWP_NOACTIVATE | SWP_NOZORDER); + + if (hDWP) + EndDeferWindowPos(hDWP); +} + +static BOOL +NewExtDlg_OnInitDialog(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) +{ + WCHAR szText[64]; + + pNewExt->hwndDlg = hwndDlg; + pNewExt->bAdvanced = FALSE; + + GetWindowRect(hwndDlg, &pNewExt->rcDlg); + + RECT rc1, rc2; + GetWindowRect(GetDlgItem(hwndDlg, IDC_NEWEXT_EDIT), &rc1); + GetWindowRect(GetDlgItem(hwndDlg, IDC_NEWEXT_COMBOBOX), &rc2); + pNewExt->dy = rc2.top - rc1.top; + + LoadStringW(shell32_hInstance, IDS_NEWEXT_NEW, szText, _countof(szText)); + SendDlgItemMessageW(hwndDlg, IDC_NEWEXT_COMBOBOX, CB_ADDSTRING, 0, (LPARAM)szText); + SendDlgItemMessageW(hwndDlg, IDC_NEWEXT_COMBOBOX, CB_SETCURSEL, 0, 0); + + SendDlgItemMessageW(hwndDlg, IDC_NEWEXT_EDIT, EM_SETLIMITTEXT, _countof(pNewExt->szExt) - 1, 0); + + NewExtDlg_OnAdvanced(hwndDlg, pNewExt); + + return TRUE; +} + +static void +StringTrimW(LPWSTR pszText) +{ + LPWSTR pch = pszText; + while (iswspace(*pch)) + pch++; + + LPWSTR pchFirst, pchLast; + pchFirst = pchLast = pch; + while (*pch && !iswspace(*pch)) + { + ++pch; + pchLast = pch; + } + + INT_PTR cch = pchLast - pchFirst; + MoveMemory(pszText, pchFirst, cch * sizeof(WCHAR)); + pszText[cch] = 0; +} + +static BOOL +NewExtDlg_OnOK(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) +{ + LV_FINDINFO find; + INT iItem; + + GetDlgItemTextW(hwndDlg, IDC_NEWEXT_EDIT, pNewExt->szExt, _countof(pNewExt->szExt)); + StringTrimW(pNewExt->szExt); + CharUpperW(pNewExt->szExt); + + GetDlgItemTextW(hwndDlg, IDC_NEWEXT_COMBOBOX, pNewExt->szFileType, _countof(pNewExt->szFileType)); + StringTrimW(pNewExt->szFileType); + + if (pNewExt->szExt[0] == 0) + { + WCHAR szText[128], szTitle[128]; + LoadStringW(shell32_hInstance, IDS_NEWEXT_SPECIFY_EXT, szText, _countof(szText)); + szText[_countof(szText) - 1] = 0; + LoadStringW(shell32_hInstance, IDS_FILE_TYPES, szTitle, _countof(szTitle)); + szTitle[_countof(szTitle) - 1] = 0; + MessageBoxW(hwndDlg, szText, szTitle, MB_ICONERROR); + return FALSE; + } + + ZeroMemory(&find, sizeof(find)); + find.flags = LVFI_STRING; + if (pNewExt->szExt[0] == L'.') + { + find.psz = &pNewExt->szExt[1]; + } + else + { + find.psz = pNewExt->szExt; + } + + iItem = ListView_FindItem(pNewExt->hwndLV, -1, &find); + if (iItem >= 0) + { + // already exists + WCHAR szText[256], szFormat[256], szTitle[64], szFileType[64]; + + // get file type + LV_ITEM item; + ZeroMemory(&item, sizeof(item)); + item.mask = LVIF_TEXT; + item.pszText = szFileType; + item.cchTextMax = _countof(szFileType); + item.iItem = iItem; + item.iSubItem = 1; + ListView_GetItem(pNewExt->hwndLV, &item); + + // get text + LoadStringW(shell32_hInstance, IDS_NEWEXT_ALREADY_ASSOC, szFormat, _countof(szFormat)); + szText[_countof(szFormat) - 1] = 0; + StringCchPrintfW(szText, _countof(szText), szFormat, find.psz, szFileType, find.psz, szFileType); + + // get title + LoadStringW(shell32_hInstance, IDS_NEWEXT_EXT_IN_USE, szTitle, _countof(szTitle)); + szTitle[_countof(szTitle) - 1] = 0; + + if (MessageBoxW(hwndDlg, szText, szTitle, MB_ICONWARNING | MB_YESNO) == IDNO) + { + return FALSE; + } + + // Delete the item + ListView_DeleteItem(pNewExt->hwndLV, iItem); + } + + EndDialog(hwndDlg, IDOK); + return TRUE; +} + +// IDD_NEWEXTENSION dialog +INT_PTR +CALLBACK +NewExtensionDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + static NEWEXT_DIALOG *s_pNewExt = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + s_pNewExt = (NEWEXT_DIALOG *)lParam; + NewExtDlg_OnInitDialog(hwndDlg, s_pNewExt); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + NewExtDlg_OnOK(hwndDlg, s_pNewExt); + break; + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + case IDC_NEWEXT_ADVANCED: + s_pNewExt->bAdvanced = !s_pNewExt->bAdvanced; + NewExtDlg_OnAdvanced(hwndDlg, s_pNewExt); + break; + } + break; + } + return 0; +} + +static BOOL +FileTypesDlg_AddExt(HWND hwndDlg, LPCWSTR pszExt, LPCWSTR pszFileType) +{ + DWORD dwValue = 1; + HKEY hKey; + WCHAR szKey[13]; // max. "ft4294967295" + "\0" + LONG nResult; + + // Search the next "ft%06u" key name + do + { + StringCchPrintfW(szKey, _countof(szKey), TEXT("ft%06u"), dwValue); + + nResult = RegOpenKeyEx(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hKey); + if (nResult != ERROR_SUCCESS) + break; + + RegCloseKey(hKey); + ++dwValue; + } while (dwValue != 0); + + RegCloseKey(hKey); + + if (dwValue == 0) + return FALSE; + + // Create new "ft%06u" key + nResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, szKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL); + if (ERROR_SUCCESS != nResult) + return FALSE; + + RegCloseKey(hKey); + + // Create the ".ext" key + WCHAR szExt[16]; + if (*pszExt == L'.') + ++pszExt; + StringCchPrintfW(szExt, _countof(szExt), TEXT(".%s"), pszExt); + CharLowerW(szExt); + nResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL); + CharUpperW(szExt); + if (ERROR_SUCCESS != nResult) + return FALSE; + + // Set the default value of ".ext" to "ft%06u" + DWORD dwSize = (lstrlen(szKey) + 1) * sizeof(WCHAR); + RegSetValueExW(hKey, NULL, 0, REG_SZ, (BYTE *)szKey, dwSize); + + RegCloseKey(hKey); + + // Make up the file type name + WCHAR szFile[100], szFileFormat[100]; + LoadStringW(shell32_hInstance, IDS_FILE_EXT_TYPE, szFileFormat, _countof(szFileFormat)); + szFile[_countof(szFileFormat) - 1] = 0; + StringCchPrintfW(szFile, _countof(szFile), szFileFormat, &szExt[1]); + + // Insert an item to listview + HWND hListView = GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW); + INT iItem = ListView_GetItemCount(hListView); + INT iItemCopy = iItem; + InsertFileType(hListView, szExt, &iItemCopy, szFile); + + LV_ITEM item; + ZeroMemory(&item, sizeof(item)); + item.mask = LVIF_STATE | LVIF_TEXT; + item.iItem = iItem; + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; + item.pszText = &szExt[1]; + ListView_SetItem(hListView, &item); + + item.pszText = szFile; + item.iSubItem = 1; + ListView_SetItem(hListView, &item); + + ListView_EnsureVisible(hListView, iItem, FALSE); + + return TRUE; +} + +// IDD_FOLDER_OPTIONS_FILETYPES dialog INT_PTR CALLBACK FolderOptionsFileTypesDlg( @@ -1569,6 +1887,7 @@ FolderOptionsFileTypesDlg( WCHAR Buffer[255], FormatBuffer[255]; PFOLDER_FILE_TYPE_ENTRY pItem; OPENASINFO Info; + NEWEXT_DIALOG newext; switch(uMsg) { @@ -1578,14 +1897,22 @@ FolderOptionsFileTypesDlg( /* Disable the Delete button if the listview is empty or the selected item should not be deleted by the user */ if (pItem == NULL || (pItem->EditFlags & 0x00000010)) // FTA_NoRemove - EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), FALSE); return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { - case 14006: - pItem = FindSelectedItem(GetDlgItem(hwndDlg, 14000)); + case IDC_FILETYPES_NEW: + newext.hwndLV = GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW); + if (IDOK == DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_NEWEXTENSION), + hwndDlg, NewExtensionDlgProc, (LPARAM)&newext)) + { + FileTypesDlg_AddExt(hwndDlg, newext.szExt, newext.szFileType); + } + break; + case IDC_FILETYPES_CHANGE: + pItem = FindSelectedItem(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW)); if (pItem) { Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT; @@ -1623,7 +1950,7 @@ FolderOptionsFileTypesDlg( /* format buffer */ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1]); /* update dialog */ - SetDlgItemTextW(hwndDlg, 14003, Buffer); + SetDlgItemTextW(hwndDlg, IDC_FILETYPES_DETAILS_GROUPBOX, Buffer); if (!LoadStringW(shell32_hInstance, IDS_FILE_DETAILSADV, FormatBuffer, sizeof(FormatBuffer) / sizeof(WCHAR))) { @@ -1633,19 +1960,19 @@ FolderOptionsFileTypesDlg( /* format buffer */ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1], &pItem->FileDescription[0], &pItem->FileDescription[0]); /* update dialog */ - SetDlgItemTextW(hwndDlg, 14007, Buffer); + SetDlgItemTextW(hwndDlg, IDC_FILETYPES_DESCRIPTION, Buffer); /* Enable the Delete button */ if (pItem->EditFlags & 0x00000010) // FTA_NoRemove - EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), FALSE); else - EnableWindow(GetDlgItem(hwndDlg, 14002), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), TRUE); } } else if (lppl->hdr.code == PSN_SETACTIVE) { /* On page activation, set the focus to the listview */ - SetFocus(GetDlgItem(hwndDlg, 14000)); + SetFocus(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW)); } break; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 7db93e7883..e1434cc693 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 691928568e..5e132b5a23 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 9928ef0947..88341dee0f 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -647,6 +647,20 @@ Určitě chcete otevřít tento soubor?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "Ne", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -864,4 +878,11 @@ BEGIN IDS_MENU_EMPTY "(Prázdné)" IDS_OBJECTS "Položek: %d" IDS_OBJECTS_SELECTED "Položek vybráno: %d" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index b243df2bf8..499a764aaf 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -647,6 +647,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -884,4 +898,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 962b0b99b9..7413b005ac 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -642,6 +642,20 @@ Sind Sie sicher, dass Sie diese Datei öffnen möchten?", IDC_STATIC, 35, 5, 230 PUSHBUTTON "&Nein", IDNO, 180, 60, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -879,4 +893,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Systemsteuerung unter Arbeitsplatz einblenden" IDS_ADVANCED_SHOW_COMP_COLOR "Verschlüsselte oder komprimierte NTFS-Dateien farbig anzeigen" IDS_ADVANCED_SHOW_INFO_TIP "Popupinformationen für Ordner- und Desktop-Elemente anzeigen" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index c3de8be186..b52405c547 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 097e62f4f2..75807f8a95 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 02be7b92eb..36620174d5 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -642,6 +642,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -879,4 +893,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 33f2a498b0..560c3bc11d 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -643,6 +643,20 @@ sistema o comprometer su correcto funcionamiento.\n\n\ PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -880,4 +894,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 9f8150ae25..d7e7f5f7da 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -649,6 +649,20 @@ Kas oled kindel et soovid seda faili avada?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "Ei", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -886,4 +900,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Näita juhtpaneeli kaustas Minu aruvti" IDS_ADVANCED_SHOW_COMP_COLOR "Näita krüptitud või tihendatud NTFS-faile värvilisena" IDS_ADVANCED_SHOW_INFO_TIP "Näita kausta- ja töölauaüksuste hüpikkirjeldusi" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 438b40d125..9c047596fb 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 6ca34ecaa0..94934f332a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -641,6 +641,20 @@ système ou le rendre moins fonctionnel.\n\n\ PUSHBUTTON "Non", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 925493cd51..21adbdaca7 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 7f4caf3157..8cfc2a4fda 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 3ab099b0be..a676af71b6 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -641,6 +641,20 @@ Si desidera comunque aprire questo file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 3c585185a4..afc51ab142 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -638,6 +638,20 @@ BEGIN PUSHBUTTON "いいえ", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -875,4 +889,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "マイコンピュータでコントロールパネルを表示する" IDS_ADVANCED_SHOW_COMP_COLOR "暗号化または圧縮されたNTFSファイルを色付きで表示する" IDS_ADVANCED_SHOW_INFO_TIP "フォルダとデスクトップの項目にポップアップ式の説明を表示する" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 5a9674803c..19a06e0183 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "굴림" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 97e947a882..ba0280cd18 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index be60be5f1d..9a06724890 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index fb62f92282..67951958e3 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -646,6 +646,20 @@ Czy na pewno chcesz otworzyć ten plik?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "Nie", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -883,4 +897,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Pokaż Panel sterowania w oknie Mój komputer" IDS_ADVANCED_SHOW_COMP_COLOR "Pokaż zaszyfrowane lub skompresowane pliki NTFS w kolorze" IDS_ADVANCED_SHOW_INFO_TIP "Pokaż podręczny opis elementów folderów i pulpitu" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index abbdc292f6..e7da10ffee 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 978dc1b95c..f0df0caf9d 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3880417de2..213d1c654e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -643,6 +643,20 @@ Sigur doriți să deschideți acest fișier?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "N&u", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -880,4 +894,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Afișează Panoul de control în Calculatorul meu" IDS_ADVANCED_SHOW_COMP_COLOR "Afișează în culori fișierele NTFS criptate sau comprimate" IDS_ADVANCED_SHOW_INFO_TIP "Permite descriere prin indicii pentru dosare și elemente de birou" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 9fe7bb3a3a..9999c34582 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -643,6 +643,20 @@ BEGIN PUSHBUTTON "Нет", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -880,4 +894,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Показать ""Панель управления"" в ""Мой компьютер""" IDS_ADVANCED_SHOW_COMP_COLOR "Отображать сжатые или зашифрованные файлы NTFS другим цветом" IDS_ADVANCED_SHOW_INFO_TIP "Отображать описание для папок и элементов рабочего стола" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index c4dbe9172e..e43686755c 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 9520ab1ec1..b31654d02e 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index fced8feca2..0b24962ea8 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -645,6 +645,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -882,4 +896,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9484e95687..1ffa90923f 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -641,6 +641,20 @@ system eller påverka funktionaliteten.\n\n\ PUSHBUTTON "Nej", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index eceecef021..8bfc5be38f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -643,6 +643,20 @@ Bu kütüğü açmak istediğinizden emin misiniz?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "Hayır", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -880,4 +894,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Bilgisayarım'da Denetim Masası'nı göster" IDS_ADVANCED_SHOW_COMP_COLOR "Şifrelenmiş veyâ sıkıştırılmış NTFS kütüklerini renkli göster" IDS_ADVANCED_SHOW_INFO_TIP "Dizin ve masaüstü ögeleri için açılan tanım göster" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 01763d8758..e821dde925 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -641,6 +641,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -878,4 +892,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7671975ae5..e51e1b01e2 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -649,6 +649,20 @@ BEGIN PUSHBUTTON "否", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -888,4 +902,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的电脑中显示控制面板" IDS_ADVANCED_SHOW_COMP_COLOR "用彩色显示加密或压缩的 NTFS 文件" IDS_ADVANCED_SHOW_INFO_TIP "鼠标指向文件夹和桌面项时显示提示信息" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index b0ee067e9d..e0bb30c924 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -649,6 +649,20 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END +IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 +CAPTION "Create New Extension" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "新細明體" +BEGIN + LTEXT "&File Extension:", -1, 10, 10, 85, 14 + EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 + PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -886,4 +900,11 @@ BEGIN IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + + IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" + IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" + IDS_NEWEXT_NEW "<New>" + IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_EXT_IN_USE "Extension is in use" END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 7bbd3b262f..decbc120fc 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -259,6 +259,13 @@ #define IDS_ADVANCED_SHOW_COMP_COLOR 30512 #define IDS_ADVANCED_SHOW_INFO_TIP 30502 +#define IDS_NEWEXT_ADVANCED_LEFT 30515 +#define IDS_NEWEXT_ADVANCED_RIGHT 30516 +#define IDS_NEWEXT_NEW 30518 +#define IDS_NEWEXT_SPECIFY_EXT 30519 +#define IDS_NEWEXT_ALREADY_ASSOC 30520 +#define IDS_NEWEXT_EXT_IN_USE 30521 + /* Dialogs */ /* Run dialog */ @@ -348,12 +355,19 @@ #define IDC_FILETYPES_DESCRIPTION 14007 #define IDC_FILETYPES_ADVANCED 14008 +/* Control IDs for IDD_NEWEXTENSION dialog */ +#define IDC_NEWEXT_EDIT 14001 +#define IDC_NEWEXT_ADVANCED 14002 +#define IDC_NEWEXT_COMBOBOX 14003 +#define IDC_NEWEXT_ASSOC 14004 + /* Other dialogs */ #define IDD_RUN_AS 23 #define IDD_OPEN_WITH 24 #define IDD_FORMAT_DRIVE 25 #define IDD_CHECK_DISK 26 #define IDD_NOOPEN 27 +#define IDD_NEWEXTENSION 28 /* Not used dialogs */ #define IDD_SHUTDOWN 29

1 0

01/01: [FASTFAT] When attaching our FCB to a FO, also set the VPB.
by Pierre Schweitzer 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d743b7bd7519229cbc34… commit 5d743b7bd7519229cbc34752ce745af608fff62b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 18 10:29:45 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 18 10:30:52 2018 +0200 [FASTFAT] When attaching our FCB to a FO, also set the VPB. Spotted by Alex. --- drivers/filesystems/fastfat/fcb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index 33124bc51b..35bb675795 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -670,6 +670,7 @@ vfatFCBInitializeCacheFromVolume( fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; fileObject->FsContext = fcb; fileObject->FsContext2 = newCCB; + fileObject->Vpb = vcb->IoVPB; fcb->FileObject = fileObject; _SEH2_TRY @@ -833,6 +834,7 @@ vfatAttachFCBToFileObject( fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; fileObject->FsContext = fcb; fileObject->FsContext2 = newCCB; + fileObject->Vpb = vcb->IoVPB; DPRINT("file open: fcb:%p PathName:%wZ\n", fcb, &fcb->PathNameU); #ifdef KDBG

1 0

01/01: [TRANSLATION][DRWTSN32] Add zh-CN translation. (#549)
by Wexpo Lyu 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d11d56d1ab2e379cc8bd… commit 1d11d56d1ab2e379cc8bd3d25cfb9da8913b748d Author: Wexpo Lyu <laosb(a)lns.unihubs.com> AuthorDate: Fri May 18 01:57:57 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 17 19:57:57 2018 +0200 [TRANSLATION][DRWTSN32] Add zh-CN translation. (#549) --- base/applications/drwtsn32/drwtsn32.rc | 3 +++ base/applications/drwtsn32/lang/zh-CN.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index 8698a3a9fc..17597e31db 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -31,3 +31,6 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif diff --git a/base/applications/drwtsn32/lang/zh-CN.rc b/base/applications/drwtsn32/lang/zh-CN.rc new file mode 100644 index 0000000000..39d235c8d7 --- /dev/null +++ b/base/applications/drwtsn32/lang/zh-CN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: zh-CN resource file + * COPYRIGHT: Copyright 2018 Wexpo Lyu (laosb at lasteam.net) + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_APP_TITLE "ReactOS 崩溃报告" + IDS_USER_ALERT_MESSAGE "应用程序 %ls 遇到错误异常退出了。有关这次异常退出的信息保存在：\r\n\r\n%ls" +END

1 0

01/01: [TRANSLATION][TASKMGR] Update Chinese Translation.
by Wexpo Lyu 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b5f84dfcd92f0461da76… commit 6b5f84dfcd92f0461da76338648896f0a9b5ae91 Author: Wexpo Lyu <laosb(a)lasteam.net> AuthorDate: Wed May 16 21:28:58 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 17 19:56:48 2018 +0200 [TRANSLATION][TASKMGR] Update Chinese Translation. --- base/applications/taskmgr/lang/zh-CN.rc | 131 ++++++++++++++++---------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 8495d7d068..ae2a91793a 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -2,6 +2,7 @@ * (Simplified Chinese resources) * (简体中文资源) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * Improved by Wexpo Lyu <laosb at lasteam.net> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -16,7 +17,7 @@ BEGIN END POPUP "选项(&O)" BEGIN - MENUITEM "前端显示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED + MENUITEM "总在最前(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用时自动最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化时隐藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED MENUITEM "显示 16 位任务(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED @@ -119,7 +120,7 @@ BEGIN MENUITEM "还原(&R)", ID_RESTORE MENUITEM "关闭(&C)", ID_FILE_EXIT MENUITEM SEPARATOR - MENUITEM "前端显示(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "总在最前(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -141,7 +142,7 @@ BEGIN MENUITEM "低(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW END MENUITEM "关系设置(&A)...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "编辑调试频道...(&C)", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "编辑调试频道(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -187,7 +188,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN GROUPBOX "CPU 使用情况显示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "PF使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "页面文件使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "总数", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "提交开销(K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "物理内存(K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT @@ -228,12 +229,12 @@ BEGIN ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "CPU 使用纪录", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "内存使用纪录", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "CPU 使用记录", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "内存使用记录", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT PUSHBUTTON "CPU 使用情况显示", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "内存使用情况显示", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "CPU 使用纪录", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "内存使用纪录", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "CPU 使用记录", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "内存使用记录", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 @@ -248,12 +249,12 @@ END IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "处理器亲和性" +CAPTION "处理器关联" FONT 9, "宋体" BEGIN DEFPUSHBUTTON "确定", IDOK, 120, 133, 50, 14 PUSHBUTTON "取消", IDCANCEL, 174, 133, 50, 14 - LTEXT "处理器关联设置可控制 CPU 进程将获准在上执行。", IDC_STATIC, 5, 5, 220, 16 + LTEXT "处理器关联指定可为该进程所用的 CPU 核心。", IDC_STATIC, 5, 5, 220, 16 CONTROL "CPU 0", IDC_CPU0, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10 CONTROL "CPU 1", IDC_CPU1, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10 CONTROL "CPU 2", IDC_CPU2, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10 @@ -290,12 +291,12 @@ END IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "选择列" +CAPTION "选择显示的列" FONT 9, "宋体" BEGIN DEFPUSHBUTTON "确定", IDOK, 84, 178, 50, 14 PUSHBUTTON "取消", IDCANCEL, 138, 178, 50, 14 - LTEXT "请选择“任务管理器”进程页上将显示的列。", IDC_STATIC, 7, 7, 181, 17 + LTEXT "请选择任务管理器进程页上将显示的列。", IDC_STATIC, 7, 7, 181, 17 CONTROL "映像名称(&I)", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "PID (进程标识符)(&P)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 CONTROL "CPU 使用(&C)", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 @@ -306,21 +307,21 @@ BEGIN CONTROL "页面错误(&F)", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 CONTROL "USER 对象(&U)", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 CONTROL "I/O 读取", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "I/O 读取字节", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 + CONTROL "I/O 读取字节数", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "会话 ID(&S)", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 CONTROL "用户名(&N)", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 CONTROL "页面错误增量(&A)", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 CONTROL "虚拟内存大小(&V)", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 CONTROL "页面缓冲池(&G)", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 - CONTROL "非页面缓冲池(&O)", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 + CONTROL "未分页缓冲池(&O)", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 CONTROL "基本优先级(&R)", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 - CONTROL "句柄计数(&H)", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 - CONTROL "线程计数(&T)", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 + CONTROL "句柄数量(&H)", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 + CONTROL "线程数量(&T)", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 CONTROL "GDI 对象", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 CONTROL "I/O 写入", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 - CONTROL "I/O 写入字节", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 + CONTROL "I/O 写入字节数", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O 其他", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "I/O 其他字节", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "I/O 其他字节数", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 CONTROL "命令行(&L)", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END @@ -336,53 +337,53 @@ END STRINGTABLE BEGIN ID_FILE_NEW "执行新程序" - ID_OPTIONS_ALWAYSONTOP "任务管理器仍然是所有其他窗口的前面，除非减到最小" - ID_OPTIONS_MINIMIZEONUSE "任务管理器最小化当执行 SwitchTo 操作时" - ID_OPTIONS_HIDEWHENMINIMIZED "隐藏任务管理器当它最小化时" + ID_OPTIONS_ALWAYSONTOP "任务管理器总在所有窗口前面，除非被最小化" + ID_OPTIONS_MINIMIZEONUSE "在执行“切换到”命令时，任务管理器将会最小化" + ID_OPTIONS_HIDEWHENMINIMIZED "当任务管理器被最小化时，它将隐藏到系统托盘" ID_VIEW_REFRESH "强制任务管理器立即更新，忽略更新速度设置" ID_VIEW_LARGE "用大图标显示任务" ID_VIEW_SMALL "用小图标显示任务" - ID_VIEW_DETAILS "显示有关每个任务的信息" - ID_VIEW_UPDATESPEED_HIGH "更新两次每秒显示" - ID_VIEW_UPDATESPEED_NORMAL "更新显示每两秒钟" - ID_VIEW_UPDATESPEED_LOW "更新显示每四秒钟" + ID_VIEW_DETAILS "显示有关每个任务的具体信息" + ID_VIEW_UPDATESPEED_HIGH "每秒更新两次" + ID_VIEW_UPDATESPEED_NORMAL "每两秒钟更新一次" + ID_VIEW_UPDATESPEED_LOW "每四秒钟更新一次" END STRINGTABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "不自动更新" - ID_WINDOWS_TILEHORIZONTALLY "平铺在桌面上水平窗口" - ID_WINDOWS_TILEVERTICALLY "平铺在桌面上垂直窗口" + ID_VIEW_UPDATESPEED_PAUSED "不自动刷新" + ID_WINDOWS_TILEHORIZONTALLY "水平平铺窗口" + ID_WINDOWS_TILEVERTICALLY "垂直平铺窗口" ID_WINDOWS_MINIMIZE "最小化窗口" ID_WINDOWS_MAXIMIZE "最大化窗口" - ID_WINDOWS_CASCADE "层叠对角桌面上的窗口" - ID_WINDOWS_BRINGTOFRONT "将窗口前置，但不能切换到它" + ID_WINDOWS_CASCADE "堆叠窗口" + ID_WINDOWS_BRINGTOFRONT "前置窗口，但不切换到该窗口" ID_HELP_TOPICS "显示任务管理器帮助主题" ID_HELP_ABOUT "显示程序信息、版本号和版权信息" ID_FILE_EXIT "退出任务管理器应用程序" - ID_OPTIONS_SHOW16BITTASKS "显示关联 ntvdm.exe 下的 16 位任务" - ID_VIEW_SELECTCOLUMNS "选择哪一列将对进程页上可见" - ID_VIEW_SHOWKERNELTIMES "在绩效图中显示内核时间" - ID_VIEW_CPUHISTORY_ONEGRAPHALL "单一历史记录图表显示出总的 CPU 使用率" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "每个 CPU 都有其自身的历史记录关系图" - ID_APPLICATION_PAGE_SWITCHTO "给前景带来了一项任务, 将焦点切换到该任务" + ID_OPTIONS_SHOW16BITTASKS "显示与 ntvdm.exe 关联的 16 位任务" + ID_VIEW_SELECTCOLUMNS "选择列在进程页上可见" + ID_VIEW_SHOWKERNELTIMES "在性能图中显示内核时间" + ID_VIEW_CPUHISTORY_ONEGRAPHALL "在单一的历史记录图表显示出总 CPU 使用率" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "单独显示每个 CPU 的使用率" + ID_APPLICATION_PAGE_SWITCHTO "将一个任务带到前台，并使其获得焦点" END STRINGTABLE BEGIN - ID_ENDTASK "告诉要关闭所选的任务" - ID_GOTOPROCESS "将焦点切换到所选任务的过程" - ID_RESTORE "从其隐藏状态恢复任务管理器" - ID_PROCESS_PAGE_ENDPROCESS "从系统中删除的过程" - ID_PROCESS_PAGE_ENDPROCESSTREE "从系统中删除此进程及其所有子体" + ID_ENDTASK "要求选中的任务执行退出命令" + ID_GOTOPROCESS "使所选的任务获得焦点" + ID_RESTORE "从隐藏的状态恢复任务管理器" + ID_PROCESS_PAGE_ENDPROCESS "从系统层面上结束这个进程" + ID_PROCESS_PAGE_ENDPROCESSTREE "从系统层面上结束此进程及它启动的一切子任务" ID_PROCESS_PAGE_DEBUG "将调试器附加到该进程" - ID_PROCESS_PAGE_SETAFFINITY "控制这一进程将获准在上运行的处理器" - ID_PROCESS_PAGE_SETPRIORITY_REALTIME "将进程设置为实时优先级类" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "将进程设置为高优先级类" - ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "将进程设置为高于正常优先级类" - ID_PROCESS_PAGE_SETPRIORITY_NORMAL "将进程设置为正常优先级类" - ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "将进程设置为低于正常优先级类" - ID_PROCESS_PAGE_SETPRIORITY_LOW "将进程设置为低优先级类" + ID_PROCESS_PAGE_SETAFFINITY "控制这一进程可以利用的 CPU" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME "将进程设置为实时优先级" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "将进程设置为高优先级" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "将进程设置为高于正常优先级" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL "将进程设置为正常优先级" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "将进程设置为低于正常优先级" + ID_PROCESS_PAGE_SETPRIORITY_LOW "将进程设置为低优先级" END STRINGTABLE @@ -399,13 +400,13 @@ BEGIN IDS_TAB_CPU "CPU" IDS_TAB_CPUTIME "CPU 时间" IDS_TAB_MEMUSAGE "内存使用" - IDS_TAB_PEAKMEMUSAGE "高峰内存使用" + IDS_TAB_PEAKMEMUSAGE "内存使用峰值" IDS_TAB_MEMDELTA "内存增量" IDS_TAB_PAGEFAULT "页面错误" IDS_TAB_PFDELTA "页面错误增量" IDS_TAB_VMSIZE "虚拟内存大小" IDS_TAB_PAGEDPOOL "页面缓冲池" - IDS_TAB_NPPOOL "非页面缓冲池" + IDS_TAB_NPPOOL "未分页缓冲池" IDS_TAB_BASEPRI "基本优先级" IDS_TAB_HANDLES "句柄数" IDS_TAB_THREADS "线程数" @@ -414,37 +415,37 @@ BEGIN IDS_TAB_IOREADS "I/O 读取" IDS_TAB_IOWRITES "I/O 写入" IDS_TAB_IOOTHER "I/O 其他" - IDS_TAB_IOREADBYTES "I/O 读取字节" - IDS_TAB_IOWRITESBYTES "I/O 写入字节" - IDS_TAB_IOOTHERBYTES "I/O 其他字节" + IDS_TAB_IOREADBYTES "I/O 读取字节数" + IDS_TAB_IOWRITESBYTES "I/O 写入字节数" + IDS_TAB_IOOTHERBYTES "I/O 其他字节数" IDS_TAB_COMMANDLINE "命令行" - IDS_MENU_SELECTCOLUMNS "选择列(&S)..." + IDS_MENU_SELECTCOLUMNS "选择显示的列(&S)..." IDS_MENU_16BITTASK "显示 16 位任务(&S)" IDS_MENU_WINDOWS "窗口(&W)" IDS_MENU_LARGEICONS "大图标(&G)" IDS_MENU_SMALLICONS "小图标(&M)" IDS_MENU_DETAILS "详细(&D)" - IDS_MENU_ONEGRAPHALLCPUS "所有 CPU 一张图表(&O)" - IDS_MENU_ONEGRAPHPERCPU "每个 CPU 一张图表(&P)" - IDS_MENU_CPUHISTORY "CPU 纪录(&C)" + IDS_MENU_ONEGRAPHALLCPUS "所有 CPU 共享一张图表(&O)" + IDS_MENU_ONEGRAPHPERCPU "每个 CPU 单列一张图表(&P)" + IDS_MENU_CPUHISTORY "CPU 记录(&C)" IDS_MENU_SHOWKERNELTIMES "显示内核时间(&S)" IDS_CREATENEWTASK "创建新任务" - IDS_CREATENEWTASK_DESC "任务管理器将根据您所输入的名称，为您打开相应的程序、文件夹、文档或 Internet 资源。" - IDS_MSG_ACCESSPROCESSAFF "无法访问或设置进程关联" - IDS_MSG_PROCESSONEPRO "该进程必须具有至少一个处理器与亲和力。" + IDS_CREATENEWTASK_DESC "任务管理器将根据您的输入，为您打开相应的程序、文件夹、文档或 Internet 资源。" + IDS_MSG_ACCESSPROCESSAFF "无法访问或设置进程关联 CPU" + IDS_MSG_PROCESSONEPRO "该进程必须具有至少一个关联 CPU。" IDS_MSG_INVALIDOPTION "无效的选项" IDS_MSG_UNABLEDEBUGPROCESS "无法调试进程" IDS_MSG_WARNINGDEBUG "警告：调试该进程可能会导致数据丢失。\n你确定想要附加调试器？" IDS_MSG_TASKMGRWARNING "任务管理器警告" - IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的\n结果，包括丢失数据和系统不稳定。在被\n终止前，这一进程将不给予机会保存\n其状态或数据。确信你想\n终止该进程吗?" + IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n 在被终止前，这一进程将不会获得机会保存其状态或数据。\n 您确定想终止该进程吗?" IDS_MSG_UNABLETERMINATEPRO "无法终止进程" - IDS_MSG_CLOSESYSTEMPROCESS "这是一个关键的系统过程。任务管理器不会结束这一进程。" + IDS_MSG_CLOSESYSTEMPROCESS "这是一个至关重要的系统进程。任务管理器不会结束这一进程。" IDS_MSG_UNABLECHANGEPRIORITY "无法更改优先级" - IDS_MSG_WARNINGCHANGEPRIORITY "警告: 改变这一进程的优先级类可能会\n导致意外的结果，包括系统不稳定。你确定\n想更改优先级类吗?" + IDS_MSG_WARNINGCHANGEPRIORITY "警告: 改变这一进程的优先级可能会\n导致意外的结果，包括系统不稳定。您确定\n要更改优先级类？" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情况: %d%%" IDS_STATUS_MEMUSAGE "内存使用情况: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU 使用情况: %3d%%" - IDS_STATUS_PROCESSES "處理程序: %d" - IDS_NOT_RESPONDING "没有回应" + IDS_STATUS_PROCESSES "进程数: %d" + IDS_NOT_RESPONDING "未响应" IDS_RUNNING "正在运行" END

1 0

01/01: [IPHLPAPI] ipstats_reactos: Review all TRACE/WARN calls
by Serge Gautherie 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c9359221c9bcf5549fb8… commit 6c9359221c9bcf5549fb8693834de51ab509cdee Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Feb 24 16:16:26 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 17:11:17 2018 +0100 [IPHLPAPI] ipstats_reactos: Review all TRACE/WARN calls - Improve/Promote failures to ERR. - Improve other TRACE calls. --- dll/win32/iphlpapi/ipstats_reactos.c | 86 +++++++++++++++++------------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index ed95d42705..a886931a8b 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -81,8 +81,8 @@ NTSTATUS getNthIpEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ) { } if( numRoutes == index && i < numEntities ) { - TRACE("Index %d is entity #%d - %04x:%08x\n", index, i, - entitySet[i].tei_entity, entitySet[i].tei_instance ); + TRACE("Index %lu is entity #%d - %04x:%08x\n", index, i, + entitySet[i].tei_entity, entitySet[i].tei_instance); memcpy( ent, &entitySet[i], sizeof(*ent) ); tdiFreeThingSet( entitySet ); return STATUS_SUCCESS; @@ -100,8 +100,8 @@ NTSTATUS tdiGetMibForIpEntity memset( entry, 0, sizeof( *entry ) ); - TRACE("TdiGetMibForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetMibForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); req.ID.toi_class = INFO_CLASS_PROTOCOL; req.ID.toi_type = INFO_TYPE_PROVIDER; @@ -117,31 +117,31 @@ NTSTATUS tdiGetMibForIpEntity &returnSize, NULL ); - TRACE("TdiGetMibForIpEntity() => {\n" - " ipsi_forwarding ............ %d\n" - " ipsi_defaultttl ............ %d\n" - " ipsi_inreceives ............ %d\n" - " ipsi_indelivers ............ %d\n" - " ipsi_outrequests ........... %d\n" - " ipsi_routingdiscards ....... %d\n" - " ipsi_outdiscards ........... %d\n" - " ipsi_outnoroutes ........... %d\n" - " ipsi_numif ................. %d\n" - " ipsi_numaddr ............... %d\n" - " ipsi_numroutes ............. %d\n" - "} status %08x\n", - entry->ipsi_forwarding, - entry->ipsi_defaultttl, - entry->ipsi_inreceives, - entry->ipsi_indelivers, - entry->ipsi_outrequests, - entry->ipsi_routingdiscards, - entry->ipsi_outdiscards, - entry->ipsi_outnoroutes, - entry->ipsi_numif, - entry->ipsi_numaddr, - entry->ipsi_numroutes, - status); + TRACE("TdiGetMibForIpEntity() => status = 0x%08lx, entry = {\n" + " ipsi_forwarding ............ %lu\n" + " ipsi_defaultttl ............ %lu\n" + " ipsi_inreceives ............ %lu\n" + " ipsi_indelivers ............ %lu\n" + " ipsi_outrequests ........... %lu\n" + " ipsi_routingdiscards ....... %lu\n" + " ipsi_outdiscards ........... %lu\n" + " ipsi_outnoroutes ........... %lu\n" + " ipsi_numif ................. %lu\n" + " ipsi_numaddr ............... %lu\n" + " ipsi_numroutes ............. %lu\n" + "}\n", + status, + entry->ipsi_forwarding, + entry->ipsi_defaultttl, + entry->ipsi_inreceives, + entry->ipsi_indelivers, + entry->ipsi_outrequests, + entry->ipsi_routingdiscards, + entry->ipsi_outdiscards, + entry->ipsi_outnoroutes, + entry->ipsi_numif, + entry->ipsi_numaddr, + entry->ipsi_numroutes); return status; } @@ -150,8 +150,8 @@ NTSTATUS tdiGetRoutesForIpEntity ( HANDLE tcpFile, TDIEntityID *ent, IPRouteEntry **routes, PDWORD numRoutes ) { NTSTATUS status = STATUS_SUCCESS; - TRACE("TdiGetRoutesForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetRoutesForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -171,8 +171,8 @@ NTSTATUS tdiGetIpAddrsForIpEntity ( HANDLE tcpFile, TDIEntityID *ent, IPAddrEntry **addrs, PDWORD numAddrs ) { NTSTATUS status; - TRACE("TdiGetIpAddrsForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetIpAddrsForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -367,16 +367,14 @@ DWORD getNumRoutes(void) TRACE("called.\n"); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; } status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("tdiGetEntityIDSet returned 0x%08lx\n", status); closeTcpFile( tcpFile ); return 0; } @@ -387,7 +385,7 @@ DWORD getNumRoutes(void) memset( &isnmp, 0, sizeof( isnmp ) ); status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); if( !NT_SUCCESS(status) ) { - WARN("tdiGetMibForIpEntity failed for i = %d", i); + ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d", status, i); numRoutes = 0; break; } @@ -395,7 +393,7 @@ DWORD getNumRoutes(void) } } - TRACE("numRoutes: %d\n", (int)numRoutes); + TRACE("numRoutes = %lu\n", numRoutes); tdiFreeThingSet( entitySet ); closeTcpFile( tcpFile ); @@ -454,7 +452,7 @@ RouteTable *getRouteTable(void) return 0; } - TRACE( "%d routes in instance %d\n", numRoutes, i ); + TRACE("%lu routes in instance %d\n", numRoutes, i); #if 0 HexDump( route_set, sizeof( IPRouteEntry ) * @@ -482,7 +480,7 @@ RouteTable *getRouteTable(void) closeTcpFile( tcpFile ); - TRACE("Return: %08x, %08x\n", status, out_route_table); + TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table); return out_route_table; } @@ -500,9 +498,8 @@ DWORD getNumArpEntries(void) TRACE("called.\n"); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; } @@ -552,9 +549,8 @@ PMIB_IPNETTABLE getArpTable(void) totalNumber = getNumArpEntries(); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; }

1 0

01/01: [CHARMAP]Code improvements (#436)
by Baruch Rutman 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf34d6bf8b0e1d243020b… commit bf34d6bf8b0e1d243020b67a0fb3ca6206e77b6b Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Thu May 17 18:18:57 2018 +0300 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:18:57 2018 +0100 [CHARMAP]Code improvements (#436) * [CHARMAP][GETUNAME] Code improvements Based on the code from nls2txt, switches the linking from dynamic to static, also simplifies the code. --- base/applications/charmap/CMakeLists.txt | 2 +- base/applications/charmap/charmap.c | 31 ++++--------------------------- base/applications/charmap/precomp.h | 2 ++ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt index e576b741e1..d2e497554e 100644 --- a/base/applications/charmap/CMakeLists.txt +++ b/base/applications/charmap/CMakeLists.txt @@ -10,6 +10,6 @@ list(APPEND SOURCE add_rc_deps(charmap.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/charmap.ico) add_executable(charmap ${SOURCE} charmap.rc) set_module_type(charmap win32gui UNICODE) -add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) +add_importlibs(charmap getuname advapi32 user32 gdi32 comctl32 msvcrt kernel32) add_pch(charmap precomp.h SOURCE) add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 35cc8e6f9f..218f8512c5 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -25,10 +25,6 @@ HICON hSmIcon; HICON hBgIcon; SETTINGS Settings; -/* GetUName prototype */ -typedef int (WINAPI * GETUNAME)(WORD wCharCode, LPWSTR lpbuf); -GETUNAME GetUName; - /* Font-enumeration callback */ static int @@ -165,7 +161,7 @@ CopyCharacters(HWND hDlg) // Test if the whose text is unselected if(dwStart == dwEnd) { - + // Select the whole text SendMessageW(hText, EM_SETSEL, 0, -1); @@ -268,12 +264,9 @@ UpdateStatusBar(WCHAR wch) WCHAR buff[MAX_PATH]; WCHAR szDesc[MAX_PATH]; - if (GetUName) - { - GetUName(wch, szDesc); - wsprintfW(buff, L"U+%04X: %s", wch, szDesc); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff); - } + GetUName(wch, szDesc); + wsprintfW(buff, L"U+%04X: %s", wch, szDesc); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff); } static @@ -593,7 +586,6 @@ wWinMain(HINSTANCE hInst, INT Ret = 1; HMODULE hRichEd20; MSG Msg; - HINSTANCE hGetUName = NULL; hInstance = hInst; @@ -612,18 +604,6 @@ wWinMain(HINSTANCE hInst, iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); - /* Loading the GetUName function */ - hGetUName = LoadLibraryW(L"getuname.dll"); - if (hGetUName != NULL) - { - GetUName = (GETUNAME) GetProcAddress(hGetUName, "GetUName"); - if (GetUName == NULL) - { - FreeLibrary(hGetUName); - hGetUName = NULL; - } - } - if (RegisterMapClasses(hInstance)) { hRichEd20 = LoadLibraryW(L"RICHED20.DLL"); @@ -649,8 +629,5 @@ wWinMain(HINSTANCE hInst, UnregisterMapClasses(hInstance); } - if (hGetUName != NULL) - FreeLibrary(hGetUName); - return Ret; } diff --git a/base/applications/charmap/precomp.h b/base/applications/charmap/precomp.h index 0ade7aa1e7..132f275d4e 100644 --- a/base/applications/charmap/precomp.h +++ b/base/applications/charmap/precomp.h @@ -73,6 +73,8 @@ VOID ShowAboutDlg(HWND hWndParent); BOOL RegisterMapClasses(HINSTANCE hInstance); VOID UnregisterMapClasses(HINSTANCE hInstance); +int WINAPI GetUName(IN WORD wCharCode, OUT LPWSTR lpBuf); + /* charmap.c */ VOID UpdateStatusBar(WCHAR wch); extern VOID ChangeMapFont(HWND hDlg);

1 0

01/01: [KMTEST] Check/Wait for start/stop of services to complete
by Serge Gautherie 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c683c264c7c908e4bcc9… commit 0c683c264c7c908e4bcc971d0a904afb2dad6b41 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Jan 16 05:47:34 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:17:36 2018 +0100 [KMTEST] Check/Wait for start/stop of services to complete This is cleaner behavior and lets report failures. - Create KmtEnsureServiceState(), called at end of KmtStartService() and KmtStopService(). - Create KmtGetServiceStateAsString(), called from KmtEnsureServiceState(). ROSTESTS-263 --- modules/rostests/kmtests/kmtest/service.c | 111 +++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/service.c b/modules/rostests/kmtests/kmtest/service.c index cc2e91a96e..7427fbfdd3 100644 --- a/modules/rostests/kmtests/kmtest/service.c +++ b/modules/rostests/kmtests/kmtest/service.c @@ -4,6 +4,7 @@ * PURPOSE: Kernel-Mode Test Suite loader service control functions * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> + * Copyright 2018 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include <kmt_test.h> @@ -11,7 +12,7 @@ #include <assert.h> -#define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) +#define SERVICE_ACCESS (SERVICE_QUERY_STATUS | SERVICE_START | SERVICE_STOP | DELETE) /* * This is an internal function not meant for use by the kmtests app, @@ -101,6 +102,104 @@ KmtCreateService( ServiceHandle); } +/** + * @name KmtGetServiceStateAsString + * + * @param ServiceState + * Service state as a number + * + * @return Service state as a string + */ +static +PCSTR +KmtGetServiceStateAsString( + IN DWORD ServiceState) +{ + switch(ServiceState) + { + case SERVICE_STOPPED: + return "STOPPED"; + case SERVICE_START_PENDING: + return "START_PENDING"; + case SERVICE_STOP_PENDING: + return "STOP_PENDING"; + case SERVICE_RUNNING: + return "RUNNING"; + case SERVICE_CONTINUE_PENDING: + return "CONTINUE_PENDING"; + case SERVICE_PAUSE_PENDING: + return "PAUSE_PENDING"; + case SERVICE_PAUSED: + return "PAUSED"; + default: + ok(FALSE, "Unknown service state = %lu\n", ServiceState); + return "(Unknown)"; + } +} + +/** + * @name KmtEnsureServiceState + * + * @param ServiceName + * Name of the service to check, + * or NULL + * @param ServiceHandle + * Handle to the service + * @param ExpectedServiceState + * State which the service should be in + * + * @return Win32 error code + */ +static +DWORD +KmtEnsureServiceState( + IN PCWSTR ServiceName OPTIONAL, + IN SC_HANDLE ServiceHandle, + IN DWORD ExpectedServiceState) +{ + DWORD Error = ERROR_SUCCESS; + SERVICE_STATUS ServiceStatus; + DWORD StartTime = GetTickCount(); + DWORD Timeout = 10 * 1000; + PCWSTR ServiceNameOut = ServiceName ? ServiceName : L"(handle only, no name)"; + + assert(ServiceHandle); + assert(ExpectedServiceState); + + if (!QueryServiceStatus(ServiceHandle, &ServiceStatus)) + error_goto(Error, cleanup); + + while (ServiceStatus.dwCurrentState != ExpectedServiceState) + { + // NB: ServiceStatus.dwWaitHint and ServiceStatus.dwCheckPoint logic could be added, if need be. + + Sleep(1 * 1000); + + if (!QueryServiceStatus(ServiceHandle, &ServiceStatus)) + error_goto(Error, cleanup); + + if (GetTickCount() - StartTime >= Timeout) + break; + } + + if (ServiceStatus.dwCurrentState != ExpectedServiceState) + { + ok(FALSE, "Service = %ls, state = %lu %s (!= %lu %s), waitHint = %lu, checkPoint = %lu\n", + ServiceNameOut, + ServiceStatus.dwCurrentState, KmtGetServiceStateAsString(ServiceStatus.dwCurrentState), + ExpectedServiceState, KmtGetServiceStateAsString(ExpectedServiceState), + ServiceStatus.dwWaitHint, ServiceStatus.dwCheckPoint); + goto cleanup; + } + + trace("Service = %ls, state = %lu %s\n", + ServiceNameOut, + ExpectedServiceState, KmtGetServiceStateAsString(ExpectedServiceState)); + +cleanup: + return Error; +} + /** * @name KmtStartService * @@ -133,6 +232,10 @@ KmtStartService( if (!StartService(*ServiceHandle, 0, NULL)) error_goto(Error, cleanup); + Error = KmtEnsureServiceState(ServiceName, *ServiceHandle, SERVICE_RUNNING); + if (Error) + goto cleanup; + cleanup: return Error; } @@ -228,6 +331,10 @@ KmtStopService( if (!ControlService(*ServiceHandle, SERVICE_CONTROL_STOP, &ServiceStatus)) error_goto(Error, cleanup); + Error = KmtEnsureServiceState(ServiceName, *ServiceHandle, SERVICE_STOPPED); + if (Error) + goto cleanup; + cleanup: return Error; } @@ -340,4 +447,4 @@ KmtpCreateService( cleanup: return Error; -} \ No newline at end of file +}

1 0

03/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9cc6bb520ba0ec547b5… commit ae9cc6bb520ba0ec547b51780cc98b556f676175 Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:17:19 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/usbhub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbhub/usbhub.c b/drivers/usb/usbhub/usbhub.c index fbb9811b6f..da2b80dbe2 100644 --- a/drivers/usb/usbhub/usbhub.c +++ b/drivers/usb/usbhub/usbhub.c @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/usbhub.c * PURPOSE: UsbHub Driver * PROGRAMMERS: - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */

1 0

02/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6412253d440525c785d20… commit 6412253d440525c785d206de1874762df4eef075 Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:17:01 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/pdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbhub/pdo.c b/drivers/usb/usbhub/pdo.c index cadb5c7857..b39098f9f8 100644 --- a/drivers/usb/usbhub/pdo.c +++ b/drivers/usb/usbhub/pdo.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/pdo.c * PURPOSE: Handle PDO * PROGRAMMERS: * Hervé Poussineau (hpoussin(a)reactos.org)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs