Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 17 Nov '08

17 Nov '08

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; }

1 0

[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 17 Nov '08

17 Nov '08

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

1 0

[greatlrd] 37406: remove a comment that is not true.
by greatlrd＠svn.reactos.org 17 Nov '08

17 Nov '08

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;

1 0

[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 17 Nov '08

17 Nov '08

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; }

1 0

[jimtabor] 37404: - Move StretchDIBits out of stubs. Add more notes.
by jimtabor＠svn.reactos.org 17 Nov '08

17 Nov '08

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))

1 0

[jimtabor] 37403: - Add note for NtGdiCreateDIBitmapInternal, Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this.
by jimtabor＠svn.reactos.org 17 Nov '08

17 Nov '08

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) {

1 0

[sginsberg] 37402: - Start deprecating the overabused system_header gcc pragma extension
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 07:49:52 2008 New Revision: 37402 URL: http://svn.reactos.org/svn/reactos?rev=37402&view=rev Log: - Start deprecating the overabused system_header gcc pragma extension Modified: trunk/reactos/include/GL/glu.h Modified: trunk/reactos/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/glu.h?rev=37402… ============================================================================== --- trunk/reactos/include/GL/glu.h [iso-8859-1] (original) +++ trunk/reactos/include/GL/glu.h [iso-8859-1] Mon Nov 17 07:49:52 2008 @@ -30,9 +30,6 @@ #ifndef __glu_h__ #define __glu_h__ #define _GLU_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #include <stddef.h> /* for wchar_t */ #include <GL/gl.h>

1 0

[mkupfer] 37401: - disable non-working device selection code - add a missing "break"
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 07:35:59 2008 New Revision: 37401 URL: http://svn.reactos.org/svn/reactos?rev=37401&view=rev Log: - disable non-working device selection code - add a missing "break" Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 07:35:59 2008 @@ -535,10 +535,10 @@ (WPARAM)sizeof(SetupData.InstallDir)/sizeof(TCHAR),(LPARAM)SetupData.InstallDir); EndDialog(hwndDlg, IDOK); - break; + return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - break; + return TRUE; } } return FALSE; @@ -559,10 +559,10 @@ { case IDOK: EndDialog(hwndDlg, IDOK); - break; + return TRUE; case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); - break; + return TRUE; } } return FALSE; @@ -574,10 +574,12 @@ WPARAM wParam, LPARAM lParam) { +#if 0 HDEVINFO h; HWND hList; SP_DEVINFO_DATA DevInfoData; DWORD i; +#endif switch (uMsg) { case WM_INITDIALOG: @@ -596,6 +598,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ +#if 0 h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); if (h != INVALID_HANDLE_VALUE) @@ -627,6 +630,7 @@ } SetupDiDestroyDeviceInfoList(h); } +#endif } break; case WM_COMMAND: @@ -634,14 +638,15 @@ switch(LOWORD(wParam)) { case IDC_PARTMOREOPTS: - DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); + DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,(DLGPROC)MoreOptDlgProc); break; case IDC_PARTCREATE: - DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,PartitionDlgProc); + DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,(DLGPROC)PartitionDlgProc); break; case IDC_PARTDELETE: break; } + break; } case WM_NOTIFY:

1 0

[fireball] 37400: - Remove hack around VFATFS (and CDFS) bugs which were fixed in r37393.
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 07:19:22 2008 New Revision: 37400 URL: http://svn.reactos.org/svn/reactos?rev=37400&view=rev Log: - Remove hack around VFATFS (and CDFS) bugs which were fixed in r37393. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Nov 17 07:19:22 2008 @@ -1355,14 +1355,6 @@ return Status; } - /* ROS HACK. VFAT SUCKS */ - if (NT_WARNING(Status)) - { - DPRINT("Status 0x%08x, LRN 0x%x, FileLength 0x%x\n", Status, - LocalReturnLength, FileLength); - LocalReturnLength = FileLength; - } - /* If the provided buffer is too small, return the required size */ if (LengthMismatch) {

1 0

[fireball] 37399: - Cleanup 37394, 37396 and 37397: * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE. * Fix headers, actual stub, and usage in kernel32 respectively. * We don't use hungarian notation in RTL ("hFileHandle") .
by fireball＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: fireball Date: Mon Nov 17 07:16:07 2008 New Revision: 37399 URL: http://svn.reactos.org/svn/reactos?rev=37399&view=rev Log: - Cleanup 37394, 37396 and 37397: * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE. * Fix headers, actual stub, and usage in kernel32 respectively. * We don't use hungarian notation in RTL ("hFileHandle") . Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -355,7 +355,7 @@ DPRINT("(%p, %p, %d)\n", FileHandle, Function, Flags); Status = RtlSetIoCompletionCallback(FileHandle, - (PRTL_OVERLAPPED_COMPLETION_ROUTINE) Function, + (PIO_APC_ROUTINE)Function, Flags); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -2065,7 +2065,7 @@ NTAPI RtlSetIoCompletionCallback( IN HANDLE FileHandle, - IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, + IN PIO_APC_ROUTINE Callback, IN ULONG Flags ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -430,16 +430,6 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; #endif - -// -// Callback for RtlSetIoCompletionCallback -// -typedef VOID -(NTAPI *PRTL_OVERLAPPED_COMPLETION_ROUTINE)( - ULONG, - ULONG, - PVOID -); // // Callback for RTL Heap Enumeration Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=373… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Mon Nov 17 07:16:07 2008 @@ -885,8 +885,8 @@ */ NTSTATUS NTAPI -RtlSetIoCompletionCallback(IN HANDLE hFileHandle, - IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function, +RtlSetIoCompletionCallback(IN HANDLE FileHandle, + IN PIO_APC_ROUTINE Callback, IN ULONG Flags) { UNIMPLEMENTED;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs