From 91316fff930f3ae998fe8f030500b48af2ad26f8 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Sat, 26 Apr 2003 21:37:09 +0000 Subject: [PATCH] Fixed bitblt test to use ReactOS build system. svn path=/trunk/; revision=4592 --- .../tests/bitblt/{bitblt.cpp => bitblt.c} | 53 +++++++-------- reactos/apps/tests/bitblt/makefile | 66 +++---------------- 2 files changed, 34 insertions(+), 85 deletions(-) rename reactos/apps/tests/bitblt/{bitblt.cpp => bitblt.c} (67%) diff --git a/reactos/apps/tests/bitblt/bitblt.cpp b/reactos/apps/tests/bitblt/bitblt.c similarity index 67% rename from reactos/apps/tests/bitblt/bitblt.cpp rename to reactos/apps/tests/bitblt/bitblt.c index 631e446a94e..d8d24244e49 100644 --- a/reactos/apps/tests/bitblt/bitblt.cpp +++ b/reactos/apps/tests/bitblt/bitblt.c @@ -1,20 +1,17 @@ -// ------------------------------------------------------------------ -// Windows 2000 Graphics API Black Book -// Chapter 1 - Listing 1.3 (BitBlt Bitmap Rendering Demo) -// -// Created by Damon Chandler -// Updates can be downloaded at: -// -// Please do not hesistate to e-mail me at dmc27@ee.cornell.edu -// if you have any questions about this code. -// ------------------------------------------------------------------ +/* + * Windows 2000 Graphics API Black Book + * (BitBlt Bitmap Rendering Demo) + * + * Created by Damon Chandler + * Updates can be downloaded at: + * + * Please do not hesistate to e-mail me at dmc27@ee.cornell.edu + * if you have any questions about this code. + */ -//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #include -//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< - HINSTANCE HInst; const char* WndClassName = "GMainWnd"; @@ -34,7 +31,8 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, wc.lpfnWndProc = MainWndProc; wc.hInstance = HInstance; wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = reinterpret_cast(COLOR_BTNFACE + 1); + /* wc.hbrBackground = reinterpret_cast(COLOR_BTNFACE + 1); */ + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszClassName = WndClassName; if (RegisterClass(&wc)) @@ -63,10 +61,8 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, } return 0; } -//------------------------------------------------------------------ - -// image related +/* image related */ BITMAP bmp; LPCSTR filename = TEXT("lena.bmp"); HDC HMemDC = NULL; @@ -79,24 +75,24 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, { case WM_CREATE: { - // create a memory DC + /* create a memory DC */ HMemDC = CreateCompatibleDC(NULL); if (HMemDC) { - // load a bitmap from file + /* load a bitmap from file */ HBITMAP HBmp = - static_cast( + /* static_cast */( LoadImage(HInst, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE) ); if (HBmp) { - // extract dimensions of the bitmap + /* extract dimensions of the bitmap */ GetObject(HBmp, sizeof(BITMAP), &bmp); - // associate the bitmap with the memory DC - HOldBmp = static_cast( - SelectObject(HMemDC, HBmp) + /* associate the bitmap with the memory DC */ + /* HOldBmp = static_cast */ + (SelectObject(HMemDC, HBmp) ); } } @@ -109,9 +105,9 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, try #endif { - // - // TODO: add palette support (see Chapter 9)... - // + + /* TODO: add palette support (see Chapter 9)... */ + BitBlt(Hdc, 20, 15, bmp.bmWidth, bmp.bmHeight, @@ -129,7 +125,7 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, } case WM_DESTROY: { - // clean up + /* clean up */ DeleteObject(SelectObject(HMemDC, HOldBmp)); DeleteDC(HMemDC); @@ -139,4 +135,3 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, } return DefWindowProc(HWnd, Msg, WParam, LParam); } -//------------------------------------------------------------------ diff --git a/reactos/apps/tests/bitblt/makefile b/reactos/apps/tests/bitblt/makefile index 8ce98633074..bc1acb1a907 100644 --- a/reactos/apps/tests/bitblt/makefile +++ b/reactos/apps/tests/bitblt/makefile @@ -1,66 +1,20 @@ -# Makefile - Proj_Listing1_5.dsp -ifndef CFG -CFG=Proj_Listing1_5 - Win32 Debug -endif -CC=gcc -CFLAGS= -CXX=g++ -CXXFLAGS=$(CFLAGS) -RC=windres -O COFF -ifeq "$(CFG)" "Proj_Listing1_5 - Win32 Release" -CFLAGS+=-fexceptions -O2 -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -W -LD=$(CXX) $(CXXFLAGS) -LDFLAGS= -LDFLAGS+=-Wl,--subsystem,windows -LIBS+=-lkernel32 -luser32 -lgdi32 -else -ifeq "$(CFG)" "Proj_Listing1_5 - 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 -endif -endif +PATH_TO_TOP = ../../.. -ifndef TARGET -TARGET=bitblt.exe -endif +TARGET_NORC = yes -.PHONY: all -all: $(TARGET) +TARGET_TYPE = program -%.o: %.c - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< +TARGET_APPTYPE = windows -%.o: %.cpp - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< +TARGET_NAME = bitblt -%.res: %.rc - $(RC) $(CPPFLAGS) -o $@ -i $< +TARGET_SDKLIBS = kernel32.a gdi32.a -SOURCE_FILES= \ - bitblt.cpp +TARGET_OBJECTS = $(TARGET_NAME).o -HEADER_FILES= +include $(PATH_TO_TOP)/rules.mak -RESOURCE_FILES= - -SRCS=$(SOURCE_FILES) $(HEADER_FILES) $(RESOURCE_FILES) - -OBJS=$(patsubst %.rc,%.res,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.rc,$(SRCS))))) - -$(TARGET): $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - -.PHONY: clean -clean: - -del $(OBJS) $(TARGET) - -.PHONY: depends -depends: - -$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(filter %.c %.cpp,$(SRCS)) > Proj_Listing1_5.dep - --include Proj_Listing1_5.dep +include $(TOOLS_PATH)/helper.mk +# EOF