Ros-diffs

ros-diffs@reactos.org

81390 discussions

05/07: [USETUP] Improve the NTOS installations detector.
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a6050902bd78e831d525… commit 5a6050902bd78e831d525fc56a1714f155bd86f3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 01:19:08 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:59 2018 +0200 [USETUP] Improve the NTOS installations detector. In all the disks/partitions available, it searches for the presence of freeldr.ini / boot.ini, open & parse them, and enumerates the available boot entries (as candidates for installations). For each of them, it maps their ARC paths into the NT namespace (hence the ARC 2 NT path resolver committed in r74621), then attempts to detect in these paths the existence of NTOS installations. svn path=/branches/setup_improvements/; revision=74622 --- base/setup/usetup/osdetect.c | 589 +++++++++++++++++++++++++++++++++---------- base/setup/usetup/osdetect.h | 8 +- 2 files changed, 468 insertions(+), 129 deletions(-) diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 23f1dee7a9..34c18e7b11 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -94,28 +94,41 @@ NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = // {BootMgr, L"bootmgr" , ???} }; -#if 0 -static VOID -EnumerateInstallationsFreeLdr() +static BOOLEAN +IsValidNTOSInstallation( + IN HANDLE SystemRootDirectory OPTIONAL, + IN PCWSTR SystemRoot OPTIONAL); + +static PNTOS_INSTALLATION +AddNTOSInstallation( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot, + IN PCWSTR InstallationName); + +static NTSTATUS +FreeLdrEnumerateInstallations( + IN OUT PGENERIC_LIST List, + IN PPARTLIST PartList, + // IN PPARTENTRY PartEntry, + IN PCHAR FileBuffer, + IN ULONG FileLength) { NTSTATUS Status; PINICACHE IniCache; - PINICACHESECTION IniSection; - PINICACHESECTION OsIniSection; - WCHAR SectionName[80]; - WCHAR OsName[80]; - WCHAR SystemPath[200]; - WCHAR SectionName2[200]; - PWCHAR KeyData; - ULONG i,j; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection, OsIniSection; + PWCHAR SectionName, KeyData; + WCHAR InstallName[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoad(&IniCache, IniPath, FALSE); + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); if (!NT_SUCCESS(Status)) return Status; - /* Get "Operating Systems" section */ + /* Get the "Operating Systems" section */ IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); if (IniSection == NULL) { @@ -123,69 +136,335 @@ EnumerateInstallationsFreeLdr() return STATUS_UNSUCCESSFUL; } - /* NOTE that we enumerate all the valid installations, not just the default one */ - while (TRUE) + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do { - Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), + Begin, End - Begin); + } + else + { + /* Non-quoted name, copy everything */ + StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + } + + DPRINT1("Possible installation '%S' in OS section '%S'\n", InstallName, SectionName); + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName); + if (!OsIniSection) + continue; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + continue; + } + } + else + { + /* Certainly not a ReactOS installation */ + continue; + } + + /* BootType is Windows2003. Now check SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (!NT_SUCCESS(Status)) - break; + { + DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); + continue; + } - // TODO some foobaring... + { + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + DPRINT1(" Found a candidate Win2k3 install '%S' with ARC path '%S'\n", InstallName, KeyData); + + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + + // TODO 1: Normalize the ARC path. + + // TODO 2: Check whether we already have an installation with this ARC path. + // If that's the case, stop there. If not, continue... + + /* + * Convert the ARC path into an NT path, from which we will deduce + * the real disk drive & partition on which the candidate installation + * resides, as well verifying whether it is indeed an NTOS installation. + */ + RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); + if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) + { + DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", KeyData); + // FIXME: Do not continue! + continue; + } - // TODO 2 : Remind the entry name so that we may display it as available installation... + DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", KeyData, &SystemRootPath); + + // TODO 3: Check whether we already have an installation with this NT path. + // If that's the case, stop there. If not, continue... + + /* Set SystemRootPath */ + DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + + /* Open SystemRootPath */ + InitializeObjectAttributes(&ObjectAttributes, + &SystemRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&SystemRootDirectory, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + continue; + } - /* Search for an existing ReactOS entry */ - OsIniSection = IniCacheGetSection(IniCache, SectionName2); - if (OsIniSection != NULL) + if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - BOOLEAN UseExistingEntry = TRUE; + ULONG DiskNumber, PartitionNumber; + PCWSTR PathComponent; + PDISKENTRY DiskEntry = NULL; + PPARTENTRY PartEntry = NULL; + + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", KeyData, &SystemRootPath); - /* Check for supported boot type "Windows2003" */ - Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); - if (NT_SUCCESS(Status)) + /* From the NT path, compute the disk, partition and path components */ + if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) { - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"Windows2003") != 0) && - (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) - { - /* This is not a ReactOS entry */ - UseExistingEntry = FALSE; - } + DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", + &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); + + /* Retrieve the corresponding disk and partition */ + if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) + DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); } else { - UseExistingEntry = FALSE; + DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); } - if (UseExistingEntry) + if (PartEntry && PartEntry->DriveLetter) { - /* BootType is Windows2003. Now check SystemPath. */ - Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); - if (NT_SUCCESS(Status)) - { - swprintf(SystemPath, L"\"%s\"", ArcPath); - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, ArcPath) != 0) && - (_wcsicmp(KeyData, SystemPath) != 0) )) - { - /* This entry is a ReactOS entry, but the SystemRoot - does not match the one we are looking for. */ - UseExistingEntry = FALSE; - } - } - else - { - UseExistingEntry = FALSE; - } + /* We have retrieved a partition that is mounted */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", + PartEntry->DriveLetter, PathComponent, InstallName); } + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", + &SystemRootPath, InstallName); + } + AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, KeyData, InstallNameW); + } + + NtClose(SystemRootDirectory); } } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + IniCacheFindClose(Iterator); + +Quit: IniCacheDestroy(IniCache); + return STATUS_SUCCESS; } -#endif +static NTSTATUS +NtLdrEnumerateInstallations( + IN OUT PGENERIC_LIST List, + IN PPARTLIST PartList, + // IN PPARTENTRY PartEntry, + IN PCHAR FileBuffer, + IN ULONG FileLength) +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection; + PWCHAR SectionName, KeyData; + WCHAR InstallName[MAX_PATH]; + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get the "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"operating systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do + { + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), + Begin, End - Begin); + } + else + { + /* Non-quoted name, copy everything */ + StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); + } + + DPRINT1("Possible installation '%S' with ARC path '%S'\n", InstallName, SectionName); + + // FIXME TODO: Determine whether we indeed have an ARC path, in which case + // this is an NT installation, or, whether we have something else like a DOS + // path, which means that we are booting a boot sector... + + DPRINT1(" Found a Win2k3 install '%S' with ARC path '%S'\n", InstallName, SectionName); + // TODO: Dissect it in order to retrieve the real disk drive & partition numbers. + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + { + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + // Note that in ARC path, the disk number is the BIOS disk number, so a conversion + // should be done. + + // TODO 1: Normalize the ARC path. + + // TODO 2: Check whether we already have an installation with this ARC path. + // If that's the case, stop there. If not, continue... + + /* + * Convert the ARC path into an NT path, from which we will deduce + * the real disk drive & partition on which the candidate installation + * resides, as well verifying whether it is indeed an NTOS installation. + */ + RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); + if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) + { + DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", SectionName); + // FIXME: Do not continue! + continue; + } + + DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", SectionName, &SystemRootPath); + + // TODO 3: Check whether we already have an installation with this NT path. + // If that's the case, stop there. If not, continue... + + /* Set SystemRootPath */ + DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + + /* Open SystemRootPath */ + InitializeObjectAttributes(&ObjectAttributes, + &SystemRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&SystemRootDirectory, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + continue; + } + + if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) + { + ULONG DiskNumber, PartitionNumber; + PCWSTR PathComponent; + PDISKENTRY DiskEntry = NULL; + PPARTENTRY PartEntry = NULL; + + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", SectionName, &SystemRootPath); + + /* From the NT path, compute the disk, partition and path components */ + if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) + { + DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", + &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); + + /* Retrieve the corresponding disk and partition */ + if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) + DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); + } + else + { + DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); + } + + if (PartEntry && PartEntry->DriveLetter) + { + /* We have retrieved a partition that is mounted */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", + PartEntry->DriveLetter, PathComponent, InstallName); + } + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", + &SystemRootPath, InstallName); + } + AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, SectionName, InstallNameW); + } + + NtClose(SystemRootDirectory); + } + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} /* * FindSubStrI(PCWSTR str, PCWSTR strSearch) : @@ -221,8 +500,8 @@ static BOOLEAN CheckForValidPEAndVendor( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL - IN PCWSTR VendorName // Better would be OUT PCWSTR*, and the function returning NTSTATUS ? + IN PCWSTR FileName, // OPTIONAL + OUT PUNICODE_STRING VendorName ) { BOOLEAN Success = FALSE; @@ -234,18 +513,24 @@ CheckForValidPEAndVendor( PVOID pvData = NULL; UINT BufLen = 0; + if (VendorName->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *VendorName->Buffer = UNICODE_NULL; + VendorName->Length = 0; + Status = OpenAndMapFile(RootDirectory, PathName, FileName, - &FileHandle, &SectionHandle, &ViewBase); + &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file %wZ, Status 0x%08lx\n", &FileName, Status); + DPRINT1("Failed to open and map file %S, Status 0x%08lx\n", FileName, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File %wZ does not seem to be a valid PE, bail out\n", &FileName); + DPRINT1("File %S does not seem to be a valid PE, bail out\n", FileName); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -257,7 +542,7 @@ CheckForValidPEAndVendor( Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); + DPRINT1("Failed to get version resource for file %S, Status 0x%08lx\n", FileName, Status); goto UnmapFile; } @@ -266,7 +551,6 @@ CheckForValidPEAndVendor( { USHORT wCodePage = 0, wLangID = 0; WCHAR FileInfo[MAX_PATH]; - UNICODE_STRING Vendor; wCodePage = LOWORD(*(ULONG*)pvData); wLangID = HIWORD(*(ULONG*)pvData); @@ -276,22 +560,27 @@ CheckForValidPEAndVendor( wCodePage, wLangID); Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); - if (NT_SUCCESS(Status) && pvData) + + /* Fixup the Status in case pvData is NULL */ + if (NT_SUCCESS(Status) && !pvData) + Status = STATUS_NOT_FOUND; + + if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); - Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); + DPRINT1("Found version vendor: \"%S\" for file %S\n", pvData, FileName); - DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); + StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, + pvData, BufLen * sizeof(WCHAR)); + VendorName->Length = wcslen(VendorName->Buffer) * sizeof(WCHAR); - Success = !!FindSubStrI(pvData, VendorName); - } - else - { - DPRINT1("No version vendor found for file %wZ\n", &FileName); + Success = TRUE; } } + if (!NT_SUCCESS(Status)) + DPRINT1("No version vendor found for file %S\n", FileName); + UnmapFile: /* Finally, unmap and close the file */ UnMapFile(SectionHandle, ViewBase); @@ -300,36 +589,55 @@ UnmapFile: return Success; } +// +// TODO: Instead of returning TRUE/FALSE, it would be nice to return +// a flag indicating: +// - whether the installation is actually valid; +// - if it's broken or not (aka. needs for repair, or just upgrading). +// static BOOLEAN IsValidNTOSInstallation( - IN HANDLE PartitionHandle, - IN PCWSTR SystemRoot) + IN HANDLE SystemRootDirectory OPTIONAL, + IN PCWSTR SystemRoot OPTIONAL) { BOOLEAN Success = FALSE; USHORT i; WCHAR PathBuffer[MAX_PATH]; + UNICODE_STRING VendorName; - // DoesPathExist(PartitionHandle, SystemRoot, L"System32\\"); etc... + /* + * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, + * depending on what the user gave to us in entry. + */ + if (SystemRootDirectory) + SystemRoot = NULL; + // else SystemRootDirectory == NULL and SystemRoot is what it is. + + /* If both the parameters are NULL we cannot do anything else more */ + if (!SystemRootDirectory && !SystemRoot) + return FALSE; + + // DoesPathExist(SystemRootDirectory, SystemRoot, L"System32\\"); etc... /* Check for the existence of \SystemRoot\System32 */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\drivers */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\drivers\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\config */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\config\\"); - if (!DoesPathExist(PartitionHandle, PathBuffer)) + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); + if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; @@ -340,38 +648,64 @@ IsValidNTOSInstallation( * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SYSTEM")) + if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) { // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } - if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SOFTWARE")) + if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) { // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif - for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) - { - /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and verify its version */ - Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntoskrnl.exe", KnownVendors[i]); + RtlInitEmptyUnicodeString(&VendorName, PathBuffer, sizeof(PathBuffer)); - /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ + /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ + Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntoskrnl.exe", &VendorName); + if (!Success) + DPRINT1("Kernel file ntoskrnl.exe is either not a PE file, or does not have any vendor?\n"); - /* Check for the existence of \SystemRoot\System32\ntdll.dll */ - Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntdll.dll", KnownVendors[i]); + /* The kernel gives the OS its flavour */ + if (Success) + { + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) + { + Success = !!FindSubStrI(VendorName.Buffer, KnownVendors[i]); + if (Success) + { + /* We have found a correct vendor combination */ + DPRINT1("IsValidNTOSInstallation: We've got an NTOS installation from %S !\n", KnownVendors[i]); + break; + } + } + } - /* We have found a correct vendor combination */ - if (Success) - break; + /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ + + /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ + Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntdll.dll", &VendorName); + if (!Success) + DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); + if (Success) + { + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) + { + if (!!FindSubStrI(VendorName.Buffer, KnownVendors[i])) + { + /* We have found a correct vendor combination */ + DPRINT1("IsValidNTOSInstallation: The user-mode file ntdll.dll is from %S\n", KnownVendors[i]); + break; + } + } } return Success; } static VOID -ListNTOSInstalls( +DumpNTOSInstalls( IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; @@ -442,6 +776,10 @@ AddNTOSInstallation( { DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot %S\n", NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, NtOsInstall->SystemRoot); + // + // NOTE: We may use its "IsDefault" attribute, and only keep the entries that have IsDefault == TRUE... + // Setting IsDefault to TRUE would imply searching for the "Default" entry in the loader configuration file. + // return NtOsInstall; } @@ -464,9 +802,9 @@ AddNTOSInstallation( static VOID FindNTOSInstallations( - IN PGENERIC_LIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber) + IN OUT PGENERIC_LIST List, + IN PPARTLIST PartList, + IN PPARTENTRY PartEntry) { NTSTATUS Status; UINT i; @@ -476,15 +814,18 @@ FindNTOSInstallations( UNICODE_STRING PartitionRootPath; HANDLE SectionHandle; // SIZE_T ViewSize; + ULONG FileSize; PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; + +PDISKENTRY DiskEntry = PartEntry->DiskEntry; +ULONG DiskNumber = DiskEntry->DiskNumber; +ULONG PartitionNumber = PartEntry->PartitionNumber; /* Set PartitionRootPath */ - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu\\", - DiskNumber, PartitionNumber); + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskNumber, PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); @@ -519,7 +860,7 @@ FindNTOSInstallations( /* Check whether the loader configuration file exists */ Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase); + &FileHandle, &SectionHandle, &ViewBase, &FileSize); if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ @@ -529,31 +870,21 @@ FindNTOSInstallations( } /* The loader configuration file exists, interpret it to find valid installations */ - // TODO!! - DPRINT1("TODO: Analyse the OS installations inside %S !\n", NtosBootLoaders[i].LoaderConfigurationFile); - - // Here we get a SystemRootPath for each installation // FIXME! - // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... - StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"WINDOWS\\"); - if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) + DPRINT1("Analyse the OS installations inside '%S' in disk #%d, partition #%d\n", + NtosBootLoaders[i].LoaderConfigurationFile, DiskNumber, PartitionNumber); + switch (NtosBootLoaders[i].Type) { - DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", - DiskNumber, PartitionNumber, SystemRoot); - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", - 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"Windows (placeholder)"); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); - } + case FreeLdr: + Status = FreeLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); + break; - // Here we get a SystemRootPath for each installation // FIXME! - // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... - StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"ReactOS\\"); - if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) - { - DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", - DiskNumber, PartitionNumber, SystemRoot); - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", - 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"ReactOS (placeholder)"); - AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); + case NtLdr: + Status = NtLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); + break; + + default: + DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[i].Type); + Status = STATUS_SUCCESS; } /* Finally, unmap and close the file */ @@ -611,6 +942,8 @@ CreateNTOSInstallationsList( PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); Entry2 = Entry2->Flink; + ASSERT(PartEntry->DiskEntry == DiskEntry); + DPRINT1(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", @@ -621,7 +954,7 @@ CreateNTOSInstallationsList( ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); if (ShouldICheckThisPartition(PartEntry)) - FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + FindNTOSInstallations(List, PartList, PartEntry); } /* Then, the logical partitions (present in the extended partition) */ @@ -631,6 +964,8 @@ CreateNTOSInstallationsList( PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); Entry2 = Entry2->Flink; + ASSERT(PartEntry->DiskEntry == DiskEntry); + DPRINT1(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", PartEntry->PartitionNumber, PartEntry->PartitionIndex, PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", @@ -641,12 +976,12 @@ CreateNTOSInstallationsList( ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); if (ShouldICheckThisPartition(PartEntry)) - FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + FindNTOSInstallations(List, PartList, PartEntry); } } /**** Debugging: List all the collected installations ****/ - ListNTOSInstalls(List); + DumpNTOSInstalls(List); return List; } diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h index 117681e47a..bef666a172 100644 --- a/base/setup/usetup/osdetect.h +++ b/base/setup/usetup/osdetect.h @@ -11,8 +11,12 @@ typedef struct _NTOS_INSTALLATION LIST_ENTRY ListEntry; ULONG DiskNumber; ULONG PartitionNumber; -// Vendor???? - WCHAR SystemRoot[MAX_PATH]; + PPARTENTRY PartEntry; +// BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. +// Vendor???? (Microsoft / ReactOS) +/**/WCHAR SystemRoot[MAX_PATH];/**/ + UNICODE_STRING SystemArcPath; // Normalized ARC path + UNICODE_STRING SystemNtPath; // Corresponding NT path /**/WCHAR InstallationName[MAX_PATH];/**/ } NTOS_INSTALLATION, *PNTOS_INSTALLATION;

1 0

04/07: [SETUPLIB] Add an ARC path to (and from) NT path resolver.
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa44ab1fbceecc0ab9c69… commit aa44ab1fbceecc0ab9c69512ca5f04eba0a6bfcd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 22 01:09:35 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:59 2018 +0200 [SETUPLIB] Add an ARC path to (and from) NT path resolver. The NT path resolver allows mapping between an ARC path as specified in freeldr.ini / boot.ini , to its corresponding NT path, if possible. Currently, only the mapping direction "ARC to NT" is implemented. It will be used wherever such mappings are needed, for example when identifying the ReactOS / Windows installations from the available freeldr.ini / boot.ini entries (for upgrading / repair purposes). The resolver supports the usual ARC paths: multi()disk()[r|f]disk()[partition()] ; eisa()disk()[r|f]disk()[partition()] ; multi()disk()cdrom() ; scsi()disk()[r|f]disk()[partition()] ; scsi()cdrom()fdisk() ; ramdisk(x) ; net(x) (actually reported as "unsupported" since it would map to some path on some network), and the newly-introduced Win2k signature()disk()rdisk()[partition()]. The code is in work-in-progress status. Some validation tests, that were used during the implementation of the resolver, have been added. svn path=/branches/setup_improvements/; revision=74621 svn path=/branches/setup_improvements/; revision=74631 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/arcname.c | 860 +++++++++++++++++++++++++++++++++++++++++ base/setup/lib/arcname.h | 21 + base/setup/lib/arcname_tests.c | 134 +++++++ base/setup/lib/setuplib.h | 2 + 5 files changed, 1018 insertions(+) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 258a14b03c..a37be9d1fb 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND SOURCE + arcname.c fsutil.c genlist.c ntverrsrc.c diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c new file mode 100644 index 0000000000..d2ea9d927a --- /dev/null +++ b/base/setup/lib/arcname.c @@ -0,0 +1,860 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ARC path to-and-from NT path resolver. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ +/* + * References: + * + * - ARC Specification v1.2: http://netbsd.org./docs/Hardware/Machines/ARC/riscspec.pdf + * - "Setup and Startup", MSDN article: https://technet.microsoft.com/en-us/library/cc977184.aspx + * - Answer for "How do I determine the ARC path for a particular drive letter in Windows?": https://serverfault.com/a/5929 + * - ARC - LinuxMIPS: https://www.linux-mips.org/wiki/ARC + * - ARCLoad - LinuxMIPS: https://www.linux-mips.org/wiki/ARCLoad + * - Inside Windows 2000 Server: https://books.google.fr/books?id=kYT7gKnwUQ8C&pg=PA71&lpg=PA71&dq=nt+arc+pa… + * - Inside Windows Server 2003: https://books.google.fr/books?id=zayrcM9ZYdAC&pg=PA61&lpg=PA61&dq=arc+path+… + * + * Stuff to read: http://www.adminxp.com/windows2000/index.php?aid=46 and http://www.trcb.com/Computers-and-Technology/Windows-XP/Windows-XP-ARC-Nami… + * concerning which values of disk() or rdisk() are valid when either scsi() or multi() adapters are specified. + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "partlist.h" +#include "arcname.h" + +#define NDEBUG +#include <debug.h> + + +/* Supported adapter types */ +typedef enum _ADAPTER_TYPE +{ + EisaAdapter, + ScsiAdapter, + MultiAdapter, + NetAdapter, + RamdiskAdapter, + AdapterTypeMax +} ADAPTER_TYPE, *PADAPTER_TYPE; +const PCSTR AdapterTypes_A[] = +{ + "eisa", + "scsi", + "multi", + "net", + "ramdisk", + NULL +}; +const PCWSTR AdapterTypes_U[] = +{ + L"eisa", + L"scsi", + L"multi", + L"net", + L"ramdisk", + NULL +}; + +/* Supported controller types */ +typedef enum _CONTROLLER_TYPE +{ + DiskController, + CdRomController, + ControllerTypeMax +} CONTROLLER_TYPE, *PCONTROLLER_TYPE; +const PCSTR ControllerTypes_A[] = +{ + "disk", + "cdrom", + NULL +}; +const PCWSTR ControllerTypes_U[] = +{ + L"disk", + L"cdrom", + NULL +}; + +/* Supported peripheral types */ +typedef enum _PERIPHERAL_TYPE +{ +// VDiskPeripheral, + RDiskPeripheral, + FDiskPeripheral, + CdRomPeripheral, + PeripheralTypeMax +} PERIPHERAL_TYPE, *PPERIPHERAL_TYPE; +const PCSTR PeripheralTypes_A[] = +{ +// "vdisk", // Enable this when we'll support boot from virtual disks! + "rdisk", + "fdisk", + "cdrom", + NULL +}; +const PCWSTR PeripheralTypes_U[] = +{ +// L"vdisk", // Enable this when we'll support boot from virtual disks! + L"rdisk", + L"fdisk", + L"cdrom", + NULL +}; + + +/* FUNCTIONS ****************************************************************/ + +PCSTR +ArcGetNextTokenA( + IN PCSTR ArcPath, + OUT PANSI_STRING TokenSpecifier, + OUT PULONG Key) +{ + HRESULT hr; + PCSTR p = ArcPath; + ULONG SpecifierLength; + ULONG KeyValue; + + /* + * We must have a valid "specifier(key)" string, where 'specifier' + * cannot be the empty string, and is followed by '('. + */ + p = strchr(p, '('); + if (p == NULL) + return NULL; /* No '(' found */ + if (p == ArcPath) + return NULL; /* Path starts with '(' and is thus invalid */ + + SpecifierLength = (p - ArcPath) * sizeof(CHAR); + + /* + * The strtoul function skips any leading whitespace. + * + * Note that if the token is "specifier()" then strtoul won't perform + * any conversion and return 0, therefore effectively making the token + * equivalent to "specifier(0)", as it should be. + */ + // KeyValue = atoi(p); + KeyValue = strtoul(p, (PSTR*)&p, 10); + + /* Skip any trailing whitespace */ + while (*p && isspace(*p)) ++p; + + /* The token must terminate with ')' */ + if (*p != ')') + return NULL; +#if 0 + p = strchr(p, ')'); + if (p == NULL) + return NULL; +#endif + + /* We should have succeeded, copy the token specifier in the buffer */ + hr = StringCbCopyNA(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (FAILED(hr)) + return NULL; + + TokenSpecifier->Length = strlen(TokenSpecifier->Buffer) * sizeof(CHAR); + + /* We succeeded, return the token key value */ + *Key = KeyValue; + + /* Next token starts just after */ + return ++p; +} + +PCWSTR +ArcGetNextTokenU( + IN PCWSTR ArcPath, + OUT PUNICODE_STRING TokenSpecifier, + OUT PULONG Key) +{ + HRESULT hr; + PCWSTR p = ArcPath; + ULONG SpecifierLength; + ULONG KeyValue; + + /* + * We must have a valid "specifier(key)" string, where 'specifier' + * cannot be the empty string, and is followed by '('. + */ + p = wcschr(p, L'('); + if (p == NULL) + return NULL; /* No '(' found */ + if (p == ArcPath) + return NULL; /* Path starts with '(' and is thus invalid */ + + SpecifierLength = (p - ArcPath) * sizeof(WCHAR); + + ++p; + + /* + * The strtoul function skips any leading whitespace. + * + * Note that if the token is "specifier()" then strtoul won't perform + * any conversion and return 0, therefore effectively making the token + * equivalent to "specifier(0)", as it should be. + */ + // KeyValue = _wtoi(p); + KeyValue = wcstoul(p, (PWSTR*)&p, 10); + ASSERT(p); + + /* Skip any trailing whitespace */ + while (*p && iswspace(*p)) ++p; + + /* The token must terminate with ')' */ + if (*p != L')') + return NULL; +#if 0 + p = wcschr(p, L')'); + if (p == NULL) + return NULL; +#endif + + /* We should have succeeded, copy the token specifier in the buffer */ + hr = StringCbCopyNW(TokenSpecifier->Buffer, TokenSpecifier->MaximumLength, + ArcPath, SpecifierLength); + if (FAILED(hr)) + return NULL; + + TokenSpecifier->Length = wcslen(TokenSpecifier->Buffer) * sizeof(WCHAR); + + /* We succeeded, return the token key value */ + *Key = KeyValue; + + /* Next token starts just after */ + return ++p; +} + + +ULONG +ArcMatchTokenA( + IN PCSTR CandidateToken, + IN const PCSTR* TokenTable) +{ + ULONG Index = 0; + + while (TokenTable[Index] && _stricmp(CandidateToken, TokenTable[Index]) != 0) + { + ++Index; + } + + return Index; +} + +ULONG +ArcMatchTokenU( + IN PCWSTR CandidateToken, + IN const PCWSTR* TokenTable) +{ + ULONG Index = 0; + + while (TokenTable[Index] && _wcsicmp(CandidateToken, TokenTable[Index]) != 0) + { + ++Index; + } + + return Index; +} + +ULONG +ArcMatchToken_UStr( + IN PCUNICODE_STRING CandidateToken, + IN const PCWSTR* TokenTable) +{ + ULONG Index = 0; +#if 0 + SIZE_T Length; +#else + UNICODE_STRING Token; +#endif + + while (TokenTable[Index]) + { +#if 0 + Length = wcslen(TokenTable[Index])*sizeof(WCHAR); + if (RtlCompareMemory(CandidateToken->Buffer, TokenTable[Index], Length) == Length) + break; +#else + RtlInitUnicodeString(&Token, TokenTable[Index]); + // if (RtlCompareUnicodeString(CandidateToken, &Token, TRUE) == 0) + if (RtlEqualUnicodeString(CandidateToken, &Token, TRUE)) + break; +#endif + + ++Index; + } + + return Index; +} + + +BOOLEAN +ArcPathNormalize( + OUT PUNICODE_STRING NormalizedArcPath, + IN PCWSTR ArcPath) +{ + HRESULT hr; + PCWSTR EndOfArcName; + PCWSTR p; + + if (NormalizedArcPath->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *NormalizedArcPath->Buffer = UNICODE_NULL; + NormalizedArcPath->Length = 0; + + EndOfArcName = wcschr(ArcPath, OBJ_NAME_PATH_SEPARATOR); + if (!EndOfArcName) + EndOfArcName = ArcPath + wcslen(ArcPath); + + while ((p = wcsstr(ArcPath, L"()")) && (p < EndOfArcName)) + { +#if 0 + hr = StringCbCopyNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); +#else + hr = StringCbCatNW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, + ArcPath, (p - ArcPath) * sizeof(WCHAR)); +#endif + if (FAILED(hr)) + return FALSE; + hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, L"(0)"); + if (FAILED(hr)) + return FALSE; +#if 0 + NormalizedArcPath->Buffer += wcslen(NormalizedArcPath->Buffer); +#endif + ArcPath = p + 2; + } + hr = StringCbCatW(NormalizedArcPath->Buffer, NormalizedArcPath->MaximumLength, ArcPath); + if (FAILED(hr)) + return FALSE; + + NormalizedArcPath->Length = wcslen(NormalizedArcPath->Buffer) * sizeof(WCHAR); + return TRUE; +} + + +/* + * ArcName: + * ARC name (counted string) to be resolved into a NT device name. + * The caller should have already delimited it from within an ARC path + * (usually by finding where the first path separator appears in the path). + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + */ +static NTSTATUS +ResolveArcNameNtSymLink( + OUT PUNICODE_STRING NtName, + IN PUNICODE_STRING ArcName) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DirectoryHandle, LinkHandle; + UNICODE_STRING ArcNameDir; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* Open the \ArcName object directory */ + RtlInitUnicodeString(&ArcNameDir, L"\\ArcName"); + InitializeObjectAttributes(&ObjectAttributes, + &ArcNameDir, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenDirectoryObject(&DirectoryHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenDirectoryObject(%wZ) failed, Status 0x%08lx\n", &ArcNameDir, Status); + return Status; + } + + /* Open the ARC name link */ + InitializeObjectAttributes(&ObjectAttributes, + ArcName, + OBJ_CASE_INSENSITIVE, + DirectoryHandle, + NULL); + Status = NtOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + + /* Close the \ArcName object directory handle */ + NtClose(DirectoryHandle); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + return Status; + } + + /* Reserve one WCHAR for the NULL-termination */ + NtName->MaximumLength -= sizeof(UNICODE_NULL); + + /* Resolve the link */ + Status = NtQuerySymbolicLinkObject(LinkHandle, NtName, NULL); + + /* Restore the NULL-termination */ + NtName->MaximumLength += sizeof(UNICODE_NULL); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed, don't touch NtName */ + DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + } + else + { + /* We succeeded, NULL-terminate NtName */ + NtName->Buffer[NtName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + NtClose(LinkHandle); + return Status; +} + +/* + * ArcNamePath: + * In input, pointer to an ARC path (NULL-terminated) starting by an ARC name + * to be resolved into a NT device name. + * In opposition to ResolveArcNameNtSymLink(), the caller does not have to + * delimit the ARC name from within an ARC path. The real ARC name is deduced + * after parsing the ARC path, and, in output, ArcNamePath points to the + * beginning of the path after the ARC name part. + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + * + * PartList: + * (Optional) partition list that helps in resolving the paths pointing + * to hard disks. + */ +static NTSTATUS +ResolveArcNameManually( + OUT PUNICODE_STRING NtName, + IN OUT PCWSTR* ArcNamePath, + IN PPARTLIST PartList OPTIONAL) +{ + HRESULT hr; + WCHAR TokenBuffer[50]; + UNICODE_STRING Token; + PCWSTR p, q; + ULONG AdapterKey; + ULONG ControllerKey; + ULONG PeripheralKey; + ULONG PartitionNumber; + ADAPTER_TYPE AdapterType; + CONTROLLER_TYPE ControllerType; + PERIPHERAL_TYPE PeripheralType; + BOOLEAN UseSignature = FALSE; + + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* + * The format of ArcName is: + * adapter(www)[controller(xxx)peripheral(yyy)[partition(zzz)][filepath]] , + * where the [filepath] part is not being parsed. + */ + + RtlInitEmptyUnicodeString(&Token, TokenBuffer, sizeof(TokenBuffer)); + + p = *ArcNamePath; + + /* Retrieve the adapter */ + p = ArcGetNextTokenU(p, &Token, &AdapterKey); + if (!p) + { + DPRINT1("No adapter specified!\n"); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Check for the 'signature()' pseudo-adapter, introduced in Windows 2000 */ + if (_wcsicmp(Token.Buffer, L"signature") == 0) + { + /* + * We've got a signature! Remember this for later, and set the adapter type to SCSI. + * We however check that the rest of the ARC path is valid by parsing the other tokens. + * AdapterKey stores the disk signature value (that holds in a ULONG). + */ + UseSignature = TRUE; + AdapterType = ScsiAdapter; + } + else + { + /* Check for regular adapters */ + AdapterType = (ADAPTER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, AdapterTypes_U); + if (AdapterType >= AdapterTypeMax) + { + DPRINT1("Invalid adapter type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Check for adapters that don't take any extra controller or peripheral nodes */ + if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) + { + // if (*p) + // return STATUS_OBJECT_PATH_SYNTAX_BAD; + + if (AdapterType == NetAdapter) + { + DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_NOT_SUPPORTED; + } + + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Ramdisk%lu", AdapterKey); + goto Quit; + } + } + + /* Here, we have either an 'eisa', a 'scsi/signature', or a 'multi' adapter */ + + /* Check for a valid controller */ + p = ArcGetNextTokenU(p, &Token, &ControllerKey); + if (!p) + { + DPRINT1("%S(%lu) adapter doesn't have a controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + ControllerType = (CONTROLLER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, ControllerTypes_U); + if (ControllerType >= ControllerTypeMax) + { + DPRINT1("Invalid controller type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Here the controller can only be either a disk or a CDROM */ + + /* + * Ignore the controller in case we have a 'multi' adapter. + * I guess a similar condition holds for the 'eisa' adapter too... + * + * For SignatureAdapter, as similar for ScsiAdapter, the controller key corresponds + * to the disk target ID. Note that actually, the implementation just ignores the + * target ID, as well as the LUN, and just loops over all the available disks and + * searches for the one having the correct signature. + */ + if ((AdapterType == MultiAdapter /* || AdapterType == EisaAdapter */) && ControllerKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + ControllerKey = 0; + } + + /* + * Only the 'scsi' adapter supports a direct 'cdrom' controller. + * For the others, we need a 'disk' controller to which a 'cdrom' peripheral can talk to. + */ + if ((AdapterType != ScsiAdapter) && (ControllerType == CdRomController)) + { + DPRINT1("%S(%lu) adapter cannot have a CDROM controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* Check for a valid peripheral */ + p = ArcGetNextTokenU(p, &Token, &PeripheralKey); + if (!p) + { + DPRINT1("%S(%lu)%S(%lu) adapter-controller doesn't have a peripheral!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + PeripheralType = (PERIPHERAL_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, PeripheralTypes_U); + if (PeripheralType >= PeripheralTypeMax) + { + DPRINT1("Invalid peripheral type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* + * If we had a 'cdrom' controller already, the corresponding peripheral can only be 'fdisk' + * (see for example the ARC syntax for SCSI CD-ROMs: scsi(x)cdrom(y)fdisk(z) where z == 0). + */ + if ((ControllerType == CdRomController) && (PeripheralType != FDiskPeripheral)) + { + DPRINT1("%S(%lu) controller cannot have a %S(%lu) peripheral! (note that we haven't check whether the adapter was SCSI or not)\n", + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* For a 'scsi' adapter, the possible peripherals are only 'rdisk' or 'fdisk' */ + if (AdapterType == ScsiAdapter && !(PeripheralType == RDiskPeripheral || PeripheralType == FDiskPeripheral)) + { + DPRINT1("%S(%lu)%S(%lu) SCSI adapter-controller has an invalid peripheral %S(%lu) !\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + +#if 0 + if (AdapterType == SignatureAdapter && PeripheralKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + PeripheralKey = 0; + } +#endif + + /* Check for the optional 'partition' specifier */ + q = ArcGetNextTokenU(p, &Token, &PartitionNumber); + if (q && _wcsicmp(Token.Buffer, L"partition") == 0) + { + /* We've got a partition! */ + p = q; + } + else + { + /* + * Either no other ARC token was found, or we've got something else + * (possibly invalid or not)... + */ + PartitionNumber = 0; + } + + + // TODO: Check the partition number in case of fdisks and cdroms?? + + + if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + else + /* Now, ControllerType == DiskController */ + if (PeripheralType == CdRomPeripheral) + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\CdRom%lu", PeripheralKey); + else + if (PeripheralType == FDiskPeripheral) + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Floppy%lu", PeripheralKey); + else + if (PeripheralType == RDiskPeripheral) + { + if (UseSignature) + { + /* The disk signature is stored in AdapterKey */ + DiskEntry = GetDiskBySignature(PartList, AdapterKey); + } + else + { + DiskEntry = GetDiskBySCSI(PartList, AdapterKey, + ControllerKey, PeripheralKey); + } + if (!DiskEntry) + return STATUS_OBJECT_PATH_NOT_FOUND; // STATUS_NOT_FOUND; + + if (PartitionNumber != 0) + { + PartEntry = GetPartition(DiskEntry, PartitionNumber); + if (!PartEntry) + return STATUS_OBJECT_PATH_NOT_FOUND; // STATUS_DEVICE_NOT_PARTITIONED; + ASSERT(PartEntry->DiskEntry == DiskEntry); + } + + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, PartitionNumber); + } +#if 0 + else + if (PeripheralType == VDiskPeripheral) + { + // TODO: Check how Win 7+ deals with virtual disks. + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\VirtualHarddisk%lu\\Partition%lu", + PeripheralKey, PartitionNumber); + } +#endif + +Quit: + if (FAILED(hr)) + { + /* + * We can directly cast the HRESULTs into NTSTATUS since the error codes + * returned by StringCbPrintfW: + * STRSAFE_E_INVALID_PARAMETER == 0x80070057, + * STRSAFE_E_INSUFFICIENT_BUFFER == 0x8007007a, + * do not have assigned values in the NTSTATUS space. + */ + return (NTSTATUS)hr; + } + + *ArcNamePath = p; + return STATUS_SUCCESS; +} + + +/**** FIXME: Redundant with filesup.c ! ****\ +|** (but filesup.c is not yet included in **| +\** setuplib, hence this code copy) **/ + +static +HRESULT +ConcatPaths( + IN OUT PWSTR PathElem1, + IN SIZE_T cchPathSize, + IN PCWSTR PathElem2 OPTIONAL) +{ + HRESULT hr; + SIZE_T cchPathLen; + + if (!PathElem2) + return S_OK; + if (cchPathSize <= 1) + return S_OK; + + cchPathLen = min(cchPathSize, wcslen(PathElem1)); + + if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') + { + /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ + hr = StringCchCatW(PathElem1, cchPathSize, L"\\"); + if (FAILED(hr)) + return hr; + } + else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') + { + /* PathElem2 starts with '\' and PathElem1 ends with '\' */ + while (*PathElem2 == L'\\') + ++PathElem2; // Skip any backslash + } + hr = StringCchCatW(PathElem1, cchPathSize, PathElem2); + return hr; +} + +/*******************************************/ + + +BOOLEAN +ArcPathToNtPath( + OUT PUNICODE_STRING NtPath, + IN PCWSTR ArcPath, + IN PPARTLIST PartList OPTIONAL) +{ + NTSTATUS Status; + PCWSTR BeginOfPath; + UNICODE_STRING ArcName; + + /* TODO: We should "normalize" the path, i.e. expand all the xxx() into xxx(0) */ + + if (NtPath->MaximumLength < sizeof(UNICODE_NULL)) + return FALSE; + + *NtPath->Buffer = UNICODE_NULL; + NtPath->Length = 0; + + /* + * - First, check whether the ARC path is already inside \\ArcName + * and if so, map it to the corresponding NT path. + * - Only then, if we haven't found any ArcName, try to build a + * NT path by deconstructing the ARC path, using its disk and + * partition numbers. We may use here our disk/partition list. + * + * See also freeldr/arcname.c + * + * Note that it would be nice to maintain a cache of these mappings. + */ + + /* + * Initialize the ARC name to resolve, by cutting the ARC path at the first + * NT path separator. The ARC name therefore ends where the NT path part starts. + */ + RtlInitUnicodeString(&ArcName, ArcPath); + BeginOfPath = wcschr(ArcName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (BeginOfPath) + ArcName.Length = (ULONG_PTR)BeginOfPath - (ULONG_PTR)ArcName.Buffer; + + /* Resolve the ARC name via NT SymLinks. Note that NtPath is returned NULL-terminated. */ + Status = ResolveArcNameNtSymLink(NtPath, &ArcName); + if (!NT_SUCCESS(Status)) + { + /* We failed, attempt a manual resolution */ + DPRINT1("ResolveArcNameNtSymLink(ArcName = '%wZ') for ArcPath = '%S' failed, Status 0x%08lx\n", &ArcName, ArcPath, Status); + + /* + * We failed at directly resolving the ARC path, and we cannot perform + * a manual resolution because we don't have any disk/partition list, + * we therefore fail here. + */ + if (!PartList) + { + DPRINT1("PartList == NULL, cannot perform a manual resolution\n"); + return FALSE; + } + + *NtPath->Buffer = UNICODE_NULL; + NtPath->Length = 0; + + BeginOfPath = ArcPath; + Status = ResolveArcNameManually(NtPath, &BeginOfPath, PartList); + if (!NT_SUCCESS(Status)) + { + /* We really failed this time, bail out */ + DPRINT1("ResolveArcNameManually(ArcPath = '%S') failed, Status 0x%08lx\n", ArcPath, Status); + return FALSE; + } + } + + /* + * We succeeded. Concatenate the rest of the system-specific path. We know the path is going + * to be inside the NT namespace, therefore we can use the path string concatenation function + * that uses '\\' as the path separator. + */ + if (BeginOfPath && *BeginOfPath) + { + HRESULT hr; + hr = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); + if (FAILED(hr)) + { + /* Buffer not large enough, or whatever...: just bail out */ + return FALSE; + } + } + NtPath->Length = wcslen(NtPath->Buffer) * sizeof(WCHAR); + return TRUE; +} + +#if 0 +PWSTR +NtPathToArcPath( + IN PWSTR NtPath) +{ + /* + * - First, check whether any of the ARC paths inside \\ArcName + * map to the corresponding NT path. If so, we are OK. + * - Only then, if we haven't found any ArcName, try to build an + * ARC path by deconstructing the NT path, using its disk and + * partition numbers. We may use here our disk/partition list. + * + * See also freeldr/arcname.c + * + * Note that it would be nice to maintain a cache of these mappings. + */ +} +#endif + +/* EOF */ diff --git a/base/setup/lib/arcname.h b/base/setup/lib/arcname.h new file mode 100644 index 0000000000..45d5b6b5c7 --- /dev/null +++ b/base/setup/lib/arcname.h @@ -0,0 +1,21 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ARC path to-and-from NT path resolver. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#pragma once + +BOOLEAN +ArcPathNormalize( + OUT PUNICODE_STRING NormalizedArcPath, + IN PCWSTR ArcPath); + +BOOLEAN +ArcPathToNtPath( + OUT PUNICODE_STRING NtPath, + IN PCWSTR ArcPath, + IN PPARTLIST PartList OPTIONAL); + +/* EOF */ diff --git a/base/setup/lib/arcname_tests.c b/base/setup/lib/arcname_tests.c new file mode 100644 index 0000000000..deba131552 --- /dev/null +++ b/base/setup/lib/arcname_tests.c @@ -0,0 +1,134 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for the arcname.c functions: + * ArcPathNormalize(), ArcPathToNtPath(). + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + * + * You may need to fix the included headers before being able to + * compile this file (this file has only been compiled under VS). + */ + +#include <stdio.h> +#include <tchar.h> +#include <conio.h> + +#define WIN32_NO_STATUS +#include <windows.h> +#include <winternl.h> +#undef WIN32_NO_STATUS + +#include <ntstatus.h> + +#include <strsafe.h> + +#include "arcname.h" + +#define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') + +int _tmain(int argc, _TCHAR* argv[]) +{ + WCHAR ArcPath[MAX_PATH] = L"multi(5)disk()rdisk(1)partition()\\ReactOS"; + WCHAR NormalizedArcPathBuffer[MAX_PATH]; + UNICODE_STRING NormalizedArcPath; + WCHAR NtPathBuffer[MAX_PATH]; + UNICODE_STRING NtPath; + + NormalizedArcPath.Buffer = NormalizedArcPathBuffer; + NormalizedArcPath.Length = 0; + NormalizedArcPath.MaximumLength = sizeof(NormalizedArcPathBuffer); + + ArcPathNormalize(&NormalizedArcPath, ArcPath); + wprintf(L"ArcPath = '%s' ; Normalized = '%wZ'\n", ArcPath, &NormalizedArcPath); + + NtPath.Buffer = NtPathBuffer; + NtPath.Length = 0; + NtPath.MaximumLength = sizeof(NtPathBuffer); + + ArcPathToNtPath(&NtPath, NormalizedArcPath.Buffer); + // wprintf(L"ArcPath = '%s' ; NtPath = '%wZ'\n", ArcPath, &NtPath); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)\\ReactOS\\system32\\ntoskrnl.exe"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)\\Foobar"); // OK but not supported + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)disk(1)\\Foobar"); // Bad + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)disk(1)rdisk(3)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)disk(1)fdisk(3)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)"); // Bad: missing fdisk + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)cdrom(0)"); // Bad: twice cdrom + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)fdisk(0)"); // OK + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(2)cdrom(1)rdisk(0)"); // Bad; cdrom controller and rdisk peripheral + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)cdrom(1)fdisk(0)"); // Bad: multi adapter cannot have cdrom controller + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)rdisk(1)cdrom(1)fdisk(0)"); // Bad: rdisk is not a controller + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)cdrom(1)fdisk(0)"); // OK (disk(1) ignored) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)rdisk(1)fdisk(0)"); // Same (and also fdisk is not considered as part of ARC path) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(2)disk(1)rdisk(1)partition(3)"); // OK (disk(1) ignored) + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + + /* All these are OK */ + ArcPathToNtPath(&NtPath, L"scsi(0)disk(3)rdisk(0)partition(1)\\OS.DIR"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"scsi(1)disk(3)rdisk(3)partition(2)\\OS\\ARCOS\\LOADER"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + + /* All these are OK */ + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)cdrom(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"ramdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"net(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(1)partition(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)rdisk(0)partition(3)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)disk(0)fdisk(1)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(1)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"eisa(0)disk(0)fdisk(0)partition(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + /* These are invalid storage ARC paths (but otherwise are valid ARC names) */ + ArcPathToNtPath(&NtPath, L"multi(0)video(0)monitor(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + ArcPathToNtPath(&NtPath, L"multi(0)key(0)keyboard(0)"); + wprintf(L"NtPath = '%wZ'\n", &NtPath); + + _getch(); + return 0; +} diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 6a4452429b..055ed5eef7 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -28,8 +28,10 @@ extern HANDLE ProcessHeap; #include "errorcode.h" #include "linklist.h" #include "ntverrsrc.h" +// #include "arcname.h" #include "fsutil.h" #include "genlist.h" #include "partlist.h" +#include "arcname.h" /* EOF */

1 0

03/07: [USETUP][SETUPLIB] Move all the code that retrieves the version resources from PE executable, out of osdetect.c, and place it in its own module inside the SetupLib.
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1741a07cfa267bda77f3… commit b1741a07cfa267bda77f32e5b019908b76187f94 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:41:04 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:58 2018 +0200 [USETUP][SETUPLIB] Move all the code that retrieves the version resources from PE executable, out of osdetect.c, and place it in its own module inside the SetupLib. Remove also some commented headers in precomp.h. svn path=/branches/setup_improvements/; revision=74618 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/ntverrsrc.c | 193 ++++++++++++++++++++++++++++++++++++++++++ base/setup/lib/ntverrsrc.h | 23 +++++ base/setup/lib/precomp.h | 5 -- base/setup/lib/setuplib.h | 1 + base/setup/usetup/osdetect.c | 180 --------------------------------------- 6 files changed, 218 insertions(+), 185 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index e44b2f71c7..258a14b03c 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE fsutil.c genlist.c + ntverrsrc.c partlist.c precomp.h) diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/ntverrsrc.c new file mode 100644 index 0000000000..e788e12b12 --- /dev/null +++ b/base/setup/lib/ntverrsrc.c @@ -0,0 +1,193 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Version Resource Management API + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + * + * NOTE 1: Adapted from Wine-synced dll/win32/version DLL. + * NOTE 2: We only deal with 32-bit PE executables. + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include <ndk/ldrtypes.h> +#include <ndk/ldrfuncs.h> + +#include "ntverrsrc.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL) +{ +// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h +#define VS_VERSION_INFO 1 // See psdk/verrsrc.h +#define VS_FILE_INFO RT_VERSION + + NTSTATUS Status; + LDR_RESOURCE_INFO ResourceInfo; + PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; + PVOID Data = NULL; + ULONG Size = 0; + + /* Try to find the resource */ + ResourceInfo.Type = 16; // RT_VERSION; + ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); + ResourceInfo.Language = 0; // Don't care about the language + + Status = LdrFindResource_U(BaseAddress, + &ResourceInfo, + RESOURCE_DATA_LEVEL, + &ResourceDataEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); + return Status; + } + + /* Access the resource */ + Status = LdrAccessResource(BaseAddress, + ResourceDataEntry, + &Data, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); + return Status; + } + + *Resource = Data; + if (ResourceSize) *ResourceSize = Size; + + return STATUS_SUCCESS; +} + +/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ +typedef struct _VS_VERSION_INFO_STRUCT32 +{ + WORD wLength; + WORD wValueLength; + WORD wType; /* 1:Text, 0:Binary */ + WCHAR szKey[1]; +#if 0 /* variable length structure */ + /* DWORD aligned */ + BYTE Value[]; + /* DWORD aligned */ + VS_VERSION_INFO_STRUCT32 Children[]; +#endif +} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; +typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; + +#define DWORD_ALIGN( base, ptr ) \ + ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) + +#define VersionInfo32_Value( ver ) \ + DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) + +#define VersionInfo32_Children( ver ) \ + (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ + ( ( (ver)->wValueLength * \ + ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) + +#define VersionInfo32_Next( ver ) \ + (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) + +static PCVS_VERSION_INFO_STRUCT32 +VersionInfo32_FindChild( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR szKey, + IN UINT cbKey) +{ + PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); + + while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) + { + if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + return child; + + if (child->wLength == 0) return NULL; + child = VersionInfo32_Next(child); + } + + return NULL; +} + +static NTSTATUS +VersionInfo32_QueryValue( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen OPTIONAL, + OUT BOOL* pbText OPTIONAL) +{ + PCWSTR lpNextSlash; + + DPRINT("lpSubBlock : (%S)\n", lpSubBlock); + + while (*lpSubBlock) + { + /* Find next path component */ + for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) + { + if (*lpNextSlash == '\\') + break; + } + + /* Skip empty components */ + if (lpNextSlash == lpSubBlock) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); + if (!info) + { + if (puLen) *puLen = 0; + return STATUS_RESOURCE_TYPE_NOT_FOUND; + } + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = (PVOID)VersionInfo32_Value(info); + if (puLen) + *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; + + return STATUS_SUCCESS; +} + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen) +{ + PCVS_VERSION_INFO_STRUCT32 info = pBlock; + + DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); + + if (!pBlock) + return FALSE; + + if (!lpSubBlock || !*lpSubBlock) + lpSubBlock = L"\\"; + + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); +} + +/* EOF */ diff --git a/base/setup/lib/ntverrsrc.h b/base/setup/lib/ntverrsrc.h new file mode 100644 index 0000000000..9ef5b0065e --- /dev/null +++ b/base/setup/lib/ntverrsrc.h @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT Version Resource Management API + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#pragma once + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL); + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen); + +/* EOF */ diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index 1f84862e1b..ea82da4f39 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -32,11 +32,6 @@ /* Filesystem headers */ #include <reactos/rosioctl.h> // For extra partition IDs -/** For FileSystems **/ -// #include <fslib/vfatlib.h> -// #include <fslib/ext2lib.h> -// // #include <fslib/ntfslib.h> - // ///* Internal Headers */ //#include "interface/consup.h" diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index f9ed75ebda..6a4452429b 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -27,6 +27,7 @@ extern HANDLE ProcessHeap; #include "errorcode.h" #include "linklist.h" +#include "ntverrsrc.h" #include "fsutil.h" #include "genlist.h" #include "partlist.h" diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c index 60fd7ef644..23f1dee7a9 100644 --- a/base/setup/usetup/osdetect.c +++ b/base/setup/usetup/osdetect.c @@ -8,9 +8,6 @@ #include "usetup.h" -#include <ndk/ldrtypes.h> -#include <ndk/ldrfuncs.h> - // HACK! #include <strsafe.h> @@ -26,183 +23,6 @@ extern PPARTLIST PartitionList; static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; -/* VERSION RESOURCE API ******************************************************/ - -/* - * NT-oriented version resource management, adapted from dll/win32/version. - * We only deal with 32-bit PE executables. - */ - -NTSTATUS -NtGetVersionResource( - IN PVOID BaseAddress, - OUT PVOID* Resource, - OUT PULONG ResourceSize OPTIONAL) -{ -// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h -#define VS_VERSION_INFO 1 // See psdk/verrsrc.h -#define VS_FILE_INFO RT_VERSION - - NTSTATUS Status; - LDR_RESOURCE_INFO ResourceInfo; - PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; - PVOID Data = NULL; - ULONG Size = 0; - - /* Try to find the resource */ - ResourceInfo.Type = 16; // RT_VERSION; - ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); - ResourceInfo.Language = 0; // Don't care about the language - - Status = LdrFindResource_U(BaseAddress, - &ResourceInfo, - RESOURCE_DATA_LEVEL, - &ResourceDataEntry); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); - return Status; - } - - /* Access the resource */ - Status = LdrAccessResource(BaseAddress, - ResourceDataEntry, - &Data, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); - return Status; - } - - *Resource = Data; - if (ResourceSize) *ResourceSize = Size; - - return STATUS_SUCCESS; -} - -/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ -typedef struct _VS_VERSION_INFO_STRUCT32 -{ - WORD wLength; - WORD wValueLength; - WORD wType; /* 1:Text, 0:Binary */ - WCHAR szKey[1]; -#if 0 /* variable length structure */ - /* DWORD aligned */ - BYTE Value[]; - /* DWORD aligned */ - VS_VERSION_INFO_STRUCT32 Children[]; -#endif -} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; -typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; - -#define DWORD_ALIGN( base, ptr ) \ - ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) - -#define VersionInfo32_Value( ver ) \ - DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) - -#define VersionInfo32_Children( ver ) \ - (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ - ( ( (ver)->wValueLength * \ - ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) - -#define VersionInfo32_Next( ver ) \ - (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) - -static PCVS_VERSION_INFO_STRUCT32 -VersionInfo32_FindChild( - IN PCVS_VERSION_INFO_STRUCT32 info, - IN PCWSTR szKey, - IN UINT cbKey) -{ - PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); - - while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) - { - if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) - return child; - - if (child->wLength == 0) return NULL; - child = VersionInfo32_Next(child); - } - - return NULL; -} - -static NTSTATUS -VersionInfo32_QueryValue( - IN PCVS_VERSION_INFO_STRUCT32 info, - IN PCWSTR lpSubBlock, - OUT PVOID* lplpBuffer, - OUT PUINT puLen OPTIONAL, - OUT BOOL* pbText OPTIONAL) -{ - PCWSTR lpNextSlash; - - DPRINT("lpSubBlock : (%S)\n", lpSubBlock); - - while (*lpSubBlock) - { - /* Find next path component */ - for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) - { - if (*lpNextSlash == '\\') - break; - } - - /* Skip empty components */ - if (lpNextSlash == lpSubBlock) - { - lpSubBlock++; - continue; - } - - /* We have a non-empty component: search info for key */ - info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); - if (!info) - { - if (puLen) *puLen = 0; - return STATUS_RESOURCE_TYPE_NOT_FOUND; - } - - /* Skip path component */ - lpSubBlock = lpNextSlash; - } - - /* Return value */ - *lplpBuffer = (PVOID)VersionInfo32_Value(info); - if (puLen) - *puLen = info->wValueLength; - if (pbText) - *pbText = info->wType; - - return STATUS_SUCCESS; -} - -NTSTATUS -NtVerQueryValue( - IN const VOID* pBlock, - IN PCWSTR lpSubBlock, - OUT PVOID* lplpBuffer, - OUT PUINT puLen) -{ - PCVS_VERSION_INFO_STRUCT32 info = pBlock; - - DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); - - if (!pBlock) - return FALSE; - - if (!lpSubBlock || !*lpSubBlock) - lpSubBlock = L"\\"; - - return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); -} - - - /* FUNCTIONS ****************************************************************/ #if 0

1 0

02/07: [USETUP] PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They will be used in the subsequent commits.
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c76ce526c88811e35b8f… commit 2c76ce526c88811e35b8fbfc43a2c04f33b7e6bc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:36:13 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:58 2018 +0200 [USETUP] PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They will be used in the subsequent commits. svn path=/branches/setup_improvements/; revision=74617 --- base/setup/lib/partlist.c | 249 ++++++++++++++++++++++++++++++++++++++++------ base/setup/lib/partlist.h | 39 +++++++- 2 files changed, 258 insertions(+), 30 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 9861c241f8..d2d3f36768 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -1067,6 +1067,21 @@ AddDiskToList( DiskEntry->Id = ScsiAddress.TargetId; GetDriverName(DiskEntry); + /* + * Actually it would be more correct somehow to use: + * + * OBJECT_NAME_INFORMATION NameInfo; // ObjectNameInfo; + * ULONG ReturnedLength; + * + * Status = NtQueryObject(SomeHandleToTheDisk, + * ObjectNameInformation, + * &NameInfo, + * sizeof(NameInfo), + * &ReturnedLength); + * etc... + * + * See examples in https://git.reactos.org/?p=reactos.git;a=blob;f=reactos/ntoskrnl/io/iomgr/e… + */ InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); @@ -1329,53 +1344,229 @@ DestroyPartitionList( RtlFreeHeap(ProcessHeap, 0, List); } -// -// FIXME: This function is COMPLETELY BROKEN!!!! -// -BOOLEAN -SelectPartition( +PDISKENTRY +GetDiskByBiosNumber( IN PPARTLIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber) + IN ULONG BiosDiskNumber) { PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - PLIST_ENTRY Entry1, Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return FALSE; + return NULL; - /* Check for first usable entry on next disk */ - Entry1 = List->CurrentDisk->ListEntry.Flink; - while (Entry1 != &List->DiskListHead) + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) { - DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->BiosDiskNumber == BiosDiskNumber) + { + /* Disk found */ + return DiskEntry; + } + } + + /* Disk not found, stop there */ + return NULL; +} + +PDISKENTRY +GetDiskByNumber( + IN PPARTLIST List, + IN ULONG DiskNumber) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; if (DiskEntry->DiskNumber == DiskNumber) { - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + /* Disk found */ + return DiskEntry; + } + } - if (PartEntry->PartitionNumber == PartitionNumber) - { - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - return TRUE; - } + /* Disk not found, stop there */ + return NULL; +} - Entry2 = Entry2->Flink; - } +PDISKENTRY +GetDiskBySCSI( + IN PPARTLIST List, + IN USHORT Port, + IN USHORT Bus, + IN USHORT Id) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; - return FALSE; + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->Port == Port && + DiskEntry->Bus == Bus && + DiskEntry->Id == Id) + { + /* Disk found */ + return DiskEntry; } + } - Entry1 = Entry1->Flink; + /* Disk not found, stop there */ + return NULL; +} + +PDISKENTRY +GetDiskBySignature( + IN PPARTLIST List, + IN ULONG Signature) +{ + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + + /* Check for empty disks */ + if (IsListEmpty(&List->DiskListHead)) + return NULL; + + /* Loop over the disks and find the correct one */ + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + if (DiskEntry->LayoutBuffer->Signature == Signature) + { + /* Disk found */ + return DiskEntry; + } } - return FALSE; + /* Disk not found, stop there */ + return NULL; +} + +PPARTENTRY +GetPartition( + // IN PPARTLIST List, + IN PDISKENTRY DiskEntry, + IN ULONG PartitionNumber) +{ + PPARTENTRY PartEntry; + PLIST_ENTRY Entry; + + /* Disk found, loop over the primary partitions first... */ + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + Entry = Entry->Flink; + + if (PartEntry->PartitionNumber == PartitionNumber) + { + /* Partition found */ + return PartEntry; + } + } + + /* ... then over the logical partitions if needed */ + Entry = DiskEntry->LogicalPartListHead.Flink; + while (Entry != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + Entry = Entry->Flink; + + if (PartEntry->PartitionNumber == PartitionNumber) + { + /* Partition found */ + return PartEntry; + } + } + + /* The partition was not found on the disk, stop there */ + return NULL; +} + +BOOLEAN +GetDiskOrPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber OPTIONAL, + OUT PDISKENTRY* pDiskEntry, + OUT PPARTENTRY* pPartEntry OPTIONAL) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + /* Find the disk */ + DiskEntry = GetDiskByNumber(List, DiskNumber); + if (!DiskEntry) + return FALSE; + + /* If we have a partition (PartitionNumber != 0), find it */ + if (PartitionNumber != 0) + { + PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); + if (!PartEntry) + return FALSE; + ASSERT(PartEntry->DiskEntry == DiskEntry); + } + + /* Return the disk (and optionally the partition) */ + *pDiskEntry = DiskEntry; + if (pPartEntry) *pPartEntry = PartEntry; + return TRUE; +} + +// +// NOTE: Was introduced broken in r6258 by Casper +// +BOOLEAN +SelectPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + DiskEntry = GetDiskByNumber(List, DiskNumber); + if (!DiskEntry) + return FALSE; + + PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); + if (!PartEntry) + return FALSE; + + ASSERT(PartEntry->DiskEntry == DiskEntry); + ASSERT(DiskEntry->DiskNumber == DiskNumber); + ASSERT(PartEntry->PartitionNumber == PartitionNumber); + + List->CurrentDisk = DiskEntry; + List->CurrentPartition = PartEntry; + return TRUE; } PPARTENTRY diff --git a/base/setup/lib/partlist.h b/base/setup/lib/partlist.h index 5d2b62535f..d23642731b 100644 --- a/base/setup/lib/partlist.h +++ b/base/setup/lib/partlist.h @@ -87,11 +87,12 @@ typedef struct _DISKENTRY /* BIOS parameters */ BOOLEAN BiosFound; ULONG BiosDiskNumber; -// ULONG Signature; +// ULONG Signature; // Obtained from LayoutBuffer->Signature // ULONG Checksum; /* SCSI parameters */ ULONG DiskNumber; +// SCSI_ADDRESS; USHORT Port; USHORT Bus; USHORT Id; @@ -217,6 +218,42 @@ VOID DestroyPartitionList( IN PPARTLIST List); +PDISKENTRY +GetDiskByBiosNumber( + IN PPARTLIST List, + IN ULONG BiosDiskNumber); + +PDISKENTRY +GetDiskByNumber( + IN PPARTLIST List, + IN ULONG DiskNumber); + +PDISKENTRY +GetDiskBySCSI( + IN PPARTLIST List, + IN USHORT Port, + IN USHORT Bus, + IN USHORT Id); + +PDISKENTRY +GetDiskBySignature( + IN PPARTLIST List, + IN ULONG Signature); + +PPARTENTRY +GetPartition( + // IN PPARTLIST List, + IN PDISKENTRY DiskEntry, + IN ULONG PartitionNumber); + +BOOLEAN +GetDiskOrPartition( + IN PPARTLIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber OPTIONAL, + OUT PDISKENTRY* pDiskEntry, + OUT PPARTENTRY* pPartEntry OPTIONAL); + BOOLEAN SelectPartition( IN PPARTLIST List,

1 0

01/07: [USETUP] Introduce an NT OS installation detector: a functionality that attempts to detect installations of NT 5.x operating systems (MS Windows <= 2k3, ReactOS).
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b76fa3412122ade2b95f8… commit b76fa3412122ade2b95f8b05b7110f84db6d65bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 13 16:13:19 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 18:00:44 2018 +0200 [USETUP] Introduce an NT OS installation detector: a functionality that attempts to detect installations of NT 5.x operating systems (MS Windows <= 2k3, ReactOS). The aim is to use this detector to be able to detect and select an existing installation of ReactOS for upgrading. The user then could either select one, or skip this step and perform a regular ReactOS installation. What remains to be done, is to parse the NTOS loader configuration files (freeldr.ini in ReactOS' case, or boot.ini in Win2k3's case, etc...) to retrieve the actual installation paths. So far these are currently hardcoded for testing purposes only. The detector attempts to distinguish between ReactOS and Windows installations by checking at the company name vendor of the ntoskrnl.exe & ntdll.dll files, so that only ReactOS installations are allowed to be upgraded. svn path=/branches/setup_improvements/; revision=74527 svn path=/branches/setup_improvements/; revision=74550 --- base/setup/usetup/CMakeLists.txt | 1 + base/setup/usetup/osdetect.c | 834 +++++++++++++++++++++++++++++++++++++++ base/setup/usetup/osdetect.h | 22 ++ base/setup/usetup/usetup.h | 1 + 4 files changed, 858 insertions(+) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 69d1e6b4e3..714182e7e7 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE inicache.c keytrans.c mui.c + osdetect.c partlist.c progress.c registry.c diff --git a/base/setup/usetup/osdetect.c b/base/setup/usetup/osdetect.c new file mode 100644 index 0000000000..60fd7ef644 --- /dev/null +++ b/base/setup/usetup/osdetect.c @@ -0,0 +1,834 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * operating systems detection code. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#include "usetup.h" + +#include <ndk/ldrtypes.h> +#include <ndk/ldrfuncs.h> + +// HACK! +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +extern PPARTLIST PartitionList; + +/* Language-independent Vendor strings */ +static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; + + +/* VERSION RESOURCE API ******************************************************/ + +/* + * NT-oriented version resource management, adapted from dll/win32/version. + * We only deal with 32-bit PE executables. + */ + +NTSTATUS +NtGetVersionResource( + IN PVOID BaseAddress, + OUT PVOID* Resource, + OUT PULONG ResourceSize OPTIONAL) +{ +// #define RT_VERSION MAKEINTRESOURCE(16) // See winuser.h +#define VS_VERSION_INFO 1 // See psdk/verrsrc.h +#define VS_FILE_INFO RT_VERSION + + NTSTATUS Status; + LDR_RESOURCE_INFO ResourceInfo; + PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; + PVOID Data = NULL; + ULONG Size = 0; + + /* Try to find the resource */ + ResourceInfo.Type = 16; // RT_VERSION; + ResourceInfo.Name = VS_VERSION_INFO; // MAKEINTRESOURCEW(VS_VERSION_INFO); + ResourceInfo.Language = 0; // Don't care about the language + + Status = LdrFindResource_U(BaseAddress, + &ResourceInfo, + RESOURCE_DATA_LEVEL, + &ResourceDataEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Version resource not found, Status 0x%08lx\n", Status); + return Status; + } + + /* Access the resource */ + Status = LdrAccessResource(BaseAddress, + ResourceDataEntry, + &Data, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetVersionResource: Cannot access Version resource, Status 0x%08lx\n", Status); + return Status; + } + + *Resource = Data; + if (ResourceSize) *ResourceSize = Size; + + return STATUS_SUCCESS; +} + +/* NOTE: the xxx_STRUCT16 version differs by storing strings in ANSI, not in UNICODE */ +typedef struct _VS_VERSION_INFO_STRUCT32 +{ + WORD wLength; + WORD wValueLength; + WORD wType; /* 1:Text, 0:Binary */ + WCHAR szKey[1]; +#if 0 /* variable length structure */ + /* DWORD aligned */ + BYTE Value[]; + /* DWORD aligned */ + VS_VERSION_INFO_STRUCT32 Children[]; +#endif +} VS_VERSION_INFO_STRUCT32, *PVS_VERSION_INFO_STRUCT32; +typedef const VS_VERSION_INFO_STRUCT32 *PCVS_VERSION_INFO_STRUCT32; + +#define DWORD_ALIGN( base, ptr ) \ + ( (ULONG_PTR)(base) + ((((ULONG_PTR)(ptr) - (ULONG_PTR)(base)) + 3) & ~3) ) + +#define VersionInfo32_Value( ver ) \ + DWORD_ALIGN( (ver), (ver)->szKey + wcslen((ver)->szKey) + 1 ) + +#define VersionInfo32_Children( ver ) \ + (PCVS_VERSION_INFO_STRUCT32)( VersionInfo32_Value( ver ) + \ + ( ( (ver)->wValueLength * \ + ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) + +#define VersionInfo32_Next( ver ) \ + (PVS_VERSION_INFO_STRUCT32)( (ULONG_PTR)ver + (((ver)->wLength + 3) & ~3) ) + +static PCVS_VERSION_INFO_STRUCT32 +VersionInfo32_FindChild( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR szKey, + IN UINT cbKey) +{ + PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); + + while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) + { + if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + return child; + + if (child->wLength == 0) return NULL; + child = VersionInfo32_Next(child); + } + + return NULL; +} + +static NTSTATUS +VersionInfo32_QueryValue( + IN PCVS_VERSION_INFO_STRUCT32 info, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen OPTIONAL, + OUT BOOL* pbText OPTIONAL) +{ + PCWSTR lpNextSlash; + + DPRINT("lpSubBlock : (%S)\n", lpSubBlock); + + while (*lpSubBlock) + { + /* Find next path component */ + for (lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++) + { + if (*lpNextSlash == '\\') + break; + } + + /* Skip empty components */ + if (lpNextSlash == lpSubBlock) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo32_FindChild(info, lpSubBlock, lpNextSlash - lpSubBlock); + if (!info) + { + if (puLen) *puLen = 0; + return STATUS_RESOURCE_TYPE_NOT_FOUND; + } + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = (PVOID)VersionInfo32_Value(info); + if (puLen) + *puLen = info->wValueLength; + if (pbText) + *pbText = info->wType; + + return STATUS_SUCCESS; +} + +NTSTATUS +NtVerQueryValue( + IN const VOID* pBlock, + IN PCWSTR lpSubBlock, + OUT PVOID* lplpBuffer, + OUT PUINT puLen) +{ + PCVS_VERSION_INFO_STRUCT32 info = pBlock; + + DPRINT("%s (%p, %S, %p, %p)\n", __FUNCTION__, pBlock, lpSubBlock, lplpBuffer, puLen); + + if (!pBlock) + return FALSE; + + if (!lpSubBlock || !*lpSubBlock) + lpSubBlock = L"\\"; + + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL); +} + + + +/* FUNCTIONS ****************************************************************/ + +#if 0 + +BOOL IsWindowsOS(VOID) +{ + // TODO: + // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, + // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, + // check the REG_SZ value "ProductName" and see whether it's "Windows" + // or "ReactOS". One may also check the REG_SZ "CurrentVersion" value, + // the REG_SZ "SystemRoot" and "PathName" values (what are the differences??). + // + // Optionally, looking at the SYSTEM hive, CurrentControlSet\\Control, + // REG_SZ values "SystemBootDevice" (and "FirmwareBootDevice" ??)... + // + + /* ReactOS reports as Windows NT 5.2 */ + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + LONG ret; + DWORD dwType = 0, dwBufSize = 0; + + ret = RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, NULL, &dwBufSize); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + LPTSTR lpszProductName = (LPTSTR)MemAlloc(0, dwBufSize); + RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, (LPBYTE)lpszProductName, &dwBufSize); + + bIsWindowsOS = (FindSubStrI(lpszProductName, _T("Windows")) != NULL); + + MemFree(lpszProductName); + } + + RegCloseKey(hKey); + } + + return bIsWindowsOS; +} + +#endif + +typedef enum _NTOS_BOOT_LOADER_TYPE +{ + FreeLdr, // ReactOS' FreeLDR + NtLdr, // Windows <= 2k3 NTLDR +// BootMgr, // Vista+ BCD-oriented BOOTMGR +} NTOS_BOOT_LOADER_TYPE; + +typedef struct _NTOS_BOOT_LOADER_FILES +{ + NTOS_BOOT_LOADER_TYPE Type; + PCWSTR LoaderExecutable; + PCWSTR LoaderConfigurationFile; + // EnumerateInstallations; +} NTOS_BOOT_LOADER_FILES, *PNTOS_BOOT_LOADER_FILES; + +// Question 1: What if config file is optional? +// Question 2: What if many config files are possible? +NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = +{ + {FreeLdr, L"freeldr.sys", L"freeldr.ini"}, + {NtLdr , L"ntldr" , L"boot.ini"}, + {NtLdr , L"setupldr" , L"txtsetup.sif"}, +// {BootMgr, L"bootmgr" , ???} +}; + +#if 0 + +static VOID +EnumerateInstallationsFreeLdr() +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHESECTION IniSection; + PINICACHESECTION OsIniSection; + WCHAR SectionName[80]; + WCHAR OsName[80]; + WCHAR SystemPath[200]; + WCHAR SectionName2[200]; + PWCHAR KeyData; + ULONG i,j; + + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoad(&IniCache, IniPath, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* NOTE that we enumerate all the valid installations, not just the default one */ + while (TRUE) + { + Status = IniCacheGetKey(IniSection, SectionName, &KeyData); + if (!NT_SUCCESS(Status)) + break; + + // TODO some foobaring... + + // TODO 2 : Remind the entry name so that we may display it as available installation... + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName2); + if (OsIniSection != NULL) + { + BOOLEAN UseExistingEntry = TRUE; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + + if (UseExistingEntry) + { + /* BootType is Windows2003. Now check SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); + if (NT_SUCCESS(Status)) + { + swprintf(SystemPath, L"\"%s\"", ArcPath); + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, ArcPath) != 0) && + (_wcsicmp(KeyData, SystemPath) != 0) )) + { + /* This entry is a ReactOS entry, but the SystemRoot + does not match the one we are looking for. */ + UseExistingEntry = FALSE; + } + } + else + { + UseExistingEntry = FALSE; + } + } + } + } + + IniCacheDestroy(IniCache); +} + +#endif + + +/* + * FindSubStrI(PCWSTR str, PCWSTR strSearch) : + * Searches for a sub-string 'strSearch' inside 'str', similarly to what + * wcsstr(str, strSearch) does, but ignores the case during the comparisons. + */ +PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +{ + PWSTR cp = (PWSTR)str; + PWSTR s1, s2; + + if (!*strSearch) + return (PWSTR)str; + + while (*cp) + { + s1 = cp; + s2 = (PWSTR)strSearch; + + while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) + ++s1, ++s2; + + if (!*s2) + return cp; + + ++cp; + } + + return NULL; +} + +static BOOLEAN +CheckForValidPEAndVendor( + IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName, // OPTIONAL + IN PCWSTR VendorName // Better would be OUT PCWSTR*, and the function returning NTSTATUS ? + ) +{ + BOOLEAN Success = FALSE; + NTSTATUS Status; + HANDLE FileHandle, SectionHandle; + // SIZE_T ViewSize; + PVOID ViewBase; + PVOID VersionBuffer = NULL; // Read-only + PVOID pvData = NULL; + UINT BufLen = 0; + + Status = OpenAndMapFile(RootDirectory, PathName, FileName, + &FileHandle, &SectionHandle, &ViewBase); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open and map file %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; // Status; + } + + /* Make sure it's a valid PE file */ + if (!RtlImageNtHeader(ViewBase)) + { + DPRINT1("File %wZ does not seem to be a valid PE, bail out\n", &FileName); + Status = STATUS_INVALID_IMAGE_FORMAT; + goto UnmapFile; + } + + /* + * Search for a valid executable version and vendor. + * NOTE: The module is loaded as a data file, it should be marked as such. + */ + Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); + goto UnmapFile; + } + + Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); + if (NT_SUCCESS(Status)) + { + USHORT wCodePage = 0, wLangID = 0; + WCHAR FileInfo[MAX_PATH]; + UNICODE_STRING Vendor; + + wCodePage = LOWORD(*(ULONG*)pvData); + wLangID = HIWORD(*(ULONG*)pvData); + + StringCchPrintfW(FileInfo, ARRAYSIZE(FileInfo), + L"StringFileInfo\\%04X%04X\\CompanyName", + wCodePage, wLangID); + + Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); + if (NT_SUCCESS(Status) && pvData) + { + /* BufLen includes the NULL terminator count */ + RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); + Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); + + DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); + + Success = !!FindSubStrI(pvData, VendorName); + } + else + { + DPRINT1("No version vendor found for file %wZ\n", &FileName); + } + } + +UnmapFile: + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + + return Success; +} + +static BOOLEAN +IsValidNTOSInstallation( + IN HANDLE PartitionHandle, + IN PCWSTR SystemRoot) +{ + BOOLEAN Success = FALSE; + USHORT i; + WCHAR PathBuffer[MAX_PATH]; + + // DoesPathExist(PartitionHandle, SystemRoot, L"System32\\"); etc... + + /* Check for the existence of \SystemRoot\System32 */ + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\"); + if (!DoesPathExist(PartitionHandle, PathBuffer)) + { + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + + /* Check for the existence of \SystemRoot\System32\drivers */ + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\drivers\\"); + if (!DoesPathExist(PartitionHandle, PathBuffer)) + { + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + + /* Check for the existence of \SystemRoot\System32\config */ + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\config\\"); + if (!DoesPathExist(PartitionHandle, PathBuffer)) + { + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + +#if 0 + /* + * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config + * (but we don't check here whether they are actually valid). + */ + if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SYSTEM")) + { + // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } + if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SOFTWARE")) + { + // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + return FALSE; + } +#endif + + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) + { + /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and verify its version */ + Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntoskrnl.exe", KnownVendors[i]); + + /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ + + /* Check for the existence of \SystemRoot\System32\ntdll.dll */ + Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntdll.dll", KnownVendors[i]); + + /* We have found a correct vendor combination */ + if (Success) + break; + } + + return Success; +} + +static VOID +ListNTOSInstalls( + IN PGENERIC_LIST List) +{ + PGENERIC_LIST_ENTRY Entry; + PNTOS_INSTALLATION NtOsInstall; + ULONG NtOsInstallsCount = GetNumberOfListEntries(List); + + DPRINT1("There %s %d installation%s detected:\n", + NtOsInstallsCount >= 2 ? "are" : "is", + NtOsInstallsCount, + NtOsInstallsCount >= 2 ? "s" : ""); + + Entry = GetFirstListEntry(List); + while (Entry) + { + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); + Entry = GetNextListEntry(Entry); + + DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot %S\n", + NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, + NtOsInstall->InstallationName, NtOsInstall->SystemRoot); + } + + DPRINT1("Done.\n"); +} + +static PNTOS_INSTALLATION +FindExistingNTOSInstall( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot) +{ + PGENERIC_LIST_ENTRY Entry; + PNTOS_INSTALLATION NtOsInstall; + + Entry = GetFirstListEntry(List); + while (Entry) + { + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); + Entry = GetNextListEntry(Entry); + + if (NtOsInstall->DiskNumber == DiskNumber && + NtOsInstall->PartitionNumber == PartitionNumber && + _wcsicmp(NtOsInstall->SystemRoot, SystemRoot) == 0) + { + /* Found it! */ + return NtOsInstall; + } + } + + return NULL; +} + +static PNTOS_INSTALLATION +AddNTOSInstallation( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber, + IN PCWSTR SystemRoot, + IN PCWSTR InstallationName) +{ + PNTOS_INSTALLATION NtOsInstall; + CHAR InstallNameA[MAX_PATH]; + + /* Is there already any installation with these settings? */ + NtOsInstall = FindExistingNTOSInstall(List, DiskNumber, PartitionNumber, SystemRoot); + if (NtOsInstall) + { + DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot %S\n", + NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, NtOsInstall->SystemRoot); + return NtOsInstall; + } + + /* None was found, so add a new one */ + NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*NtOsInstall)); + if (!NtOsInstall) + return NULL; + + NtOsInstall->DiskNumber = DiskNumber; + NtOsInstall->PartitionNumber = PartitionNumber; + StringCchCopyW(NtOsInstall->SystemRoot, ARRAYSIZE(NtOsInstall->SystemRoot), SystemRoot); + StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); + + // Having the GENERIC_LIST storing the display item string plainly sucks... + StringCchPrintfA(InstallNameA, ARRAYSIZE(InstallNameA), "%S", InstallationName); + AppendGenericListEntry(List, InstallNameA, NtOsInstall, FALSE); + + return NtOsInstall; +} + +static VOID +FindNTOSInstallations( + IN PGENERIC_LIST List, + IN ULONG DiskNumber, + IN ULONG PartitionNumber) +{ + NTSTATUS Status; + UINT i; + HANDLE PartitionHandle, FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PartitionRootPath; + HANDLE SectionHandle; + // SIZE_T ViewSize; + PVOID ViewBase; + WCHAR PathBuffer[MAX_PATH]; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; + + /* Set PartitionRootPath */ + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskNumber, PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Open the partition */ + InitializeObjectAttributes(&ObjectAttributes, + &PartitionRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + return; + } + + /* Try to see whether we recognize some NT boot loaders */ + for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) + { + /* Check whether the loader executable exists */ + if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) + { + /* The loader does not exist, continue with another one */ + DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + continue; + } + + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + continue; + } + + /* The loader configuration file exists, interpret it to find valid installations */ + // TODO!! + DPRINT1("TODO: Analyse the OS installations inside %S !\n", NtosBootLoaders[i].LoaderConfigurationFile); + + // Here we get a SystemRootPath for each installation // FIXME! + // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... + StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"WINDOWS\\"); + if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) + { + DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", + DiskNumber, PartitionNumber, SystemRoot); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", + 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"Windows (placeholder)"); + AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); + } + + // Here we get a SystemRootPath for each installation // FIXME! + // FIXME: Do NOT hardcode the path!! But retrieve it from boot.ini etc... + StringCchCopyW(SystemRoot, ARRAYSIZE(SystemRoot), L"ReactOS\\"); + if (IsValidNTOSInstallation(PartitionHandle, SystemRoot)) + { + DPRINT1("Found a valid NTOS installation in disk #%d, partition #%d, SystemRoot %S\n", + DiskNumber, PartitionNumber, SystemRoot); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C: \\Device\\Harddisk%lu\\Partition%lu\\%s \"%s\"", + 'X' /* FIXME: Partition letter */, DiskNumber, PartitionNumber, SystemRoot, L"ReactOS (placeholder)"); + AddNTOSInstallation(List, DiskNumber, PartitionNumber, SystemRoot, InstallNameW); + } + + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + } + + /* Close the partition */ + NtClose(PartitionHandle); +} + +// static +FORCEINLINE BOOLEAN +ShouldICheckThisPartition( + IN PPARTENTRY PartEntry) +{ + if (!PartEntry) + return FALSE; + + return PartEntry->IsPartitioned && + !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ && + !PartEntry->New && + (PartEntry->FormatState == Preformatted /* || PartEntry->FormatState == Formatted */); +} + +// EnumerateNTOSInstallations +PGENERIC_LIST +CreateNTOSInstallationsList( + IN PPARTLIST PartList) +{ + PGENERIC_LIST List; + PLIST_ENTRY Entry, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + /* Loop each available disk ... */ + Entry = PartList->DiskListHead.Flink; + while (Entry != &PartList->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry = Entry->Flink; + + DPRINT1("Disk #%d\n", DiskEntry->DiskNumber); + + /* ... and for each disk, loop each available partition */ + + /* First, the primary partitions */ + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + } + + /* Then, the logical partitions (present in the extended partition) */ + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + Entry2 = Entry2->Flink; + + DPRINT1(" Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, AutoCreate = %s, FormatState = %lu -- Should I check it? %s\n", + PartEntry->PartitionNumber, PartEntry->PartitionIndex, + PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE", + PartEntry->IsPartitioned ? "TRUE" : "FALSE", + PartEntry->New ? "Yes" : "No", + PartEntry->AutoCreate ? "Yes" : "No", + PartEntry->FormatState, + ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!"); + + if (ShouldICheckThisPartition(PartEntry)) + FindNTOSInstallations(List, DiskEntry->DiskNumber, PartEntry->PartitionNumber); + } + } + + /**** Debugging: List all the collected installations ****/ + ListNTOSInstalls(List); + + return List; +} + +/* EOF */ diff --git a/base/setup/usetup/osdetect.h b/base/setup/usetup/osdetect.h new file mode 100644 index 0000000000..117681e47a --- /dev/null +++ b/base/setup/usetup/osdetect.h @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * operating systems detection code. + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +typedef struct _NTOS_INSTALLATION +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG PartitionNumber; +// Vendor???? + WCHAR SystemRoot[MAX_PATH]; +/**/WCHAR InstallationName[MAX_PATH];/**/ +} NTOS_INSTALLATION, *PNTOS_INSTALLATION; + +// EnumerateNTOSInstallations +PGENERIC_LIST +CreateNTOSInstallationsList( + IN PPARTLIST List); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 4b7d7de339..aed5dcec4c 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -70,6 +70,7 @@ #include "cabinet.h" #include "filesup.h" #include "genlist.h" +#include "osdetect.h" #include "mui.h" extern HANDLE ProcessHeap;

1 0

01/01: [NDK] Replace the SYSTEMTIME fields StandardDate and DaylightDate in RTL_TIME_ZONE_INFORMATION by TIME_FIELDs and fix resulting errors
by Eric Kohl 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=491138291348dbc72f0be… commit 491138291348dbc72f0be52cecb1459d0281d332 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 17:48:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 17:48:29 2018 +0200 [NDK] Replace the SYSTEMTIME fields StandardDate and DaylightDate in RTL_TIME_ZONE_INFORMATION by TIME_FIELDs and fix resulting errors Patch will be sent upstream. CORE-14658 --- dll/win32/kernel32/wine/timezone.c | 64 ++++++++++++++++++++++++++++++++++--- ntoskrnl/ex/sysinfo.c | 10 +++--- ntoskrnl/ex/time.c | 8 ++--- ntoskrnl/include/internal/ex.h | 4 +-- sdk/include/ndk/rtltypes.h | 29 +++-------------- sdk/include/reactos/wine/winternl.h | 32 ++++++++++--------- win32ss/user/ntuser/kbdlayout.c | 5 ++- 7 files changed, 96 insertions(+), 56 deletions(-) diff --git a/dll/win32/kernel32/wine/timezone.c b/dll/win32/kernel32/wine/timezone.c index 23c0c47302..8869848d49 100644 --- a/dll/win32/kernel32/wine/timezone.c +++ b/dll/win32/kernel32/wine/timezone.c @@ -261,13 +261,14 @@ DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) { + RTL_TIME_ZONE_INFORMATION TimeZoneInformation; NTSTATUS Status; DPRINT("GetTimeZoneInformation()\n"); Status = NtQuerySystemInformation(SystemCurrentTimeZoneInformation, - lpTimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION), + &TimeZoneInformation, + sizeof(RTL_TIME_ZONE_INFORMATION), NULL); if (!NT_SUCCESS(Status)) { @@ -275,6 +276,32 @@ GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) return TIME_ZONE_ID_INVALID; } + lpTimeZoneInformation->Bias = TimeZoneInformation.Bias; + + wcsncpy(lpTimeZoneInformation->StandardName, + TimeZoneInformation.StandardName, + ARRAYSIZE(lpTimeZoneInformation->StandardName)); + lpTimeZoneInformation->StandardDate.wYear = TimeZoneInformation.StandardDate.Year; + lpTimeZoneInformation->StandardDate.wMonth = TimeZoneInformation.StandardDate.Month; + lpTimeZoneInformation->StandardDate.wDay = TimeZoneInformation.StandardDate.Day; + lpTimeZoneInformation->StandardDate.wHour = TimeZoneInformation.StandardDate.Hour; + lpTimeZoneInformation->StandardDate.wMinute = TimeZoneInformation.StandardDate.Minute; + lpTimeZoneInformation->StandardDate.wSecond = TimeZoneInformation.StandardDate.Second; + lpTimeZoneInformation->StandardDate.wDayOfWeek = TimeZoneInformation.StandardDate.Weekday; + lpTimeZoneInformation->StandardBias = TimeZoneInformation.StandardBias; + + wcsncpy(lpTimeZoneInformation->DaylightName, + TimeZoneInformation.DaylightName, + ARRAYSIZE(lpTimeZoneInformation->DaylightName)); + lpTimeZoneInformation->DaylightDate.wYear = TimeZoneInformation.DaylightDate.Year; + lpTimeZoneInformation->DaylightDate.wMonth = TimeZoneInformation.DaylightDate.Month; + lpTimeZoneInformation->DaylightDate.wDay = TimeZoneInformation.DaylightDate.Day; + lpTimeZoneInformation->DaylightDate.wHour = TimeZoneInformation.DaylightDate.Hour; + lpTimeZoneInformation->DaylightDate.wMinute = TimeZoneInformation.DaylightDate.Minute; + lpTimeZoneInformation->DaylightDate.wSecond = TimeZoneInformation.DaylightDate.Second; + lpTimeZoneInformation->DaylightDate.wDayOfWeek = TimeZoneInformation.DaylightDate.Weekday; + lpTimeZoneInformation->DaylightBias = TimeZoneInformation.DaylightBias; + return TIME_ZoneID(lpTimeZoneInformation); } @@ -286,11 +313,38 @@ BOOL WINAPI SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) { + RTL_TIME_ZONE_INFORMATION TimeZoneInformation; NTSTATUS Status; DPRINT("SetTimeZoneInformation()\n"); - Status = RtlSetTimeZoneInformation((LPTIME_ZONE_INFORMATION)lpTimeZoneInformation); + TimeZoneInformation.Bias = lpTimeZoneInformation->Bias; + + wcsncpy(TimeZoneInformation.StandardName, + lpTimeZoneInformation->StandardName, + ARRAYSIZE(TimeZoneInformation.StandardName)); + TimeZoneInformation.StandardDate.Year = lpTimeZoneInformation->StandardDate.wYear; + TimeZoneInformation.StandardDate.Month = lpTimeZoneInformation->StandardDate.wMonth; + TimeZoneInformation.StandardDate.Day = lpTimeZoneInformation->StandardDate.wDay; + TimeZoneInformation.StandardDate.Hour = lpTimeZoneInformation->StandardDate.wHour; + TimeZoneInformation.StandardDate.Minute = lpTimeZoneInformation->StandardDate.wMinute; + TimeZoneInformation.StandardDate.Second = lpTimeZoneInformation->StandardDate.wSecond; + TimeZoneInformation.StandardDate.Weekday = lpTimeZoneInformation->StandardDate.wDayOfWeek; + TimeZoneInformation.StandardBias = lpTimeZoneInformation->StandardBias; + + wcsncpy(TimeZoneInformation.DaylightName, + lpTimeZoneInformation->DaylightName, + ARRAYSIZE(TimeZoneInformation.DaylightName)); + TimeZoneInformation.DaylightDate.Year = lpTimeZoneInformation->DaylightDate.wYear; + TimeZoneInformation.DaylightDate.Month = lpTimeZoneInformation->DaylightDate.wMonth; + TimeZoneInformation.DaylightDate.Day = lpTimeZoneInformation->DaylightDate.wDay; + TimeZoneInformation.DaylightDate.Hour = lpTimeZoneInformation->DaylightDate.wHour; + TimeZoneInformation.DaylightDate.Minute = lpTimeZoneInformation->DaylightDate.wMinute; + TimeZoneInformation.DaylightDate.Second = lpTimeZoneInformation->DaylightDate.wSecond; + TimeZoneInformation.DaylightDate.Weekday = lpTimeZoneInformation->DaylightDate.wDayOfWeek; + TimeZoneInformation.DaylightBias = lpTimeZoneInformation->DaylightBias; + + Status = RtlSetTimeZoneInformation(&TimeZoneInformation); if (!NT_SUCCESS(Status)) { DPRINT1("RtlSetTimeZoneInformation() failed (Status %lx)\n", Status); @@ -299,8 +353,8 @@ SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) } Status = NtSetSystemInformation(SystemCurrentTimeZoneInformation, - (PVOID)lpTimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION)); + (PVOID)&TimeZoneInformation, + sizeof(RTL_TIME_ZONE_INFORMATION)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetSystemInformation() failed (Status %lx)\n", Status); diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index ceb1d22842..016ac5b1d9 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1939,9 +1939,9 @@ QSI_DEF(SystemLegacyDriverInformation) /* Class 44 - Current Time Zone Information */ QSI_DEF(SystemCurrentTimeZoneInformation) { - *ReqSize = sizeof(TIME_ZONE_INFORMATION); + *ReqSize = sizeof(RTL_TIME_ZONE_INFORMATION); - if (sizeof(TIME_ZONE_INFORMATION) != Size) + if (sizeof(RTL_TIME_ZONE_INFORMATION) != Size) { return STATUS_INFO_LENGTH_MISMATCH; } @@ -1949,7 +1949,7 @@ QSI_DEF(SystemCurrentTimeZoneInformation) /* Copy the time zone information struct */ memcpy(Buffer, &ExpTimeZoneInfo, - sizeof(TIME_ZONE_INFORMATION)); + sizeof(RTL_TIME_ZONE_INFORMATION)); return STATUS_SUCCESS; } @@ -1958,12 +1958,12 @@ QSI_DEF(SystemCurrentTimeZoneInformation) SSI_DEF(SystemCurrentTimeZoneInformation) { /* Check user buffer's size */ - if (Size < sizeof(TIME_ZONE_INFORMATION)) + if (Size < sizeof(RTL_TIME_ZONE_INFORMATION)) { return STATUS_INFO_LENGTH_MISMATCH; } - return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); + return ExpSetTimeZoneInformation((PRTL_TIME_ZONE_INFORMATION)Buffer); } static diff --git a/ntoskrnl/ex/time.c b/ntoskrnl/ex/time.c index a9ae21c1ce..44ce39d9ad 100644 --- a/ntoskrnl/ex/time.c +++ b/ntoskrnl/ex/time.c @@ -18,7 +18,7 @@ /* GLOBALS ******************************************************************/ /* Note: Bias[minutes] = UTC - local time */ -TIME_ZONE_INFORMATION ExpTimeZoneInfo; +RTL_TIME_ZONE_INFORMATION ExpTimeZoneInfo; ULONG ExpLastTimeZoneBias = -1; LARGE_INTEGER ExpTimeZoneBias; ULONG ExpAltTimeZoneBias; @@ -233,7 +233,7 @@ ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) if (!NT_SUCCESS(Status)) { /* Failed, clear all data */ - RtlZeroMemory(&ExpTimeZoneInfo, sizeof(TIME_ZONE_INFORMATION)); + RtlZeroMemory(&ExpTimeZoneInfo, sizeof(RTL_TIME_ZONE_INFORMATION)); ExpTimeZoneBias.QuadPart = (LONGLONG)0; ExpTimeZoneId = TIME_ZONE_ID_UNKNOWN; } @@ -275,7 +275,7 @@ ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) } NTSTATUS -ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) +ExpSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation) { LARGE_INTEGER LocalTime, SystemTime, OldTime; TIME_FIELDS TimeFields; @@ -303,7 +303,7 @@ ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) /* Copy the timezone information */ RtlCopyMemory(&ExpTimeZoneInfo, TimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION)); + sizeof(RTL_TIME_ZONE_INFORMATION)); /* Set the new time zone information */ SharedUserData->TimeZoneBias.High1Time = ExpTimeZoneBias.u.HighPart; diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 091b90783d..740bb96564 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -2,7 +2,7 @@ /* GLOBAL VARIABLES *********************************************************/ -extern TIME_ZONE_INFORMATION ExpTimeZoneInfo; +extern RTL_TIME_ZONE_INFORMATION ExpTimeZoneInfo; extern LARGE_INTEGER ExpTimeZoneBias; extern ULONG ExpTimeZoneId; extern ULONG ExpTickCountMultiplier; @@ -1417,7 +1417,7 @@ ExTryToAcquireResourceExclusiveLite( NTSTATUS ExpSetTimeZoneInformation( - IN PTIME_ZONE_INFORMATION TimeZoneInformation + IN PRTL_TIME_ZONE_INFORMATION TimeZoneInformation ); BOOLEAN diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 1371f4c86f..b526f9ea04 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1662,38 +1662,19 @@ typedef struct _RTL_ATOM_TABLE PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; -#ifndef _WINBASE_ // -// System Time and Timezone Structures +// Timezone Information // -typedef struct _SYSTEMTIME -{ - USHORT wYear; - USHORT wMonth; - USHORT wDayOfWeek; - USHORT wDay; - USHORT wHour; - USHORT wMinute; - USHORT wSecond; - USHORT wMilliseconds; -} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; - -typedef struct _TIME_ZONE_INFORMATION +typedef struct _RTL_TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - SYSTEMTIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - SYSTEMTIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; -} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; -#endif /* !_WINBASE_ */ - -// -// Native version of Timezone Structure -// -typedef LPTIME_ZONE_INFORMATION PRTL_TIME_ZONE_INFORMATION; +} RTL_TIME_ZONE_INFORMATION, *PRTL_TIME_ZONE_INFORMATION; // // Hotpatch Header diff --git a/sdk/include/reactos/wine/winternl.h b/sdk/include/reactos/wine/winternl.h index 999f544edb..edd79e5a6f 100644 --- a/sdk/include/reactos/wine/winternl.h +++ b/sdk/include/reactos/wine/winternl.h @@ -102,6 +102,7 @@ typedef struct _FILETIME } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */ +#if 0 /* * RTL_SYSTEM_TIME and RTL_TIME_ZONE_INFORMATION are the same as * the SYSTEMTIME and TIME_ZONE_INFORMATION structures defined @@ -120,14 +121,26 @@ typedef struct _RTL_SYSTEM_TIME { WORD wSecond; WORD wMilliseconds; } RTL_SYSTEM_TIME, *PRTL_SYSTEM_TIME; +#endif + +typedef struct _TIME_FIELDS { + CSHORT Year; + CSHORT Month; + CSHORT Day; + CSHORT Hour; + CSHORT Minute; + CSHORT Second; + CSHORT Milliseconds; + CSHORT Weekday; +} TIME_FIELDS, *PTIME_FIELDS; typedef struct _RTL_TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - RTL_SYSTEM_TIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - RTL_SYSTEM_TIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; } RTL_TIME_ZONE_INFORMATION, *PRTL_TIME_ZONE_INFORMATION; @@ -135,10 +148,10 @@ typedef struct _RTL_TIME_DYNAMIC_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - RTL_SYSTEM_TIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - RTL_SYSTEM_TIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; WCHAR TimeZoneKeyName[128]; BOOLEAN DynamicDaylightTimeDisabled; @@ -1647,17 +1660,6 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT { BOOLEAN TimeAdjustmentDisabled; } SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT; -typedef struct _TIME_FIELDS -{ CSHORT Year; - CSHORT Month; - CSHORT Day; - CSHORT Hour; - CSHORT Minute; - CSHORT Second; - CSHORT Milliseconds; - CSHORT Weekday; -} TIME_FIELDS, *PTIME_FIELDS; - typedef struct _WINSTATIONINFORMATIONW { BYTE Reserved2[70]; ULONG LogonId; diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index cd57492d99..f47ece5cba 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -10,7 +10,10 @@ #include <win32k.h> -#include <winnls.h> +// Was included only because of CP_ACP and required the +// definition of SYSTEMTIME in ndk\rtltypes.h +//#include <winnls.h> +#define CP_ACP 0 DBG_DEFAULT_CHANNEL(UserKbdLayout);

1 0

01/01: [NTDLL_APITEST] Add missing test file for 0f8e7207.
by Eric Kohl 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac45758aff58d16bfbed0… commit ac45758aff58d16bfbed0a0a5e2451d5b8d34633 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 17:12:52 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 17:12:52 2018 +0200 [NTDLL_APITEST] Add missing test file for 0f8e7207. CORE-14658 --- .../rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c | 155 +++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c new file mode 100644 index 0000000000..fcbad38f5c --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ntdll_apitest + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for RtlQueryTimeZoneInformation + * COPYRIGHT: Copyright 2018 Doug Lyons + */ + +#include "precomp.h" + +#if 0 +/* + * RTL_SYSTEM_TIME is almost the same as the SYSTEMTIME structure defined + * in winbase.h, however we need to define it differently here. + * This is used by RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. + * See: https://social.msdn.microsoft.com/Forums/en-US/home?forum=en-US and + * Search: Reading TimeZone binary data from registry by Patrick + * and then look at the last post showing typedef struct SYSTEMTIME_TZI. + */ +typedef struct _RTL_SYSTEM_TIME { + WORD wYear; + WORD wMonth; + WORD wDay; /* wDayOfWeek was here normally */ + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; + WORD wDayOfWeek; /* wDayOfWeek relocated to here */ +} RTL_SYSTEM_TIME; + +/* + * RTL_TIME_ZONE_INFORMATION is the same as the TIME_ZONE_INFORMATION structure + * defined in winbase.h, however we need to define RTL_TIME_ZONE_INFORMATION + * seperately here so we don't depend on winbase.h. + * This is used by RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. + */ +typedef struct _RTL_TIME_ZONE_INFORMATION { + LONG Bias; + WCHAR StandardName[32]; + RTL_SYSTEM_TIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + RTL_SYSTEM_TIME DaylightDate; + LONG DaylightBias; +} RTL_TIME_ZONE_INFORMATION; +#endif + +static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); + +static void test_RtlQueryTimeZoneInformation(void) +{ + RTL_TIME_ZONE_INFORMATION tzinfo; + NTSTATUS status; + TIME_ZONE_INFORMATION tziOld, tziNew, tziTest; + DWORD dwRet; + + // Retrieve the current time zone information + + dwRet = GetTimeZoneInformation(&tziOld); + + ok(dwRet == TIME_ZONE_ID_STANDARD || dwRet == TIME_ZONE_ID_UNKNOWN || dwRet == TIME_ZONE_ID_DAYLIGHT, + "Get Time Zone Name failed with error = %ld.\n", GetLastError()); + + // Adjust the time zone information + + ZeroMemory(&tziNew, sizeof(tziNew)); + tziNew.Bias = 360; + wcscpy(tziNew.StandardName, L"Test Standard Zone"); + tziNew.StandardDate.wMonth = 11; + tziNew.StandardDate.wDayOfWeek = 5; + tziNew.StandardDate.wDay = 3; + tziNew.StandardDate.wHour = 2; + tziNew.StandardBias = 120; + + wcscpy(tziNew.DaylightName, L"Test Daylight Zone"); + tziNew.DaylightDate.wMonth = 4; + tziNew.DaylightDate.wDayOfWeek = 6; + tziNew.DaylightDate.wDay = 2; + tziNew.DaylightDate.wHour = 2; + tziNew.DaylightBias = -60; + + // Set up SetLastError with known value for later testing + + SetLastError(0xDEADBEEF); + + ok(SetTimeZoneInformation(&tziNew) , + "Set Time Zone Information failed with error = %ld.\n", GetLastError()); + + // if we got an error the function failed, so there is not much else we can do + + if(GetLastError() != 0xDEADBEEF) + { + win_skip("SetTimeZoneInformation() is not available, so tests cannot be run.\n"); + return; + } + + // Retrieve and display the newly set time zone information + + dwRet = GetTimeZoneInformation(&tziTest); + + ok(dwRet == TIME_ZONE_ID_STANDARD || dwRet == TIME_ZONE_ID_UNKNOWN || dwRet == TIME_ZONE_ID_DAYLIGHT, + "Get Time Zone Information Returned failed with error = %ld.\n", GetLastError()); + + ok(!wcscmp(tziTest.StandardName, tziNew.StandardName), + "Standard Time Zone Name = %ls, expected %ls.\n", tziTest.StandardName, tziNew.StandardName); + + ok(!wcscmp(tziTest.DaylightName, tziNew.DaylightName), + "Standard Time Zone Name = %ls, expected %ls.\n", tziTest.DaylightName, tziNew.DaylightName); + + /* test RtlQueryTimeZoneInformation returns a TIME_ZONE_INFORMATION structure */ + + if (!pRtlQueryTimeZoneInformation) + { + win_skip("pRtlQueryTimeZoneInformation() fails, so tests cannot be run.\n"); + return; + } + + /* Clear Time Zone Info field */ + memset(&tzinfo, 0, sizeof(tzinfo)); + + /* Read Time Zone Info */ + status = pRtlQueryTimeZoneInformation(&tzinfo); + ok(status == STATUS_SUCCESS, "pRtlQueryTimeZoneInformation failed, got %08lx\n", status); + + /* Check for the Daylight Date Info */ + ok(tzinfo.DaylightDate.Month == 4, "tzinfo.DaylightDate.wMonth expected '4', got '%d'.\n", tzinfo.DaylightDate.Month); + ok(tzinfo.DaylightDate.Day == 2, "tzinfo.DaylightDate.wDay expected '2', got '%d'.\n", tzinfo.DaylightDate.Day); + ok(tzinfo.DaylightDate.Weekday == 6, "tzinfo.DaylightDate.wDayOfWeek expected '6', got '%d'.\n", tzinfo.DaylightDate.Weekday); + ok(tzinfo.DaylightDate.Year == 0, "tzinfo.DaylightDate.wYear expected '0', got '%d'.\n", tzinfo.DaylightDate.Year); + + /* Check for the Standard Data Info */ + ok(tzinfo.StandardDate.Month == 11, "tzinfo.StandardDate.wMonth expected '11', got '%d'.\n", tzinfo.StandardDate.Month); + ok(tzinfo.StandardDate.Day == 3, "tzinfo.StandardDate.wDay expected '3', got '%d'.\n", tzinfo.StandardDate.Day); + ok(tzinfo.StandardDate.Weekday == 5, "tzinfo.StandardDate.wDayOfWeek expected '5', got '%d'.\n", tzinfo.StandardDate.Weekday); + ok(tzinfo.StandardDate.Year == 0, "tzinfo.StandardDate.wYear expected '0', got '%d'.\n", tzinfo.StandardDate.Year); + + /* Check for the Bias Info */ + ok(tzinfo.Bias == 360, "tzinfo.Bias expected '360', got '%ld'.\n", tzinfo.Bias); + ok(tzinfo.DaylightBias == -60, "tzinfo.DaylightBias expected '-60', got '%ld'.\n", tzinfo.DaylightBias); + ok(tzinfo.StandardBias == 120, "tzinfo.StandardBias expected '120', got '%ld'.\n", tzinfo.StandardBias); + + // Restore the original time zone information and put things back like we found them originally + ok(SetTimeZoneInformation(&tziOld), + "Set Time Zone Information failed with error = %ld.\n", GetLastError()); + +} + + +START_TEST(RtlQueryTimeZoneInformation) +{ + /* Test modeled after reactos\modules\rostests\winetests\ntdll\time.c for Vista+ */ + HMODULE mod = GetModuleHandleA("ntdll.dll"); + pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); + + test_RtlQueryTimeZoneInformation(); +} \ No newline at end of file

1 0

01/01: [NTDLL_APITEST][LIB_RTL] Add a test for RtlQueryTimeZoneInformation and fix the bug in RtlpQueryRegistryDirect
by Eric Kohl 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8e720711532d6020021… commit 0f8e720711532d60200211ab7c6dce80e023b68f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 16:47:42 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 16:47:42 2018 +0200 [NTDLL_APITEST][LIB_RTL] Add a test for RtlQueryTimeZoneInformation and fix the bug in RtlpQueryRegistryDirect In working on some problems with Time Zone adjustments in ReactOS I found that the RtlQueryTimeZoneInformation function is partially broken and wrote an apitest to capture the failures. Patch by Doug Lyons. CORE-14658 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/testlist.c | 2 ++ sdk/lib/rtl/registry.c | 26 +++++++++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 3e9756c7f3..a7fdc5a2cd 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -49,6 +49,7 @@ list(APPEND SOURCE RtlMemoryStream.c RtlNtPathNameToDosPathName.c RtlpEnsureBufferSize.c + RtlQueryTimeZoneInfo.c RtlReAllocateHeap.c RtlUnicodeStringToAnsiString.c RtlUpcaseUnicodeStringToCountedOemString.c diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index f17f87267c..c6afd1d342 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -53,6 +53,7 @@ extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); extern void func_RtlNtPathNameToDosPathName(void); extern void func_RtlpEnsureBufferSize(void); +extern void func_RtlQueryTimeZoneInformation(void); extern void func_RtlReAllocateHeap(void); extern void func_RtlUnicodeStringToAnsiString(void); extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); @@ -111,6 +112,7 @@ const struct test winetest_testlist[] = { "RtlMemoryStream", func_RtlMemoryStream }, { "RtlNtPathNameToDosPathName", func_RtlNtPathNameToDosPathName }, { "RtlpEnsureBufferSize", func_RtlpEnsureBufferSize }, + { "RtlQueryTimeZoneInformation", func_RtlQueryTimeZoneInformation }, { "RtlReAllocateHeap", func_RtlReAllocateHeap }, { "RtlUnicodeStringToAnsiString", func_RtlUnicodeStringToAnsiString }, { "RtlUpcaseUnicodeStringToCountedOemString", func_RtlUpcaseUnicodeStringToCountedOemString }, diff --git a/sdk/lib/rtl/registry.c b/sdk/lib/rtl/registry.c index 02361efc48..bc69d4d0b3 100644 --- a/sdk/lib/rtl/registry.c +++ b/sdk/lib/rtl/registry.c @@ -96,17 +96,25 @@ RtlpQueryRegistryDirect(IN ULONG ValueType, } else { - /* Check if there's space for the length and type, plus data */ - if (*Length < (2 * sizeof(ULONG) + ValueLength)) + if (ValueType != REG_BINARY) { - /* Nope, fail */ - return STATUS_BUFFER_TOO_SMALL; - } + /* Check if there's space for the length and type, plus data */ + if (*Length < (2 * sizeof(ULONG) + ValueLength)) + { + /* Nope, fail */ + return STATUS_BUFFER_TOO_SMALL; + } - /* Return the data */ - *Length++ = ValueLength; - *Length++ = ValueType; - RtlCopyMemory(Length, ValueData, ValueLength); + /* Return the data */ + *Length++ = ValueLength; + *Length++ = ValueType; + RtlCopyMemory(Length, ValueData, ValueLength); + } + else + { + /* Return the REG_BINARY data */ + RtlCopyMemory(Length, ValueData, ValueLength); + } } }

1 0

01/01: [WINLOGON] Update Italian translation (#513) (by deleted user)
by Hermès Bélusca-Maïto 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=528e6339c21109b33f6a2… commit 528e6339c21109b33f6a29eddd8e4f3167b43036 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 31 15:41:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 15:41:09 2018 +0200 [WINLOGON] Update Italian translation (#513) (by deleted user) --- base/system/winlogon/lang/it-IT.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index 35d9e297f3..01af5b2d4a 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -44,11 +44,11 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Esecuzione scripts di connessione..." IDS_LOADINGYOURPERSONALSETTINGS "Caricamento delle impostazioni personali..." IDS_CLOSINGNETWORKCONNECTIONS "Chiusura connessioni di rete..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS Sta spegnendosi..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS si sta spegnendo..." IDS_PREPARETOSTANDBY "Preparazione Standby..." - IDS_PREPARETOHIBERNATE "Preparazione Hibernate..." + IDS_PREPARETOHIBERNATE "Preparazione Ibernazione..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." - IDS_REACTOSISSTARTINGUP "ReactOS sta avviandosi..." + IDS_REACTOSISSTARTINGUP "ReactOS si sta avviando..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" IDS_TIMEOUTLONGFORMAT "%d days" END

1 0

01/01: [SHELL32] Fix and improve the PickIconDlg function (#574)
by Katayama Hirofumi MZ 31 May '18

31 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=222534a5a22cf12ed6673… commit 222534a5a22cf12ed667382c7425bd77bd4242ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 31 22:33:07 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 15:33:07 2018 +0200 [SHELL32] Fix and improve the PickIconDlg function (#574) CORE-10972 --- dll/win32/shell32/CShellLink.cpp | 69 ++++++--- dll/win32/shell32/dialogs/dialogs.cpp | 266 ++++++++++++++++++++++++---------- dll/win32/shell32/lang/bg-BG.rc | 46 +++--- dll/win32/shell32/lang/ca-ES.rc | 45 +++--- dll/win32/shell32/lang/cs-CZ.rc | 45 +++--- dll/win32/shell32/lang/da-DK.rc | 45 +++--- dll/win32/shell32/lang/de-DE.rc | 45 +++--- dll/win32/shell32/lang/el-GR.rc | 45 +++--- dll/win32/shell32/lang/en-GB.rc | 45 +++--- dll/win32/shell32/lang/en-US.rc | 45 +++--- dll/win32/shell32/lang/es-ES.rc | 45 +++--- dll/win32/shell32/lang/et-EE.rc | 45 +++--- dll/win32/shell32/lang/fi-FI.rc | 45 +++--- dll/win32/shell32/lang/fr-FR.rc | 45 +++--- dll/win32/shell32/lang/he-IL.rc | 45 +++--- dll/win32/shell32/lang/hu-HU.rc | 45 +++--- dll/win32/shell32/lang/it-IT.rc | 45 +++--- dll/win32/shell32/lang/ja-JP.rc | 47 +++--- dll/win32/shell32/lang/ko-KR.rc | 45 +++--- dll/win32/shell32/lang/nl-NL.rc | 45 +++--- dll/win32/shell32/lang/no-NO.rc | 45 +++--- dll/win32/shell32/lang/pl-PL.rc | 45 +++--- dll/win32/shell32/lang/pt-BR.rc | 45 +++--- dll/win32/shell32/lang/pt-PT.rc | 45 +++--- dll/win32/shell32/lang/ro-RO.rc | 45 +++--- dll/win32/shell32/lang/ru-RU.rc | 45 +++--- dll/win32/shell32/lang/sk-SK.rc | 45 +++--- dll/win32/shell32/lang/sl-SI.rc | 45 +++--- dll/win32/shell32/lang/sq-AL.rc | 45 +++--- dll/win32/shell32/lang/sv-SE.rc | 45 +++--- dll/win32/shell32/lang/tr-TR.rc | 45 +++--- dll/win32/shell32/lang/uk-UA.rc | 45 +++--- dll/win32/shell32/lang/zh-CN.rc | 45 +++--- dll/win32/shell32/lang/zh-TW.rc | 45 +++--- dll/win32/shell32/shresdef.h | 28 ++++ 35 files changed, 1007 insertions(+), 799 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index dfbd05792f..ddabd18949 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -6,6 +6,7 @@ * Copyright 2009 Andrew Hill * Copyright 2013 Dominik Hornung * Copyright 2017 Hermes Belusca-Maito + * Copyright 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 @@ -1764,10 +1765,30 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon return S_OK; } -HRESULT STDMETHODCALLTYPE CShellLink::Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +HRESULT STDMETHODCALLTYPE +CShellLink::Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { - UNIMPLEMENTED; - return E_FAIL; + SHFILEINFOW info; + + if (phiconLarge) + { + SHGetFileInfoW(pszFile, 0, &info, sizeof(info), + SHGFI_ICON | SHGFI_LARGEICON | SHGFI_LINKOVERLAY); + *phiconLarge = info.hIcon; + if (!info.hIcon) + return E_FAIL; + } + + if (phiconSmall) + { + SHGetFileInfoW(pszFile, 0, &info, sizeof(info), + SHGFI_ICON | SHGFI_SMALLICON | SHGFI_LINKOVERLAY); + *phiconSmall = info.hIcon; + if (!info.hIcon) + return E_FAIL; + } + + return S_OK; } #if 0 @@ -2658,13 +2679,13 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, case WM_INITDIALOG: if (lParam) { - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_SHORTEX_RUN_DIFFERENT); SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); } return TRUE; case WM_COMMAND: { - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_SHORTEX_RUN_DIFFERENT); if (LOWORD(wParam) == IDOK) { if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) @@ -2676,7 +2697,7 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, { EndDialog(hwndDlg, -1); } - else if (LOWORD(wParam) == 14000) + else if (LOWORD(wParam) == IDC_SHORTEX_RUN_DIFFERENT) { if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) SendMessage(hDlgCtrl, BM_SETCHECK, BST_UNCHECKED, 0); @@ -2772,13 +2793,13 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM } if (fi.hIcon) // TODO: destroy icon - SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)fi.hIcon, 0); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_SETICON, (WPARAM)fi.hIcon, 0); else ERR("ExtractIconW failed %ls %u\n", pThis->m_sIcoPath, pThis->m_Header.nIconIndex); /* Target type */ if (pThis->m_sPath) - SetDlgItemTextW(hwndDlg, 14005, SH_GetTargetTypeByPath(pThis->m_sPath)); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TYPE_EDIT, SH_GetTargetTypeByPath(pThis->m_sPath)); /* Target location */ if (pThis->m_sPath) @@ -2786,7 +2807,7 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM WCHAR target[MAX_PATH]; StringCchCopyW(target, _countof(target), pThis->m_sPath); PathRemoveFileSpecW(target); - SetDlgItemTextW(hwndDlg, 14007, PathFindFileNameW(target)); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION_EDIT, PathFindFileNameW(target)); } /* Target path */ @@ -2803,16 +2824,16 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM StringCchCatW(newpath, _countof(newpath), L" "); StringCchCatW(newpath, _countof(newpath), pThis->m_sArgs); } - SetDlgItemTextW(hwndDlg, 14009, newpath); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TARGET_TEXT, newpath); } /* Working dir */ if (pThis->m_sWorkDir) - SetDlgItemTextW(hwndDlg, 14011, pThis->m_sWorkDir); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_START_IN_EDIT, pThis->m_sWorkDir); /* Description */ if (pThis->m_sDescription) - SetDlgItemTextW(hwndDlg, 14019, pThis->m_sDescription); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_COMMENT_EDIT, pThis->m_sDescription); return TRUE; } @@ -2824,10 +2845,10 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM { WCHAR wszBuf[MAX_PATH]; /* set working directory */ - GetDlgItemTextW(hwndDlg, 14011, wszBuf, _countof(wszBuf)); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_START_IN_EDIT, wszBuf, _countof(wszBuf)); pThis->SetWorkingDirectory(wszBuf); /* set link destination */ - GetDlgItemTextW(hwndDlg, 14009, wszBuf, _countof(wszBuf)); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TARGET_TEXT, wszBuf, _countof(wszBuf)); LPWSTR lpszArgs = NULL; LPWSTR unquoted = strdupW(wszBuf); StrTrimW(unquoted, L" "); @@ -2877,7 +2898,7 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM case WM_COMMAND: switch(LOWORD(wParam)) { - case 14020: + case IDC_SHORTCUT_FIND: SHOpenFolderAndSelectItems(pThis->m_pPidl, 0, NULL, 0); /// /// FIXME @@ -2885,24 +2906,32 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM /// return TRUE; - case 14021: + case IDC_SHORTCUT_CHANGE_ICON: { WCHAR wszPath[MAX_PATH] = L""; if (pThis->m_sIcoPath) wcscpy(wszPath, pThis->m_sIcoPath); + else + FindExecutableW(pThis->m_sPath, NULL, wszPath); + INT IconIndex = pThis->m_Header.nIconIndex; if (PickIconDlg(hwndDlg, wszPath, _countof(wszPath), &IconIndex)) { pThis->SetIconLocation(wszPath, IconIndex); - /// - /// FIXME redraw icon - /// + + HICON hIconLarge = NULL; + if (S_OK == pThis->Extract(wszPath, IconIndex, &hIconLarge, NULL, 0)) + { + HICON hIconOld = (HICON)SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_GETICON, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_SETICON, (WPARAM)hIconLarge, 0); + DestroyIcon(hIconOld); + } } return TRUE; } - case 14022: + case IDC_SHORTCUT_ADVANCED: { INT_PTR result = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_SHORTCUT_EXTENDED_PROPERTIES), hwndDlg, ExtendedShortcutProc, (LPARAM)pThis->m_bRunAs); if (result == 1 || result == 0) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index f266e79787..168b066e28 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -2,6 +2,7 @@ * common shell dialogs * * Copyright 2000 Juergen Schmied + * Copyright 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 @@ -46,39 +47,33 @@ typedef struct { HMODULE hLibrary; HWND hDlgCtrl; - WCHAR szName[MAX_PATH]; + WCHAR szPath[MAX_PATH]; + WCHAR szExpandedPath[MAX_PATH]; INT Index; + INT nIcons; + HICON *phIcons; } PICK_ICON_CONTEXT, *PPICK_ICON_CONTEXT; BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, - LONG_PTR lParam -) + LONG_PTR lParam) { - WCHAR szName[100]; - int index; - HICON hIcon; - HWND hDlgCtrl = (HWND)lParam; + PPICK_ICON_CONTEXT pIconContext = PPICK_ICON_CONTEXT(lParam); + HWND hDlgCtrl = pIconContext->hDlgCtrl; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u", (DWORD)lpszName); + lParam = LOWORD(lpszName); else - StringCbCopyW(szName, sizeof(szName), lpszName); - - hIcon = LoadIconW(hModule, lpszName); - if (hIcon == NULL) - return TRUE; + lParam = -1; - index = SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName); - if (index != LB_ERR) - SendMessageW(hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon); + SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, lParam); return TRUE; } static void -DestroyIconList(HWND hDlgCtrl) +DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) { int count; int index; @@ -89,11 +84,94 @@ DestroyIconList(HWND hDlgCtrl) for(index = 0; index < count; index++) { - HICON hIcon = (HICON)SendMessageW(hDlgCtrl, LB_GETITEMDATA, index, 0); - DestroyIcon(hIcon); + DestroyIcon(pIconContext->phIcons[index]); + pIconContext->phIcons[index] = NULL; } } +static BOOL +DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) +{ + // destroy previous + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); + delete[] pIconContext->phIcons; + + // store paths + if (pIconContext->szPath != pszFile) + StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); + ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + + // load DLL if possible + HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (pIconContext->hLibrary) + FreeLibrary(pIconContext->hLibrary); + pIconContext->hLibrary = hLibrary; + + if (pIconContext->hLibrary) + { + // load icons from DLL + pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); + pIconContext->phIcons = new HICON[pIconContext->nIcons]; + + if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + { + EnumResourceNamesW(pIconContext->hLibrary, RT_GROUP_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); + } + else + { + pIconContext->nIcons = 0; + } + } + else + { + // *.ico + pIconContext->nIcons = 1; + pIconContext->phIcons = new HICON[1]; + + if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + { + SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, 0); + } + else + { + pIconContext->nIcons = 0; + } + } + + // set text + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); + + if (pIconContext->nIcons == 0) + { + delete[] pIconContext->phIcons; + pIconContext->phIcons = NULL; + } + + return pIconContext->nIcons > 0; +} + +static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; + +static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) +{ + // show message + CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); + strText.Format(IDS_NO_ICONS, pIconContext->szPath); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONWARNING); + + // load default icons + DoLoadIcons(hwndDlg, pIconContext, s_pszDefaultPath); +} + +// icon size +#define CX_ICON GetSystemMetrics(SM_CXICON) +#define CY_ICON GetSystemMetrics(SM_CYICON) + +// item size +#define CX_ITEM (CX_ICON + 4) +#define CY_ITEM (CY_ICON + 12) + INT_PTR CALLBACK PickIconProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -104,8 +182,9 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, LPDRAWITEMSTRUCT lpdis; HICON hIcon; INT index, count; - WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; - OPENFILENAMEW ofn = {0}; + WCHAR szText[MAX_PATH], szFilter[100]; + CStringW strTitle; + OPENFILENAMEW ofn; PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -115,83 +194,99 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); - EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); - else - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); + + // load icons + if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) + { + NoIconsInFile(hwndDlg, pIconContext); + } + + // set selection count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); if (count != LB_ERR) { - if (count > pIconContext->Index) - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); - else - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + if (pIconContext->Index < 0) + { + // A negative value will be interpreted as a negated resource ID. + LPARAM lParam = -pIconContext->Index; + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); + } + + if (pIconContext->Index < 0 || count <= pIconContext->Index) + pIconContext->Index = 0; + + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); } return TRUE; + case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); pIconContext->Index = index; - GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName, MAX_PATH); - DestroyIconList(pIconContext->hDlgCtrl); + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, MAX_PATH); + ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; EndDialog(hwndDlg, 1); break; + case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; EndDialog(hwndDlg, 0); break; + case IDC_PICKICON_LIST: - if (HIWORD(wParam) == LBN_SELCHANGE) - InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + InvalidateRect((HWND)lParam, NULL, TRUE); + break; + + case LBN_DBLCLK: + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); + break; + } break; + case IDC_BUTTON_PATH: + // choose DLL path szText[0] = 0; - szTitle[0] = 0; szFilter[0] = 0; + ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwndDlg; ofn.lpstrFile = szText; ofn.nMaxFile = MAX_PATH; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, sizeof(szTitle) / sizeof(WCHAR)); - ofn.lpstrTitle = szTitle; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR)); + strTitle.LoadString(IDS_PICK_ICON_TITLE); + ofn.lpstrTitle = strTitle; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); ofn.lpstrFilter = szFilter; - if (GetOpenFileNameW(&ofn)) - { - HMODULE hLibrary; - - if (!wcsicmp(pIconContext->szName, szText)) - break; - - DestroyIconList(pIconContext->hDlgCtrl); + if (!GetOpenFileNameW(&ofn)) + break; - hLibrary = LoadLibraryExW(szText, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (hLibrary == NULL) - break; - FreeLibrary(pIconContext->hLibrary); - pIconContext->hLibrary = hLibrary; - wcscpy(pIconContext->szName, szText); - EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); - else - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); - - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + // load icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + { + NoIconsInFile(hwndDlg, pIconContext); } + + // set selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; } break; + case WM_MEASUREITEM: lpmis = (LPMEASUREITEMSTRUCT) lParam; - lpmis->itemHeight = 32; - lpmis->itemWidth = 64; + lpmis->itemHeight = CY_ITEM; return TRUE; + case WM_DRAWITEM: lpdis = (LPDRAWITEMSTRUCT) lParam; if (lpdis->itemID == (UINT)-1) @@ -202,19 +297,24 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, { case ODA_SELECT: case ODA_DRAWENTIRE: + { index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, 0); + hIcon = pIconContext->phIcons[lpdis->itemID]; if (lpdis->itemID == (UINT)index) FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); else FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1)); - DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, - 0, 0, 0, NULL, DI_NORMAL); + // centering + INT x = lpdis->rcItem.left + (CX_ITEM - CX_ICON) / 2; + INT y = lpdis->rcItem.top + (CY_ITEM - CY_ICON) / 2; + + DrawIconEx(lpdis->hDC, x, y, hIcon, 0, 0, 0, NULL, DI_NORMAL); break; + } } - break; + return TRUE; } return FALSE; @@ -226,23 +326,41 @@ BOOL WINAPI PickIconDlg( UINT nMaxFile, INT* lpdwIconIndex) { - HMODULE hLibrary; int res; - PICK_ICON_CONTEXT IconContext; - hLibrary = LoadLibraryExW(lpstrFile, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - IconContext.hLibrary = hLibrary; + // initialize + PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; - StringCchCopyNW(IconContext.szName, _countof(IconContext.szName), lpstrFile, nMaxFile); + StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); + ExpandEnvironmentStringsW(lpstrFile, IconContext.szExpandedPath, _countof(IconContext.szExpandedPath)); + + if (!IconContext.szExpandedPath[0] || + GetFileAttributesW(IconContext.szExpandedPath) == INVALID_FILE_ATTRIBUTES) + { + if (IconContext.szExpandedPath[0]) + { + // no such file + CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); + strText.Format(IDS_FILE_NOT_FOUND, lpstrFile); + MessageBoxW(hWndOwner, strText, strTitle, MB_ICONWARNING); + } + + // set default value + StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); + ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); + } + // show dialog res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hWndOwner, PickIconProc, (LPARAM)&IconContext); if (res) { - StringCchCopyNW(lpstrFile, nMaxFile, IconContext.szName, _countof(IconContext.szName)); + // store + StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); *lpdwIconIndex = IconContext.Index; } - FreeLibrary(hLibrary); + if (IconContext.hLibrary) + FreeLibrary(IconContext.hLibrary); return res; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 83c49ed60a..a4e722635a 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1,3 +1,4 @@ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT MENU_001 MENUEX @@ -180,27 +181,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Препратка" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Вид на целта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Място на целта:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Цел:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Вид на целта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Място на целта:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Цел:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Изпълняване в:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Бърз &клавиш:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Из&пълняване:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Забележка:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Намиране на целта...", 14020, 10, 115, 75, 14, ES_LEFT - PUSHBUTTON "&Смяна на значето...", 14021, 86, 115, 72, 14, ES_LEFT - PUSHBUTTON "Раз&ширени...", 14022, 160, 115, 60, 14, ES_LEFT + LTEXT "&Изпълняване в:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Бърз &клавиш:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Из&пълняване:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Забележка:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Намиране на целта...", IDC_SHORTCUT_FIND, 10, 115, 75, 14, ES_LEFT + PUSHBUTTON "&Смяна на значето...", IDC_SHORTCUT_CHANGE_ICON, 86, 115, 72, 14, ES_LEFT + PUSHBUTTON "Раз&ширени...", IDC_SHORTCUT_ADVANCED, 160, 115, 60, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 260, 150 @@ -210,9 +211,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Укажете желаните допълнителни свойства за препратката.", -1, 5, 30, 246, 10 - CHECKBOX "Изпълняване с различни правомощия", 14000, 30, 50, 150, 10 + CHECKBOX "Изпълняване с различни правомощия", IDC_SHORTEX_RUN_DIFFERENT, 30, 50, 150, 10 LTEXT "Тази възможност ви позволява да изпълните препратката като друг потребител или да продължите като себе си, като предпазвате компютъра и данните от неупълномощена дейност на приложенията.", -1, 50, 60, 200, 40 - CHECKBOX "Изпълняване в отделен дял от паметта", 14001, 30, 100, 170, 10, WS_DISABLED + CHECKBOX "Изпълняване в отделен дял от паметта", IDC_SHORTEX_RUN_SEPARATE, 30, 100, 170, 10, WS_DISABLED PUSHBUTTON "Добре", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Прекъсване", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index d0f996e04f..a345509fa6 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index adbf5db4db..2b59ae81c1 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -186,27 +186,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Zástupce" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ cíle:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Umístění cíle:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cíl:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ cíle:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Umístění cíle:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cíl:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Spustit v:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Klávesová zk&ratka:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Spusti&t:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Komentář:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Najít cíl...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Změnit ikonu...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "R&ozšířené...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Spustit v:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Klávesová zk&ratka:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Spusti&t:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Komentář:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Najít cíl...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Změnit ikonu...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "R&ozšířené...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -216,9 +216,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zvolte rozšířené vlastnosti, které požadujtete pro tohoto zástupce.", -1, 5, 30, 210, 10 - CHECKBOX "Spustit s jinými pověřeními", 14000, 25, 50, 150, 10 + CHECKBOX "Spustit s jinými pověřeními", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Tato možnost umožní spustit tohoto zástupce jako jiný uživatel nebo při spuštění se současným uživatelem chránit počítač před nepovolenou aktivitou programu.", -1, 50, 60, 175, 40 - CHECKBOX "Spustit v odděleném paměťovém prostoru", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Spustit v odděleném paměťovém prostoru", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -929,5 +929,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 50a7afd779..de55fda1f7 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -186,27 +186,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -216,9 +216,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -949,5 +949,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 8008e61627..667269fb10 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Verknüpfung" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Zieltyp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Zielpfad:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Ziel:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Zieltyp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Zielpfad:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Ziel:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Starten in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Kurztasten:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Ausfüh&ren:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Ziel finden...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "S&ymbol wechseln...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "Er&weitert...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Starten in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Kurztasten:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Ausfüh&ren:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Ziel finden...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "S&ymbol wechseln...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 210, 10 - CHECKBOX "Als anderer Benutzer ausführen", 14000, 25, 50, 150, 10 + CHECKBOX "Als anderer Benutzer ausführen", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem anderen oder Ihrem eigenen Benutzerkonto auszuführen während der Computer und Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", -1, 50, 60, 175, 40 - CHECKBOX "In getrenntem Speicherbereich ausführen", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "In getrenntem Speicherbereich ausführen", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -944,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 240e742ed2..051a9ab472 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Συντόμευση" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Τύπος προορισμού:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Θέση προορισμού:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Προορισμός:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Τύπος προορισμού:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Θέση προορισμού:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Προορισμός:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Εκκίνηση στο:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Πλήκτρο &συντόμευσης:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Εκ&τέλεση:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Σχόλια:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Εύρεση προορισμού...", 14020, 10, 115, 71, 14, ES_LEFT - PUSHBUTTON "&Αλλαγή εικονιδίου...", 14021, 83, 115, 71, 14, ES_LEFT - PUSHBUTTON "&Για προχωρημένους...", 14022, 156, 115, 71, 14, ES_LEFT + LTEXT "&Εκκίνηση στο:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Πλήκτρο &συντόμευσης:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Εκ&τέλεση:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Σχόλια:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Εύρεση προορισμού...", IDC_SHORTCUT_FIND, 10, 115, 71, 14, ES_LEFT + PUSHBUTTON "&Αλλαγή εικονιδίου...", IDC_SHORTCUT_CHANGE_ICON, 83, 115, 71, 14, ES_LEFT + PUSHBUTTON "&Για προχωρημένους...", IDC_SHORTCUT_ADVANCED, 156, 115, 71, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Επιλέξτε τις πρόσθετες ιδιότητες που θέλετε για αυτήν την συντόμευση.", -1, 5, 30, 210, 20 - CHECKBOX "Εκτέλεση με διαφορετικά πιστοποιητικά", 14000, 25, 50, 150, 10 + CHECKBOX "Εκτέλεση με διαφορετικά πιστοποιητικά", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Αυτή η επιλογή θα σας επιτρέψει να εκτελέσετε την συντόμευση ως διαφορετικός χρήστης ή ως εσείς ο ίδιος προστατεύοντας τον υπολογιστή σας από μη εξουσιοδοτημένες ενέργειες προγραμμάτων.", -1, 50, 60, 175, 40 - CHECKBOX "Εκτέλεση σε διαφορετική περιοχή μνήμης", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Εκτέλεση σε διαφορετική περιοχή μνήμης", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Άκυρο", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 77fedc3028..39b8612d2b 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 4c11b3f54e..c4e7df3afe 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -181,27 +181,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -211,9 +211,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -944,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index a6d1bef762..971391dac4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de destino:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ubicación de destino:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Destino:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de destino:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Ubicación de destino:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Destino:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "I&niciar en:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de método abreviado:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Ejecutar:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omentario:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Abrir ubicación...", 14020, 9, 172, 62, 14, ES_LEFT - PUSHBUTTON "Cambiar &icono...", 14021, 76, 172, 62, 14, ES_LEFT - PUSHBUTTON "Propiedades avan&zadas...", 14022, 144, 172, 85, 14, ES_LEFT + LTEXT "I&niciar en:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de método abreviado:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Ejecutar:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omentario:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Abrir ubicación...", IDC_SHORTCUT_FIND, 9, 172, 62, 14, ES_LEFT + PUSHBUTTON "Cambiar &icono...", IDC_SHORTCUT_CHANGE_ICON, 76, 172, 62, 14, ES_LEFT + PUSHBUTTON "Propiedades avan&zadas...", IDC_SHORTCUT_ADVANCED, 144, 172, 85, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 25, 210, 14 - CHECKBOX "Ejecutar con credenciales diferentes", 14000, 25, 50, 150, 10 + CHECKBOX "Ejecutar con credenciales diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opción puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 - CHECKBOX "Ejecutar en otro espacio de memoria", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Ejecutar en otro espacio de memoria", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Aceptar", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancelar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 22c71b8af7..df51f5cb63 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -188,27 +188,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Otsetee" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Sihiüksuse t&üüp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Sihtüksuse &asukoht:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Sihtüksus:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Sihiüksuse t&üüp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Sihtüksuse &asukoht:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Sihtüksus:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Käi&vituskoht:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Kiirkla&hv:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Käivita:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentaar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Otsi sihtüksus...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Muuda ikoon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Täpsemalt...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "Käi&vituskoht:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Kiirkla&hv:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Käivita:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentaar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Otsi sihtüksus...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Muuda ikoon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Täpsemalt...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -218,9 +218,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Vali selle otsetee jaoks soovitud täpsemad atribuudid.", -1, 5, 30, 210, 10 - CHECKBOX "Käivita teistsuguse mandaadiga", 14000, 25, 50, 150, 10 + CHECKBOX "Käivita teistsuguse mandaadiga", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Selle suvandi abil saad käivitada otsetee teise või enda kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata programmitegevuse eest.", -1, 50, 60, 175, 40 - CHECKBOX "Käivita eraldi mäluruumis", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Käivita eraldi mäluruumis", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Loobu", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -951,5 +951,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 02949be085..5b058eda00 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 3e056ea304..800f6a5715 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Raccourci" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type de la cible :", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localisation de la cible :", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cible :", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Type de la cible :", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Localisation de la cible :", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cible :", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Démarrer dans :", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Touche de raccourci :", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Exécuter :", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommentaire :", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Changer d'icône...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancé...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Démarrer dans :", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Touche de raccourci :", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Exécuter :", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&ommentaire :", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "Trouver la cible...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Changer d'icône...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancé...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choisissez la propriété étendue que vous voulez pour ce raccourci.", -1, 5, 30, 210, 10 - CHECKBOX "Exécuter avec des droits différents", 14000, 25, 50, 150, 10 + CHECKBOX "Exécuter avec des droits différents", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-même en protégeant votre ordinateur et vos données des activés de programme non autorisées.", -1, 50, 60, 175, 40 - CHECKBOX "Lancer dans un espace mémoire séparé", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Lancer dans un espace mémoire séparé", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 1fb8a87f14..28e5f97599 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "קיצור דרך" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "סוג יעד:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "מיקום יעד:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "יעד:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "סוג יעד:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "מיקום יעד:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "יעד:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "התחל ב:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "מקש קיצור:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "הפעל:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "הערה:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "פתח מיקום קובץ", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "שינוי סמל...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "מתקדם...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "התחל ב:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "מקש קיצור:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "הפעל:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "הערה:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "פתח מיקום קובץ", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "שינוי סמל...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "מתקדם...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "הרץ בטווח זיכרון מופרד", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "הרץ בטווח זיכרון מופרד", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "אישור", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "ביטול", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ba3374f49f..fe0da3d84d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 584bd37f9f..d73eae1772 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Posizione:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Nome:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Posizione:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Nome:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Eseguito in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tasto per il collegamento:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "E&secuzione:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommento:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Trova...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Cambia icona...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vanzate...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Eseguito in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tasto per il collegamento:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "E&secuzione:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&ommento:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Trova...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Cambia icona...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vanzate...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Scegliere le impostazioni avanzate per questo collegamento.", -1, 5, 30, 210, 10 - CHECKBOX "Eseguire con credenziali diverse", 14000, 25, 50, 150, 10 + CHECKBOX "Eseguire con credenziali diverse", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Questa opzione permette l'esecuzione del collegamento come se si fosse un altro utente o di proteggere il computer e i dati da attività non autorizzate del programma.", -1, 50, 60, 175, 40 - CHECKBOX "Eseguire in uno spazio di memoria separato", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Eseguire in uno spazio di memoria separato", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annulla", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 3834c9bd9a..43c85ae4b4 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "ショートカット" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "対象の種類:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "対象の場所:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "対象 (&T):", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "対象の種類:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "対象の場所:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "対象 (&T):", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "実行元(&S):", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "ショートカットキー(&K):", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "実行状態 (&R):", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "コメント(&O):", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "対象の検索(&F)...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "アイコンの変更(&C)...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "詳細設定(&D)...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "実行元(&S):", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "ショートカットキー(&K):", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "実行状態 (&R):", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "コメント(&O):", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "対象の検索(&F)...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "アイコンの変更(&C)...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "詳細設定(&D)...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "このショートカットに使用する拡張プロパティを選択してください。", -1, 5, 30, 210, 10 - CHECKBOX "異なる人物証明情報で実行する", 14000, 25, 50, 150, 10 + CHECKBOX "異なる人物証明情報で実行する", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "このオプションを使用するとこのショートカットを別のユーザーとして実行できます。また、自分自身で実行する場合、許可されていないプログラムの活動からコンピュータとデータを保護できます。", -1, 50, 60, 175, 40 - CHECKBOX "別のメモリ領域で実行する", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "別のメモリ領域で実行する", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "中止", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -222,7 +222,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE + ICON "", IDC_SHORTCUT_ICON, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT LTEXT "ファイルの種類:", 14004, 8, 40, 55, 10 CONTROL "フォルダ", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 @@ -940,5 +940,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf7c62329e..bd1908c2a1 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 9, "굴림", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index de2b87616c..c0da495845 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 9d8e0477ec..0924770823 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Snarvei" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Plasseringstype:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Plasseringssted:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Plassering:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Plasseringstype:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Plasseringssted:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Plassering:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start i:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Snarvei nø&kkel:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Kjø&r:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Finn mål...", 14020, 10, 115, 63, 14, ES_LEFT - PUSHBUTTON "&Endre ikon...", 14021, 83, 115, 63, 14, ES_LEFT - PUSHBUTTON "A&vansert...", 14022, 156, 115, 63, 14, ES_LEFT + LTEXT "&Start i:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Snarvei nø&kkel:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Kjø&r:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Finn mål...", IDC_SHORTCUT_FIND, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "&Endre ikon...", IDC_SHORTCUT_CHANGE_ICON, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "A&vansert...", IDC_SHORTCUT_ADVANCED, 156, 115, 63, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Velg avansert egenskaper som du vil for denne snarveien.", -1, 5, 30, 210, 10 - CHECKBOX "Kjør som administrator", 14000, 25, 50, 150, 10 + CHECKBOX "Kjør som administrator", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Med dette valget kan du kjøre denne snarveien med som en administrator, mens du beskytter din datamaskin og data fra uautorisert program aktivitet.", -1, 50, 60, 175, 40 - CHECKBOX "Kjør i seperat minneplass", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Kjør i seperat minneplass", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index d22086d5b3..55e531c2e0 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -185,27 +185,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Skrót" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ docelowy:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Lokalizacja:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Element docelowy:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ docelowy:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Lokalizacja:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Element docelowy:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Uruchom w:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Skrót &klawiszowy:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "U&ruchom:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&omentarz:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Znajdź element docelowy", 14020, 8, 172, 90, 14, ES_LEFT - PUSHBUTTON "Zmień &ikonę", 14021, 104, 172, 60, 14, ES_LEFT - PUSHBUTTON "Z&aawansowane", 14022, 169, 172, 60, 14, ES_LEFT + LTEXT "&Uruchom w:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Skrót &klawiszowy:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "U&ruchom:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&omentarz:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Znajdź element docelowy", IDC_SHORTCUT_FIND, 8, 172, 90, 14, ES_LEFT + PUSHBUTTON "Zmień &ikonę", IDC_SHORTCUT_CHANGE_ICON, 104, 172, 60, 14, ES_LEFT + PUSHBUTTON "Z&aawansowane", IDC_SHORTCUT_ADVANCED, 169, 172, 60, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -215,9 +215,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Wybierz właściwości zaawansowane dla tego skrótu.", -1, 5, 30, 210, 10 - CHECKBOX "Uruchom z innym Użytkownikiem", 14000, 25, 50, 150, 10 + CHECKBOX "Uruchom z innym Użytkownikiem", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ta opcja pozwoli ci na uruchomienie skrótu jako inny użytkownik, do ochrony twoich danych przed niepowołanym dostępem.", -1, 50, 60, 175, 40 - CHECKBOX "Uruchom w osobnym przedziale pamięci", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Uruchom w osobnym przedziale pamięci", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -948,5 +948,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 33a5df82fa..4f1864b369 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Atalho" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de alvo:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Local do alvo:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Alvo:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de alvo:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Local do alvo:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Alvo:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Iniciar em:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de atalho:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Executar:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omentário:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Procurar Alvo...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Modificar Ícone...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vançado...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Iniciar em:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de atalho:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Executar:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omentário:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Procurar Alvo...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Modificar Ícone...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vançado...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avançadas para este atalho.", -1, 5, 30, 210, 10 - CHECKBOX "Executar com credenciais diferentes", 14000, 25, 50, 150, 10 + CHECKBOX "Executar com credenciais diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite você executar este atalho como outro usuário, ou continuar como si próprio enquanto protege seu computador e dados de atividades de programas não autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar em espaço de memória separado", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Executar em espaço de memória separado", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7dfbef5761..31618bb68f 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Atalho" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de destino:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localização do destino:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Destino:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de destino:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Localização do destino:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Destino:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Iniciar em:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de Atalho:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Executa&r:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omemntário:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Localizar Destino...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Trocar Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vançado...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Iniciar em:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de Atalho:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Executa&r:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omemntário:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Localizar Destino...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Trocar Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vançado...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avançadas que quer para este atalho.", -1, 5, 30, 210, 10 - CHECKBOX "Executar com diferentes credenciais", 14000, 25, 50, 150, 10 + CHECKBOX "Executar com diferentes credenciais", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas não autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar num espaço de memória separada", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Executar num espaço de memória separada", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 577ecf6495..e3fa5b04b4 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Scurtătură" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipul destinației:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Locația destinației:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "D&estinația:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipul destinației:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Locația destinației:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "D&estinația:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "C&alea de lansare:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Taste &rapide:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "E&xecuție:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Comentariu:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Locul țintei", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Pictogramă…", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vansate…", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "C&alea de lansare:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Taste &rapide:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "E&xecuție:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Comentariu:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Locul țintei", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Pictogramă…", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vansate…", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Specificați proprietăți avansate pentru această scurtătură.", -1, 5, 30, 210, 10 - CHECKBOX "Execută sub o i&dentitate explicită", 14000, 25, 50, 150, 10 + CHECKBOX "Execută sub o i&dentitate explicită", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Această opțiune vă permite execuția scurtăturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtăturii în mod securizat, protejând astfel calculatorul de activități neautorizate.", -1, 50, 60, 175, 40 - CHECKBOX "Execută în sp&ațiu de memorie separat", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Execută în sp&ațiu de memorie separat", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Con&firmă", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "A&nulează", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2f6c32567f..e1b4372fd3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ярлык" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Тип объекта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Размещение:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Объект:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Тип объекта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Размещение:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Объект:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Рабочая папка:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Б&ыстрый вызов:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Ок&но:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Комментарий:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Найти объект...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "См&енить значок...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Дополнительно...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Рабочая папка:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Б&ыстрый вызов:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Ок&но:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Комментарий:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Найти объект...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "См&енить значок...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Дополнительно...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Установите нужные свойства для этого ярлыка.", -1, 5, 30, 210, 10 - CHECKBOX "Запускать с другими учетными данными", 14000, 25, 50, 150, 10 + CHECKBOX "Запускать с другими учетными данными", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Позволяет использовать этот ярлык для запуска программы от &имени администратора, в то же время продолжая работу от своего имени, что защищает компьютер от несанкционированных действий других программ.", -1, 50, 60, 175, 40 - CHECKBOX "Запус&кать в отдельной области памяти", 14001, 25, 104, 145, 10, WS_DISABLED + CHECKBOX "Запус&кать в отдельной области памяти", IDC_SHORTEX_RUN_SEPARATE, 25, 104, 145, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Отмена", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index d64d3fe0d0..1ca54231a0 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Odkaz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ cieľa:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Umiestnenie cieľa:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cieľ:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ cieľa:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Umiestnenie cieľa:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cieľ:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Z&ačať v priečinku:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Klávesová skratka:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Sp&ustiť:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Pozná&mka:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Hľadať cieľ...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Zmeniť ikonu...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Spresniť...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "Z&ačať v priečinku:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Klávesová skratka:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Sp&ustiť:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "Pozná&mka:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Hľadať cieľ...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Zmeniť ikonu...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Spresniť...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Vyberte rozšírené vlastnosti určené pre tento odkaz.", -1, 5, 30, 210, 10 - CHECKBOX "&Spustiť s inými povereniami", 14000, 25, 50, 150, 10 + CHECKBOX "&Spustiť s inými povereniami", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Táto možnosť umožňuje spustiť tento odkaz ako iný používateľ, alebo pokračovať so svojím používateľským oprávnením, ale s ochranou počítača a údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 170, 40 - CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", 14001, 25, 100, 190, 10, WS_DISABLED + CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 190, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Prerušiť", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 08368bad81..6caa12aa2a 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 5ef554d314..cde0bc88cf 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -184,27 +184,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ikonë" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipi Objektivit:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Vendndodhja ObjektivitTarget location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Objektivi:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipi Objektivit:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Vendndodhja ObjektivitTarget location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Objektivi:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Fillo në:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Ikonë &çelës:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Ekzekuto:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&oment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Gjej Objektivin...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Ndrysho Ikonë...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancuar...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Fillo në:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Ikonë &çelës:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Ekzekuto:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&oment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Gjej Objektivin...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Ndrysho Ikonë...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancuar...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -214,9 +214,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zgjidhni karakteristikat e avancuara që ju dëshironi për këtë ikonë.", -1, 5, 30, 210, 10 - CHECKBOX "Ekzekuto me kredenciale të ndryshme", 14000, 25, 50, 150, 10 + CHECKBOX "Ekzekuto me kredenciale të ndryshme", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ky opsion mund të lejojë për të drejtuar këtë ikonë si një përdorues tjetër, ose të vazhdojë si veten tënde, duke mbrojtur kompjuterin tuaj dhe të dhënat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40 - CHECKBOX "Ekzekuto në hapësirë të veçantë që e kujtesës", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Ekzekuto në hapësirë të veçantë që e kujtesës", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Ndërprej", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -947,5 +947,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9838370191..6c5cdc3e0c 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Genväg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Måltyp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Målplats:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Mål:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Måltyp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Målplats:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Mål:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Starta i:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Kort&kommando:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Kör:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Sök mål...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Ändra ikon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancerat...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Starta i:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Kort&kommando:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Kör:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Sök mål...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Ändra ikon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancerat...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Välj de avancerade egenskaper du vill ha för den här genvägen.", -1, 5, 30, 210, 10 - CHECKBOX "Kör med andra användaruppgifter", 14000, 25, 50, 150, 10 + CHECKBOX "Kör med andra användaruppgifter", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Det här alternativet tillåter dig att köra genvägen som en annan användare eller som dig själv samtidigt som din dator skyddas från otillåten programaktivitet.", -1, 50, 60, 175, 40 - CHECKBOX "Kör i seperat minnesutrymme", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Kör i seperat minnesutrymme", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Avbryt", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 6411243735..92e0d46827 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Kısayol" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Varış Türü:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Varış Konumu:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Varış:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Varış Türü:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Varış Konumu:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Varış:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Başlama Yeri:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Kısayol Düğmesi:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Çalıştır:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Açıklama:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "Va&rış Bul...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Simge Değiştir...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Gelişmiş...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Başlama Yeri:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Kısayol Düğmesi:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Çalıştır:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Açıklama:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "Va&rış Bul...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Simge Değiştir...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Gelişmiş...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Bu kısayol için istediğiniz gelişmiş husûsîyetleri seçiniz.", -1, 5, 30, 210, 10 - CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", 14000, 25, 50, 150, 10 + CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Bu seçenek, bu kısayolu başka bir kullanıcı olarak çalıştırmanızı veyâ yetkilendirilmemiş izlence etkinliğinden bilgisayarınızı ve verinizi koruyarak kendiniz olarak sürdürmenizi sağlayabilir.", -1, 50, 60, 175, 40 - CHECKBOX "A&yrı Bellek Alanında Çalıştır", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "A&yrı Bellek Alanında Çalıştır", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "İptal", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 8065fd0512..5d60621327 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ярлик" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Тип об'єкта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Розташування:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "О&б'єкт:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Тип об'єкта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Розташування:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "О&б'єкт:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Робоча папка:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Швидкий виклик:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Вікно:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Примітка:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "З&найти об'єкт...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Змінити значок...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Додатково...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Робоча папка:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Швидкий виклик:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Вікно:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Примітка:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "З&найти об'єкт...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Змінити значок...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Додатково...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Виберіть потрібні властивості для цього ярлика.", -1, 5, 30, 210, 10 - CHECKBOX "Запускати з іншими обліковими даними", 14000, 25, 50, 150, 10 + CHECKBOX "Запускати з іншими обліковими даними", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Цей параметр дозволяє використовувати цей ярлик від імені іншого користувача або продовжувати роботу від свого імені, що захищає комп'ютер й дані від несанкціонованих дій програми.", -1, 50, 60, 175, 40 - CHECKBOX "Запускати в окремій області пам'яті", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Запускати в окремій області пам'яті", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Скасувати", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 78a898a1fb..983c9b57f6 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -190,27 +190,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "快捷方式" FONT 9, "宋体", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "目标类型：", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "目标位置：", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "目标(&T):", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "目标类型：", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "目标位置：", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "目标(&T):", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "起始位置(&S):", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "快捷键(&K):", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "运行(&R):", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "备注(&O):", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "查找目标...(&F)", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "更改图标...(&C)", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "高级...(&D)", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "起始位置(&S):", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "快捷键(&K):", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "运行(&R):", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "备注(&O):", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "查找目标...(&F)", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "更改图标...(&C)", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "高级...(&D)", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -220,9 +220,9 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "为这个快捷方式选择您想要的高级属性。", -1, 5, 30, 210, 10 - CHECKBOX "以其他用户身份运行", 14000, 25, 50, 150, 10 + CHECKBOX "以其他用户身份运行", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "此选项允许您以另一用户身份运行此快捷方式，或继续以您自己的身份运行以保护您的计算机和数据不受未授权程序的破坏。", -1, 50, 60, 175, 40 - CHECKBOX "在单独的内存空间中运行", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "在单独的内存空间中运行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -953,5 +953,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index f46729673c..3288dcceee 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -188,27 +188,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -218,9 +218,9 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -951,5 +951,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 74bf189361..440fe81785 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -275,6 +275,9 @@ #define IDS_REMOVE_EXT 30522 +#define IDS_NO_ICONS 30529 +#define IDS_FILE_NOT_FOUND 30530 + /* Dialogs */ /* Run dialog */ @@ -371,6 +374,31 @@ #define IDC_NEWEXT_COMBOBOX 14003 #define IDC_NEWEXT_ASSOC 14004 +/* Control IDs for IDD_SHORTCUT_PROPERTIES dialog */ +#define IDC_SHORTCUT_ICON 14000 +#define IDC_SHORTCUT_TEXT 14001 +#define IDC_SHORTCUT_TYPE 14004 +#define IDC_SHORTCUT_TYPE_EDIT 14005 +#define IDC_SHORTCUT_LOCATION 14006 +#define IDC_SHORTCUT_LOCATION_EDIT 14007 +#define IDC_SHORTCUT_TARGET 14008 +#define IDC_SHORTCUT_TARGET_TEXT 14009 +#define IDC_SHORTCUT_START_IN 14010 +#define IDC_SHORTCUT_START_IN_EDIT 14011 +#define IDC_SHORTCUT_KEY 14014 +#define IDC_SHORTCUT_KEY_HOTKEY 14015 +#define IDC_SHORTCUT_RUN 14016 +#define IDC_SHORTCUT_RUN_COMBO 14017 +#define IDC_SHORTCUT_COMMENT 14018 +#define IDC_SHORTCUT_COMMENT_EDIT 14019 +#define IDC_SHORTCUT_FIND 14020 +#define IDC_SHORTCUT_CHANGE_ICON 14021 +#define IDC_SHORTCUT_ADVANCED 14022 + +/* Control IDs for IDD_SHORTCUT_EXTENDED_PROPERTIES dialog */ +#define IDC_SHORTEX_RUN_DIFFERENT 14000 +#define IDC_SHORTEX_RUN_SEPARATE 14001 + /* Control IDs for IDD_EDITTYPE dialog */ #define IDC_EDITTYPE_ICON 14001 #define IDC_EDITTYPE_TEXT 14002

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