[PATCH] ntoskrnl.exe: Make alloc_kernel_object() static.

[Francois Gouget]

Signed-off-by: Francois Gouget 
---
 dlls/ntoskrnl.exe/ntoskrnl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 2e78e4595b3..62c188cfc18 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -264,7 +264,7 @@ static void free_kernel_object( void *obj )
     HeapFree( GetProcessHeap(), 0, header );
 }

-void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
+static void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
 {
     struct object_header *header;

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=49446

Your paranoid android.

=== debian9 (build log) ===

Task errors:
Unable to set the VM system time: the "nc -q0 '10.42.42.142' '4243'" command returned 1 (settime/connect). Maybe the TestAgentd process is missing the required privileges.

=== debian9b (32 bit WoW report) ===

Report errors:
ntoskrnl.exe:ntoskrnl contains a misplaced todo message for driver

=== debian9b (64 bit WoW report) ===

Report errors:
ntoskrnl.exe:ntoskrnl contains a misplaced todo message for driver

=== debian9b (build log) ===

Task errors:
Unable to set the VM system time: the "nc -q0 '10.42.42.143' '4243'" command returned 1 (settime/connect). Maybe the TestAgentd process is missing the required privileges.

[Jacek Caban]

Hi Francois,

On 3/15/19 3:14 PM, Francois Gouget wrote:
> Signed-off-by: Francois Gouget
>
> dlls/ntoskrnl.exe/ntoskrnl.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
> index 2e78e4595b3..62c188cfc18 100644
> --- a/dlls/ntoskrnl.exe/ntoskrnl.c
> +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
> @@ -264,7 +264,7 @@ static void free_kernel_object( void *obj )
>       HeapFree( GetProcessHeap(), 0, header );
>   }
>
> -void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
> +static void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
>   {
>       struct object_header *header;

The plan is to use this function in other files.

Thanks,

Jacek

[Francois Gouget]

On Fri, 15 Mar 2019, Jacek Caban wrote:
> Hi Francois,
>
> On 3/15/19 3:14 PM, Francois Gouget wrote:
> > Signed-off-by: Francois Gouget
> >
> > dlls/ntoskrnl.exe/ntoskrnl.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
> > index 2e78e4595b3..62c188cfc18 100644
> > --- a/dlls/ntoskrnl.exe/ntoskrnl.c
> > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
> > @@ -264,7 +264,7 @@ static void free_kernel_object( void *obj )
> >       HeapFree( GetProcessHeap(), 0, header );
> >   }
> >   -void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
> > +static void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref
> > )
> >   {
> >       struct object_header *header;
>
> The plan is to use this function in other files.

But then there is no declaration in a header file so no other source 
file can use it. So making it static would not hurt and it's easy to 
change back when the time comes. But if there are pending patches it's 
fine to wait for those (and even if not I don't care that much but I may 
come back to it in a few months).

[Jacek Caban]

Hi Francois,

On 16/03/2019 22:09, Francois Gouget wrote:
> On Fri, 15 Mar 2019, Jacek Caban wrote:
> > Hi Francois,
> >
> > On 3/15/19 3:14 PM, Francois Gouget wrote:
> > > Signed-off-by: Francois Gouget
> > >
> > > dlls/ntoskrnl.exe/ntoskrnl.c | 2 +-
> > >    1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
> > > index 2e78e4595b3..62c188cfc18 100644
> > > --- a/dlls/ntoskrnl.exe/ntoskrnl.c
> > > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
> > > @@ -264,7 +264,7 @@ static void free_kernel_object( void *obj )
> > >        HeapFree( GetProcessHeap(), 0, header );
> > >    }
> > >    -void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref )
> > > +static void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref
> > > )
> > >    {
> > >        struct object_header *header;
> >
> > The plan is to use this function in other files.
>
> But then there is no declaration in a header file so no other source
> file can use it. So making it static would not hurt and it's easy to
> change back when the time comes.But if there are pending patches it's
> fine to wait for those (and even if not I don't care that much but I may
> come back to it in a few months).

This patch changes it:

https://source.winehq.org/patches/data/161002

Thanks,

Jacek