Changeset 22020 for trunk/src/crypt32/oid.c

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.

File:

• trunk/src/crypt32/oid.c (modified) (4 diffs)

trunk/src/crypt32/oid.c

@@ -60 +60 @@
 static RTL_CRITICAL_SECTION_DEBUG funcSetCSDebug =
 {
+#ifndef __WIN32OS2__
     0, 0, &funcSetCS,
     { &funcSetCSDebug.ProcessLocksList, &funcSetCSDebug.ProcessLocksList },
     0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": funcSetCS") }
+#endif
 };
 static RTL_CRITICAL_SECTION funcSetCS = { &funcSetCSDebug, -1, 0, 0, 0, 0 };
@@ -106 +108 @@
             CryptMemFree(functionCursor);
         }
-#ifdef DEBUG
+#ifndef __WIN32OS2__
         setCursor->cs.DebugInfo->Spare[0] = 0;
 #endif
@@ -143 +145 @@
             {
                 InitializeCriticalSection((CRITICAL_SECTION*)&ret->cs);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
                 ret->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": OIDFunctionSet.cs");
 #endif
@@ -1034 +1036 @@
 static RTL_CRITICAL_SECTION_DEBUG oidInfoCSDebug =
 {
+#ifndef __WIN32OS2__
     0, 0, &oidInfoCS,
     { &oidInfoCSDebug.ProcessLocksList, &oidInfoCSDebug.ProcessLocksList },
     0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": oidInfoCS") }
+#endif
 };
 static RTL_CRITICAL_SECTION oidInfoCS = { &oidInfoCSDebug, -1, 0, 0, 0, 0 };