From 57a3b7cc34b6e956bd230d6a8425381fcf2c4f32 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Sat, 14 Jun 2003 22:17:48 +0000
Subject: [PATCH] Turn off SEH Junk some other minor cleanups.

svn path=/trunk/; revision=4893
---
 reactos/apps/tests/primitives/Makefile       | 6 +++---
 reactos/apps/tests/primitives/primitives.cpp | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/reactos/apps/tests/primitives/Makefile b/reactos/apps/tests/primitives/Makefile
index 0e47374dfd0..a2f7e1aa57c 100644
--- a/reactos/apps/tests/primitives/Makefile
+++ b/reactos/apps/tests/primitives/Makefile
@@ -13,14 +13,14 @@ CFLAGS+=-fexceptions -O2 -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -W
 LD=$(CXX) $(CXXFLAGS)
 LDFLAGS=
 LDFLAGS+=-Wl,--subsystem,windows
-LIBS+=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+LIBS+=-lkernel32 -luser32 -lgdi32
 else
 ifeq "$(CFG)"  "Proj_Listing5_1 - Win32 Debug"
 CFLAGS+=-fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W
 LD=$(CXX) $(CXXFLAGS)
 LDFLAGS=
 LDFLAGS+=-Wl,--subsystem,windows
-LIBS+=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+LIBS+=-lkernel32 -luser32 -lgdi32
 endif
 endif
 
@@ -63,7 +63,7 @@ $(TARGET): $(OBJS)
 
 .PHONY: clean
 clean:
-	-rm -f $(OBJS) $(TARGET)
+	-del $(OBJS) $(TARGET)
 
 
 
diff --git a/reactos/apps/tests/primitives/primitives.cpp b/reactos/apps/tests/primitives/primitives.cpp
index 2f76c8559d4..1a3499967ac 100644
--- a/reactos/apps/tests/primitives/primitives.cpp
+++ b/reactos/apps/tests/primitives/primitives.cpp
@@ -212,7 +212,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
          hListBrush = CreateSolidBrush(PALETTERGB(64, 192, 64));
          hListPen = CreatePen(PS_SOLID, 3, PALETTERGB(0, 0, 0));
          HDC hScreenDC = GetDC(NULL);
+#if 0
          try
+#endif
          {
             // MakeFont() from Chapter 4
             hListFont = font::MakeFont(
@@ -220,7 +222,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                font::FS_BOLD | font::FS_UNDERLINE
                ); 
          }
+#if 0
          catch (...)
+#endif
          {
             ReleaseDC(NULL, hScreenDC);
          }
@@ -250,7 +254,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
          if (lpdis->CtlID == reinterpret_cast<UINT>(hListBox))
          {            
             SaveDC(lpdis->hDC);
+#if 0
             try
+#endif
             {              
                SelectObject(lpdis->hDC, hListBrush);
                SelectObject(lpdis->hDC, hListPen);
@@ -309,7 +315,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                   DrawFocusRect(lpdis->hDC, &RFocus);
                }
             }
+#if 0
             catch (...)
+#endif
             {
                RestoreDC(lpdis->hDC, -1);
             }