From 5dbf11e1990b44773314eeaafec41530d40f817d Mon Sep 17 00:00:00 2001
From: Justin Miller <justin.miller@reactos.org>
Date: Mon, 11 Nov 2024 15:41:18 -0800
Subject: [PATCH] Fix GCC Boot and remove the hack

---
 base/applications/glgears/glgears.c | 14 +-------------
 sdk/lib/runtmchk/rtcapi.c           |  4 ++--
 win32ss/gdi/eng/surface.c           |  2 +-
 win32ss/gdi/ntgdi/dclife.c          |  2 --
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/base/applications/glgears/glgears.c b/base/applications/glgears/glgears.c
index 6c189d592fc57..fe24870b42dc1 100644
--- a/base/applications/glgears/glgears.c
+++ b/base/applications/glgears/glgears.c
@@ -74,23 +74,11 @@ static HWND hWnd;
 static HINSTANCE hInst;
 static RECT winrect;
 
-static const char *ProgramName;      /* program name (from argv[0]) */
-static Bool        verbose = False;  /* verbose output what the program is doing */
-
+//static const char *ProgramName;      /* program name (from argv[0]) */
 static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
 static GLint gear1, gear2, gear3;
 static GLfloat angle = 0.0;
 
-static
-void usage(void)
-{
-   fprintf (stderr, "usage:  %s [options]\n", ProgramName);
-   fprintf (stderr, "-info\tPrint additional GL information.\n");
-   fprintf (stderr, "-h\tPrint this help page.\n");
-   fprintf (stderr, "-v\tVerbose output.\n");
-   fprintf (stderr, "\n");
-   exit(EXIT_FAILURE);
-}
 
 
 /* return current time (in seconds) */
diff --git a/sdk/lib/runtmchk/rtcapi.c b/sdk/lib/runtmchk/rtcapi.c
index e246fbc0bb50f..f3f5000a51efe 100644
--- a/sdk/lib/runtmchk/rtcapi.c
+++ b/sdk/lib/runtmchk/rtcapi.c
@@ -43,7 +43,7 @@ _RTC_DefaultErrorFuncW(
     ...)
 {
     /* Simple fallback function */
-    __debugbreak();
+  //  __debugbreak();
     return 0;
 }
 
@@ -83,7 +83,7 @@ void
 __cdecl
 _RTC_Shutdown(void)
 {
-    __debugbreak();
+   // __debugbreak();
 }
 
 void
diff --git a/win32ss/gdi/eng/surface.c b/win32ss/gdi/eng/surface.c
index 16375bc7780c6..3bfe6f892769d 100644
--- a/win32ss/gdi/eng/surface.c
+++ b/win32ss/gdi/eng/surface.c
@@ -143,7 +143,7 @@ SURFACE_AllocSurface(
     cBitsPixel = gajBitsPerFormat[iFormat];
 
     /* Are bits and a width in bytes given? */
-    if (pvBits && cjWidth && cjWidth != 0xDEADBEEF)
+    if (pvBits && cjWidth)
     {
         /* Align the width (Windows compatibility, drivers expect that) */
         cjWidth = WIDTH_BYTES_ALIGN32((cjWidth << 3) / cBitsPixel, cBitsPixel);
diff --git a/win32ss/gdi/ntgdi/dclife.c b/win32ss/gdi/ntgdi/dclife.c
index eaa75c676d31f..caa66eda073f6 100644
--- a/win32ss/gdi/ntgdi/dclife.c
+++ b/win32ss/gdi/ntgdi/dclife.c
@@ -659,7 +659,6 @@ GreOpenDCW(
     if (!ppdev)
     {
         DPRINT1("Didn't find a suitable PDEV\n");
-        __debugbreak();
         return NULL;
     }
 
@@ -851,7 +850,6 @@ GreCreateCompatibleDC(HDC hdc, BOOL bAltDc)
     if (!ppdev)
     {
         DPRINT1("Didn't find a suitable PDEV\n");
-        __debugbreak();
         return NULL;
     }