Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[tkreuzer] 67564: [CPPRT] Add some symbol aliases for ARM

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 5 20:14:28 2015 New Revision: 67564 URL: http://svn.reactos.org/svn/reactos?rev=67564&view=rev Log: [CPPRT] Add some symbol aliases for ARM Added: trunk/reactos/lib/sdk/cpprt/arm/ (with props) trunk/reactos/lib/sdk/cpprt/arm/cpprt.s (with props) Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue May 5 20:14:28 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/arm/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/arm/cpprt.s?… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/arm/cpprt.s (added) +++ trunk/reactos/lib/sdk/cpprt/arm/cpprt.s [iso-8859-1] Tue May 5 20:14:28 2015 @@ -0,0 +1,24 @@ + +#include <kxarm.h> + + TEXTAREA + + MACRO + DEFINE_ALIAS $FuncName, $Target + LCLS _FuncName + LCLS _Target +_FuncName SETS "|$FuncName|" +_Target SETS "|$Target|" + IMPORT $_FuncName, WEAK $_Target + MEND + + ; void __cdecl `eh vector constructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) + DEFINE_ALIAS ??_L@YAXPAXIHP6AX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPAXIHP6AX0@Z1@Z + + ; void __cdecl `eh vector destructor iterator'(void *,unsigned int,int,void (__cdecl*)(void *)) + DEFINE_ALIAS ??_M@YAXPAXIHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPAXIHP6AX0@Z@Z + + ; These are the same + //DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler + + END Propchange: trunk/reactos/lib/sdk/cpprt/arm/cpprt.s ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[gedmurphy] 67563: [DDK] Fix the FS filter callback definitions

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue May 5 18:54:28 2015 New Revision: 67563 URL: http://svn.reactos.org/svn/reactos?rev=67563&view=rev Log: [DDK] Fix the FS filter callback definitions Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=67… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 5 18:54:28 2015 @@ -4890,12 +4890,12 @@ } FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; typedef NTSTATUS -(NTAPI *PFS_FILTER_CALLBACK) ( +(*PFS_FILTER_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _Out_ PVOID *CompletionContext); typedef VOID -(NTAPI *PFS_FILTER_COMPLETION_CALLBACK) ( +(*PFS_FILTER_COMPLETION_CALLBACK) ( _In_ PFS_FILTER_CALLBACK_DATA Data, _In_ NTSTATUS OperationStatus, _In_ PVOID CompletionContext);

9 years, 4 months

[aandrejevic] 67562: [NTVDM] Revert r67561. It's incorrect.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 5 18:16:56 2015 New Revision: 67562 URL: http://svn.reactos.org/svn/reactos?rev=67562&view=rev Log: [NTVDM] Revert r67561. It's incorrect. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Tue May 5 18:16:56 2015 @@ -42,8 +42,8 @@ { if (!ExtendedCode) { - /* Call the BIOS INT 16h, AH=10h "Get Extended Keystroke" */ - setAH(0x10); + /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ + setAH(0x00); Int32Call(&DosContext, BIOS_KBD_INTERRUPT); /* Retrieve the character in AL (scan code is in AH) */ @@ -59,7 +59,7 @@ } /* Check if this is a special character */ - if (Character == 0 || Character == 0xE0) ExtendedCode = getAH(); + if (Character == 0) ExtendedCode = getAH(); if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); Pointer[BytesRead++] = Character;

9 years, 4 months

[aandrejevic] 67561: [NTVDM] The DOS CON driver should support extended keystrokes.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 5 17:56:37 2015 New Revision: 67561 URL: http://svn.reactos.org/svn/reactos?rev=67561&view=rev Log: [NTVDM] The DOS CON driver should support extended keystrokes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Tue May 5 17:56:37 2015 @@ -42,8 +42,8 @@ { if (!ExtendedCode) { - /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ - setAH(0x00); + /* Call the BIOS INT 16h, AH=10h "Get Extended Keystroke" */ + setAH(0x10); Int32Call(&DosContext, BIOS_KBD_INTERRUPT); /* Retrieve the character in AL (scan code is in AH) */ @@ -59,7 +59,7 @@ } /* Check if this is a special character */ - if (Character == 0) ExtendedCode = getAH(); + if (Character == 0 || Character == 0xE0) ExtendedCode = getAH(); if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); Pointer[BytesRead++] = Character;

9 years, 4 months

[aandrejevic] 67560: [NTVDM] Fix the BIOS handling of extended scancodes.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 5 17:37:06 2015 New Revision: 67560 URL: http://svn.reactos.org/svn/reactos?rev=67560&view=rev Log: [NTVDM] Fix the BIOS handling of extended scancodes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue May 5 17:37:06 2015 @@ -87,7 +87,7 @@ /* Wait for keystroke and read */ case 0x00: /* Wait for extended keystroke and read */ - case 0x10: // FIXME: Temporarily do the same as INT 16h, 00h + case 0x10: { WORD Character; @@ -99,6 +99,12 @@ break; } + if (getAH() == 0x00 && LOBYTE(Character) == 0xE0) + { + /* Clear the extended code */ + Character &= 0xFF00; + } + BiosKbdBufferPop(); setAX(Character); @@ -108,7 +114,7 @@ /* Get keystroke status */ case 0x01: /* Get extended keystroke status */ - case 0x11: // FIXME: Temporarily do the same as INT 16h, 01h + case 0x11: { WORD Character; @@ -122,6 +128,12 @@ { /* No character, set ZF */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_ZF; + } + + if (getAH() == 0x01 && LOBYTE(Character) == 0xE0) + { + /* Clear the extended code */ + Character &= 0xFF00; } break; @@ -176,6 +188,7 @@ // Keyboard IRQ 1 static VOID WINAPI BiosKeyboardIrq(LPWORD Stack) { + static BOOLEAN Extended = FALSE; BOOLEAN SkipScanCode; BYTE ScanCode, VirtualKey; WORD Character; @@ -204,6 +217,12 @@ setAX(AX); setCF(CF); + if (ScanCode == 0xE0) + { + Extended = TRUE; + goto Quit; + } + /* Check whether CF is clear. If so, skip the scan code. */ if (SkipScanCode) goto Quit; @@ -242,10 +261,10 @@ default: { - Character = 0; - - /* If ALT isn't held down, find out which character this is */ - if (!(Bda->KeybdShiftFlags & (BDA_KBDFLAG_ALT | BDA_KBDFLAG_LALT | BDA_KBDFLAG_RALT))) + Character = Extended ? 0xE0 : 0x00; + + /* If this is not an extended scancode, and ALT isn't held down, find out which character this is */ + if (!Extended && !(Bda->KeybdShiftFlags & (BDA_KBDFLAG_ALT | BDA_KBDFLAG_LALT | BDA_KBDFLAG_RALT))) { if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) { @@ -287,6 +306,9 @@ if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; + /* Clear the extended key flag */ + Extended = FALSE; + DPRINT("BiosKeyboardIrq - Character = 0x%X, ScanCode = 0x%X, KeybdShiftFlags = 0x%X\n", Character, ScanCode, Bda->KeybdShiftFlags);

9 years, 4 months

[dreimer] 67559: [ROSAPPS] After r67555 regexpl builds fine on MSVC. So reactivate it. Thx goes to ThFabba

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 5 17:02:28 2015 New Revision: 67559 URL: http://svn.reactos.org/svn/reactos?rev=67559&view=rev Log: [ROSAPPS] After r67555 regexpl builds fine on MSVC. So reactivate it. Thx goes to ThFabba Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 17:02:28 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -#add_subdirectory(regexpl) +add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo) Modified: trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt [iso-8859-1] Tue May 5 17:02:28 2015 @@ -32,5 +32,5 @@ add_executable(regexpl ${SOURCE} regexpl.rc) set_module_type(regexpl win32cui) -add_importlibs(regexpl user32 advapi32 msvcrt kernel32) +add_importlibs(regexpl user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET regexpl DESTINATION reactos/system32 FOR all)

9 years, 4 months

[cwittich] 67558: [NTVDM] addenum to r67557

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue May 5 08:11:22 2015 New Revision: 67558 URL: http://svn.reactos.org/svn/reactos?rev=67558&view=rev Log: [NTVDM] addenum to r67557 Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Tue May 5 08:11:22 2015 @@ -192,7 +192,6 @@ { if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); - Timer = NULL; } }

9 years, 4 months

[cwittich] 67557: [NTVDM] don't try to deference an uninitialized Timer

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue May 5 08:07:08 2015 New Revision: 67557 URL: http://svn.reactos.org/svn/reactos?rev=67557&view=rev Log: [NTVDM] don't try to deference an uninitialized Timer Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Tue May 5 08:07:08 2015 @@ -188,8 +188,12 @@ VOID DestroyHardwareTimer(PHARDWARE_TIMER Timer) { - if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); - RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); + if (Timer) + { + if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); + RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); + Timer = NULL; + } } BOOLEAN ClockInitialize(VOID)

9 years, 4 months

[aandrejevic] 67556: [NTVDM] In DosTerminateProcess, McbSegment is the segment of the MCB itself, not the data it contains.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 5 03:52:25 2015 New Revision: 67556 URL: http://svn.reactos.org/svn/reactos?rev=67556&view=rev Log: [NTVDM] In DosTerminateProcess, McbSegment is the segment of the MCB itself, not the data it contains. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Tue May 5 03:52:25 2015 @@ -839,7 +839,7 @@ if (KeepResident) { /* Check if this is the PSP block and we should reduce its size */ - if (McbSegment == Psp && KeepResident < CurrentMcb->Size) + if ((McbSegment + 1) == Psp && KeepResident < CurrentMcb->Size) { /* Reduce the size of the block */ DosResizeMemory(McbSegment + 1, KeepResident, NULL);

9 years, 4 months

[tfaber] 67555: [C++] - Add nothrow versions of new/delete operators - Add <cassert> - Fix a TODO and add missing dependency to <exception> header

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 5 02:44:17 2015 New Revision: 67555 URL: http://svn.reactos.org/svn/reactos?rev=67555&view=rev Log: [C++] - Add nothrow versions of new/delete operators - Add <cassert> - Fix a TODO and add missing dependency to <exception> header Added: trunk/reactos/include/c++/cassert (with props) trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp (with props) Modified: trunk/reactos/include/c++/exception trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/cpprt/i386/cpprt.s trunk/reactos/lib/sdk/cpprt/typeinfo.cpp Added: trunk/reactos/include/c++/cassert URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/cassert?re… ============================================================================== --- trunk/reactos/include/c++/cassert (added) +++ trunk/reactos/include/c++/cassert [iso-8859-1] Tue May 5 02:44:17 2015 @@ -0,0 +1,5 @@ +// C++ forwarding C assert header. + +#pragma once + +#include <assert.h> Propchange: trunk/reactos/include/c++/cassert ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/c++/exception URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/exception?… ============================================================================== --- trunk/reactos/include/c++/exception [iso-8859-1] (original) +++ trunk/reactos/include/c++/exception [iso-8859-1] Tue May 5 02:44:17 2015 @@ -2,6 +2,8 @@ #ifndef __EXCEPTION__ #define __EXCEPTION__ + +#include <crtdefs.h> extern "C++" { Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Tue May 5 02:44:17 2015 @@ -1,10 +1,13 @@ set_cpp(WITH_EXCEPTIONS) -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include + ${REACTOS_SOURCE_DIR}/include/c++) list(APPEND SOURCE ehvec.cpp + new_nothrow.cpp typeinfo.cpp) if(ARCH STREQUAL "i386") Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Tue May 5 02:44:17 2015 @@ -39,4 +39,10 @@ ; void __cdecl operator delete(void *,unsigned int) DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z +; void __cdecl operator delete(void *,struct std::nothrow_t const &) +DEFINE_ALIAS ??3@YAXPAXABUnothrow_t@std@@@Z, ??3@YAXPAX@Z + +; void __cdecl operator delete[](void *,struct std::nothrow_t const &) +DEFINE_ALIAS ??_V@YAXPAXABUnothrow_t@std@@@Z, ??3@YAXPAX@Z + END Added: trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/new_nothrow.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp (added) +++ trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp [iso-8859-1] Tue May 5 02:44:17 2015 @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS C++ runtime library + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: nothrow version of the new operators + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <new> + +void* operator new (std::size_t) throw(std::bad_alloc); +void* operator new[] (std::size_t) throw(std::bad_alloc); + +const std::nothrow_t std::nothrow; + +void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw() +{ + try + { + return operator new (size); + } + catch (std::bad_alloc) + { + return NULL; + } +} + +void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw() +{ + try + { + return operator new[] (size); + } + catch (std::bad_alloc) + { + return NULL; + } +} Propchange: trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/cpprt/typeinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/typeinfo.cpp… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/typeinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/typeinfo.cpp [iso-8859-1] Tue May 5 02:44:17 2015 @@ -5,14 +5,7 @@ * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) */ -/* TODO: #include <exception> instead */ -class type_info { -public: - __declspec(dllimport) virtual ~type_info(); -private: - type_info(const type_info &); - type_info &operator=(const type_info &); -}; +#include <typeinfo> /* These stubs don't need to do anything (those private functions are never * called). They need to be in cpprt, though, in order to have the vtable

9 years, 4 months

← Newer
1
...
40
41
42
43
44
45
46
...
50
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 May 2015