Skip to content

W
wine-cw
Commit 94e958c6 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

ntoskrnl: Add a macro to declare a static CRITICAL_SECTION.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 72876116
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 32 deletions
dlls/ntoskrnl.exe/ntoskrnl.c
View file @ 94e958c6
...@@ -133,14 +133,7 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en ...@@ -133,14 +133,7 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en
static struct wine_rb_tree device_interfaces = { interface_rb_compare }; static struct wine_rb_tree device_interfaces = { interface_rb_compare };
static CRITICAL_SECTION drivers_cs; DECLARE_CRITICAL_SECTION(drivers_cs);
static CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &drivers_cs,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") }
};
static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) static inline LPCSTR debugstr_us( const UNICODE_STRING *us )
{ {
...@@ -286,14 +279,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r ...@@ -286,14 +279,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r
return header + 1; return header + 1;
} }
static CRITICAL_SECTION obref_cs; DECLARE_CRITICAL_SECTION(obref_cs);
static CRITICAL_SECTION_DEBUG obref_critsect_debug =
{
0, 0, &obref_cs,
{ &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 };
/*********************************************************************** /***********************************************************************
* ObDereferenceObject (NTOSKRNL.EXE.@) * ObDereferenceObject (NTOSKRNL.EXE.@)
...@@ -384,14 +370,7 @@ static const POBJECT_TYPE *known_types[] = ...@@ -384,14 +370,7 @@ static const POBJECT_TYPE *known_types[] =
&SeTokenObjectType &SeTokenObjectType
}; };
static CRITICAL_SECTION handle_map_cs; DECLARE_CRITICAL_SECTION(handle_map_cs);
static CRITICAL_SECTION_DEBUG handle_map_critsect_debug =
{
0, 0, &handle_map_cs,
{ &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 };
NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret )
{ {
......
dlls/ntoskrnl.exe/ntoskrnl_private.h
View file @ 94e958c6
...@@ -60,4 +60,11 @@ extern POBJECT_TYPE PsProcessType; ...@@ -60,4 +60,11 @@ extern POBJECT_TYPE PsProcessType;
extern POBJECT_TYPE PsThreadType; extern POBJECT_TYPE PsThreadType;
extern POBJECT_TYPE SeTokenObjectType; extern POBJECT_TYPE SeTokenObjectType;
#define DECLARE_CRITICAL_SECTION(cs) \
static CRITICAL_SECTION cs; \
static CRITICAL_SECTION_DEBUG cs##_debug = \
{ 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \
0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \
static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 };
#endif #endif
dlls/ntoskrnl.exe/sync.c
View file @ 94e958c6
...@@ -49,14 +49,7 @@ enum object_type ...@@ -49,14 +49,7 @@ enum object_type
TYPE_AUTO_TIMER = 9, TYPE_AUTO_TIMER = 9,
}; };
static CRITICAL_SECTION sync_cs; DECLARE_CRITICAL_SECTION(sync_cs);
static CRITICAL_SECTION_DEBUG sync_cs_debug =
{
0, 0, &sync_cs,
{ &sync_cs_debug.ProcessLocksList, &sync_cs_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": sync_cs") }
};
static CRITICAL_SECTION sync_cs = { &sync_cs_debug, -1, 0, 0, 0, 0 };
/*********************************************************************** /***********************************************************************
* KeWaitForMultipleObjects (NTOSKRNL.EXE.@) * KeWaitForMultipleObjects (NTOSKRNL.EXE.@)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment