Changeset 21967 for trunk/src

Timestamp:

Feb 9, 2012, 2:34:40 PM (14 years ago)

Author:

dmik

Message:

Don't access debug fields in CRITICAL_SECTION in release builds.

This fixes occasional crashes in CRYPT32.DLL (e.g. when playing back
some Flash contents).

Location:

trunk/src

Files:

• crypt32/collectionstore.c (modified) (2 diffs)
• crypt32/context.c (modified) (2 diffs)
• crypt32/oid.c (modified) (2 diffs)
• crypt32/proplist.c (modified) (2 diffs)
• crypt32/regstore.c (modified) (2 diffs)
• rsaenh/handle.c (modified) (2 diffs)
• secur32/secur32.c (modified) (2 diffs)

trunk/src/crypt32/collectionstore.c

@@ -60 +60 @@
         CryptMemFree(entry);
     }
+#ifdef DEBUG
     cs->cs.DebugInfo->Spare[0] = 0;
+#endif
     DeleteCriticalSection((CRITICAL_SECTION*)&cs->cs);
     CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store);
@@ -453 +455 @@
             store->hdr.ctls.deleteContext  = CRYPT_CollectionDeleteCTL;
             InitializeCriticalSection((CRITICAL_SECTION*)&store->cs);
+#ifdef DEBUG
             store->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": PWINE_COLLECTIONSTORE->cs");
+#endif
             list_init(&store->stores);
         }

trunk/src/crypt32/context.c

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

trunk/src/crypt32/oid.c

@@ -106 +106 @@
             CryptMemFree(functionCursor);
         }
+#ifdef DEBUG
         setCursor->cs.DebugInfo->Spare[0] = 0;
+#endif
         DeleteCriticalSection((CRITICAL_SECTION*)&setCursor->cs);
         CryptMemFree(setCursor);
@@ -141 +143 @@
             {
                 InitializeCriticalSection((CRITICAL_SECTION*)&ret->cs);
+#ifdef DEBUG
                 ret->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": OIDFunctionSet.cs");
+#endif
                 list_init(&ret->functions);
                 strcpy(ret->name, pszFuncName);

trunk/src/crypt32/proplist.c

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

trunk/src/crypt32/regstore.c

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

trunk/src/rsaenh/handle.c

@@ -59 +59 @@
     lpTable->iFirstFree = 0;
     InitializeCriticalSection(&lpTable->mutex);
-    //lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETBL.mutex");
+#ifdef DEBUG
+    lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETBL.mutex");
+#endif
 }
 
@@ -78 +80 @@
         
     HeapFree(GetProcessHeap(), 0, lpTable->paEntries);
-    //lpTable->mutex.DebugInfo->Spare[0] = 0;
+#ifdef DEBUG
+    lpTable->mutex.DebugInfo->Spare[0] = 0;
+#endif
     DeleteCriticalSection(&lpTable->mutex);
 }

trunk/src/secur32/secur32.c

@@ -559 +559 @@
     TRACE("\n");
     InitializeCriticalSection(&cs);
-    //cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");
+#ifdef DEBUG
+    cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");
+#endif
     /* First load built-in providers */
     SECUR32_initSchannelSP();
@@ -707 +709 @@
 
     LeaveCriticalSection(&cs);
-    //cs.DebugInfo->Spare[0] = 0;
+#ifdef DEBUG
+    cs.DebugInfo->Spare[0] = 0;
+#endif
     DeleteCriticalSection(&cs);
 }