Re: [ros-dev] [ros-diffs] [reactos] 02/02: [MOUNTMGR][MUP] Use global definition of INIT_FUNCTION/INIT_SECTION (Addendum to 71fefa32).

[Michael Fritscher]

Moin,

this commit causes
https://build.reactos.org/builders/Build%20MSVC_x86/builds/13087/steps/comp…
:

FAILED: C:\PROGRA~2\MICROS~1.0\VC\bin\cl.exe   /nologo
-D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof
\"C:/Buildslave/Build_MSVC_x86/build\" - 1 : sizeof REACTOS_SOURCE_DIR]"
/Ob0 /Od /GF /Gy /X /Zl /GR- /EHs-c- /GS- /arch:IA32 /FS /W3 /wd4244
/wd4290 /wd4800 /wd4200 /wd4214 /wd4018 /we4013 /we4020 /we4022 /we4047
/we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716 /we4028
/we4189 /w14115 /Zi /hotpatch -Idrivers\filters\mountmgr
-IC:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\psdk
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\dxsdk -Isdk\include
-Isdk\include\psdk -Isdk\include\dxsdk -Isdk\include\ddk
-Isdk\include\reactos -Isdk\include\reactos\mc
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\crt
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\ddk
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\ndk
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\reactos
-IC:\Buildslave\Build_MSVC_x86\build\sdk\include\reactos\libs
-DREACTOS_SOURCE_DIR="\"C:/Buildslave/Build_MSVC_x86/build\""
-DREACTOS_BINARY_DIR="\"R:/buildbot/output-VS-i386\""
/FIR:/buildbot/output-VS-i386/drivers/filters/mountmgr/mountmgr.pch
/YuR:/buildbot/output-VS-i386/drivers/filters/mountmgr/mountmgr.pch
/showIncludes -DDBG=1 -DUSE_COMPILER_EXCEPTIONS -DWIN32 -DWINVER=0x502
-D_M_IX86 -D_SEH_ENABLE_TRACE -D_SETUPAPI_VER=0x502 -D_USE_32BIT_TIME_T
-D_WIN32_IE=0x600 -D_WIN32_WINDOWS=0x502 -D_WIN32_WINNT=0x502 -D_WINDOWS
-D_WINKD_=1 -D_X86_ -D__REACTOS__ -D__STDC__=1 -D__i386__ -Di386
-Dinline=__inline -Dmountmgr_EXPORTS
/Fodrivers\filters\mountmgr\CMakeFiles\mountmgr.dir\mountmgr.c.obj
/Fddrivers\filters\mountmgr\CMakeFiles\mountmgr.dir\ /FS -c
C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mountmgr.c

C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mountmgr.c(1810)
: error C2983: 'DriverEntry' : all declarations must have an identical
__declspec(code_seg(...))

C:\Buildslave\Build_MSVC_x86\build\drivers\filters\mountmgr\mntmgr.h(179) :
see declaration of 'DriverEntry'

Best regards,
Michael Fritscher

On 27.01.19 02:37, Hermès Bélusca-Maïto wrote:
>  
> https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53abbb06b532fd052d575…
>  
>  commit 53abbb06b532fd052d575231a219ca5683e05514
>  Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
>  AuthorDate: Sun Jan 27 02:34:20 2019 +0100
>  Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
>  CommitDate: Sun Jan 27 02:40:11 2019 +0100
>  
>      [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 d158a055ab..49194bdc7f 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 <section_attribs.h>
>   
>   #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 4153add678..dacbfa7d69 100644
>  --- a/drivers/filters/mountmgr/mntmgr.h
>  +++ b/drivers/filters/mountmgr/mntmgr.h
>  @@ -8,12 +8,7 @@
>   #include <wdmguid.h>
>   #include <ndk/psfuncs.h>
>   #include <ntdddisk.h>
>  -
>  -#ifdef __GNUC__
>  -#define INIT_SECTION __attribute__((section ("INIT")))
>  -#else
>  -#define INIT_SECTION /* Done via alloc_text for MSC */
>  -#endif
>  +#include <section_attribs.h>
>   
>   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 0e273b3957..0b2fe8e7ba 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,
>