Turn off SEH Junk some other minor cleanups.

svn path=/trunk/; revision=4893
This commit is contained in:
Steven Edwards 2003-06-14 22:17:48 +00:00
parent 60dd268c50
commit 57a3b7cc34
2 changed files with 11 additions and 3 deletions

View file

@ -13,14 +13,14 @@ CFLAGS+=-fexceptions -O2 -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -W
LD=$(CXX) $(CXXFLAGS) LD=$(CXX) $(CXXFLAGS)
LDFLAGS= LDFLAGS=
LDFLAGS+=-Wl,--subsystem,windows LDFLAGS+=-Wl,--subsystem,windows
LIBS+=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 LIBS+=-lkernel32 -luser32 -lgdi32
else else
ifeq "$(CFG)" "Proj_Listing5_1 - Win32 Debug" ifeq "$(CFG)" "Proj_Listing5_1 - Win32 Debug"
CFLAGS+=-fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W CFLAGS+=-fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W
LD=$(CXX) $(CXXFLAGS) LD=$(CXX) $(CXXFLAGS)
LDFLAGS= LDFLAGS=
LDFLAGS+=-Wl,--subsystem,windows LDFLAGS+=-Wl,--subsystem,windows
LIBS+=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 LIBS+=-lkernel32 -luser32 -lgdi32
endif endif
endif endif
@ -63,7 +63,7 @@ $(TARGET): $(OBJS)
.PHONY: clean .PHONY: clean
clean: clean:
-rm -f $(OBJS) $(TARGET) -del $(OBJS) $(TARGET)

View file

@ -212,7 +212,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
hListBrush = CreateSolidBrush(PALETTERGB(64, 192, 64)); hListBrush = CreateSolidBrush(PALETTERGB(64, 192, 64));
hListPen = CreatePen(PS_SOLID, 3, PALETTERGB(0, 0, 0)); hListPen = CreatePen(PS_SOLID, 3, PALETTERGB(0, 0, 0));
HDC hScreenDC = GetDC(NULL); HDC hScreenDC = GetDC(NULL);
#if 0
try try
#endif
{ {
// MakeFont() from Chapter 4 // MakeFont() from Chapter 4
hListFont = font::MakeFont( hListFont = font::MakeFont(
@ -220,7 +222,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
font::FS_BOLD | font::FS_UNDERLINE font::FS_BOLD | font::FS_UNDERLINE
); );
} }
#if 0
catch (...) catch (...)
#endif
{ {
ReleaseDC(NULL, hScreenDC); ReleaseDC(NULL, hScreenDC);
} }
@ -250,7 +254,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
if (lpdis->CtlID == reinterpret_cast<UINT>(hListBox)) if (lpdis->CtlID == reinterpret_cast<UINT>(hListBox))
{ {
SaveDC(lpdis->hDC); SaveDC(lpdis->hDC);
#if 0
try try
#endif
{ {
SelectObject(lpdis->hDC, hListBrush); SelectObject(lpdis->hDC, hListBrush);
SelectObject(lpdis->hDC, hListPen); SelectObject(lpdis->hDC, hListPen);
@ -309,7 +315,9 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
DrawFocusRect(lpdis->hDC, &RFocus); DrawFocusRect(lpdis->hDC, &RFocus);
} }
} }
#if 0
catch (...) catch (...)
#endif
{ {
RestoreDC(lpdis->hDC, -1); RestoreDC(lpdis->hDC, -1);
} }