Коммит c7eba0c5 создал по автору Timo Kreuzer's avatar Timo Kreuzer
Просмотр файлов

[SDK] Improve definition of (RTL_)CRITICAL_SECTION_DEBUG

владелец a444572c
Скрыть пробелы
Построчно Рядом
dll/win32/kernel32/wine/profile.c
Просмотр файла @ c7eba0c5
...@@ -103,7 +103,7 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = ...@@ -103,7 +103,7 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
{ {
0, 0, &PROFILE_CritSect, 0, 0, &PROFILE_CritSect,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
0, 0, 0 0, 0, { 0 }
}; };
static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 };
......
dll/win32/kernel32/winnls/string/lcformat.c
Просмотр файла @ c7eba0c5
...@@ -126,11 +126,7 @@ static CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug = ...@@ -126,11 +126,7 @@ static CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug =
0, 0, &NLS_FormatsCS, 0, 0, &NLS_FormatsCS,
{ &NLS_FormatsCS_debug.ProcessLocksList, { &NLS_FormatsCS_debug.ProcessLocksList,
&NLS_FormatsCS_debug.ProcessLocksList }, &NLS_FormatsCS_debug.ProcessLocksList },
#ifdef __REACTOS__
0, 0, 0
#else
0, 0, { (DWORD_PTR)(__FILE__ ": NLS_Formats") } 0, 0, { (DWORD_PTR)(__FILE__ ": NLS_Formats") }
#endif
}; };
static CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 };
......
sdk/include/ndk/rtltypes.h
Просмотр файла @ c7eba0c5
...@@ -1423,9 +1423,25 @@ typedef struct _RTL_CRITICAL_SECTION_DEBUG ...@@ -1423,9 +1423,25 @@ typedef struct _RTL_CRITICAL_SECTION_DEBUG
LIST_ENTRY ProcessLocksList; LIST_ENTRY ProcessLocksList;
ULONG EntryCount; ULONG EntryCount;
ULONG ContentionCount; ULONG ContentionCount;
ULONG Spare[2]; union
{
ULONG_PTR WineDebugString;
ULONG_PTR Spare[1];
struct
{
ULONG Flags;
USHORT CreatorBackTraceIndexHigh;
USHORT SpareWORD;
};
};
} RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG; } RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG;
#ifdef _WIN64
C_ASSERT(sizeof(RTL_CRITICAL_SECTION_DEBUG) == 0x30);
#else
C_ASSERT(sizeof(RTL_CRITICAL_SECTION_DEBUG) == 0x20);
#endif
typedef struct _RTL_CRITICAL_SECTION typedef struct _RTL_CRITICAL_SECTION
{ {
PRTL_CRITICAL_SECTION_DEBUG DebugInfo; PRTL_CRITICAL_SECTION_DEBUG DebugInfo;
......
sdk/include/psdk/winbase.h
Просмотр файла @ c7eba0c5
...@@ -908,11 +908,17 @@ typedef struct _CRITICAL_SECTION_DEBUG { ...@@ -908,11 +908,17 @@ typedef struct _CRITICAL_SECTION_DEBUG {
LIST_ENTRY ProcessLocksList; LIST_ENTRY ProcessLocksList;
DWORD EntryCount; DWORD EntryCount;
DWORD ContentionCount; DWORD ContentionCount;
//#ifdef __WINESRC__ //not all wine code is marked so union
DWORD_PTR Spare[8/sizeof(DWORD_PTR)];/* in Wine they store a string here */ {
//#else DWORD_PTR WineDebugString;
//WORD SpareWORD; DWORD_PTR Spare[1];
//#endif struct
{
DWORD Flags;
WORD CreatorBackTraceIndexHigh;
WORD SpareWORD;
};
};
} CRITICAL_SECTION_DEBUG,*PCRITICAL_SECTION_DEBUG,*LPCRITICAL_SECTION_DEBUG; } CRITICAL_SECTION_DEBUG,*PCRITICAL_SECTION_DEBUG,*LPCRITICAL_SECTION_DEBUG;
typedef struct _CRITICAL_SECTION { typedef struct _CRITICAL_SECTION {
......
sdk/include/xdk/winnt_old.h
Просмотр файла @ c7eba0c5
...@@ -2791,9 +2791,17 @@ typedef struct _RTL_CRITICAL_SECTION_DEBUG { ...@@ -2791,9 +2791,17 @@ typedef struct _RTL_CRITICAL_SECTION_DEBUG {
LIST_ENTRY ProcessLocksList; LIST_ENTRY ProcessLocksList;
DWORD EntryCount; DWORD EntryCount;
DWORD ContentionCount; DWORD ContentionCount;
DWORD Flags; union
WORD CreatorBackTraceIndexHigh; {
WORD SpareWORD; DWORD_PTR WineDebugString;
DWORD_PTR Spare[1];
struct
{
DWORD Flags;
WORD CreatorBackTraceIndexHigh;
WORD SpareWORD;
};
};
} RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG; } RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG;
#include "pshpack8.h" #include "pshpack8.h"
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать