Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [LDR][APPHELP] Add a shim that disables manifest compatibility version parsing

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=343442cc3fedd084990bc… commit 343442cc3fedd084990bc02ccb32f2b8aab78cea Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Aug 19 02:33:13 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 12:08:06 2019 +0200 [LDR][APPHELP] Add a shim that disables manifest compatibility version parsing --- dll/appcompat/apphelp/hsdb.c | 5 +++-- dll/ntdll/ldr/ldrinit.c | 33 +++++++++++++++++++++++---------- media/sdb/sysmain.xml | 8 ++++++-- sdk/include/reactos/compat_undoc.h | 17 ++++++----------- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index f04312e034a..89eb6284e8c 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -29,7 +29,7 @@ typedef struct _ShimData } ShimData; #define SHIMDATA_MAGIC 0xAC0DEDAB - +#define REACTOS_COMPATVERSION_IGNOREMANIFEST 0xffffffff C_ASSERT(SHIMDATA_MAGIC == REACTOS_SHIMDATA_MAGIC); C_ASSERT(sizeof(ShimData) == sizeof(ReactOS_ShimData)); @@ -739,7 +739,8 @@ BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* if (SdbQueryData(hsdb, pQueryResult->atrLayers[n], L"SHIMVERSIONNT", &dwType, &dwValue, &dwValueSize) == ERROR_SUCCESS && dwType == REG_DWORD && dwValueSize == sizeof(dwValue)) { - dwValue = (dwValue % 100) | ((dwValue / 100) << 8); + if (dwValue != REACTOS_COMPATVERSION_IGNOREMANIFEST) + dwValue = (dwValue % 100) | ((dwValue / 100) << 8); if (dwValue > pData->dwRosProcessCompatVersion) pData->dwRosProcessCompatVersion = dwValue; } diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 16a3361421a..c23783a77ce 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1541,9 +1541,17 @@ VOID NTAPI LdrpInitializeProcessCompat(PVOID* pOldShimData) { - static const GUID* GuidOrder[] = { &COMPAT_GUID_WIN10, &COMPAT_GUID_WIN81, &COMPAT_GUID_WIN8, - &COMPAT_GUID_WIN7, &COMPAT_GUID_VISTA }; - static const DWORD GuidVersions[] = { WINVER_WIN10, WINVER_WIN81, WINVER_WIN8, WINVER_WIN7, WINVER_VISTA }; + static const struct + { + const GUID* Guid; + const DWORD Version; + } KnownCompatGuids[] = { + { &COMPAT_GUID_WIN10, _WIN32_WINNT_WIN10 }, + { &COMPAT_GUID_WIN81, _WIN32_WINNT_WINBLUE }, + { &COMPAT_GUID_WIN8, _WIN32_WINNT_WIN8 }, + { &COMPAT_GUID_WIN7, _WIN32_WINNT_WIN7 }, + { &COMPAT_GUID_VISTA, _WIN32_WINNT_VISTA }, + }; ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)]; ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; @@ -1552,8 +1560,6 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) DWORD n, cur; ReactOS_ShimData* pShimData = *pOldShimData; - C_ASSERT(RTL_NUMBER_OF(GuidOrder) == RTL_NUMBER_OF(GuidVersions)); - if (pShimData) { if (pShimData->dwMagic != REACTOS_SHIMDATA_MAGIC || @@ -1564,7 +1570,14 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) } if (pShimData->dwRosProcessCompatVersion) { - DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion already set to 0x%x\n", pShimData->dwRosProcessCompatVersion); + if (pShimData->dwRosProcessCompatVersion == REACTOS_COMPATVERSION_IGNOREMANIFEST) + { + DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion set to ignore manifest\n"); + } + else + { + DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion already set to 0x%x\n", pShimData->dwRosProcessCompatVersion); + } return; } } @@ -1590,12 +1603,12 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) return; /* Search for known GUID's, starting from newest to oldest. */ - for (cur = 0; cur < RTL_NUMBER_OF(GuidOrder); ++cur) + for (cur = 0; cur < RTL_NUMBER_OF(KnownCompatGuids); ++cur) { for (n = 0; n < ContextCompatInfo->ElementCount; ++n) { if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && - RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, GuidOrder[cur], sizeof(GUID)) == sizeof(GUID)) + RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, KnownCompatGuids[cur].Guid, sizeof(GUID)) == sizeof(GUID)) { /* If this process did not need shim data before, allocate and store it */ if (pShimData == NULL) @@ -1619,8 +1632,8 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) } /* Store the highest found version, and bail out. */ - pShimData->dwRosProcessCompatVersion = GuidVersions[cur]; - DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", GuidVersions[cur]); + pShimData->dwRosProcessCompatVersion = KnownCompatGuids[cur].Version; + DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", KnownCompatGuids[cur].Version); return; } } diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 7afab95388e..c41413abde0 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -233,9 +233,9 @@ <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM NAME="HideShimEnv"> +  <FLAG NAME="GetShortPathNameNT4"> <FLAG_MASK_KERNEL>1</FLAG_MASK_KERNEL> @@ -248,6 +248,10 @@  + <LAYER NAME="IgnoreManifestCompatVersion"> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="0xffffffff" />  + </LAYER> + <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" /> <SHIM_REF NAME="ForceDXSetupSuccess" /> diff --git a/sdk/include/reactos/compat_undoc.h b/sdk/include/reactos/compat_undoc.h index fc6a04794dc..44212efb2d2 100644 --- a/sdk/include/reactos/compat_undoc.h +++ b/sdk/include/reactos/compat_undoc.h @@ -13,21 +13,16 @@ typedef struct _ReactOS_ShimData #define REACTOS_SHIMDATA_MAGIC 0xAC0DEDAB +#define REACTOS_COMPATVERSION_UNINITIALIZED 0xfffffffe +#define REACTOS_COMPATVERSION_IGNOREMANIFEST 0xffffffff -#ifndef WINVER_VISTA -#define WINVER_VISTA 0x0600 -#define WINVER_WIN7 0x0601 -#define WINVER_WIN8 0x0602 -#define WINVER_WIN81 0x0603 -#define WINVER_WIN10 0x0a00 -#endif - +// Returns values in the form of _WIN32_WINNT_VISTA, _WIN32_WINNT_WIN7 etc static inline DWORD RosGetProcessCompatVersion(VOID) { - static DWORD g_CompatVersion = 0xffffffff; - if (g_CompatVersion == 0xffffffff) + static DWORD g_CompatVersion = REACTOS_COMPATVERSION_UNINITIALIZED; + if (g_CompatVersion == REACTOS_COMPATVERSION_UNINITIALIZED) { ReactOS_ShimData* pShimData = (ReactOS_ShimData*)NtCurrentPeb()->pShimData; if (pShimData && pShimData->dwMagic == REACTOS_SHIMDATA_MAGIC && @@ -36,7 +31,7 @@ DWORD RosGetProcessCompatVersion(VOID) g_CompatVersion = pShimData->dwRosProcessCompatVersion; } } - return g_CompatVersion != 0xffffffff ? g_CompatVersion : 0; + return g_CompatVersion < REACTOS_COMPATVERSION_UNINITIALIZED ? g_CompatVersion : 0; }

5 years, 4 months

[reactos] 01/01: [NTOSKRNL] Handle symlink parsing when it's bound to a specific object

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e12abf63c53670009f684… commit e12abf63c53670009f6843fa705ab7d392b66cf9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 19 10:44:56 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 19 10:45:50 2019 +0200 [NTOSKRNL] Handle symlink parsing when it's bound to a specific object --- ntoskrnl/ob/oblink.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/oblink.c b/ntoskrnl/ob/oblink.c index 712143e1ed7..67cb36385dd 100644 --- a/ntoskrnl/ob/oblink.c +++ b/ntoskrnl/ob/oblink.c @@ -5,6 +5,7 @@ * PURPOSE: Implements symbolic links * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) +* Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -481,7 +482,98 @@ ObpParseSymbolicLink(IN PVOID ParsedObject, /* Check if this symlink is bound to a specific object */ if (SymlinkObject->LinkTargetObject) { - UNIMPLEMENTED; + /* No name to reparse, directly reparse the object */ + if (!SymlinkObject->LinkTargetRemaining.Length) + { + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; + } + + TempLength = SymlinkObject->LinkTargetRemaining.Length; + /* The target and remaining names aren't empty, so check for slashes */ + if (SymlinkObject->LinkTargetRemaining.Buffer[TempLength / sizeof(WCHAR) - 1] == OBJ_NAME_PATH_SEPARATOR && + RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + /* Reduce the length by one to cut off the extra '\' */ + TempLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Calculate the new length */ + LengthUsed = TempLength + RemainingName->Length; + LengthUsed += (sizeof(WCHAR) * (RemainingName->Buffer - FullPath->Buffer)); + + /* Check if it's not too much */ + if (LengthUsed > 0xFFF0) + return STATUS_NAME_TOO_LONG; + + /* If FullPath is enough, use it */ + if (FullPath->MaximumLength > LengthUsed) + { + /* Update remaining length if appropriate */ + if (RemainingName->Length) + { + RtlMoveMemory((PVOID)((ULONG_PTR)RemainingName->Buffer + TempLength), + RemainingName->Buffer, + RemainingName->Length); + } + + /* And move the target object name */ + RtlCopyMemory(RemainingName->Buffer, + SymlinkObject->LinkTargetRemaining.Buffer, + TempLength); + + /* Finally update the full path with what we parsed */ + FullPath->Length += SymlinkObject->LinkTargetRemaining.Length; + RemainingName->Length += SymlinkObject->LinkTargetRemaining.Length; + RemainingName->MaximumLength += RemainingName->Length + sizeof(WCHAR); + FullPath->Buffer[FullPath->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* And reparse */ + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; + } + + /* FullPath is not enough, we'll have to reallocate */ + MaximumLength = LengthUsed + sizeof(WCHAR); + NewTargetPath = ExAllocatePoolWithTag(NonPagedPool, + MaximumLength, + OB_NAME_TAG); + if (!NewTargetPath) return STATUS_INSUFFICIENT_RESOURCES; + + /* Copy path begin */ + RtlCopyMemory(NewTargetPath, + FullPath->Buffer, + sizeof(WCHAR) * (RemainingName->Buffer - FullPath->Buffer)); + + /* Copy path end (if any) */ + if (RemainingName->Length) + { + RtlCopyMemory((PVOID)((ULONG_PTR)&NewTargetPath[RemainingName->Buffer - FullPath->Buffer] + TempLength), + RemainingName->Buffer, + RemainingName->Length); + } + + /* And finish path with bound object */ + RtlCopyMemory(&NewTargetPath[RemainingName->Buffer - FullPath->Buffer], + SymlinkObject->LinkTargetRemaining.Buffer, + TempLength); + + /* Free old buffer */ + ExFreePool(FullPath->Buffer); + + /* Set new buffer in FullPath */ + FullPath->Buffer = NewTargetPath; + FullPath->MaximumLength = MaximumLength; + FullPath->Length = LengthUsed; + + /* Update remaining with what we handled */ + RemainingName->Length = LengthUsed + (ULONG_PTR)NewTargetPath - (ULONG_PTR)&NewTargetPath[RemainingName->Buffer - FullPath->Buffer]; + RemainingName->Buffer = &NewTargetPath[RemainingName->Buffer - FullPath->Buffer]; + RemainingName->MaximumLength = RemainingName->Length + sizeof(WCHAR); + + /* Reparse! */ + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; } /* Set the target path and length */

5 years, 4 months

[reactos] 01/01: [NOTEPAD] Encoding detection (#1852)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e85664a3d8dfb955b56b2… commit e85664a3d8dfb955b56b2f5d27a8ccd85db9454b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 18 22:46:56 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 18 22:46:56 2019 +0900 [NOTEPAD] Encoding detection (#1852) CORE-15548 In notepad, if there is no BOM in the input file, then judge the text encoding. --- base/applications/notepad/text.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 6e26a7ab474..d22cf4817ee 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -4,6 +4,7 @@ * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2002 Andriy Palamarchuk + * Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -47,6 +48,32 @@ static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, D return TRUE; } +ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) +{ + INT flags = IS_TEXT_UNICODE_STATISTICS; + + if (dwSize <= 1) + return ENCODING_ANSI; + + if (IsTextUnicode(pBytes, dwSize, &flags)) + { + return ENCODING_UTF16LE; + } + + if ((flags & IS_TEXT_UNICODE_REVERSE_MASK) && !(flags & IS_TEXT_UNICODE_ILLEGAL_CHARS)) + { + return ENCODING_UTF16BE; + } + + /* is it UTF-8? */ + if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, pBytes, dwSize, NULL, 0)) + { + return ENCODING_UTF8; + } + + return ENCODING_ANSI; +} + BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, int *piEoln) { @@ -98,6 +125,10 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, encFile = ENCODING_UTF8; dwPos += 3; } + else + { + encFile = AnalyzeEncoding((const char *)pBytes, dwSize); + } switch(encFile) {

5 years, 4 months

[reactos] 01/01: [MSV1_0] Add SpLsaModeInitialize and SpUserModeInitialize.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f052817d841c5738a8d2d… commit f052817d841c5738a8d2dc645899911c04e4296b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 18 14:54:12 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 18 14:56:27 2019 +0200 [MSV1_0] Add SpLsaModeInitialize and SpUserModeInitialize. SpLsaModeInitialize and SpUserModeInitialize will provide access to SSPI functions. LSASRV will soon access the LsaAp functions via SpLsaModeInialize. --- dll/win32/msv1_0/msv1_0.c | 103 +++++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/msv1_0.spec | 4 +- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 90ee9d264d8..cbe5ec6f944 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1549,4 +1549,107 @@ done: return Status; } + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +SpLsaModeInitialize( + _In_ ULONG LsaVersion, + _Out_ PULONG PackageVersion, + _Out_ PSECPKG_FUNCTION_TABLE *ppTables, + _Out_ PULONG pcTables) +{ + SECPKG_FUNCTION_TABLE Tables[1]; + + TRACE("SpLsaModeInitialize(0x%lx %p %p %p)\n", + LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + + RtlZeroMemory(&Tables, sizeof(Tables)); + + Tables[0].InitializePackage = LsaApInitializePackage; +// Tables[0].LogonUser = NULL; + Tables[0].CallPackage = (PLSA_AP_CALL_PACKAGE)LsaApCallPackage; + Tables[0].LogonTerminated = LsaApLogonTerminated; + Tables[0].CallPackageUntrusted = LsaApCallPackageUntrusted; + Tables[0].CallPackagePassthrough = (PLSA_AP_CALL_PACKAGE_PASSTHROUGH)LsaApCallPackagePassthrough; +// Tables[0].LogonUserEx = NULL; + Tables[0].LogonUserEx2 = LsaApLogonUserEx2; +// Tables[0].Initialize = SpInitialize; +// Tables[0].Shutdown = NULL; +// Tables[0].GetInfo = NULL; +// Tables[0].AcceptCredentials = NULL; +// Tables[0].SpAcquireCredentialsHandle = NULL; +// Tables[0].SpQueryCredentialsAttributes = NULL; +// Tables[0].FreeCredentialsHandle = NULL; +// Tables[0].SaveCredentials = NULL; +// Tables[0].GetCredentials = NULL; +// Tables[0].DeleteCredentials = NULL; +// Tables[0].InitLsaModeContext = NULL; +// Tables[0].AcceptLsaModeContext = NULL; +// Tables[0].DeleteContext = NULL; +// Tables[0].ApplyControlToken = NULL; +// Tables[0].GetUserInfo = NULL; +// Tables[0].GetExtendedInformation = NULL; +// Tables[0].SpQueryContextAttributes = NULL; +// Tables[0].SpAddCredentials = NULL; +// Tables[0].SetExtendedInformation = NULL; + + *ppTables = Tables; + *pcTables = 1; + + return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +SpUserModeInitialize( + _In_ ULONG LsaVersion, + _Out_ PULONG PackageVersion, + _Out_ PSECPKG_USER_FUNCTION_TABLE *ppTables, + _Out_ PULONG pcTables) +{ + SECPKG_USER_FUNCTION_TABLE Tables[1]; + + TRACE("SpUserModeInitialize(0x%lx %p %p %p)\n", + LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + + RtlZeroMemory(&Tables, sizeof(Tables)); + +// Tables[0].InstanceInit = SpInstanceInit; +// Tables[0].InitUserModeContext = NULL; +// Tables[0].MakeSignature = NULL; +// Tables[0].VerifySignature = NULL; +// Tables[0].SealMessage = NULL; +// Tables[0].UnsealMessage = NULL; +// Tables[0].GetContextToken = NULL; +// Tables[0].SpQueryContextAttributes = NULL; +// Tables[0].CompleteAuthToken = NULL; +// Tables[0].DeleteUserModeContext = NULL; +// Tables[0].FormatCredentials = NULL; +// Tables[0].MarshallSupplementalCreds = NULL; +// Tables[0].ExportContext = NULL; +// Tables[0].ImportContext = NULL; + + *ppTables = Tables; + *pcTables = 1; + + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 34fe25e6ca9..f1c98077b2a 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -12,5 +12,5 @@ @ stub MsvValidateTarget @ stub SpInitialize @ stub SpInstanceInit -@ stub SpLsaModeInitialize -@ stub SpUserModeInitialize +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) +@ stdcall SpUserModeInitialize(long ptr ptr ptr)

5 years, 4 months

[reactos] 02/02: [FREELDR] Demote the ArcOpen() trace in WinLdrLoadImage() to a warning only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dca43193c87f17ac778d3… commit dca43193c87f17ac778d3973102dea4b3fd7f537 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 18 15:23:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 18 15:26:25 2019 +0200 [FREELDR] Demote the ArcOpen() trace in WinLdrLoadImage() to a warning only. --- boot/freeldr/freeldr/lib/peloader.c | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index bd4e66573d9..0d4cb3cafba 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -75,8 +75,8 @@ WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, InLoadOrderLinks); TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", - DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); + DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, + DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); /* Compare names */ if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) @@ -119,7 +119,7 @@ WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; BaseName.Length = ScanDTE->BaseDllName.Length; TRACE("WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", - &BaseName, ImportTable); + &BaseName, ImportTable); } #endif @@ -182,8 +182,9 @@ WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; USHORT Length; + TRACE("WinLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", - BaseDllName, FullDllName, BasePA); + BaseDllName, FullDllName, BasePA); /* Allocate memory for a data table entry, zero-initialize it */ DataTableEntry = (PLDR_DATA_TABLE_ENTRY)FrLdrHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY), @@ -281,13 +282,14 @@ WinLdrLoadImage(IN PCHAR FileName, ARC_STATUS Status; LARGE_INTEGER Position; ULONG i, BytesRead; + TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); /* Open the image file */ Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - ERR("ArcOpen(FileName: \"%s\", OpenReadOnly: %u) failed. Status %u\n", FileName, OpenReadOnly, Status); + WARN("ArcOpen(FileName: '%s') failed. Status: %u\n", FileName, Status); return FALSE; } @@ -472,7 +474,7 @@ WinLdrpCompareDllName(IN PCH DllName, UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); } #endif @@ -525,7 +527,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, BOOLEAN Success; //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); + // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ if(DllBase == NULL) @@ -564,7 +566,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", - // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); + // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); /* Get the hint, convert it to a physical pointer */ Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; @@ -604,14 +606,13 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, /* Compare the names */ Result = strcmp(ExportName, (PCHAR)ImportData->Name); - /*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/ - /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));*/ - - /*TRACE("TE->u1.AOD %p, fulladdr %p\n", - ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name );*/ + // TRACE("Binary search: comparing Import '__', Export '%s'\n", + // VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), + // (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); + // TRACE("TE->u1.AOD %p, fulladdr %p\n", + // ThunkData->u1.AddressOfData, + // ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ); /* Depending on result of strcmp, perform different actions */ if (Result > 0) @@ -634,7 +635,6 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, /* If high boundary is less than low boundary, then no result found */ if (High < Low) { - //Print(L"Error in binary search\n"); ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); return FALSE; } @@ -668,6 +668,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, CHAR ForwardDllName[255]; PIMAGE_EXPORT_DIRECTORY RefExportDirectory; ULONG RefExportSize; + TRACE("WinLdrpBindImportName(): ForwarderName %s\n", ForwarderName); /* Save the name of the forward dll */ @@ -770,7 +771,6 @@ WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, strcat(FullDllName, ImportName); TRACE("Loading referenced DLL: %s\n", FullDllName); - //Print(L"Loading referenced DLL: %s\n", FullDllName); /* Load the image */ Success = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); @@ -794,7 +794,7 @@ WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, /* Scan its dependencies too */ TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", - VaToPa((*DataTableEntry)->BaseDllName.Buffer)); + VaToPa((*DataTableEntry)->BaseDllName.Buffer)); Success = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); if (!Success) { @@ -817,7 +817,7 @@ WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, ULONG ExportSize; TRACE("WinLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); + "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); /* Obtain the export table from the DLL's base */ if (DllBase == NULL)

5 years, 4 months

[reactos] 01/02: [FFS] Silence some only-informative KdPrints.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40162252693a3a59b6d28… commit 40162252693a3a59b6d28d6f8d19a52c92a7cb22 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 16 18:14:19 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 18 15:26:23 2019 +0200 [FFS] Silence some only-informative KdPrints. --- drivers/filesystems/ffs/src/fsctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/ffs/src/fsctl.c b/drivers/filesystems/ffs/src/fsctl.c index 175b3258202..1542c63df5e 100644 --- a/drivers/filesystems/ffs/src/fsctl.c +++ b/drivers/filesystems/ffs/src/fsctl.c @@ -159,13 +159,13 @@ FFSLoadDiskLabel( if (Disklabel->d_magic == DISKMAGIC) { - KdPrint(("FFSLoadDiskLabel() Disklabel magic ok\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Disklabel magic ok\n")); Status = STATUS_SUCCESS; } else { - KdPrint(("FFSLoadDiskLabel() No BSD disklabel found, trying to find BSD file system on \"normal\" partition.\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() No BSD disklabel found, trying to find BSD file system on \"normal\" partition.\n")); if ((FFSSb = FFSLoadSuper(Vcb, FALSE, FSOffset + SBLOCK_UFS1)) && (FFSSb->fs_magic == FS_UFS1_MAGIC)) @@ -213,7 +213,7 @@ FFSLoadDiskLabel( } else { - KdPrint(("FFSLoadDiskLabel() No BSD file system was found on the \"normal\" partition.\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() No BSD file system was found on the \"normal\" partition.\n")); #ifdef __REACTOS__ ExFreePoolWithTag(Disklabel, FFS_POOL_TAG); #endif @@ -225,7 +225,7 @@ FFSLoadDiskLabel( Status = FFSGetPartition(DeviceObject, &StartOffset); if (!NT_SUCCESS(Status)) { - KdPrint(("FFSLoadDiskLabel() Slice info failed, Status %u\n", Status)); + FFSPrint((DBG_ERROR, "FFSLoadDiskLabel() Slice info failed, Status %u\n", Status)); #ifdef __REACTOS__ ExFreePoolWithTag(Disklabel, FFS_POOL_TAG); #endif @@ -234,7 +234,7 @@ FFSLoadDiskLabel( Vcb->PartitionNumber = FFSGlobal->PartitionNumber; - KdPrint(("FFSLoadDiskLabel() Selected BSD Label : %d, StartOffset : %x\n", Vcb->PartitionNumber, StartOffset)); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Selected BSD Label : %d, StartOffset : %x\n", Vcb->PartitionNumber, StartOffset)); for (i = 0; i < MAXPARTITIONS; i++) { @@ -247,7 +247,7 @@ FFSLoadDiskLabel( Vcb->FSOffset[i] = FSOffset; /* Important */ - KdPrint(("FFSLoadDiskLabel() Label %d, FS_BSDFFS, %x\n", i, Vcb->FSOffset[i])); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Label %d, FS_BSDFFS, %x\n", i, Vcb->FSOffset[i])); if ((FFSSb = FFSLoadSuper(Vcb, FALSE, FSOffset + SBLOCK_UFS1)) && (FFSSb->fs_magic == FS_UFS1_MAGIC))

5 years, 4 months

[reactos] 01/01: [USETUP] Localize the rest of the hardcoded error message strings

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fbff73792ed7683e947c… commit 2fbff73792ed7683e947c64e11f174d3a9418ecf Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 13 17:13:48 2019 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sat Aug 17 21:34:39 2019 +0200 [USETUP] Localize the rest of the hardcoded error message strings --- base/setup/lib/errorcode.h | 3 +++ base/setup/usetup/lang/bg-BG.h | 15 +++++++++++++++ base/setup/usetup/lang/bn-BD.h | 15 +++++++++++++++ base/setup/usetup/lang/cs-CZ.h | 15 +++++++++++++++ base/setup/usetup/lang/da-DK.h | 15 +++++++++++++++ base/setup/usetup/lang/de-DE.h | 15 +++++++++++++++ base/setup/usetup/lang/el-GR.h | 15 +++++++++++++++ base/setup/usetup/lang/en-US.h | 15 +++++++++++++++ base/setup/usetup/lang/es-ES.h | 15 +++++++++++++++ base/setup/usetup/lang/et-EE.h | 15 +++++++++++++++ base/setup/usetup/lang/fr-FR.h | 15 +++++++++++++++ base/setup/usetup/lang/he-IL.h | 15 +++++++++++++++ base/setup/usetup/lang/it-IT.h | 15 +++++++++++++++ base/setup/usetup/lang/ja-JP.h | 15 +++++++++++++++ base/setup/usetup/lang/lt-LT.h | 15 +++++++++++++++ base/setup/usetup/lang/ms-MY.h | 15 +++++++++++++++ base/setup/usetup/lang/nl-NL.h | 15 +++++++++++++++ base/setup/usetup/lang/pl-PL.h | 15 +++++++++++++++ base/setup/usetup/lang/pt-BR.h | 15 +++++++++++++++ base/setup/usetup/lang/ro-RO.h | 15 +++++++++++++++ base/setup/usetup/lang/ru-RU.h | 15 +++++++++++++++ base/setup/usetup/lang/sk-SK.h | 15 +++++++++++++++ base/setup/usetup/lang/sq-AL.h | 15 +++++++++++++++ base/setup/usetup/lang/sv-SE.h | 15 +++++++++++++++ base/setup/usetup/lang/tr-TR.h | 15 +++++++++++++++ base/setup/usetup/lang/uk-UA.h | 15 +++++++++++++++ base/setup/usetup/usetup.c | 20 +++++--------------- 27 files changed, 383 insertions(+), 15 deletions(-) diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h index a7fd84e95f8..48f9acb0fc4 100644 --- a/base/setup/lib/errorcode.h +++ b/base/setup/lib/errorcode.h @@ -16,6 +16,9 @@ typedef enum _ERROR_NUMBER { NOT_AN_ERROR = 0, // ERROR_SUCCESS, ERROR_NOT_INSTALLED, + ERROR_NO_BUILD_PATH, + ERROR_SOURCE_PATH, + ERROR_SOURCE_DIR, ERROR_NO_HDD, ERROR_NO_SOURCE_DRIVE, ERROR_LOAD_TXTSETUPSIF, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 7c44315d9f1..244d2d3c740 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1484,6 +1484,21 @@ MUI_ERROR bgBGErrorEntries[] = " \x07 \207\240 \250\247\345\256\244 \255\240\342\250\341\255\245\342\245 F3.", "F3 = \210\247\345\256\244 ENTER = \217\340\256\244\352\253\246\240\242\240\255\245" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\240\341\342\340\256\251\242\240\347\352\342 \255\245 \255\240\254\245\340\250 \342\242\352\340\244 \244\250\341\252.\n", diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 8bb8b75df65..03746a6c4c0 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1473,6 +1473,21 @@ MUI_ERROR bnBDErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 4c8e661dff1..4d3a719129f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1482,6 +1482,21 @@ MUI_ERROR csCZErrorEntries[] = " \x07 Stisknut\241m F3 ukon\237\241te instalaci.", "F3 = Ukon\237it ENTER = Pokra\237ovat" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalace nedok\240zala naj\241t harddisk.\n", diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 3aee65bcf70..e33dad89cf4 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1489,6 +1489,21 @@ MUI_ERROR daDKErrorEntries[] = " \x07 Tryk p\206 F3 afslutte installationen.", "F3 = Afslut ENTER = Forts\221t" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Installationen kunne ikke finde en harddisk.\n", diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index eab9c9bfdff..08f8a3dd4ea 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1476,6 +1476,21 @@ MUI_ERROR deDEErrorEntries[] = " \x07 Dr\201cken Sie F3, um die Installation zu beenden.", "F3 = Beenden EINGABETASTE = Fortsetzen" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Es konnte keine Festplatte gefunden werden.\n", diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index fc2d6d6f118..69e5baaf6bc 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1500,6 +1500,21 @@ MUI_ERROR elGRErrorEntries[] = " \x07 \217\230\253\343\251\253\234 F3 \232\240\230 \244\230 \230\247\246\256\340\250\343\251\234\253\234 \230\247\346 \253\236\244 \204\232\241\230\253\341\251\253\230\251\236.", "F3 = \200\247\246\256\351\250\236\251\236 ENTER = \221\254\244\342\256\234\240\230" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\346\250\234\251\234 \244\230 \231\250\234\240 \241\341\247\246\240\246\244 \251\241\242\236\250\346 \233\345\251\241\246.\n", diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 63faa0fde62..1ddbbad1582 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1474,6 +1474,21 @@ MUI_ERROR enUSErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 7ab27f9dbb8..57cb10c5f7c 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1479,6 +1479,21 @@ MUI_ERROR esESErrorEntries[] = " \x07 Presione F3 para abandonar el instalador.", "F3 = Salir INTRO = Continuar" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "El instalador no pudo encontrar un disco duro.\n", diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b0ef95d4d03..9173c6a8847 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1477,6 +1477,21 @@ MUI_ERROR etEEErrorEntries[] = " \x07 Vajuta F3 paigalduse seiskamiseks.", "F3 = V\204lju ENTER = J\204tka" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "K\344vaketast ei leitud.\n", diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 9eea85258b8..3c5b2bf6d51 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1494,6 +1494,21 @@ MUI_ERROR frFRErrorEntries[] = " \x07 Appuyer sur F3 pour quitter Setup.", "F3 = Quitter ENTR\220E = Continuer" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup n'a pu trouver un disque dur.\n", diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 3bf458bb251..a6550708c56 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1478,6 +1478,21 @@ MUI_ERROR heILErrorEntries[] = " \x07 .\204\220\227\232\204\204\216 \232\200\226\214 \211\203\213 F3 \225\207\214", "\204\220\227\232\204 \214\205\210\211\201 = F3 \212\231\216\204 = ENTER" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD ".\207\211\231\227 \217\220\205\213 \204\200\226\216 \200\214 \204\220\227\232\204\204 \232\211\220\213\232\n", diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 171089ca44c..15e369997b5 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1479,6 +1479,21 @@ MUI_ERROR itITErrorEntries[] = " \x07 Premere F3 per uscire.", "F3 = Uscire INVIO = Continuare" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup non ha trovato un disco fisso.\n", diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 58c254f44c8..c1408ad5b65 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1477,6 +1477,21 @@ MUI_ERROR jaJPErrorEntries[] = " \x07 \276\257\304\261\257\314\337\246 \301\255\263\274 \275\331\306\312 F3 \267\260\246 \265\274\303 \270\300\336\273\262\241", "F3 = \301\255\263\274 ENTER = \277\336\257\272\263" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\276\257\304\261\257\314\337\312 \312\260\304\336\303\336\250\275\270\246 \271\335\274\255\302 \303\336\267\317\276\335 \303\336\274\300\241\n", diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index e1ebf82d13c..f3c3bdf4e74 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1485,6 +1485,21 @@ MUI_ERROR ltLTErrorEntries[] = " \x07 Press F3 to quit Setup.", "F3 = Quit ENTER = Continue" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup could not find a harddisk.\n", diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 32d76284080..67ac883ae42 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1373,6 +1373,21 @@ MUI_ERROR msMYErrorEntries[] = " \x07 Tekan F3 untuk keluar persediaan.", "F3 = Keluar ENTER = Teruskan" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Persediaan tidak dapat mencari cakera keras.\n", diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index a868590d4d3..076240d56e0 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1495,6 +1495,21 @@ MUI_ERROR nlNLErrorEntries[] = " \x07 Druk op F3 om Setup af te sluiten.", "F3 = Afsluiten ENTER = Doorgaan" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup kan geen vaste schijf vinden.\n", diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 87c93c7ccd0..d4d77483dc8 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1485,6 +1485,21 @@ MUI_ERROR plPLErrorEntries[] = " \x07 Naci\230nij F3, aby wyj\230\206 z instalatora.", "F3 = Wyj\230cie ENTER = Kontynuacja" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalator nie wykry\210 \276adnego dysku twardego.\n", diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 1c5b97d9961..d19033fadd0 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1507,6 +1507,21 @@ MUI_ERROR ptBRErrorEntries[] = " \x07 Para sair da instala\207\306o, pressione F3.", "F3=Sair ENTER=Continuar" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "N\306o foi poss\241vel localizar um disco r\241digo.\n", diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 92fa85b3397..8a1c5f2135b 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1508,6 +1508,21 @@ MUI_ERROR roROErrorEntries[] = " \x07 Tasta\376i F3 pentru a abandona instalarea.", "F3 = Ie\272ire ENTER = Continuare" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "E\272ec la identificarea unit\343\376ilor interne de stocare.", diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index d820c8089a1..75e9f1e92df 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1494,6 +1494,21 @@ MUI_ERROR ruRUErrorEntries[] = " \x07 \215\240\246\254\250\342\245 F3 \242\353\345\256\244\240 \250\247 \343\341\342\240\255\256\242\252\250.", "F3 = \202\353\345\256\244 ENTER = \217\340\256\244\256\253\246\250\342\354" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\245 \343\244\240\253\256\341\354 \255\240\251\342\250 \246\245\341\342\252\250\251 \244\250\341\252.\n", diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 8adac0cdb22..1462032784d 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1483,6 +1483,21 @@ MUI_ERROR skSKErrorEntries[] = " \x07 Stla\237te F3 pre skon\237enie in\347tal\240cie.", "F3 = Skon\237i\234 ENTER = Pokra\237ova\234" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "In\347tal\240toru sa nepodarilo n\240js\234 pevn\354 disk.\n", diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index d2e1f9276ae..98bd309e0e5 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1481,6 +1481,21 @@ MUI_ERROR sqALErrorEntries[] = " \x07 Kliko F3 t\211 dal\211sh nga instalimi.", "F3 = Dil ENTER = Vazhdo" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Instalimi nuk mund t\211 gjej nj\211 harddisk.\n", diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 9e6ece2cb62..0b392550fd7 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1483,6 +1483,21 @@ MUI_ERROR svSEErrorEntries[] = " \x07 Tryck F3 f\224r att avsluta Setup.", "F3 = Avsluta ENTER = Forts\204tta" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Setup kunde inte hitta n\206gon h\206rddisk.\n", diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 80196752ea9..5fad4675b9b 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1455,6 +1455,21 @@ MUI_ERROR trTRErrorEntries[] = " \x07 Kur'dan \207\215kmak i\207in F3'e bas\215n\215z.", "F3 = \200\215k ENTER = S\201rd\201r" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "Kur, bir sabit disk bulamad\215.\n", diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 5f6258c7444..4d12092d41b 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1483,6 +1483,21 @@ MUI_ERROR ukUAErrorEntries[] = " \x07 \215\240\342\250\341\255i\342\354 F3 \244\253\357 \242\250\345\256\244\343 \247 \242\341\342\240\255\256\242\253\356\242\240\347\240.", "F3 = \202\250\251\342\250 ENTER = \217\340\256\244\256\242\246\250\342\250" }, + { + // ERROR_NO_BUILD_PATH + "Failed to build the installation paths for the ReactOS installation directory!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_PATH + "You cannot delete the partition containing the installation source!\n" + "ENTER = Reboot computer" + }, + { + // ERROR_SOURCE_DIR + "You cannot install ReactOS within the installation source directory!\n" + "ENTER = Reboot computer" + }, { // ERROR_NO_HDD "\215\245 \242\244\240\253\256\341\354 \247\255\240\251\342\250 \246\256\340\341\342\252\250\251 \244\250\341\252.\n", diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 63c13c5bd01..8aaf3cc5831 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1777,9 +1777,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) // &USetupData.SourceRootPath if (RtlPrefixUnicodeString(&CurrentPartitionU, &USetupData.SourcePath, TRUE)) { - PopupError("You cannot delete the partition containing the installation source!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_PATH, Ir, POPUP_WAIT_ENTER); return SELECT_PARTITION_PAGE; } } @@ -3569,9 +3567,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); - PopupError("Failed to build the installation paths for the ReactOS installation directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3582,9 +3578,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) { - PopupError("You cannot install ReactOS within the installation source directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; } @@ -3677,9 +3671,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); - PopupError("Failed to build the installation paths for the ReactOS installation directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3690,9 +3682,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) { - PopupError("You cannot install ReactOS within the installation source directory!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_SOURCE_DIR, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; }

5 years, 4 months

[reactos] 01/01: [HAL] Xbox needs more PCI blacklisting!

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=251bf491270ce95e4bb62… commit 251bf491270ce95e4bb62e21ce1f976d1a75b0b5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 17 20:03:39 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 21:19:28 2019 +0200 [HAL] Xbox needs more PCI blacklisting! CORE-16216 --- hal/halx86/legacy/bus/pcibus.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index 93ed9cb5ca1..a0aff2c70da 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -325,6 +325,21 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, if (Slot.u.bits.Reserved) return FALSE; if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; +#ifdef SARCH_XBOX + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + { + DPRINT("HalpValidPCISlot(): Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + return FALSE; + } +#endif + /* Function 0 doesn't need checking */ if (!Slot.u.bits.FunctionNumber) return TRUE;

5 years, 4 months

[reactos] 01/01: [CMAKE] KDBG and _WINKD_ do not need a value

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12dc1089ecca7336a279a… commit 12dc1089ecca7336a279af9c211ac774936bac50 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Aug 17 18:20:51 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 18:40:40 2019 +0200 [CMAKE] KDBG and _WINKD_ do not need a value --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5ccbd70289..aa2fefdb138 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,11 +133,11 @@ else() endif() if(KDBG) - add_definitions(-DKDBG=1) + add_definitions(-DKDBG) endif() if(_WINKD_) - add_definitions(-D_WINKD_=1) + add_definitions(-D_WINKD_) endif() if(CMAKE_VERSION MATCHES "ReactOS")

5 years, 4 months

[reactos] 01/01: [IPHLPAPI] icmp.c: Complete sync with Wine Staging 1.7.55

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba4b11a33ccf792b7f97… commit 8ba4b11a33ccf792b7f97181637d940a8a44e699 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 23:25:24 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 17 17:48:21 2019 +0200 [IPHLPAPI] icmp.c: Complete sync with Wine Staging 1.7.55 - Restore a missing brace. - Mark all our differences (at that time). Please inspect them. CORE-10536 --- dll/win32/iphlpapi/icmp.c | 28 ++++++++++++++++++++++++++++ media/doc/README.WINE | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dll/win32/iphlpapi/icmp.c b/dll/win32/iphlpapi/icmp.c index 95fbe1bdca3..2dcf4bbafc5 100644 --- a/dll/win32/iphlpapi/icmp.c +++ b/dll/win32/iphlpapi/icmp.c @@ -603,6 +603,7 @@ DWORD WINAPI IcmpSendEcho( WARN("using system ping command since SOCK_RAW was not supported.\n"); return system_icmp(DestinationAddress, RequestData, RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + } #endif /* Prepare the request */ @@ -702,7 +703,11 @@ DWORD WINAPI IcmpSendEcho( #endif send_time = GetTickCount(); +#ifdef __REACTOS__ res=sendto(icp->sid, (const char*)reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); +#else + res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); +#endif HeapFree(GetProcessHeap (), 0, reqbuf); if (res<0) { DWORD dwBestIfIndex; @@ -716,6 +721,7 @@ DWORD WINAPI IcmpSendEcho( memcpy(&ier->Address, &IP4Addr, sizeof(IP4Addr)); } +#ifdef __REACTOS__ if (WSAGetLastError()==WSAEMSGSIZE) ier->Status = IP_PACKET_TOO_BIG; else { @@ -733,6 +739,24 @@ DWORD WINAPI IcmpSendEcho( } } return 1; +#else + if (errno==EMSGSIZE) + SetLastError(IP_PACKET_TOO_BIG); + else { + switch (errno) { + case ENETUNREACH: + SetLastError(IP_DEST_NET_UNREACHABLE); + break; + case EHOSTUNREACH: + SetLastError(IP_DEST_HOST_UNREACHABLE); + break; + default: + TRACE("unknown error: errno=%d\n",errno); + SetLastError(IP_GENERAL_FAILURE); + } + } + return 0; +#endif } /* Get the reply */ @@ -744,7 +768,11 @@ DWORD WINAPI IcmpSendEcho( while (poll(&fdr,1,Timeout)>0) { #endif recv_time = GetTickCount(); +#ifdef __REACTOS__ res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,(int*)&addrlen); +#else + res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); +#endif TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; if (res < 0) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ebd0f73d913..195f9543d68 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -269,7 +269,7 @@ gdi32 - reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 iphlpapi - - reactos/dll/win32/iphlpapi/icmp.c # Partially synced to WineStaging-1.7.55 + reactos/dll/win32/iphlpapi/icmp.c # Synced to WineStaging-1.7.55 kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55

5 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019