Changeset 22020 for trunk/include

Timestamp:

Sep 25, 2012, 11:55:02 PM (13 years ago)

Author:

dmik

Message:

Disable debug fields of RTL_CRITICAL_SECTION_DEBUG.

Odin uses the DebugInfo ptr in CRITICAL_SECTION for its own purposes
which are incompatible with NT. For this reason any NT-style usage must
be disabled.

This in particular fixes debug assertions and crashes in CRYPT32.DLL (due to
misinterpretation of the structure fields) which happened e.g. during playback of
some Flash content.

Location:

trunk/include/win

Files:

• winbase.h (modified) (1 diff)
• winnt.h (modified) (2 diffs)

trunk/include/win/winbase.h

@@ -1224 +1224 @@
 
 #ifdef __WINE__
+#ifdef __WIN32OS2__
+#define CRITICAL_SECTION_INIT(name) { 0, -1, 0, 0, 0, 0 }
+#else
 #define CRITICAL_SECTION_INIT(name) { (void *)(__FILE__ ": " name), -1, 0, 0, 0, 0 }
+#endif
 #endif
 

trunk/include/win/winnt.h

@@ -2765 +2765 @@
 typedef struct _RTL_CRITICAL_SECTION_DEBUG
 {
+#ifndef __WIN32OS2__
   WORD   Type;
   WORD   CreatorBackTraceIndex;
@@ -2772 +2773 @@
   DWORD ContentionCount;
   DWORD Spare[ 2 ];
+#endif
 } RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG;