Changeset 22020 for trunk/src

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/src

Files:

• crypt32/collectionstore.c (modified) (3 diffs)
• crypt32/context.c (modified) (2 diffs)
• crypt32/oid.c (modified) (4 diffs)
• crypt32/proplist.c (modified) (2 diffs)
• crypt32/regstore.c (modified) (2 diffs)
• crypt32/sip.c (modified) (1 diff)
• ole32/ifs.c (modified) (1 diff)

trunk/src/crypt32/collectionstore.c

@@ -42 +42 @@
 {
     WINECRYPT_CERTSTORE hdr;
-    /*CRITICAL_SECTION*/RTL_CRITICAL_SECTION    cs;
+    RTL_CRITICAL_SECTION cs;
     struct list         stores;
 } WINE_COLLECTIONSTORE, *PWINE_COLLECTIONSTORE;
@@ -60 +60 @@
         CryptMemFree(entry);
     }
-#ifdef DEBUG
+#ifndef __WIN32OS2__
     cs->cs.DebugInfo->Spare[0] = 0;
 #endif
@@ -455 +455 @@
             store->hdr.ctls.deleteContext  = CRYPT_CollectionDeleteCTL;
             InitializeCriticalSection((CRITICAL_SECTION*)&store->cs);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
             store->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": PWINE_COLLECTIONSTORE->cs");
 #endif

trunk/src/crypt32/context.c

@@ -198 +198 @@
         list->contextSize = contextSize;
         InitializeCriticalSection((CRITICAL_SECTION*)&list->cs);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
         list->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": ContextList.cs");
 #endif
@@ -312 +312 @@
 {
     ContextList_Empty(list);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
     list->cs.DebugInfo->Spare[0] = 0;
 #endif

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 };

trunk/src/crypt32/proplist.c

@@ -49 +49 @@
     {
         InitializeCriticalSection((CRITICAL_SECTION*)&list->cs);
-#if DEBUG
+#ifndef __WIN32OS2__
         list->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": PCONTEXT_PROPERTY_LIST->cs");
 #endif
@@ -68 +68 @@
         CryptMemFree(prop);
     }
-#if DEBUG
+#ifndef __WIN32OS2__
     list->cs.DebugInfo->Spare[0] = 0;
 #endif

trunk/src/crypt32/regstore.c

@@ -328 +328 @@
     CRYPT_RegFlushStore(store, FALSE);
     RegCloseKey(store->key);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
     store->cs.DebugInfo->Spare[0] = 0;
 #endif
@@ -551 +551 @@
                     regInfo->key = key;
                     InitializeCriticalSection((CRITICAL_SECTION*)&regInfo->cs);
-#ifdef DEBUG
+#ifndef __WIN32OS2__
                     regInfo->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": PWINE_REGSTOREINFO->cs");
 #endif

trunk/src/crypt32/sip.c

@@ -570 +570 @@
 static RTL_CRITICAL_SECTION_DEBUG providers_cs_debug =
 {
+#ifndef __WIN32OS2__
     0, 0, &providers_cs,
     { &providers_cs_debug.ProcessLocksList,
     &providers_cs_debug.ProcessLocksList },
     0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": providers_cs") }
+#endif
 };
 static RTL_CRITICAL_SECTION providers_cs = { &providers_cs_debug, -1, 0, 0, 0, 0 };

trunk/src/ole32/ifs.c

@@ -34 +34 @@
 
 #include "wine/debug.h"
-
-#ifdef __WIN32OS2__
-#define CRITICAL_SECTION_INIT(name) { (void *)(__FILE__ ": " name), -1, 0, 0, 0, 0 }
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);