NTDLL: use RTL_CRITICAL_SECTION instead of CRITICAL_SECTION
Mike McCormack
mike at codeweavers.com
Fri Jun 24 21:59:07 CDT 2005
ChangeLog:
* use RTL_CRITICAL_SECTION instead of CRITICAL_SECTION
-------------- next part --------------
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.55
diff -u -p -r1.55 cdrom.c
--- dlls/ntdll/cdrom.c 21 Jun 2005 09:52:41 -0000 1.55
+++ dlls/ntdll/cdrom.c 25 Jun 2005 02:49:01 -0000
@@ -363,14 +363,14 @@ struct cdrom_cache {
#define MAX_CACHE_ENTRIES 5
static struct cdrom_cache cdrom_cache[MAX_CACHE_ENTRIES];
-static CRITICAL_SECTION cache_section;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION cache_section;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &cache_section,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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 */
/* This is a 1 or 0 type of function */
Index: dlls/ntdll/directory.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/directory.c,v
retrieving revision 1.34
diff -u -p -r1.34 directory.c
--- dlls/ntdll/directory.c 21 Jun 2005 09:52:41 -0000 1.34
+++ dlls/ntdll/directory.c 25 Jun 2005 02:49:01 -0000
@@ -135,14 +135,14 @@ static int show_dot_files;
/* at some point we may want to allow Winelib apps to set this */
static const int is_case_sensitive = FALSE;
-static CRITICAL_SECTION dir_section;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION dir_section;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &dir_section,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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 */
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.79
diff -u -p -r1.79 exception.c
--- dlls/ntdll/exception.c 21 Jun 2005 09:52:41 -0000 1.79
+++ dlls/ntdll/exception.c 25 Jun 2005 02:49:01 -0000
@@ -53,14 +53,14 @@ typedef struct
static struct list vectored_handlers = LIST_INIT(vectored_handlers);
-static CRITICAL_SECTION vectored_handlers_section;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION vectored_handlers_section;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &vectored_handlers_section,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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__
# define GET_IP(context) ((LPVOID)(context)->Eip)
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.40
diff -u -p -r1.40 heap.c
--- dlls/ntdll/heap.c 21 Jun 2005 20:54:31 -0000 1.40
+++ dlls/ntdll/heap.c 25 Jun 2005 02:49:01 -0000
@@ -109,7 +109,7 @@ typedef struct tagHEAP
{
SUBHEAP subheap; /* First sub-heap */
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 */
DWORD flags; /* Heap flags */
DWORD magic; /* Magic number */
Index: dlls/ntdll/loader.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
retrieving revision 1.93
diff -u -p -r1.93 loader.c
--- dlls/ntdll/loader.c 21 Jun 2005 09:52:41 -0000 1.93
+++ dlls/ntdll/loader.c 25 Jun 2005 02:49:01 -0000
@@ -96,14 +96,14 @@ static const IMAGE_TLS_DIRECTORY **tls_d
UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */
-static CRITICAL_SECTION loader_section;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION loader_section;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &loader_section,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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 *current_modref;
Index: dlls/ntdll/ntdll_misc.h
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/ntdll_misc.h,v
retrieving revision 1.55
diff -u -p -r1.55 ntdll_misc.h
--- dlls/ntdll/ntdll_misc.h 6 Jun 2005 20:04:33 -0000 1.55
+++ dlls/ntdll/ntdll_misc.h 25 Jun 2005 02:49:01 -0000
@@ -22,9 +22,7 @@
#include <stdarg.h>
#include "windef.h"
-#include "winbase.h"
#include "winnt.h"
-#include "winreg.h"
#include "ntstatus.h"
#include "winternl.h"
#include "wine/server.h"
Index: dlls/ntdll/rtl.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtl.c,v
retrieving revision 1.75
diff -u -p -r1.75 rtl.c
--- dlls/ntdll/rtl.c 21 Jun 2005 09:52:41 -0000 1.75
+++ dlls/ntdll/rtl.c 25 Jun 2005 02:49:02 -0000
@@ -37,14 +37,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
-static CRITICAL_SECTION peb_lock;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION peb_lock;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &peb_lock,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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 */
static const DWORD CRC_table[256] =
Index: dlls/ntdll/time.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/time.c,v
retrieving revision 1.73
diff -u -p -r1.73 time.c
--- dlls/ntdll/time.c 20 Jun 2005 18:37:17 -0000 1.73
+++ dlls/ntdll/time.c 25 Jun 2005 02:49:02 -0000
@@ -47,14 +47,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
-static CRITICAL_SECTION TIME_GetBias_section;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION TIME_GetBias_section;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &TIME_GetBias_section,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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 */
static const WCHAR TZInformationKeyW[] = { 'M','a','c','h','i','n','e','\\',
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.54
diff -u -p -r1.54 virtual.c
--- dlls/ntdll/virtual.c 21 Jun 2005 20:23:02 -0000 1.54
+++ dlls/ntdll/virtual.c 25 Jun 2005 02:49:02 -0000
@@ -101,14 +101,14 @@ static const BYTE VIRTUAL_Win32Flags[16]
static struct list views_list = LIST_INIT(views_list);
-static CRITICAL_SECTION csVirtual;
-static CRITICAL_SECTION_DEBUG critsect_debug =
+static RTL_CRITICAL_SECTION csVirtual;
+static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &csVirtual,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
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__
/* These are always the same on an i386, and it will be faster this way */
More information about the wine-patches
mailing list