From 53abbb06b532fd052d575231a219ca5683e05514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 27 Jan 2019 02:34:20 +0100 Subject: [PATCH] [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32). --- drivers/filesystems/mup/dfs.h | 9 +-------- drivers/filters/mountmgr/mntmgr.h | 9 ++------- drivers/filters/mountmgr/mountmgr.c | 4 ++-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/filesystems/mup/dfs.h b/drivers/filesystems/mup/dfs.h index d158a055abc..49194bdc7f5 100644 --- a/drivers/filesystems/mup/dfs.h +++ b/drivers/filesystems/mup/dfs.h @@ -1,14 +1,7 @@ #ifndef _DFS_PCH_ #define _DFS_PCH_ -#ifndef INIT_SECTION -#ifdef __GNUC__ -#define INIT_SECTION __attribute__((section ("INIT"))) -#else -#define INIT_SECTION /* Done via alloc_text for MSC */ -#endif -#define INIT_FUNCTION INIT_SECTION -#endif +#include #define DFS_OPEN_CONTEXT 0xFF444653 #define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 diff --git a/drivers/filters/mountmgr/mntmgr.h b/drivers/filters/mountmgr/mntmgr.h index 4153add6781..dacbfa7d69b 100644 --- a/drivers/filters/mountmgr/mntmgr.h +++ b/drivers/filters/mountmgr/mntmgr.h @@ -8,12 +8,7 @@ #include #include #include - -#ifdef __GNUC__ -#define INIT_SECTION __attribute__((section ("INIT"))) -#else -#define INIT_SECTION /* Done via alloc_text for MSC */ -#endif +#include typedef struct _DEVICE_EXTENSION { @@ -233,7 +228,7 @@ HasDriveLetter( IN PDEVICE_INFORMATION DeviceInformation ); -INIT_SECTION +INIT_FUNCTION BOOLEAN MountmgrReadNoAutoMount( IN PUNICODE_STRING RegistryPath diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index 0e273b39575..0b2fe8e7ba0 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -908,7 +908,7 @@ MountMgrUnload(IN struct _DRIVER_OBJECT *DriverObject) /* * @implemented */ -INIT_SECTION +INIT_FUNCTION BOOLEAN MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) { @@ -1802,7 +1802,7 @@ MountMgrShutdown(IN PDEVICE_OBJECT DeviceObject, /* FUNCTIONS ****************************************************************/ -INIT_SECTION +INIT_FUNCTION NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject,