Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[gschneider] 37412: - Restructure dib related tests, 2nd try. - Change build files accordingly

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 17 11:28:14 2008 New Revision: 37412 URL: http://svn.reactos.org/svn/reactos?rev=37412&view=rev Log: - Restructure dib related tests, 2nd try. - Change build files accordingly Added: trunk/rostests/dibtests/bitblt/ trunk/rostests/dibtests/bitblt/bitblt.c (with props) trunk/rostests/dibtests/bitblt/bitblt.rbuild (with props) trunk/rostests/dibtests/bitblt/bitblt.rc (with props) trunk/rostests/dibtests/bitblt/lena.bmp (with props) trunk/rostests/dibtests/dibtest/ trunk/rostests/dibtests/dibtest/dibtest.c (with props) trunk/rostests/dibtests/dibtest/dibtest.rbuild (with props) trunk/rostests/dibtests/icontest/ trunk/rostests/dibtests/icontest/icon.ico (with props) trunk/rostests/dibtests/icontest/icontest.c (with props) trunk/rostests/dibtests/icontest/icontest.rbuild (with props) trunk/rostests/dibtests/icontest/icontest.rc (with props) trunk/rostests/dibtests/icontest/resource.h (with props) trunk/rostests/dibtests/palbitblt/ trunk/rostests/dibtests/palbitblt/pal.c (with props) trunk/rostests/dibtests/palbitblt/palbitblt.rbuild (with props) trunk/rostests/dibtests/patblt/ trunk/rostests/dibtests/patblt/Penguin.bmp (with props) trunk/rostests/dibtests/patblt/patblt.cpp (with props) trunk/rostests/dibtests/patblt/patblt.rbuild (with props) trunk/rostests/dibtests/stretchblt/ trunk/rostests/dibtests/stretchblt/lena.bmp (with props) trunk/rostests/dibtests/stretchblt/stretchblt.cpp (with props) trunk/rostests/dibtests/stretchblt/stretchblt.rbuild (with props) Modified: trunk/rostests/dibtests/directory.rbuild trunk/rostests/directory.rbuild trunk/rostests/tests/directory.rbuild Added: trunk/rostests/dibtests/bitblt/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.c?… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.c (added) +++ trunk/rostests/dibtests/bitblt/bitblt.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,139 @@ + +/* + * Windows 2000 Graphics API Black Book + * (BitBlt Bitmap Rendering Demo) + * + * Created by Damon Chandler <dmc27(a)ee.cornell.edu> + * Updates can be downloaded at: <www.coriolis.com> + * + * Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu + * if you have any questions about this code. + */ + + +#include <windows.h> +#include <string.h> + +HINSTANCE HInst; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, + LPTSTR lpCmdLine, int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + + HInst = HInstance; + + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + /* wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); */ + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszClassName = WndClassName; + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow( + WndClassName, TEXT("BitBlt Bitmap Rendering Demo"), + WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | + WS_VISIBLE | WS_CLIPSIBLINGS, + 0, 0, 220, 230, + NULL, NULL, HInst, NULL + ); + + if (HWnd) + { + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} + +/* image related */ +BITMAP bmp; +LPCSTR filename = TEXT("lena.bmp"); +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + /* create a memory DC */ + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + /* load a bitmap from file */ + HBITMAP HBmp = + /* static_cast<HBITMAP> */( + LoadImage(HInst, MAKEINTRESOURCE(1000), IMAGE_BITMAP, + 0, 0, 0) + ); + if (HBmp) + { + /* extract dimensions of the bitmap */ + GetObject(HBmp, sizeof(BITMAP), &bmp); + + /* associate the bitmap with the memory DC */ + /* HOldBmp = static_cast<HBITMAP> */ + (SelectObject(HMemDC, HBmp) + ); + } + } + } + case WM_PAINT: + { + PAINTSTRUCT ps; + const HDC Hdc = BeginPaint(HWnd, &ps); +#if 0 + try +#endif + { + + /* TODO: add palette support (see Chapter 9)... */ + + + BitBlt(Hdc, 20, 15, + bmp.bmWidth, bmp.bmHeight, + HMemDC, 0, 0, + SRCCOPY); + } +#if 0 + catch (...) +#endif + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + /* clean up */ + DeleteObject(SelectObject(HMemDC, HOldBmp)); + DeleteDC(HMemDC); + + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} Propchange: trunk/rostests/dibtests/bitblt/bitblt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/bitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.rb… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.rbuild (added) +++ trunk/rostests/dibtests/bitblt/bitblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,9 @@ +<module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe"> + <define name="__USE_W32API" /> + <include base="bitblt">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>bitblt.c</file> + <file>bitblt.rc</file> +</module> Propchange: trunk/rostests/dibtests/bitblt/bitblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/bitblt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.rc… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.rc (added) +++ trunk/rostests/dibtests/bitblt/bitblt.rc [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,2 @@ +1000 BITMAP MOVEABLE PURE "lena.bmp" + Propchange: trunk/rostests/dibtests/bitblt/bitblt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bitblt/lena.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/lena.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/bitblt/lena.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/dibtest/dibtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/dibtest/dibtest.… ============================================================================== --- trunk/rostests/dibtests/dibtest/dibtest.c (added) +++ trunk/rostests/dibtests/dibtest/dibtest.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,196 @@ +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> + +#define CELL_SIZE 10 + +static RGBQUAD Colors[] = +{ + { 0x00, 0x00, 0x00, 0x00 }, // black + { 0x00, 0x00, 0x80, 0x00 }, // red + { 0x00, 0x80, 0x00, 0x00 }, // green + { 0x00, 0x80, 0x80, 0x00 }, // brown + { 0x80, 0x00, 0x00, 0x00 }, // blue + { 0x80, 0x00, 0x80, 0x00 }, // magenta + { 0x80, 0x80, 0x00, 0x00 }, // cyan + { 0x80, 0x80, 0x80, 0x00 }, // dark gray + { 0xc0, 0xc0, 0xc0, 0x00 }, // light gray + { 0x00, 0x00, 0xFF, 0x00 }, // bright red + { 0x00, 0xFF, 0x00, 0x00 }, // bright green + { 0x00, 0xFF, 0xFF, 0x00 }, // bright yellow + { 0xFF, 0x00, 0x00, 0x00 }, // bright blue + { 0xFF, 0x00, 0xFF, 0x00 }, // bright magenta + { 0xFF, 0xFF, 0x00, 0x00 }, // bright cyan + { 0xFF, 0xFF, 0xFF, 0x00 } // bright white +}; + +LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + HWND hWnd; + + wc.lpszClassName = "DibTestClass"; + wc.lpfnWndProc = MainWndProc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(GRAY_BRUSH); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClass(&wc) == 0) + { + fprintf(stderr, "RegisterClass failed (last error 0x%lX)\n", + GetLastError()); + return(1); + } + + hWnd = CreateWindow("DibTestClass", + "DIB Test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 25 * CELL_SIZE + 5, + 25 * CELL_SIZE + 20, + NULL, + NULL, + hInstance, + NULL); + if (hWnd == NULL) + { + fprintf(stderr, "CreateWindow failed (last error 0x%lX)\n", + GetLastError()); + return(1); + } + + ShowWindow(hWnd, nCmdShow); + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return msg.wParam; +} + +static void PaintCells(HDC WindowDC, WORD BitCount1, WORD BitCount2, + int XDest, int YDest) +{ + HBRUSH Brush; + RECT Rect; + UINT row, col; + BITMAPINFO *BitmapInfo; + HBITMAP DIB1, DIB2; + HDC DC1, DC2; + + BitmapInfo = malloc(sizeof(BITMAPINFO) + 15 * sizeof(RGBQUAD)); + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = 4 * CELL_SIZE + 9; + BitmapInfo->bmiHeader.biHeight = -(4 * CELL_SIZE + 9); // it's top down (since BI_RGB is used, the sign is operative of direction) + BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biBitCount = BitCount1; + BitmapInfo->bmiHeader.biCompression = BI_RGB; + BitmapInfo->bmiHeader.biSizeImage = 0; + BitmapInfo->bmiHeader.biXPelsPerMeter = 0; + BitmapInfo->bmiHeader.biYPelsPerMeter = 0; + BitmapInfo->bmiHeader.biClrUsed = 16; + BitmapInfo->bmiHeader.biClrImportant = 16; + for (col = 0; col < 16; col++) { + BitmapInfo->bmiColors[col] = Colors[col]; + } + DIB1 = CreateDIBSection(NULL, BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0); + DC1 = CreateCompatibleDC(NULL); + SelectObject(DC1, DIB1); + + BitmapInfo->bmiHeader.biBitCount = BitCount2; + DIB2 = CreateDIBSection(NULL, BitmapInfo, DIB_RGB_COLORS, NULL, NULL, 0); + DC2 = CreateCompatibleDC(NULL); + SelectObject(DC2, DIB2); + free(BitmapInfo); + + /* Now paint on the first bitmap */ + for (row = 0; row < 4; row++) + { + for (col = 0; col < 4; col++) + { + Brush = CreateSolidBrush(RGB(Colors[4 * row + col].rgbRed, + Colors[4 * row + col].rgbGreen, + Colors[4 * row + col].rgbBlue)); + Rect.left = CELL_SIZE * col + 5; + Rect.top = CELL_SIZE * row + 5; + Rect.right = Rect.left + CELL_SIZE; + Rect.bottom = Rect.top + CELL_SIZE; + FillRect(DC1, &Rect, Brush); + DeleteObject(Brush); + } + } + + /* Copy the first bitmap to the second */ + BitBlt(DC2, 4, 4, 4 * CELL_SIZE, 4 * CELL_SIZE, DC1, 5, 5, SRCCOPY); + + /* Show results on screen */ + BitBlt(WindowDC, XDest, YDest, 4 * CELL_SIZE, 4 * CELL_SIZE, DC2, 4, 4, SRCCOPY); +} + +LRESULT CALLBACK MainWndProc(HWND Wnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT ps; + HDC WindowDC; + + switch(msg) + { + case WM_PAINT: + WindowDC = BeginPaint(Wnd, &ps); + + PaintCells(WindowDC, 4, 4, 0, 0); + PaintCells(WindowDC, 4, 8, 5 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 16, 10 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 24, 15 * CELL_SIZE, 0); + PaintCells(WindowDC, 4, 32, 20 * CELL_SIZE, 0); + + PaintCells(WindowDC, 8, 4, 0, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 8, 5 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 16, 10 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 24, 15 * CELL_SIZE, 5 * CELL_SIZE); + PaintCells(WindowDC, 8, 32, 20 * CELL_SIZE, 5 * CELL_SIZE); + + PaintCells(WindowDC, 16, 4, 0, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 8, 5 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 16, 10 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 24, 15 * CELL_SIZE, 10 * CELL_SIZE); + PaintCells(WindowDC, 16, 32, 20 * CELL_SIZE, 10 * CELL_SIZE); + + PaintCells(WindowDC, 24, 4, 0, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 8, 5 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 16, 10 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 24, 15 * CELL_SIZE, 15 * CELL_SIZE); + PaintCells(WindowDC, 24, 32, 20 * CELL_SIZE, 15 * CELL_SIZE); + + PaintCells(WindowDC, 32, 4, 0, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 8, 5 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 16, 10 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 24, 15 * CELL_SIZE, 20 * CELL_SIZE); + PaintCells(WindowDC, 32, 32, 20 * CELL_SIZE, 20 * CELL_SIZE); + + EndPaint(Wnd, &ps); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(Wnd, msg, wParam, lParam); + } + + return 0; +} Propchange: trunk/rostests/dibtests/dibtest/dibtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/dibtest/dibtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/dibtest/dibtest.… ============================================================================== --- trunk/rostests/dibtests/dibtest/dibtest.rbuild (added) +++ trunk/rostests/dibtests/dibtest/dibtest.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>dibtest.c</file> +</module> Propchange: trunk/rostests/dibtests/dibtest/dibtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/dibtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/directory.rbuild… ============================================================================== --- trunk/rostests/dibtests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,8 +1,29 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="alphablend"> + <xi:include href="alphablend/alphablend.rbuild" /> + </directory> + <directory name="bitblt"> + <xi:include href="bitblt/bitblt.rbuild" /> + </directory> <directory name="bltrop"> <xi:include href="bltrop/bltrop.rbuild" /> + </directory> + <directory name="dibtest"> + <xi:include href="dibtest/dibtest.rbuild" /> + </directory> + <directory name="icontest"> + <xi:include href="icontest/icontest.rbuild" /> + </directory> + <directory name="palbitblt"> + <xi:include href="palbitblt/palbitblt.rbuild" /> + </directory> + <directory name="patblt"> + <xi:include href="patblt/patblt.rbuild" /> + </directory> + <directory name="stretchblt"> + <xi:include href="stretchblt/stretchblt.rbuild" /> </directory> <directory name="vbltest"> <xi:include href="vbltest/vbltest.rbuild" /> Added: trunk/rostests/dibtests/icontest/icon.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icon.ic… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/icontest/icon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/icontest/icontest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.c (added) +++ trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,208 @@ +#include <windows.h> +#include "resource.h" +#include <string.h> +#include <stdio.h> + +ULONG __cdecl DbgPrint(IN PCH Format, IN ...); + +const char titleDrwIco[] = "DrawIcon Output"; +const char titleMask[] = "Mask(AND image)"; +const char titleXor[] = "XOR(color image)"; +const char file[] = "Icon from file:"; +const char res[] = "Icon from Resorce:"; +const char cursor[] = "Current Cursor:"; +const char cursormask[] = "Cursor Mask Bitmap"; +const char cursorcolor[] = "Cursor Color Bitmap"; + +HFONT tf; +HINSTANCE hInst; + +LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM); + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WNDCLASS wc; + MSG msg; + HWND hWnd; + + hInst = hInstance; + + #ifdef _GetCursorInfo + GetCursorInfo = (GETCURSORINFO)GetProcAddress(GetModuleHandleW(L"user32.dll"), "GetCursorInfo"); + #endif + + wc.lpszClassName = "IconTestClass"; + wc.lpfnWndProc = MainWndProc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, (LPCTSTR)IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClass(&wc) == 0) + { + DbgPrint("RegisterClass failed (last error 0x%X)\n", GetLastError()); + return(1); + } + + hWnd = CreateWindow("IconTestClass", + "Icon Test", + WS_OVERLAPPEDWINDOW|WS_HSCROLL|WS_VSCROLL, + CW_USEDEFAULT, + CW_USEDEFAULT, + 480, + 480, + NULL, + NULL, + hInstance, + NULL); + if (hWnd == NULL) + { + DbgPrint("CreateWindow failed (last error 0x%X)\n", GetLastError()); + return(1); + } + + tf = CreateFontA(14,0, 0, TA_BASELINE, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "Timmons"); + + ShowWindow(hWnd, nCmdShow); + + SetTimer(hWnd, 1, 1000, NULL); + + while(GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return msg.wParam; +} + +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT ps; + HDC hDC; + HICON hIcon; + HGDIOBJ hOld; + HDC hMemDC; + CURSORINFO cursorinfo; + ICONINFO iconinfo; + BITMAP bmp; + RECT rc; + CHAR str[20]; + + switch(msg) + { + case WM_PAINT: + hDC = BeginPaint(hWnd, &ps); + SelectObject(hDC, tf); + SetBkMode(hDC, TRANSPARENT); + + TextOut(hDC, 160, 10, file, strlen(file)); + TextOut(hDC, 15, 85, titleDrwIco, strlen(titleDrwIco)); + TextOut(hDC, 160, 85, titleMask, strlen(titleMask)); + TextOut(hDC, 300, 85, titleXor, strlen(titleXor)); + + hIcon = LoadImage(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE|LR_LOADFROMFILE); + DrawIcon(hDC,50,50,hIcon); + + hMemDC = CreateCompatibleDC(hDC); + GetIconInfo(hIcon, &iconinfo); + DestroyIcon(hIcon); + + hOld = SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 50, 32, 32, hMemDC, 0, 0, SRCCOPY); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 50, 32, 32, hMemDC, 0, 0, SRCCOPY); + + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + + TextOut(hDC, 145, 150, res, strlen(res)); + TextOut(hDC, 15, 225, titleDrwIco, strlen(titleDrwIco)); + TextOut(hDC, 160, 225, titleMask, strlen(titleMask)); + TextOut(hDC, 300, 225, titleXor, strlen(titleXor)); + + hIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + DrawIcon(hDC,50,190,hIcon); + + GetIconInfo(hIcon, &iconinfo); + DestroyIcon(hIcon); + + SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 190, 32, 32, hMemDC, 0, 0, SRCCOPY); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 190, 32, 32, hMemDC, 0, 0, SRCCOPY); + + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + + cursorinfo.cbSize = sizeof(CURSORINFO); + if(GetCursorInfo(&cursorinfo)) + { + if(cursorinfo.hCursor && cursorinfo.flags) + { + TextOut(hDC, 160, 290, cursor, strlen(cursor)); + DrawIcon(hDC, 50, 330, cursorinfo.hCursor); + GetIconInfo(cursorinfo.hCursor, &iconinfo); + TextOut(hDC, 15, 365, titleDrwIco, strlen(titleDrwIco)); + + sprintf(str, "Hotspot: %ld; %ld", iconinfo.xHotspot, iconinfo.yHotspot); + TextOut(hDC, 15, 380, str, strlen(str)); + + if(iconinfo.hbmMask) + { + GetObjectW(iconinfo.hbmMask, sizeof(BITMAP), &bmp); + SelectObject(hMemDC, iconinfo.hbmMask); + BitBlt(hDC, 200, 330, bmp.bmWidth, bmp.bmHeight, hMemDC, 0, 0, SRCCOPY); + DeleteObject(iconinfo.hbmMask); + TextOut(hDC, 160, 365 - 32 + bmp.bmHeight, cursormask, strlen(cursormask)); + + sprintf(str, "%dBPP", bmp.bmBitsPixel); + TextOut(hDC, 160, 380 - 32 + bmp.bmHeight, str, strlen(str)); + } + + if(iconinfo.hbmColor) + { + GetObjectW(iconinfo.hbmColor, sizeof(BITMAP), &bmp); + SelectObject(hMemDC, iconinfo.hbmColor); + BitBlt(hDC, 350, 330, bmp.bmWidth, bmp.bmHeight, hMemDC, 0, 0, SRCCOPY); + DeleteObject(iconinfo.hbmColor); + TextOut(hDC, 300, 365 - 32 + bmp.bmHeight, cursorcolor, strlen(cursorcolor)); + + sprintf(str, "%dBPP", bmp.bmBitsPixel); + TextOut(hDC, 300, 380 - 32 + bmp.bmHeight, str, strlen(str)); + } + } + } + + SelectObject(hMemDC, hOld); + + DeleteObject(hMemDC); + EndPaint(hWnd, &ps); + break; + + case WM_TIMER: + rc.left = 0; + rc.top = 330; + rc.right = 480; + rc.bottom = 480; + InvalidateRect(hWnd, &rc, TRUE); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, msg, wParam, lParam); + } + return 0; +} Propchange: trunk/rostests/dibtests/icontest/icontest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/icontest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.rbuild (added) +++ trunk/rostests/dibtests/icontest/icontest.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,10 @@ +<module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe"> + <define name="__USE_W32API" /> + <include base="icontest">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>ntdll</library> + <file>icontest.c</file> + <file>icontest.rc</file> +</module> Propchange: trunk/rostests/dibtests/icontest/icontest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/icontest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.rc (added) +++ trunk/rostests/dibtests/icontest/icontest.rc [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +IDI_ICON ICON DISCARDABLE "icon.ico" Propchange: trunk/rostests/dibtests/icontest/icontest.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/icontest/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/resourc… ============================================================================== --- trunk/rostests/dibtests/icontest/resource.h (added) +++ trunk/rostests/dibtests/icontest/resource.h [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,1 @@ +#define IDI_ICON 101 Propchange: trunk/rostests/dibtests/icontest/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/palbitblt/pal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/pal.c?… ============================================================================== --- trunk/rostests/dibtests/palbitblt/pal.c (added) +++ trunk/rostests/dibtests/palbitblt/pal.c [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,201 @@ +/* The idea of this test app is inspired from tutorial * + * found at http://www.theparticle.com/pgraph.html * + * * + * Developed by: Aleksey Bragin <aleksey(a)studiocerebral.com> * + * Version: 1.0 */ + +#include <windows.h> +#include <stdlib.h> + +#define W_WIDTH 320 +#define W_HEIGHT 240 + +// special version of BITMAPINFO and LOGPALETTE for max of 256 palette entries +typedef struct +{ + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[256]; +} BITMAPINFO256; + +typedef struct { + WORD palVersion; + WORD palNumEntries; + PALETTEENTRY palPalEntry[256]; +} LOGPALETTE256; + +// The only global variable --- contents of the DIBitmap +BYTE* dibits; + +void GeneratePalette(RGBQUAD* p) +{ + int i; + for(i=0;i<256;i++) + { + p[i].rgbRed = i; + p[i].rgbGreen = i; + p[i].rgbBlue = i; + p[i].rgbReserved = 0; + } +} + +void DoBlt(HBITMAP hBM) +{ + HDC hDC,Context; + HWND ActiveWindow; + RECT dest; + HBITMAP dflBmp; + + if((ActiveWindow = GetActiveWindow()) == NULL) + return; + + hDC = GetDC(ActiveWindow); + GetClientRect(ActiveWindow,&dest); + + Context = CreateCompatibleDC(0); + dflBmp = SelectObject(Context, hBM); + BitBlt(hDC, 0, 0, dest.right, dest.bottom, Context, 0, 0, SRCCOPY); + SelectObject(Context, dflBmp); + DeleteDC(Context); + DeleteObject(dflBmp); + ReleaseDC(ActiveWindow, hDC); +} + +void UpdatePalette(HBITMAP hBM){ + int i,y; + static unsigned int c=0; + + for(i=0;i<W_WIDTH;i++){ + for(y=0;y<=W_HEIGHT-1;y++) + dibits[y*320+i] = c % 256; + + if (c > 512) + c = 0; + else + c++; // It's operation of incrementing of c variable, not reference of a cool OO language :-) + } + + DoBlt(hBM); +} + +void InitBitmap(HANDLE *hBM){ + HPALETTE PalHan; + HWND ActiveWindow; + HDC hDC; + RGBQUAD palette[256]; + int i; + BITMAPINFO256 bmInf; + LOGPALETTE256 palInf; + + ActiveWindow = GetActiveWindow(); + hDC = GetDC(ActiveWindow); + + bmInf.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmInf.bmiHeader.biWidth = W_WIDTH; + bmInf.bmiHeader.biHeight = -abs(W_HEIGHT); + bmInf.bmiHeader.biPlanes = 1; + bmInf.bmiHeader.biBitCount = 8; + bmInf.bmiHeader.biCompression = BI_RGB; + bmInf.bmiHeader.biSizeImage = 0; + bmInf.bmiHeader.biXPelsPerMeter = 0; + bmInf.bmiHeader.biYPelsPerMeter = 0; + bmInf.bmiHeader.biClrUsed = 256; + bmInf.bmiHeader.biClrImportant = 256; + + GeneratePalette(palette); + + for(i=0;i<256;i++) + bmInf.bmiColors[i] = palette[i]; + + palInf.palVersion = 0x300; + palInf.palNumEntries = 256; + for(i=0;i<256;i++){ + palInf.palPalEntry[i].peRed = palette[i].rgbRed; + palInf.palPalEntry[i].peGreen = palette[i].rgbGreen; + palInf.palPalEntry[i].peBlue = palette[i].rgbBlue; + palInf.palPalEntry[i].peFlags = PC_NOCOLLAPSE; + } + + // Create palette + PalHan = CreatePalette((LOGPALETTE*)&palInf); + + // Select it into hDC + SelectPalette(hDC,PalHan,FALSE); + + // Realize palette in hDC + RealizePalette(hDC); + + // Delete handle to palette + DeleteObject(PalHan); + + // Create dib section + *hBM = CreateDIBSection(hDC,(BITMAPINFO*)&bmInf, + DIB_RGB_COLORS,(void**)&dibits,0,0); + + // Release dc + ReleaseDC(ActiveWindow,hDC); +} + +LRESULT CALLBACK WndProc(HWND hWnd,UINT msg, WPARAM wParam,LPARAM lParam) +{ + switch(msg){ + case WM_DESTROY: + PostQuitMessage(0); + return 0; + default: + return DefWindowProc(hWnd,msg,wParam,lParam); + } +} + + + +int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance, LPSTR lpszCmdParam,int nCmdShow) +{ + WNDCLASS WndClass; + HWND hWnd; + MSG msg; + char szName[] = "Palette BitBlt test"; + BOOL exit = FALSE; + HBITMAP hBM; + + // Create and register window class (not modified!!!!!!!!!!!1) + WndClass.style = CS_HREDRAW|CS_VREDRAW|CS_OWNDC; + WndClass.lpfnWndProc = WndProc; + WndClass.cbClsExtra = 0; + WndClass.cbWndExtra = 0; + WndClass.hbrBackground = NULL;//GetStockObject(BLACK_BRUSH); + WndClass.hIcon = NULL;//LoadIcon(hInstance,NULL); + WndClass.hCursor = NULL;//LoadCursor(NULL,IDC_ARROW); + WndClass.hInstance = hInstance; + WndClass.lpszClassName = szName; + WndClass.lpszMenuName = 0; + + RegisterClass(&WndClass); + + // Create and show window (change styles !!!!!!!!) + hWnd = CreateWindow(szName, "ReactOS palette bitblt test", + WS_CAPTION|WS_MINIMIZEBOX|WS_SYSMENU, + CW_USEDEFAULT,CW_USEDEFAULT,W_WIDTH,W_HEIGHT, + 0,0,hInstance,0); + ShowWindow(hWnd,nCmdShow); + + // Prepare bitmap to be bitblt + InitBitmap(&hBM); + + // Main message loop + while (!exit) + { + UpdatePalette(hBM); + Sleep(200); + + if(PeekMessage(&msg,0,0,0,PM_NOREMOVE) == TRUE) + { + if (!GetMessage(&msg,0,0,0)) + exit = TRUE; + + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return msg.wParam; +} Propchange: trunk/rostests/dibtests/palbitblt/pal.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/palbitblt/palbit… ============================================================================== --- trunk/rostests/dibtests/palbitblt/palbitblt.rbuild (added) +++ trunk/rostests/dibtests/palbitblt/palbitblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>pal.c</file> +</module> Propchange: trunk/rostests/dibtests/palbitblt/palbitblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/patblt/Penguin.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/Penguin.b… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/patblt/Penguin.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/patblt/patblt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/patblt.cp… ============================================================================== --- trunk/rostests/dibtests/patblt/patblt.cpp (added) +++ trunk/rostests/dibtests/patblt/patblt.cpp [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,270 @@ + +// ------------------------------------------------------------------ +// Windows 2000 Graphics API Black Book +// Chapter 2 - Listing 2.1 (PatBlt Tracking Rect Demo) +// +// Created by Damon Chandler <dmc27(a)ee.cornell.edu> +// Updates can be downloaded at: <www.coriolis.com> +// +// Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu +// if you have any questions about this code. +// ------------------------------------------------------------------ + + +//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +#include <windows.h> +//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + + +HINSTANCE HInst; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE, LPTSTR, + int nCmdShow) +{ + HInst = HInstance; + + WNDCLASS wc; + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.lpszClassName = WndClassName; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = static_cast<HBRUSH>( + GetStockObject(BLACK_BRUSH) + ); + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow(WndClassName, + TEXT("PatBlt Tracking Rect Demo"), + WS_OVERLAPPEDWINDOW | WS_CAPTION | + WS_VISIBLE | WS_CLIPCHILDREN, + CW_USEDEFAULT, CW_USEDEFAULT, 640, 480, + NULL, NULL, HInst, NULL); + + if (HWnd) + { + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} +//------------------------------------------------------------------ + + +// image related +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; +const char* filename = "PENGUIN.BMP"; +RECT RImage = {225, 110, 225, 110}; + +// tracking related +bool is_tracking = false; +HDC HScreenDC = NULL; +POINT PMouse = {0, 0}; +RECT RTrack = {0, 0, 0, 0}; +const int line_width = 5; + + +// utility function to map to/from window coordinates +void MapRect(IN HWND HWndFrom, IN HWND HWndTo, IN OUT RECT& RMap) +{ + MapWindowPoints( + HWndFrom, HWndTo, + reinterpret_cast<LPPOINT>(&RMap), 2 + ); +} +//------------------------------------------------------------------ + + +// utility function that uses the PatBlt function to +// render a tracking rectangle +void RenderTrackingRect(IN HDC HDestDC, IN const RECT& RRender) +{ + const int width = RRender.right - RRender.left; + const int height = RRender.bottom - RRender.top; + const DWORD dwROP3 = DSTINVERT; // experiment with others + + // render top bar + PatBlt(HDestDC, + RRender.left, RRender.top, + width, line_width, + dwROP3); + // render bottom bar + PatBlt(HDestDC, + RRender.left, RRender.bottom - line_width, + width, line_width, + dwROP3); + // render left bar + PatBlt(HDestDC, + RRender.left, RRender.top + line_width, + line_width, height - (2 * line_width), + dwROP3); + // render right bar + PatBlt(HDestDC, + RRender.right - line_width, RRender.top + line_width, + line_width, height - (2 * line_width), + dwROP3); + +} +//------------------------------------------------------------------ + + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + // create a memory DC + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + // load the penguin bitmap + HBITMAP HBmp = static_cast<HBITMAP>( + LoadImage(HInst, filename, IMAGE_BITMAP, 0, 0, + LR_LOADFROMFILE | LR_DEFAULTSIZE) + ); + if (HBmp) + { + // get the bitmap's dimensions + BITMAP bmp; + if (GetObject(HBmp, sizeof(BITMAP), &bmp)) + { + RImage.right += bmp.bmWidth; + RImage.bottom += bmp.bmHeight; + + // realize the bitmap + HOldBmp = static_cast<HBITMAP>( + SelectObject(HMemDC, HBmp) + ); + } + else DeleteObject(HBmp); + } + } + break; + } + case WM_LBUTTONDOWN: + { + PMouse.x = LOWORD(LParam); + PMouse.y = HIWORD(LParam); + + RECT RClient; + if (PtInRect(&RImage, PMouse) && + GetClientRect(HWnd, &RClient)) + { + MapRect(HWnd, HWND_DESKTOP, RClient); + ClipCursor(&RClient); + + // grab a handle to the screen DC and clip + // all output to the client area of our window + HScreenDC = GetDC(NULL); + HRGN HClipRgn = CreateRectRgnIndirect(&RClient); + SelectClipRgn(HScreenDC, HClipRgn); + DeleteObject(HClipRgn); + + CopyRect(&RTrack, &RImage); + MapRect(HWnd, HWND_DESKTOP, RTrack); + + // render the first tracking rect + RenderTrackingRect(HScreenDC, RTrack); + is_tracking = true; + } + break; + } + case WM_MOUSEMOVE: + { + if (HScreenDC && is_tracking) + { + POINT PCurrent = {LOWORD(LParam), HIWORD(LParam)}; + const int dX = PCurrent.x - PMouse.x; + const int dY = PCurrent.y - PMouse.y; + + // erase the previous rectangle + RenderTrackingRect(HScreenDC, RTrack); + // update the postion + OffsetRect(&RTrack, dX, dY); + // render the new tracking rectangle + RenderTrackingRect(HScreenDC, RTrack); + + // update the mouse position + memcpy(&PMouse, &PCurrent, sizeof(POINT)); + } + break; + } + case WM_LBUTTONUP: + { + // clean up + if (is_tracking) + { + is_tracking = false; + SelectClipRgn(HScreenDC, NULL); + ReleaseDC(NULL, HScreenDC); + + InvalidateRect(HWnd, &RImage, true); + CopyRect(&RImage, &RTrack); + MapRect(HWND_DESKTOP, HWnd, RImage); + InvalidateRect(HWnd, &RImage, true); + + ClipCursor(NULL); + } + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC Hdc = BeginPaint(HWnd, &ps); + try + { + // + // TODO: Add palette support... + // + + // render the penguin + BitBlt(Hdc, RImage.left, RImage.top, + RImage.right - RImage.left, + RImage.bottom - RImage.top, + HMemDC, 0, 0, + SRCCOPY); + } + catch (...) + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + // clean up + if (HOldBmp) + { + DeleteObject(SelectObject(HMemDC, HOldBmp)); + } + if (HMemDC) + { + DeleteDC(HMemDC); + } + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} +//------------------------------------------------------------------ Propchange: trunk/rostests/dibtests/patblt/patblt.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/patblt/patblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/patblt.rb… ============================================================================== --- trunk/rostests/dibtests/patblt/patblt.rbuild (added) +++ trunk/rostests/dibtests/patblt/patblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>patblt.cpp</file> +</module> Propchange: trunk/rostests/dibtests/patblt/patblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/stretchblt/lena.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/lena.… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/stretchblt/lena.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/stretchblt/stretchblt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/stret… ============================================================================== --- trunk/rostests/dibtests/stretchblt/stretchblt.cpp (added) +++ trunk/rostests/dibtests/stretchblt/stretchblt.cpp [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,380 @@ + +// ------------------------------------------------------------------ +// Windows 2000 Graphics API Black Book +// Chapter 1 - Listing 1.5 (StretchBlt Zooming Demo) +// +// Created by Damon Chandler <dmc27(a)ee.cornell.edu> +// Updates can be downloaded at: <www.coriolis.com> +// +// Please do not hesistate to e-mail me at dmc27(a)ee.cornell.edu +// if you have any questions about this code. +// ------------------------------------------------------------------ + +// Modified by Aleksey Bragin (aleksey at studiocerebral.com) +// to support non-uniform scaling, and output via sretchdibits +// (type something in the command line to invoke this mode, +// in future it will be source BPP) + +//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +#include <windows.h> +#include <stdio.h> +//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + + +HWND HListBox = NULL; +HWND VListBox = NULL; +const int ID_LISTBOX = 101; +const int ID_LISTBOX2 = 102; +BOOL useDIBits=FALSE; // How to display the image - via StretchDIBits + +HINSTANCE HInst; +HINSTANCE HPrevInst; +TCHAR *cmdline; +const char* WndClassName = "GMainWnd"; +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam); + + +int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance, + LPTSTR lpCmdLine, int nCmdShow) +{ + HInst = HInstance; + HPrevInst = HPrevInstance; + cmdline = lpCmdLine; + + WNDCLASS wc; + memset(&wc, 0, sizeof(WNDCLASS)); + + wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = MainWndProc; + wc.hInstance = HInstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); + wc.lpszClassName = WndClassName; + + if (RegisterClass(&wc)) + { + HWND HWnd = + CreateWindow(WndClassName, TEXT("StretchBlt NonUniform Zooming Demo"), + WS_OVERLAPPEDWINDOW | WS_CAPTION | + WS_VISIBLE | WS_CLIPSIBLINGS, + 0, 0, 675, 560, + NULL, NULL, HInst, NULL); + + if (HWnd) + { + HListBox = + CreateWindowEx(WS_EX_CLIENTEDGE, "LISTBOX", "", + LBS_NOTIFY | WS_CHILD | WS_VISIBLE, + 530, 5, 130, 150, HWnd, + reinterpret_cast<HMENU>(ID_LISTBOX), + HInst, NULL); + VListBox = + CreateWindowEx(WS_EX_CLIENTEDGE, "LISTBOX", "", + LBS_NOTIFY | WS_CHILD | WS_VISIBLE, + 530, 5+170, 130, 150, HWnd, + reinterpret_cast<HMENU>(ID_LISTBOX2), + HInst, NULL); + + if (HListBox && VListBox) + { +// horizontal zoom + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 25%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 50%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 75%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 100%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 125%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 150%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 200%")); + SNDMSG(HListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 300%")); +// vertical zoom + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 25%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 50%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 75%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 100%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 125%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 150%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 200%")); + SNDMSG(VListBox, LB_ADDSTRING, 0, + reinterpret_cast<LPARAM>("Zoom 300%")); + + } + + ShowWindow(HWnd, nCmdShow); + UpdateWindow(HWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + return 0; +} +//------------------------------------------------------------------ + + +// image related +BITMAP bmp; +BITMAPINFO bmInfo; +char *bbits = NULL; // bitmap bits +const char* filename = "LENA.BMP"; +HDC HMemDC = NULL; +HBITMAP HOldBmp = NULL; + +// zooming related +float zoom_factor_h = 0.5; +float zoom_factor_v = 0.5; +RECT RDest = {5, 5, 0, 0}; +enum {ID_ZOOM25, ID_ZOOM50, ID_ZOOM75, ID_ZOOM100, + ID_ZOOM125, ID_ZOOM150, ID_ZOOM200, ID_ZOOM300}; + +LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, + LPARAM LParam) +{ + switch (Msg) + { + case WM_CREATE: + { + // check commandline + if (strlen(cmdline) != 0) + { + + useDIBits = TRUE; + } + else + useDIBits = FALSE; + + // create a memory DC + HMemDC = CreateCompatibleDC(NULL); + if (HMemDC) + { + // load a bitmap from file + HBITMAP HBmp = + static_cast<HBITMAP>( + LoadImage(HInst, filename, IMAGE_BITMAP, + 0, 0, LR_LOADFROMFILE) + ); + if (HBmp) + { + // extract dimensions of the bitmap + GetObject(HBmp, sizeof(BITMAP), &bmp); + + // fill the BITMAPINFO stucture for further use by StretchDIBits + bmInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmInfo.bmiHeader.biWidth = bmp.bmWidth; + bmInfo.bmiHeader.biHeight = bmp.bmHeight; + bmInfo.bmiHeader.biPlanes = 1;//bmp.bmPlanes; + bmInfo.bmiHeader.biBitCount = bmp.bmBitsPixel; + bmInfo.bmiHeader.biCompression = BI_RGB; + bmInfo.bmiHeader.biSizeImage = 0; + bmInfo.bmiHeader.biXPelsPerMeter = 0; + bmInfo.bmiHeader.biClrImportant = 0; + bmInfo.bmiHeader.biClrUsed = 0; + + // associate the bitmap with the memory DC + HOldBmp = static_cast<HBITMAP>( + SelectObject(HMemDC, HBmp) + ); + + if (useDIBits) + { + bbits = new char[bmp.bmHeight*bmp.bmWidthBytes*(bmp.bmBitsPixel / 8)]; + //GetDIBits(HMemDC, HBmp, 0, bmp.bmHeight, bbits, &bmInfo, DIB_RGB_COLORS); + + // Here goes a temp hack, since GetDIBits doesn't exist in ReactOS yet + FILE *f = fopen(filename, "rb"); + BITMAPFILEHEADER bmpHeader; + + fread(&bmpHeader, sizeof(BITMAPFILEHEADER), 1, f); + fread(&bmInfo, sizeof(BITMAPINFO), 1, f); + fseek(f, bmpHeader.bfOffBits, SEEK_SET); + fread(bbits, bmp.bmHeight*bmp.bmWidthBytes*(bmp.bmBitsPixel / 8), 1, f); + + fclose(f); + } + } + } + } + case WM_COMMAND: + { + if (WParam == MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) || + WParam == MAKEWPARAM(ID_LISTBOX2, LBN_SELCHANGE)) + { + switch (SNDMSG(HListBox, LB_GETCURSEL, 0, 0)) + { + case ID_ZOOM25: zoom_factor_h = 0.25; break; + case ID_ZOOM50: zoom_factor_h = 0.50; break; + case ID_ZOOM75: zoom_factor_h = 0.75; break; + case ID_ZOOM100: zoom_factor_h = 1.00; break; + case ID_ZOOM125: zoom_factor_h = 1.25; break; + case ID_ZOOM150: zoom_factor_h = 1.50; break; + case ID_ZOOM200: zoom_factor_h = 2.00; break; + case ID_ZOOM300: zoom_factor_h = 3.00; break; + } + + switch (SNDMSG(VListBox, LB_GETCURSEL, 0, 0)) + { + case ID_ZOOM25: zoom_factor_v = 0.25; break; + case ID_ZOOM50: zoom_factor_v = 0.50; break; + case ID_ZOOM75: zoom_factor_v = 0.75; break; + case ID_ZOOM100: zoom_factor_v = 1.00; break; + case ID_ZOOM125: zoom_factor_v = 1.25; break; + case ID_ZOOM150: zoom_factor_v = 1.50; break; + case ID_ZOOM200: zoom_factor_v = 2.00; break; + case ID_ZOOM300: zoom_factor_v = 3.00; break; + } + + // calculate the new width and height + const int new_width = + static_cast<int>(zoom_factor_h * bmp.bmWidth); + const int new_height = + static_cast<int>(zoom_factor_v * bmp.bmHeight); + + // is zooming in? + bool zoom_in = (new_width > RDest.right - RDest.left); + + // caculate the area that needs to be updated + RECT RUpdate = { + RDest.left, RDest.top, + RDest.left + max(new_width, RDest.right - RDest.left), + RDest.top + max(new_height, RDest.bottom - RDest.top) + }; + + // adjust the dimenstions of the + // destination rectangle + RDest.right = RDest.left + new_width; + RDest.bottom = RDest.top + new_height; + + // create an update region from the XOR combination + // of the update and destination rectangles + HRGN HUpdateRgn = CreateRectRgnIndirect(&RUpdate); + HRGN HDestRgn = CreateRectRgnIndirect(&RDest); + int result = + CombineRgn(HUpdateRgn, HUpdateRgn, HDestRgn, RGN_XOR); + + // incite a repaint + if (result != NULLREGION && result != ERROR) + { + InvalidateRgn(HWnd, HUpdateRgn, true); + RedrawWindow(HWnd, &RDest, NULL, RDW_NOERASE | RDW_INVALIDATE); + } + else if (result == NULLREGION) + { + InvalidateRect(HWnd, &RUpdate, zoom_in ? false : true); + } + + // clean up + DeleteObject(HUpdateRgn); + DeleteObject(HDestRgn); + } + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + const HDC Hdc = BeginPaint(HWnd, &ps); +#if 0 + try +#endif + { + // + // TODO: add palette support (see Chapter 9)... + // + if (useDIBits) + { + if (RDest.right - RDest.left > 0) + { + if (zoom_factor_h < 1.0 || zoom_factor_v < 1.0) + { + SetStretchBltMode(Hdc, COLORONCOLOR); + } + + // render the zoomed image + StretchDIBits(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + 0, 0, + bmp.bmWidth, bmp.bmHeight, + bbits, &bmInfo, + DIB_RGB_COLORS, + SRCCOPY); + } + } + else + { + if (RDest.right - RDest.left > 0) + { + + // use BitBlt when not zooming + if (zoom_factor_h == 1.0 && zoom_factor_v == 1.0) + { + BitBlt(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + HMemDC, 0, 0, + SRCCOPY); + } + else + { + if (zoom_factor_h < 1.0 || zoom_factor_v < 1.0) + { + SetStretchBltMode(Hdc, COLORONCOLOR); + } + + // render the zoomed image + StretchBlt(Hdc, RDest.left, RDest.top, + RDest.right - RDest.left, + RDest.bottom - RDest.top, + HMemDC, 0, 0, + bmp.bmWidth, bmp.bmHeight, + SRCCOPY); + } + } + } + } +#if 0 + catch (...) +#endif + { + EndPaint(HWnd, &ps); + } + EndPaint(HWnd, &ps); + break; + } + case WM_DESTROY: + { + // clean up + DeleteObject(SelectObject(HMemDC, HOldBmp)); + DeleteDC(HMemDC); + + if (bbits) + delete[] bbits; + + PostQuitMessage(0); + return 0; + } + } + return DefWindowProc(HWnd, Msg, WParam, LParam); +} +//------------------------------------------------------------------ + + + Propchange: trunk/rostests/dibtests/stretchblt/stretchblt.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/stretchblt/stretchblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/stret… ============================================================================== --- trunk/rostests/dibtests/stretchblt/stretchblt.rbuild (added) +++ trunk/rostests/dibtests/stretchblt/stretchblt.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -1,0 +1,7 @@ +<module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe" stdlib="host"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>stretchblt.cpp</file> +</module> Propchange: trunk/rostests/dibtests/stretchblt/stretchblt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=3741… ============================================================================== --- trunk/rostests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="dibtests"> + <xi:include href="dibtests/directory.rbuild" /> </directory> <directory name="dxtest"> <xi:include href="dxtest/directory.rbuild" /> Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Mon Nov 17 11:28:14 2008 @@ -7,9 +7,6 @@ <directory name="alive"> <xi:include href="alive/alive.rbuild" /> </directory> - <directory name="alphablend"> - <xi:include href="alphablend/alphablend.rbuild" /> - </directory> <directory name="apc"> <xi:include href="apc/apc.rbuild" /> </directory> @@ -25,9 +22,6 @@ <directory name="bench"> <xi:include href="bench/bench.rbuild" /> </directory> - <directory name="bitblt"> - <xi:include href="bitblt/bitblt.rbuild" /> - </directory> <directory name="button"> <xi:include href="button/button.rbuild" /> </directory> @@ -55,9 +49,6 @@ <directory name="create-links"> <xi:include href="create-links/create-links.rbuild" /> </directory> - <directory name="dibtest"> - <xi:include href="dibtest/dibtest.rbuild" /> - </directory> <directory name="dirdlg"> <xi:include href="dirdlg/dirdlg.rbuild" /> </directory> @@ -115,9 +106,6 @@ <directory name="hivetest"> <xi:include href="hivetest/hivetest.rbuild" /> </directory> - <directory name="icontest"> - <xi:include href="icontest/icontest.rbuild" /> - </directory> <directory name="Imagelistviewer"> <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> </directory> @@ -177,12 +165,6 @@  - <directory name="palbitblt"> - <xi:include href="palbitblt/palbitblt.rbuild" /> - </directory> - <directory name="patblt"> - <xi:include href="patblt/patblt.rbuild" /> - </directory> <directory name="polytest"> <xi:include href="polytest/polytest.rbuild" /> </directory> @@ -228,9 +210,6 @@ <directory name="statst2"> <xi:include href="statst2/statst2.rbuild" /> </directory> - <directory name="stretchblt"> - <xi:include href="stretchblt/stretchblt.rbuild" /> - </directory> <directory name="subclass"> <xi:include href="subclass/subclass.rbuild" /> </directory>

16 years, 1 month

[gschneider] 37411: Moved dib tests remotely

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 17 10:59:01 2008 New Revision: 37411 URL: http://svn.reactos.org/svn/reactos?rev=37411&view=rev Log: Moved dib tests remotely Added: trunk/rostests/dibtests/alphablend/ - copied from r37410, trunk/rostests/tests/alphablend/ Removed: trunk/rostests/tests/alphablend/

16 years, 1 month

[tkreuzer] 37410: ntoskrnl: - Use generic Interlocked functions for amd64, too - use generic rbuild file (2 hax left) - add baseaddress for ntoskrnl - update and sort amd64stubs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 17 10:24:37 2008 New Revision: 37410 URL: http://svn.reactos.org/svn/reactos?rev=37410&view=rev Log: ntoskrnl: - Use generic Interlocked functions for amd64, too - use generic rbuild file (2 hax left) - add baseaddress for ntoskrnl - update and sort amd64stubs Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -214,7 +214,7 @@ </directory> <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl-amd64hack.rbuild" /> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory>  -  -  - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>kdb.c</file> - </directory> - </if> - </if> - <if property="DBG_OR_KDBG" value="true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name="kd"> - <directory name="wrappers"> - <file>bochs.c</file> - <if property="ARCH" value="i386"> - <file>gdbstub.c</file> - </if> - <if property="ARCH" value="powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property="_WINKD_" value ="1"> - <directory name="kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name="lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name="mm"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>page.c</file> - </directory> - </if> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>stubs.c</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property="_ELF_" value="1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name="ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>obsdcach.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name="po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name="ps"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>psctx.c</file> - </directory> - </if> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>psctx.c</file> - </directory> - </if> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name="rtl"> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>rtlexcpt.c</file> - </directory> - </if> - <file>libsupp.c</file> - <file>misc.c</file> - </directory> - <directory name="se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name="vdm"> - <if property="ARCH" value="i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name="wmi"> - <file>wmi.c</file> - </directory> - <file>ntoskrnl.rc</file> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> -</module> - Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -36,6 +36,9 @@ <directory name="include"> <pch>ntoskrnl.h</pch> </directory> + <if property="ARCH" value="amd64"> + <file>amd64stubs.c</file> + </if> <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -85,6 +88,19 @@ <file>thrdini.c</file> <file>ctxswitch.c</file> <file>ctxhelp.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file first="true">boot.S</file> + <file>cpu.c</file> + <file>ctxswitch.S</file> + <file>except.c</file> + <file>irql.c</file> + <file>kiinit.c</file> + <file>spinlock.c</file> + <file>thrdini.c</file> + <file>trap.S</file> </directory> </if> <file>apc.c</file> @@ -122,6 +138,11 @@ </directory> <directory name="config"> <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> <directory name="i386"> <file>cmhardwr.c</file> </directory> @@ -294,11 +315,18 @@ </directory> </if> <if property="KDBG" value="1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> + <ifnot property="ARCH" value="amd64"> + <file>kdb.c</file> + <file>kdb_cli.c</file> + <file>kdb_expr.c</file> + </ifnot> <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>kdb.c</file> + </directory> + </if> </if> <if property="DBG_OR_KDBG" value="true"> <file>kdb_symbols.c</file> @@ -355,6 +383,11 @@ <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file>pfault.c</file> + <file>page.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> <file>page.c</file> </directory> </if> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Mon Nov 17 10:24:37 2008 @@ -1,7 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true"> + <ifnot property="ARCH" value="amd64"> + <property name="BASEADDRESS_NTOSKRNL" value="0x80800000" /> + </ifnot> + <if property="ARCH" value="amd64"> + <property name="BASEADDRESS_NTOSKRNL" value="0xfffff80000800000" /> + </if> + <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="${BASEADDRESS_NTOSKRNL}" entrypoint="KiSystemStartup" allowwarnings="true"> <xi:include href="ntoskrnl-generic.rbuild" /> </module> </group>

16 years, 1 month

[fireball] 37409: - Target device to mount may not have VPB, the driver should get the VPB passed in parameters. - Set target device's VPB to this value. This should not really be done, however our driver heavily depends on target device having this VPB. I don't see any side effects. - With these changes, Windows 2003 is able to boot up to desktop and cleanly shutdown using this driver.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 17 10:09:31 2008 New Revision: 37409 URL: http://svn.reactos.org/svn/reactos?rev=37409&view=rev Log: - Target device to mount may not have VPB, the driver should get the VPB passed in parameters. - Set target device's VPB to this value. This should not really be done, however our driver heavily depends on target device having this VPB. I don't see any side effects. - With these changes, Windows 2003 is able to boot up to desktop and cleanly shutdown using this driver. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Nov 17 10:09:31 2008 @@ -372,6 +372,7 @@ PVFATFCB VolumeFcb = NULL; PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; + PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; @@ -389,6 +390,7 @@ } DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; + Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); if (!NT_SUCCESS(Status)) @@ -438,7 +440,9 @@ DeviceExt->HashTableSize = HashTableSize; /* use same vpb as device disk */ - DeviceObject->Vpb = DeviceToMount->Vpb; + DeviceObject->Vpb = Vpb; + DeviceToMount->Vpb = Vpb; + Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) {

16 years, 1 month

[greatlrd] 37408: Fixed a old typo HelDdSurfLock it should be DIB_RGB_* not DIB_PAL_* when it try getting rgb bitmap pixel data Ported old experiment code for HelDdSurfUnLock it is not completed and can be very buggy Fixed smaller bug in Main_DDrawSurface_Unlock the rest of visrgn can fail on real hw. if it fail, it was not supported by the hw drv for most case. so it is safe to ignore if it fails

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 17 09:52:02 2008 New Revision: 37408 URL: http://svn.reactos.org/svn/reactos?rev=37408&view=rev Log: Fixed a old typo HelDdSurfLock it should be DIB_RGB_* not DIB_PAL_* when it try getting rgb bitmap pixel data Ported old experiment code for HelDdSurfUnLock it is not completed and can be very buggy Fixed smaller bug in Main_DDrawSurface_Unlock the rest of visrgn can fail on real hw. if it fail, it was not supported by the hw drv for most case. so it is safe to ignore if it fails Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Mon Nov 17 09:52:02 2008 @@ -8,54 +8,59 @@ * */ #include "rosdraw.h" + DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) { -if (lpBltData->dwFlags & DDBLT_COLORFILL) -{ -HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); -FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, -(CONST RECT *)&lpBltData->rDest, -hbr); -DeleteObject(hbr); -lpBltData->ddRVal = DD_OK; -} - -else if (lpBltData->dwFlags & DDBLT_ROP) -{ - -BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, -lpBltData->rDest.top, -lpBltData->rDest.left, -lpBltData->rDest.right, -lpBltData->rDest.bottom, -(HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, -lpBltData->rSrc.top, -lpBltData->rSrc.right, -lpBltData->bltFX.dwROP); -lpBltData->ddRVal = DD_OK; -} -return DDHAL_DRIVER_HANDLED; -} + if (lpBltData->dwFlags & DDBLT_COLORFILL) + { + HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); + FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + (CONST RECT *)&lpBltData->rDest, + hbr); + DeleteObject(hbr); + lpBltData->ddRVal = DD_OK; + } + else if (lpBltData->dwFlags & DDBLT_ROP) + { + BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rDest.top, + lpBltData->rDest.left, + lpBltData->rDest.right, + lpBltData->rDest.bottom, + (HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rSrc.top, + lpBltData->rSrc.right, + lpBltData->bltFX.dwROP); + lpBltData->ddRVal = DD_OK; + } + return DDHAL_DRIVER_HANDLED; +} + DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) { HDC hDC; @@ -102,7 +107,7 @@ else { /* Extract the bitmap bits data from RGB bitmap */ - retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); + retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_RGB_COLORS); } /* Check see if we susccess it to get the memory pointer and fill it for the bitmap pixel data */ @@ -136,33 +141,83 @@ DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) { -/* -This api is not doucment by MS So I leave it -as stub. -*/ -DX_STUB; -} + /* + This api is not doucment by MS So I leave it + as stub. + */ + DX_STUB; +} + DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData) { -DX_STUB; -} + DX_STUB; +} + DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) { -DX_STUB; -} + HDC hDC; + BITMAP bm; + PDWORD pixels = NULL; + HGDIOBJ hBmp; + BITMAPINFO bmi; + int retvalue = 0; + + /* Get our hdc for the surface */ + hDC = (HDC)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; + + /* Get our bitmap handle from hdc, we need it if we want extract the Bitmap pixel data */ + hBmp = GetCurrentObject(hDC, OBJ_BITMAP); + + /* Get our bitmap information from hBmp, we need it if we want extract the Bitmap pixel data */ + if (GetObject(hBmp, sizeof(BITMAP), &bm) ) + { + /* Zero out all members in bmi so no junk data are left */ + ZeroMemory(&bmi, sizeof(BITMAPINFO)); + + /* Setup BITMAPINFOHEADER for bmi header */ + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = bm.bmPlanes; + bmi.bmiHeader.biBitCount = bm.bmBitsPixel; + bmi.bmiHeader.biCompression = BI_RGB; + + /* Check if it the bitmap is palete or not */ + if ( bm.bmBitsPixel <= 8) + { + /* Upload the bitmap bits data from palete bitmap */ + retvalue = SetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); + } + else + { + /* Upload the bitmap bits data from RGB bitmap */ + retvalue = SetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_RGB_COLORS); + } + } + if (retvalue) + { + lpUnLockData->ddRVal = DD_OK; + } + return DDHAL_DRIVER_HANDLED; +} + DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) { -DX_STUB; -} + DX_STUB; +} + Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Mon Nov 17 09:52:02 2008 @@ -303,10 +303,10 @@ mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt; } - /* check see if we got any of them */ if (mDdBlt.Blt == NULL) { - return DDERR_GENERIC; + /* This api are unsupported */ + return DDERR_UNSUPPORTED; } /* Prepare for draw, if we do not rest the DdResetVisrgn some graphice card will not draw on the screen */ @@ -412,8 +412,7 @@ DX_WINDBG_trace_res( (DWORD)ThisDest->lpLcl->lpGbl->wWidth, (DWORD)ThisDest->lpLcl->lpGbl->wHeight, (DWORD)ThisDest->lpLcl->lpGbl->lPitch, (DWORD) 0); - - /* Zero out members in DDHAL_BLTDATA */ + /* Zero out members in DDHAL_LOCKDATA */ ZeroMemory(&mdLock, sizeof(DDHAL_LOCKDATA)); /* Check if we got HAL support for this api */ @@ -427,6 +426,12 @@ DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) { mdLock.Lock = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock; + } + + if (mdLock.Lock == NULL) + { + /* This api are unsupported */ + return DDERR_UNSUPPORTED; } if (events != NULL) @@ -505,30 +510,45 @@ HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT pRect) { - DDHAL_UNLOCKDATA mdUnLock; - - DX_WINDBG_trace(); - - if (!This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) - { - DX_STUB_str("DDERR_UNSUPPORTED"); - return DDERR_UNSUPPORTED; - } + DDHAL_UNLOCKDATA mdUnLock; + + DX_WINDBG_trace(); + + /* Zero out members in DDHAL_UNLOCKDATA */ + ZeroMemory(&mdUnLock, sizeof(DDHAL_UNLOCKDATA)); + + /* Check if we got HAL support for this api */ + if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Unlock; + } + /* Check if we got HEL support for this api */ + else if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Unlock; + } + + if (mdUnLock.Unlock == NULL) + { + /* This api are unsupported */ + return DDERR_UNSUPPORTED; + } mdUnLock.ddRVal = DDERR_NOTPALETTIZED; mdUnLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Unlock; + mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; if (!DdResetVisrgn( mdUnLock.lpDDSurface, NULL)) { - DX_STUB_str("DDERR_UNSUPPORTED"); - return DDERR_UNSUPPORTED; + DX_STUB_str("DdResetVisrgn fail"); + //return DDERR_UNSUPPORTED; /* this can fail */ } if (mdUnLock.Unlock(&mdUnLock)!= DDHAL_DRIVER_HANDLED) { - DX_STUB_str("unLock fail"); + DX_STUB_str("unLock fail"); return DDERR_UNSUPPORTED; }

16 years, 1 month

[gschneider] 37407: - Add new directory for some dib related test restructuring, including two new tests: - bltrop test for well known BitBlt ROPs, highlighted bugs were processed in r37268, r37269, r37372 - vbltest for testing several blit and blend functions, highlighted bugs fixed in r37139, r37168 and some overlay issues still tbd

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 17 09:05:02 2008 New Revision: 37407 URL: http://svn.reactos.org/svn/reactos?rev=37407&view=rev Log: - Add new directory for some dib related test restructuring, including two new tests: - bltrop test for well known BitBlt ROPs, highlighted bugs were processed in r37268, r37269, r37372 - vbltest for testing several blit and blend functions, highlighted bugs fixed in r37139, r37168 and some overlay issues still tbd Added: trunk/rostests/dibtests/ trunk/rostests/dibtests/bltrop/ trunk/rostests/dibtests/bltrop/bltrop.c (with props) trunk/rostests/dibtests/bltrop/bltrop.rbuild (with props) trunk/rostests/dibtests/bltrop/bltrop.rc (with props) trunk/rostests/dibtests/bltrop/mars.bmp (with props) trunk/rostests/dibtests/directory.rbuild (with props) trunk/rostests/dibtests/vbltest/ trunk/rostests/dibtests/vbltest/test_inv01.bmp (with props) trunk/rostests/dibtests/vbltest/test_inv04.bmp (with props) trunk/rostests/dibtests/vbltest/test_inv08.bmp (with props) trunk/rostests/dibtests/vbltest/test_inv24.bmp (with props) trunk/rostests/dibtests/vbltest/vbltest.c (with props) trunk/rostests/dibtests/vbltest/vbltest.rbuild (with props) trunk/rostests/dibtests/vbltest/vbltest.rc (with props) Added: trunk/rostests/dibtests/bltrop/bltrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/bltrop.c?… ============================================================================== --- trunk/rostests/dibtests/bltrop/bltrop.c (added) +++ trunk/rostests/dibtests/bltrop/bltrop.c [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,163 @@ +/* + * Shows the 15 well known BitBlt raster operations + * using src, dest, pattern, a background brush and color. + * + * Created by Gregor Schneider <grschneider AT gmail DOT com>, November 2008 +*/ + +#include <windows.h> +#include <tchar.h> + +HINSTANCE hInst; +TCHAR szWindowClass[] = _T("testclass"); + +static LRESULT CALLBACK +WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static HBITMAP hBmpTest; + + switch (message) + { + case WM_CREATE: + { + hBmpTest = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(100), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + break; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + BITMAP bitmap; + HBRUSH brush, brush2; + + hdc = BeginPaint(hWnd, &ps); + hdcMem = CreateCompatibleDC(hdc); + + GetObject(hBmpTest, sizeof(BITMAP), &bitmap); + + /* fill destination with brush */ + brush = CreateHatchBrush(HS_DIAGCROSS, RGB(255,0,0)); + SelectObject(hdc, brush); + PatBlt(hdc, 0, 0, 4*bitmap.bmWidth, 4*bitmap.bmHeight, PATCOPY); + /* set up a second brush */ + brush2 = CreateHatchBrush(HS_VERTICAL, RGB(127,127,127)); + + /* first select brush, then set bk color */ + SelectObject(hdc, brush2); + SetBkColor(hdc, RGB(0, 255, 0)); + + /* 15 blt op's */ + SelectObject(hdcMem, hBmpTest); + BitBlt(hdc, 0, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCCOPY); + BitBlt(hdc, 100, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, DSTINVERT); + BitBlt(hdc, 200, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGECOPY); + BitBlt(hdc, 300, 0, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, MERGEPAINT); + + BitBlt(hdc, 0, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCCOPY); + BitBlt(hdc, 100, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, NOTSRCERASE); + BitBlt(hdc, 200, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATCOPY); + BitBlt(hdc, 300, 100, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATINVERT); + + BitBlt(hdc, 0, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, PATPAINT); + BitBlt(hdc, 100, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCAND); + BitBlt(hdc, 200, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCERASE); + BitBlt(hdc, 300, 200, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCINVERT); + + BitBlt(hdc, 0, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, BLACKNESS); + BitBlt(hdc, 100, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCPAINT); + BitBlt(hdc, 200, 300, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, WHITENESS); + + DeleteDC(hdcMem); + EndPaint(hWnd, &ps); + break; + } + + case WM_DESTROY: + PostQuitMessage(0); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; +} + + +static ATOM +MyRegisterClass(HINSTANCE hInstance) +{ + WNDCLASSEX wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = NULL; + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = NULL; + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = NULL; + + return RegisterClassEx(&wcex); +} + + +static BOOL +InitInstance(HINSTANCE hInstance, int nCmdShow) +{ + HWND hWnd; + + hInst = hInstance; + + hWnd = CreateWindowEx(0, + szWindowClass, + _T("BitBlt raster operation test"), + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 440, + 440, + NULL, + NULL, + hInstance, + NULL); + + if (!hWnd) + { + return FALSE; + } + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + return TRUE; +} + + +int WINAPI +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + MSG msg; + + MyRegisterClass(hInstance); + + if (!InitInstance(hInstance, nCmdShow)) + { + return FALSE; + } + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int)msg.wParam; +} Propchange: trunk/rostests/dibtests/bltrop/bltrop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bltrop/bltrop.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/bltrop.rb… ============================================================================== --- trunk/rostests/dibtests/bltrop/bltrop.rbuild (added) +++ trunk/rostests/dibtests/bltrop/bltrop.rbuild [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,9 @@ +<module name="bltrop" type="win32gui" installbase="bin" installname="bltrop.exe"> + <define name="__USE_W32API" /> + <include base="bltrop">.</include> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <file>bltrop.c</file> + <file>bltrop.rc</file> +</module> Propchange: trunk/rostests/dibtests/bltrop/bltrop.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bltrop/bltrop.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/bltrop.rc… ============================================================================== --- trunk/rostests/dibtests/bltrop/bltrop.rc (added) +++ trunk/rostests/dibtests/bltrop/bltrop.rc [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,1 @@ +100 BITMAP "mars.bmp" Propchange: trunk/rostests/dibtests/bltrop/bltrop.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/bltrop/mars.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bltrop/mars.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/bltrop/mars.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/directory.rbuild… ============================================================================== --- trunk/rostests/dibtests/directory.rbuild (added) +++ trunk/rostests/dibtests/directory.rbuild [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="bltrop"> + <xi:include href="bltrop/bltrop.rbuild" /> + </directory> + <directory name="vbltest"> + <xi:include href="vbltest/vbltest.rbuild" /> + </directory> +</group> Propchange: trunk/rostests/dibtests/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/vbltest/test_inv01.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv01.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/vbltest/test_inv04.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv04.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/vbltest/test_inv08.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv08.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/vbltest/test_inv24.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv24.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/dibtests/vbltest/vbltest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.c (added) +++ trunk/rostests/dibtests/vbltest/vbltest.c [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,178 @@ +/* + * Tests various blit and blend operations with different src + * bit depths and scaling where possbile. + * + * Created by Gregor Schneider <grschneider AT gmail DOT com>, November 2008 +*/ + +#include <windows.h> +#include <tchar.h> + +#define CURRENT_BMPS 4 +#define SCALE 1.5 +#define OFFSET 5 + +HINSTANCE hInst; +TCHAR szWindowClass[] = _T("testclass"); + +static LRESULT CALLBACK +WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static HBITMAP hbmList[CURRENT_BMPS]; + + switch (message) + { + case WM_CREATE: + { + hbmList[0] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(100), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hbmList[1] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hbmList[2] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(800), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hbmList[3] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(2400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + break; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + BITMAP bitmap; + BLENDFUNCTION bfunc; + int x = 0, y = 0, i; + + hdc = BeginPaint(hWnd, &ps); + hdcMem = CreateCompatibleDC(hdc); + + bfunc.AlphaFormat = AC_SRC_ALPHA; + bfunc.BlendFlags = 0; + bfunc.BlendOp = AC_SRC_OVER; + bfunc.SourceConstantAlpha = 128; + + for(i = 0; i < CURRENT_BMPS; i++) + { + y = 0; + SelectObject(hdcMem, hbmList[i]); + GetObject(hbmList[i], sizeof(BITMAP), &bitmap); + + /* bit blt */ + BitBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, SRCCOPY); + y += bitmap.bmHeight + OFFSET; + + /* stretch blt, org size */ + StretchBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCCOPY); + y += bitmap.bmHeight + OFFSET; + + /* stretch blt, scaled */ + StretchBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, SRCCOPY); + y += bitmap.bmHeight*SCALE + OFFSET; + + /* transparent blt, transparency: grey */ + TransparentBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + y += bitmap.bmHeight + OFFSET; + + /* transparent blt, transparency: grey, scaled */ + TransparentBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + y += bitmap.bmHeight*SCALE + OFFSET; + + /* alpha blend, org size */ + AlphaBlend(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + y += bitmap.bmHeight + OFFSET; + + /* alpha blend, scaled */ + AlphaBlend(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + + x += bitmap.bmWidth*SCALE + OFFSET; + } + + DeleteDC(hdcMem); + EndPaint(hWnd, &ps); + break; + } + + case WM_DESTROY: + PostQuitMessage(0); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; +} + + +static ATOM +MyRegisterClass(HINSTANCE hInstance) +{ + WNDCLASSEX wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = NULL; + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = NULL; + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = NULL; + + return RegisterClassEx(&wcex); +} + + +static BOOL +InitInstance(HINSTANCE hInstance, int nCmdShow) +{ + HWND hWnd; + + hInst = hInstance; + + hWnd = CreateWindowEx(0, + szWindowClass, + _T("Various blit and blend operations"), + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 640, + 640, + NULL, + NULL, + hInstance, + NULL); + + if (!hWnd) + { + return FALSE; + } + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + return TRUE; +} + + +int WINAPI +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + MSG msg; + + MyRegisterClass(hInstance); + + if (!InitInstance(hInstance, nCmdShow)) + { + return FALSE; + } + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int)msg.wParam; +} Propchange: trunk/rostests/dibtests/vbltest/vbltest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/vbltest/vbltest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rbuild (added) +++ trunk/rostests/dibtests/vbltest/vbltest.rbuild [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,10 @@ +<module name="vbltest" type="win32gui" installbase="bin" installname="vbltest.exe"> + <define name="__USE_W32API" /> + <include base="vbltest">.</include> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>msimg32</library> + <file>vbltest.c</file> + <file>vbltest.rc</file> +</module> Propchange: trunk/rostests/dibtests/vbltest/vbltest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/dibtests/vbltest/vbltest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rc (added) +++ trunk/rostests/dibtests/vbltest/vbltest.rc [iso-8859-1] Mon Nov 17 09:05:02 2008 @@ -1,0 +1,4 @@ +100 BITMAP "test_inv01.bmp" +400 BITMAP "test_inv04.bmp" +800 BITMAP "test_inv08.bmp" +2400 BITMAP "test_inv24.bmp" Propchange: trunk/rostests/dibtests/vbltest/vbltest.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 1 month

[greatlrd] 37406: remove a comment that is not true.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 17 09:01:43 2008 New Revision: 37406 URL: http://svn.reactos.org/svn/reactos?rev=37406&view=rev Log: remove a comment that is not true. Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Mon Nov 17 09:01:43 2008 @@ -67,7 +67,6 @@ /* ToDo tell ddraw internal this surface are locked */ /* ToDo add support for dwFlags */ - /* ToDo fill in LPDDHALSURFCB_LOCK Lock ? */ /* Get our hdc for the surface */ hDC = (HDC)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC;

16 years, 1 month

[greatlrd] 37405: ported old version of HEL lock surface for ddraw I wrote long time ago. It is not complete and can contain bugs.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 17 09:00:28 2008 New Revision: 37405 URL: http://svn.reactos.org/svn/reactos?rev=37405&view=rev Log: ported old version of HEL lock surface for ddraw I wrote long time ago. It is not complete and can contain bugs. Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Mon Nov 17 09:00:28 2008 @@ -1,119 +1,169 @@ /* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/callbacks_surf_hel.c - * PURPOSE: HEL Callbacks For Surface APIs - * PROGRAMMER: Magnus Olsen - * - */ - +* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS DirectX +* FILE: ddraw/surface/callbacks_surf_hel.c +* PURPOSE: HEL Callbacks For Surface APIs +* PROGRAMMER: Magnus Olsen +* +*/ #include "rosdraw.h" - DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) { - DX_STUB; +DX_STUB; +} +DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) +{ +if (lpBltData->dwFlags & DDBLT_COLORFILL) +{ +HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); +FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, +(CONST RECT *)&lpBltData->rDest, +hbr); +DeleteObject(hbr); +lpBltData->ddRVal = DD_OK; } -DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) +else if (lpBltData->dwFlags & DDBLT_ROP) { - if (lpBltData->dwFlags & DDBLT_COLORFILL) +BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, +lpBltData->rDest.top, +lpBltData->rDest.left, +lpBltData->rDest.right, +lpBltData->rDest.bottom, +(HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, +lpBltData->rSrc.top, +lpBltData->rSrc.right, +lpBltData->bltFX.dwROP); +lpBltData->ddRVal = DD_OK; +} +return DDHAL_DRIVER_HANDLED; +} +DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) +{ +DX_STUB; +} +DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) +{ +DX_STUB; +} +DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) +{ +DX_STUB; +} +DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) +{ +DX_STUB; +} +DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) +{ + HDC hDC; + BITMAP bm; + PDWORD pixels = NULL; + HGDIOBJ hBmp; + BITMAPINFO bmi; + int retvalue = 0; + + /* ToDo tell ddraw internal this surface are locked */ + /* ToDo add support for dwFlags */ + /* ToDo fill in LPDDHALSURFCB_LOCK Lock ? */ + + /* Get our hdc for the surface */ + hDC = (HDC)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; + + /* Get our bitmap handle from hdc, we need it if we want extract the Bitmap pixel data */ + hBmp = GetCurrentObject(hDC, OBJ_BITMAP); + + /* Get our bitmap information from hBmp, we need it if we want extract the Bitmap pixel data */ + if (GetObject(hBmp, sizeof(BITMAP), &bm) ) { + /* Alloc memory buffer at usermode for the bitmap pixel data */ + pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bm.bmWidth * bm.bmHeight * (bm.bmBitsPixel*bm.bmBitsPixel ) ); - HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); + if (pixels != NULL) + { + /* Zero out all members in bmi so no junk data are left */ + ZeroMemory(&bmi, sizeof(BITMAPINFO)); - FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, - (CONST RECT *)&lpBltData->rDest, - hbr); + /* Setup BITMAPINFOHEADER for bmi header */ + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = bm.bmPlanes; + bmi.bmiHeader.biBitCount = bm.bmBitsPixel; + bmi.bmiHeader.biCompression = BI_RGB; - DeleteObject(hbr); + /* Check if it the bitmap is palete or not */ + if ( bm.bmBitsPixel <= 8) + { + /* Extract the bitmap bits data from palete bitmap */ + retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); + } + else + { + /* Extract the bitmap bits data from RGB bitmap */ + retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); + } - lpBltData->ddRVal = DD_OK; - } - - else if (lpBltData->dwFlags & DDBLT_ROP) - { - - BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, - lpBltData->rDest.top, - lpBltData->rDest.left, - lpBltData->rDest.right, - lpBltData->rDest.bottom, - (HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, - lpBltData->rSrc.top, - lpBltData->rSrc.right, - lpBltData->bltFX.dwROP); + /* Check see if we susccess it to get the memory pointer and fill it for the bitmap pixel data */ + if (retvalue) + { + /* Check see if the are special area it should have been extracted or not */ + if (!lpLockData->bHasRect) + { + /* The all bitmap pixel data must return */ + lpLockData->lpSurfData = pixels; + lpLockData->ddRVal = DD_OK; + } + else + { + /* Only the lpLockData->rArea bitmap data should be return */ + DX_STUB; + } + } + } + } - lpBltData->ddRVal = DD_OK; - } + /* Free the pixels buffer if we fail */ + if ( (pixels != NULL) && + (lpLockData->ddRVal != DD_OK) ) + { + HeapFree(GetProcessHeap(), 0, pixels ); + } return DDHAL_DRIVER_HANDLED; } -DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) -{ - DX_STUB; -} - - DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) { - /* - This api is not doucment by MS So I leave it - as stub. - */ - - DX_STUB; +/* +This api is not doucment by MS So I leave it +as stub. +*/ +DX_STUB; } - DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData) { - DX_STUB; +DX_STUB; } - DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData) { - DX_STUB; +DX_STUB; } - DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) { - DX_STUB; +DX_STUB; } - DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData) { - DX_STUB; +DX_STUB; } - DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) { - DX_STUB; +DX_STUB; } - DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) { - DX_STUB; +DX_STUB; } - Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Mon Nov 17 09:00:28 2008 @@ -403,14 +403,31 @@ HRESULT WINAPI -Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect, +Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) { DDHAL_LOCKDATA mdLock; DX_WINDBG_trace(); - DX_WINDBG_trace_res( (DWORD)This->lpLcl->lpGbl->wWidth, (DWORD)This->lpLcl->lpGbl->wHeight, (DWORD)This->lpLcl->lpGbl->lPitch, (DWORD) 0); + DX_WINDBG_trace_res( (DWORD)ThisDest->lpLcl->lpGbl->wWidth, (DWORD)ThisDest->lpLcl->lpGbl->wHeight, (DWORD)ThisDest->lpLcl->lpGbl->lPitch, (DWORD) 0); + + + /* Zero out members in DDHAL_BLTDATA */ + ZeroMemory(&mdLock, sizeof(DDHAL_LOCKDATA)); + + /* Check if we got HAL support for this api */ + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) + { + mdLock.Lock = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Lock; + } + /* Check if we got HEL support for this api */ + else if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) + { + mdLock.Lock = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock; + } if (events != NULL) { @@ -431,20 +448,18 @@ //FIXME check if it primary or not and use primary or pixelformat data, at moment it is hardcode to primary - mdLock.ddRVal = DDERR_NOTPALETTIZED; - mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; + mdLock.ddRVal = DDERR_CANTLOCKSURFACE; mdLock.dwFlags = flags; - mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mdLock.lpDDSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + mdLock.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdLock.lpSurfData = NULL; - if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) + if (!DdResetVisrgn(ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; } - if (mdLock.Lock(&mdLock)!= DDHAL_DRIVER_HANDLED) { @@ -476,11 +491,11 @@ pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; - pDDSD->dwHeight = This->lpLcl->lpGbl->wHeight; - pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; - - pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; - pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; + pDDSD->dwHeight = ThisDest->lpLcl->lpGbl->wHeight; + pDDSD->dwWidth = ThisDest->lpLcl->lpGbl->wWidth; + + pDDSD->ddpfPixelFormat.dwRGBBitCount = ThisDest->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; + pDDSD->lPitch = ThisDest->lpLcl->lpGbl->lPitch; pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; }

16 years, 1 month

[jimtabor] 37404: - Move StretchDIBits out of stubs. Add more notes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 17 07:55:00 2008 New Revision: 37404 URL: http://svn.reactos.org/svn/reactos?rev=37404&view=rev Log: - Move StretchDIBits out of stubs. Add more notes. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Nov 17 07:55:00 2008 @@ -20,31 +20,6 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); - -/* - * @unimplemented - */ -int -STDCALL -StretchDIBits(HDC hdc, - int XDest, - int YDest, - int nDestWidth, - int nDestHeight, - int XSrc, - int YSrc, - int nSrcWidth, - int nSrcHeight, - CONST VOID *lpBits, - CONST BITMAPINFO *lpBitsInfo, - UINT iUsage, - DWORD dwRop) - -{ - /* FIXME share memory */ - return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, - nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); -} /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Mon Nov 17 07:55:00 2008 @@ -315,7 +315,7 @@ 0); } -#if 0 +#if 0 // FIXME!!! This is a victim of the Win32k Initialization BUG!!!!! /* * @implemented */ @@ -461,4 +461,29 @@ } - +/* + * @unimplemented + */ +int +STDCALL +StretchDIBits(HDC hdc, + int XDest, + int YDest, + int nDestWidth, + int nDestHeight, + int XSrc, + int YSrc, + int nSrcWidth, + int nSrcHeight, + CONST VOID *lpBits, + CONST BITMAPINFO *lpBitsInfo, + UINT iUsage, + DWORD dwRop) + +{ + DPRINT("StretchDIBits %x : %x\n", lpBits, lpBitsInfo); + /* FIXME share memory */ + return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); +} + Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Nov 17 07:55:00 2008 @@ -507,7 +507,7 @@ { // HAX!!!! // Due to winlogon process/thread mapping issues we have this hax! - // + // FIXME!!! This is a victim of the Win32k Initialization BUG!!!!! return NtGdiGetDeviceCaps(hDC,i); if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr))

16 years, 1 month

[jimtabor] 37403: - Add note for NtGdiCreateDIBitmapInternal, Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 17 07:51:43 2008 New Revision: 37403 URL: http://svn.reactos.org/svn/reactos?rev=37403&view=rev Log: - Add note for NtGdiCreateDIBitmapInternal, Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Nov 17 07:51:43 2008 @@ -995,7 +995,7 @@ HBITMAP Bmp; if (!hDc) - { + { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); if (!hDc) {

16 years, 1 month

← Newer
1
...
35
36
37
38
39
40
41
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008