Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [REACTOS] Fix parameter types on some exports (#3217)
by Serge Gautherie 01 May '21

01 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=249f2388bd7ce08657811… commit 249f2388bd7ce086578119b50c988ba752169fc1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat May 1 21:11:34 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 1 21:11:34 2021 +0200 [REACTOS] Fix parameter types on some exports (#3217) Fix some wrong parameter types on some exports in NTDLL, KERNEL32, WTSAPI32, and NTOSKRNL. --- dll/ntdll/def/ntdll.spec | 38 +++++++++++++++++++------------------- dll/win32/kernel32/kernel32.spec | 6 +++--- dll/win32/wtsapi32/wtsapi32.spec | 2 +- ntoskrnl/ntoskrnl.spec | 8 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index dc9969102e2..63fd851dc8d 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -284,7 +284,7 @@ @ stdcall NtCreateProcessEx(ptr long ptr ptr long ptr ptr ptr long) @ stdcall NtCreateProfile(ptr ptr ptr long long ptr long long long) ; CHECKME @ stub -version=0x600+ NtCreateResourceManager -@ stdcall NtCreateSection(ptr long ptr ptr long long long) +@ stdcall NtCreateSection(ptr long ptr ptr long long ptr) @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall NtCreateThread(ptr long ptr ptr ptr ptr ptr long) @@ -427,13 +427,13 @@ @ stdcall NtQueryFullAttributesFile(ptr ptr) @ stdcall NtQueryInformationAtom(long long ptr long ptr) @ stub -version=0x600+ NtQueryInformationEnlistment -@ stdcall NtQueryInformationFile(long ptr ptr long long) -@ stdcall NtQueryInformationJobObject(long long ptr long ptr) +@ stdcall NtQueryInformationFile(ptr ptr ptr long long) +@ stdcall NtQueryInformationJobObject(ptr long ptr long ptr) @ stdcall NtQueryInformationPort(ptr long ptr long ptr) -@ stdcall NtQueryInformationProcess(long long ptr long ptr) +@ stdcall NtQueryInformationProcess(ptr long ptr long ptr) @ stub -version=0x600+ NtQueryInformationResourceManager -@ stdcall NtQueryInformationThread(long long ptr long ptr) -@ stdcall NtQueryInformationToken(long long ptr long ptr) +@ stdcall NtQueryInformationThread(ptr long ptr long ptr) +@ stdcall NtQueryInformationToken(ptr long ptr long ptr) @ stub -version=0x600+ NtQueryInformationTransaction @ stub -version=0x600+ NtQueryInformationTransactionManager @ stub -version=0x600+ NtQueryInformationWorkerFactory @@ -524,14 +524,14 @@ @ stdcall NtSetHighWaitLowEventPair(ptr) @ stdcall NtSetInformationDebugObject(ptr long ptr long ptr) @ stub -version=0x600+ NtSetInformationEnlistment -@ stdcall NtSetInformationFile(long long long long long) -@ stdcall NtSetInformationJobObject(long long ptr long) -@ stdcall NtSetInformationKey(long long ptr long) -@ stdcall NtSetInformationObject(long long ptr long) -@ stdcall NtSetInformationProcess(long long long long) +@ stdcall NtSetInformationFile(ptr ptr ptr long long) +@ stdcall NtSetInformationJobObject(ptr long ptr long) +@ stdcall NtSetInformationKey(ptr long ptr long) +@ stdcall NtSetInformationObject(ptr long ptr long) +@ stdcall NtSetInformationProcess(ptr long ptr long) @ stub -version=0x600+ NtSetInformationResourceManager -@ stdcall NtSetInformationThread(long long ptr long) -@ stdcall NtSetInformationToken(long long ptr long) +@ stdcall NtSetInformationThread(ptr long ptr long) +@ stdcall NtSetInformationToken(ptr long ptr long) @ stub -version=0x600+ NtSetInformationTransaction @ stub -version=0x600+ NtSetInformationTransactionManager @ stub -version=0x600+ NtSetInformationWorkerFactory @@ -562,9 +562,9 @@ @ stdcall NtSuspendProcess(ptr) @ stdcall NtSuspendThread(long ptr) @ stdcall NtSystemDebugControl(long ptr long ptr long ptr) -@ stdcall NtTerminateJobObject(long long) -@ stdcall NtTerminateProcess(long long) -@ stdcall NtTerminateThread(long long) +@ stdcall NtTerminateJobObject(ptr long) +@ stdcall NtTerminateProcess(ptr long) +@ stdcall NtTerminateThread(ptr long) @ stdcall NtTestAlert() @ stub -version=0x600+ NtThawRegistry @ stub -version=0x600+ NtThawTransactions @@ -1720,9 +1720,9 @@ @ stdcall ZwSuspendProcess(ptr) @ stdcall ZwSuspendThread(long ptr) @ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) -@ stdcall ZwTerminateJobObject(long long) -@ stdcall ZwTerminateProcess(long long) -@ stdcall ZwTerminateThread(long long) +@ stdcall ZwTerminateJobObject(ptr long) +@ stdcall ZwTerminateProcess(ptr long) +@ stdcall ZwTerminateThread(ptr long) @ stdcall ZwTestAlert() @ stub -version=0x600+ ZwThawRegistry @ stub -version=0x600+ ZwThawTransactions diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 765d5f450bb..1b8dd416be9 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -1109,9 +1109,9 @@ @ stdcall SwitchToThread() @ stdcall SystemTimeToFileTime(ptr ptr) @ stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) -@ stdcall TerminateJobObject(long long) -@ stdcall TerminateProcess(long long) -@ stdcall TerminateThread(long long) +@ stdcall TerminateJobObject(ptr long) +@ stdcall TerminateProcess(ptr long) +@ stdcall TerminateThread(ptr long) @ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) diff --git a/dll/win32/wtsapi32/wtsapi32.spec b/dll/win32/wtsapi32/wtsapi32.spec index 37838d5e07a..fe44d07248b 100644 --- a/dll/win32/wtsapi32/wtsapi32.spec +++ b/dll/win32/wtsapi32/wtsapi32.spec @@ -38,7 +38,7 @@ @ stdcall WTSStartRemoteControlSessionA(ptr long long long) @ stdcall WTSStartRemoteControlSessionW(ptr long long long) @ stdcall WTSStopRemoteControlSession(long) -@ stdcall WTSTerminateProcess(long long long) +@ stdcall WTSTerminateProcess(ptr long long) @ stdcall WTSUnRegisterSessionNotification(long) @ stdcall WTSUnRegisterSessionNotificationEx(long long) @ stdcall WTSVirtualChannelClose(long) diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 96660a3fea1..8d2dc6f4b23 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -868,9 +868,9 @@ @ stdcall NtOpenThreadTokenEx(ptr long long long ptr) @ stdcall NtQueryDirectoryFile(ptr ptr ptr ptr ptr ptr long long long ptr long) @ stdcall NtQueryEaFile(ptr ptr ptr long long ptr long ptr long) -@ stdcall NtQueryInformationAtom(ptr long ptr long ptr) +@ stdcall NtQueryInformationAtom(long long ptr long ptr) @ stdcall NtQueryInformationFile(ptr ptr ptr long long) -@ stdcall NtQueryInformationProcess(ptr ptr ptr long ptr) +@ stdcall NtQueryInformationProcess(ptr long ptr long ptr) @ stdcall NtQueryInformationThread(ptr long ptr long ptr) @ stdcall NtQueryInformationToken(ptr long ptr long ptr) @ stdcall NtQueryQuotaInformationFile(ptr ptr ptr long long ptr long ptr long) @@ -883,7 +883,7 @@ @ stdcall NtSetEaFile(ptr ptr ptr long) @ stdcall NtSetEvent(ptr ptr) @ stdcall NtSetInformationFile(ptr ptr ptr long long) -@ stdcall NtSetInformationProcess(ptr ptr ptr long) +@ stdcall NtSetInformationProcess(ptr long ptr long) @ stdcall NtSetInformationThread(ptr long ptr long) @ stdcall NtSetQuotaInformationFile(ptr ptr ptr long) @ stdcall NtSetSecurityObject(ptr long ptr) @@ -1249,7 +1249,7 @@ @ fastcall RtlPrefetchMemoryNonTemporal(ptr long) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) -@ stdcall RtlQueryAtomInAtomTable(ptr ptr ptr ptr ptr ptr) +@ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall RtlRaiseException(ptr)

1 0

[reactos] 01/01: [NTOS:OB] ObQueryDeviceMapInformation(): Fix annotations
by Serge Gautherie 01 May '21

01 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d8964331131f40be6eb7… commit 5d8964331131f40be6eb748f02378b929508a476 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 1 11:26:07 2021 +0200 [NTOS:OB] ObQueryDeviceMapInformation(): Fix annotations --- ntoskrnl/include/internal/ob.h | 6 +++--- ntoskrnl/ob/devicemap.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 2ecd936d536..87a5d6901f0 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -299,9 +299,9 @@ ObpSetHandleAttributes( NTSTATUS NTAPI ObQueryDeviceMapInformation( - IN PEPROCESS Process, - OUT PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, - IN ULONG Flags + _In_opt_ PEPROCESS Process, + _Out_ PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, + _In_ ULONG Flags ); // diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 0c54f6995b8..866ef66482d 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -536,9 +536,10 @@ ObInheritDeviceMap(IN PEPROCESS Parent, NTSTATUS NTAPI -ObQueryDeviceMapInformation(IN PEPROCESS Process, - IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, - IN ULONG Flags) +ObQueryDeviceMapInformation( + _In_opt_ PEPROCESS Process, + _Out_ PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo, + _In_ ULONG Flags) { PDEVICE_MAP DeviceMap = NULL, GlobalDeviceMap; BOOLEAN Dereference;

1 0

[reactos] 01/01: [PSDK] UnlockResource(): Improve definition
by Serge Gautherie 01 May '21

01 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1689cdceaf8e2e5c7831… commit f1689cdceaf8e2e5c7831166fd9862902270d88f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 1 09:48:02 2021 +0200 [PSDK] UnlockResource(): Improve definition Sync' with https://source.winehq.org/git/wine.git/commit/a9e50da352e32d4c1bc8d0a686efa… --- sdk/include/psdk/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index b6bda981368..1e7071fda07 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3225,7 +3225,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME LONG WINAPI UnhandledExceptionFilter(LPEXCEPTION_POINTERS); BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); -#define UnlockResource(h) (h) +#define UnlockResource(handle) ((handle), 0) #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */ BOOL WINAPI UnmapViewOfFile(LPCVOID); #if (_WIN32_WINNT >= 0x0500)

1 0

[reactos] 01/01: [CMD_APITEST] Follow-up of #3632 (0c2230a)
by Katayama Hirofumi MZ 30 Apr '21

30 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92e3b426b3ab1b1ab42b4… commit 92e3b426b3ab1b1ab42b43d7163e95df63da5e9d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 30 10:48:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Apr 30 10:48:33 2021 +0900 [CMD_APITEST] Follow-up of #3632 (0c2230a) CORE-17500 --- modules/rostests/apitests/cmd/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/cmd/fc.c b/modules/rostests/apitests/cmd/fc.c index 1ff1aad84b6..3ca7a30f24c 100644 --- a/modules/rostests/apitests/cmd/fc.c +++ b/modules/rostests/apitests/cmd/fc.c @@ -250,8 +250,8 @@ static const TEST_ENTRY s_entries[] = NO_DIFF }, { - __LINE__, 1, "fc /W" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING - "***** fc-test1.txt\n A \nB\n" + __LINE__, 1, "fc /W /T" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n\tA \nB\n" "***** FC-TEST2.TXT\nAB\nB\n" "*****\n\n" },

1 0

[reactos] 01/01: [INF] Remove stray file. Addendum to commit a1fc312a.
by Hermès Bélusca-Maïto 30 Apr '21

30 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb467003b70ea2f392b0a… commit bb467003b70ea2f392b0aee27aede55b315757d7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 30 02:42:35 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 30 02:42:35 2021 +0200 [INF] Remove stray file. Addendum to commit a1fc312a. --- reactos/media/inf/netisa.inf | Bin 5378 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/reactos/media/inf/netisa.inf b/reactos/media/inf/netisa.inf deleted file mode 100644 index ef6c91ce887..00000000000 Binary files a/reactos/media/inf/netisa.inf and /dev/null differ

1 0

[reactos] 02/02: [NTOS:PS] NtQueryInformationProcess(): Fix ProcessDeviceMap case
by Serge Gautherie 29 Apr '21

29 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a61e4f08cd00e3e68149… commit 8a61e4f08cd00e3e68149895450ef53970fc5d04 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 29 21:40:58 2021 +0200 [NTOS:PS] NtQueryInformationProcess(): Fix ProcessDeviceMap case Fix Clang-Cl '...\ntoskrnl\ps\query.c(583,33): warning: variable 'Status' is uninitialized when used here [-Wuninitialized]' Addendum to 1074a9a. --- ntoskrnl/ps/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index c9b0b6b75a2..7c8737cba93 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -578,14 +578,10 @@ NtQueryInformationProcess( { /* Get the exception code */ Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - break; - } - /* Only one flag is supported and it needs LUID mappings */ if ((Flags & ~PROCESS_LUID_DOSDEVICES_ONLY) != 0 || !ObIsLUIDDeviceMapsEnabled())

1 0

[reactos] 01/02: [NTOS:PS] NtQueryInformationProcess(): Sync' annotations
by Serge Gautherie 29 Apr '21

29 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0961cac105ed590284a3… commit c0961cac105ed590284a39dce3d1df276f308bb4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 29 21:40:58 2021 +0200 [NTOS:PS] NtQueryInformationProcess(): Sync' annotations --- ntoskrnl/ps/query.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index cad72c4d60a..c9b0b6b75a2 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -56,11 +56,12 @@ PsReferenceProcessFilePointer(IN PEPROCESS Process, */ NTSTATUS NTAPI -NtQueryInformationProcess(IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL) +NtQueryInformationProcess( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength) { PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();

1 0

[reactos] 01/01: [FC] Fix typo s/IDS_RESYNCH_/IDS_RESYNC_/ s/Resynch/Resync/
by Katayama Hirofumi MZ 29 Apr '21

29 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91dc5eac7dc6f6ac51bbc… commit 91dc5eac7dc6f6ac51bbcf4a155cbb84a85eafad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 29 16:59:20 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Apr 29 16:59:20 2021 +0900 [FC] Fix typo s/IDS_RESYNCH_/IDS_RESYNC_/ s/Resynch/Resync/ CORE-17500 --- base/applications/cmdutils/fc/lang/bg-BG.rc | 2 +- base/applications/cmdutils/fc/lang/cs-CZ.rc | 2 +- base/applications/cmdutils/fc/lang/de-DE.rc | 2 +- base/applications/cmdutils/fc/lang/el-GR.rc | 2 +- base/applications/cmdutils/fc/lang/en-GB.rc | 2 +- base/applications/cmdutils/fc/lang/en-US.rc | 2 +- base/applications/cmdutils/fc/lang/es-ES.rc | 2 +- base/applications/cmdutils/fc/lang/et-EE.rc | 2 +- base/applications/cmdutils/fc/lang/fr-FR.rc | 2 +- base/applications/cmdutils/fc/lang/he-IL.rc | 2 +- base/applications/cmdutils/fc/lang/hu-HU.rc | 2 +- base/applications/cmdutils/fc/lang/id-ID.rc | 2 +- base/applications/cmdutils/fc/lang/it-IT.rc | 2 +- base/applications/cmdutils/fc/lang/ja-JP.rc | 2 +- base/applications/cmdutils/fc/lang/nl-NL.rc | 2 +- base/applications/cmdutils/fc/lang/no-NO.rc | 2 +- base/applications/cmdutils/fc/lang/pl-PL.rc | 2 +- base/applications/cmdutils/fc/lang/pt-BR.rc | 2 +- base/applications/cmdutils/fc/lang/pt-PT.rc | 2 +- base/applications/cmdutils/fc/lang/ro-RO.rc | 2 +- base/applications/cmdutils/fc/lang/ru-RU.rc | 2 +- base/applications/cmdutils/fc/lang/sk-SK.rc | 2 +- base/applications/cmdutils/fc/lang/sq-AL.rc | 2 +- base/applications/cmdutils/fc/lang/sv-SE.rc | 2 +- base/applications/cmdutils/fc/lang/tr-TR.rc | 2 +- base/applications/cmdutils/fc/lang/uk-UA.rc | 2 +- base/applications/cmdutils/fc/lang/zh-CN.rc | 2 +- base/applications/cmdutils/fc/lang/zh-TW.rc | 2 +- base/applications/cmdutils/fc/resource.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/base/applications/cmdutils/fc/lang/bg-BG.rc b/base/applications/cmdutils/fc/lang/bg-BG.rc index f0c672ff4ae..520e81f2466 100644 --- a/base/applications/cmdutils/fc/lang/bg-BG.rc +++ b/base/applications/cmdutils/fc/lang/bg-BG.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/cs-CZ.rc b/base/applications/cmdutils/fc/lang/cs-CZ.rc index b5bf38399c7..867ed3dca72 100644 --- a/base/applications/cmdutils/fc/lang/cs-CZ.rc +++ b/base/applications/cmdutils/fc/lang/cs-CZ.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/de-DE.rc b/base/applications/cmdutils/fc/lang/de-DE.rc index d4449b25972..58d6cbedd9a 100644 --- a/base/applications/cmdutils/fc/lang/de-DE.rc +++ b/base/applications/cmdutils/fc/lang/de-DE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/el-GR.rc b/base/applications/cmdutils/fc/lang/el-GR.rc index 060954fec8e..27cc5bfcb90 100644 --- a/base/applications/cmdutils/fc/lang/el-GR.rc +++ b/base/applications/cmdutils/fc/lang/el-GR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/en-GB.rc b/base/applications/cmdutils/fc/lang/en-GB.rc index 3fa575f8999..92a7545ce5a 100644 --- a/base/applications/cmdutils/fc/lang/en-GB.rc +++ b/base/applications/cmdutils/fc/lang/en-GB.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/en-US.rc b/base/applications/cmdutils/fc/lang/en-US.rc index ae4951d9450..a9976adf463 100644 --- a/base/applications/cmdutils/fc/lang/en-US.rc +++ b/base/applications/cmdutils/fc/lang/en-US.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/es-ES.rc b/base/applications/cmdutils/fc/lang/es-ES.rc index 451b19b834a..89d0c28db48 100644 --- a/base/applications/cmdutils/fc/lang/es-ES.rc +++ b/base/applications/cmdutils/fc/lang/es-ES.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/et-EE.rc b/base/applications/cmdutils/fc/lang/et-EE.rc index 7d7aeab13ba..ffe2139ab22 100644 --- a/base/applications/cmdutils/fc/lang/et-EE.rc +++ b/base/applications/cmdutils/fc/lang/et-EE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/fr-FR.rc b/base/applications/cmdutils/fc/lang/fr-FR.rc index 01b6e46fa77..369a2519fd5 100644 --- a/base/applications/cmdutils/fc/lang/fr-FR.rc +++ b/base/applications/cmdutils/fc/lang/fr-FR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/he-IL.rc b/base/applications/cmdutils/fc/lang/he-IL.rc index ab1687c260d..af0d0ce3708 100644 --- a/base/applications/cmdutils/fc/lang/he-IL.rc +++ b/base/applications/cmdutils/fc/lang/he-IL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/hu-HU.rc b/base/applications/cmdutils/fc/lang/hu-HU.rc index a9ea667ed9e..0b344b27153 100644 --- a/base/applications/cmdutils/fc/lang/hu-HU.rc +++ b/base/applications/cmdutils/fc/lang/hu-HU.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/id-ID.rc b/base/applications/cmdutils/fc/lang/id-ID.rc index a97dfa3cafb..dfe0b376477 100644 --- a/base/applications/cmdutils/fc/lang/id-ID.rc +++ b/base/applications/cmdutils/fc/lang/id-ID.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/it-IT.rc b/base/applications/cmdutils/fc/lang/it-IT.rc index ebffa3679c8..b11895f30be 100644 --- a/base/applications/cmdutils/fc/lang/it-IT.rc +++ b/base/applications/cmdutils/fc/lang/it-IT.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ja-JP.rc b/base/applications/cmdutils/fc/lang/ja-JP.rc index 0d4de1467e0..df289254a10 100644 --- a/base/applications/cmdutils/fc/lang/ja-JP.rc +++ b/base/applications/cmdutils/fc/lang/ja-JP.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/nl-NL.rc b/base/applications/cmdutils/fc/lang/nl-NL.rc index 381006a8dd7..02bf17eb76d 100644 --- a/base/applications/cmdutils/fc/lang/nl-NL.rc +++ b/base/applications/cmdutils/fc/lang/nl-NL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/no-NO.rc b/base/applications/cmdutils/fc/lang/no-NO.rc index 00618a7fd47..4299d720445 100644 --- a/base/applications/cmdutils/fc/lang/no-NO.rc +++ b/base/applications/cmdutils/fc/lang/no-NO.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/pl-PL.rc b/base/applications/cmdutils/fc/lang/pl-PL.rc index bd73f2ed521..32f918a9b35 100644 --- a/base/applications/cmdutils/fc/lang/pl-PL.rc +++ b/base/applications/cmdutils/fc/lang/pl-PL.rc @@ -44,5 +44,5 @@ FC /B [dysk1:][ścieżka1]plik1 [dysk2:][ścieżka2]plik2\n\ IDS_CANT_USE_WILDCARD "Symbole wieloznaczne ('*' i '?') nie są jeszcze obsługiwane\n" IDS_DIFFERENT "FC: pliki %ls i %ls różnią się\n" IDS_TOO_LARGE "FC: plik %ls jest za duży\n" - IDS_RESYNCH_FAILED "Ponowna synchronizacja nie powiodła się. Pliki za bardzo się różnią.\n" + IDS_RESYNC_FAILED "Ponowna synchronizacja nie powiodła się. Pliki za bardzo się różnią.\n" END diff --git a/base/applications/cmdutils/fc/lang/pt-BR.rc b/base/applications/cmdutils/fc/lang/pt-BR.rc index f74d8d6a2df..9deefb1aab1 100644 --- a/base/applications/cmdutils/fc/lang/pt-BR.rc +++ b/base/applications/cmdutils/fc/lang/pt-BR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/pt-PT.rc b/base/applications/cmdutils/fc/lang/pt-PT.rc index a7ceb26ca2b..5c39e8b8197 100644 --- a/base/applications/cmdutils/fc/lang/pt-PT.rc +++ b/base/applications/cmdutils/fc/lang/pt-PT.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ro-RO.rc b/base/applications/cmdutils/fc/lang/ro-RO.rc index 55b992cd071..1998bcf1f8d 100644 --- a/base/applications/cmdutils/fc/lang/ro-RO.rc +++ b/base/applications/cmdutils/fc/lang/ro-RO.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ru-RU.rc b/base/applications/cmdutils/fc/lang/ru-RU.rc index 64d99eabc8f..d2ce6f2996d 100644 --- a/base/applications/cmdutils/fc/lang/ru-RU.rc +++ b/base/applications/cmdutils/fc/lang/ru-RU.rc @@ -37,5 +37,5 @@ FC /B [диск1:][путь1]имя_файла1 [диск2:][путь2]имя_ф IDS_CANT_USE_WILDCARD "Подстановочные знаки ('*' и '?') пока не поддерживаются\n" IDS_DIFFERENT "FC: Файлы %ls и %ls различны\n" IDS_TOO_LARGE "FC: Файл %ls слишком большой\n" - IDS_RESYNCH_FAILED "Не удаётся синхронизировать строки. Слишком много различий между файлами.\n" + IDS_RESYNC_FAILED "Не удаётся синхронизировать строки. Слишком много различий между файлами.\n" END diff --git a/base/applications/cmdutils/fc/lang/sk-SK.rc b/base/applications/cmdutils/fc/lang/sk-SK.rc index d66a8042344..c1fd9f1de68 100644 --- a/base/applications/cmdutils/fc/lang/sk-SK.rc +++ b/base/applications/cmdutils/fc/lang/sk-SK.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/sq-AL.rc b/base/applications/cmdutils/fc/lang/sq-AL.rc index cf7c458382a..fdf077b3f9e 100644 --- a/base/applications/cmdutils/fc/lang/sq-AL.rc +++ b/base/applications/cmdutils/fc/lang/sq-AL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/sv-SE.rc b/base/applications/cmdutils/fc/lang/sv-SE.rc index dc3fb6647ba..a725d0c4eeb 100644 --- a/base/applications/cmdutils/fc/lang/sv-SE.rc +++ b/base/applications/cmdutils/fc/lang/sv-SE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/tr-TR.rc b/base/applications/cmdutils/fc/lang/tr-TR.rc index 04dfac5fdf7..ac4b0449e4c 100644 --- a/base/applications/cmdutils/fc/lang/tr-TR.rc +++ b/base/applications/cmdutils/fc/lang/tr-TR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/uk-UA.rc b/base/applications/cmdutils/fc/lang/uk-UA.rc index 19f43286905..dbf1a8856b1 100644 --- a/base/applications/cmdutils/fc/lang/uk-UA.rc +++ b/base/applications/cmdutils/fc/lang/uk-UA.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/zh-CN.rc b/base/applications/cmdutils/fc/lang/zh-CN.rc index 1909aead09f..f984f2bee69 100644 --- a/base/applications/cmdutils/fc/lang/zh-CN.rc +++ b/base/applications/cmdutils/fc/lang/zh-CN.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/zh-TW.rc b/base/applications/cmdutils/fc/lang/zh-TW.rc index f790f60dad4..875d71a09d5 100644 --- a/base/applications/cmdutils/fc/lang/zh-TW.rc +++ b/base/applications/cmdutils/fc/lang/zh-TW.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/resource.h b/base/applications/cmdutils/fc/resource.h index 45f8e032bd8..d784a77c0de 100644 --- a/base/applications/cmdutils/fc/resource.h +++ b/base/applications/cmdutils/fc/resource.h @@ -10,4 +10,4 @@ #define IDS_CANT_USE_WILDCARD 1009 #define IDS_DIFFERENT 1010 #define IDS_TOO_LARGE 1011 -#define IDS_RESYNCH_FAILED 1012 +#define IDS_RESYNC_FAILED 1012

1 0

[reactos] 01/01: [CMD_APITEST] Add FC testcase (#3632)
by Katayama Hirofumi MZ 29 Apr '21

29 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c2230ad64b3e4b1d8f0d… commit 0c2230ad64b3e4b1d8f0da4dfe766efdc3b88873 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 29 16:39:13 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 29 16:39:13 2021 +0900 [CMD_APITEST] Add FC testcase (#3632) Add a testcase for FC (file comparison) command to investigate FC command. CORE-17500 --- modules/rostests/apitests/cmd/CMakeLists.txt | 3 +- modules/rostests/apitests/cmd/fc.c | 617 +++++++++++++++++++++++++++ modules/rostests/apitests/cmd/testlist.c | 2 + 3 files changed, 621 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/cmd/CMakeLists.txt b/modules/rostests/apitests/cmd/CMakeLists.txt index 00202dde809..432cc4f11fd 100644 --- a/modules/rostests/apitests/cmd/CMakeLists.txt +++ b/modules/rostests/apitests/cmd/CMakeLists.txt @@ -1,10 +1,11 @@ list(APPEND SOURCE cmd.c + fc.c testlist.c) add_executable(cmd_apitest ${SOURCE}) target_link_libraries(cmd_apitest wine ${PSEH_LIB}) set_module_type(cmd_apitest win32cui) -add_importlibs(cmd_apitest msvcrt kernel32) +add_importlibs(cmd_apitest shlwapi msvcrt kernel32) add_rostests_file(TARGET cmd_apitest) diff --git a/modules/rostests/apitests/cmd/fc.c b/modules/rostests/apitests/cmd/fc.c new file mode 100644 index 00000000000..1ff1aad84b6 --- /dev/null +++ b/modules/rostests/apitests/cmd/fc.c @@ -0,0 +1,617 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for fc.exe + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <shlwapi.h> + +typedef struct TEST_ENTRY +{ + INT lineno; + INT ret; + LPCSTR cmdline; + LPCSTR file1_data; + LPCSTR file2_data; + INT file1_size; // -1 for zero-terminated + INT file2_size; // -1 for zero-terminated + LPCSTR output; +} TEST_ENTRY; + +#define FILE1 "fc-test1.txt" +#define FILE2 "fc-test2.txt" +#define FILES " " FILE1 " " FILE2 +#define COMPARING "Comparing files fc-test1.txt and FC-TEST2.TXT\n" +#define NO_DIFF "FC: no differences encountered\n" +#define RESYNC_FAILED "Resync Failed. Files are too different.\n" + +static const TEST_ENTRY s_entries[] = +{ + /* binary comparison */ + { + __LINE__, 0, "fc /B" FILES, "", "", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "A", "B", -1, -1, COMPARING + "00000000: 41 42\n" + }, + { + __LINE__, 1, "fc /B" FILES, "B", "A", -1, -1, COMPARING + "00000000: 42 41\n" + }, + { + __LINE__, 0, "fc /B" FILES, "AB", "AB", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "AB", "BA", -1, -1, COMPARING + "00000000: 41 42\n" + "00000001: 42 41\n" + }, + { + __LINE__, 0, "fc /B" FILES, "ABC", "ABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "ABC", "ABCD", -1, -1, COMPARING + "FC: FC-TEST2.TXT longer than fc-test1.txt\n\n" + }, + { + __LINE__, 1, "fc /B" FILES, "ABC", "ABDD", -1, -1, COMPARING + "00000002: 43 44\n" + "FC: FC-TEST2.TXT longer than fc-test1.txt\n" + }, + { + __LINE__, 1, "fc /B /C" FILES, "ABC", "abc", -1, -1, COMPARING + "00000000: 41 61\n" + "00000001: 42 62\n" + "00000002: 43 63\n" + }, + /* text comparison */ + { + __LINE__, 0, "fc" FILES, "", "", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "A", "B", -1, -1, COMPARING + "***** fc-test1.txt\nA\n" + "***** FC-TEST2.TXT\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc" FILES, "B", "A", -1, -1, COMPARING + "***** fc-test1.txt\nB\n" + "***** FC-TEST2.TXT\nA\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "AB", "AB", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "AB", "BA", -1, -1, COMPARING + "***** fc-test1.txt\nAB\n" + "***** FC-TEST2.TXT\nBA\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "ABC", "ABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /C" FILES, "ABC", "abc", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "A\nB\nC\nD\nE\n", "A\nB\nB\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\n" + "***** FC-TEST2.TXT\nB\nB\nD\n" + "*****\n\n" + }, + /* Test /A */ + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "B\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nB\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nC\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nA\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nC\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\n...\nE\n" + "***** FC-TEST2.TXT\nA\n...\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nD\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nD\nE\n" + "***** FC-TEST2.TXT\nD\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nF\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nF\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nF\nF\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\n...\nE\n" + "***** FC-TEST2.TXT\nB\n...\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nC\nE\nF\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nC\nE\n" + "***** FC-TEST2.TXT\nA\n...\nE\n" + "*****\n\n" + "***** fc-test1.txt\nF\nE\n" + "***** FC-TEST2.TXT\n" + "*****\n\n" + }, + /* Test /N /A */ + { + __LINE__, 1, "fc /N /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nB\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 2: B\n 3: C\n 4: D\n" + "***** FC-TEST2.TXT\n 2: B\n 3: B\n 4: D\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nC\nD\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n 2: C\n 3: C\n" + "***** FC-TEST2.TXT\n 1: A\n 2: B\n 3: C\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nC\nC\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n...\n 5: E\n" + "***** FC-TEST2.TXT\n 1: A\n...\n 5: E\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nE\nF\nC\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n...\n 5: C\n" + "***** FC-TEST2.TXT\n 1: A\n 2: B\n 3: C\n" + "*****\n\n" + "***** fc-test1.txt\n" + "***** FC-TEST2.TXT\n 4: D\n 5: E\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nE\nF\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n 2: C\n 3: E\n" + "***** FC-TEST2.TXT\n 1: A\n...\n 5: E\n" + "*****\n\n" + "***** fc-test1.txt\n 4: F\n 5: E\n" + "***** FC-TEST2.TXT\n" + "*****\n\n" + }, + /* Test tab expansion */ + { + __LINE__, 0, "fc" FILES, "A\n\tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + /* Test /T */ + { + __LINE__, 1, "fc /T" FILES, "A\n\tB\nC", "A\n B\nC", -1, -1, COMPARING + "***** fc-test1.txt\nA\n\tB\nC\n" + "***** FC-TEST2.TXT\nA\n B\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + "***** fc-test1.txt\nA\n \tB\nC\n" + "***** FC-TEST2.TXT\nA\n B\nC\n" + "*****\n\n" + }, + /* Test /W */ + { + __LINE__, 0, "fc /W" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /W" FILES, "\tA \nB\n", "A\nB\n", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /W" FILES, " A \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n A \nB\n" + "***** FC-TEST2.TXT\nAB\nB\n" + "*****\n\n" + }, + /* TEST /W /T */ + { + __LINE__, 0, "fc /W /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /W /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /W" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n A \nB\n" + "***** FC-TEST2.TXT\nAB\nB\n" + "*****\n\n" + }, + /* Test /N */ + { + __LINE__, 1, "fc /N" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 3: C\n 4: D\n 5: E\n" + "***** FC-TEST2.TXT\n 3: C\n 4: E\n" + "*****\n\n" + "***** fc-test1.txt\n" + "***** FC-TEST2.TXT\n 5: E\n" + "*****\n\n" + }, + /* Test NUL */ + { + __LINE__, 1, "fc" FILES, "ABC\000DE", "ABC\000\000\000", 6, 6, COMPARING + "***** fc-test1.txt\nABC\nDE\n" + "***** FC-TEST2.TXT\nABC\n\n\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc" FILES, "ABC\000DE", "ABC\n\000\000", 6, 6, COMPARING + "***** fc-test1.txt\nABC\nDE\n" + "***** FC-TEST2.TXT\nABC\n\n\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "ABC\000DE", "ABC\nDE", 6, 6, COMPARING + NO_DIFF + }, + /* Test CR ('\r') */ + { + __LINE__, 0, "fc" FILES, "ABC\nABC", "ABC\r\nABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "ABC\nABC", "ABC\r\r\nABC", -1, -1, COMPARING + "***** fc-test1.txt\nABC\nABC\n" + "***** FC-TEST2.TXT\nABC\nABC\n" + "*****\n\n" + }, + /* Test '\n' at EOF */ + { + __LINE__, 0, "fc" FILES, "ABC", "ABC\n", -1, -1, COMPARING + NO_DIFF + }, + /* Test /U */ + { + /* L"AB" */ + __LINE__, 0, "fc /U" FILES, "A\000B\000", "A\000B\000", 4, 4, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /U" FILES, "A\000B\000", "A\000C\000", 4, 4, COMPARING + "***** fc-test1.txt\nAB\n" + "***** FC-TEST2.TXT\nAC\n" + "*****\n\n" + }, + /* Test /LB2 */ + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "B\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nB\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "D\nD\nD\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nD\nD\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nA\nC\n" + "*****\n\n" + }, + /* Test /LB3 */ + { + __LINE__, 1, "fc /LB3" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nC\nC\n" + "*****\n\n" + "***** fc-test1.txt\nC\nD\n" + "***** FC-TEST2.TXT\nC\nC\nD\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB3" FILES, "A\nB\nC\nD\nE\n", "D\nD\nD\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nD\nD\nD\n" + "*****\n\n" + }, + /* Test /N /LB2 */ + { + __LINE__, 1, "fc /N /LB2" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\n 3: C\n 4: D\n" + "***** FC-TEST2.TXT\n 3: C\n 4: E\n" + "*****\n\n" + }, + /* Test /1 */ + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\n", "A\nB\nX\nX\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\n" + "***** FC-TEST2.TXT\nB\nX\nX\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\nF\n", "A\nB\nX\nD\nX\nF", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\n" + "***** FC-TEST2.TXT\nB\nX\nD\n" + "*****\n\n" + "***** fc-test1.txt\nD\nE\nF\n" + "***** FC-TEST2.TXT\nD\nX\nF\n" + "*****\n\n" + }, + /* Test /3 */ + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\n", "A\nB\nX\nX\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\n" + "***** FC-TEST2.TXT\nB\nX\nX\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\nF\n", "A\nB\nX\nD\nX\nF", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\nF\n" + "***** FC-TEST2.TXT\nB\nX\nD\nX\nF\n" + "*****\n\n" + }, +}; + +BOOL DoDuplicateHandle(HANDLE hFile, PHANDLE phFile, BOOL bInherit) +{ + HANDLE hProcess = GetCurrentProcess(); + return DuplicateHandle(hProcess, hFile, hProcess, phFile, 0, + bInherit, DUPLICATE_SAME_ACCESS); +} + +static BOOL +PrepareForRedirect(STARTUPINFOA *psi, PHANDLE phInputWrite, PHANDLE phOutputRead, + PHANDLE phErrorRead) +{ + SECURITY_ATTRIBUTES sa; + HANDLE hInputRead = NULL, hInputWriteTmp = NULL; + HANDLE hOutputReadTmp = NULL, hOutputWrite = NULL; + HANDLE hErrorReadTmp = NULL, hErrorWrite = NULL; + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + if (phInputWrite) + { + if (CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0)) + { + if (!DoDuplicateHandle(hInputWriteTmp, phInputWrite, FALSE)) + return FALSE; + CloseHandle(hInputWriteTmp); + } + else + goto failure; + } + + if (phOutputRead) + { + if (CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0)) + { + if (!DoDuplicateHandle(hOutputReadTmp, phOutputRead, FALSE)) + return FALSE; + CloseHandle(hOutputReadTmp); + } + else + goto failure; + } + + if (phOutputRead && phOutputRead == phErrorRead) + { + if (!DoDuplicateHandle(hOutputWrite, &hErrorWrite, TRUE)) + return FALSE; + } + else if (phErrorRead) + { + if (CreatePipe(&hErrorReadTmp, &hErrorWrite, &sa, 0)) + { + if (!DoDuplicateHandle(hErrorReadTmp, phErrorRead, FALSE)) + return FALSE; + CloseHandle(hErrorReadTmp); + } + else + goto failure; + } + + if (phInputWrite) + { + psi->hStdInput = hInputRead; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + if (phOutputRead) + { + psi->hStdOutput = hOutputWrite; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + if (phErrorRead) + { + psi->hStdOutput = hErrorWrite; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + return TRUE; + +failure: + CloseHandle(hInputRead); + CloseHandle(hInputWriteTmp); + CloseHandle(hOutputReadTmp); + CloseHandle(hOutputWrite); + CloseHandle(hErrorReadTmp); + CloseHandle(hErrorWrite); + return FALSE; +} + +static void ConvertOutput(LPSTR psz) +{ + LPSTR pch1, pch2; + pch1 = pch2 = psz; + while (*pch1) + { + if (*pch1 != '\r') + { + *pch2++ = *pch1; + } + ++pch1; + } + *pch2 = 0; +} + +static void DoTestEntry(const TEST_ENTRY* pEntry) +{ + FILE *fp; + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION pi; + INT file1_size, file2_size; + HANDLE hOutputRead; + DWORD cbAvail, cbRead; + CHAR szOutput[1024]; + BOOL ret; + DWORD dwExitCode; + LPSTR psz; + + file1_size = pEntry->file1_size; + file2_size = pEntry->file2_size; + if (file1_size == -1) + file1_size = strlen(pEntry->file1_data); + if (file2_size == -1) + file2_size = strlen(pEntry->file2_data); + + fp = fopen(FILE1, "wb"); + fwrite(pEntry->file1_data, file1_size, 1, fp); + fclose(fp); + + fp = fopen(FILE2, "wb"); + fwrite(pEntry->file2_data, file2_size, 1, fp); + fclose(fp); + + ok(PathFileExistsA(FILE1), "Line %d: PathFileExistsA(FILE1) failed\n", pEntry->lineno); + ok(PathFileExistsA(FILE2), "Line %d: PathFileExistsA(FILE2) failed\n", pEntry->lineno); + + si.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + si.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + PrepareForRedirect(&si, NULL, &hOutputRead, &hOutputRead); + + psz = _strdup(pEntry->cmdline); + ret = CreateProcessA(NULL, psz, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); + free(psz); + + ok(ret, "Line %d: CreateProcessA failed\n", pEntry->lineno); + +#define TIMEOUT (10 * 1000) + WaitForSingleObject(pi.hProcess, TIMEOUT); + + ZeroMemory(szOutput, sizeof(szOutput)); + if (PeekNamedPipe(hOutputRead, NULL, 0, NULL, &cbAvail, NULL)) + { + if (cbAvail > 0) + { + if (cbAvail > sizeof(szOutput)) + cbAvail = sizeof(szOutput) - 1; + + ReadFile(hOutputRead, szOutput, cbAvail, &cbRead, NULL); + } + } + ConvertOutput(szOutput); + + GetExitCodeProcess(pi.hProcess, &dwExitCode); + ok(dwExitCode == pEntry->ret, "Line %d: dwExitCode was 0x%lx\n", pEntry->lineno, dwExitCode); + + if (StrCmpNIA(pEntry->output, szOutput, strlen(pEntry->output)) != 0) + { + ok(FALSE, "Line %d: Output was wrong\n", pEntry->lineno); + printf("---FROM HERE\n"); + printf("%s\n", szOutput); + printf("---UP TO HERE\n"); + } + else + { + ok_int(TRUE, TRUE); + } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + CloseHandle(hOutputRead); + if (si.hStdInput != GetStdHandle(STD_INPUT_HANDLE)) + CloseHandle(si.hStdInput); + if (si.hStdOutput != GetStdHandle(STD_OUTPUT_HANDLE)) + CloseHandle(si.hStdOutput); + if (si.hStdError != GetStdHandle(STD_ERROR_HANDLE)) + CloseHandle(si.hStdError); + + DeleteFileA(FILE1); + DeleteFileA(FILE2); +} + +#define ENGLISH_CP 437 /* English codepage */ + +START_TEST(fc) +{ + UINT i; + UINT uOldCP = GetConsoleCP(), uOldOutputCP = GetConsoleOutputCP(); + SetConsoleCP(ENGLISH_CP); + SetConsoleOutputCP(ENGLISH_CP); + + for (i = 0; i < _countof(s_entries); ++i) + { + DoTestEntry(&s_entries[i]); + } + + SetConsoleCP(uOldCP); + SetConsoleOutputCP(uOldOutputCP); +} diff --git a/modules/rostests/apitests/cmd/testlist.c b/modules/rostests/apitests/cmd/testlist.c index cc73f9d0805..a62c3c78be5 100644 --- a/modules/rostests/apitests/cmd/testlist.c +++ b/modules/rostests/apitests/cmd/testlist.c @@ -5,6 +5,7 @@ extern void func_attrib(void); extern void func_cd(void); extern void func_echo(void); extern void func_exit(void); +extern void func_fc(void); extern void func_pushd(void); const struct test winetest_testlist[] = @@ -13,6 +14,7 @@ const struct test winetest_testlist[] = { "cd", func_cd }, { "echo", func_echo }, { "exit", func_exit }, + { "fc", func_fc }, { "pushd", func_pushd }, { 0, 0 } };

1 0

[reactos] 01/01: [NE2000] Use the real MAC address instead of a fake one
by Hervé Poussineau 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1fc312a8941d66cf6465… commit a1fc312a8941d66cf64654be949c9be5a8d5becc Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Apr 22 00:32:33 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Apr 28 17:28:38 2021 +0200 [NE2000] Use the real MAC address instead of a fake one These lines were added 15 years ago, in r18445. --- drivers/network/dd/ne2000/netne2000.inf | 1 - drivers/network/dd/ne2000/netrtl8029.inf | 1 - reactos/media/inf/netisa.inf | Bin 0 -> 5378 bytes 3 files changed, 2 deletions(-) diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne2000.inf index fe6f8e5b208..cbcc1c41d7d 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne2000.inf @@ -31,7 +31,6 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" -HKR,,NetworkAddress,0x00000000,"001122334455" [NE2000_CopyFiles.NT] ne2000.sys diff --git a/drivers/network/dd/ne2000/netrtl8029.inf b/drivers/network/dd/ne2000/netrtl8029.inf index b6b62161ac2..56cd50dc889 100644 --- a/drivers/network/dd/ne2000/netrtl8029.inf +++ b/drivers/network/dd/ne2000/netrtl8029.inf @@ -31,7 +31,6 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" -HKR,,NetworkAddress,0x00000000,"001122334455" [NE2000_CopyFiles.NT] ne2000.sys diff --git a/reactos/media/inf/netisa.inf b/reactos/media/inf/netisa.inf new file mode 100644 index 00000000000..ef6c91ce887 Binary files /dev/null and b/reactos/media/inf/netisa.inf differ

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