[PATCH] ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs

Jacek Caban jacek at codeweavers.com
Mon Apr 29 14:56:51 CDT 2019


Jacek Caban <jacek at codeweavers.com>

On 4/29/19 9:13 PM, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
> ---
>   dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
> index b353839c0a..73fe054259 100644
> --- a/dlls/ntoskrnl.exe/ntoskrnl.c
> +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
> @@ -293,7 +293,7 @@ static CRITICAL_SECTION obref_cs;
>   static CRITICAL_SECTION_DEBUG obref_critsect_debug =
>   {
>       0, 0, &obref_cs,
> -    { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
> +    { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList },
>         0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") }
>   };
>   static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 };
> @@ -396,7 +396,7 @@ static CRITICAL_SECTION handle_map_cs;
>   static CRITICAL_SECTION_DEBUG handle_map_critsect_debug =
>   {
>       0, 0, &handle_map_cs,
> -    { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
> +    { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList },
>         0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") }
>   };
>   static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 };


FWIW, it would be nice if declaring a critical section would be easier 
and less error prone. Maybe WINE_STATIC_CRITICAL_SECTION() macro?


Thanks,

Jacek




More information about the wine-devel mailing list