Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [NTOSKRNL] Fix a ****ing bug where private cache map was deleted in CcUninitializeCacheMap() before the call to CcRosReleaseFileCache() which expects to have it to properly clean the file. So, move deletion code to CcRosReleaseFileCache() so that he's the only one to handle private map. Should hopefully fix all the recent buildbots issues (and the universe perhaps, who knows?)
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0c7f862d4da673ea3e41… commit f0c7f862d4da673ea3e4120918924af7a03ed0df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 14:15:02 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 14:15:02 2018 +0100 [NTOSKRNL] Fix a ****ing bug where private cache map was deleted in CcUninitializeCacheMap() before the call to CcRosReleaseFileCache() which expects to have it to properly clean the file. So, move deletion code to CcRosReleaseFileCache() so that he's the only one to handle private map. Should hopefully fix all the recent buildbots issues (and the universe perhaps, who knows?) --- ntoskrnl/cc/fs.c | 19 ------------------- ntoskrnl/cc/view.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 7be40ae82b..38c9ae527c 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -346,25 +346,6 @@ CcUninitializeCacheMap ( FALSE); } - /* Closing the handle, so kill the private cache map */ - if (FileObject->SectionObjectPointer->SharedCacheMap != NULL && - FileObject->PrivateCacheMap != NULL) - { - PPRIVATE_CACHE_MAP PrivateMap; - - PrivateMap = FileObject->PrivateCacheMap; - SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; - - /* Remove it from the file */ - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); - RemoveEntryList(&PrivateMap->PrivateLinks); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); - - /* And free it */ - FileObject->PrivateCacheMap = NULL; - ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); - } - Status = CcRosReleaseFileCache(FileObject); if (UninitializeCompleteEvent) { diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 18eaac50e8..4823d04268 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1180,7 +1180,21 @@ CcRosReleaseFileCache ( SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; if (FileObject->PrivateCacheMap != NULL) { + KIRQL OldIrql; + PPRIVATE_CACHE_MAP PrivateMap; + + /* Closing the handle, so kill the private cache map */ + PrivateMap = FileObject->PrivateCacheMap; + + /* Remove it from the file */ + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + RemoveEntryList(&PrivateMap->PrivateLinks); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + + /* And free it */ FileObject->PrivateCacheMap = NULL; + ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); + if (SharedCacheMap->OpenCount > 0) { SharedCacheMap->OpenCount--;

1 0

01/01: [NDK] Update the PRIVATE_CACHE_MAP structure to match W2K3 one. Also update the spin lock on allocation.
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8b5d27807db025dba05a… commit f8b5d27807db025dba05a922a73432940e2af66e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 14:02:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 14:02:42 2018 +0100 [NDK] Update the PRIVATE_CACHE_MAP structure to match W2K3 one. Also update the spin lock on allocation. --- ntoskrnl/cc/view.c | 1 + sdk/include/ndk/cctypes.h | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 94fcff6b7a..18eaac50e8 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1280,6 +1280,7 @@ CcRosInitializeFileCache ( PrivateMap->NodeTypeCode = NODE_TYPE_PRIVATE_MAP; PrivateMap->ReadAheadMask = PAGE_SIZE - 1; PrivateMap->FileObject = FileObject; + KeInitializeSpinLock(&PrivateMap->ReadAheadSpinLock); /* Link it to the file */ KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); diff --git a/sdk/include/ndk/cctypes.h b/sdk/include/ndk/cctypes.h index 5dd55689f5..c49a748923 100644 --- a/sdk/include/ndk/cctypes.h +++ b/sdk/include/ndk/cctypes.h @@ -75,10 +75,13 @@ typedef struct _PRIVATE_CACHE_MAP LARGE_INTEGER BeyondLastByte1; LARGE_INTEGER FileOffset2; LARGE_INTEGER BeyondLastByte2; - LARGE_INTEGER ReadAheadOffset[2]; - ULONG ReadAheadLength[2]; + ULONG SequentialReadCount; + ULONG ReadAheadLength; + LARGE_INTEGER ReadAheadOffset; + LARGE_INTEGER ReadAheadBeyondLastByte; KSPIN_LOCK ReadAheadSpinLock; LIST_ENTRY PrivateLinks; + PVOID ReadAheadWorkItem; } PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP; typedef struct _BITMAP_RANGE

1 0

01/01: [NTOSKRNL] Revert 2362e0f and 07e6e9c (partly) they seem to have caused high instability in Cc. This reverts BCB being lazy written when marked dirty.
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de897cbe3d5e95d006fbe… commit de897cbe3d5e95d006fbeae3e8a8683b569bbd5c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 13:40:54 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 13:40:54 2018 +0100 [NTOSKRNL] Revert 2362e0f and 07e6e9c (partly) they seem to have caused high instability in Cc. This reverts BCB being lazy written when marked dirty. We'll go back to this behavior when this part will have been reworked and stabilized. CORE-14263 CORE-14279 CORE-14285 --- ntoskrnl/cc/pin.c | 4 ---- ntoskrnl/cc/view.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 955bbd0ca7..7b8d878731 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -247,10 +247,6 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; - if (!iBcb->Vacb->Dirty) - { - CcRosMarkDirtyVacb(iBcb->Vacb); - } } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0d6d51b2f8..94fcff6b7a 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -231,8 +231,7 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); /* One reference is added above */ - if ((current->ReferenceCount > 2 && current->PinCount == 0) || - (current->ReferenceCount > 3 && current->PinCount > 1)) + if (current->ReferenceCount > 2) { CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite(

1 0

02/02: [NTOSKRNL] Revert 6ece4e9fc22d664ea2485d04303e8ae10047f21f for third tools compatibility
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e26e4445b39d7455e83e4… commit e26e4445b39d7455e83e45ac7272d21289cc5106 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 11:50:45 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:50:45 2018 +0100 [NTOSKRNL] Revert 6ece4e9fc22d664ea2485d04303e8ae10047f21f for third tools compatibility --- ntoskrnl/ke/bug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 2127d7207c..a92acb1bab 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -1070,8 +1070,8 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) { /* Crash on the debugger console */ - DbgPrint("\n*** BugCheck: 0x%08lx\n" - " (0x%p,0x%p,0x%p,0x%p)\n\n", + DbgPrint("\n*** Fatal System Error: 0x%08lx\n" + " (0x%p,0x%p,0x%p,0x%p)\n\n", KiBugCheckData[0], KiBugCheckData[1], KiBugCheckData[2],

1 0

01/02: [NTOSKRNL] Implement CcSetAdditionalCacheAttributes()
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df5839db5b174754659b0… commit df5839db5b174754659b0f990410eb345dc1c243 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 11:49:22 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:49:22 2018 +0100 [NTOSKRNL] Implement CcSetAdditionalCacheAttributes() --- ntoskrnl/cc/cacheman.c | 31 ++++++++++++++++++++++++++++--- ntoskrnl/include/internal/cc.h | 4 ++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 5d7ff571e6..abfb5e425c 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -164,7 +164,7 @@ CcScheduleReadAhead ( } /* - * @unimplemented + * @implemented */ VOID NTAPI @@ -174,10 +174,35 @@ CcSetAdditionalCacheAttributes ( IN BOOLEAN DisableWriteBehind ) { + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; + CCTRACE(CC_API_DEBUG, "FileObject=%p DisableReadAhead=%d DisableWriteBehind=%d\n", FileObject, DisableReadAhead, DisableWriteBehind); - UNIMPLEMENTED; + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + + if (DisableReadAhead) + { + SetFlag(SharedCacheMap->Flags, READAHEAD_DISABLED); + } + else + { + ClearFlag(SharedCacheMap->Flags, READAHEAD_DISABLED); + } + + if (DisableWriteBehind) + { + /* FIXME: also set flag 0x200 */ + SetFlag(SharedCacheMap->Flags, WRITEBEHIND_DISABLED); + } + else + { + ClearFlag(SharedCacheMap->Flags, WRITEBEHIND_DISABLED); + } + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); } /* @@ -234,7 +259,7 @@ CcSetDirtyPageThreshold ( } /* - * @unimplemented + * @implemented */ VOID NTAPI diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 63b6bc44f1..51dea091e3 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -163,6 +163,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PFILE_OBJECT FileObject; ULONG DirtyPages; LIST_ENTRY SharedCacheMapLinks; + ULONG Flags; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; LIST_ENTRY PrivateList; @@ -178,6 +179,9 @@ typedef struct _ROS_SHARED_CACHE_MAP #endif } ROS_SHARED_CACHE_MAP, *PROS_SHARED_CACHE_MAP; +#define READAHEAD_DISABLED 0x1 +#define WRITEBEHIND_DISABLED 0x2 + typedef struct _ROS_VACB { /* Base address of the region where the view's data is mapped. */

1 0

03/03: [NTOSKRNL] Misc cosmetic changes
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8c3f0c9c4f5e217c6a46… commit f8c3f0c9c4f5e217c6a46420f4e4e5ed1e82cd88 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 11:02:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Misc cosmetic changes --- ntoskrnl/cc/fs.c | 2 +- ntoskrnl/cc/view.c | 4 +++- ntoskrnl/include/internal/cc.h | 23 ++++++++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index fddf76079a..7be40ae82b 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -362,7 +362,7 @@ CcUninitializeCacheMap ( /* And free it */ FileObject->PrivateCacheMap = NULL; - ExFreePoolWithTag(PrivateMap, 'cPcC'); + ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); } Status = CcRosReleaseFileCache(FileObject); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 4933665bd1..0d6d51b2f8 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1233,6 +1233,8 @@ CcRosInitializeFileCache ( FILE_ALL_ACCESS, NULL, KernelMode); + SharedCacheMap->NodeTypeCode = NODE_TYPE_SHARED_MAP; + SharedCacheMap->NodeByteSize = sizeof(*SharedCacheMap); SharedCacheMap->FileObject = FileObject; SharedCacheMap->Callbacks = CallBacks; SharedCacheMap->LazyWriteContext = LazyWriterContext; @@ -1255,7 +1257,7 @@ CcRosInitializeFileCache ( PPRIVATE_CACHE_MAP PrivateMap; /* Allocate the private cache map for this handle */ - PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), 'cPcC'); + PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); if (PrivateMap == NULL) { /* If we also allocated the shared cache map for this file, kill it */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 9679255697..63b6bc44f1 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -155,20 +155,24 @@ typedef struct _PFSN_PREFETCHER_GLOBALS typedef struct _ROS_SHARED_CACHE_MAP { - LIST_ENTRY CacheMapVacbListHead; - ULONG TimeStamp; - PFILE_OBJECT FileObject; - LARGE_INTEGER SectionSize; + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + ULONG OpenCount; LARGE_INTEGER FileSize; - BOOLEAN PinAccess; + LARGE_INTEGER SectionSize; + PFILE_OBJECT FileObject; + ULONG DirtyPages; + LIST_ENTRY SharedCacheMapLinks; PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; LIST_ENTRY PrivateList; - KSPIN_LOCK CacheMapLock; - ULONG OpenCount; - ULONG DirtyPages; - LIST_ENTRY SharedCacheMapLinks; ULONG DirtyPageThreshold; + + /* ROS specific */ + LIST_ENTRY CacheMapVacbListHead; + ULONG TimeStamp; + BOOLEAN PinAccess; + KSPIN_LOCK CacheMapLock; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif @@ -257,6 +261,7 @@ extern LAZY_WRITER LazyWriter; #define NODE_TYPE_DEFERRED_WRITE 0x02FC #define NODE_TYPE_PRIVATE_MAP 0x02FE +#define NODE_TYPE_SHARED_MAP 0x02FF VOID NTAPI

1 0

02/03: [NTOSKRNL] Implement CcSetReadAheadGranularity()
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8792519737778c5b176… commit 9c8792519737778c5b17606c4eccaee6ad9fb5ca Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 09:46:57 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Implement CcSetReadAheadGranularity() --- ntoskrnl/cc/cacheman.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index aacf818c8a..5d7ff571e6 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -243,10 +243,11 @@ CcSetReadAheadGranularity ( IN ULONG Granularity ) { - static ULONG Warn; + PPRIVATE_CACHE_MAP PrivateMap; CCTRACE(CC_API_DEBUG, "FileObject=%p Granularity=%lu\n", FileObject, Granularity); - if (!Warn++) UNIMPLEMENTED; + PrivateMap = FileObject->PrivateCacheMap; + PrivateMap->ReadAheadMask = Granularity - 1; }

1 0

01/03: [NTOSKRNL] Magic value--
by Pierre Schweitzer 08 Feb '18

08 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c19c7c767448842af9b40… commit c19c7c767448842af9b403f140248958e5490038 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 8 09:46:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 8 11:02:26 2018 +0100 [NTOSKRNL] Magic value-- --- ntoskrnl/cc/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 145eb0d908..4933665bd1 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1277,7 +1277,7 @@ CcRosInitializeFileCache ( /* Initialize it */ RtlZeroMemory(PrivateMap, sizeof(PRIVATE_CACHE_MAP)); PrivateMap->NodeTypeCode = NODE_TYPE_PRIVATE_MAP; - PrivateMap->ReadAheadMask = 0xFFF; + PrivateMap->ReadAheadMask = PAGE_SIZE - 1; PrivateMap->FileObject = FileObject; /* Link it to the file */

1 0

01/01: [SYSDM] Make the GPL text ASCII. CORE-14278
by Thomas Faber 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0a227d9a5857eb2c2fd5… commit c0a227d9a5857eb2c2fd5978a9dc8192ee0d7dc9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 7 10:53:51 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 8 00:52:41 2018 +0100 [SYSDM] Make the GPL text ASCII. CORE-14278 This is better than wasting space on null chars (and having Git mangle it). Also ensure that it gets CRLF newlines since its contents go in the binary. --- dll/cpl/sysdm/licence.c | 10 +++++----- dll/cpl/sysdm/resources/.gitattributes | 2 ++ dll/cpl/sysdm/resources/gpl.txt | Bin 36652 -> 17987 bytes 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/cpl/sysdm/licence.c b/dll/cpl/sysdm/licence.c index d8461bf442..6894fd6598 100644 --- a/dll/cpl/sysdm/licence.c +++ b/dll/cpl/sysdm/licence.c @@ -20,7 +20,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) { HRSRC hResInfo; HGLOBAL hResMem; - WCHAR *LicenseText; + PCSTR LicenseText; pLicInfo->hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM), @@ -45,10 +45,10 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) return FALSE; } - /* Insert the license into the edit control (unicode!) */ - SetDlgItemText(hDlg, - IDC_LICENCEEDIT, - LicenseText); + /* Insert the license into the edit control */ + SetDlgItemTextA(hDlg, + IDC_LICENCEEDIT, + LicenseText); PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), EM_SETSEL, diff --git a/dll/cpl/sysdm/resources/.gitattributes b/dll/cpl/sysdm/resources/.gitattributes new file mode 100644 index 0000000000..4d51a75d04 --- /dev/null +++ b/dll/cpl/sysdm/resources/.gitattributes @@ -0,0 +1,2 @@ +# This text file is included in the binary output +gpl.txt text eol=crlf diff --git a/dll/cpl/sysdm/resources/gpl.txt b/dll/cpl/sysdm/resources/gpl.txt index 9f46aed4df..d511905c16 100644 Binary files a/dll/cpl/sysdm/resources/gpl.txt and b/dll/cpl/sysdm/resources/gpl.txt differ

1 0

01/01: [LIBXML2] Restore lost ROS-diff introduced in 7571d351ce. CORE-14291 CORE-11799
by Thomas Faber 07 Feb '18

07 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d887745a7effe4409485… commit 2d887745a7effe4409485ffb08c9f0368b2049e3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 8 00:41:13 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 8 00:41:39 2018 +0100 [LIBXML2] Restore lost ROS-diff introduced in 7571d351ce. CORE-14291 CORE-11799 --- sdk/lib/3rdparty/libxml2/trionan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/3rdparty/libxml2/trionan.c b/sdk/lib/3rdparty/libxml2/trionan.c index 6fbabb5dbd..71f1b1b9b3 100644 --- a/sdk/lib/3rdparty/libxml2/trionan.c +++ b/sdk/lib/3rdparty/libxml2/trionan.c @@ -327,7 +327,7 @@ trio_nan(TRIO_NOARGS) if (result == 0.0) { -#if defined(TRIO_COMPILER_SUPPORTS_C99) +#if defined(TRIO_COMPILER_SUPPORTS_C99) && !defined(__clang__) result = nan(""); #elif defined(NAN) && defined(__STDC_IEC_559__)

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018