Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [NTOSKNRL] In case we leak a VACB, debug as much information as possible.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=579a784e0431e5400daca… commit 579a784e0431e5400dacaf39ee6d97b0a380ebe9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Apr 27 14:14:56 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Apr 27 14:14:56 2018 +0200 [NTOSKNRL] In case we leak a VACB, debug as much information as possible. CORE-14578 --- ntoskrnl/cc/view.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 081d881d15..a0f0867080 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1132,7 +1132,25 @@ CcRosDeleteFileCache ( current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&current->CacheMapVacbListEntry); Refs = CcRosVacbDecRefCount(current); +#if DBG // CORE-14578 + if (Refs != 0) + { + DPRINT1("Leaking VACB %p attached to %p (%I64d)\n", current, FileObject, current->FileOffset.QuadPart); + DPRINT1("There are: %d references left\n", Refs); + DPRINT1("Pin: %d, Map: %d\n", current->PinCount, current->MappedCount); + DPRINT1("Dirty: %d\n", current->Dirty); + if (FileObject->FileName.Length != 0) + { + DPRINT1("File was: %wZ\n", &FileObject->FileName); + } + else + { + DPRINT1("No name for the file\n"); + } + } +#else ASSERT(Refs == 0); +#endif } OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock);

6 years, 8 months

01/01: [NTOSKRNL] Noisily dereference mapped VACB on cache release.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcf83315dccd67cd9636f… commit fcf83315dccd67cd9636f9ae08868104a420a3dd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Apr 27 10:23:06 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Apr 27 10:23:06 2018 +0200 [NTOSKRNL] Noisily dereference mapped VACB on cache release. It seems that on process killing, some VACB may be deleted while still mapped. With current reference counting, they will actually not be deleted, but leaked, and an ASSERT will be triggered. CORE-14578 --- ntoskrnl/cc/view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index bd2f4887d4..081d881d15 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1106,6 +1106,12 @@ CcRosDeleteFileCache ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); DPRINT1("Freeing dirty VACB\n"); } + if (current->MappedCount != 0) + { + current->MappedCount = 0; + NT_VERIFY(CcRosVacbDecRefCount(current) > 0); + DPRINT1("Freeing mapped VACB\n"); + } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);

6 years, 8 months

01/01: [MSXML3] Fix buffer overflow in BindStatusCallback_GetBindInfo. CORE-14570

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=708d26acf396d81fa475f… commit 708d26acf396d81fa475f3ce7b70d3346279b133 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Apr 26 14:59:21 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Apr 26 15:00:24 2018 +0200 [MSXML3] Fix buffer overflow in BindStatusCallback_GetBindInfo. CORE-14570 --- dll/win32/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msxml3/httprequest.c b/dll/win32/msxml3/httprequest.c index 40a976438d..07eeb74370 100644 --- a/dll/win32/msxml3/httprequest.c +++ b/dll/win32/msxml3/httprequest.c @@ -397,7 +397,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = This->request->verb; if (This->request->verb == BINDVERB_CUSTOM) { - pbindinfo->szCustomVerb = CoTaskMemAlloc(SysStringByteLen(This->request->custom)); + pbindinfo->szCustomVerb = CoTaskMemAlloc(SysStringByteLen(This->request->custom)+sizeof(WCHAR)); strcpyW(pbindinfo->szCustomVerb, This->request->custom); }

6 years, 8 months

01/01: Correctly bugcheck if we aren't returning a usermode thread (#506)

by Jason Johnson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=054c11a02cf4353d38203… commit 054c11a02cf4353d38203698a0dbe0c360db72d0 Author: Jason Johnson <jasonmjohnson1(a)gmail.com> AuthorDate: Tue Apr 24 18:07:02 2018 -0400 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Tue Apr 24 23:07:02 2018 +0100 Correctly bugcheck if we aren't returning a usermode thread (#506) Cause a corresponding bug check to occur for the reason of the user context flag being zero (a system thread), instead of using DbgBreakPoint. --- ntoskrnl/ke/i386/thrdini.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index 683ed88f8d..678bedd113 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -78,7 +78,10 @@ KiThreadStartup(VOID) StartFrame->SystemRoutine(StartFrame->StartRoutine, StartFrame->StartContext); /* If we returned, we better be a user thread */ - if (!StartFrame->UserThread) DbgBreakPoint(); + if (!StartFrame->UserThread) + { + KeBugCheck(NO_USER_MODE_CONTEXT); + } /* Exit to user-mode */ KiServiceExit2(TrapFrame);

6 years, 8 months

01/01: Removed unreachable line (#517)

by Peter Wathall

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e2dd8676a787551d0029… commit 9e2dd8676a787551d0029a51b28b71d478c5c756 Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Tue Apr 24 20:35:23 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Tue Apr 24 21:35:23 2018 +0100 Removed unreachable line (#517) The break statement was unnecessary because the goto on the line before it returns from the routine so it can never be reached --- drivers/storage/class/class2/class2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index 52fdf53d5e..2d29f64575 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -4170,8 +4170,6 @@ Return Value: IoCompleteRequest(Irp, IO_NO_INCREMENT); status = STATUS_INSUFFICIENT_RESOURCES; goto SetStatusAndReturn; - - break; } irp2->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread;

6 years, 8 months

01/01: [SYSSETUP] PS2MousePropPageProvider: Use the UDN_DELTAPOS notification to change the input buffer size in steps of 10

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd653de2510880a21aa96… commit dd653de2510880a21aa960263b746f04d7d5f127 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 23 23:58:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 23 23:58:49 2018 +0200 [SYSSETUP] PS2MousePropPageProvider: Use the UDN_DELTAPOS notification to change the input buffer size in steps of 10 --- dll/win32/syssetup/proppage.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index d200a841ea..eb38cf988f 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -188,6 +188,28 @@ MouseOnCommand( } +static +BOOL +MouseOnNotify( + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + switch (((LPNMHDR)lParam)->idFrom) + { + case IDC_PS2MOUSEINPUTUPDN: + if (((LPNMHDR)lParam)->code == UDN_DELTAPOS) + { + ((LPNMUPDOWN)lParam)->iDelta *= 10; + return FALSE; + } + break; + } + + return FALSE; +} + + static INT_PTR CALLBACK @@ -209,6 +231,9 @@ MouseDlgProc( MouseOnCommand(hwndDlg, wParam, lParam); break; + case WM_NOTIFY: + return MouseOnNotify(hwndDlg, wParam, lParam); + } return FALSE;

6 years, 8 months

01/01: [MSPAINT] Fix crash on zoom out

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=955048e50a79996e69bae… commit 955048e50a79996e69baec6c6b9c495e5155db24 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Apr 14 15:42:34 2018 +0300 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Mon Apr 23 20:11:43 2018 +0200 [MSPAINT] Fix crash on zoom out - Check the denominator for zero for both zoomed width and height. - Do not allow to move zoom slider above possible position. - Move commonly used `zoomTo` function into new header file. CORE-14539 --- base/applications/mspaint/common.h | 14 ++++++++++++++ base/applications/mspaint/imgarea.cpp | 3 --- base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/toolsettings.cpp | 8 +++++--- base/applications/mspaint/winproc.cpp | 14 +++++++++++--- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h new file mode 100644 index 0000000000..45cde747b8 --- /dev/null +++ b/base/applications/mspaint/common.h @@ -0,0 +1,14 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint/common.h + * PURPOSE: Commonly used functions + * PROGRAMMERS: Benedikt Freisen + * Stanislav Motylkov + */ + +#pragma once + +/* FUNCTIONS ********************************************************/ + +extern BOOL zoomTo(int, int, int); diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index dbf2035b2c..c9b1b3f49e 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -16,9 +16,6 @@ /* FUNCTIONS ********************************************************/ -extern void -zoomTo(int newZoom, int mouseX, int mouseY); - void updateCanvasAndScrollbars() { diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 706da42349..f4720837ff 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,6 +21,7 @@ #include <shellapi.h> #include <htmlhelp.h> +#include "common.h" #include "definitions.h" #include "drawing.h" #include "dib.h" diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index efc2a329dd..11cce8386d 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/toolsettings.cpp * PURPOSE: Window procedure of the tool settings window * PROGRAMMERS: Benedikt Freisen + * Stanislav Motylkov */ /* INCLUDES *********************************************************/ @@ -12,8 +13,6 @@ /* FUNCTIONS ********************************************************/ -extern void zoomTo(int, int, int); - LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, WINBOOL& bHandled) { RECT trackbarZoomPos = {1, 1, 1 + 40, 1 + 64}; @@ -25,7 +24,10 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, W LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0); + if (!zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0)) + { + OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); + } return 0; } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index f0b64c69a3..76d7e4e67f 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -6,6 +6,7 @@ * hPalWin, hToolSettings and hSelection * PROGRAMMERS: Benedikt Freisen * Katayama Hirofumi MZ + * Stanislav Motylkov */ /* INCLUDES *********************************************************/ @@ -16,7 +17,7 @@ /* FUNCTIONS ********************************************************/ -void +BOOL zoomTo(int newZoom, int mouseX, int mouseY) { RECT clientRectScrollbox; @@ -24,8 +25,14 @@ zoomTo(int newZoom, int mouseX, int mouseY) int x, y, w, h; scrollboxWindow.GetClientRect(&clientRectScrollbox); imageArea.GetClientRect(&clientRectImageArea); - w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * newZoom / toolsModel.GetZoom()); - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * newZoom / toolsModel.GetZoom()); + w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); + h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); + if (!w || !h) + { + return FALSE; + } + w = clientRectImageArea.right * clientRectScrollbox.right / w; + h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); @@ -38,6 +45,7 @@ zoomTo(int newZoom, int mouseX, int mouseY) scrollboxWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); scrollboxWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + return TRUE; } void CMainWindow::alignChildrenToMainWindow()

6 years, 8 months

01/01: [SYSSETUP] Initialize the property sheet page dialog and implement the Defaults button

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=065e70048daa70bbe2db1… commit 065e70048daa70bbe2db15175441c627782ad11d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 22 23:59:28 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 23 00:00:46 2018 +0200 [SYSSETUP] Initialize the property sheet page dialog and implement the Defaults button --- dll/win32/syssetup/proppage.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index 6cab3faab1..d200a841ea 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -110,6 +110,81 @@ MouseOnDialogInit( (LPARAM)szBuffer); } + /* Set the input buffer length range: 100-300 */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETRANGE32, + 100, + 300); + + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETPOS32, + 0, + 100); +} + + +static +VOID +MouseOnCommand( + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case IDC_PS2MOUSESAMPLERATE: + case IDC_PS2MOUSEWHEEL: + case IDC_PS2MOUSEINPUTLEN: + case IDC_PS2MOUSEFASTINIT: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + /* Enable the Apply button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_PS2MOUSEDEFAULTS: + if (HIWORD(wParam) == BN_CLICKED) + { + /* Sample rate: 100 */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSESAMPLERATE, + CB_SETCURSEL, + 4, + 0); + + /* Wheel detection: Assume wheel present */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEWHEEL, + CB_SETCURSEL, + 2, + 0); + + /* Input buffer length: 100 packets */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETPOS32, + 0, + 100); + + /* Fast Initialization: Checked */ + SendDlgItemMessage(hwndDlg, + IDC_PS2MOUSEFASTINIT, + BM_SETCHECK, + (WPARAM)BST_CHECKED, + (LPARAM)0); + + /* Enable the Apply button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + default: + break; + } } @@ -129,6 +204,11 @@ MouseDlgProc( case WM_INITDIALOG: MouseOnDialogInit(hwndDlg, lParam); return TRUE; + + case WM_COMMAND: + MouseOnCommand(hwndDlg, wParam, lParam); + break; + } return FALSE;

6 years, 8 months

01/01: [WIN32K] Implement UOI_FLAGS in NtUserGetObjectInformation(). Based from a patch by Jérôme Gardou. CORE-13447 CORE-14422

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a55d7c692ba0215e97663… commit a55d7c692ba0215e976630df88782c1ca20e792e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 22 22:56:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 23:00:55 2018 +0200 [WIN32K] Implement UOI_FLAGS in NtUserGetObjectInformation(). Based from a patch by Jérôme Gardou. CORE-13447 CORE-14422 This fixes closing nLite 1.4.9.3 (.NET2) application, as well as any other program that expects that the interactive window station is reported as being visible. I thank Mark Jansen and Joachim Henze for help and testing. --- win32ss/user/ntuser/winsta.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 1187e44055..d9ca3ca999 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -717,22 +717,49 @@ NtUserGetObjectInformation( goto Exit; } - TRACE("WinSta or Desktop opened!!\n"); + TRACE("WinSta or Desktop opened!\n"); /* Get data */ switch (nIndex) { case UOI_FLAGS: { - /* This is a default implementation that does almost nothing */ - ObjectFlags.fInherit = FALSE; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; + ULONG BytesWritten; + ObjectFlags.fReserved = FALSE; + + /* Check whether this handle is inheritable */ + Status = ZwQueryObject(hObject, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), + &BytesWritten); + if (!NT_SUCCESS(Status)) + { + ERR("ZwQueryObject failed, Status 0x%08lx\n", Status); + break; + } + ObjectFlags.fInherit = HandleInfo.Inherit; + ObjectFlags.dwFlags = 0; + if (WinStaObject != NULL) + { + if (!(WinStaObject->Flags & WSS_NOIO)) + ObjectFlags.dwFlags |= WSF_VISIBLE; + } + else if (DesktopObject != NULL) + { + FIXME("Setting DF_ALLOWOTHERACCOUNTHOOK is unimplemented.\n"); + } + else + { + ERR("No associated WinStaObject nor DesktopObject!\n"); + } pvData = &ObjectFlags; nDataSize = sizeof(ObjectFlags); Status = STATUS_SUCCESS; - ERR("UOI_FLAGS unimplemented!\n"); break; }

6 years, 8 months

01/01: [CPL][CONSOLE] Mistake corrections

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e445b305bb8afdd80a8da… commit e445b305bb8afdd80a8da5aadddd642563337b4a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Apr 13 18:11:47 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sun Apr 22 22:52:48 2018 +0200 [CPL][CONSOLE] Mistake corrections --- dll/cpl/console/lang/it-IT.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/console/lang/it-IT.rc b/dll/cpl/console/lang/it-IT.rc index b9bbfc769e..0677e07d1a 100644 --- a/dll/cpl/console/lang/it-IT.rc +++ b/dll/cpl/console/lang/it-IT.rc @@ -148,9 +148,9 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "Consola" - IDS_CPLDESCRIPTION "Configura le proprietà della consola." + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configura le proprietà della console." IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra" - IDS_RASTERFONTS "Font a Raster" + IDS_RASTERFONTS "Font Raster" IDS_GROUPBOX_FONT_NAME "Font Selezionate: " END

6 years, 8 months

← Newer
1
2
3
4
5
6
7
...
25
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 April 2018