Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/04: [NTOS:IO] Modify when 'PartitionBuffer' and how 'DriveLayout' are freed in IopCreateArcNamesDisk().
by Hermès Bélusca-Maïto 11 Jun '21

11 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b4ffa92f564a334ad919… commit 4b4ffa92f564a334ad919bdda2404561aa1ab10f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 19:44:59 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 11 02:21:48 2021 +0200 [NTOS:IO] Modify when 'PartitionBuffer' and how 'DriveLayout' are freed in IopCreateArcNamesDisk(). - Manage the lifetime of the temporary 'PartitionBuffer' buffer where it is locally used only, and free it as soon as possible, just after calculating the sector checksum. No need to then free it outside of the main for-loop. - When the 'DriveLayout' buffer is freed, ensure the pointer is NULL-ed (and assert this at the top of the main for-loop), since it can also be freed at cleanup outside this for-loop, and in this case a NULL check is performed. This will avoid the scenario of possibly double-freeing a pointer, in the case the 'DriveLayout' was previously freed (when e.g. reading the sector for checksum calculation failed), then the for-loop goes to the next disk and stops early. --- ntoskrnl/io/iomgr/arcname.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/io/iomgr/arcname.c b/ntoskrnl/io/iomgr/arcname.c index 3be5930ec69..937b5cfb0c5 100644 --- a/ntoskrnl/io/iomgr/arcname.c +++ b/ntoskrnl/io/iomgr/arcname.c @@ -478,6 +478,8 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, /* Start browsing disks */ for (DiskNumber = 0; DiskNumber < DiskCount; DiskNumber++) { + ASSERT(DriveLayout == NULL); + /* Check if we have an enabled disk */ if (lSymbolicLinkList && *lSymbolicLinkList != UNICODE_NULL) { @@ -652,6 +654,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, &IoStatusBlock); if (!Irp) { + ExFreePoolWithTag(PartitionBuffer, TAG_IO); ObDereferenceObject(FileObject); Status = STATUS_INSUFFICIENT_RESOURCES; goto Cleanup; @@ -665,20 +668,26 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatusBlock.Status; } - if (!NT_SUCCESS(Status)) + + /* If reading succeeded, calculate checksum by adding data */ + if (NT_SUCCESS(Status)) { - ExFreePool(DriveLayout); - ExFreePoolWithTag(PartitionBuffer, TAG_IO); - ObDereferenceObject(FileObject); - continue; + for (i = 0, CheckSum = 0; i < 512 / sizeof(ULONG); i++) + { + CheckSum += PartitionBuffer[i]; + } } + /* Release now unnecessary resources */ + ExFreePoolWithTag(PartitionBuffer, TAG_IO); ObDereferenceObject(FileObject); - /* Calculate checksum by adding data */ - for (i = 0, CheckSum = 0; i < 512 / sizeof(ULONG) ; i++) + /* If we failed, release drive layout before going to next disk */ + if (!NT_SUCCESS(Status)) { - CheckSum += PartitionBuffer[i]; + ExFreePool(DriveLayout); + DriveLayout = NULL; + continue; } /* Browse each ARC disk */ @@ -800,29 +809,22 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, } } - /* Release memory before jumping to next item */ + /* Finally, release drive layout */ ExFreePool(DriveLayout); DriveLayout = NULL; - ExFreePoolWithTag(PartitionBuffer, TAG_IO); - PartitionBuffer = NULL; } Status = STATUS_SUCCESS; Cleanup: - if (SymbolicLinkList) - { - ExFreePool(SymbolicLinkList); - } - if (DriveLayout) { ExFreePool(DriveLayout); } - if (PartitionBuffer) + if (SymbolicLinkList) { - ExFreePoolWithTag(PartitionBuffer, TAG_IO); + ExFreePool(SymbolicLinkList); } return Status;

1 0

[reactos] 03/04: [NTOS:IO/FSTUB] Fix the determination of 'SingleDisk' in IoGetBootDiskInformation().
by Hermès Bélusca-Maïto 11 Jun '21

11 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdd74eb97e79bd7ad62c0… commit fdd74eb97e79bd7ad62c0fc2f26541db1ff1009c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 19:31:43 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 11 02:21:47 2021 +0200 [NTOS:IO/FSTUB] Fix the determination of 'SingleDisk' in IoGetBootDiskInformation(). The purpose of 'SingleDisk' is the same as in the IopCreateArcNames() function. It is an optimization for that when looking up the firmware-recognized ARC disks list, in order to match one of these with the current NT disk being analysed (see e.g. also in IopCreateArcNamesDisk()), we avoid a possible IopVerifyDiskSignature() call and directly build a corresponding ARC name NT symbolic link for it. 'SingleDisk' will actually be TRUE, whether the DiskSignatureListHead list is empty or contains only one element: Indeed in only both these cases, 'DiskSignatureListHead.Flink->Flink' will refer to the list head. (If the list is empty but 'SingleDisk' is TRUE, this does not matter, because the DiskSignatureListHead looking-up loop never starts.) --- ntoskrnl/fstub/fstubex.c | 8 +++++--- ntoskrnl/io/iomgr/arcname.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 21a0dbd1561..1904d32339a 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -1866,13 +1866,15 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, /* Init some useful stuff: * Get ARC disks information - * Check whether we have a single disk + * Check whether we have a single disk on the machine * Check received structure size (extended or not?) * Init boot strings (system/boot) * Finaly, get disk count */ ArcDiskInformation = IopLoaderBlock->ArcDiskInformation; - SingleDisk = IsListEmpty(&(ArcDiskInformation->DiskSignatureListHead)); + SingleDisk = (ArcDiskInformation->DiskSignatureListHead.Flink->Flink == + &ArcDiskInformation->DiskSignatureListHead); + IsBootDiskInfoEx = (Size >= sizeof(BOOTDISK_INFORMATION_EX)); RtlInitAnsiString(&ArcBootString, IopLoaderBlock->ArcBootDeviceName); RtlInitAnsiString(&ArcSystemString, IopLoaderBlock->ArcHalDeviceName); @@ -2147,7 +2149,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, } } - /* Finally, release drive layout structure */ + /* Finally, release drive layout */ ExFreePool(DriveLayout); } diff --git a/ntoskrnl/io/iomgr/arcname.c b/ntoskrnl/io/iomgr/arcname.c index bdb3e7b1324..3be5930ec69 100644 --- a/ntoskrnl/io/iomgr/arcname.c +++ b/ntoskrnl/io/iomgr/arcname.c @@ -48,8 +48,8 @@ IopCreateArcNames(IN PLOADER_PARAMETER_BLOCK LoaderBlock) ANSI_STRING ArcSystemString, ArcString, LanmanRedirector, LoaderPathNameA; /* Check if we only have one disk on the machine */ - SingleDisk = ArcDiskInfo->DiskSignatureListHead.Flink->Flink == - (&ArcDiskInfo->DiskSignatureListHead); + SingleDisk = (ArcDiskInfo->DiskSignatureListHead.Flink->Flink == + &ArcDiskInfo->DiskSignatureListHead); /* Create the global HAL partition name */ sprintf(Buffer, "\\ArcName\\%s", LoaderBlock->ArcHalDeviceName);

1 0

[reactos] 02/04: [NTOS:IO] Avoid hardcoding variable types in sizeofs when possible.
by Hermès Bélusca-Maïto 11 Jun '21

11 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99078646c372782016dd2… commit 99078646c372782016dd28ddc880907693336b68 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 19:30:45 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 11 02:21:47 2021 +0200 [NTOS:IO] Avoid hardcoding variable types in sizeofs when possible. --- ntoskrnl/fstub/fstubex.c | 6 +++--- ntoskrnl/io/iomgr/arcname.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 6e43f238e66..21a0dbd1561 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -1914,7 +1914,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, NULL, 0, &DiskGeometry, - sizeof(DISK_GEOMETRY), + sizeof(DiskGeometry), FALSE, &Event, &IoStatusBlock); @@ -2023,7 +2023,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, NULL, 0, &PartitionInformation, - sizeof(PARTITION_INFORMATION_EX), + sizeof(PartitionInformation), FALSE, &Event, &IoStatusBlock); @@ -2094,7 +2094,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, NULL, 0, &PartitionInformation, - sizeof(PARTITION_INFORMATION_EX), + sizeof(PartitionInformation), FALSE, &Event, &IoStatusBlock); diff --git a/ntoskrnl/io/iomgr/arcname.c b/ntoskrnl/io/iomgr/arcname.c index c36af33a5e8..bdb3e7b1324 100644 --- a/ntoskrnl/io/iomgr/arcname.c +++ b/ntoskrnl/io/iomgr/arcname.c @@ -274,7 +274,7 @@ IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock) NULL, 0, &DeviceNumber, - sizeof(STORAGE_DEVICE_NUMBER), + sizeof(DeviceNumber), FALSE, &Event, &IoStatusBlock); @@ -499,7 +499,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, NULL, 0, &DeviceNumber, - sizeof(STORAGE_DEVICE_NUMBER), + sizeof(DeviceNumber), FALSE, &Event, &IoStatusBlock); @@ -581,7 +581,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, NULL, 0, &DiskGeometry, - sizeof(DISK_GEOMETRY), + sizeof(DiskGeometry), FALSE, &Event, &IoStatusBlock);

1 0

[reactos] 01/04: [NTOS:IO] Minor code style fixes (typos; improve comments/DPRINT; IN vs. OUT parameter).
by Hermès Bélusca-Maïto 11 Jun '21

11 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e65e6b28d78eae93896a… commit 6e65e6b28d78eae93896aeb95fc4876b83063c85 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 19:24:04 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 11 02:21:47 2021 +0200 [NTOS:IO] Minor code style fixes (typos; improve comments/DPRINT; IN vs. OUT parameter). --- ntoskrnl/fstub/fstubex.c | 14 +++++++------- ntoskrnl/io/iomgr/arcname.c | 36 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 84296e0a722..6e43f238e66 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -1852,7 +1852,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, PAGED_CODE(); - /* Get loader block. If it's null, we come to late */ + /* Get loader block. If it's null, we come too late */ if (!IopLoaderBlock) { return STATUS_TOO_LATE; @@ -1865,7 +1865,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, } /* Init some useful stuff: - * Get arc disks information + * Get ARC disks information * Check whether we have a single disk * Check received structure size (extended or not?) * Init boot strings (system/boot) @@ -1955,7 +1955,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, DiskGeometry.BytesPerSector = 512; } - /* Now, for each arc disk, try to find the matching */ + /* Now, for each ARC disk, try to find the matching */ for (NextEntry = ArcDiskInformation->DiskSignatureListHead.Flink; NextEntry != &ArcDiskInformation->DiskSignatureListHead; NextEntry = NextEntry->Flink) @@ -1963,7 +1963,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, ArcDiskSignature = CONTAINING_RECORD(NextEntry, ARC_DISK_SIGNATURE, ListEntry); - /* If they matches, ie + /* If they match, i.e. * - There's only one disk for both BIOS and detected * - Signatures are matching * - This is MBR @@ -1973,7 +1973,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, (IopVerifyDiskSignature(DriveLayout, ArcDiskSignature, &Signature))) && (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR)) { - /* Create arc name */ + /* Create ARC name */ sprintf(ArcBuffer, "\\ArcName\\%s", ArcDiskSignature->ArcName); RtlInitAnsiString(&ArcNameStringA, ArcBuffer); @@ -1995,7 +1995,7 @@ IoGetBootDiskInformation(IN OUT PBOOTDISK_INFORMATION BootDiskInformation, Signature = DriveLayout->Mbr.Signature; } - /* Create partial arc name */ + /* Create partial ARC name */ sprintf(ArcBuffer, "%spartition(%lu)", ArcDiskSignature->ArcName, PartitionNumber); RtlInitAnsiString(&ArcNameStringA, ArcBuffer); @@ -2524,7 +2524,7 @@ IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject, FALSE, DriveLayout->PartitionCount, DriveLayout->PartitionEntry); - /* If it succeed, also update backup table */ + /* If it succeeded, also update backup table */ if (NT_SUCCESS(Status)) { Status = FstubWritePartitionTableEFI(Disk, diff --git a/ntoskrnl/io/iomgr/arcname.c b/ntoskrnl/io/iomgr/arcname.c index 2e7cbb968b1..c36af33a5e8 100644 --- a/ntoskrnl/io/iomgr/arcname.c +++ b/ntoskrnl/io/iomgr/arcname.c @@ -24,16 +24,14 @@ PCHAR IoLoaderArcBootDeviceName; CODE_SEG("INIT") NTSTATUS NTAPI -IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock -); +IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock); CODE_SEG("INIT") NTSTATUS NTAPI IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN BOOLEAN SingleDisk, - IN PBOOLEAN FoundBoot -); + OUT PBOOLEAN FoundBoot); CODE_SEG("INIT") NTSTATUS @@ -136,7 +134,7 @@ IopCreateArcNames(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Loop every disk and try to find boot disk */ Status = IopCreateArcNamesDisk(LoaderBlock, SingleDisk, &FoundBoot); - /* If it succeed but we didn't find boot device, try to browse Cds */ + /* If it succeeded but we didn't find boot device, try to browse Cds */ if (NT_SUCCESS(Status) && !FoundBoot) { Status = IopCreateArcNamesCd(LoaderBlock); @@ -178,7 +176,7 @@ IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock) * that have been successfully handled by MountMgr driver * and that already own their device name. This is the "new" way * to handle them, that came with NT5. - * Currently, Windows 2003 provides an arc names creation based + * Currently, Windows 2003 provides an ARC names creation based * on both enabled drives and not enabled drives (lack from * the driver). * Given the current ReactOS state, that's good for us. @@ -357,7 +355,7 @@ IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Status = IoStatusBlock.Status; } - /* Reading succeed, compute checksum by adding data, 2048 bytes checksum */ + /* If reading succeeded, compute checksum by adding data, 2048 bytes checksum */ if (NT_SUCCESS(Status)) { for (i = 0; i < 2048 / sizeof(ULONG); i++) @@ -413,7 +411,7 @@ NTSTATUS NTAPI IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN BOOLEAN SingleDisk, - IN PBOOLEAN FoundBoot) + OUT PBOOLEAN FoundBoot) { PIRP Irp; PVOID Data; @@ -644,7 +642,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, goto Cleanup; } - /* Read a sector for computing checksum */ + /* Read the first sector for computing checksum */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, DeviceObject, PartitionBuffer, @@ -677,7 +675,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, ObDereferenceObject(FileObject); - /* Calculate checksum, that's an easy computation, just adds read data */ + /* Calculate checksum by adding data */ for (i = 0, CheckSum = 0; i < 512 / sizeof(ULONG) ; i++) { CheckSum += PartitionBuffer[i]; @@ -692,7 +690,7 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, ARC_DISK_SIGNATURE, ListEntry); - /* If they matches, ie + /* If they match, i.e. * - There's only one disk for both BIOS and detected/enabled * - Signatures are matching * - Checksums are matching @@ -789,15 +787,15 @@ IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, } else { - /* In case there's a valid partition, a matching signature, - BUT a none matching checksum, or there's a duplicate - signature, or even worse a virus played with partition - table */ - if (ArcDiskSignature->Signature == Signature && - (ArcDiskSignature->CheckSum + CheckSum != 0) && - ArcDiskSignature->ValidPartitionTable) + /* Debugging feedback: Warn in case there's a valid partition, + * a matching signature, BUT a non-matching checksum: this can + * be the sign of a duplicate signature, or even worse a virus + * played with the partition table. */ + if (ArcDiskSignature->ValidPartitionTable && + (ArcDiskSignature->Signature == Signature) && + (ArcDiskSignature->CheckSum + CheckSum != 0)) { - DPRINT("Be careful, or you have a duplicate disk signature, or a virus altered your MBR!\n"); + DPRINT("Be careful, you have a duplicate disk signature, or a virus altered your MBR!\n"); } } }

1 0

[reactos] 01/01: [SHELL32_APITEST] Improve ShellExecCmdLine testcase more (#3736)
by Katayama Hirofumi MZ 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afd349a93e6f9ed981cb6… commit afd349a93e6f9ed981cb640c59391c95e19bd6fa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 11 08:09:18 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jun 11 08:09:18 2021 +0900 [SHELL32_APITEST] Improve ShellExecCmdLine testcase more (#3736) - Simplify code. - Loose the condition of success. - Add some missing tests. - Close newly opened windows gracefully. CORE-17351, CORE-16898, CORE-17612 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 649 +++++++++++++-------- 1 file changed, 403 insertions(+), 246 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 084d85f351e..ce53cd45968 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -32,8 +32,8 @@ static const WCHAR wszCom[] = L".com"; static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source) { - *target = (WCHAR *)SHAlloc((lstrlenW(source) + 1) * sizeof(WCHAR) ); - lstrcpyW(*target, source); + *target = (WCHAR *)SHAlloc((lstrlenW(source) + 1) * sizeof(WCHAR) ); + lstrcpyW(*target, source); } // NOTE: You have to sync the following code to dll/win32/shell32/shlexec.cpp. @@ -244,200 +244,360 @@ SHELLEXECCMDLINE g_pShellExecCmdLine = NULL; typedef struct TEST_ENTRY { INT lineno; - HRESULT hr; + BOOL result; BOOL bAllowNonExe; - LPCWSTR pwszWindowClass; LPCWSTR pwszCommand; LPCWSTR pwszStartDir; } TEST_ENTRY; -static const char s_testfile1[] = "Test File.txt"; -static const char s_testfile2[] = "Test File.bat"; +static WCHAR s_sub_program[MAX_PATH]; +static WCHAR s_win_test_exe[MAX_PATH]; +static WCHAR s_sys_bat_file[MAX_PATH]; +static WCHAR s_cur_dir[MAX_PATH]; -static const TEST_ENTRY s_entries[] = +static BOOL +GetSubProgramPath(void) +{ + GetModuleFileNameW(NULL, s_sub_program, _countof(s_sub_program)); + PathRemoveFileSpecW(s_sub_program); + PathAppendW(s_sub_program, L"shell32_apitest_sub.exe"); + + if (!PathFileExistsW(s_sub_program)) + { + PathRemoveFileSpecW(s_sub_program); + PathAppendW(s_sub_program, L"testdata\\shell32_apitest_sub.exe"); + + if (!PathFileExistsW(s_sub_program)) + { + return FALSE; + } + } + + return TRUE; +} + +static const TEST_ENTRY s_entries_1[] = { // NULL - { __LINE__, (HRESULT)0xDEADFACE, FALSE, NULL, NULL, NULL }, - { __LINE__, (HRESULT)0xDEADFACE, FALSE, NULL, NULL, L"." }, - { __LINE__, (HRESULT)0xDEADFACE, FALSE, NULL, NULL, L"system32" }, - { __LINE__, (HRESULT)0xDEADFACE, FALSE, NULL, NULL, L"C:\\Program Files" }, - { __LINE__, (HRESULT)0xDEADFACE, TRUE, NULL, NULL, NULL }, - { __LINE__, (HRESULT)0xDEADFACE, TRUE, NULL, NULL, L"." }, - { __LINE__, (HRESULT)0xDEADFACE, TRUE, NULL, NULL, L"system32" }, - { __LINE__, (HRESULT)0xDEADFACE, TRUE, NULL, NULL, L"C:\\Program Files" }, + { __LINE__, 0xBADFACE, FALSE, NULL, NULL }, + { __LINE__, 0xBADFACE, FALSE, NULL, L"." }, + { __LINE__, 0xBADFACE, FALSE, NULL, L"system32" }, + { __LINE__, 0xBADFACE, FALSE, NULL, L"C:\\Program Files" }, + { __LINE__, 0xBADFACE, TRUE, NULL, NULL }, + { __LINE__, 0xBADFACE, TRUE, NULL, L"." }, + { __LINE__, 0xBADFACE, TRUE, NULL, L"system32" }, + { __LINE__, 0xBADFACE, TRUE, NULL, L"C:\\Program Files" }, // notepad - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad", L"." }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad", L"system32" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad", L"C:\\Program Files" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad \"Test File.txt\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad \"Test File.txt\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad", L"system32" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad", L"C:\\Program Files" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad \"Test File.txt\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad \"Test File.txt\"", L"." }, + { __LINE__, TRUE, FALSE, L"notepad", NULL }, + { __LINE__, TRUE, FALSE, L"notepad", L"." }, + { __LINE__, TRUE, FALSE, L"notepad", L"system32" }, + { __LINE__, TRUE, FALSE, L"notepad", L"C:\\Program Files" }, + { __LINE__, TRUE, FALSE, L"notepad \"Test File.txt\"", NULL }, + { __LINE__, TRUE, FALSE, L"notepad \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"notepad", NULL }, + { __LINE__, TRUE, TRUE, L"notepad", L"." }, + { __LINE__, TRUE, TRUE, L"notepad", L"system32" }, + { __LINE__, TRUE, TRUE, L"notepad", L"C:\\Program Files" }, + { __LINE__, TRUE, TRUE, L"notepad \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"notepad \"Test File.txt\"", L"." }, // notepad.exe - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe", L"." }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe", L"system32" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe", L"C:\\Program Files" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe \"Test File.txt\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"notepad.exe \"Test File.txt\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe", L"system32" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe", L"C:\\Program Files" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe \"Test File.txt\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"notepad.exe \"Test File.txt\"", L"." }, + { __LINE__, TRUE, FALSE, L"notepad.exe", NULL }, + { __LINE__, TRUE, FALSE, L"notepad.exe", L"." }, + { __LINE__, TRUE, FALSE, L"notepad.exe", L"system32" }, + { __LINE__, TRUE, FALSE, L"notepad.exe", L"C:\\Program Files" }, + { __LINE__, TRUE, FALSE, L"notepad.exe \"Test File.txt\"", NULL }, + { __LINE__, TRUE, FALSE, L"notepad.exe \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"notepad.exe", NULL }, + { __LINE__, TRUE, TRUE, L"notepad.exe", L"." }, + { __LINE__, TRUE, TRUE, L"notepad.exe", L"system32" }, + { __LINE__, TRUE, TRUE, L"notepad.exe", L"C:\\Program Files" }, + { __LINE__, TRUE, TRUE, L"notepad.exe \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"notepad.exe \"Test File.txt\"", L"." }, // C:\notepad.exe - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"C:\\notepad.exe \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"C:\\notepad.exe \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe", NULL }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe", L"." }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe", L"system32" }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"C:\\notepad.exe \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe", NULL }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe", L"." }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe", L"system32" }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"C:\\notepad.exe \"Test File.txt\"", L"." }, // "notepad" - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\"", L"." }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\"", L"system32" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\"", L"C:\\Program Files" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\" \"Test File.txt\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad\" \"Test File.txt\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\"", L"system32" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\"", L"C:\\Program Files" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\" \"Test File.txt\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"notepad\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"notepad\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"notepad\"", L"system32" }, + { __LINE__, TRUE, FALSE, L"\"notepad\"", L"C:\\Program Files" }, + { __LINE__, TRUE, FALSE, L"\"notepad\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"notepad\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"notepad\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"notepad\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"notepad\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"notepad\"", L"C:\\Program Files" }, + { __LINE__, TRUE, TRUE, L"\"notepad\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"notepad\" \"Test File.txt\"", L"." }, // "notepad.exe" - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\"", L"." }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\"", L"system32" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\"", L"C:\\Program Files" }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\" \"Test File.txt\"", NULL }, - { __LINE__, S_OK, FALSE, L"Notepad", L"\"notepad.exe\" \"Test File.txt\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\"", L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\"", L"system32" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\"", L"C:\\Program Files" }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\" \"Test File.txt\"", NULL }, - { __LINE__, S_OK, TRUE, L"Notepad", L"\"notepad.exe\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\"", L"system32" }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\"", L"C:\\Program Files" }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"notepad.exe\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\"", L"C:\\Program Files" }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"notepad.exe\" \"Test File.txt\"", L"." }, + // test program + { __LINE__, FALSE, FALSE, L"test program", NULL }, + { __LINE__, FALSE, FALSE, L"test program", L"." }, + { __LINE__, FALSE, FALSE, L"test program", L"system32" }, + { __LINE__, FALSE, FALSE, L"test program", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"test program \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"test program \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"test program", NULL }, + { __LINE__, FALSE, TRUE, L"test program", L"." }, + { __LINE__, FALSE, TRUE, L"test program", L"system32" }, + { __LINE__, FALSE, TRUE, L"test program", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"test program \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"test program \"Test File.txt\"", L"." }, // test program.exe - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"test program.exe \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"test program.exe \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"test program.exe", NULL }, + { __LINE__, FALSE, FALSE, L"test program.exe", L"." }, + { __LINE__, FALSE, FALSE, L"test program.exe", L"system32" }, + { __LINE__, FALSE, FALSE, L"test program.exe", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"test program.exe \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"test program.exe \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"test program.exe", NULL }, + { __LINE__, FALSE, TRUE, L"test program.exe", L"." }, + { __LINE__, FALSE, TRUE, L"test program.exe", L"system32" }, + { __LINE__, FALSE, TRUE, L"test program.exe", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"test program.exe \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"test program.exe \"Test File.txt\"", L"." }, + // test program.bat + { __LINE__, FALSE, FALSE, L"test program.bat", NULL }, + { __LINE__, FALSE, FALSE, L"test program.bat", L"." }, + { __LINE__, FALSE, FALSE, L"test program.bat", L"system32" }, + { __LINE__, FALSE, FALSE, L"test program.bat", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"test program.bat \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"test program.bat \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"test program.bat", NULL }, + { __LINE__, FALSE, TRUE, L"test program.bat", L"." }, + { __LINE__, FALSE, TRUE, L"test program.bat", L"system32" }, + { __LINE__, FALSE, TRUE, L"test program.bat", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"test program.bat \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"test program.bat \"Test File.txt\"", L"." }, // "test program" - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\"", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\"", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\"", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\" \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program\" \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\"", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\"", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\" \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"test program\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"test program\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"test program\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"test program\"", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"\"test program\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"test program\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"test program\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"test program\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"test program\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"test program\"", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"\"test program\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"test program\" \"Test File.txt\"", L"." }, // "test program.exe" - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\"", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\"", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\"", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\" \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"test program.exe\" \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\"", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\"", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\" \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"test program.exe\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\"", L"." }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\"", L"system32" }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\"", L"C:\\Program Files" }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, FALSE, L"\"test program.exe\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\"", L"C:\\Program Files" }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"test program.exe\" \"Test File.txt\"", L"." }, + // "test program.bat" + { __LINE__, FALSE, FALSE, L"\"test program.bat\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"test program.bat\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"test program.bat\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"test program.bat\"", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"\"test program.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"test program.bat\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\"", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"test program.bat\" \"Test File.txt\"", L"." }, // invalid program - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"invalid program \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"invalid program \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"invalid program", NULL }, + { __LINE__, FALSE, FALSE, L"invalid program", L"." }, + { __LINE__, FALSE, FALSE, L"invalid program", L"system32" }, + { __LINE__, FALSE, FALSE, L"invalid program", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"invalid program \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"invalid program \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"invalid program", NULL }, + { __LINE__, FALSE, TRUE, L"invalid program", L"." }, + { __LINE__, FALSE, TRUE, L"invalid program", L"system32" }, + { __LINE__, FALSE, TRUE, L"invalid program", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"invalid program \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"invalid program \"Test File.txt\"", L"." }, // \"invalid program.exe\" - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\"", L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\"", L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\"", L"C:\\Program Files" }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"invalid program.exe\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\"", L"C:\\Program Files" }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"invalid program.exe\" \"Test File.txt\"", L"." }, // My Documents - { __LINE__, S_OK, TRUE, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, - { __LINE__, S_OK, TRUE, NULL, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, - // Control Panel - { __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, - { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, + { __LINE__, TRUE, TRUE, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, + { __LINE__, TRUE, TRUE, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL }, // shell:sendto - { __LINE__, S_OK, TRUE, NULL, L"shell:sendto", NULL }, + { __LINE__, TRUE, TRUE, L"shell:sendto", NULL }, + // iexplore.exe + { __LINE__, TRUE, FALSE, L"iexplore", NULL }, + { __LINE__, TRUE, FALSE, L"iexplore.exe", NULL }, + { __LINE__, TRUE, TRUE, L"iexplore", NULL }, + { __LINE__, TRUE, TRUE, L"iexplore.exe", NULL }, + // https://google.com + { __LINE__, TRUE, FALSE, L"https://google.com", NULL }, + { __LINE__, TRUE, TRUE, L"https://google.com", NULL }, + // Test File 1.txt + { __LINE__, FALSE, FALSE, L"Test File 1.txt", NULL }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", L"." }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", L"system32" }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"Test File 1.txt", NULL }, + { __LINE__, TRUE, TRUE, L"Test File 1.txt", L"." }, + { __LINE__, FALSE, TRUE, L"Test File 1.txt", L"system32" }, + { __LINE__, TRUE, TRUE, L"Test File 1.txt", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 1.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", s_cur_dir }, + // Test File 2.bat + { __LINE__, FALSE, FALSE, L"Test File 2.bat", NULL }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", L"." }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", L"system32" }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", NULL }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", L"." }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", L"system32" }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", s_cur_dir }, }; -static BOOL CloseAppWindows(LPCWSTR pwszWindowClass, BOOL bRetry, INT nCount = 10) +static const TEST_ENTRY s_entries_2[] = { -#define INTERVAL 100 - BOOL bFound = FALSE; - for (INT i = 0; i < nCount; ++i) - { - HWND hwnd = FindWindowW(pwszWindowClass, NULL); - if (!hwnd) - { - if (!bRetry) - break; - Sleep(INTERVAL); - continue; - } - bFound = TRUE; - HWND hwndPopup = GetLastActivePopup(hwnd); - if (hwndPopup && hwnd != hwndPopup) - { - PostMessageW(hwndPopup, WM_COMMAND, IDCANCEL, 0); - PostMessageW(hwndPopup, WM_COMMAND, IDNO, 0); - PostMessageW(hwndPopup, WM_CLOSE, 0, 0); - } - PostMessageW(hwnd, WM_CLOSE, 0, 0); - Sleep(INTERVAL); - } - return bFound; -#undef INTERVAL + // Test File 1.txt (with setting path) + { __LINE__, FALSE, FALSE, L"Test File 1.txt", NULL }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", L"." }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", L"system32" }, + { __LINE__, FALSE, FALSE, L"Test File 1.txt", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\"", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 1.txt\" \"Test File.txt\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"Test File 1.txt", NULL }, + { __LINE__, TRUE, TRUE, L"Test File 1.txt", L"." }, + { __LINE__, FALSE, TRUE, L"Test File 1.txt", L"system32" }, + { __LINE__, TRUE, TRUE, L"Test File 1.txt", s_cur_dir }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\"", s_cur_dir }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", NULL }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", L"." }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", L"system32" }, + { __LINE__, TRUE, TRUE, L"\"Test File 1.txt\" \"Test File.txt\"", s_cur_dir }, + // Test File 2.bat (with setting path) + { __LINE__, FALSE, FALSE, L"Test File 2.bat", NULL }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", L"." }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", L"system32" }, + { __LINE__, FALSE, FALSE, L"Test File 2.bat", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\"", s_cur_dir }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, FALSE, L"\"Test File 2.bat\" \"Test File.txt\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", NULL }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", L"." }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", L"system32" }, + { __LINE__, FALSE, TRUE, L"Test File 2.bat", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\"", s_cur_dir }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", NULL }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", L"." }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", L"system32" }, + { __LINE__, FALSE, TRUE, L"\"Test File 2.bat\" \"Test File.txt\"", s_cur_dir }, +}; + +typedef struct OPENWNDS +{ + UINT count; + HWND *phwnd; +} OPENWNDS; + +static OPENWNDS s_wi0 = { 0 }, s_wi1 = { 0 }; + +static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + OPENWNDS *info = (OPENWNDS *)lParam; + info->phwnd = (HWND *)realloc(info->phwnd, (info->count + 1) * sizeof(HWND)); + if (!info->phwnd) + return FALSE; + info->phwnd[info->count] = hwnd; + ++(info->count); + return TRUE; } static void DoEntry(const TEST_ENTRY *pEntry) { HRESULT hr; DWORD dwSeclFlags; + BOOL result; if (pEntry->bAllowNonExe) dwSeclFlags = SECL_NO_UI | SECL_ALLOW_NONEXE; @@ -459,17 +619,36 @@ static void DoEntry(const TEST_ENTRY *pEntry) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - hr = 0xDEADFACE; + hr = 0xBADFACE; } _SEH2_END; - ok(hr == pEntry->hr, "Line %d: hr expected 0x%lX, was 0x%lX\n", pEntry->lineno, pEntry->hr, hr); + if (hr == 0xBADFACE) + result = hr; + else + result = (hr == S_OK); - if (SUCCEEDED(hr) && pEntry->pwszWindowClass) + ok(result == pEntry->result, "Line %d: result expected %d, was %d\n", + pEntry->lineno, pEntry->result, result); + + // close newly opened windows + EnumWindows(EnumWindowsProc, (LPARAM)&s_wi1); + for (UINT i1 = 0; i1 < s_wi1.count; ++i1) { - BOOL bFound = CloseAppWindows(pEntry->pwszWindowClass, TRUE); - ok(bFound, "Line %d: The window not found\n", pEntry->lineno); + BOOL bFound = FALSE; + for (UINT i0 = 0; i0 < s_wi0.count; ++i0) + { + if (s_wi1.phwnd[i1] == s_wi0.phwnd[i0]) + { + bFound = TRUE; + break; + } + } + if (!bFound) + PostMessageW(s_wi1.phwnd[i1], WM_CLOSE, 0, 0); } + free(s_wi1.phwnd); + ZeroMemory(&s_wi1, sizeof(s_wi1)); } START_TEST(ShellExecCmdLine) @@ -493,92 +672,70 @@ START_TEST(ShellExecCmdLine) } } - CloseAppWindows(L"Notepad", FALSE); - - // s_testfile1 - FILE *fp = fopen(s_testfile1, "wb"); - ok(fp != NULL, "failed to create a test file\n"); - fclose(fp); - - // s_testfile2 - fp = fopen(s_testfile2, "wb"); - ok(fp != NULL, "failed to create a test file\n"); - if (fp) + if (!GetSubProgramPath()) { - fprintf(fp, "echo OK\n"); + skip("shell32_apitest_sub.exe is not found\n"); + return; } - fclose(fp); - for (size_t i = 0; i < _countof(s_entries); ++i) + // record open windows + if (!EnumWindows(EnumWindowsProc, (LPARAM)&s_wi0)) { - DoEntry(&s_entries[i]); + skip("EnumWindows failed\n"); + free(s_wi0.phwnd); + return; } - WCHAR buf0[MAX_PATH]; - WCHAR buf1[MAX_PATH]; - WCHAR buf2[MAX_PATH]; - TEST_ENTRY additionals[] = + // s_win_test_exe + GetWindowsDirectoryW(s_win_test_exe, _countof(s_win_test_exe)); + PathAppendW(s_win_test_exe, L"test program.exe"); + BOOL ret = CopyFileW(s_sub_program, s_win_test_exe, FALSE); + if (!ret) { - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf0, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf0, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf0, L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf1, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf1, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf1, L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf2, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf2, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, L"Notepad", buf2, L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", buf0, NULL }, // FIXME - { __LINE__, S_OK, TRUE, L"Notepad", buf0, L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", buf0, L"system32" }, // FIXME - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", buf1, NULL }, // FIXME - { __LINE__, S_OK, TRUE, L"Notepad", buf1, L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", buf1, L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", buf2, NULL }, // FIXME - { __LINE__, S_OK, TRUE, L"Notepad", buf2, L"." }, - { __LINE__, S_OK, TRUE, L"Notepad", buf2, L"system32" }, - }; - - wsprintfW(buf0, L"%hs", s_testfile1); - wsprintfW(buf1, L"\"%hs\"", s_testfile1); - wsprintfW(buf2, L"\"%hs\" \"Test File.txt\"", s_testfile1); - for (size_t i = 0; i < _countof(additionals); ++i) - { - DoEntry(&additionals[i]); + skip("Please retry with admin rights\n"); + free(s_wi0.phwnd); + return; } - TEST_ENTRY additionals2[] = + FILE *fp; + + // s_sys_bat_file + GetSystemDirectoryW(s_sys_bat_file, _countof(s_sys_bat_file)); + PathAppendW(s_sys_bat_file, L"test program.bat"); + fp = _wfopen(s_sys_bat_file, L"wb"); + fclose(fp); + ok_int(PathFileExistsW(s_sys_bat_file), TRUE); + + // "Test File 1.txt" + fp = fopen("Test File 1.txt", "wb"); + ok(fp != NULL, "failed to create a test file\n"); + fclose(fp); + ok_int(PathFileExistsA("Test File 1.txt"), TRUE); + + // "Test File 2.bat" + fp = fopen("Test File 2.bat", "wb"); + ok(fp != NULL, "failed to create a test file\n"); + fclose(fp); + ok_int(PathFileExistsA("Test File 2.bat"), TRUE); + + // s_cur_dir + GetCurrentDirectoryW(_countof(s_cur_dir), s_cur_dir); + + // do tests + for (size_t i = 0; i < _countof(s_entries_1); ++i) { - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf0, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf0, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf0, L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf1, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf1, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf1, L"system32" }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf2, NULL }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf2, L"." }, - { __LINE__, CO_E_APPNOTFOUND, FALSE, NULL, buf2, L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, NULL, buf0, NULL }, // FIXME - { __LINE__, S_OK, TRUE, NULL, buf0, L"." }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, NULL, buf0, L"system32" }, // FIXME - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, NULL, buf1, NULL }, // FIXME - { __LINE__, S_OK, TRUE, NULL, buf1, L"." }, - { __LINE__, S_OK, TRUE, NULL, buf1, L"system32" }, - { __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, NULL, buf2, NULL }, // FIXME - { __LINE__, S_OK, TRUE, NULL, buf2, L"." }, - { __LINE__, S_OK, TRUE, NULL, buf2, L"system32" }, - }; - - wsprintfW(buf0, L"%hs", s_testfile2); - wsprintfW(buf1, L"\"%hs\"", s_testfile2); - wsprintfW(buf2, L"\"%hs\" \"Test File.txt\"", s_testfile2); - for (size_t i = 0; i < _countof(additionals2); ++i) + DoEntry(&s_entries_1[i]); + } + SetEnvironmentVariableW(L"PATH", s_cur_dir); + for (size_t i = 0; i < _countof(s_entries_2); ++i) { - DoEntry(&additionals2[i]); + DoEntry(&s_entries_2[i]); } // clean up - ok(DeleteFileA(s_testfile1), "failed to delete the test file\n"); - ok(DeleteFileA(s_testfile2), "failed to delete the test file\n"); - CloseAppWindows(L"Notepad", FALSE); + ok(DeleteFileW(s_win_test_exe), "failed to delete the test file\n"); + ok(DeleteFileW(s_sys_bat_file), "failed to delete the test file\n"); + ok(DeleteFileA("Test File 1.txt"), "failed to delete the test file\n"); + ok(DeleteFileA("Test File 2.bat"), "failed to delete the test file\n"); + free(s_wi0.phwnd); }

1 0

[reactos] 01/01: [CMAKE] host-tools: Define ROS_SAVED_* for MSVC_IDE only
by Serge Gautherie 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2317d773e937e0504aa4… commit c2317d773e937e0504aa4ceb11caee7b409c7f0f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jun 11 02:08:12 2021 +0300 [CMAKE] host-tools: Define ROS_SAVED_* for MSVC_IDE only Addendum to 18e95f5. ROSBE-174 --- sdk/cmake/host-tools.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 8533c3614ee..a415297455c 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -79,6 +79,14 @@ function(setup_host_tools) -DCMAKE_CXX_COMPILER=cl) endif() + if (MSVC_IDE) + # Required for Bison/Flex wrappers created by /CMakeLists.txt. + list(APPEND CMAKE_HOST_TOOLS_EXTRA_ARGS + -DROS_SAVED_BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR} + -DROS_SAVED_M4=${ROS_SAVED_M4} + ) + endif() + ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools @@ -89,8 +97,6 @@ function(setup_host_tools) -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin - -DROS_SAVED_M4=${ROS_SAVED_M4} - -DROS_SAVED_BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR} -DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID} ${CMAKE_HOST_TOOLS_EXTRA_ARGS} BUILD_ALWAYS TRUE

1 0

[reactos] 01/01: [SOUNDS] Add new Recycle Bin system sound Add new sound for Recycle Bin sound event. Since this sound event is now working properly after some fixes in shell32 code, it's now possible for user to set the sound for this sound event manually. But don't enable it by default, since it is also disabled on Windows Server 2003. CORE-15868
by Oleg Dubinskiy 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e29107f316e7d2f69cde… commit 6e29107f316e7d2f69cde974639d208fbaa40fef Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Jun 4 17:32:07 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jun 11 02:06:11 2021 +0300 [SOUNDS] Add new Recycle Bin system sound Add new sound for Recycle Bin sound event. Since this sound event is now working properly after some fixes in shell32 code, it's now possible for user to set the sound for this sound event manually. But don't enable it by default, since it is also disabled on Windows Server 2003. CORE-15868 --- media/CMakeLists.txt | 1 + media/sounds/ReactOS_Recycle.wav | Bin 0 -> 109412 bytes 2 files changed, 1 insertion(+) diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index dd2a78ea9f8..2f8cecc8b22 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -12,6 +12,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/networks DESTINATION re add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/protocol DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_Recycle.wav DESTINATION reactos/media FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/systemcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/forwardcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/media/sounds/ReactOS_Recycle.wav b/media/sounds/ReactOS_Recycle.wav new file mode 100644 index 00000000000..bf9c7fa57f1 Binary files /dev/null and b/media/sounds/ReactOS_Recycle.wav differ

1 0

[reactos] 01/01: [RAPPS] Fix double free when closing rapps
by Mark Jansen 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=675edad96f8dfec3b1fd2… commit 675edad96f8dfec3b1fd2a3a88b877eca2e8f039 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jun 9 22:56:53 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jun 10 21:25:34 2021 +0200 [RAPPS] Fix double free when closing rapps --- base/applications/rapps/appview.cpp | 14 ++++++++++---- base/applications/rapps/include/appview.h | 7 ++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 57442cd0e80..aa908ffcf2c 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1113,12 +1113,18 @@ CAppInfoDisplay::~CAppInfoDisplay() // **** CAppsListView **** -CAppsListView::CAppsListView() : - bHasCheckboxes(FALSE), - nLastHeaderID(-1) +CAppsListView::CAppsListView() { } +CAppsListView::~CAppsListView() +{ + if (m_hImageListView) + { + ImageList_Destroy(m_hImageListView); + } +} + VOID CAppsListView::SetCheckboxesVisible(BOOL bIsVisible) { if (bIsVisible) @@ -1253,7 +1259,7 @@ INT CAppsListView::CompareFunc(LPARAM lParam1, LPARAM lParam2, INT iSubItem) HWND CAppsListView::Create(HWND hwndParent) { RECT r = { 205, 28, 465, 250 }; - DWORD style = WS_CHILD | WS_VISIBLE | LVS_SORTASCENDING | LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE; + DWORD style = WS_CHILD | WS_VISIBLE | LVS_SORTASCENDING | LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_SHAREIMAGELISTS; HWND hwnd = CListView::Create(hwndParent, r, NULL, style, WS_EX_CLIENTEDGE); diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 668131245ce..192a59c7489 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -211,20 +211,21 @@ class CAppsListView : }; BOOL bIsAscending = TRUE; - BOOL bHasCheckboxes; + BOOL bHasCheckboxes = FALSE; INT ItemCount = 0; INT CheckedItemCount = 0; INT ColumnCount = 0; - INT nLastHeaderID; + INT nLastHeaderID = -1; APPLICATION_VIEW_TYPE ApplicationViewType = AppViewTypeEmpty; - HIMAGELIST m_hImageListView; + HIMAGELIST m_hImageListView = NULL; public: CAppsListView(); + ~CAppsListView(); VOID SetCheckboxesVisible(BOOL bIsVisible);

1 0

[reactos] 01/01: [HIDPARSER] Don't include pshpack1.h before including other headers
by Timo Kreuzer 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9229e73f03afc07880121… commit 9229e73f03afc07880121f27797be5927b0a3552 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jun 9 10:54:05 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jun 10 08:52:22 2021 +0200 [HIDPARSER] Don't include pshpack1.h before including other headers NEVER DO THIS! It is guaranteed to be wrong. Instead always individually pack single structures that need packing. This fixes USB mouse on 64 bit builds. --- sdk/lib/drivers/hidparser/parser.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/lib/drivers/hidparser/parser.h b/sdk/lib/drivers/hidparser/parser.h index 5e115399b50..32061daa4b9 100644 --- a/sdk/lib/drivers/hidparser/parser.h +++ b/sdk/lib/drivers/hidparser/parser.h @@ -2,7 +2,6 @@ #define _HIDPARSER_H_ #include <wdm.h> -#include <pshpack1.h> #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include <hidpddi.h> @@ -84,6 +83,7 @@ typedef struct UCHAR Tag:4; }ITEM_PREFIX, *PITEM_PREFIX; +#include <pshpack1.h> typedef struct { ITEM_PREFIX Prefix; @@ -99,6 +99,7 @@ typedef struct }Data; }SHORT_ITEM, *PSHORT_ITEM; +#include <poppack.h> typedef struct {

1 0

[reactos] 01/01: [MORE] Use positional elements to build the MORE prompt, whose state is controlled by flags.
by Hermès Bélusca-Maïto 10 Jun '21

10 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dbbfe86ab5b72f6e111e… commit 2dbbfe86ab5b72f6e111e56b7fbd6ae2cba34c17 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 04:10:55 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 10 04:10:55 2021 +0200 [MORE] Use positional elements to build the MORE prompt, whose state is controlled by flags. --- base/applications/cmdutils/more/lang/bg-BG.rc | 12 +-- base/applications/cmdutils/more/lang/ca-ES.rc | 12 +-- base/applications/cmdutils/more/lang/cs-CZ.rc | 12 +-- base/applications/cmdutils/more/lang/de-DE.rc | 12 +-- base/applications/cmdutils/more/lang/el-GR.rc | 12 +-- base/applications/cmdutils/more/lang/en-US.rc | 12 +-- base/applications/cmdutils/more/lang/es-ES.rc | 12 +-- base/applications/cmdutils/more/lang/et-EE.rc | 12 +-- base/applications/cmdutils/more/lang/fr-FR.rc | 12 +-- base/applications/cmdutils/more/lang/it-IT.rc | 12 +-- base/applications/cmdutils/more/lang/lt-LT.rc | 12 +-- base/applications/cmdutils/more/lang/no-NO.rc | 12 +-- base/applications/cmdutils/more/lang/pl-PL.rc | 12 +-- base/applications/cmdutils/more/lang/ro-RO.rc | 12 +-- base/applications/cmdutils/more/lang/ru-RU.rc | 12 +-- base/applications/cmdutils/more/lang/sk-SK.rc | 12 +-- base/applications/cmdutils/more/lang/sq-AL.rc | 12 +-- base/applications/cmdutils/more/lang/sv-SE.rc | 12 +-- base/applications/cmdutils/more/lang/tr-TR.rc | 12 +-- base/applications/cmdutils/more/lang/uk-UA.rc | 12 +-- base/applications/cmdutils/more/lang/zh-CN.rc | 12 +-- base/applications/cmdutils/more/lang/zh-TW.rc | 12 +-- base/applications/cmdutils/more/more.c | 127 ++++++++++++++++---------- base/applications/cmdutils/more/resource.h | 15 +-- 24 files changed, 217 insertions(+), 189 deletions(-) diff --git a/base/applications/cmdutils/more/lang/bg-BG.rc b/base/applications/cmdutils/more/lang/bg-BG.rc index 24a8a384a2f..1372cfa7dd5 100644 --- a/base/applications/cmdutils/more/lang/bg-BG.rc +++ b/base/applications/cmdutils/more/lang/bg-BG.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Продължаване --" - IDS_CONTINUE_PROGRESS "-- Продължаване (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Няма достъп до файл %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Продължаване%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/ca-ES.rc b/base/applications/cmdutils/more/lang/ca-ES.rc index f14562e6600..59401c23917 100644 --- a/base/applications/cmdutils/more/lang/ca-ES.rc +++ b/base/applications/cmdutils/more/lang/ca-ES.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Continua --" - IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "No puc accedir al fitxer %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continua%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/cs-CZ.rc b/base/applications/cmdutils/more/lang/cs-CZ.rc index fd1db132622..48fd668ff55 100644 --- a/base/applications/cmdutils/more/lang/cs-CZ.rc +++ b/base/applications/cmdutils/more/lang/cs-CZ.rc @@ -48,11 +48,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Pokračovat --" - IDS_CONTINUE_PROGRESS "-- Pokračovat (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Nelze získat přístup k souboru %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Pokračovat%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/de-DE.rc b/base/applications/cmdutils/more/lang/de-DE.rc index bfa56fcd9df..3fedd6080fd 100644 --- a/base/applications/cmdutils/more/lang/de-DE.rc +++ b/base/applications/cmdutils/more/lang/de-DE.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Fortsetzung --" - IDS_CONTINUE_PROGRESS "-- Fortsetzung (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Auf die Datei %s kann nicht zugegriffen werden.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Fortsetzung%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/el-GR.rc b/base/applications/cmdutils/more/lang/el-GR.rc index 6750bbd9317..035b50331b2 100644 --- a/base/applications/cmdutils/more/lang/el-GR.rc +++ b/base/applications/cmdutils/more/lang/el-GR.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Συνέχεια --" - IDS_CONTINUE_PROGRESS "-- Συνέχεια (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Δεν ήταν δυνατή η προσπέλαση του αρχείου %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Συνέχεια%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/en-US.rc b/base/applications/cmdutils/more/lang/en-US.rc index 5f182d8e173..96f4c543107 100644 --- a/base/applications/cmdutils/more/lang/en-US.rc +++ b/base/applications/cmdutils/more/lang/en-US.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Continue --" - IDS_CONTINUE_PROGRESS "-- Continue (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Cannot access the file %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continue%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/es-ES.rc b/base/applications/cmdutils/more/lang/es-ES.rc index d0191aa2557..9a487cf453a 100644 --- a/base/applications/cmdutils/more/lang/es-ES.rc +++ b/base/applications/cmdutils/more/lang/es-ES.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Continuar --" - IDS_CONTINUE_PROGRESS "-- Continuar (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "No se puede acceder al fichero %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continuar%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/et-EE.rc b/base/applications/cmdutils/more/lang/et-EE.rc index 4ff3b31a452..5c42e17d0d8 100644 --- a/base/applications/cmdutils/more/lang/et-EE.rc +++ b/base/applications/cmdutils/more/lang/et-EE.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Jätka --" - IDS_CONTINUE_PROGRESS "-- Jätka (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Ei saa ligi failile %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Jätka%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/fr-FR.rc b/base/applications/cmdutils/more/lang/fr-FR.rc index dd774f048eb..e0b59de9db9 100644 --- a/base/applications/cmdutils/more/lang/fr-FR.rc +++ b/base/applications/cmdutils/more/lang/fr-FR.rc @@ -44,11 +44,11 @@ disponibles à l'invite ""-- Continuer --"" :\n\ <Espace> Affiche la page suivante.\n\ <Entrée> Affiche la ligne suivante.\n" - IDS_CONTINUE "-- Continuer --" - IDS_CONTINUE_PROGRESS "-- Continuer (%d %%) --" + IDS_BAD_FLAG "Paramètre invalide - '%s'\n" IDS_FILE_ACCESS "Impossible d'accéder au fichier %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continuer%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d %%)" + IDS_CONTINUE_LINE_AT " [Ligne : %d]" + IDS_CONTINUE_OPTIONS " [Options : psfq=<Espace><Entrée>]" + IDS_CONTINUE_LINES " Lignes : " END diff --git a/base/applications/cmdutils/more/lang/it-IT.rc b/base/applications/cmdutils/more/lang/it-IT.rc index 32eb4497938..7e477fe8c19 100644 --- a/base/applications/cmdutils/more/lang/it-IT.rc +++ b/base/applications/cmdutils/more/lang/it-IT.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Continua --" - IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Impossibile accedere al file %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continua%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/lt-LT.rc b/base/applications/cmdutils/more/lang/lt-LT.rc index e7b3013a754..0e7979ca472 100644 --- a/base/applications/cmdutils/more/lang/lt-LT.rc +++ b/base/applications/cmdutils/more/lang/lt-LT.rc @@ -51,11 +51,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Toliau --" - IDS_CONTINUE_PROGRESS "-- Toliau (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Nepavyko atverti bylos %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Toliau%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/no-NO.rc b/base/applications/cmdutils/more/lang/no-NO.rc index 6274bd17536..f9396a74663 100644 --- a/base/applications/cmdutils/more/lang/no-NO.rc +++ b/base/applications/cmdutils/more/lang/no-NO.rc @@ -42,11 +42,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Fortsett --" - IDS_CONTINUE_PROGRESS "-- Fortsett (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Får ikke tilgang til filen %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Fortsett%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/pl-PL.rc b/base/applications/cmdutils/more/lang/pl-PL.rc index 9b564b1578c..b10a7c7e9ff 100644 --- a/base/applications/cmdutils/more/lang/pl-PL.rc +++ b/base/applications/cmdutils/more/lang/pl-PL.rc @@ -50,11 +50,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Kontynuuj --" - IDS_CONTINUE_PROGRESS "-- Kontynuuj (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Brak dostępu do pliku: %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Kontynuuj%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/ro-RO.rc b/base/applications/cmdutils/more/lang/ro-RO.rc index 41f25717910..ef4417a6629 100644 --- a/base/applications/cmdutils/more/lang/ro-RO.rc +++ b/base/applications/cmdutils/more/lang/ro-RO.rc @@ -50,11 +50,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Continuă --" - IDS_CONTINUE_PROGRESS "-- Continuă (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Fișierul «%s» nu poate fi accesat!\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Continuă%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/ru-RU.rc b/base/applications/cmdutils/more/lang/ru-RU.rc index 13f2aa219d2..a2ec7e99233 100644 --- a/base/applications/cmdutils/more/lang/ru-RU.rc +++ b/base/applications/cmdutils/more/lang/ru-RU.rc @@ -50,11 +50,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Продолжить --" - IDS_CONTINUE_PROGRESS "-- Продолжить (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Нет доступа к файлу %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Продолжить%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/sk-SK.rc b/base/applications/cmdutils/more/lang/sk-SK.rc index d9c83207ab8..2dc91d241a1 100644 --- a/base/applications/cmdutils/more/lang/sk-SK.rc +++ b/base/applications/cmdutils/more/lang/sk-SK.rc @@ -46,11 +46,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Pokračujte --" - IDS_CONTINUE_PROGRESS "-- Pokračujte (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Neviem získať prístup k súboru %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Pokračujte%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/sq-AL.rc b/base/applications/cmdutils/more/lang/sq-AL.rc index 29b508426bd..9e769002a80 100644 --- a/base/applications/cmdutils/more/lang/sq-AL.rc +++ b/base/applications/cmdutils/more/lang/sq-AL.rc @@ -46,11 +46,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Vazhdo --" - IDS_CONTINUE_PROGRESS "-- Vazhdo (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Nuk mund të aksesoj dokumentin %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Vazhdo%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/sv-SE.rc b/base/applications/cmdutils/more/lang/sv-SE.rc index 5a4e250d8dd..d2149941099 100644 --- a/base/applications/cmdutils/more/lang/sv-SE.rc +++ b/base/applications/cmdutils/more/lang/sv-SE.rc @@ -49,11 +49,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Fortsätt --" - IDS_CONTINUE_PROGRESS "-- Fortsätt (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Får inte tillgång till filen %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Fortsätt%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/tr-TR.rc b/base/applications/cmdutils/more/lang/tr-TR.rc index e0599d0ce26..7e25f173595 100644 --- a/base/applications/cmdutils/more/lang/tr-TR.rc +++ b/base/applications/cmdutils/more/lang/tr-TR.rc @@ -44,11 +44,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Sürdür --" - IDS_CONTINUE_PROGRESS "-- Sürdür (%%%d) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "%s kütüğüne erişilemiyor.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Sürdür%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%%%d)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/uk-UA.rc b/base/applications/cmdutils/more/lang/uk-UA.rc index c5c131419c4..1363190d32b 100644 --- a/base/applications/cmdutils/more/lang/uk-UA.rc +++ b/base/applications/cmdutils/more/lang/uk-UA.rc @@ -49,11 +49,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- Далi --" - IDS_CONTINUE_PROGRESS "-- Далi (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "Не можу отримати доступ до файла %s.\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- Далi%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/zh-CN.rc b/base/applications/cmdutils/more/lang/zh-CN.rc index 007bb73397b..3797c49574f 100644 --- a/base/applications/cmdutils/more/lang/zh-CN.rc +++ b/base/applications/cmdutils/more/lang/zh-CN.rc @@ -44,11 +44,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- 继续 --" - IDS_CONTINUE_PROGRESS "-- 继续 (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "无法访问文件 %s。\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- 继续%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/lang/zh-TW.rc b/base/applications/cmdutils/more/lang/zh-TW.rc index d246582949d..f6feacb28ca 100644 --- a/base/applications/cmdutils/more/lang/zh-TW.rc +++ b/base/applications/cmdutils/more/lang/zh-TW.rc @@ -44,11 +44,11 @@ at the ""-- Continue --"" prompt:\n\ <Space> Display the next page.\n\ <Enter> Display the next line.\n" - IDS_CONTINUE "-- 繼續 --" - IDS_CONTINUE_PROGRESS "-- 繼續 (%d%%) --" + IDS_BAD_FLAG "Invalid argument - '%s'\n" IDS_FILE_ACCESS "無法訪問檔案 %s。\n" - IDS_BAD_FLAG "Invalid argument - '%ls'\n" - IDS_CONTINUE_OPTIONS "-- Continue (%d%%) [Options: psfq=<Space><Enter>] --" - IDS_CONTINUE_LINES "-- Continue (%d%%) -- Lines: " - IDS_CONTINUE_LINE_AT "-- Continue (%d%%) [Line:%d] --" + IDS_CONTINUE_PROMPT "-- 繼續%1%2%3 --%4" + IDS_CONTINUE_PERCENT " (%d%%)" + IDS_CONTINUE_LINE_AT " [Line: %d]" + IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]" + IDS_CONTINUE_LINES " Lines: " END diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 5190bc6308c..16c07d2417a 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -32,6 +32,7 @@ #include <winuser.h> #include <conutils.h> +#include <strsafe.h> #include "resource.h" @@ -51,19 +52,26 @@ HANDLE hKeyboard; /* Enable/Disable extensions */ BOOL bEnableExtensions = TRUE; // FIXME: By default, it should be FALSE. -#define FLAG_HELP (1 << 0) -#define FLAG_E (1 << 1) -#define FLAG_C (1 << 2) -#define FLAG_P (1 << 3) -#define FLAG_S (1 << 4) -#define FLAG_Tn (1 << 5) -#define FLAG_PLUSn (1 << 6) +/* Parser flags */ +#define FLAG_HELP (1 << 0) +#define FLAG_E (1 << 1) +#define FLAG_C (1 << 2) +#define FLAG_P (1 << 3) +#define FLAG_S (1 << 4) +#define FLAG_Tn (1 << 5) +#define FLAG_PLUSn (1 << 6) + +/* Prompt flags */ +#define PROMPT_PERCENT (1 << 0) +#define PROMPT_LINE_AT (1 << 1) +#define PROMPT_OPTIONS (1 << 2) +#define PROMPT_LINES (1 << 3) static DWORD s_dwFlags = 0; static LONG s_nTabWidth = 8; static DWORD s_nNextLineNo = 0; static BOOL s_bPrevLineIsBlank = FALSE; -static UINT s_nPromptID = IDS_CONTINUE_PROGRESS; +static WORD s_fPrompt = 0; static BOOL s_bDoNextFile = FALSE; static BOOL IsBlankLine(IN PCWCH line, IN DWORD cch) @@ -143,49 +151,69 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) DWORD nLines; WCHAR chSubCommand = 0; + /* Prompt strings (small size since the prompt should + * hold ideally on one <= 80-character line) */ + static WCHAR StrPercent[80] = L""; + static WCHAR StrLineAt[80] = L""; + static WCHAR StrOptions[80] = L""; + static WCHAR StrLines[80] = L""; + + WCHAR szPercent[80] = L""; + WCHAR szLineAt[80] = L""; + + /* Load the prompt strings */ + if (!*StrPercent) + K32LoadStringW(NULL, IDS_CONTINUE_PERCENT, StrPercent, ARRAYSIZE(StrPercent)); + if (!*StrLineAt) + K32LoadStringW(NULL, IDS_CONTINUE_LINE_AT, StrLineAt, ARRAYSIZE(StrLineAt)); + if (!*StrOptions) + K32LoadStringW(NULL, IDS_CONTINUE_OPTIONS, StrOptions, ARRAYSIZE(StrOptions)); + if (!*StrLines) + K32LoadStringW(NULL, IDS_CONTINUE_LINES, StrLines, ARRAYSIZE(StrLines)); + Restart: nLines = 0; - /* - * Just use the simple prompt if the file being displayed is the STDIN, - * otherwise use the prompt with progress percentage. - * - * The progress percentage is evaluated as follows. - * So far we have read a total of 'dwSumReadBytes' bytes from the file. - * Amongst those is the latest read chunk of 'dwReadBytes' bytes, to which - * correspond a number of 'dwReadChars' characters with which we have called - * ConWritePaging who called PagePrompt. We then have: Total == dwReadChars. - * During this ConWritePaging call the PagePrompt was called after 'Done' - * number of characters over 'Total'. - * It should be noted that for 'dwSumReadBytes' number of bytes read it - * *roughly* corresponds 'dwSumReadChars' number of characters. This is - * because there may be some failures happening during the conversion of - * the bytes read to the character string for a given encoding. - * Therefore the number of characters displayed on screen is equal to: - * dwSumReadChars - Total + Done , - * but the best corresponding approximed number of bytes would be: - * dwSumReadBytes - (Total - Done) * (dwSumReadBytes / dwSumReadChars) , - * where the ratio is the average number of bytes per character. - * The percentage is then computed relative to the total file size. - */ - if (hFile == hStdIn) - { - ConResPuts(Pager->Screen->Stream, IDS_CONTINUE); - } - else + /* Do not show the progress percentage when STDIN is being displayed */ + if (s_fPrompt & PROMPT_PERCENT) // && (hFile != hStdIn) { + /* + * The progress percentage is evaluated as follows. + * So far we have read a total of 'dwSumReadBytes' bytes from the file. + * Amongst those is the latest read chunk of 'dwReadBytes' bytes, to which + * correspond a number of 'dwReadChars' characters with which we have called + * ConWritePaging who called PagePrompt. We then have: Total == dwReadChars. + * During this ConWritePaging call the PagePrompt was called after 'Done' + * number of characters over 'Total'. + * It should be noted that for 'dwSumReadBytes' number of bytes read it + * *roughly* corresponds 'dwSumReadChars' number of characters. This is + * because there may be some failures happening during the conversion of + * the bytes read to the character string for a given encoding. + * Therefore the number of characters displayed on screen is equal to: + * dwSumReadChars - Total + Done , + * but the best corresponding approximed number of bytes would be: + * dwSumReadBytes - (Total - Done) * (dwSumReadBytes / dwSumReadChars) , + * where the ratio is the average number of bytes per character. + * The percentage is then computed relative to the total file size. + */ DWORD dwPercent = (dwSumReadBytes - (Total - Done) * (dwSumReadBytes / dwSumReadChars)) * 100 / dwFileSize; - if (s_nPromptID == IDS_CONTINUE_LINE_AT) - { - ConResPrintf(Pager->Screen->Stream, s_nPromptID, dwPercent, Pager->lineno); - } - else - { - ConResPrintf(Pager->Screen->Stream, s_nPromptID, dwPercent); - } + StringCchPrintfW(szPercent, ARRAYSIZE(szPercent), StrPercent, dwPercent); } - s_nPromptID = IDS_CONTINUE_PROGRESS; + if (s_fPrompt & PROMPT_LINE_AT) + { + StringCchPrintfW(szLineAt, ARRAYSIZE(szLineAt), StrLineAt, Pager->lineno); + } + + /* Suitably format and display the prompt */ + ConResMsgPrintf(Pager->Screen->Stream, 0, IDS_CONTINUE_PROMPT, + (s_fPrompt & PROMPT_PERCENT ? szPercent : L""), + (s_fPrompt & PROMPT_LINE_AT ? szLineAt : L""), + (s_fPrompt & PROMPT_OPTIONS ? StrOptions : L""), + (s_fPrompt & PROMPT_LINES ? StrLines : L"")); + + /* Reset the prompt to a default state */ + s_fPrompt &= ~(PROMPT_LINE_AT | PROMPT_OPTIONS | PROMPT_LINES); /* RemoveBreakHandler */ SetConsoleCtrlHandler(NULL, TRUE); @@ -364,7 +392,7 @@ Restart: /* '?': Show Options */ if (KeyEvent.uChar.UnicodeChar == L'?') { - s_nPromptID = IDS_CONTINUE_OPTIONS; + s_fPrompt |= PROMPT_OPTIONS; goto Restart; } @@ -389,7 +417,7 @@ Restart: /* 'P': Display n lines */ if (KeyEvent.wVirtualKeyCode == L'P') { - s_nPromptID = IDS_CONTINUE_LINES; + s_fPrompt |= PROMPT_LINES; chSubCommand = L'P'; goto Restart; } @@ -397,7 +425,7 @@ Restart: /* 'S': Skip n lines */ if (KeyEvent.wVirtualKeyCode == L'S') { - s_nPromptID = IDS_CONTINUE_LINES; + s_fPrompt |= PROMPT_LINES; chSubCommand = L'S'; goto Restart; } @@ -405,11 +433,10 @@ Restart: /* '=': Show current line number */ if (KeyEvent.uChar.UnicodeChar == L'=') { - s_nPromptID = IDS_CONTINUE_LINE_AT; + s_fPrompt |= PROMPT_LINE_AT; goto Restart; } - s_nPromptID = IDS_CONTINUE_PROGRESS; chSubCommand = 0; goto Restart; } @@ -1048,7 +1075,7 @@ int wmain(int argc, WCHAR* argv[]) /* Reset state for paging */ s_bPrevLineIsBlank = FALSE; - s_nPromptID = IDS_CONTINUE_PROGRESS; + s_fPrompt = PROMPT_PERCENT; s_bDoNextFile = FALSE; /* Update the statistics for PagePrompt */ diff --git a/base/applications/cmdutils/more/resource.h b/base/applications/cmdutils/more/resource.h index b477bcc0847..98a66e204ca 100644 --- a/base/applications/cmdutils/more/resource.h +++ b/base/applications/cmdutils/more/resource.h @@ -1,10 +1,11 @@ #pragma once #define IDS_USAGE 100 -#define IDS_CONTINUE 101 -#define IDS_CONTINUE_PROGRESS 102 -#define IDS_FILE_ACCESS 103 -#define IDS_BAD_FLAG 104 -#define IDS_CONTINUE_OPTIONS 105 -#define IDS_CONTINUE_LINES 106 -#define IDS_CONTINUE_LINE_AT 107 +#define IDS_BAD_FLAG 101 +#define IDS_FILE_ACCESS 102 + +#define IDS_CONTINUE_PROMPT 110 +#define IDS_CONTINUE_PERCENT 111 +#define IDS_CONTINUE_LINE_AT 112 +#define IDS_CONTINUE_OPTIONS 113 +#define IDS_CONTINUE_LINES 114

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