Use RTL_CRITICAL_SECTION instead of CRITICAL_SECTION.
This commit is contained in:
parent
4378e7731c
commit
6b636e3e7b
|
@ -363,14 +363,14 @@ struct cdrom_cache {
|
||||||
#define MAX_CACHE_ENTRIES 5
|
#define MAX_CACHE_ENTRIES 5
|
||||||
static struct cdrom_cache cdrom_cache[MAX_CACHE_ENTRIES];
|
static struct cdrom_cache cdrom_cache[MAX_CACHE_ENTRIES];
|
||||||
|
|
||||||
static CRITICAL_SECTION cache_section;
|
static RTL_CRITICAL_SECTION cache_section;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &cache_section,
|
0, 0, &cache_section,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": cache_section") }
|
0, 0, { 0, (DWORD)(__FILE__ ": cache_section") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION cache_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION cache_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
/* Proposed media change function: not really needed at this time */
|
/* Proposed media change function: not really needed at this time */
|
||||||
/* This is a 1 or 0 type of function */
|
/* This is a 1 or 0 type of function */
|
||||||
|
|
|
@ -135,14 +135,14 @@ static int show_dot_files;
|
||||||
/* at some point we may want to allow Winelib apps to set this */
|
/* at some point we may want to allow Winelib apps to set this */
|
||||||
static const int is_case_sensitive = FALSE;
|
static const int is_case_sensitive = FALSE;
|
||||||
|
|
||||||
static CRITICAL_SECTION dir_section;
|
static RTL_CRITICAL_SECTION dir_section;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &dir_section,
|
0, 0, &dir_section,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": dir_section") }
|
0, 0, { 0, (DWORD)(__FILE__ ": dir_section") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
|
|
||||||
/* check if a given Unicode char is OK in a DOS short name */
|
/* check if a given Unicode char is OK in a DOS short name */
|
||||||
|
|
|
@ -53,14 +53,14 @@ typedef struct
|
||||||
|
|
||||||
static struct list vectored_handlers = LIST_INIT(vectored_handlers);
|
static struct list vectored_handlers = LIST_INIT(vectored_handlers);
|
||||||
|
|
||||||
static CRITICAL_SECTION vectored_handlers_section;
|
static RTL_CRITICAL_SECTION vectored_handlers_section;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &vectored_handlers_section,
|
0, 0, &vectored_handlers_section,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": vectored_handlers_section") }
|
0, 0, { 0, (DWORD)(__FILE__ ": vectored_handlers_section") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
# define GET_IP(context) ((LPVOID)(context)->Eip)
|
# define GET_IP(context) ((LPVOID)(context)->Eip)
|
||||||
|
|
|
@ -109,7 +109,7 @@ typedef struct tagHEAP
|
||||||
{
|
{
|
||||||
SUBHEAP subheap; /* First sub-heap */
|
SUBHEAP subheap; /* First sub-heap */
|
||||||
struct tagHEAP *next; /* Next heap for this process */
|
struct tagHEAP *next; /* Next heap for this process */
|
||||||
CRITICAL_SECTION critSection; /* Critical section for serialization */
|
RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */
|
||||||
FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */
|
FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */
|
||||||
DWORD flags; /* Heap flags */
|
DWORD flags; /* Heap flags */
|
||||||
DWORD magic; /* Magic number */
|
DWORD magic; /* Magic number */
|
||||||
|
|
|
@ -96,14 +96,14 @@ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */
|
||||||
|
|
||||||
UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */
|
UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */
|
||||||
|
|
||||||
static CRITICAL_SECTION loader_section;
|
static RTL_CRITICAL_SECTION loader_section;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &loader_section,
|
0, 0, &loader_section,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": loader_section") }
|
0, 0, { 0, (DWORD)(__FILE__ ": loader_section") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION loader_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION loader_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
static WINE_MODREF *cached_modref;
|
static WINE_MODREF *cached_modref;
|
||||||
static WINE_MODREF *current_modref;
|
static WINE_MODREF *current_modref;
|
||||||
|
|
|
@ -22,9 +22,7 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
|
||||||
#include "winnt.h"
|
#include "winnt.h"
|
||||||
#include "winreg.h"
|
|
||||||
#include "ntstatus.h"
|
#include "ntstatus.h"
|
||||||
#include "winternl.h"
|
#include "winternl.h"
|
||||||
#include "wine/server.h"
|
#include "wine/server.h"
|
||||||
|
|
|
@ -37,14 +37,14 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
||||||
|
|
||||||
static CRITICAL_SECTION peb_lock;
|
static RTL_CRITICAL_SECTION peb_lock;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &peb_lock,
|
0, 0, &peb_lock,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": peb_lock") }
|
0, 0, { 0, (DWORD)(__FILE__ ": peb_lock") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
/* CRC polynomial 0xedb88320 */
|
/* CRC polynomial 0xedb88320 */
|
||||||
static const DWORD CRC_table[256] =
|
static const DWORD CRC_table[256] =
|
||||||
|
|
|
@ -47,14 +47,14 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
||||||
|
|
||||||
static CRITICAL_SECTION TIME_GetBias_section;
|
static RTL_CRITICAL_SECTION TIME_GetBias_section;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &TIME_GetBias_section,
|
0, 0, &TIME_GetBias_section,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": TIME_GetBias_section") }
|
0, 0, { 0, (DWORD)(__FILE__ ": TIME_GetBias_section") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION TIME_GetBias_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION TIME_GetBias_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
/* TimeZone registry key values */
|
/* TimeZone registry key values */
|
||||||
static const WCHAR TZInformationKeyW[] = { 'M','a','c','h','i','n','e','\\',
|
static const WCHAR TZInformationKeyW[] = { 'M','a','c','h','i','n','e','\\',
|
||||||
|
|
|
@ -101,14 +101,14 @@ static const BYTE VIRTUAL_Win32Flags[16] =
|
||||||
|
|
||||||
static struct list views_list = LIST_INIT(views_list);
|
static struct list views_list = LIST_INIT(views_list);
|
||||||
|
|
||||||
static CRITICAL_SECTION csVirtual;
|
static RTL_CRITICAL_SECTION csVirtual;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
0, 0, &csVirtual,
|
0, 0, &csVirtual,
|
||||||
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
|
||||||
0, 0, { 0, (DWORD)(__FILE__ ": csVirtual") }
|
0, 0, { 0, (DWORD)(__FILE__ ": csVirtual") }
|
||||||
};
|
};
|
||||||
static CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 };
|
static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
/* These are always the same on an i386, and it will be faster this way */
|
/* These are always the same on an i386, and it will be faster this way */
|
||||||
|
|
Loading…
Reference in New Issue