From 9d0b4973fab0d99f5b7163597d09f978fa471d14 Mon Sep 17 00:00:00 2001 From: Hartmut Birr Date: Tue, 15 Nov 2005 17:52:27 +0000 Subject: [PATCH] Put the bitmaps into the executable. svn path=/trunk/; revision=19251 --- rosapps/tests/alphablend/alphablend.c | 8 ++++---- rosapps/tests/alphablend/alphablend.rc | 3 +++ rosapps/tests/alphablend/alphablend.xml | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 rosapps/tests/alphablend/alphablend.rc diff --git a/rosapps/tests/alphablend/alphablend.c b/rosapps/tests/alphablend/alphablend.c index 0c3e96a0b53..aea5d40e6b6 100644 --- a/rosapps/tests/alphablend/alphablend.c +++ b/rosapps/tests/alphablend/alphablend.c @@ -85,8 +85,8 @@ BOOL ConvertBitmapTo32Bpp(HDC hDC, BITMAP *bmp) BitBlt(hDC, 0, 0, bmp->bmWidth, bmp->bmHeight, HMemDC, 0, 0, SRCCOPY); /* load and apply alpha channel */ - bmpalpha = LoadImage(HInst, TEXT("lenaalpha.bmp"), IMAGE_BITMAP, - 0, 0, LR_LOADFROMFILE); + bmpalpha = LoadImage(HInst, MAKEINTRESOURCE(2000), IMAGE_BITMAP, + 0, 0, 0); if(bmpalpha) { COLORREF *col = pBmpBits; @@ -131,8 +131,8 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, /* load a bitmap from file */ HBITMAP HBmp = /* static_cast */( - LoadImage(HInst, filename, IMAGE_BITMAP, - 0, 0, LR_LOADFROMFILE) + LoadImage(HInst, MAKEINTRESOURCE(1000), IMAGE_BITMAP, + 0, 0, 0) ); if (HBmp) { diff --git a/rosapps/tests/alphablend/alphablend.rc b/rosapps/tests/alphablend/alphablend.rc new file mode 100644 index 00000000000..38dc9f383ff --- /dev/null +++ b/rosapps/tests/alphablend/alphablend.rc @@ -0,0 +1,3 @@ + +1000 BITMAP MOVEABLE PURE "lena.bmp" +2000 BITMAP MOVEABLE PURE "lenaalpha.bmp" diff --git a/rosapps/tests/alphablend/alphablend.xml b/rosapps/tests/alphablend/alphablend.xml index 785077e865f..9e195012529 100644 --- a/rosapps/tests/alphablend/alphablend.xml +++ b/rosapps/tests/alphablend/alphablend.xml @@ -2,7 +2,9 @@ 0x0501 0x0501 + . kernel32 gdi32 alphablend.c + alphablend.rc -- 2.17.1