Debug::Assert(false to Debug::Fail (#9441)

dotnet · Jul 23, 2024 · e84c567 · e84c567
1 parent 804a31e
commit e84c567
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.h
@@ -25,7 +25,7 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
 
         public:
 
-            FontCollectionLoader() { Debug::Assert(false, "Assertion failed"); }
+            FontCollectionLoader() { Debug::Fail("Assertion failed"); }
 
             FontCollectionLoader(
                                 IFontSourceCollectionFactory^ fontSourceCollectionFactory,

diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.h
@@ -27,7 +27,7 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
 
         public:
 
-            FontFileEnumerator() { Debug::Assert(false, "Assertion failed"); }
+            FontFileEnumerator() { Debug::Fail("Assertion failed"); }
 
             FontFileEnumerator(
                               IEnumerable<IFontSource^>^ fontSourceCollection,

diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.h
@@ -22,7 +22,7 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
 
     public:
 
-        FontFileLoader() { Debug::Assert(false, "Assertion failed"); }
+        FontFileLoader() { Debug::Fail("Assertion failed"); }
 
         FontFileLoader(IFontSourceFactory^ fontSourceFactory);
 

diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h
@@ -29,7 +29,7 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
             /// Asserts false because COM convention requires us to have a default constructor
             /// but we are the only entity that can construct these objects, and we use the
             /// other constructor.            
-            FontFileStream() { Debug::Assert(false, "Assertion failed"); }
+            FontFileStream() { Debug::Fail("Assertion failed"); }
 
             /// <summary>
             /// ctor.

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdibitmap.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdibitmap.cpp
@@ -188,7 +188,7 @@ void CGDIBitmap::SetupPalette(interior_ptr<BITMAPINFO> bmi, int bitCount)
     }
     else
     {
-        Debug::Assert(false, "Unsupported format");
+        Debug::Fail("Unsupported format");
     }
 
     bmi->bmiHeader.biClrUsed      = count;
@@ -242,7 +242,7 @@ void CGDIBitmap::SetBits(interior_ptr<BITMAPINFO> bmi)
     }
     else
     {
-        Debug::Assert(false, "Unexpected bitcount");
+        Debug::Fail("Unexpected bitcount");
         m_Buffer = nullptr;
     }
 }

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdibrush.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdibrush.cpp
@@ -33,7 +33,7 @@ GdiSafeHandle^ CGDIDevice::ConvertBrush(COLORREF colorRef)
         }
         else
         {
-            Debug::Assert(false, "CreateSolidBrush failed");
+            Debug::Fail("CreateSolidBrush failed");
         }
     }
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdipath.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdipath.cpp
@@ -343,7 +343,7 @@ ref class GdiGeometryConverter : public CapacityStreamGeometryContext
 
         if (Double::IsNaN(transformedPoint.X) || Double::IsNaN(transformedPoint.Y))
         {
-            Debug::Assert(false, "Invalid path input: NaN encountered");
+            Debug::Fail("Invalid path input: NaN encountered");
             ForceGeometryEmpty();
             return -1;
         }

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdipen.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdipen.cpp
@@ -361,7 +361,7 @@ GdiSafeHandle^ CGDIDevice::ConvertPen(
             }
             else
             {
-                Debug::Assert(false, "ExtCreatePen failed");
+                Debug::Fail("ExtCreatePen failed");
             }
         }
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdirt.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gdirt.cpp
@@ -1178,7 +1178,7 @@ HRESULT CGDIRenderTarget::StrokePath(
         }
         else
         {
-            Debug::Assert(false, "PathGeometry.GetWidenedPathGeometry failed.");
+            Debug::Fail("PathGeometry.GetWidenedPathGeometry failed.");
         }
     }
 
@@ -1487,12 +1487,12 @@ HRESULT CGDIRenderTarget::FillLinearGradient(
     }
     else if (gradientBrush->GradientStops == nullptr || gradientBrush->GradientStops->Count == 0)
     {
-        Debug::Assert(false, "Empty LinearGradientBrush, should've been culled");
+        Debug::Fail("Empty LinearGradientBrush, should've been culled");
         return S_OK;
     }
     else if (gradientBrush->GradientStops->Count == 1)
     {
-        Debug::Assert(false, "Single-stop LinearGradientBrush, should've been converted to SolidColorBrush");
+        Debug::Fail("Single-stop LinearGradientBrush, should've been converted to SolidColorBrush");
         return FillPath(geometry, gcnew SolidColorBrush(gradientBrush->GradientStops[0]->Color));
     }
 
@@ -1538,7 +1538,7 @@ HRESULT CGDIRenderTarget::FillLinearGradient(
             break;
 
         default:
-            Debug::Assert(false, "Unknown GradientSpreadMethod");
+            Debug::Fail("Unknown GradientSpreadMethod");
             return E_NOTIMPL;
     }
 

diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gditextrt.cpp b/src/Microsoft.DotNet.Wpf/src/System.Printing/CPP/src/GDIExporter/gditextrt.cpp
@@ -931,7 +931,7 @@ GdiSafeHandle^ CGDIRenderTarget::CreateSimulatedStyleFont(interior_ptr<ENUMLOGFO
             {
                 // we have no way of telling if we've succeeded in creating unstyled font,
                 // fail.
-                Debug::Assert(false, "CreateUnstyledFont failed");
+                Debug::Fail("CreateUnstyledFont failed");
             }
             else
             {
@@ -975,7 +975,7 @@ GdiSafeHandle^ CGDIRenderTarget::CreateSimulatedStyleFont(interior_ptr<ENUMLOGFO
 
                 if (charsetFont == nullptr)
                 {
-                    Debug::Assert(false, "CreateFontCached failed");
+                    Debug::Fail("CreateFontCached failed");
                 }
                 else if (CheckFontFaceAndStyle(charsetFont, regularFaceName, regularStyleName))
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
         public:
-            FontFileLoader() { Debug::Assert(false, "Assertion failed"); }
+            FontFileLoader() { Debug::Fail("Assertion failed"); }
             FontFileLoader(IFontSourceFactory^ fontSourceFactory);
@@ Expand Down @@