Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

02/02: [COM_APITEST] Add some interfaces.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88b9b90337a1e9ec77c3c… commit 88b9b90337a1e9ec77c3c033cf4dc9cef7f60725 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 2 14:15:08 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Mar 2 15:23:13 2018 +0100 [COM_APITEST] Add some interfaces. --- modules/rostests/apitests/com/com_apitest.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 752f5549e6..769cf0f4eb 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -56,6 +56,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IAddressBarParser), TRUE }, { ID_NAME(IID_IAddressBand), TRUE }, { ID_NAME(IID_IAddressEditBox), TRUE }, + { ID_NAME(IID_IAsyncMoniker), TRUE }, { ID_NAME(IID_IAugmentedShellFolder), TRUE }, { ID_NAME(IID_IAugmentedShellFolder2), TRUE }, { ID_NAME(IID_IAutoComplete), TRUE }, @@ -74,6 +75,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IBindProtocol), TRUE }, { ID_NAME(IID_IBindResource) }, { ID_NAME(IID_IBindStatusCallback) }, + { ID_NAME(IID_IBlockingLock) }, { ID_NAME(IID_IBrowserFrameOptions), TRUE }, { ID_NAME(IID_IBrowserService) }, { ID_NAME(IID_IBrowserService2), TRUE }, @@ -83,8 +85,10 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_ICDBurnExt) }, { ID_NAME(IID_ICDBurnPriv) }, { ID_NAME(IID_ICallFactory), TRUE }, + { ID_NAME(IID_ICancelMethodCalls), TRUE }, { ID_NAME(IID_ICatInformation) }, { ID_NAME(IID_ICatRegister) }, + { ID_NAME(IID_IClassActivator), }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, { ID_NAME(IID_IClassFactory3), TRUE }, @@ -95,6 +99,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_ICompositeFolder) }, { ID_NAME(IID_IComputerInfoChangeNotify), }, { ID_NAME(IID_IComThreadingInfo), TRUE }, + { ID_NAME(IID_IConnectionPoint) }, { ID_NAME(IID_IConnectionPointContainer) }, { ID_NAME(IID_IContext), TRUE }, { ID_NAME(IID_IContextMenu), TRUE }, @@ -103,6 +108,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IContextMenuCB), TRUE }, { ID_NAME(IID_IContextMenuSite) }, { ID_NAME(IID_IContinue) }, + { ID_NAME(IID_IContinueCallback) }, { ID_NAME(IID_ICopyHookA), TRUE }, { ID_NAME(IID_ICopyHookW), TRUE }, { ID_NAME(IID_ICurrentWorkingDirectory), TRUE }, @@ -134,6 +140,11 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IDropTarget) }, { ID_NAME(IID_IDropTargetHelper), TRUE }, { ID_NAME(IID_IEFrameAuto) }, + //{ ID_NAME(IID_IEnumCATID) }, == EnumGUID + //{ ID_NAME(IID_IEnumCLSID) }, == EnumGUID + { ID_NAME(IID_IEnumCATEGORYINFO) }, + { ID_NAME(IID_IEnumConnectionPoints) }, + { ID_NAME(IID_IEnumConnections) }, { ID_NAME(IID_IEnumExtraSearch) }, { ID_NAME(IID_IEnumGUID) }, { ID_NAME(IID_IEnumIDList) }, @@ -238,9 +249,12 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IOleInPlaceSiteEx) }, { ID_NAME(IID_IOleInPlaceSiteWindowless), TRUE }, { ID_NAME(IID_IOleInPlaceUIWindow) }, + { ID_NAME(IID_IOleItemContainer), }, + { ID_NAME(IID_IOleLink), }, { ID_NAME(IID_IOleObject) }, { ID_NAME(IID_IOleWindow) }, { ID_NAME(IID_IParentAndItem) }, + { ID_NAME(IID_IParseDisplayName), }, { ID_NAME(IID_IPersist) }, { ID_NAME(IID_IPersistFile) }, { ID_NAME(IID_IPersistFolder) }, @@ -273,8 +287,10 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IRegTreeOptions), TRUE }, { ID_NAME(IID_IRemoteComputer) }, { ID_NAME(IID_IResolveShellLink) }, + { ID_NAME(IID_IROTData), }, { ID_NAME(IID_IRpcOptions), TRUE }, { ID_NAME(IID_IRunnableObject) }, + { ID_NAME(IID_IRunningObjectTable), }, { ID_NAME(IID_ISLTracker), TRUE }, { ID_NAME(IID_IScriptErrorList) }, { ID_NAME(IID_ISearch) }, @@ -360,6 +376,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_ITargetNotify) }, { ID_NAME(IID_ITaskbarList) }, { ID_NAME(IID_ITaskbarList2) }, + { ID_NAME(IID_ITaskbarList3), TRUE }, + { ID_NAME(IID_ITaskbarList4), TRUE }, { ID_NAME(IID_ITrackShellMenu), TRUE }, /* This interface is completely different between PSDK and registry/shell32 */ { ID_NAME(IID_ITransferAdviseSink), TRUE },

6 years, 9 months

01/02: [COM_APITEST] Fix test failures on Win2003.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3bd2aabe1cc8558eb0bf… commit b3bd2aabe1cc8558eb0bf6bfa041b686c9bf6156 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 2 14:14:53 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Mar 2 15:23:05 2018 +0100 [COM_APITEST] Fix test failures on Win2003. --- modules/rostests/apitests/com/com_apitest.c | 19 ++++++++++--------- modules/rostests/apitests/com/com_apitest.h | 1 - modules/rostests/apitests/com/shell32.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index bd1ec684c6..752f5549e6 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -48,7 +48,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IAccessibleHandler) }, { ID_NAME(IID_IAccessControl), TRUE }, { ID_NAME(IID_IAccessor) }, - { ID_NAME(IID_IACLCustomMRU) }, + { ID_NAME(IID_IACLCustomMRU), TRUE }, { ID_NAME(IID_IActiveDesktop), TRUE }, { ID_NAME(IID_IActiveDesktopP), TRUE }, { ID_NAME(IID_IActionProgress) }, @@ -129,7 +129,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IDockingWindowSite), TRUE }, { ID_NAME(IID_IDocViewSite), TRUE }, { ID_NAME(IID_IDragSourceHelper), TRUE }, - { ID_NAME(IID_IDriveFolderExt) }, + { ID_NAME(IID_IDriveFolderExt), TRUE }, { ID_NAME(IID_IDropSource) }, { ID_NAME(IID_IDropTarget) }, { ID_NAME(IID_IDropTargetHelper), TRUE }, @@ -416,7 +416,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IUserNotificationCallback) }, // On Vista+ { ID_NAME(IID_IUserNotification2) }, // On Vista+ - { ID_NAME(IID_IAggregateFilterCondition), TRUE }, + { ID_NAME(IID_IAggregateFilterCondition) }, { ID_NAME(IID_IAliasRegistrationCallback), TRUE }, { ID_NAME(IID_IAssociationArrayInitialize), TRUE }, { ID_NAME(IID_IAssociationList), TRUE }, @@ -429,7 +429,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IEnumAssociationElements), TRUE }, { ID_NAME(IID_IEnumerateAssociationElements),TRUE }, { ID_NAME(IID_IExecuteCommand), TRUE }, - { ID_NAME(IID_IFilterCondition), TRUE }, + { ID_NAME(IID_IFilterCondition) }, { ID_NAME(IID_IFolderNotify), TRUE }, { ID_NAME(IID_IFolderProperties), TRUE }, { ID_NAME(IID_IFolderType), TRUE }, @@ -460,15 +460,16 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_ITaskConditionCombiner), TRUE }, { ID_NAME(IID_ITaskConditionInit), TRUE }, { ID_NAME(IID_ITransferProvider), TRUE }, - { ID_NAME(IID_IUserEventTimer), TRUE }, - { ID_NAME(IID_IUserEventTimerCallback), TRUE }, + { ID_NAME(IID_IUserEventTimer) }, + { ID_NAME(IID_IUserEventTimerCallback) }, { ID_NAME(IID_IAssociationArrayOld), TRUE }, { ID_NAME(IID_IAssociationArray), TRUE }, - { ID_NAME(IID_IDriveFolderExtOld), TRUE }, - { ID_NAME(IID_IDriveFolderExt), TRUE }, +#define IID_IDriveFolderExt IID_IDriveFolderExtOld + { ID_NAME(IID_IDriveFolderExt) }, +#undef IID_IDriveFolderExt { ID_NAME(IID_IPinnedListOld), TRUE }, { ID_NAME(IID_IPinnedList), TRUE }, - { ID_NAME(IID_IAttachmentExecute), TRUE } + { ID_NAME(IID_IAttachmentExecute), TRUE }, }; static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index f1f4c73876..28d774c6b8 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -138,7 +138,6 @@ DEFINE_GUID(IID_IDeskBandEx, 0x5dd6b79a, 0x3ab7, 0x49c0, 0xab, 0x8 DEFINE_GUID(IID_IDeskMovr, 0x72267f69, 0xa6f9, 0x11d0, 0xbc, 0x94, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63); DEFINE_GUID(IID_IDiscMasterProgressEvents, 0xec9e51c1, 0x4e5d, 0x11d3, 0x91, 0x44, 0x00, 0x10, 0x4b, 0xa1, 0x1c, 0x5e); DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29); -DEFINE_GUID(IID_IDriveFolderExt, 0x98467961, 0x4f27, 0x4a1f, 0x96, 0x29, 0x22, 0xb0, 0x6d, 0x0b, 0x5c, 0xcb); DEFINE_GUID(IID_IEFrameAuto, 0x0b7b9bb9, 0xade1, 0x4ea0, 0xa4, 0xb6, 0x02, 0xb9, 0xc6, 0x6e, 0x31, 0x69); DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1); DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda); diff --git a/modules/rostests/apitests/com/shell32.c b/modules/rostests/apitests/com/shell32.c index c7bae24ba2..76769e6c62 100644 --- a/modules/rostests/apitests/com/shell32.c +++ b/modules/rostests/apitests/com/shell32.c @@ -27,7 +27,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x24, &IID_ICDBurn }, { 0x28, &IID_ICDBurnPriv }, { 0x2c, &IID_IPersistPropertyBag }, - { 0x30, &IID_IDriveFolderExt }, + { 0x30, &IID_IDriveFolderExtOld }, { 0x34, &IID_INamespaceWalkCB }, { 0x3c, &IID_IServiceProvider }, { 0x40, &IID_ITransferAdviseSinkPriv },

6 years, 9 months

01/01: [NTOS:KE] Don't loop indefinitely trying to figure out the CPU frequency. CORE-14419

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b78ff036fb4f446f4e0a… commit 6b78ff036fb4f446f4e0aebe5120af26d6183a77 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Mar 1 10:36:27 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Mar 1 14:26:44 2018 +0100 [NTOS:KE] Don't loop indefinitely trying to figure out the CPU frequency. CORE-14419 Previously, we would keep sampling the CPU frequency until two subsequent samples differed by at most 1 MHz. This could take several seconds, and would unnecessarily delay boot. Instead, if sampling is too unreliable, just give up and calculate the average frequency from 10 samples. This is no worse than picking the frequency that just happened to be returned twice in a row. The fact that this method of sampling fails could indicate that there's a problem with our performance counter implementation or timer interrupt, but that's a separate issue... --- ntoskrnl/ke/i386/kiinit.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index cba2c423fd..c17f4dd1f3 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -44,7 +44,7 @@ KiInitMachineDependent(VOID) PFX_SAVE_AREA FxSaveArea; ULONG MXCsrMask = 0xFFBF; CPU_INFO CpuInfo; - KI_SAMPLE_MAP Samples[4]; + KI_SAMPLE_MAP Samples[10]; PKI_SAMPLE_MAP CurrentSample = Samples; LARGE_IDENTITY_MAP IdentityMap; @@ -240,11 +240,17 @@ KiInitMachineDependent(VOID) CurrentSample++; Sample++; - if (Sample == sizeof(Samples) / sizeof(Samples[0])) + if (Sample == RTL_NUMBER_OF(Samples)) { - /* Restart */ - CurrentSample = Samples; - Sample = 0; + /* No luck. Average the samples and be done */ + ULONG TotalMHz = 0; + while (Sample--) + { + TotalMHz += Samples[Sample].MHz; + } + CurrentSample[-1].MHz = TotalMHz / RTL_NUMBER_OF(Samples); + DPRINT1("Sampling CPU frequency failed. Using average of %lu MHz\n", CurrentSample[-1].MHz); + break; } }

6 years, 9 months

01/01: [TELEPHON.CPL] Include winuser.h in the rc which is needed for manifest_hosted.rc Add a check in manifest_hosted.rc to make sure that winuser.h is included

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d214e1c4d4af1166f2f5d… commit d214e1c4d4af1166f2f5df66edfa069f6732e9c4 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Mar 1 10:05:12 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Mar 1 10:05:54 2018 +0200 [TELEPHON.CPL] Include winuser.h in the rc which is needed for manifest_hosted.rc Add a check in manifest_hosted.rc to make sure that winuser.h is included --- dll/cpl/telephon/telephon.rc | 1 + sdk/include/reactos/manifest_hosted.rc | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dll/cpl/telephon/telephon.rc b/dll/cpl/telephon/telephon.rc index 44ce43dc3f..c08e4e6573 100644 --- a/dll/cpl/telephon/telephon.rc +++ b/dll/cpl/telephon/telephon.rc @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" diff --git a/sdk/include/reactos/manifest_hosted.rc b/sdk/include/reactos/manifest_hosted.rc index 05604d44c7..46d0cb27d9 100644 --- a/sdk/include/reactos/manifest_hosted.rc +++ b/sdk/include/reactos/manifest_hosted.rc @@ -1 +1,6 @@ + +#ifndef RT_MANIFEST +#error please include winuser.h before including me! +#endif + 123 RT_MANIFEST "manifest.xml"

6 years, 9 months

01/01: [BEEPMIDI] Don't busy-wait when no notes are playing. CORE-12860

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eab8a0b968cbb7ef08933… commit eab8a0b968cbb7ef0893326a5e87704c4da45c7f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Feb 27 18:36:22 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Mar 1 08:58:33 2018 +0100 [BEEPMIDI] Don't busy-wait when no notes are playing. CORE-12860 - Use a new work_available event to allow ProcessPlayingNotes to sleep when no notes are to be played. - Get rid of the pointless thread_termination_complete event, wait on the thread handle instead. - Don't leak thread_handle. --- dll/win32/beepmidi/beepmidi.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dll/win32/beepmidi/beepmidi.c b/dll/win32/beepmidi/beepmidi.c index 5fdf62d7bc..b23999845f 100644 --- a/dll/win32/beepmidi/beepmidi.c +++ b/dll/win32/beepmidi/beepmidi.c @@ -95,7 +95,7 @@ typedef struct _DeviceInfo HANDLE thread_handle; BOOL terminate_thread; - HANDLE thread_termination_complete; + HANDLE work_available; } DeviceInfo; DeviceInfo* the_device; @@ -127,7 +127,7 @@ ProcessPlayingNotes( /* We lock the note list only while accessing it */ #ifdef CONTINUOUS_NOTES - while ( ! device_info->terminate_thread ) + while ( WaitForSingleObject(the_device->work_available, INFINITE), !device_info->terminate_thread ) #endif { NoteNode* node; @@ -198,10 +198,6 @@ ProcessPlayingNotes( LeaveCriticalSection(&device_lock); } -#ifdef CONTINUOUS_NOTES - SetEvent(device_info->thread_termination_complete); -#endif - return 0; } @@ -346,9 +342,9 @@ OpenDevice( /* This is threading-related code */ #ifdef CONTINUOUS_NOTES - the_device->thread_termination_complete = CreateEvent(NULL, FALSE, FALSE, NULL); + the_device->work_available = CreateEvent(NULL, TRUE, FALSE, NULL); - if ( ! the_device->thread_termination_complete ) + if ( ! the_device->work_available ) { DPRINT("CreateEvent failed\n"); HeapFree(heap, 0, the_device); @@ -365,7 +361,7 @@ OpenDevice( if ( ! the_device->thread_handle ) { DPRINT("CreateThread failed\n"); - CloseHandle(the_device->thread_termination_complete); + CloseHandle(the_device->work_available); HeapFree(heap, 0, the_device); return MMSYSERR_NOMEM; } @@ -391,10 +387,11 @@ CloseDevice(DeviceInfo* device_info) /* If we're working in threaded mode we need to wait for thread to die */ #ifdef CONTINUOUS_NOTES the_device->terminate_thread = TRUE; + SetEvent(device_info->work_available); - WaitForSingleObject(the_device->thread_termination_complete, INFINITE); - - CloseHandle(the_device->thread_termination_complete); + WaitForSingleObject(the_device->thread_handle, INFINITE); + CloseHandle(the_device->thread_handle); + CloseHandle(the_device->work_available); #endif /* Let the client application know the device is closing */ @@ -451,6 +448,11 @@ StopNote( DPRINT("Note stopped - now playing %d notes\n", (int) device_info->playing_notes_count); +#ifdef CONTINUOUS_NOTES + if (device_info->playing_notes_count == 0) + ResetEvent(device_info->work_available); +#endif + LeaveCriticalSection(&device_lock); device_info->refresh_notes = TRUE; @@ -561,6 +563,10 @@ PlayNote( } */ +#ifdef CONTINUOUS_NOTES + SetEvent(device_info->work_available); +#endif + LeaveCriticalSection(&device_lock); DPRINT("Note started - now playing %d notes\n", (int) device_info->playing_notes_count);

6 years, 9 months

01/01: [SHIMGVW] -Add the 123 manifest to load the v6 comctl32. CORE-14415 This shows that we may have problems in the future with applications using just comctl32 v5

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f1190400055545a4c35b… commit 2f1190400055545a4c35bb315153efa16bb005ff Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Mar 1 09:20:44 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Mar 1 09:23:06 2018 +0200 [SHIMGVW] -Add the 123 manifest to load the v6 comctl32. CORE-14415 This shows that we may have problems in the future with applications using just comctl32 v5 --- dll/win32/shimgvw/shimgvw.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.rc b/dll/win32/shimgvw/shimgvw.rc index 2e213845a9..c2164fbd3f 100644 --- a/dll/win32/shimgvw/shimgvw.rc +++ b/dll/win32/shimgvw/shimgvw.rc @@ -1,13 +1,18 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Picture and Fax Viewer" #define REACTOS_STR_INTERNAL_NAME "shimgvw" #define REACTOS_STR_ORIGINAL_FILENAME "shimgvw.dll" #include <reactos/version.rc> +#include <reactos/manifest_hosted.rc> + IDI_APPICON ICON "res/main.ico" IDI_BMP_ICON ICON "res/bmp.ico" IDI_PNG_ICON ICON "res/png.ico"

6 years, 9 months

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 March 2018